diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec index c1db28f3..f40bf003 100644 --- a/rockspec/apisix-master-0.rockspec +++ b/rockspec/apisix-master-0.rockspec @@ -51,7 +51,7 @@ dependencies = { "luafilesystem = 1.7.0-2", "api7-lua-tinyyaml = 0.4.2", "nginx-lua-prometheus = 0.20210206", - "jsonschema = 0.9.5", + "jsonschema = 0.9.6", "lua-resty-ipmatcher = 0.6.1", "lua-resty-kafka = 0.07", "lua-resty-logger-socket = 2.0-0", diff --git a/t/admin/health-check.t b/t/admin/health-check.t index f4246f37..d26e9242 100644 --- a/t/admin/health-check.t +++ b/t/admin/health-check.t @@ -169,7 +169,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"active\" validation failed: property \"healthy\" validation failed: property \"successes\" validation failed: expected 255 to be smaller than 254"} +{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"active\" validation failed: property \"healthy\" validation failed: property \"successes\" validation failed: expected 255 to be at most 254"} @@ -195,7 +195,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"active\" validation failed: property \"healthy\" validation failed: property \"successes\" validation failed: expected 0 to be greater than 1"} +{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"active\" validation failed: property \"healthy\" validation failed: property \"successes\" validation failed: expected 0 to be at least 1"} @@ -221,7 +221,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"passive\" validation failed: property \"unhealthy\" validation failed: property \"http_statuses\" validation failed: failed to validate item 2: expected 600 to be smaller than 599"} +{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: property \"passive\" validation failed: property \"unhealthy\" validation failed: property \"http_statuses\" validation failed: failed to validate item 2: expected 600 to be at most 599"} @@ -436,7 +436,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: object matches none of the requireds: [\"active\"] or [\"active\",\"passive\"]"} +{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: object matches none of the required: [\"active\"] or [\"active\",\"passive\"]"} diff --git a/t/admin/routes.t b/t/admin/routes.t index 069b7ca9..a16ccdbd 100644 --- a/t/admin/routes.t +++ b/t/admin/routes.t @@ -433,7 +433,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"service_id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"service_id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -541,7 +541,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -568,7 +568,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the required"} --- no_error_log [error] diff --git a/t/admin/routes3.t b/t/admin/routes3.t index 02fbc871..d9eb4f91 100644 --- a/t/admin/routes3.t +++ b/t/admin/routes3.t @@ -183,7 +183,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"remote_addr\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"remote_addr\" validation failed: object matches none of the required"} diff --git a/t/admin/services-string-id.t b/t/admin/services-string-id.t index e42be016..15160c5a 100644 --- a/t/admin/services-string-id.t +++ b/t/admin/services-string-id.t @@ -433,7 +433,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -460,7 +460,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -487,7 +487,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the required"} --- no_error_log [error] diff --git a/t/admin/services.t b/t/admin/services.t index 8493b517..d0ca8989 100644 --- a/t/admin/services.t +++ b/t/admin/services.t @@ -447,7 +447,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -474,7 +474,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -501,7 +501,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the required"} --- no_error_log [error] diff --git a/t/admin/upstream-array-nodes.t b/t/admin/upstream-array-nodes.t index 27966121..d6cfaf01 100644 --- a/t/admin/upstream-array-nodes.t +++ b/t/admin/upstream-array-nodes.t @@ -351,7 +351,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -383,7 +383,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -415,7 +415,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -447,6 +447,6 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the required"} --- no_error_log [error] diff --git a/t/admin/upstream.t b/t/admin/upstream.t index 01e21622..96dcef3c 100644 --- a/t/admin/upstream.t +++ b/t/admin/upstream.t @@ -344,7 +344,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -374,7 +374,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -506,7 +506,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the required"} --- no_error_log [error] @@ -536,7 +536,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"nodes\" validation failed: object matches none of the required"} --- no_error_log [error] diff --git a/t/admin/upstream2.t b/t/admin/upstream2.t index d44e16b6..e7b86703 100644 --- a/t/admin/upstream2.t +++ b/t/admin/upstream2.t @@ -290,6 +290,6 @@ no valid upstream node GET /t --- error_code: 400 --- response_body_like eval -qr/{"error_msg":"invalid configuration: property \\\"timeout\\\" validation failed: property \\\"(connect|send|read)\\\" validation failed: expected 0 to be strictly greater than 0"}/ +qr/{"error_msg":"invalid configuration: property \\\"timeout\\\" validation failed: property \\\"(connect|send|read)\\\" validation failed: expected 0 to be greater than 0"}/ --- no_error_log [error] diff --git a/t/admin/upstream3.t b/t/admin/upstream3.t index 51142a4f..9796a05e 100644 --- a/t/admin/upstream3.t +++ b/t/admin/upstream3.t @@ -88,7 +88,7 @@ __DATA__ } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"retry_timeout\" validation failed: expected -1 to be greater than 0"} +{"error_msg":"invalid configuration: property \"retry_timeout\" validation failed: expected -1 to be at least 0"} diff --git a/t/admin/upstream4.t b/t/admin/upstream4.t index c829fd28..1fc30048 100644 --- a/t/admin/upstream4.t +++ b/t/admin/upstream4.t @@ -142,7 +142,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"} +{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the required"} @@ -197,7 +197,7 @@ passed } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"retries\" validation failed: expected -1 to be greater than 0"} +{"error_msg":"invalid configuration: property \"retries\" validation failed: expected -1 to be at least 0"} diff --git a/t/node/healthcheck-passive.t b/t/node/healthcheck-passive.t index dd34c175..be85ecc9 100644 --- a/t/node/healthcheck-passive.t +++ b/t/node/healthcheck-passive.t @@ -164,4 +164,4 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: object matches none of the requireds: [\"active\"] or [\"active\",\"passive\"]"} +{"error_msg":"invalid configuration: property \"upstream\" validation failed: property \"checks\" validation failed: object matches none of the required: [\"active\"] or [\"active\",\"passive\"]"} diff --git a/t/node/healthcheck.t b/t/node/healthcheck.t index ff69f30f..f11f134c 100644 --- a/t/node/healthcheck.t +++ b/t/node/healthcheck.t @@ -742,7 +742,7 @@ qr/unhealthy TCP increment.*foo.com.*127.0.0.1:1988/ --- request GET /t --- response_body_like eval -qr/expected 0 to be greater than 1/ +qr/expected 0 to be at least 1/ --- error_code chomp 400 @@ -791,7 +791,7 @@ qr/expected 0 to be greater than 1/ --- request GET /t --- response_body_like eval -qr/expected 65536 to be smaller than 65535/ +qr/expected 65536 to be at most 65535/ --- error_code chomp 400 diff --git a/t/node/upstream-keepalive-pool.t b/t/node/upstream-keepalive-pool.t index 3d2e762a..1818ecca 100644 --- a/t/node/upstream-keepalive-pool.t +++ b/t/node/upstream-keepalive-pool.t @@ -72,7 +72,7 @@ __DATA__ } --- error_code: 400 --- response_body -{"error_msg":"invalid configuration: property \"keepalive_pool\" validation failed: property \"size\" validation failed: expected 0 to be greater than 1"} +{"error_msg":"invalid configuration: property \"keepalive_pool\" validation failed: property \"size\" validation failed: expected 0 to be at least 1"} diff --git a/t/plugin/api-breaker.t b/t/plugin/api-breaker.t index 2858f5a4..1dc480cf 100644 --- a/t/plugin/api-breaker.t +++ b/t/plugin/api-breaker.t @@ -178,7 +178,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin api-breaker err: property \"break_response_code\" validation failed: expected 199 to be greater than 200"} +{"error_msg":"failed to check the configuration of plugin api-breaker err: property \"break_response_code\" validation failed: expected 199 to be at least 200"} --- no_error_log [error] diff --git a/t/plugin/authz-keycloak.t b/t/plugin/authz-keycloak.t index 5fce3dd5..add20e5d 100644 --- a/t/plugin/authz-keycloak.t +++ b/t/plugin/authz-keycloak.t @@ -208,7 +208,7 @@ done --- request GET /t --- response_body -allOf 1 failed: object matches none of the requireds: ["discovery"] or ["token_endpoint"] +allOf 1 failed: object matches none of the required: ["discovery"] or ["token_endpoint"] done --- no_error_log [error] @@ -231,7 +231,7 @@ done --- request GET /t --- response_body -allOf 2 failed: object matches none of the requireds: ["client_id"] or ["audience"] +allOf 2 failed: object matches none of the required: ["client_id"] or ["audience"] done --- no_error_log [error] @@ -258,7 +258,7 @@ done --- request GET /t --- response_body -allOf 3 failed: object matches none of the requireds +allOf 3 failed: object matches none of the required done --- no_error_log [error] diff --git a/t/plugin/batch-requests.t b/t/plugin/batch-requests.t index 415369ea..8df3aa94 100644 --- a/t/plugin/batch-requests.t +++ b/t/plugin/batch-requests.t @@ -199,7 +199,7 @@ passed GET /aggregate --- error_code: 400 --- response_body -{"error_msg":"bad request body: object matches none of the requireds: [\"pipeline\"]"} +{"error_msg":"bad request body: object matches none of the required: [\"pipeline\"]"} --- no_error_log [error] @@ -1003,7 +1003,7 @@ passed GET /t --- error_code: 400 --- response_body eval -qr/\{"error_msg":"invalid configuration: property \\"max_body_size\\" validation failed: expected 0 to be strictly greater than 0"\}/ +qr/\{"error_msg":"invalid configuration: property \\"max_body_size\\" validation failed: expected 0 to be greater than 0"\}/ --- no_error_log [error] diff --git a/t/plugin/client-control.t b/t/plugin/client-control.t index 02f74f60..64b8ce9b 100644 --- a/t/plugin/client-control.t +++ b/t/plugin/client-control.t @@ -144,7 +144,7 @@ POST /hello GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin client-control err: property \"max_body_size\" validation failed: expected -1 to be greater than 0"} +{"error_msg":"failed to check the configuration of plugin client-control err: property \"max_body_size\" validation failed: expected -1 to be at least 0"} diff --git a/t/plugin/example.t b/t/plugin/example.t index 8e960911..70a9d617 100644 --- a/t/plugin/example.t +++ b/t/plugin/example.t @@ -87,7 +87,7 @@ done --- request GET /t --- response_body -property "i" validation failed: expected -1 to be greater than 0 +property "i" validation failed: expected -1 to be at least 0 done --- no_error_log [error] diff --git a/t/plugin/gzip.t b/t/plugin/gzip.t index c7688318..93d7db40 100644 --- a/t/plugin/gzip.t +++ b/t/plugin/gzip.t @@ -537,10 +537,10 @@ Vary: upstream, Accept-Encoding } } --- response_body -{"error_msg":"failed to check the configuration of plugin gzip err: property \"types\" validation failed: object matches none of the requireds"} -{"error_msg":"failed to check the configuration of plugin gzip err: property \"min_length\" validation failed: expected 0 to be greater than 1"} -{"error_msg":"failed to check the configuration of plugin gzip err: property \"comp_level\" validation failed: expected 10 to be smaller than 9"} +{"error_msg":"failed to check the configuration of plugin gzip err: property \"types\" validation failed: object matches none of the required"} +{"error_msg":"failed to check the configuration of plugin gzip err: property \"min_length\" validation failed: expected 0 to be at least 1"} +{"error_msg":"failed to check the configuration of plugin gzip err: property \"comp_level\" validation failed: expected 10 to be at most 9"} {"error_msg":"failed to check the configuration of plugin gzip err: property \"http_version\" validation failed: matches none of the enum values"} -{"error_msg":"failed to check the configuration of plugin gzip err: property \"buffers\" validation failed: property \"number\" validation failed: expected 0 to be greater than 1"} -{"error_msg":"failed to check the configuration of plugin gzip err: property \"buffers\" validation failed: property \"size\" validation failed: expected 0 to be greater than 1"} +{"error_msg":"failed to check the configuration of plugin gzip err: property \"buffers\" validation failed: property \"number\" validation failed: expected 0 to be at least 1"} +{"error_msg":"failed to check the configuration of plugin gzip err: property \"buffers\" validation failed: property \"size\" validation failed: expected 0 to be at least 1"} {"error_msg":"failed to check the configuration of plugin gzip err: property \"vary\" validation failed: wrong type: expected boolean, got number"} diff --git a/t/plugin/ip-restriction.t b/t/plugin/ip-restriction.t index dd20e0a1..d2cbc75c 100644 --- a/t/plugin/ip-restriction.t +++ b/t/plugin/ip-restriction.t @@ -86,7 +86,7 @@ GET /t --- request GET /t --- response_body_like eval -qr/failed to validate item 1: object matches none of the requireds/ +qr/failed to validate item 1: object matches none of the required/ --- no_error_log [error] @@ -115,7 +115,7 @@ qr/failed to validate item 1: object matches none of the requireds/ --- request GET /t --- response_body_like eval -qr/failed to validate item 1: object matches none of the requireds/ +qr/failed to validate item 1: object matches none of the required/ --- no_error_log [error] @@ -567,7 +567,7 @@ GET /hello --- request GET /t --- response_body_like eval -qr/failed to validate item 1: object matches none of the requireds/ +qr/failed to validate item 1: object matches none of the required/ --- no_error_log [error] diff --git a/t/plugin/kafka-logger2.t b/t/plugin/kafka-logger2.t index c78da6f5..77bcbbff 100644 --- a/t/plugin/kafka-logger2.t +++ b/t/plugin/kafka-logger2.t @@ -359,8 +359,8 @@ qr/not found topic, retryable: true, topic: undefined_topic, partition_id: -1/ --- response_body property "broker_list" validation failed: expect object to have at least 1 properties property "broker_list" validation failed: failed to validate 127.0.0.1 (matching ".*"): wrong type: expected integer, got string -property "broker_list" validation failed: failed to validate 127.0.0.1 (matching ".*"): expected 0 to be greater than 1 -property "broker_list" validation failed: failed to validate 127.0.0.1 (matching ".*"): expected 65536 to be smaller than 65535 +property "broker_list" validation failed: failed to validate 127.0.0.1 (matching ".*"): expected 0 to be at least 1 +property "broker_list" validation failed: failed to validate 127.0.0.1 (matching ".*"): expected 65536 to be at most 65535 diff --git a/t/plugin/limit-conn.t b/t/plugin/limit-conn.t index fe480f65..e5b89344 100644 --- a/t/plugin/limit-conn.t +++ b/t/plugin/limit-conn.t @@ -428,7 +428,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-conn err: property \"conn\" validation failed: expected -1 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-conn err: property \"conn\" validation failed: expected -1 to be greater than 0"} --- no_error_log [error] @@ -511,7 +511,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-conn err: property \"conn\" validation failed: expected -1 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-conn err: property \"conn\" validation failed: expected -1 to be greater than 0"} --- no_error_log [error] @@ -980,8 +980,8 @@ GET /test_concurrency --- request GET /t --- response_body -property "conn" validation failed: expected 0 to be strictly greater than 0 -property "default_conn_delay" validation failed: expected 0 to be strictly greater than 0 +property "conn" validation failed: expected 0 to be greater than 0 +property "default_conn_delay" validation failed: expected 0 to be greater than 0 done --- no_error_log [error] diff --git a/t/plugin/limit-count.t b/t/plugin/limit-count.t index b04642a6..671443dc 100644 --- a/t/plugin/limit-count.t +++ b/t/plugin/limit-count.t @@ -268,7 +268,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be greater than 0"} --- no_error_log [error] @@ -310,7 +310,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be greater than 0"} --- no_error_log [error] @@ -390,7 +390,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be greater than 0"} --- no_error_log [error] @@ -431,7 +431,7 @@ GET /t GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-count err: property \"count\" validation failed: expected -100 to be greater than 0"} --- no_error_log [error] @@ -1345,7 +1345,7 @@ passed --- request GET /t --- response_body eval -qr/property \"count\" validation failed: expected 0 to be strictly greater than 0/ +qr/property \"count\" validation failed: expected 0 to be greater than 0/ --- no_error_log [error] @@ -1367,6 +1367,6 @@ qr/property \"count\" validation failed: expected 0 to be strictly greater than --- request GET /t --- response_body eval -qr/property \"time_window\" validation failed: expected 0 to be strictly greater than 0/ +qr/property \"time_window\" validation failed: expected 0 to be greater than 0/ --- no_error_log [error] diff --git a/t/plugin/limit-req.t b/t/plugin/limit-req.t index d0634cb8..976fb2ce 100644 --- a/t/plugin/limit-req.t +++ b/t/plugin/limit-req.t @@ -290,7 +290,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin limit-req err: property \"rate\" validation failed: expected -1 to be strictly greater than 0"} +{"error_msg":"failed to check the configuration of plugin limit-req err: property \"rate\" validation failed: expected -1 to be greater than 0"} --- no_error_log [error] @@ -756,6 +756,6 @@ passed --- request GET /t --- response_body eval -qr/property \"rate\" validation failed: expected 0 to be strictly greater than 0/ +qr/property \"rate\" validation failed: expected 0 to be greater than 0/ --- no_error_log [error] diff --git a/t/plugin/proxy-mirror.t b/t/plugin/proxy-mirror.t index a5522804..2c0e2e8e 100644 --- a/t/plugin/proxy-mirror.t +++ b/t/plugin/proxy-mirror.t @@ -482,7 +482,7 @@ passed GET /t --- error_code: 400 --- response_body -{"error_msg":"failed to check the configuration of plugin proxy-mirror err: property \"sample_ratio\" validation failed: expected 10 to be smaller than 1"} +{"error_msg":"failed to check the configuration of plugin proxy-mirror err: property \"sample_ratio\" validation failed: expected 10 to be at most 1"} --- no_error_log [error] diff --git a/t/plugin/real-ip.t b/t/plugin/real-ip.t index 45e9de7f..5df38137 100644 --- a/t/plugin/real-ip.t +++ b/t/plugin/real-ip.t @@ -83,7 +83,7 @@ __DATA__ } --- response_body {"error_msg":"failed to check the configuration of plugin real-ip err: property \"source\" is required"} -{"error_msg":"failed to check the configuration of plugin real-ip err: property \"trusted_addresses\" validation failed: failed to validate item 1: object matches none of the requireds"} +{"error_msg":"failed to check the configuration of plugin real-ip err: property \"trusted_addresses\" validation failed: failed to validate item 1: object matches none of the required"} {"error_msg":"failed to check the configuration of plugin real-ip err: invalid ip address: ::1\/129"} diff --git a/t/plugin/request-validation.t b/t/plugin/request-validation.t index 2893d085..92f81089 100644 --- a/t/plugin/request-validation.t +++ b/t/plugin/request-validation.t @@ -62,7 +62,7 @@ done --- request GET /t --- response_body_like eval -qr/object matches none of the requireds/ +qr/object matches none of the required/ --- no_error_log [error] @@ -1652,7 +1652,7 @@ qr/string too long/ --- request GET /t --- response_body_like eval -qr/object matches none of the requireds/ +qr/object matches none of the required/ --- error_code: 400 --- no_error_log [error] @@ -1776,7 +1776,7 @@ qr/opentracing/ --- request GET /t --- response_body_like eval -qr/expected 10000 to be smaller than 599/ +qr/expected 10000 to be at most 599/ --- error_code: 400 --- no_error_log [error] @@ -1813,7 +1813,7 @@ qr/expected 10000 to be smaller than 599/ --- request GET /t --- response_body_like eval -qr/object matches none of the requireds/ +qr/object matches none of the required/ --- error_code: 400 --- no_error_log [error] diff --git a/t/plugin/response-rewrite.t b/t/plugin/response-rewrite.t index bdc54cae..ebde0d05 100644 --- a/t/plugin/response-rewrite.t +++ b/t/plugin/response-rewrite.t @@ -79,7 +79,7 @@ done --- request GET /t --- response_body -property "status_code" validation failed: expected 599 to be smaller than 598 +property "status_code" validation failed: expected 599 to be at most 598 --- no_error_log [error] diff --git a/t/plugin/zipkin.t b/t/plugin/zipkin.t index 5465ac0e..04b587ab 100644 --- a/t/plugin/zipkin.t +++ b/t/plugin/zipkin.t @@ -62,7 +62,7 @@ done --- request GET /t --- response_body -property "sample_ratio" validation failed: expected -0.1 to be greater than 1e-05 +property "sample_ratio" validation failed: expected -0.1 to be at least 1e-05 done --- no_error_log [error] @@ -85,7 +85,7 @@ done --- request GET /t --- response_body -property "sample_ratio" validation failed: expected 2 to be smaller than 1 +property "sample_ratio" validation failed: expected 2 to be at most 1 done --- no_error_log [error]