Copilot commented on code in PR #13513:
URL: https://github.com/apache/apisix/pull/13513#discussion_r3394559710
##########
apisix/discovery/consul/client.lua:
##########
@@ -394,7 +394,9 @@ function _M.fetch_services_from_server(consul_server,
options)
local nodes_uniq = {}
for _, node in ipairs(result.body) do
if not node.Service then
- goto CONTINUE
+ log.warn("invalid consul service entry without Service
field, ",
+ "skip it: ", json_delay_encode(node))
+ goto CONTINUE_NODE
Review Comment:
`goto CONTINUE_NODE` currently jumps forward over `local` declarations
(`svc_address`, `svc_port`, `service_id`). In Lua this is a compile-time error
(a goto cannot jump into the scope of locals declared after it). Declare these
locals before the `if not node.Service` guard and turn the later `local`
declarations into assignments so the goto is legal.
##########
t/discovery/consul-malformed-node.t:
##########
@@ -0,0 +1,157 @@
+#
+# 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);
+log_level('info');
+no_root_location();
+no_shuffle();
+
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ # mock consul server: /v1/health/service/service_a returns one malformed
+ # entry (without the Service field) followed by two valid entries
+ my $http_config = $block->http_config // <<_EOC_;
+
+ server {
+ listen 18506;
+
+ location /v1/catalog/services {
+ content_by_lua_block {
+ ngx.header["X-Consul-Index"] = "1"
+ ngx.header.content_type = "application/json"
+ ngx.say('{"service_a":[]}')
+ }
+ }
+
+ location /v1/health/state/any {
+ content_by_lua_block {
+ ngx.header["X-Consul-Index"] = "1"
+ ngx.header.content_type = "application/json"
+ ngx.say('[]')
+ }
+ }
+
+ location /v1/health/service/service_a {
+ content_by_lua_block {
+ ngx.header["X-Consul-Index"] = "1"
+ ngx.header.content_type = "application/json"
+ ngx.say('['
+ ..
'{"Node":{"Node":"reclaimed-node","Address":"127.0.0.1"},"Checks":[]},'
+ .. '{"Node":{"Node":"node1","Address":"127.0.0.1"},'
+ .. '"Service":{"ID":"service_a1","Service":"service_a",'
+ .. '"Address":"127.0.0.1","Port":30511},"Checks":[]},'
+ .. '{"Node":{"Node":"node2","Address":"127.0.0.1"},'
+ .. '"Service":{"ID":"service_a2","Service":"service_a",'
+ .. '"Address":"127.0.0.1","Port":30512},"Checks":[]}'
+ .. ']')
+ }
+ }
+ }
+
+ server {
+ listen 30511;
+
+ location /hello {
+ content_by_lua_block {
+ ngx.say("server 1")
+ }
+ }
+ }
+ server {
+ listen 30512;
+
+ location /hello {
+ content_by_lua_block {
+ ngx.say("server 2")
+ }
+ }
+ }
+_EOC_
+
+ $block->set_value("http_config", $http_config);
+});
+
+our $yaml_config = <<_EOC_;
+apisix:
+ node_listen: 1984
+deployment:
+ role: data_plane
+ role_data_plane:
+ config_provider: yaml
+discovery:
+ consul:
+ servers:
+ - "http://127.0.0.1:18506";
+ timeout:
+ connect: 1000
+ read: 1000
+ wait: 60
+ weight: 1
+ fetch_interval: 1
+ keepalive: true
+_EOC_
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: one malformed catalog entry should not discard the remaining valid
nodes
Review Comment:
Test name says "malformed catalog entry" but the malformed entry is from the
health API response. Renaming avoids confusion when reading discovery test
output.
--
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]
