update strip

Kong · May 29, 2024 · b6ac910 · b6ac910
1 parent d407cdc
commit b6ac910
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/kong/plugins/ai-proxy/handler.lua b/kong/plugins/ai-proxy/handler.lua
@@ -7,7 +7,7 @@ local cjson = require("cjson.safe")
 local kong_utils = require("kong.tools.gzip")
 local kong_meta = require("kong.meta")
 local buffer = require "string.buffer"
-local strip = require("kong.tools.utils").strip
+local strip = require("kong.tools.string").strip
 --
 
 

diff --git a/kong/plugins/bot-detection/handler.lua b/kong/plugins/bot-detection/handler.lua
@@ -1,5 +1,5 @@
 local rules = require "kong.plugins.bot-detection.rules"
-local strip = require("kong.tools.utils").strip
+local strip = require("kong.tools.string").strip
 local lrucache = require "resty.lrucache"
 local kong_meta = require "kong.meta"
 

diff --git a/kong/plugins/oauth2/secret.lua b/kong/plugins/oauth2/secret.lua
@@ -1,4 +1,4 @@
-local utils = require "kong.tools.utils"
+local kong_string = require "kong.tools.string"
 
 
 local type = type
@@ -34,20 +34,20 @@ local ENABLED_ALGORITHMS = {
 
 
 local function infer(value)
-  value = utils.strip(value)
+  value = kong_string.strip(value)
   return tonumber(value, 10) or value
 end
 
 
 local function parse_phc(phc)
-  local parts = utils.split(phc, "$")
+  local parts = kong_string.split(phc, "$")
   local count = #parts
   if count < 2 or count > 5 then
     return nil, "invalid phc string format"
   end
 
   local id = parts[2]
-  local id_parts = utils.split(id, "-")
+  local id_parts = kong_string.split(id, "-")
   local id_count = #id_parts
 
   local prefix
@@ -63,15 +63,15 @@ local function parse_phc(phc)
   local params = {}
   local prms = parts[3]
   if prms then
-    local prm_parts = utils.split(prms, ",")
+    local prm_parts = kong_string.split(prms, ",")
     for i = 1, #prm_parts do
       local param = prm_parts[i]
-      local kv = utils.split(param, "=")
+      local kv = kong_string.split(param, "=")
       local kv_count = #kv
       if kv_count == 1 then
         params[#params + 1] = infer(kv[1])
       elseif kv_count == 2 then
-        local k = utils.strip(kv[1])
+        local k = kong_string.strip(kv[1])
         params[k] = infer(kv[2])
       else
         return nil, "invalid phc string format for parameter"
@@ -96,9 +96,9 @@ local function parse_phc(phc)
   end
 
   return {
-    id     = utils.strip(id),
-    prefix = utils.strip(prefix),
-    digest = utils.strip(digest),
+    id     = kong_string.strip(id),
+    prefix = kong_string.strip(prefix),
+    digest = kong_string.strip(digest),
     params = params,
     salt   = salt,
     hash   = hash,
@@ -133,7 +133,7 @@ if ENABLED_ALGORITHMS.ARGON2 then
     }
     do
       local hash = argon2.hash_encoded("", get_rand_bytes(ARGON2_SALT_LEN), ARGON2_OPTIONS)
-      local parts = utils.split(hash, "$")
+      local parts = kong_string.split(hash, "$")
       remove(parts)
       remove(parts)
       ARGON2_PREFIX = concat(parts, "$")
@@ -171,7 +171,7 @@ if ENABLED_ALGORITHMS.BCRYPT then
 
     do
       local hash = bcrypt.digest("", BCRYPT_ROUNDS)
-      local parts = utils.split(hash, "$")
+      local parts = kong_string.split(hash, "$")
       remove(parts)
       BCRYPT_PREFIX = concat(parts, "$")
     end
@@ -253,7 +253,7 @@ if ENABLED_ALGORITHMS.PBKDF2 then
 
     do
       local hash = derive("")
-      local parts = utils.split(hash, "$")
+      local parts = kong_string.split(hash, "$")
       remove(parts)
       remove(parts)
       PBKDF2_PREFIX = concat(parts, "$")

diff --git a/kong/plugins/response-ratelimiting/header_filter.lua b/kong/plugins/response-ratelimiting/header_filter.lua
@@ -1,4 +1,4 @@
-local utils = require "kong.tools.utils"
+local kong_string = require "kong.tools.string"
 
 
 local kong = kong
@@ -22,15 +22,15 @@ local function parse_header(header_value, limits)
     if type(header_value) == "table" then
       parts = header_value
     else
-      parts = utils.split(header_value, ",")
+      parts = kong_string.split(header_value, ",")
     end
 
     for _, v in ipairs(parts) do
-      local increment_parts = utils.split(v, "=")
+      local increment_parts = kong_string.split(v, "=")
       if #increment_parts == 2 then
-        local limit_name = utils.strip(increment_parts[1])
+        local limit_name = kong_string.strip(increment_parts[1])
         if limits[limit_name] then -- Only if the limit exists
-          increments[utils.strip(increment_parts[1])] = tonumber(utils.strip(increment_parts[2]))
+          increments[kong_string.strip(increment_parts[1])] = tonumber(kong_string.strip(increment_parts[2]))
         end
       end
     end

diff --git a/kong/tracing/propagation/extractors/aws.lua b/kong/tracing/propagation/extractors/aws.lua
@@ -1,8 +1,8 @@
 local _EXTRACTOR        = require "kong.tracing.propagation.extractors._base"
 local propagation_utils = require "kong.tracing.propagation.utils"
 
-local split = require "kong.tools.utils".split
-local strip = require "kong.tools.utils".strip
+local split = require "kong.tools.string".split
+local strip = require "kong.tools.string".strip
 
 local from_hex = propagation_utils.from_hex
 local match    = string.match

diff --git a/spec/02-integration/02-cmd/10-migrations_spec.lua b/spec/02-integration/02-cmd/10-migrations_spec.lua
@@ -1,5 +1,5 @@
 local helpers = require "spec.helpers"
-local utils = require "kong.tools.utils"
+local kong_string = require "kong.tools.string"
 local DB = require "kong.db.init"
 local tb_clone = require "table.clone"
 local shell = require "resty.shell"
@@ -361,7 +361,7 @@ for _, strategy in helpers.each_strategy() do
           plugins = "bundled"
         }, true)
         assert.equal(0, code)
-        assert.equal("Database is already up-to-date", utils.strip(stdout))
+        assert.equal("Database is already up-to-date", kong_string.strip(stdout))
         assert.equal("", stderr)
 
         code, stdout, stderr = run_kong("migrations up -f", {
@@ -400,14 +400,14 @@ for _, strategy in helpers.each_strategy() do
         }, true)
 
         assert.equal(0, code)
-        assert.equal("Database is already up-to-date", utils.strip(stdout))
+        assert.equal("Database is already up-to-date", kong_string.strip(stdout))
         assert.equal("", stderr)
 
         code, stdout, stderr = run_kong("migrations finish", {
           plugins = "bundled"
         }, true)
         assert.equal(0, code)
-        assert.equal("No pending migrations to finish", utils.strip(stdout))
+        assert.equal("No pending migrations to finish", kong_string.strip(stdout))
         assert.equal("", stderr)
 
         code, stdout, stderr = run_kong("migrations finish -f", {