You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/12/08 07:24:18 UTC
[apisix] branch master updated: fix: the plugins bound on the service use the latest configuration (#8482)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 4694685c6 fix: the plugins bound on the service use the latest configuration (#8482)
4694685c6 is described below
commit 4694685c60f1c4db57c9d3920b90567ae9e32e5c
Author: tzssangglass <tz...@gmail.com>
AuthorDate: Thu Dec 8 15:24:10 2022 +0800
fix: the plugins bound on the service use the latest configuration (#8482)
Fixes https://github.com/apache/apisix/issues/8481
---
apisix/plugin.lua | 2 +-
t/node/consumer-plugin.t | 114 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/apisix/plugin.lua b/apisix/plugin.lua
index d305f1798..35169e8a8 100644
--- a/apisix/plugin.lua
+++ b/apisix/plugin.lua
@@ -688,7 +688,7 @@ function _M.merge_consumer_route(route_conf, consumer_conf, consumer_group_conf,
.. "#" .. consumer_group_conf.modifiedIndex
end
- local new_conf = merged_route(flag, nil,
+ local new_conf = merged_route(flag, api_ctx.conf_version,
merge_consumer_route, route_conf, consumer_conf, consumer_group_conf)
api_ctx.conf_type = api_ctx.conf_type .. "&consumer"
diff --git a/t/node/consumer-plugin.t b/t/node/consumer-plugin.t
index fce5b05a1..89cdf68cc 100644
--- a/t/node/consumer-plugin.t
+++ b/t/node/consumer-plugin.t
@@ -385,3 +385,117 @@ GET /t
passed
--- error_log
find consumer John_Doe
+
+
+
+=== TEST 12: the plugins bound on the service should use the latest configuration
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/consumers',
+ ngx.HTTP_PUT,
+ [[{
+ "username":"jack",
+ "plugins": {
+ "key-auth": {
+ "key": "auth-jack"
+ }
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "key-auth": {
+ "header": "Authorization"
+ },
+ "proxy-rewrite": {
+ "uri": "/hello1"
+ }
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "methods": [
+ "GET"
+ ],
+ "uri": "/hello",
+ "service_id": "1",
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local http = require "resty.http"
+ local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello"
+ local httpc = http.new()
+ local headers = {
+ ["Authorization"] = "auth-jack"
+ }
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ assert(res.status == 200)
+ if not res then
+ ngx.log(ngx.ERR, err)
+ return
+ end
+ ngx.print(res.body)
+
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "key-auth": {
+ "header": "Authorization"
+ },
+ "proxy-rewrite": {
+ "uri": "/server_port"
+ }
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.1)
+
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ assert(res.status == 200)
+ if not res then
+ ngx.log(ngx.ERR, err)
+ return
+ end
+ ngx.say(res.body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+hello1 world
+1980