From 1743b937614efda92bbb94e69ef677fa4553a4c9 Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Sat, 4 Nov 2023 14:49:23 +0800 Subject: [PATCH 1/8] feat: support nacos ak/sk auth mode --- apisix/discovery/nacos/init.lua | 22 ++++++++++++++++++++++ apisix/discovery/nacos/schema.lua | 2 ++ 2 files changed, 24 insertions(+) diff --git a/apisix/discovery/nacos/init.lua b/apisix/discovery/nacos/init.lua index 2e06f5553493..e3d8e7701dfc 100644 --- a/apisix/discovery/nacos/init.lua +++ b/apisix/discovery/nacos/init.lua @@ -18,6 +18,7 @@ local require = require local local_conf = require('apisix.core.config_local').local_conf() local http = require('resty.http') +local hmac = require("resty.hmac") local core = require('apisix.core') local ipairs = ipairs local type = type @@ -39,6 +40,8 @@ local auth_path = 'auth/login' local instance_list_path = 'ns/instance/list?healthyOnly=true&serviceName=' local default_namespace_id = "public" local default_group_name = "DEFAULT_GROUP" +local access_key +local secret_key local events local events_list @@ -145,6 +148,20 @@ local function get_group_name_param(group_name) return param end +local function get_signed_param(group_name, service_name) + local param = '' + if access_key ~= '' and secret_key ~= '' then + local str_to_sign = ngx.now() * 1000 .. '@@' .. group_name .. '@@' .. service_name + local args = { + ak = access_key, + data = str_to_sign, + signature = ngx.encode_base64(ngx.hmac_sha1(secret_key, str_to_sign)) + } + param = '&' .. ngx.encode_args(args) + end + return param +end + local function get_base_uri() local host = local_conf.discovery.nacos.host -- TODO Add health check to get healthy nodes. @@ -286,8 +303,11 @@ local function fetch_full_registry(premature) local scheme = service_info.scheme or '' local namespace_param = get_namespace_param(service_info.namespace_id) local group_name_param = get_group_name_param(service_info.group_name) + log.info(service_info.group_name, service_info.service_name) + local signature_param = get_signed_param(service_info.group_name, service_info.service_name) local query_path = instance_list_path .. service_info.service_name .. token_param .. namespace_param .. group_name_param + .. signature_param data, err = get_url(base_uri, query_path) if err then log.error('get_url:', query_path, ' err:', err) @@ -385,6 +405,8 @@ function _M.init_worker() log.info('default_weight:', default_weight) local fetch_interval = local_conf.discovery.nacos.fetch_interval log.info('fetch_interval:', fetch_interval) + access_key = local_conf.discovery.nacos.access_key + secret_key = local_conf.discovery.nacos.secret_key ngx_timer_at(0, fetch_full_registry) ngx_timer_every(fetch_interval, fetch_full_registry) end diff --git a/apisix/discovery/nacos/schema.lua b/apisix/discovery/nacos/schema.lua index 40c1ba77cc10..294048736e58 100644 --- a/apisix/discovery/nacos/schema.lua +++ b/apisix/discovery/nacos/schema.lua @@ -52,6 +52,8 @@ return { read = 5000, } }, + access_key = {type = 'string', default = ''}, + secret_key = {type = 'string', default = ''}, }, required = {'host'} } From ecc9d11f05323b8d13d9ba29f98f5c1b2f08deaf Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Sun, 5 Nov 2023 14:13:10 +0800 Subject: [PATCH 2/8] add ci test --- conf/config-default.yaml | 2 + t/discovery/nacos3.t | 624 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 626 insertions(+) create mode 100644 t/discovery/nacos3.t diff --git a/conf/config-default.yaml b/conf/config-default.yaml index 38d67823e5a9..bf4e34e9a35a 100755 --- a/conf/config-default.yaml +++ b/conf/config-default.yaml @@ -308,6 +308,8 @@ nginx_config: # Config for render the template to generate n # connect: 2000 # Default 2000ms # send: 2000 # Default 2000ms # read: 5000 # Default 5000ms +# access_key: "" +# secret_key: "" # consul_kv: # Consul KV # servers: # Consul KV address(es) # - "http://127.0.0.1:8500" diff --git a/t/discovery/nacos3.t b/t/discovery/nacos3.t new file mode 100644 index 000000000000..b334867dd6e2 --- /dev/null +++ b/t/discovery/nacos3.t @@ -0,0 +1,624 @@ +# +# 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'; + +workers(4); + +add_block_preprocessor(sub { + my ($block) = @_; + + if (!$block->request) { + $block->set_value("request", "GET /t"); + } +}); + +our $yaml_config = <<_EOC_; +apisix: + node_listen: 1984 +deployment: + role: data_plane + role_data_plane: + config_provider: yaml +discovery: + nacos: + host: + - "http://127.0.0.1:8858" + prefix: "/nacos/v1/" + fetch_interval: 1 + weight: 1 + timeout: + connect: 2000 + send: 2000 + read: 5000 + access_key: "my_access_key" + secret_key: "my_secret_key" + +_EOC_ + +run_tests(); + +__DATA__ + + +=== TEST 1: error service_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS-DEMO + discovery_type: nacos + type: roundrobin + +#END +--- request +GET /hello +--- error_code: 503 +--- error_log +no valid upstream node + + +=== TEST 2: error namespace_id +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS-DEMO + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: err_ns +#END +--- request +GET /hello +--- error_code: 503 +--- error_log +no valid upstream node + + +=== TEST 3: error group_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS-DEMO + discovery_type: nacos + type: roundrobin + discovery_args: + group_name: err_group_name +#END +--- request +GET /hello +--- error_code: 503 +--- error_log +no valid upstream node + + +=== TEST 4: error namespace_id and error group_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS-DEMO + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: err_ns + group_name: err_group_name +#END +--- request +GET /hello +--- error_code: 503 +--- error_log +no valid upstream node + + +=== TEST 5: error group_name and correct namespace_id +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS-DEMO + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: test_ns + group_name: err_group_name +#END +--- request +GET /hello +--- error_code: 503 +--- error_log +no valid upstream node + + +=== TEST 6: error namespace_id and correct group_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS-DEMO + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: err_ns + group_name: test_group +#END +--- request +GET /hello +--- error_code: 503 +--- error_log +no valid upstream node + + +=== TEST 7: get APISIX-NACOS info from NACOS - configured in services +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + service_id: 1 +services: + - + id: 1 + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 8: get APISIX-NACOS info from NACOS - configured in services with group_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + service_id: 1 +services: + - + id: 1 + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin + discovery_args: + group_name: test_group +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 9: get APISIX-NACOS info from NACOS - configured in services with namespace_id +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + service_id: 1 +services: + - + id: 1 + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: test_ns +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 10: get APISIX-NACOS info from NACOS - configured in services with group_name and namespace_id +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + service_id: 1 +services: + - + id: 1 + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin + discovery_args: + group_name: test_group + namespace_id: test_ns +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 11: get APISIX-NACOS info from NACOS - configured in upstreams +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] +--- no_error_log +[error, error] + + + +=== TEST 12: get APISIX-NACOS info from NACOS - configured in upstreams with namespace_id +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: test_ns +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 13: get APISIX-NACOS info from NACOS - configured in upstreams with group_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin + discovery_args: + group_name: test_group +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 14: get APISIX-NACOS info from NACOS - configured in upstreams with namespace_id and group_name +--- yaml_config eval: $::yaml_config +--- apisix_yaml +routes: + - + uri: /hello + upstream: + service_name: APISIX-NACOS + discovery_type: nacos + type: roundrobin + discovery_args: + namespace_id: test_ns + group_name: test_group +#END +--- pipelined_requests eval +[ + "GET /hello", + "GET /hello", +] +--- response_body_like eval +[ + qr/server [1-2]/, + qr/server [1-2]/, +] + + +=== TEST 15: get APISIX-NACOS info from NACOS - configured in upstreams + etcd +--- extra_yaml_config +discovery: + nacos: + host: + - "http://127.0.0.1:8858" + fetch_interval: 1 + access_key: "my_access_key" + secret_key: "my_secret_key" +--- config + location /t { + content_by_lua_block { + local t = require("lib.test_admin").test + local code, body = t('/apisix/admin/upstreams/1', + ngx.HTTP_PUT, + [[{ + "service_name": "APISIX-NACOS", + "discovery_type": "nacos", + "type": "roundrobin" + }]] + ) + + if code >= 300 then + ngx.status = code + ngx.say(body) + return + end + + local code, body = t('/apisix/admin/routes/1', + ngx.HTTP_PUT, + [[{ + "uri": "/hello", + "upstream_id": 1 + }]] + ) + + if code >= 300 then + ngx.status = code + end + + ngx.say(body) + } + } +--- response_body +passed + + + +=== TEST 16: same namespace_id and service_name, different group_name +--- extra_yaml_config +discovery: + nacos: + host: + - "http://127.0.0.1:8858" + fetch_interval: 1 + access_key: "my_access_key" + secret_key: "my_secret_key" +--- config + location /t { + content_by_lua_block { + local t = require("lib.test_admin").test + + -- use nacos-service5 + local code, body = t('/apisix/admin/routes/1', + ngx.HTTP_PUT, + [[{ + "uri": "/hello", + "upstream": { + "service_name": "APISIX-NACOS", + "discovery_type": "nacos", + "type": "roundrobin", + "discovery_args": { + "namespace_id": "test_ns", + "group_name": "test_group" + } + } + }]] + ) + + if code >= 300 then + ngx.status = code + end + + -- use nacos-service6 + local code, body = t('/apisix/admin/routes/2', + ngx.HTTP_PUT, + [[{ + "uri": "/hello1", + "upstream": { + "service_name": "APISIX-NACOS", + "discovery_type": "nacos", + "type": "roundrobin", + "discovery_args": { + "namespace_id": "test_ns", + "group_name": "test_group2" + } + }, + "plugins": { + "proxy-rewrite": { + "uri": "/hello" + } + } + }]] + ) + + if code >= 300 then + ngx.status = code + end + + ngx.sleep(1.5) + + local http = require "resty.http" + local httpc = http.new() + local uri1 = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello" + local res, err = httpc:request_uri(uri1, { method = "GET"}) + if err then + ngx.log(ngx.ERR, err) + ngx.status = res.status + return + end + ngx.say(res.body) + + local uri2 = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello1" + res, err = httpc:request_uri(uri2, { method = "GET"}) + if err then + ngx.log(ngx.ERR, err) + ngx.status = res.status + return + end + ngx.say(res.body) + } + } +--- request +GET /t +--- response_body +server 1 +server 3 + + + +=== TEST 17: same group_name and service_name, different namespace_id +--- extra_yaml_config +discovery: + nacos: + host: + - "http://127.0.0.1:8858" + fetch_interval: 1 + access_key: "my_access_key" + secret_key: "my_secret_key" +--- config + location /t { + content_by_lua_block { + local t = require("lib.test_admin").test + + -- use nacos-service5 + local code, body = t('/apisix/admin/routes/1', + ngx.HTTP_PUT, + [[{ + "uri": "/hello", + "upstream": { + "service_name": "APISIX-NACOS", + "discovery_type": "nacos", + "type": "roundrobin", + "discovery_args": { + "namespace_id": "test_ns", + "group_name": "test_group" + } + } + }]] + ) + + if code >= 300 then + ngx.status = code + end + + -- use nacos-service7 + local code, body = t('/apisix/admin/routes/2', + ngx.HTTP_PUT, + [[{ + "uri": "/hello1", + "upstream": { + "service_name": "APISIX-NACOS", + "discovery_type": "nacos", + "type": "roundrobin", + "discovery_args": { + "namespace_id": "test_ns2", + "group_name": "test_group" + } + }, + "plugins": { + "proxy-rewrite": { + "uri": "/hello" + } + } + }]] + ) + + if code >= 300 then + ngx.status = code + end + + ngx.sleep(1.5) + + local http = require "resty.http" + local httpc = http.new() + local uri1 = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello" + local res, err = httpc:request_uri(uri1, { method = "GET"}) + if err then + ngx.log(ngx.ERR, err) + ngx.status = res.status + return + end + ngx.say(res.body) + + local uri2 = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello1" + res, err = httpc:request_uri(uri2, { method = "GET"}) + if err then + ngx.log(ngx.ERR, err) + ngx.status = res.status + return + end + ngx.say(res.body) + } + } +--- request +GET /t +--- response_body +server 1 +server 4 From 6a0c5fd8b29461e54ab694ca0c5b1ceb94d8defc Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Sun, 5 Nov 2023 14:16:30 +0800 Subject: [PATCH 3/8] remove debug code --- apisix/discovery/nacos/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/apisix/discovery/nacos/init.lua b/apisix/discovery/nacos/init.lua index e3d8e7701dfc..0c9fe012929b 100644 --- a/apisix/discovery/nacos/init.lua +++ b/apisix/discovery/nacos/init.lua @@ -303,7 +303,6 @@ local function fetch_full_registry(premature) local scheme = service_info.scheme or '' local namespace_param = get_namespace_param(service_info.namespace_id) local group_name_param = get_group_name_param(service_info.group_name) - log.info(service_info.group_name, service_info.service_name) local signature_param = get_signed_param(service_info.group_name, service_info.service_name) local query_path = instance_list_path .. service_info.service_name .. token_param .. namespace_param .. group_name_param From 925ad2df6c0698236f25a3841463c774190e6b53 Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Mon, 6 Nov 2023 16:45:06 +0800 Subject: [PATCH 4/8] fix code lint failed --- apisix/discovery/nacos/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/apisix/discovery/nacos/init.lua b/apisix/discovery/nacos/init.lua index 0c9fe012929b..dfe10b171340 100644 --- a/apisix/discovery/nacos/init.lua +++ b/apisix/discovery/nacos/init.lua @@ -18,7 +18,6 @@ local require = require local local_conf = require('apisix.core.config_local').local_conf() local http = require('resty.http') -local hmac = require("resty.hmac") local core = require('apisix.core') local ipairs = ipairs local type = type From baf3f5ca1729e430c359a9a32a23a72df0580c0c Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Mon, 6 Nov 2023 21:26:06 +0800 Subject: [PATCH 5/8] fix code lint --- apisix/discovery/nacos/init.lua | 6 ++++++ conf/config-default.yaml | 4 ++-- t/discovery/nacos3.t | 14 +++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/apisix/discovery/nacos/init.lua b/apisix/discovery/nacos/init.lua index dfe10b171340..b014d0feff36 100644 --- a/apisix/discovery/nacos/init.lua +++ b/apisix/discovery/nacos/init.lua @@ -55,6 +55,7 @@ local function discovery_nacos_callback(data, event, source, pid) ", application: ", core.json.encode(applications, true)) end + local function request(request_uri, path, body, method, basic_auth) local url = request_uri .. path log.info('request url:', url) @@ -129,6 +130,7 @@ local function get_token_param(base_uri, username, password) return '&accessToken=' .. data.accessToken end + local function get_namespace_param(namespace_id) local param = '' if namespace_id then @@ -138,6 +140,7 @@ local function get_namespace_param(namespace_id) return param end + local function get_group_name_param(group_name) local param = '' if group_name then @@ -147,6 +150,7 @@ local function get_group_name_param(group_name) return param end + local function get_signed_param(group_name, service_name) local param = '' if access_key ~= '' and secret_key ~= '' then @@ -161,6 +165,7 @@ local function get_signed_param(group_name, service_name) return param end + local function get_base_uri() local host = local_conf.discovery.nacos.host -- TODO Add health check to get healthy nodes. @@ -273,6 +278,7 @@ local function is_grpc(scheme) return false end + local function fetch_full_registry(premature) if premature then return diff --git a/conf/config-default.yaml b/conf/config-default.yaml index bf4e34e9a35a..336e638c0f3f 100755 --- a/conf/config-default.yaml +++ b/conf/config-default.yaml @@ -308,8 +308,8 @@ nginx_config: # Config for render the template to generate n # connect: 2000 # Default 2000ms # send: 2000 # Default 2000ms # read: 5000 # Default 5000ms -# access_key: "" -# secret_key: "" +# access_key: "" # Nacos AccessKey ID in Alibaba Cloud +# secret_key: "" # Nacos AccessKey Secret in Alibaba Cloud # consul_kv: # Consul KV # servers: # Consul KV address(es) # - "http://127.0.0.1:8500" diff --git a/t/discovery/nacos3.t b/t/discovery/nacos3.t index b334867dd6e2..576079db36b3 100644 --- a/t/discovery/nacos3.t +++ b/t/discovery/nacos3.t @@ -53,7 +53,6 @@ run_tests(); __DATA__ - === TEST 1: error service_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -73,6 +72,7 @@ GET /hello no valid upstream node + === TEST 2: error namespace_id --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -93,6 +93,7 @@ GET /hello no valid upstream node + === TEST 3: error group_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -113,6 +114,7 @@ GET /hello no valid upstream node + === TEST 4: error namespace_id and error group_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -134,6 +136,7 @@ GET /hello no valid upstream node + === TEST 5: error group_name and correct namespace_id --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -155,6 +158,7 @@ GET /hello no valid upstream node + === TEST 6: error namespace_id and correct group_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -176,6 +180,7 @@ GET /hello no valid upstream node + === TEST 7: get APISIX-NACOS info from NACOS - configured in services --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -203,6 +208,7 @@ services: ] + === TEST 8: get APISIX-NACOS info from NACOS - configured in services with group_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -232,6 +238,7 @@ services: ] + === TEST 9: get APISIX-NACOS info from NACOS - configured in services with namespace_id --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -261,6 +268,7 @@ services: ] + === TEST 10: get APISIX-NACOS info from NACOS - configured in services with group_name and namespace_id --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -291,6 +299,7 @@ services: ] + === TEST 11: get APISIX-NACOS info from NACOS - configured in upstreams --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -342,6 +351,7 @@ routes: ] + === TEST 13: get APISIX-NACOS info from NACOS - configured in upstreams with group_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -367,6 +377,7 @@ routes: ] + === TEST 14: get APISIX-NACOS info from NACOS - configured in upstreams with namespace_id and group_name --- yaml_config eval: $::yaml_config --- apisix_yaml @@ -393,6 +404,7 @@ routes: ] + === TEST 15: get APISIX-NACOS info from NACOS - configured in upstreams + etcd --- extra_yaml_config discovery: From b70f53ba1c7bd469d6be8ebc5421d78ee20907ce Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Tue, 7 Nov 2023 17:40:28 +0800 Subject: [PATCH 6/8] perf comment --- conf/config-default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config-default.yaml b/conf/config-default.yaml index 336e638c0f3f..9d99f1e67886 100755 --- a/conf/config-default.yaml +++ b/conf/config-default.yaml @@ -308,8 +308,8 @@ nginx_config: # Config for render the template to generate n # connect: 2000 # Default 2000ms # send: 2000 # Default 2000ms # read: 5000 # Default 5000ms -# access_key: "" # Nacos AccessKey ID in Alibaba Cloud -# secret_key: "" # Nacos AccessKey Secret in Alibaba Cloud +# access_key: "" # Nacos AccessKey ID in Alibaba Cloud, notice that it's for Nacos instances on Microservices Engine (MSE) +# secret_key: "" # Nacos AccessKey Secret in Alibaba Cloud, notice that it's for Nacos instances on Microservices Engine (MSE) # consul_kv: # Consul KV # servers: # Consul KV address(es) # - "http://127.0.0.1:8500" From f43b0d1db8e94209e55939d5a202190c577a65cd Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Wed, 8 Nov 2023 11:28:36 +0800 Subject: [PATCH 7/8] Update nacos3.t --- t/discovery/nacos3.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/discovery/nacos3.t b/t/discovery/nacos3.t index 576079db36b3..c58a429bf452 100644 --- a/t/discovery/nacos3.t +++ b/t/discovery/nacos3.t @@ -14,6 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +# access_key and secret_key won't work and affect the open source nacos use t::APISIX 'no_plan'; workers(4); From eee29d1bc1622e51d0f086fe8b7ca3df7402e059 Mon Sep 17 00:00:00 2001 From: yuweizzz Date: Wed, 8 Nov 2023 11:29:38 +0800 Subject: [PATCH 8/8] Update nacos3.t --- t/discovery/nacos3.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/discovery/nacos3.t b/t/discovery/nacos3.t index c58a429bf452..c71259386c7e 100644 --- a/t/discovery/nacos3.t +++ b/t/discovery/nacos3.t @@ -15,7 +15,7 @@ # limitations under the License. # -# access_key and secret_key won't work and affect the open source nacos +# we can't use mse nacos to test, access_key and secret_key won't affect the open source nacos use t::APISIX 'no_plan'; workers(4);