chore(deps): bump kong-lapis from 1.8.3.1 to 1.14.0.2 (#10841)

### Summary Check: https://leafo.net/lapis/changelog.html Signed-off-by: Aapo Talvensaari <[email protected]>
Kong · May 12, 2023 · c8675f6 · c8675f6 · khcp-gha-bot · May 12, 2023
1 parent 2e31d8f
commit c8675f6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
 
 - Bumped lua-resty-openssl from 0.8.20 to 0.8.22
   [#10837](https://github.com/Kong/kong/pull/10837)
+- Bumped kong-lapis from 1.8.3.1 to 1.14.0.2
+  [#10841](https://github.com/Kong/kong/pull/10841)
 
 ## 3.3.0
 

diff --git a/kong-3.4.0-0.rockspec b/kong-3.4.0-0.rockspec
@@ -21,7 +21,7 @@ dependencies = {
   "lua-ffi-zlib == 0.5",
   "multipart == 0.5.9",
   "version == 1.0.1",
-  "kong-lapis == 1.8.3.1",
+  "kong-lapis == 1.14.0.2",
   "lua-cassandra == 1.5.2",
   "pgmoon == 1.16.0",
   "luatz == 0.4",

diff --git a/kong/api/routes/kong.lua b/kong/api/routes/kong.lua
@@ -125,15 +125,20 @@ return {
   ["/endpoints"] = {
     GET = function(self, dao, helpers)
       local endpoints = setmetatable({}, cjson.array_mt)
-      local lapis_endpoints = require("kong.api").ordered_routes
-
-      for k, v in pairs(lapis_endpoints) do
-        if type(k) == "string" then -- skip numeric indices
-          endpoints[#endpoints + 1] = k:gsub(":([^/:]+)", function(m)
-              return "{" .. m .. "}"
-            end)
+      local application = require("kong.api")
+      local each_route = require("lapis.application.route_group").each_route
+      local filled_endpoints = {}
+      each_route(application, true, function(path)
+        if type(path) == "table" then
+          path = next(path)
         end
-      end
+        if not filled_endpoints[path] then
+          filled_endpoints[path] = true
+          endpoints[#endpoints + 1] = path:gsub(":([^/:]+)", function(m)
+            return "{" .. m .. "}"
+          end)
+        end
+      end)
       table.sort(endpoints, function(a, b)
         -- when sorting use lower-ascii char for "/" to enable segment based
         -- sorting, so not this: