Merge branch 'apache:master' into master

Author: Baoyuantop

.github/workflows/build.yml

@@ -47,12 +47,12 @@ jobs:
           submodules: recursive
 
       - name: Setup Go
-        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
         with:
           go-version: "1.17"
 
       - name: Cache deps
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
         env:
           cache-name: cache-deps
         with:
@@ -97,7 +97,7 @@ jobs:
 
       - name: Cache images
         id: cache-images
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
         env:
           cache-name: cache-apisix-docker-images
         with:

.github/workflows/cli.yml

@@ -43,7 +43,7 @@ jobs:
           submodules: recursive
 
       - name: Cache deps
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
         env:
           cache-name: cache-deps
         with:

.github/workflows/push-dev-image-on-commit.yml

@@ -80,7 +80,7 @@ jobs:
 
       - name: Login to Docker Hub
         if: github.ref == 'refs/heads/master'
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -96,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Login to Docker Hub
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/redhat-ci.yaml

@@ -36,7 +36,7 @@ jobs:
         submodules: recursive
 
     - name: Cache deps
-      uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+      uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
       env:
         cache-name: cache-deps
       with:
@@ -122,7 +122,7 @@ jobs:
 
     - name: Cache images
       id: cache-images
-      uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+      uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
       env:
         cache-name: cache-apisix-docker-images
       with:

.github/workflows/source-install.yml

@@ -53,7 +53,7 @@ jobs:
           submodules: recursive
 
       - name: Cache deps
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
+        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
         env:
           cache-name: cache-deps
         with:

apisix-master-0.rockspec

@@ -36,7 +36,7 @@ dependencies = {
     "api7-lua-resty-dns-client = 7.1.0-0",
     "lua-resty-template = 2.0-1",
     "lua-resty-etcd = 1.10.6-0",
-    "api7-lua-resty-http = 0.2.2-0",
+    "api7-lua-resty-http = 0.2.3-0",
     "lua-resty-balancer = 0.05-0",
     "lua-resty-ngxvar = 0.5.2-0",
     "lua-resty-jit-uuid = 0.0.7-2",
@@ -51,7 +51,7 @@ dependencies = {
     "lua-protobuf = 0.5.3-1",
     "lua-resty-openidc = 1.8.0-1",
     "luafilesystem = 1.8.0-1",
-    "nginx-lua-prometheus-api7 = 0.20240201-1",
+    "nginx-lua-prometheus-api7 = 0.20250302-1",
     "jsonschema = 0.9.9-0",
     "lua-resty-ipmatcher = 0.6.1-0",
     "lua-resty-kafka = 0.23-0",
@@ -69,7 +69,7 @@ dependencies = {
     "lua-resty-consul = 0.3-2",
     "penlight = 1.14.0-3",
     "ext-plugin-proto = 0.6.1-0",
-    "casbin = 1.45.0-1",
+    "casbin = 1.46.0-1",
     "inspect == 3.1.3-0",
     "lua-resty-rocketmq = 0.4.2-0",
     "opentelemetry-lua = 0.2-6",

apisix/cli/ops.lua

@@ -767,6 +767,16 @@ Please modify "admin_key" in conf/config.yaml .
 
     end
 
+    -- inject consul discovery shared dict
+    if enabled_discoveries["consul"] then
+        if not sys_conf["discovery_shared_dicts"] then
+            sys_conf["discovery_shared_dicts"] = {}
+        end
+
+        local consul_conf = yaml_conf.discovery["consul"]
+        sys_conf["discovery_shared_dicts"]["consul"] = consul_conf.shared_size or "10m"
+    end
+
     -- fix up lua path
     sys_conf["extra_lua_path"] = get_lua_path(yaml_conf.apisix.extra_lua_path)
     sys_conf["extra_lua_cpath"] = get_lua_path(yaml_conf.apisix.extra_lua_cpath)

apisix/core/table.lua

@@ -30,6 +30,7 @@ local ipairs       = ipairs
 local pairs        = pairs
 local type         = type
 local ngx_re       = require("ngx.re")
+local isarray      = require("table.isarray")
 
 
 local _M = {
@@ -174,10 +175,10 @@ local function merge(origin, extend)
     for k,v in pairs(extend) do
         if type(v) == "table" then
             if type(origin[k] or false) == "table" then
-                if _M.nkeys(origin[k]) ~= #origin[k] then
-                    merge(origin[k] or {}, extend[k] or {})
-                else
+                if isarray(origin[k]) or isarray(v) then
                     origin[k] = v
+                else
+                    merge(origin[k] or {}, extend[k] or {})
                 end
             else
                 origin[k] = v