This is an automated email from the ASF dual-hosted git repository.
ashishtiwari 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 5eb9f6aa9 fix: use right modifiedIndex for consumer when use
credential (#11649)
5eb9f6aa9 is described below
commit 5eb9f6aa93dee0cbfd48a338389cf0ffffabb50d
Author: Ashish Tiwari <[email protected]>
AuthorDate: Wed Oct 16 14:20:54 2024 +0530
fix: use right modifiedIndex for consumer when use credential (#11649)
---
apisix/consumer.lua | 3 +-
t/plugin/consumer-bug-fix.t | 137 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 139 insertions(+), 1 deletion(-)
diff --git a/apisix/consumer.lua b/apisix/consumer.lua
index f69d069d6..0eb55b5e0 100644
--- a/apisix/consumer.lua
+++ b/apisix/consumer.lua
@@ -114,6 +114,7 @@ local function plugin_consumer()
local the_consumer = consumers:get(consumer_name)
if the_consumer and the_consumer.value then
consumer = core.table.clone(the_consumer.value)
+ consumer.modifiedIndex = the_consumer.modifiedIndex
consumer.credential_id =
get_credential_id_from_etcd_key(val.key)
else
-- Normally wouldn't get here:
@@ -125,6 +126,7 @@ local function plugin_consumer()
end
else
consumer = core.table.clone(val.value)
+ consumer.modifiedIndex = val.modifiedIndex
end
-- if the consumer has labels, set the field custom_id to it.
@@ -137,7 +139,6 @@ local function plugin_consumer()
-- is 'username' field in admin
consumer.consumer_name = consumer.id
consumer.auth_conf = config
- consumer.modifiedIndex = val.modifiedIndex
core.log.info("consumer:", core.json.delay_encode(consumer))
core.table.insert(plugins[name].nodes, consumer)
end
diff --git a/t/plugin/consumer-bug-fix.t b/t/plugin/consumer-bug-fix.t
new file mode 100644
index 000000000..ec9ef481c
--- /dev/null
+++ b/t/plugin/consumer-bug-fix.t
@@ -0,0 +1,137 @@
+#
+# 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';
+
+repeat_each(1);
+no_long_string();
+no_shuffle();
+no_root_location();
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: add consumer jack1
+--- 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": "jack1",
+ "plugins": {
+ "key-auth": {
+ "key": "auth-one"
+ },
+ "echo":{"body": "before change"}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+
+
+
+=== TEST 2: add route
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "uri": "/hello",
+ "upstream": {
+ "type": "roundrobin",
+ "nodes": {
+ "127.0.0.1:1980": 1
+ }
+ },
+ "plugins": {
+ "key-auth": {}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+
+
+
+=== TEST 3: verify 20 times
+--- pipelined_requests eval
+["GET /hello", "GET /hello", "GET /hello", "GET /hello","GET /hello", "GET
/hello", "GET /hello", "GET /hello","GET /hello", "GET /hello", "GET /hello",
"GET /hello","GET /hello", "GET /hello", "GET /hello", "GET /hello","GET
/hello", "GET /hello", "GET /hello", "GET /hello"]
+--- more_headers
+apikey: auth-one
+--- response_body eval
+["before change","before change","before change","before change","before
change","before change","before change","before change","before change","before
change","before change","before change","before change","before change","before
change","before change","before change","before change","before change","before
change"]
+
+
+
+=== TEST 4: modify consumer
+--- 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": "jack1",
+ "plugins": {
+ "key-auth": {
+ "key": "auth-one"
+ },
+ "echo":{"body": "after change"}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+
+
+
+=== TEST 5: verify 20 times
+--- pipelined_requests eval
+["GET /hello", "GET /hello", "GET /hello", "GET /hello","GET /hello", "GET
/hello", "GET /hello", "GET /hello","GET /hello", "GET /hello", "GET /hello",
"GET /hello","GET /hello", "GET /hello", "GET /hello", "GET /hello","GET
/hello", "GET /hello", "GET /hello", "GET /hello"]
+--- more_headers
+apikey: auth-one
+--- response_body eval
+["after change","after change","after change","after change","after
change","after change","after change","after change","after change","after
change","after change","after change","after change","after change","after
change","after change","after change","after change","after change","after
change"]
