feat: update lua-resty-radixtree to 2.5 (#2971)

Co-authored-by: roketyyang <roketyyang@tencent.com>
apache · Dec 5, 2020 · c41aa85 · c41aa85
1 parent 2472db5
commit c41aa85
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 1 deletion.
diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
@@ -41,7 +41,7 @@ dependencies = {
     "lua-resty-cookie = 0.1.0",
     "lua-resty-session = 2.24",
     "opentracing-openresty = 0.1",
-    "lua-resty-radixtree = 2.4",
+    "lua-resty-radixtree = 2.5",
     "lua-protobuf = 0.3.1",
     "lua-resty-openidc = 1.7.2-1",
     "luafilesystem = 1.7.0-2",

diff --git a/t/router/radixtree-uri-vars.t b/t/router/radixtree-uri-vars.t
@@ -0,0 +1,157 @@
+#
+# 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);
+log_level('info');
+worker_connections(256);
+no_root_location();
+no_shuffle();
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set route(id: 1) with vars(user_agent ~* android)
+--- 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,
+                 [=[{
+                        "methods": ["GET"],
+                        "upstream": {
+                            "nodes": {
+                                "127.0.0.1:1980": 1
+                            },
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello",
+                        "vars": [["http_user_agent", "~*", "android"]]
+                }]=]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 2: not found because user_agent=ios
+--- request
+GET /hello
+--- more_headers
+User-Agent: ios
+--- error_code: 404
+--- response_body
+{"error_msg":"404 Route Not Found"}
+--- no_error_log
+[error]
+
+
+
+=== TEST 3: hit routes with user_agent=android
+--- request
+GET /hello
+--- more_headers
+User-Agent: android
+--- response_body
+hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 4: hit routes with user_agent=Android
+--- request
+GET /hello
+--- more_headers
+User-Agent: Android
+--- response_body
+hello world
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: set route(id: 1) with vars(user_agent ! ~* android)
+--- 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,
+                 [=[{
+                        "methods": ["GET"],
+                        "upstream": {
+                            "nodes": {
+                                "127.0.0.1:1980": 1
+                            },
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello",
+                        "vars": [["http_user_agent", "!", "~*", "android"]]
+                }]=]
+                )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: not found because user_agent=android
+--- request
+GET /hello
+--- more_headers
+User-Agent: android
+--- error_code: 404
+--- response_body
+{"error_msg":"404 Route Not Found"}
+--- no_error_log
+[error]
+
+
+
+=== TEST 7: hit routes with user_agent=ios
+--- request
+GET /hello
+--- more_headers
+User-Agent: ios
+--- response_body
+hello world
+--- no_error_log
+[error]