fix wrong condition

apache · Mar 23, 2023 · 967ad48 · 967ad48
1 parent 29c2e80
commit 967ad48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
@@ -187,7 +187,7 @@ local function init(env)
     local allow_admin = yaml_conf.deployment.admin and
         yaml_conf.deployment.admin.allow_admin
     if yaml_conf.apisix.enable_admin and allow_admin
-       and table.getn(allow_admin) == 1 and allow_admin[1] == "127.0.0.0/24" then
+       and #allow_admin == 1 and allow_admin[1] == "127.0.0.0/24" then
         checked_admin_key = true
     end
 

diff --git a/t/cli/test_admin.sh b/t/cli/test_admin.sh
@@ -156,8 +156,6 @@ echo "pass: missing admin key and show ERROR message"
 
 # missing admin key, only allow 127.0.0.0/24 to access admin api
 
-git checkout conf/config.yaml
-
 echo '
 deployment:
   admin:
@@ -169,7 +167,7 @@ deployment:
 make init > output.log 2>&1 | true
 
 grep -E "ERROR: missing valid Admin API token." output.log > /dev/null
-if [ ! $? -ne 0 ]; then
+if [ $? -eq 0 ]; then
     echo "failed: should not show 'ERROR: missing valid Admin API token.'"
     exit 1
 fi