Merge branch 'release/3.8.x' into backport-13567-to-release/3.8.x

Kong · Aug 26, 2024 · ce62f1c · ce62f1c
2 parents 60cdb36 + eb8a716
commit ce62f1c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.requirements b/.requirements
@@ -21,7 +21,7 @@ LUA_RESTY_WEBSOCKET=966c69c39f03029b9b42ec0f8e55aaed7d6eebc0 # 0.4.0.1
 ATC_ROUTER=ffd11db657115769bf94f0c4f915f98300bc26b6 # 1.6.2
 SNAPPY=23b3286820105438c5dbb9bc22f1bb85c5812c8a # 1.2.0
 
-KONG_MANAGER=v3.8.0.0
+KONG_MANAGER=v3.8.0.0-1
 NGX_WASM_MODULE=96b4e27e10c63b07ed40ea88a91c22f23981db35
 WASMER=3.1.1
 WASMTIME=23.0.2

diff --git a/kong/clustering/compat/removed_fields.lua b/kong/clustering/compat/removed_fields.lua
@@ -197,6 +197,7 @@ return {
       "llm.model.options.bedrock",
       "llm.auth.aws_access_key_id",
       "llm.auth.aws_secret_access_key",
+      "llm.auth.allow_override",
     },
     ai_response_transformer = {
       "max_request_body_size",
@@ -206,6 +207,7 @@ return {
       "llm.model.options.bedrock",
       "llm.auth.aws_access_key_id",
       "llm.auth.aws_secret_access_key",
+      "llm.auth.allow_override",
     },
     prometheus = {
       "ai_metrics",

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
@@ -706,8 +706,9 @@ describe("CP/DP config compat transformations #" .. strategy, function()
 
         local expected = cycle_aware_deep_copy(ai_request_transformer)
 
-        -- max body size
+        -- shared
         expected.config.max_request_body_size = nil
+        expected.config.llm.auth.allow_override = nil
 
         -- gemini fields
         expected.config.llm.auth.gcp_service_account_json = nil
@@ -770,8 +771,9 @@ describe("CP/DP config compat transformations #" .. strategy, function()
 
         local expected = cycle_aware_deep_copy(ai_response_transformer)
 
-        -- max body size
+        -- shared
         expected.config.max_request_body_size = nil
+        expected.config.llm.auth.allow_override = nil
 
         -- gemini fields
         expected.config.llm.auth.gcp_service_account_json = nil
@@ -869,6 +871,7 @@ describe("CP/DP config compat transformations #" .. strategy, function()
               auth = {
                 header_name = "header",
                 header_value = "value",
+                allow_override = true,
               },
               model = {
                 name = "any-model-name",
@@ -890,8 +893,9 @@ describe("CP/DP config compat transformations #" .. strategy, function()
 
         local expected = cycle_aware_deep_copy(ai_request_transformer)
 
-        -- max body size
+        -- shared
         expected.config.max_request_body_size = nil
+        expected.config.llm.auth.allow_override = nil
 
         -- gemini fields
         expected.config.llm.auth.gcp_service_account_json = nil
@@ -925,6 +929,7 @@ describe("CP/DP config compat transformations #" .. strategy, function()
               auth = {
                 header_name = "header",
                 header_value = "value",
+                allow_override = true,
               },
               model = {
                 name = "any-model-name",
@@ -944,8 +949,9 @@ describe("CP/DP config compat transformations #" .. strategy, function()
 
         local expected = cycle_aware_deep_copy(ai_response_transformer)
 
-        -- max body size
+        -- shared
         expected.config.max_request_body_size = nil
+        expected.config.llm.auth.allow_override = nil
 
         -- gemini fields
         expected.config.llm.auth.gcp_service_account_json = nil