spacewander commented on a change in pull request #4575:
URL: https://github.com/apache/apisix/pull/4575#discussion_r667612388
##########
File path: apisix/admin/proto.lua
##########
@@ -159,13 +168,15 @@ function _M.delete(id)
if services_ver and services then
for _, service in ipairs(services) do
- if type(service) == "table" and service.value
- and service.value.plugins then
- return _M.check_proto_used(service.value.plugins, id,
- "service", service.value.id)
+ if type(service) == "table" and service.value and
service.value.plugins then
+ local ret, err = check_proto_used(service.value.plugins,
id, "service", service.value.id)
+ if not ret then
+ return 400, err
Review comment:
Bad indent?
##########
File path: apisix/admin/proto.lua
##########
@@ -117,25 +117,31 @@ function _M.post(id, conf)
return res.status, res.body
end
-function _M.check_proto_used(plugins, deleting, ptype, pid)
+local function check_proto_used(plugins, deleting, ptype, pid)
- core.log.info("plugins1: ", core.json.delay_encode(plugins, true))
+ --core.log.info("check_proto_used plugins: ",
core.json.delay_encode(plugins, true))
+ --core.log.info("check_proto_used deleting: ", deleting)
+ --core.log.info("check_proto_used ptype: ", ptype)
+ --core.log.info("check_proto_used pid: ", pid)
if plugins then
if type(plugins) == "table" and plugins["grpc-transcode"]
and plugins["grpc-transcode"].proto_id
and tostring(plugins["grpc-transcode"].proto_id) == deleting then
- return 400, {error_msg = "can not delete this proto,"
+ -- core.log.info("check_proto_used proto is used: ",
core.json.delay_encode(plugins, true))
+ return false, {error_msg = "can not delete this proto,"
.. ptype .. " [" .. pid
.. "] is still using it now"}
end
end
+ return true,"ok"
Review comment:
return true is enough
##########
File path: t/admin/proto3.t
##########
@@ -0,0 +1,99 @@
+#
+# 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");
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: post proto + delete
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local etcd = require("apisix.core.etcd")
+ local code, message, res = t('/apisix/admin/proto',
+ ngx.HTTP_POST,
+ [[{
+ "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){}
+ }"
+ }]],
+ [[
+ {
+ "node": {
+ "value": {
+ "create_time": 1625845753,
+ "update_time": 1625845753,
+ "content": "syntax = \"proto3\";\npackage
proto;\nmessage HelloRequest{\n string name = 1;\n }\n\nmessage
HelloResponse{\n int32 code = 1;\n string msg = 2;\n }\n // The
greeting service definition.\nservice Hello {\n // Sends a greeting\n
rpc SayHi (HelloRequest) returns (HelloResponse){}\n }"
+ }
+ },
+ "action": "create"
+ }
+ ]]
+ )
+
+ if code ~= 201 then
+ ngx.status = code
+ ngx.say(message)
+ return
+ end
+
+ ngx.say("[push] code: ", code, " message: ", message)
+
+ local id = string.sub(res.node.key, #"/apisix/proto/" + 1)
+ local res = assert(etcd.get('/proto/' .. 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")
+
+ code, message = t('/apisix/admin/proto/' .. id,
Review comment:
Use `t/admin/proto.t` as test file name is enough.
We need to refer to the proto in a route/service, so that we can test the
path that returns 400.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
