feat: nacos discovery support namespace and group and support multiple host #4308
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
spacewander
requested changes
May 26, 2021
| @@ -157,9 +157,23 @@ local function get_token_param(base_uri, username, password) | |||
| return '&accessToken=' .. data.accessToken | |||
| end | |||
|
|
|||
| local function get_group_and_namespace_param(service_info) | |||
| @@ -99,3 +99,97 @@ The format response as below: | |||
| "action": "set" | |||
| } | |||
| ``` | |||
|
|
|||
| example of routing a request with a URL of "/nacosWithNamespaceIdAndGroupId/*" to a service which name, namespaceId, groupName "http://192.168.33.1:8848/nacos/v1/ns/instance/list?serviceName=APISIX-NACOS&groupName=test&namespaceId=test" and use nacos discovery client in the registry : | |||
There was a problem hiding this comment.
This first letter should be uppercase.
| } | ||
| ``` | ||
|
|
||
| example to use other nacos host |
There was a problem hiding this comment.
In what situation we need to switch Nacos address in the per upstream level?
| @@ -389,6 +389,24 @@ local upstream_schema = { | |||
| description = "discovery type", | |||
| type = "string", | |||
| }, | |||
| discovery_host = { | |||
There was a problem hiding this comment.
Better to use nacos_address instead.
All these 3 fields should go under a separate field called discovery_args, as it is nacos specific.
And we need to check them only when discovery_type nacos is used.
| @@ -208,7 +222,12 @@ local function iter_and_add_service(services, values) | |||
| end | |||
|
|
|||
| if up.discovery_type == 'nacos' then | |||
| core.table.insert(services, up.service_name) | |||
| core.table.insert(services, { | |||
| service_name=up.service_name, | |||
|
Test must be added for the new feature. |
|
My suggestion is that we need to split the PR into steps:
So that the PR can be merged quickly. |
Thx I will close this pr and open another |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
#4306
support multiple host
Pre-submission checklist: