Skip to content

Commit

Permalink
chore: fix spelling (#3253)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbampton authored Mar 14, 2021
1 parent e957bc3 commit 4ebccaf
Show file tree
Hide file tree
Showing 28 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .travis/linux_openresty_common_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion apisix/core/config_util.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apisix/plugins/api-breaker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
6 changes: 3 additions & 3 deletions apisix/plugins/http-logger.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/control-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/plugins/api-breaker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**.

Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/plugins/limit-count.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. |

Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/plugins/request-validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/plugins/sls-logger.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.|
Expand Down
2 changes: 1 addition & 1 deletion rockspec/apisix-master-0.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion t/admin/routes.t
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion t/admin/upstream2.t
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion t/config-center-yaml/consumer.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/control/schema.t
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ __DATA__
}
}]]
)
ngx.satus = code
ngx.status = code
ngx.say(body)
}
}
Expand Down
2 changes: 1 addition & 1 deletion t/core/config.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/node/chash-hashon.t
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion t/node/grpc-proxy.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/node/healthcheck-ipv6.t
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand Down
12 changes: 6 additions & 6 deletions t/plugin/batch-requests.t
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ __DATA__
]]=],
{
ConflictHeader = "outer_header",
OuterConflict = "outer_confliect"
OuterConflict = "outer_conflict"
})
ngx.status = code
Expand Down Expand Up @@ -151,7 +151,7 @@ passed



=== TEST 2: missing pipeling
=== TEST 2: missing pipeline
--- config
location = /aggregate {
content_by_lua_block {
Expand Down Expand Up @@ -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
Expand All @@ -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]

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion t/plugin/cors.t
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions t/plugin/echo.t
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion t/plugin/fault-injection.t
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions t/plugin/limit-conn.t
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
12 changes: 6 additions & 6 deletions t/plugin/limit-count.t
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down Expand Up @@ -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]

Expand Down Expand Up @@ -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]

Expand Down Expand Up @@ -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]

Expand Down Expand Up @@ -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]
Expand All @@ -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]
4 changes: 2 additions & 2 deletions t/plugin/limit-req.t
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down Expand Up @@ -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]
2 changes: 1 addition & 1 deletion t/plugin/log-rotate.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/plugin/prometheus2.t
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/router/graphql.t
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 4ebccaf

Please sign in to comment.