test/apisix
1
0
Fork 0
mirror of https://gitee.com/iresty/apisix.git synced 2024-12-15 01:11:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
0c1b208588
apisix/t/admin/services.t

1462 lines
38 KiB
Perl
Raw Normal View History

license: add ASF header. (#743)
2019-10-31 09:27:28 +08:00
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
change(test): name style.
2019-09-10 09:42:55 +08:00
use t::APISIX 'no_plan';
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
repeat_each(1);
no_long_string();
no_root_location();
no_shuffle();
log_level("info");
run_tests;
__DATA__
=== TEST 1: set service(id: 1)
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
feat: generate create/update_time automatically (#2740)
2020-11-15 17:20:51 +08:00
local etcd = require("apisix.core.etcd")
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
feature: added desc for upstream and service in schema. (#289)
2019-07-22 10:42:02 +08:00
},
"desc": "new service"
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
feature: added desc for upstream and service in schema. (#289)
2019-07-22 10:42:02 +08:00
},
"desc": "new service"
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
},
"key": "/apisix/services/1"
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
feat: generate create/update_time automatically (#2740)
2020-11-15 17:20:51 +08:00
local res = assert(etcd.get('/services/1'))
local create_time = res.body.node.value.create_time
assert(create_time ~= nil, "create_time is nil")
local update_time = res.body.node.value.update_time
assert(update_time ~= nil, "update_time is nil")
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
=== TEST 2: get service(id: 1)
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_GET,
nil,
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
feature: added desc for upstream and service in schema. (#289)
2019-07-22 10:42:02 +08:00
},
"desc": "new service"
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
},
"key": "/apisix/services/1"
},
"action": "get"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
=== TEST 3: delete service(id: 1)
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, message = t('/apisix/admin/services/1',
ngx.HTTP_DELETE,
nil,
[[{
"action": "delete"
}]]
)
ngx.say("[delete] code: ", code, " message: ", message)
}
}
--- request
GET /t
--- response_body
[delete] code: 200 message: passed
--- no_error_log
[error]
=== TEST 4: delete service(id: not_found)
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code = t('/apisix/admin/services/not_found',
ngx.HTTP_DELETE,
nil,
[[{
"action": "delete"
}]]
)
ngx.say("[delete] code: ", code)
}
}
--- request
GET /t
--- response_body
[delete] code: 404
--- no_error_log
[error]
test: fixed typo in test cases #508 (#853)
2019-11-14 12:37:46 +08:00
=== TEST 5: post service + delete
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
feat: generate create/update_time automatically (#2740)
2020-11-15 17:20:51 +08:00
local etcd = require("apisix.core.etcd")
change: merged the similar code, and not allowed to specify id when use POST method. (#128) * change: merged the similar code, and not allowed to specify id when use POST method.
2019-06-18 16:15:55 +08:00
local code, message, res = t('/apisix/admin/services',
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
ngx.HTTP_POST,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
}
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
}
}
},
"action": "create"
}]]
)
if code ~= 200 then
ngx.status = code
ngx.say(message)
return
end
ngx.say("[push] code: ", code, " message: ", message)
local id = string.sub(res.node.key, #"/apisix/services/" + 1)
feat: generate create/update_time automatically (#2740)
2020-11-15 17:20:51 +08:00
local res = assert(etcd.get('/services/' .. id))
local create_time = res.body.node.value.create_time
assert(create_time ~= nil, "create_time is nil")
local update_time = res.body.node.value.update_time
assert(update_time ~= nil, "update_time is nil")
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
code, message = t('/apisix/admin/services/' .. id,
ngx.HTTP_DELETE,
nil,
[[{
"action": "delete"
}]]
)
ngx.say("[delete] code: ", code, " message: ", message)
}
}
--- request
GET /t
--- response_body
[push] code: 200 message: passed
[delete] code: 200 message: passed
--- no_error_log
[error]
=== TEST 6: uri + upstream
--- config
location /t {
content_by_lua_block {
local core = require("apisix.core")
local t = require("lib.test_admin").test
local code, message, res = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
}
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
}
}
},
"action": "set"
}]]
)
if code ~= 200 then
ngx.status = code
ngx.say(message)
return
end
ngx.say("[push] code: ", code, " message: ", message)
}
}
--- request
GET /t
--- response_body
[push] code: 200 message: passed
--- no_error_log
[error]
=== TEST 7: uri + plugins
--- config
location /t {
content_by_lua_block {
local core = require("apisix.core")
local t = require("lib.test_admin").test
local code, message, res = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"plugins": {
"limit-count": {
"count": 2,
"time_window": 60,
"rejected_code": 503,
"key": "remote_addr"
}
}
}]],
[[{
"node": {
"value": {
"plugins": {
"limit-count": {
"count": 2,
"time_window": 60,
"rejected_code": 503,
"key": "remote_addr"
}
}
}
},
"action": "set"
}]]
)
if code ~= 200 then
ngx.status = code
ngx.say(message)
return
end
ngx.say("[push] code: ", code, " message: ", message)
}
}
--- request
GET /t
--- response_body
[push] code: 200 message: passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 8: invalid service id
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
feat: support saving k8s deployment info to upstream (#1502) * feat: support save k8s deployment info to upstream
2020-04-27 10:47:17 +08:00
local code, body = t('/apisix/admin/services/invalid_id$',
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
ngx.HTTP_PUT,
[[{
"plugins": {
"limit-count": {
"count": 2,
"time_window": 60,
"rejected_code": 503,
"key": "remote_addr"
}
}
}]]
)
ngx.exit(code)
}
}
--- request
GET /t
feature: added admin api for consumer. (#135)
2019-06-19 19:14:58 +08:00
--- error_code: 400
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 9: invalid id
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"id": 3,
"plugins": {}
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"wrong service id"}
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 10: id in the rule
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_PUT,
[[{
"id": "1",
"plugins": {}
}]],
[[{
"node": {
"value": {
"plugins": {}
},
"key": "/apisix/services/1"
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 11: integer id less than 1
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_PUT,
[[{
"id": -100,
"plugins": {}
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
optimize: updated the error message after updated new `jsonschema`. (#1011)
2020-01-02 21:56:42 +08:00
{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"}
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 12: invalid service id: string value
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_PUT,
[[{
feat: support saving k8s deployment info to upstream (#1502) * feat: support save k8s deployment info to upstream
2020-04-27 10:47:17 +08:00
"id": "invalid_id$",
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
"plugins": {}
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
optimize: updated the error message after updated new `jsonschema`. (#1011)
2020-01-02 21:56:42 +08:00
{"error_msg":"invalid configuration: property \"id\" validation failed: object matches none of the requireds"}
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 13: no additional properties is valid
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_PUT,
[[{
"id": 1,
"invalid_property": "/index.html"
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
change: used `lua-resty-jsonschema` instead of `lua-rapidjson`. (#703)
2019-10-23 12:58:10 +08:00
{"error_msg":"invalid configuration: additional properties forbidden, found invalid_property"}
feature: use schema check for service configuration. Fix #111.
2019-06-16 12:40:20 +08:00
--- no_error_log
[error]
feature: checked the upstream id in route or service. (#114) * feature: checked the upstream id in route or service.
2019-06-17 11:45:04 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 14: invalid upstream_id
feature: checked the upstream id in route or service. (#114) * feature: checked the upstream id in route or service.
2019-06-17 11:45:04 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_PUT,
[[{
"id": 1,
feat: support saving k8s deployment info to upstream (#1502) * feat: support save k8s deployment info to upstream
2020-04-27 10:47:17 +08:00
"upstream_id": "invalid$"
feature: checked the upstream id in route or service. (#114) * feature: checked the upstream id in route or service.
2019-06-17 11:45:04 +08:00
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
optimize: updated the error message after updated new `jsonschema`. (#1011)
2020-01-02 21:56:42 +08:00
{"error_msg":"invalid configuration: property \"upstream_id\" validation failed: object matches none of the requireds"}
feature: checked the upstream id in route or service. (#114) * feature: checked the upstream id in route or service.
2019-06-17 11:45:04 +08:00
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 15: not exist upstream_id
feature: checked the upstream id in route or service. (#114) * feature: checked the upstream id in route or service.
2019-06-17 11:45:04 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_PUT,
[[{
"id": 1,
"upstream_id": "9999999999"
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"failed to fetch upstream info by upstream id [9999999999], response code: 404"}
--- no_error_log
[error]
change: merged the similar code, and not allowed to specify id when use POST method. (#128) * change: merged the similar code, and not allowed to specify id when use POST method.
2019-06-18 16:15:55 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 16: wrong service id
change: merged the similar code, and not allowed to specify id when use POST method. (#128) * change: merged the similar code, and not allowed to specify id when use POST method.
2019-06-18 16:15:55 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_POST,
[[{
"plugins": {}
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"wrong service id, do not need it"}
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 17: wrong service id
change: merged the similar code, and not allowed to specify id when use POST method. (#128) * change: merged the similar code, and not allowed to specify id when use POST method.
2019-06-18 16:15:55 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services',
ngx.HTTP_POST,
[[{
"id": 1,
"plugins": {}
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"wrong service id, do not need it"}
--- no_error_log
[error]
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 18: patch service(whole)
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
feat: generate create/update_time automatically (#2740)
2020-11-15 17:20:51 +08:00
local etcd = require("apisix.core.etcd")
local id = 1
local res = assert(etcd.get('/services/' .. id))
local prev_create_time = res.body.node.value.create_time
local prev_update_time = res.body.node.value.update_time
ngx.sleep(1)
feat(admin api): enhance `PATCH` method, allow to update partial data. (#1609)
2020-06-02 11:28:45 +08:00
local code, body = t('/apisix/admin/services/1',
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
ngx.HTTP_PATCH,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new 20 service"
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new 20 service"
},
"key": "/apisix/services/1"
},
improve: use optimistic locking to avoid concurrency problem in admin PATCH APIs. (#2216) There is a potential concurrency problem in all admin PATCH APIs when two patch requests come in simultaneously, in such case, the patched result of the first applied request will be overridden, also the probability is tidy, but from the perspective of software's robust, that's not what we wanna to see. In this commit, we use the optimistic locking to avoid this problem, for the example aforementioned, the second PATCH request will failure, and it's up to the user to retry this PATCH request again. The optimistic locking mechanism in ETCD v3 APIs is showed by it's transcation mechanism. Signed-off-by: tokers <zchao1995@gmail.com>
2020-09-18 17:20:55 +08:00
"action": "compareAndSwap"
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
}]]
)
ngx.status = code
ngx.say(body)
feat: generate create/update_time automatically (#2740)
2020-11-15 17:20:51 +08:00
local res = assert(etcd.get('/services/' .. id))
local create_time = res.body.node.value.create_time
assert(prev_create_time == create_time, "create_time mismatched")
local update_time = res.body.node.value.update_time
assert(prev_update_time ~= update_time, "update_time should be changed")
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 19: patch service(new desc)
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
feat(admin api): enhance `PATCH` method, allow to update partial data. (#1609)
2020-06-02 11:28:45 +08:00
local code, body = t('/apisix/admin/services/1',
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
ngx.HTTP_PATCH,
feat(admin api): enhance `PATCH` method, allow to update partial data. (#1609)
2020-06-02 11:28:45 +08:00
[[{
"desc": "new 19 service"
}]],
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new 19 service"
},
"key": "/apisix/services/1"
},
improve: use optimistic locking to avoid concurrency problem in admin PATCH APIs. (#2216) There is a potential concurrency problem in all admin PATCH APIs when two patch requests come in simultaneously, in such case, the patched result of the first applied request will be overridden, also the probability is tidy, but from the perspective of software's robust, that's not what we wanna to see. In this commit, we use the optimistic locking to avoid this problem, for the example aforementioned, the second PATCH request will failure, and it's up to the user to retry this PATCH request again. The optimistic locking mechanism in ETCD v3 APIs is showed by it's transcation mechanism. Signed-off-by: tokers <zchao1995@gmail.com>
2020-09-18 17:20:55 +08:00
"action": "compareAndSwap"
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 20: patch service(new nodes)
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
feat(admin api): enhance `PATCH` method, allow to update partial data. (#1609)
2020-06-02 11:28:45 +08:00
local code, body = t('/apisix/admin/services/1',
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
ngx.HTTP_PATCH,
[[{
feat(admin api): enhance `PATCH` method, allow to update partial data. (#1609)
2020-06-02 11:28:45 +08:00
"upstream": {
"nodes": {
"127.0.0.1:8081": 3,
"127.0.0.1:8082": 4
},
"type": "roundrobin"
}
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
feat(admin api): enhance `PATCH` method, allow to update partial data. (#1609)
2020-06-02 11:28:45 +08:00
"127.0.0.1:8080": 1,
feature: supported `PATCH` method for `service` API. (#370) * feature: supported `PATCH` method for `service` API.
2019-08-05 12:51:21 +08:00
"127.0.0.1:8081": 3,
"127.0.0.1:8082": 4
},
"type": "roundrobin"
}
}
}
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
feature: chash key support more flexible ways (#1022) upstream add hash_on, chash key support more flexible ways routes and services admin api add upstream_conf check
2020-01-10 15:17:17 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 21: patch service(whole - sub path)
feat: support both standard PATCH and sub path PATCH for admin api (#1930) fix #1823
2020-07-31 09:21:08 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1/',
ngx.HTTP_PATCH,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new 22 service"
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new 22 service"
},
"key": "/apisix/services/1"
},
improve: use optimistic locking to avoid concurrency problem in admin PATCH APIs. (#2216) There is a potential concurrency problem in all admin PATCH APIs when two patch requests come in simultaneously, in such case, the patched result of the first applied request will be overridden, also the probability is tidy, but from the perspective of software's robust, that's not what we wanna to see. In this commit, we use the optimistic locking to avoid this problem, for the example aforementioned, the second PATCH request will failure, and it's up to the user to retry this PATCH request again. The optimistic locking mechanism in ETCD v3 APIs is showed by it's transcation mechanism. Signed-off-by: tokers <zchao1995@gmail.com>
2020-09-18 17:20:55 +08:00
"action": "compareAndSwap"
feat: support both standard PATCH and sub path PATCH for admin api (#1930) fix #1823
2020-07-31 09:21:08 +08:00
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 22: patch service(new desc - sub path)
feat: support both standard PATCH and sub path PATCH for admin api (#1930) fix #1823
2020-07-31 09:21:08 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1/desc',
ngx.HTTP_PATCH,
'"new 23 service"',
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new 23 service"
},
"key": "/apisix/services/1"
},
improve: use optimistic locking to avoid concurrency problem in admin PATCH APIs. (#2216) There is a potential concurrency problem in all admin PATCH APIs when two patch requests come in simultaneously, in such case, the patched result of the first applied request will be overridden, also the probability is tidy, but from the perspective of software's robust, that's not what we wanna to see. In this commit, we use the optimistic locking to avoid this problem, for the example aforementioned, the second PATCH request will failure, and it's up to the user to retry this PATCH request again. The optimistic locking mechanism in ETCD v3 APIs is showed by it's transcation mechanism. Signed-off-by: tokers <zchao1995@gmail.com>
2020-09-18 17:20:55 +08:00
"action": "compareAndSwap"
feat: support both standard PATCH and sub path PATCH for admin api (#1930) fix #1823
2020-07-31 09:21:08 +08:00
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 23: patch service(new nodes - sub path)
feat: support both standard PATCH and sub path PATCH for admin api (#1930) fix #1823
2020-07-31 09:21:08 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1/upstream',
ngx.HTTP_PATCH,
[[{
"nodes": {
"127.0.0.2:8081": 3,
"127.0.0.3:8082": 4
},
"type": "roundrobin"
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.2:8081": 3,
"127.0.0.3:8082": 4
},
"type": "roundrobin"
}
}
}
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 24: set service(id: 1) and upstream(type:chash, default hash_on: vars, missing key)
feature: chash key support more flexible ways (#1022) upstream add hash_on, chash key support more flexible ways routes and services admin api add upstream_conf check
2020-01-10 15:17:17 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "chash"
},
"desc": "new service"
}]])
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"missing key"}
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 25: set service(id: 1) and upstream(type:chash, hash_on: header, missing key)
feature: chash key support more flexible ways (#1022) upstream add hash_on, chash key support more flexible ways routes and services admin api add upstream_conf check
2020-01-10 15:17:17 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "chash",
"hash_on": "header"
},
"desc": "new service"
}]])
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"missing key"}
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 26: set service(id: 1) and upstream(type:chash, hash_on: cookie, missing key)
feature: chash key support more flexible ways (#1022) upstream add hash_on, chash key support more flexible ways routes and services admin api add upstream_conf check
2020-01-10 15:17:17 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "chash",
"hash_on": "cookie"
},
"desc": "new service"
}]])
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"missing key"}
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 27: set service(id: 1) and upstream(type:chash, hash_on: consumer, missing key is ok)
feature: chash key support more flexible ways (#1022) upstream add hash_on, chash key support more flexible ways routes and services admin api add upstream_conf check
2020-01-10 15:17:17 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "chash",
"hash_on": "consumer"
},
"desc": "new service"
}]])
ngx.status = code
ngx.say(code .. " " .. body)
}
}
--- request
GET /t
--- response_body
200 passed
--- no_error_log
[error]
feat: support resource name for route, service and upstream object. (#1655)
2020-06-09 08:26:33 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 28: set service(id: 1 + test service name)
feat: support resource name for route, service and upstream object. (#1655)
2020-06-09 08:26:33 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"name": "test service name"
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"name": "test service name"
},
"key": "/apisix/services/1"
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
bugfix: id can be string object, which contains `^[a-zA-Z0-9-_]+$`. (#1739) Fix #1654
2020-06-21 16:28:11 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 29: invalid string id
bugfix: id can be string object, which contains `^[a-zA-Z0-9-_]+$`. (#1739) Fix #1654
2020-06-21 16:28:11 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/*invalid',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
}
}]]
)
if code >= 300 then
ngx.status = code
end
ngx.say(body)
}
}
--- request
GET /t
--- error_code: 400
--- no_error_log
[error]
feature: allow empty `service` object, it does not contain any `upstream` and `plugin` (#2259)
2020-09-21 16:52:18 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 30: set empty service. (id: 1)（allow empty `service` object）
feature: allow empty `service` object, it does not contain any `upstream` and `plugin` (#2259)
2020-09-21 16:52:18 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
{},
[[{
"node": {
"value": {"id":"1"}
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 31: patch content to the empty service.
feature: allow empty `service` object, it does not contain any `upstream` and `plugin` (#2259)
2020-09-21 16:52:18 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PATCH,
[[{
"desc": "empty service",
"plugins": {
"limit-count": {
"count": 2,
"time_window": 60,
"rejected_code": 503,
"key": "remote_addr"
}
},
"upstream": {
"type": "roundrobin",
"nodes": {
"127.0.0.1:80": 1
}
}
}]],
refactor: remove trailing whitespace (#3040)
2020-12-15 08:56:20 +08:00
[[{
feature: allow empty `service` object, it does not contain any `upstream` and `plugin` (#2259)
2020-09-21 16:52:18 +08:00
"node":{
"value":{
"desc":"empty service",
"plugins":{
"limit-count":{
"time_window":60,
"count":2,
"rejected_code":503,
"key":"remote_addr",
"policy":"local"
}
},
"upstream":{
"type":"roundrobin",
"nodes":{
"127.0.0.1:80":1
},
"hash_on":"vars",
"pass_host":"pass"
},
"id":"1"
}
},
"action":"compareAndSwap"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
Add lables for Route/Service/Consumer/SSL (#2345) Signed-off-by: imjoey <majunjiev@gmail.com>
2020-10-09 14:05:14 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 32: set service(with labels)
Add lables for Route/Service/Consumer/SSL (#2345) Signed-off-by: imjoey <majunjiev@gmail.com>
2020-10-09 14:05:14 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"labels": {
"build":"16",
"env":"production",
"version":"v2"
},
"desc": "new service"
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"labels": {
"build": "16",
"env": "production",
"version": "v2"
},
"desc": "new service"
},
"key": "/apisix/services/1"
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 33: patch service(change labels)
Add lables for Route/Service/Consumer/SSL (#2345) Signed-off-by: imjoey <majunjiev@gmail.com>
2020-10-09 14:05:14 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PATCH,
[[{
"labels": {
"build": "17"
}
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"labels": {
"build": "17",
"env": "production",
"version": "v2"
},
"desc": "new service"
},
"key": "/apisix/services/1"
},
"action": "compareAndSwap"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 34: invalid format of label value: set service
Add lables for Route/Service/Consumer/SSL (#2345) Signed-off-by: imjoey <majunjiev@gmail.com>
2020-10-09 14:05:14 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"labels": {
"env": ["production", "release"]
},
"desc": "new service"
}]]
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"invalid configuration: property \"labels\" validation failed: failed to validate env (matching \".*\"): wrong type: expected string, got table"}
--- no_error_log
[error]
feature: add managed fields in json schema for resources, such as create_time and update_time (#2444) * feature: add managed fields in jsonschema for resources, such as create_time and update_time
2020-10-17 18:48:02 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 35: create service with create_time and update_time(id: 1)
feature: add managed fields in json schema for resources, such as create_time and update_time (#2444) * feature: add managed fields in jsonschema for resources, such as create_time and update_time
2020-10-17 18:48:02 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin",
"create_time": 1602883670,
"update_time": 1602893670
}
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin",
"create_time": 1602883670,
"update_time": 1602893670
}
},
"key": "/apisix/services/1"
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 36: delete test service(id: 1)
feature: add managed fields in json schema for resources, such as create_time and update_time (#2444) * feature: add managed fields in jsonschema for resources, such as create_time and update_time
2020-10-17 18:48:02 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, message = t('/apisix/admin/services/1',
ngx.HTTP_DELETE,
nil,
[[{
"action": "delete"
}]]
)
ngx.say("[delete] code: ", code, " message: ", message)
}
}
--- request
GET /t
--- response_body
[delete] code: 200 message: passed
--- no_error_log
[error]
feat: increase the length of rule name to 100 (#2667) Close #2665
2020-11-11 10:36:28 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 37: limit the length of service's name
feat: increase the length of rule name to 100 (#2667) Close #2665
2020-11-11 10:36:28 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/1',
ngx.HTTP_PUT,
ci: make it work under OpenResty 1.19 (#2768)
2020-11-30 10:32:35 +08:00
require("toolkit.json").encode({name = ("1"):rep(101)})
feat: increase the length of rule name to 100 (#2667) Close #2665
2020-11-11 10:36:28 +08:00
)
ngx.status = code
ngx.print(body)
}
}
--- request
GET /t
--- error_code: 400
--- response_body
{"error_msg":"invalid configuration: property \"name\" validation failed: string too long, expected at most 100, got 101"}
--- no_error_log
[error]
feat: support '.' in id definition (#2795) * feat: support '.' in id definition Close #2274. * tweak test
2020-11-23 22:36:40 +08:00
test: clean unrun cases (#3356) Those test may mislead people. Also add a check to prevent skipping test by accident. Signed-off-by: spacewander <spacewanderlzx@gmail.com>
2021-01-20 19:14:56 +08:00
=== TEST 38: allow dot in the id
feat: support '.' in id definition (#2795) * feat: support '.' in id definition Close #2274. * tweak test
2020-11-23 22:36:40 +08:00
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/services/a.b',
ngx.HTTP_PUT,
[[{
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new service"
}]],
[[{
"node": {
"value": {
"upstream": {
"nodes": {
"127.0.0.1:8080": 1
},
"type": "roundrobin"
},
"desc": "new service"
},
"key": "/apisix/services/a.b"
},
"action": "set"
}]]
)
ngx.status = code
ngx.say(body)
}
}
--- request
GET /t
--- response_body
passed
--- no_error_log
[error]
Reference in New Issue Copy Permalink