From 94a41e436e88c981ca10c9946833a5e37301a1c1 Mon Sep 17 00:00:00 2001 From: Prashansa Kulshrestha Date: Fri, 10 Apr 2026 10:45:56 +0530 Subject: [PATCH 1/3] tests: konnect test fix konnect has rolled back the secure-by-default changes. Thus, rolling back the test changes added earlier --- .../dump/002-skip-consumers/expected-no-skip_konnect.yaml | 2 +- .../konnect/consumer-group-scoped.expected.yaml | 1 - .../konnect/plugin-partial-2.expected.yaml | 6 ------ .../009-skip-defaults/konnect/plugin-partial.expected.yaml | 1 - .../konnect/plugin-shorthand-non-default.expected.yaml | 2 -- .../dump/009-skip-defaults/konnect/plugin.expected.yaml | 3 --- 6 files changed, 1 insertion(+), 14 deletions(-) diff --git a/tests/integration/testdata/dump/002-skip-consumers/expected-no-skip_konnect.yaml b/tests/integration/testdata/dump/002-skip-consumers/expected-no-skip_konnect.yaml index f0ce8c9d3..c976467c7 100644 --- a/tests/integration/testdata/dump/002-skip-consumers/expected-no-skip_konnect.yaml +++ b/tests/integration/testdata/dump/002-skip-consumers/expected-no-skip_konnect.yaml @@ -44,7 +44,7 @@ consumer_groups: sentinel_username: null server_name: null ssl: false - ssl_verify: true + ssl_verify: false timeout: 2000 username: null retry_after_jitter_max: 0 diff --git a/tests/integration/testdata/dump/009-skip-defaults/konnect/consumer-group-scoped.expected.yaml b/tests/integration/testdata/dump/009-skip-defaults/konnect/consumer-group-scoped.expected.yaml index f9a6214a1..41f3ed30e 100644 --- a/tests/integration/testdata/dump/009-skip-defaults/konnect/consumer-group-scoped.expected.yaml +++ b/tests/integration/testdata/dump/009-skip-defaults/konnect/consumer-group-scoped.expected.yaml @@ -10,7 +10,6 @@ consumer_groups: namespace: tPHO9qtcb99zWWUWxSVDQiUpb7kj59ZQ redis: host: example.com - ssl_verify: false strategy: redis sync_rate: -1 window_size: diff --git a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial-2.expected.yaml b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial-2.expected.yaml index 97b1a0a22..e0132719d 100644 --- a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial-2.expected.yaml +++ b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial-2.expected.yaml @@ -5,7 +5,6 @@ partials: - config: host: example.com keepalive_backlog: 0 - ssl_verify: false id: 9e060517-7cae-4425-9ff1-1df11d0e9b5a name: my-partial-ee type: redis-ee @@ -16,11 +15,6 @@ plugins: - abc-client client_secret: - abc-secret - cluster_cache_redis: - ssl_verify: false issuer: http://example-issuer.com - redis: - ssl_verify: false - session_redis_ssl_verify: false enabled: true name: openid-connect diff --git a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial.expected.yaml b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial.expected.yaml index 6e2a42fcd..647efc678 100644 --- a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial.expected.yaml +++ b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-partial.expected.yaml @@ -6,7 +6,6 @@ partials: host: example.com keepalive_backlog: 0 password: redis-pass - ssl_verify: false username: redis-user id: 65a8785d-2e4a-4adb-8805-63e1141219cd name: my-partial-ee diff --git a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-shorthand-non-default.expected.yaml b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-shorthand-non-default.expected.yaml index e8dcf865d..17d9048a3 100644 --- a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-shorthand-non-default.expected.yaml +++ b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin-shorthand-non-default.expected.yaml @@ -6,8 +6,6 @@ plugins: minute: 10 redis: port: 6000 - ssl_verify: false redis_port: 6000 - redis_ssl_verify: false enabled: true name: rate-limiting diff --git a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin.expected.yaml b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin.expected.yaml index 1688d2b52..e45fa78a2 100644 --- a/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin.expected.yaml +++ b/tests/integration/testdata/dump/009-skip-defaults/konnect/plugin.expected.yaml @@ -4,8 +4,5 @@ _konnect: plugins: - config: minute: 10 - redis: - ssl_verify: false - redis_ssl_verify: false enabled: true name: rate-limiting From 7f8ab0b1f0ae16ab9d510aa2dc8496883b9471ee Mon Sep 17 00:00:00 2001 From: Prashansa Kulshrestha Date: Fri, 10 Apr 2026 10:52:59 +0530 Subject: [PATCH 2/3] tests: fixed tests --- tests/integration/sync_test.go | 43 ++++++++++++++++--- .../testdata/sync/039-partials/kong-ids.yaml | 1 + .../testdata/sync/039-partials/kong.yaml | 1 + 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/tests/integration/sync_test.go b/tests/integration/sync_test.go index 4af05930a..58ee8613c 100644 --- a/tests/integration/sync_test.go +++ b/tests/integration/sync_test.go @@ -302,6 +302,39 @@ var ( }, } + pluginKonnect = []*kong.Plugin{ + { + Name: kong.String("basic-auth"), + Protocols: []*string{ + kong.String("grpc"), + kong.String("grpcs"), + kong.String("http"), + kong.String("https"), + }, + Enabled: kong.Bool(true), + Config: kong.Configuration{ + "anonymous": "58076db2-28b6-423b-ba39-a797193017f7", + "hide_credentials": false, + "realm": string("service"), + "brute_force_protection": map[string]interface{}{ + "redis": map[string]interface{}{ + "cloud_authentication": nil, + "database": float64(0), + "host": nil, + "password": nil, + "port": float64(6379), + "server_name": nil, + "ssl": false, + "ssl_verify": false, + "timeout": float64(2000), + "username": nil, + }, + "strategy": string("off"), + }, + }, + }, + } + plugin_on_entities = []*kong.Plugin{ //nolint:revive { Name: kong.String("prometheus"), @@ -3393,7 +3426,7 @@ func testSyncBasicAuthPluginKonnectImpl(t *testing.T) { name: "create a plugin", kongFile: "testdata/sync/003-create-a-plugin/kong3x.yaml", expectedState: utils.KongRawState{ - Plugins: plugin314, + Plugins: pluginKonnect, }, }, } @@ -6088,7 +6121,7 @@ func testSyncSkipConsumersKonnectImpl(t *testing.T) { "sentinel_username": nil, "server_name": nil, "ssl": false, - "ssl_verify": true, + "ssl_verify": false, "timeout": float64(2000), "username": nil, }, @@ -6146,7 +6179,7 @@ func testSyncSkipConsumersKonnectImpl(t *testing.T) { "sentinel_username": nil, "server_name": nil, "ssl": false, - "ssl_verify": true, + "ssl_verify": false, "timeout": float64(2000), "username": nil, }, @@ -6204,7 +6237,7 @@ func testSyncSkipConsumersKonnectImpl(t *testing.T) { "sentinel_username": nil, "server_name": nil, "ssl": false, - "ssl_verify": true, + "ssl_verify": false, "timeout": float64(2000), "username": nil, }, @@ -9483,7 +9516,7 @@ func testSyncPartialsPluginsKonnectImpl(t *testing.T) { "read_timeout": float64(3001), "send_timeout": float64(2004), "ssl": bool(false), - "ssl_verify": bool(true), + "ssl_verify": bool(false), } t.Run("create a partial and link to a plugin via name", func(t *testing.T) { diff --git a/tests/integration/testdata/sync/039-partials/kong-ids.yaml b/tests/integration/testdata/sync/039-partials/kong-ids.yaml index c490ca21d..ed49fa492 100644 --- a/tests/integration/testdata/sync/039-partials/kong-ids.yaml +++ b/tests/integration/testdata/sync/039-partials/kong-ids.yaml @@ -3,6 +3,7 @@ partials: - config: read_timeout: 3001 send_timeout: 2004 + ssl_verify: false name: my-ee-partial type: redis-ee id: 13dc230d-d65e-439a-9f05-9fd71abfee4d diff --git a/tests/integration/testdata/sync/039-partials/kong.yaml b/tests/integration/testdata/sync/039-partials/kong.yaml index 7792673b3..e36720197 100644 --- a/tests/integration/testdata/sync/039-partials/kong.yaml +++ b/tests/integration/testdata/sync/039-partials/kong.yaml @@ -3,6 +3,7 @@ partials: - config: read_timeout: 3001 send_timeout: 2004 + ssl_verify: false name: my-ee-partial type: redis-ee tags: From 4bdda8ada8ec1e0f2a6e06e4aecdbaf82606dc47 Mon Sep 17 00:00:00 2001 From: Prashansa Kulshrestha Date: Fri, 10 Apr 2026 16:22:35 +0530 Subject: [PATCH 3/3] tests: fixed tests for partials --- tests/integration/sync_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/sync_test.go b/tests/integration/sync_test.go index 58ee8613c..5b6d26a7a 100644 --- a/tests/integration/sync_test.go +++ b/tests/integration/sync_test.go @@ -11074,7 +11074,7 @@ func testSyncPartialsTaggingKonnectImpl(t *testing.T) { "read_timeout": float64(3001), "send_timeout": float64(2004), "ssl": bool(false), - "ssl_verify": bool(true), + "ssl_verify": bool(false), }, Tags: kong.StringSlice("redis-partials"), }, @@ -11100,7 +11100,7 @@ func testSyncPartialsTaggingKonnectImpl(t *testing.T) { }, "sentinel_role": string("master"), "ssl": bool(false), - "ssl_verify": bool(true), + "ssl_verify": bool(false), }, Tags: kong.StringSlice("redis-partials"), },