This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/next by this push:
new 394890dc6 feat: adjust some list uris of V3 API (#7364)
394890dc6 is described below
commit 394890dc6f7b8abea8c038e815b0181db2e3e0d2
Author: tzssangglass <[email protected]>
AuthorDate: Mon Jul 4 11:43:16 2022 +0800
feat: adjust some list uris of V3 API (#7364)
---
apisix/admin/init.lua | 2 ++
t/admin/protos.t | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++
t/admin/ssls.t | 79 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 163 insertions(+)
diff --git a/apisix/admin/init.lua b/apisix/admin/init.lua
index 318348ecd..a7f6d1044 100644
--- a/apisix/admin/init.lua
+++ b/apisix/admin/init.lua
@@ -47,8 +47,10 @@ local resources = {
consumers = require("apisix.admin.consumers"),
schema = require("apisix.admin.schema"),
ssl = require("apisix.admin.ssl"),
+ ssls = require("apisix.admin.ssl"),
plugins = require("apisix.admin.plugins"),
proto = require("apisix.admin.proto"),
+ protos = require("apisix.admin.proto"),
global_rules = require("apisix.admin.global_rules"),
stream_routes = require("apisix.admin.stream_routes"),
plugin_metadata = require("apisix.admin.plugin_metadata"),
diff --git a/t/admin/protos.t b/t/admin/protos.t
new file mode 100644
index 000000000..6265020e4
--- /dev/null
+++ b/t/admin/protos.t
@@ -0,0 +1,82 @@
+#
+# 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.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_root_location();
+no_shuffle();
+log_level("info");
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ if (!$block->request) {
+ $block->set_value("request", "GET /t");
+ }
+
+ if (!$block->no_error_log && !$block->error_log) {
+ $block->set_value("no_error_log", "[error]\n[alert]");
+ }
+});
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: test /apisix/admin/protos/{id}
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, message = t('/apisix/admin/protos/1',
+ ngx.HTTP_PUT,
+ [[{
+ "content": "syntax = \"proto3\";
+ package proto;
+ message HelloRequest{
+ string name = 1;
+ }
+
+ message HelloResponse{
+ int32 code = 1;
+ string msg = 2;
+ }
+ // The greeting service definition.
+ service Hello {
+ // Sends a greeting
+ rpc SayHi (HelloRequest) returns (HelloResponse){}
+ }"
+ }]],
+ [[
+ {
+ "action": "set"
+ }
+ ]]
+ )
+
+ if code ~= 200 then
+ ngx.status = code
+ ngx.say("[put proto] code: ", code, " message: ", message)
+ return
+ end
+
+ ngx.say("[put proto] code: ", code, " message: ", message)
+ }
+ }
+--- response_body
+[put proto] code: 200 message: passed
diff --git a/t/admin/ssls.t b/t/admin/ssls.t
new file mode 100644
index 000000000..33c98e11e
--- /dev/null
+++ b/t/admin/ssls.t
@@ -0,0 +1,79 @@
+#
+# 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.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_root_location();
+no_shuffle();
+log_level("info");
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ if (!$block->request) {
+ $block->set_value("request", "GET /t");
+ }
+
+ if (!$block->no_error_log && !$block->error_log) {
+ $block->set_value("no_error_log", "[error]\n[alert]");
+ }
+});
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: test /apisix/admin/ssls/{id}
+--- config
+ location /t {
+ content_by_lua_block {
+ local core = require("apisix.core")
+ local etcd = require("apisix.core.etcd")
+ local t = require("lib.test_admin")
+
+ local ssl_cert = t.read_file("t/certs/apisix.crt")
+ local ssl_key = t.read_file("t/certs/apisix.key")
+ local data = {cert = ssl_cert, key = ssl_key, sni = "test.com"}
+
+ local code, body = t.test('/apisix/admin/ssls/1',
+ ngx.HTTP_PUT,
+ core.json.encode(data),
+ [[{
+ "node": {
+ "value": {
+ "sni": "test.com"
+ },
+ "key": "/apisix/ssl/1"
+ },
+ "action": "set"
+ }]]
+ )
+
+ ngx.status = code
+ ngx.say(body)
+
+ local res = assert(etcd.get('/ssl/1'))
+ local prev_create_time = res.body.node.value.create_time
+ assert(prev_create_time ~= nil, "create_time is nil")
+ local update_time = res.body.node.value.update_time
+ assert(update_time ~= nil, "update_time is nil")
+
+ }
+ }
+--- response_body
+passed
