Merge remote-tracking branch 'origin/master'

Author: georgeji

apisix/upstream.lua

@@ -278,6 +278,35 @@ local function fill_node_info(up_conf, scheme, is_stream)
     return true
 end
 
+local function match_metadata_filters(inst, filters)
+    local metadata = inst.metadata or {}
+    for _, f in ipairs(filters) do
+        local key = f.key
+        local allowed_vals = f.allowed_vals
+        local val = metadata[key]
+        local matched = false
+        for _, allowed in ipairs(allowed_vals) do
+            if val == allowed then
+                matched = true
+                break
+            end
+        end
+        if not matched then
+            return false
+        end
+    end
+    return true
+end
+
+local function match_nodes_by_metadata(nodes, filters)
+    local result = {}
+    for _, node in ipairs(nodes) do
+        if match_metadata_filters(node, filters) then
+            core.table.insert(result, node)
+        end
+    end
+    return result
+end
 
 function _M.set_by_route(route, api_ctx)
     if api_ctx.upstream_conf then
@@ -310,6 +339,14 @@ function _M.set_by_route(route, api_ctx)
             return HTTP_CODE_UPSTREAM_UNAVAILABLE, "no valid upstream node: " .. (err or "nil")
         end
 
+        if up_conf.metadata_match then
+            new_nodes = match_nodes_by_metadata(new_nodes, up_conf.metadata_match)
+            if #new_nodes == 0 then
+                return HTTP_CODE_UPSTREAM_UNAVAILABLE, "no matched node filterd by metadata_match"
+            end
+            core.log.info("filterd by metadata_match: ", core.json.delay_encode(new_nodes, true))
+        end
+
         local same = upstream_util.compare_upstream_node(up_conf, new_nodes)
         if not same then
             if not up_conf._nodes_ver then

t/node/upstream-discovery.t

@@ -508,3 +508,64 @@ qr/compare upstream nodes by value|fill node info for upstream/
 fill node info for upstream
 compare upstream nodes by value
 fill node info for upstream
+
+=== TEST 11: test metadata_match for upstream nodes selection
+--- log_level: debug
+--- apisix_yaml
+routes:
+  -
+    uri: /hello
+    upstream:
+      type: roundrobin
+      nodes:
+        "127.0.0.1:1980":
+          weight: 1
+          metadata:
+            version: v1
+        "127.0.0.2:1980":
+          weight: 1
+          metadata:
+            version: v2
+      metadata_match:
+        version: v2
+--- config
+    location /t {
+        content_by_lua_block {
+            local discovery = require("apisix.discovery.init").discovery
+            -- mock nodes with metadata
+            discovery.mock = {
+                nodes = function()
+                    return {
+                        {host = "127.0.0.1", port = 1980, weight = 1, metadata = {version = "v1"}},
+                        {host = "127.0.0.2", port = 1980, weight = 1, metadata = {version = "v2"}},
+                    }
+                end
+            }
+
+            local http = require "resty.http"
+            local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello"
+            local httpc = http.new()
+
+            -- do 5 requests and expect upstream node with metadata.version == v2 (127.0.0.2)
+            for i = 1, 5 do
+                local res = httpc:request_uri(uri, {method = "GET", keepalive = false})
+                if res.status ~= 200 then
+                    ngx.say("request failed: ", res.status)
+                    return
+                end
+                if not string.find(res.body, "127.0.0.2") then
+                    ngx.say("unexpected upstream node: ", res.body)
+                    return
+                end
+            end
+            ngx.say("pass")
+        }
+    }
+--- response_body
+pass
+--- grep_error_log eval
+qr/compare upstream nodes by value|fill node info for upstream|metadata_match/
+--- grep_error_log_out
+fill node info for upstream
+compare upstream nodes by value
+metadata_match found for upstream