fix tests, fix missig slash in socket path

Kong · Aug 23, 2024 · 90761b1 · 90761b1
1 parent 65a9ca1
commit 90761b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/kong/tools/stream_api.lua b/kong/tools/stream_api.lua
@@ -40,7 +40,7 @@ local HEADER_LEN = #st_pack(PACK_F, MAX_KEY_LEN, MAX_DATA_LEN)
 
 -- this module may be loaded before `kong.configuration` is initialized
 local SOCKET_PATH = "unix:" .. ngx.config.prefix() .. "/"
-                    .. constants.SOCKET_DIRECTORY .. constants.SOCKETS.STREAM_RPC
+                    .. constants.SOCKET_DIRECTORY .. "/" .. constants.SOCKETS.STREAM_RPC
 
 local stream_api = {}
 

diff --git a/spec/01-unit/03-conf_loader_spec.lua b/spec/01-unit/03-conf_loader_spec.lua
@@ -2472,6 +2472,14 @@ describe("Configuration loader", function()
         -- CONF_BASIC
         prefix = true,
         socket_path = true,
+        socket_path = true,
+        worker_events_sock = true,
+        stream_worker_events_sock = true,
+        stream_rpc_sock = true,
+        stream_config_sock = true,
+        stream_tls_passthrough_sock = true,
+        stream_tls_terminate_sock = true,
+        cluster_proxy_ssl_terminator_sock = true,
         vaults = true,
         database = true,
         lmdb_environment_path = true,
@@ -2522,7 +2530,7 @@ describe("Configuration loader", function()
       }
       local conf = assert(conf_loader(nil, nil, { pre_cmd = true }))
       for k, _ in pairs(conf) do
-        assert.equal(true, FIELDS[k])
+        assert.equal(true, FIELDS[k], "key " .. k .. " is not in FIELDS")
       end
     end)
   end)