Revert "fix(proxy-cache): changes age param (#12812)"

This reverts commit 4707465.
Kong · Jul 23, 2024 · 5eac36b · 5eac36b
1 parent 44ecc32
commit 5eac36b
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 71 deletions.
diff --git a/changelog/unreleased/kong/fix-age-header.yml b/changelog/unreleased/kong/fix-age-header.yml
diff --git a/kong-3.8.0-0.rockspec b/kong-3.8.0-0.rockspec
@@ -548,7 +548,6 @@ build = {
     ["kong.plugins.proxy-cache.api"]                  = "kong/plugins/proxy-cache/api.lua",
     ["kong.plugins.proxy-cache.strategies"]           = "kong/plugins/proxy-cache/strategies/init.lua",
     ["kong.plugins.proxy-cache.strategies.memory"]    = "kong/plugins/proxy-cache/strategies/memory.lua",
-    ["kong.plugins.proxy-cache.clustering.compat.response_headers_translation"] = "kong/plugins/proxy-cache/clustering/compat/response_headers_translation.lua",
 
     ["kong.plugins.grpc-web.deco"] = "kong/plugins/grpc-web/deco.lua",
     ["kong.plugins.grpc-web.handler"] = "kong/plugins/grpc-web/handler.lua",

diff --git a/kong/clustering/compat/checkers.lua b/kong/clustering/compat/checkers.lua
@@ -26,18 +26,6 @@ local compatible_checkers = {
   { 3008000000, --[[ 3.8.0.0 ]]
     function (config_table, dp_version, log_suffix)
       local has_update
-      local adapter = require("kong.plugins.proxy-cache.clustering.compat.response_headers_translation").adapter
-      for _, plugin in ipairs(config_table.plugins or {}) do
-        if plugin.name == 'proxy-cache' then
-          has_update = adapter(plugin.config)
-          if has_update then
-            log_warn_message('adapts ' .. plugin.name .. ' plugin response_headers configuration to older version',
-                             'revert to older schema',
-                             dp_version, log_suffix)
-          end
-        end
-      end
-
       for _, plugin in ipairs(config_table.plugins or {}) do
         if plugin.name == 'aws-lambda' then
           local config = plugin.config

diff --git a/kong/plugins/proxy-cache/clustering/compat/response_headers_translation.lua b/kong/plugins/proxy-cache/clustering/compat/response_headers_translation.lua
diff --git a/kong/plugins/proxy-cache/schema.lua b/kong/plugins/proxy-cache/schema.lua
@@ -78,7 +78,7 @@ return {
             description = "Caching related diagnostic headers that should be included in cached responses",
             type = "record",
             fields = {
-              { ["Age"]  = {type = "boolean",  default = true} },
+              { age  = {type = "boolean",  default = true} },
               { ["X-Cache-Status"]  = {type = "boolean",  default = true} },
               { ["X-Cache-Key"]  = {type = "boolean",  default = true} },
             },

diff --git a/spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua b/spec/02-integration/09-hybrid_mode/09-config-compat_spec.lua
@@ -479,46 +479,6 @@ describe("CP/DP config compat transformations #" .. strategy, function()
           admin.plugins:remove({ id = response_rl.id })
         end)
       end)
-
-      describe("proxy-cache plugin", function()
-        it("rename age field in response_headers config from age to Age", function()
-          -- [[ 3.8.x ]] --
-          local response_rl = admin.plugins:insert {
-            name = "proxy-cache",
-            enabled = true,
-            config = {
-              response_code = { 200, 301, 404 },
-              request_method = { "GET", "HEAD" },
-              content_type = { "text/plain", "application/json" },
-              cache_ttl = 300,
-              strategy = "memory",
-              cache_control = false,
-              memory = {
-                dictionary_name = "kong_db_cache",
-              },
-              -- [[ age field renamed to Age
-              response_headers = {
-                ["Age"] = true,
-                ["X-Cache-Status"] = true,
-                ["X-Cache-Key"] = true
-              }
-              -- ]]
-            }
-          }
-
-          local expected_response_rl_prior_38 = cycle_aware_deep_copy(response_rl)
-          expected_response_rl_prior_38.config.response_headers = {
-            ["age"] = true,
-            ["X-Cache-Status"] = true,
-            ["X-Cache-Key"] = true
-          }
-
-          do_assert(uuid(), "3.7.0", expected_response_rl_prior_38)
-
-          -- cleanup
-          admin.plugins:remove({ id = response_rl.id })
-        end)
-      end)
     end)
 
     describe("ai plugins", function()

diff --git a/spec/03-plugins/31-proxy-cache/02-access_spec.lua b/spec/03-plugins/31-proxy-cache/02-access_spec.lua
@@ -329,7 +329,7 @@ do
           content_type = { "text/plain", "application/json" },
           [policy] = policy_config,
           response_headers = {
-            ["Age"] = false,
+            age = false,
             ["X-Cache-Status"] = false,
             ["X-Cache-Key"]  = false
           },