This is an automated email from the ASF dual-hosted git repository.
membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 4ebccaf chore: fix spelling (#3253)
4ebccaf is described below
commit 4ebccafbdc7535242c675466337aa7dc942613cc
Author: John Bampton <jbamp...@users.noreply.github.com>
AuthorDate: Mon Mar 15 00:53:34 2021 +1000
chore: fix spelling (#3253)
---
.travis/linux_openresty_common_runner.sh | 2 +-
apisix/core/config_util.lua | 2 +-
apisix/plugins/api-breaker.lua | 2 +-
apisix/plugins/http-logger.lua | 6 +++---
docs/en/latest/control-api.md | 2 +-
docs/en/latest/plugins/api-breaker.md | 2 +-
docs/en/latest/plugins/limit-count.md | 2 +-
docs/en/latest/plugins/request-validation.md | 2 +-
docs/en/latest/plugins/sls-logger.md | 2 +-
rockspec/apisix-master-0.rockspec | 2 +-
t/admin/routes.t | 2 +-
t/admin/upstream2.t | 2 +-
t/config-center-yaml/consumer.t | 2 +-
t/control/schema.t | 2 +-
t/core/config.t | 2 +-
t/node/chash-hashon.t | 2 +-
t/node/grpc-proxy.t | 2 +-
t/node/healthcheck-ipv6.t | 2 +-
t/plugin/batch-requests.t | 12 ++++++------
t/plugin/cors.t | 2 +-
t/plugin/echo.t | 4 ++--
t/plugin/fault-injection.t | 2 +-
t/plugin/limit-conn.t | 8 ++++----
t/plugin/limit-count.t | 12 ++++++------
t/plugin/limit-req.t | 4 ++--
t/plugin/log-rotate.t | 2 +-
t/plugin/prometheus2.t | 2 +-
t/router/graphql.t | 2 +-
28 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/.travis/linux_openresty_common_runner.sh
b/.travis/linux_openresty_common_runner.sh
index bb2b254..d6ed7b6 100755
--- a/.travis/linux_openresty_common_runner.sh
+++ b/.travis/linux_openresty_common_runner.sh
@@ -124,7 +124,7 @@ apisix:
./bin/apisix init_etcd
./bin/apisix start
- #start again --> fial
+ #start again --> fail
res=`./bin/apisix start`
if ! echo "$res" | grep "APISIX is running"; then
echo "failed: APISIX runs repeatedly"
diff --git a/apisix/core/config_util.lua b/apisix/core/config_util.lua
index cc29ea4..b02d464 100644
--- a/apisix/core/config_util.lua
+++ b/apisix/core/config_util.lua
@@ -46,7 +46,7 @@ end
-- Add a clean handler to a runtime configuration item.
-- The clean handler will be called when the item is deleted from configuration
-- or cancelled. Note that Nginx worker exit doesn't trigger the clean handler.
--- Retuen an index so that we can cancel it later.
+-- Return an index so that we can cancel it later.
function _M.add_clean_handler(item, func)
local idx = #item.clean_handlers + 1
item.clean_handlers[idx] = func
diff --git a/apisix/plugins/api-breaker.lua b/apisix/plugins/api-breaker.lua
index ec2f567..af3856b 100644
--- a/apisix/plugins/api-breaker.lua
+++ b/apisix/plugins/api-breaker.lua
@@ -100,7 +100,7 @@ end
local function gen_lasttime_key(ctx)
- return "unhealthy-lastime" .. core.request.get_host(ctx) .. ctx.var.uri
+ return "unhealthy-lasttime" .. core.request.get_host(ctx) .. ctx.var.uri
end
diff --git a/apisix/plugins/http-logger.lua b/apisix/plugins/http-logger.lua
index 90d3a69..3437046 100644
--- a/apisix/plugins/http-logger.lua
+++ b/apisix/plugins/http-logger.lua
@@ -249,10 +249,10 @@ function _M.log(conf, ctx)
data, err = core.json.encode(entries[1]) -- encode as single {}
else
local t = core.table.new(#entries, 0)
- for i, entrie in ipairs(entries) do
- t[i], err = core.json.encode(entrie)
+ for i, entry in ipairs(entries) do
+ t[i], err = core.json.encode(entry)
if err then
- core.log.warn("failed to encode http log: ", err, ",
log data: ", entrie)
+ core.log.warn("failed to encode http log: ", err, ",
log data: ", entry)
break
end
end
diff --git a/docs/en/latest/control-api.md b/docs/en/latest/control-api.md
index 4efd872..d346163 100644
--- a/docs/en/latest/control-api.md
+++ b/docs/en/latest/control-api.md
@@ -81,7 +81,7 @@ Return the jsonschema used by this APISIX instance in the
format below:
```
For `plugins` part, only enabled plugins will be returned. Some plugins may
lack
-of fields like `consumer_schema` or `type`, it is dependended by the plugin's
+of fields like `consumer_schema` or `type`, it is depended on by the plugin's
definition.
### GET /v1/healthcheck
diff --git a/docs/en/latest/plugins/api-breaker.md
b/docs/en/latest/plugins/api-breaker.md
index a46d2c8..c54870f 100644
--- a/docs/en/latest/plugins/api-breaker.md
+++ b/docs/en/latest/plugins/api-breaker.md
@@ -39,7 +39,7 @@ the code logic automatically **triggers the unhealthy state**
incrementation of
Whenever the upstream service returns a status code from the
`unhealthy.http_statuses` configuration (e.g., 500), up to `unhealthy.failures`
(e.g., three times) and considers the upstream service to be in an unhealthy
state.
-The first time unhealthy status is triggered, **breaken for 2 seconds**.
+The first time unhealthy status is triggered, **broken for 2 seconds**.
Then, the request is forwarded to the upstream service again after 2 seconds,
and if the `unhealthy.http_statuses` status code is returned, and the count
reaches `unhealthy.failures` again, **broken for 4 seconds**.
diff --git a/docs/en/latest/plugins/limit-count.md
b/docs/en/latest/plugins/limit-count.md
index 75306d0..9540996 100644
--- a/docs/en/latest/plugins/limit-count.md
+++ b/docs/en/latest/plugins/limit-count.md
@@ -45,7 +45,7 @@ Limit request rate by a fixed number of requests in a given
time window.
| redis_host | string | required for `redis` | |
| When using the `redis` policy, this property specifies the
address of the Redis server.
|
| redis_port | integer | optional | 6379 |
[1,...]
| When using the `redis` policy, this property
specifies the port of the Redis server.
|
| redis_password | string | optional | |
| When using the `redis` policy, this property specifies the
password of the Redis server.
|
-| redis_database | integer | optional | 0 |
redis_database >= 0
| When using the `redis` policy, this property
specifies the datatabase you selected of the Redis server, and only for non
Redis cluster mode (single instance mode or Redis public cloud service that
provides single entry).
|
+| redis_database | integer | optional | 0 |
redis_database >= 0
| When using the `redis` policy, this property
specifies the database you selected of the Redis server, and only for non Redis
cluster mode (single instance mode or Redis public cloud service that provides
single entry).
|
| redis_timeout | integer | optional | 1000 |
[1,...]
| When using the `redis` policy, this property
specifies the timeout in milliseconds of any command submitted to the Redis
server.
|
| redis_cluster_nodes | array | optional | |
| When using `redis-cluster` policy，This property is a list
of addresses of Redis cluster service nodes.
|
diff --git a/docs/en/latest/plugins/request-validation.md
b/docs/en/latest/plugins/request-validation.md
index 9b36fef..94b651f 100644
--- a/docs/en/latest/plugins/request-validation.md
+++ b/docs/en/latest/plugins/request-validation.md
@@ -114,7 +114,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/5 -H
'X-API-KEY: edd1c9f034335f13
"type": "object",
"required": ["required_payload"],
"properties": {
- "emum_payload": {
+ "enum_payload": {
"type": "string",
"enum": ["enum_string_1", "enum_string_2"],
"default": "enum_string_1"
diff --git a/docs/en/latest/plugins/sls-logger.md
b/docs/en/latest/plugins/sls-logger.md
index 0569dd8..bc3834a 100644
--- a/docs/en/latest/plugins/sls-logger.md
+++ b/docs/en/latest/plugins/sls-logger.md
@@ -42,7 +42,7 @@ For more info on Batch-Processor in Apache APISIX please refer
|Name |Requirement |Description|
|--------- |-------- |-----------|
-|host |required | IP address or the Hostname of the TCP
server, please reference ali cloud log [Serve
List](https://help.aliyun.com/document_detail/29008.html?spm=a2c4g.11186623.2.14.49301b4793uX0z#reference-wgx-pwq-zdb),
use IP address insted of domain.|
+|host |required | IP address or the Hostname of the TCP
server, please reference ali cloud log [Serve
List](https://help.aliyun.com/document_detail/29008.html?spm=a2c4g.11186623.2.14.49301b4793uX0z#reference-wgx-pwq-zdb),
use IP address instead of domain.|
|port |required |Target upstream port, default 10009.|
|timeout |optional |Timeout for the upstream to send data.|
| project |required|Ali cloud log service project name，please create in sls
before us this plugin.|
diff --git a/rockspec/apisix-master-0.rockspec
b/rockspec/apisix-master-0.rockspec
index d7bc0dd..2cd730c 100644
--- a/rockspec/apisix-master-0.rockspec
+++ b/rockspec/apisix-master-0.rockspec
@@ -50,7 +50,7 @@ dependencies = {
"luafilesystem = 1.7.0-2",
"lua-tinyyaml = 1.0",
"nginx-lua-prometheus = 0.20201218",
- "jsonschema = 0.9.3",
+ "jsonschema = 0.9.4",
"lua-resty-ipmatcher = 0.6",
"lua-resty-kafka = 0.07",
"lua-resty-logger-socket = 2.0-0",
diff --git a/t/admin/routes.t b/t/admin/routes.t
index c96e9c4..a7a0b8a 100644
--- a/t/admin/routes.t
+++ b/t/admin/routes.t
@@ -2016,7 +2016,7 @@ GET /t
-=== TEST 54: Verify Response Content-Type=applciation/json
+=== TEST 54: Verify Response Content-Type=application/json
--- config
location /t {
content_by_lua_block {
diff --git a/t/admin/upstream2.t b/t/admin/upstream2.t
index 1de8381..2ad36f5 100644
--- a/t/admin/upstream2.t
+++ b/t/admin/upstream2.t
@@ -288,6 +288,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 sctrictly greater than 0"}/
+qr/{"error_msg":"invalid configuration: property \\\"timeout\\\" validation
failed: property \\\"(connect|send|read)\\\" validation failed: expected 0 to
be strictly greater than 0"}/
--- no_error_log
[error]
diff --git a/t/config-center-yaml/consumer.t b/t/config-center-yaml/consumer.t
index f0c1b16..1f1493e 100644
--- a/t/config-center-yaml/consumer.t
+++ b/t/config-center-yaml/consumer.t
@@ -101,7 +101,7 @@ GET /apisix/plugin/jwt/sign?key=user-key
-=== TEST 4: consummer restriction
+=== TEST 4: consumer restriction
--- apisix_yaml
consumers:
- username: jack
diff --git a/t/control/schema.t b/t/control/schema.t
index ebb72cb..166fea8 100644
--- a/t/control/schema.t
+++ b/t/control/schema.t
@@ -90,7 +90,7 @@ __DATA__
}
}]]
)
- ngx.satus = code
+ ngx.status = code
ngx.say(body)
}
}
diff --git a/t/core/config.t b/t/core/config.t
index e4cd543..a8e998e 100644
--- a/t/core/config.t
+++ b/t/core/config.t
@@ -147,7 +147,7 @@ bool:
float:
canonical: 6.8523015e+5
- exponentioal: 685.230_15e+03
+ exponential: 685.230_15e+03
fixed: 685_230.15
sexagesimal: 190:20:30.15
negative infinity: -.inf
diff --git a/t/node/chash-hashon.t b/t/node/chash-hashon.t
index ae81bc4..a9770d8 100644
--- a/t/node/chash-hashon.t
+++ b/t/node/chash-hashon.t
@@ -66,7 +66,7 @@ __DATA__
)
if code ~= 200 then
- ngx.say("create comsume jack failed")
+ ngx.say("create consumer jack failed")
return
end
ngx.say(code .. " " ..body)
diff --git a/t/node/grpc-proxy.t b/t/node/grpc-proxy.t
index f544b85..00ebcb7 100644
--- a/t/node/grpc-proxy.t
+++ b/t/node/grpc-proxy.t
@@ -67,7 +67,7 @@ proxy request to 127.0.0.1:9088
-=== TEST 2: with consummer
+=== TEST 2: with consumer
--- apisix_yaml
consumers:
- username: jack
diff --git a/t/node/healthcheck-ipv6.t b/t/node/healthcheck-ipv6.t
index 75542b3..b906966 100644
--- a/t/node/healthcheck-ipv6.t
+++ b/t/node/healthcheck-ipv6.t
@@ -29,7 +29,7 @@ use t::APISIX;
my $travis_os_name = $ENV{TRAVIS_OS_NAME};
if ((defined $travis_os_name) && $travis_os_name eq "linux") {
plan(skip_all =>
- "skip under Travis CI inux environment which doesn't work well with
IPv6");
+ "skip under Travis CI Linux environment which doesn't work well with
IPv6");
} else {
plan 'no_plan';
}
diff --git a/t/plugin/batch-requests.t b/t/plugin/batch-requests.t
index c6816d0..e341b87 100644
--- a/t/plugin/batch-requests.t
+++ b/t/plugin/batch-requests.t
@@ -100,7 +100,7 @@ __DATA__
]]=],
{
ConflictHeader = "outer_header",
- OuterConflict = "outer_confliect"
+ OuterConflict = "outer_conflict"
})
ngx.status = code
@@ -151,7 +151,7 @@ passed
-=== TEST 2: missing pipeling
+=== TEST 2: missing pipeline
--- config
location = /aggregate {
content_by_lua_block {
@@ -463,7 +463,7 @@ GET /aggregate
local t = require("lib.test_admin").test
local code, body = t('/apisix/batch-requests',
ngx.HTTP_POST,
- "invaild json string"
+ "invalid json string"
)
ngx.status = code
@@ -474,7 +474,7 @@ GET /aggregate
GET /aggregate
--- error_code: 400
--- response_body
-{"error_msg":"invalid request body: invaild json string, err: Expected value
but found invalid token at character 1"}
+{"error_msg":"invalid request body: invalid json string, err: Expected value
but found invalid token at character 1"}
--- no_error_log
[error]
@@ -693,7 +693,7 @@ passed
-=== TEST 15: copy all header to every request except Contenct-
+=== TEST 15: copy all header to every request except content
--- config
client_body_in_file_only on;
location = /aggregate {
@@ -988,7 +988,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 sctrictly greater than 0"\}/
+qr/\{"error_msg":"invalid configuration: property \\"max_body_size\\"
validation failed: expected 0 to be strictly greater than 0"\}/
--- no_error_log
[error]
diff --git a/t/plugin/cors.t b/t/plugin/cors.t
index 97bfc42..ec6166c 100644
--- a/t/plugin/cors.t
+++ b/t/plugin/cors.t
@@ -434,7 +434,7 @@ OPTIONS /hello HTTP/1.1
-=== TEST 15: set route(auth plugins faills)
+=== TEST 15: set route(auth plugins fails)
--- config
location /t {
content_by_lua_block {
diff --git a/t/plugin/echo.t b/t/plugin/echo.t
index 196b0b6..97103a4 100644
--- a/t/plugin/echo.t
+++ b/t/plugin/echo.t
@@ -249,7 +249,7 @@ Location: https://www.iresty.com
"plugins": {
"echo": {
"before_body": "before the body modification ",
- "auth_value" : "userpasswrd",
+ "auth_value" : "userpassword",
"headers": {
"Location":"https://www.iresty.com";
}
@@ -269,7 +269,7 @@ Location: https://www.iresty.com
"plugins": {
"echo": {
"before_body": "before the body modification ",
- "auth_value" : "userpasswrd",
+ "auth_value" : "userpassword",
"headers": {
"Location":"https://www.iresty.com";
}
diff --git a/t/plugin/fault-injection.t b/t/plugin/fault-injection.t
index d0469f5..9a8fdf9 100644
--- a/t/plugin/fault-injection.t
+++ b/t/plugin/fault-injection.t
@@ -227,7 +227,7 @@ qr/wrong type: expected number, got string/
-=== TEST 6: set route(invalid duration with duoble dot in the delay property)
+=== TEST 6: set route(invalid duration with double dot in the delay property)
--- config
location /t {
content_by_lua_block {
diff --git a/t/plugin/limit-conn.t b/t/plugin/limit-conn.t
index e9e963e..c4089b0 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 sctrictly greater than
0"}
+{"error_msg":"failed to check the configuration of plugin limit-conn err:
property \"conn\" validation failed: expected -1 to be strictly 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 sctrictly greater than
0"}
+{"error_msg":"failed to check the configuration of plugin limit-conn err:
property \"conn\" validation failed: expected -1 to be strictly 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 sctrictly greater than 0
-property "default_conn_delay" validation failed: expected 0 to be sctrictly
greater than 0
+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
done
--- no_error_log
[error]
diff --git a/t/plugin/limit-count.t b/t/plugin/limit-count.t
index 3a5f8a5..e8fa286 100644
--- a/t/plugin/limit-count.t
+++ b/t/plugin/limit-count.t
@@ -269,7 +269,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 sctrictly greater
than 0"}
+{"error_msg":"failed to check the configuration of plugin limit-count err:
property \"count\" validation failed: expected -100 to be strictly greater than
0"}
--- no_error_log
[error]
@@ -311,7 +311,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 sctrictly greater
than 0"}
+{"error_msg":"failed to check the configuration of plugin limit-count err:
property \"count\" validation failed: expected -100 to be strictly greater than
0"}
--- no_error_log
[error]
@@ -391,7 +391,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 sctrictly greater
than 0"}
+{"error_msg":"failed to check the configuration of plugin limit-count err:
property \"count\" validation failed: expected -100 to be strictly greater than
0"}
--- no_error_log
[error]
@@ -432,7 +432,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 sctrictly greater
than 0"}
+{"error_msg":"failed to check the configuration of plugin limit-count err:
property \"count\" validation failed: expected -100 to be strictly greater than
0"}
--- no_error_log
[error]
@@ -1346,7 +1346,7 @@ passed
--- request
GET /t
--- response_body eval
-qr/property \"count\" validation failed: expected 0 to be sctrictly greater
than 0/
+qr/property \"count\" validation failed: expected 0 to be strictly greater
than 0/
--- no_error_log
[error]
@@ -1368,6 +1368,6 @@ qr/property \"count\" validation failed: expected 0 to be
sctrictly greater than
--- request
GET /t
--- response_body eval
-qr/property \"time_window\" validation failed: expected 0 to be sctrictly
greater than 0/
+qr/property \"time_window\" validation failed: expected 0 to be strictly
greater than 0/
--- no_error_log
[error]
diff --git a/t/plugin/limit-req.t b/t/plugin/limit-req.t
index 655073e..dd1a355 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 sctrictly greater than
0"}
+{"error_msg":"failed to check the configuration of plugin limit-req err:
property \"rate\" validation failed: expected -1 to be strictly greater than 0"}
--- no_error_log
[error]
@@ -757,6 +757,6 @@ passed
--- request
GET /t
--- response_body eval
-qr/property \"rate\" validation failed: expected 0 to be sctrictly greater
than 0/
+qr/property \"rate\" validation failed: expected 0 to be strictly greater than
0/
--- no_error_log
[error]
diff --git a/t/plugin/log-rotate.t b/t/plugin/log-rotate.t
index 29b66ef..2e64e35 100644
--- a/t/plugin/log-rotate.t
+++ b/t/plugin/log-rotate.t
@@ -131,7 +131,7 @@ start xxxxxx
end)
if counter ~= 1 then
- ngx.say("not a single rotater run at the same time: ",
file_name)
+ ngx.say("not a single rotator run at the same time: ",
file_name)
end
end
end
diff --git a/t/plugin/prometheus2.t b/t/plugin/prometheus2.t
index 1189855..4bd169c 100644
--- a/t/plugin/prometheus2.t
+++ b/t/plugin/prometheus2.t
@@ -584,7 +584,7 @@ passed
-=== TEST 29: tigger metircs batch-process-metrics
+=== TEST 29: trigger metrics batch-process-metrics
--- request
GET /batch-process-metrics-10
--- error_code: 404
diff --git a/t/router/graphql.t b/t/router/graphql.t
index 618b5ac..d608403 100644
--- a/t/router/graphql.t
+++ b/t/router/graphql.t
@@ -172,7 +172,7 @@ failed to parse graphql: Syntax error near line 1 body: AA
-=== TEST 8: set anonymous operaion name
+=== TEST 8: set anonymous operation name
--- config
location /t {
content_by_lua_block {
