change: update resty-radixtree to version 1.9 . (#1730)

apache · Jun 19, 2020 · e38d0a9 · e38d0a9
1 parent b0a1580
commit e38d0a9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
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 = 1.8",
+    "lua-resty-radixtree = 1.9",
     "lua-protobuf = 0.3.1",
     "lua-resty-openidc = 1.7.2-1",
     "luafilesystem = 1.7.0-2",

diff --git a/t/node/vars.t b/t/node/vars.t
@@ -34,7 +34,7 @@ __DATA__
                 ngx.HTTP_PUT,
                 [[{
                     "uri": "/hello",
-                    "vars": [ ["arg_k", "v"] ],
+                    "vars": [ ["arg_k", "==", "v"] ],
                     "upstream": {
                         "nodes": {
                             "127.0.0.1:1980": 1
@@ -100,7 +100,7 @@ hello world
                 ngx.HTTP_PUT,
                 [=[{
                     "uri": "/hello",
-                    "vars": [["cookie_k", "v"]],
+                    "vars": [["cookie_k", "==", "v"]],
                     "upstream": {
                         "nodes": {
                             "127.0.0.1:1980": 1
@@ -170,7 +170,7 @@ hello world
                 ngx.HTTP_PUT,
                 [=[{
                     "uri": "/hello",
-                    "vars": [["http_k", "v"]],
+                    "vars": [["http_k", "==", "v"]],
                     "upstream": {
                         "nodes": {
                             "127.0.0.1:1980": 1
@@ -240,7 +240,7 @@ hello world
                 ngx.HTTP_PUT,
                 [=[{
                     "uri": "/hello",
-                    "vars": [["http_k", "header"], ["cookie_k", "cookie"], ["arg_k", "uri_arg"]],
+                    "vars": [["http_k", "==", "header"], ["cookie_k", "==", "cookie"], ["arg_k", "==", "uri_arg"]],
                     "upstream": {
                         "nodes": {
                             "127.0.0.1:1980": 1

diff --git a/t/plugin/authz-keycloak.t b/t/plugin/authz-keycloak.t
@@ -48,6 +48,7 @@ done
 [error]
 
 
+
 === TEST 2: full schema check
 --- config
     location /t {
@@ -74,6 +75,7 @@ done
 [error]
 
 
+
 === TEST 3: token_endpoint missing
 --- config
     location /t {
@@ -96,6 +98,7 @@ done
 [error]
 
 
+
 === TEST 4: add plugin with view course permissions
 --- config
     location /t {
@@ -209,6 +212,7 @@ true
 [error]
 
 
+
 === TEST 6: invalid access token
 --- config
     location /t {

diff --git a/t/plugin/consumer-restriction.t b/t/plugin/consumer-restriction.t
@@ -284,7 +284,6 @@ passed
 
 
 
-
 === TEST 10: verify unauthorized
 --- request
 GET /hello