refactor(tools): update references of tools.utils to correct module

kong/plugins/file-log/handler.lua

@@ -1,5 +1,4 @@
 -- Copyright (C) Kong Inc.
-require "kong.tools.utils" -- ffi.cdefs
 local kong_meta = require "kong.meta"
 
 

kong/tools/utils.lua

@@ -24,9 +24,9 @@ do
     "kong.tools.rand",
     "kong.tools.time",
     "kong.tools.string",
-    -- ]] keep it here for compatibility
     "kong.tools.ip",
     "kong.tools.http",
+    -- ]] keep it here for compatibility
   }
 
   for _, str in ipairs(modules) do

spec/helpers.lua

@@ -695,7 +695,7 @@ end
 -- @param opts table with options. See [lua-resty-http](https://github.com/pintsized/lua-resty-http)
 function resty_http_proxy_mt:send(opts, is_reopen)
   local cjson = require "cjson"
-  local utils = require "kong.tools.utils"
+  local encode_args = require("kong.tools.http").encode_args
 
   opts = opts or {}
 
@@ -709,7 +709,7 @@ function resty_http_proxy_mt:send(opts, is_reopen)
     opts.body = cjson.encode(opts.body)
 
   elseif string.find(content_type, "www-form-urlencoded", nil, true) and t_body_table then
-    opts.body = utils.encode_args(opts.body, true, opts.no_array_indexes)
+    opts.body = encode_args(opts.body, true, opts.no_array_indexes)
 
   elseif string.find(content_type, "multipart/form-data", nil, true) and t_body_table then
     local form = opts.body
@@ -738,7 +738,7 @@ function resty_http_proxy_mt:send(opts, is_reopen)
 
   -- build querystring (assumes none is currently in 'opts.path')
   if type(opts.query) == "table" then
-    local qs = utils.encode_args(opts.query)
+    local qs = encode_args(opts.query)
     opts.path = opts.path .. "?" .. qs
     opts.query = nil
   end

spec/helpers/http_mock/nginx_instance.lua

@@ -14,9 +14,16 @@ local error = error
 local assert = assert
 local ngx = ngx
 local io = io
--- It can't be changed to kong.tools.table because the old version
--- does not have kong/tools/table.lua, so the upgrade test will fail.
-local shallow_copy = require("kong.tools.utils").shallow_copy
+
+local shallow_copy
+do
+  local clone = require "table.clone"
+
+  shallow_copy = function(orig)
+    assert(type(orig) == "table")
+    return clone(orig)
+  end
+end
 
 local template = assert(pl_template.compile(template_str))
 local render_env = {ipairs = ipairs, pairs = pairs, error = error, }