add changelog

Signed-off-by: sabertobihwy <[email protected]>
Kong · Sep 14, 2023 · a83be88 · a83be88
1 parent 3b05274
commit a83be88
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 41 deletions.
diff --git a/CHANGELOG/unreleased/kong/11566.yaml b/CHANGELOG/unreleased/kong/11566.yaml
@@ -0,0 +1,7 @@
+message: "use deep copies of Route, Service, and Consumer objects when log serialize"
+type: bugfix
+scope: PDK
+prs:
+  - 11566
+jiras:
+  - "FTI-5357"
diff --git a/spec/02-integration/07-sdk/02-log_spec.lua b/spec/02-integration/07-sdk/02-log_spec.lua
@@ -2,7 +2,6 @@ local helpers = require "spec.helpers"
 local cjson   = require "cjson"
 local FILE_LOG_PATH = os.tmpname()
 
-print("FILE_LOG_PATH: ", FILE_LOG_PATH)
 
 local function find_in_file(f, pat)
   local line = f:read("*l")
@@ -130,49 +129,48 @@ for _, strategy in helpers.each_strategy() do
     describe("http subsystem 1", function()
       local proxy_client
       local bp
-      local db
-
+
       lazy_setup(function()
-        bp, db = helpers.get_db_utils(strategy, {
+        bp, _ = helpers.get_db_utils(strategy, {
           "routes",
           "services",
           "plugins",
           "consumers",
           "acls",
           "keyauth_credentials",
         })
-  
+
         local consumer = bp.consumers:insert( {
           username = "foo",
         })
-  
+
         bp.keyauth_credentials:insert {
           key      = "test",
           consumer = { id = consumer.id },
         }
-  
+
         bp.acls:insert {
           group    = "allowed",
           consumer = consumer,
         }
-              
+
         local route1 = bp.routes:insert {
           paths = { "/status/200" },
         }
-  
+
         bp.plugins:insert {
           name = "acl",
           route = { id = route1.id },
           config = {
             allow = { "allowed" },
           },
         }
-  
+
         bp.plugins:insert {
           name     = "key-auth",
           route = { id = route1.id },
         }
-  
+
         bp.plugins:insert {
           name     = "file-log",
           route   = { id = route1.id },
@@ -187,7 +185,7 @@ for _, strategy in helpers.each_strategy() do
             "http"
           },
         }
-  
+
         assert(helpers.start_kong({
           plugins    = "bundled",
           database   = strategy,
@@ -196,19 +194,19 @@ for _, strategy in helpers.each_strategy() do
           nginx_worker_processes = 1,
         }))
       end)
-  
+
       before_each(function()
         proxy_client = helpers.proxy_client()
       end)
-  
+
       after_each(function ()
         proxy_client:close()
       end)
-  
-      lazy_teardown(function()   
+
+      lazy_teardown(function()
         helpers.stop_kong()
       end)
-  
+
       it("use the deep copy of Consumer object in serialize function", function()
         for i = 1, 3 do
           local res = proxy_client:send {
@@ -226,10 +224,9 @@ for _, strategy in helpers.each_strategy() do
     describe("http subsystem 2", function()
       local proxy_client
       local bp
-      local db
 
       lazy_setup(function()
-        bp, db = helpers.get_db_utils(strategy, {
+        bp, _ = helpers.get_db_utils(strategy, {
           "routes",
           "services",
           "plugins",
@@ -247,7 +244,7 @@ for _, strategy in helpers.each_strategy() do
           paths = { "/status/200" },
           service   = service,
         }
-  
+
         bp.plugins:insert {
           name = "error-handler-log",
           config = {},
@@ -275,19 +272,19 @@ for _, strategy in helpers.each_strategy() do
           nginx_worker_processes = 1,
         }))
       end)
-  
+
       before_each(function()
         proxy_client = helpers.proxy_client()
       end)
-  
+
       after_each(function ()
         proxy_client:close()
       end)
-  
-      lazy_teardown(function()   
+
+      lazy_teardown(function()
         helpers.stop_kong()
       end)
-  
+
       it("use the deep copy of Service object in serialize function", function()
         for i = 1, 3 do
           local res = proxy_client:send {
@@ -305,10 +302,9 @@ for _, strategy in helpers.each_strategy() do
     describe("http subsystem 3", function()
       local proxy_client
       local bp
-      local db
 
       lazy_setup(function()
-        bp, db = helpers.get_db_utils(strategy, {
+        bp, _ = helpers.get_db_utils(strategy, {
           "routes",
           "services",
           "plugins",
@@ -324,7 +320,7 @@ for _, strategy in helpers.each_strategy() do
           paths = { "/status/200" },
           service   = service,
         }
-  
+
         assert(bp.plugins:insert {
           name = "request-termination",
           route = { id = route1.id },
@@ -357,19 +353,19 @@ for _, strategy in helpers.each_strategy() do
           nginx_worker_processes = 1,
         }))
       end)
-  
+
       before_each(function()
         proxy_client = helpers.proxy_client()
       end)
-  
+
       after_each(function ()
         proxy_client:close()
       end)
-  
-      lazy_teardown(function()   
+
+      lazy_teardown(function()
         helpers.stop_kong()
       end)
-  
+
       it("use the deep copy of Route object in serialize function", function()
         for i = 1, 3 do
           local res = proxy_client:send {
@@ -387,11 +383,10 @@ for _, strategy in helpers.each_strategy() do
     describe("strean subsystem", function()
       local proxy_client
       local bp
-      local db
 
       local MESSAGE = "echo, ping, pong. echo, ping, pong. echo, ping, pong.\n"
       lazy_setup(function()
-        bp, db = helpers.get_db_utils(strategy, {
+        bp, _ = helpers.get_db_utils(strategy, {
           "routes",
           "services",
           "plugins",
@@ -412,7 +407,7 @@ for _, strategy in helpers.each_strategy() do
           },
           service = service,
         })
-  
+
         bp.plugins:insert {
           name     = "file-log",
           route = { id = route1.id },
@@ -438,19 +433,19 @@ for _, strategy in helpers.each_strategy() do
           proxy_stream_error_log = "logs/error.log",
         }))
       end)
-  
+
       before_each(function()
         proxy_client = helpers.proxy_client()
       end)
-  
+
       after_each(function ()
         proxy_client:close()
       end)
-  
-      lazy_teardown(function()   
+
+      lazy_teardown(function()
         helpers.stop_kong()
       end)
-  
+
       it("use the deep copy of Service object in serialize function", function()
         for i = 1, 3 do
           local tcp_client = ngx.socket.tcp()