-
Notifications
You must be signed in to change notification settings - Fork 2.6k
feat(nacos): add metadata filtering support to nacos discovery #12445
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
beardnick
wants to merge
10
commits into
apache:master
Choose a base branch
from
beardnick:feature-nacos-metadata-match
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+484
−5
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2de0abb
feat: add metadata filtering support to nacos discovery
beardnick d8cf96d
test: test empty metadata
beardnick 298fd9a
Merge remote-tracking branch 'upstream/master' into feature-nacos-met…
beardnick a583743
feat: support multi-value matching
beardnick 132c8b2
test(schema): table-driven nacos discovery_args.metadata cases to su…
beardnick c1c2e34
feat: delete useless comment
beardnick 53e3400
test: update tests
beardnick da59ef9
lint: fix
beardnick dc321b6
Merge branch 'master' into feature-nacos-metadata-match
beardnick 7f2fc3d
feat: remove redundant check
beardnick File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,6 +21,7 @@ local http = require('resty.http') | |
local core = require('apisix.core') | ||
local ipairs = ipairs | ||
local pairs = pairs | ||
local next = next | ||
local type = type | ||
local math = math | ||
local math_random = math.random | ||
|
@@ -54,6 +55,33 @@ local function get_key(namespace_id, group_name, service_name) | |
return namespace_id .. '.' .. group_name .. '.' .. service_name | ||
end | ||
|
||
|
||
local function metadata_contains(host_metadata, route_metadata) | ||
if not host_metadata or not next(host_metadata) then | ||
return false | ||
end | ||
|
||
for k, v in pairs(route_metadata) do | ||
local host_value = host_metadata[k] | ||
if not host_value then | ||
return false | ||
end | ||
|
||
-- Multi-value matching: check if host_value matches any value in the array | ||
local found = false | ||
for _, expected_value in ipairs(v) do | ||
if host_value == expected_value then | ||
found = true | ||
break | ||
end | ||
end | ||
if not found then | ||
return false | ||
end | ||
end | ||
return true | ||
end | ||
|
||
local function request(request_uri, path, body, method, basic_auth) | ||
local url = request_uri .. path | ||
log.info('request url:', url) | ||
|
@@ -319,6 +347,7 @@ local function fetch_full_registry(premature) | |
host = host.ip, | ||
port = host.port, | ||
weight = host.weight or default_weight, | ||
metadata = host.metadata, | ||
} | ||
-- docs: https://github.com/yidongnan/grpc-spring-boot-starter/pull/496 | ||
if is_grpc(scheme) and host.metadata and host.metadata.gRPC_port then | ||
|
@@ -355,6 +384,19 @@ function _M.nodes(service_name, discovery_args) | |
return nil | ||
end | ||
local nodes = core.json.decode(value) | ||
|
||
-- Apply metadata filtering if specified | ||
local route_metadata = discovery_args and discovery_args.metadata | ||
if route_metadata and next(route_metadata) then | ||
local filtered_nodes = {} | ||
for _, node in ipairs(nodes) do | ||
if metadata_contains(node.metadata, route_metadata) then | ||
core.table.insert(filtered_nodes, node) | ||
end | ||
end | ||
return filtered_nodes | ||
end | ||
|
||
Comment on lines
+388
to
+399
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
return nodes | ||
end | ||
|
||
|
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
#!/bin/bash | ||
# | ||
# 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. | ||
# | ||
|
||
# Build Java command with proper environment variable expansion | ||
JAVA_ARGS=( | ||
"-Djava.security.egd=file:/dev/./urandom" | ||
"-jar" | ||
"/app.jar" | ||
"--suffix.num=${SUFFIX_NUM}" | ||
"--spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR}" | ||
"--spring.application.name=${SERVICE_NAME}" | ||
"--spring.cloud.nacos.discovery.group=${GROUP}" | ||
"--spring.cloud.nacos.discovery.namespace=${NAMESPACE}" | ||
) | ||
|
||
# Add metadata dynamically for all METADATA_* environment variables | ||
for var in $(env | grep '^METADATA_' | cut -d= -f1); do | ||
# Convert METADATA_LANE to lane, METADATA_ENV to env, etc. | ||
metadata_key=$(echo "${var#METADATA_}" | tr '[:upper:]' '[:lower:]') | ||
metadata_value=$(eval echo \$${var}) | ||
|
||
if [ -n "${metadata_value}" ]; then | ||
JAVA_ARGS+=("--spring.cloud.nacos.discovery.metadata.${metadata_key}=${metadata_value}") | ||
fi | ||
done | ||
|
||
# Execute Java with expanded arguments | ||
exec java "${JAVA_ARGS[@]}" |
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.