fix: validation during merging node_listen configuration

apisix/cli/file.lua

@@ -112,6 +112,28 @@ local function tinyyaml_type(t)
 end
 
 
+local function path_is_multi_type(path, type_val)
+    if str_sub(path, 1, 14) == "nginx_config->" and
+            (type_val == "number" or type_val == "string") then
+        return true
+    end
+
+    if path == "apisix->node_listen" and type_val == "number" then
+        return true
+    end
+
+    if path == "apisix->ssl->listen_port" and type_val == "number" then
+        return true
+    end
+
+    if path == "apisix->ssl->listen" and type_val == "number" then
+        return true
+    end
+
+    return false
+end
+
+
 local function merge_conf(base, new_tab, ppath)
     ppath = ppath or ""
 
@@ -143,12 +165,11 @@ local function merge_conf(base, new_tab, ppath)
             if base[key] == nil then
                 base[key] = val
             elseif type(base[key]) ~= type_val then
-                if (ppath == "nginx_config" or str_sub(ppath, 1, 14) == "nginx_config->") and
-                    (type_val == "number" or type_val == "string")
-                then
+                local path = ppath == "" and key or ppath .. "->" .. key
+
+                if path_is_multi_type(path, type_val) then
                     base[key] = val
                 else
-                    local path = ppath == "" and key or ppath .. "->" .. key
                     return nil, "failed to merge, path[" .. path ..  "] expect: " ..
                                 type(base[key]) .. ", but got: " .. type_val
                 end

conf/config-default.yaml

@@ -20,7 +20,9 @@
 #
 
 apisix:
-  node_listen: 9080                # APISIX listening port
+  # node_listen: 9080              # APISIX listening port
+  node_listen:                     # This style support multiple ports
+    - 9080
   enable_admin: true
   enable_admin_cors: true          # Admin API support CORS response headers.
   enable_debug: false