From 983b82eab9dc2eb435be897af11c4b39c9e55580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= Date: Fri, 13 Dec 2024 08:58:21 +0100 Subject: [PATCH] chore(ci): add kong 3.8 (#1472) * chore(ci): add kong 3.8 * chore: fixed gw 3.8.0 tests (#1474) --------- Co-authored-by: Prashansa Kulshrestha --- .github/workflows/integration-enterprise.yaml | 1 + .github/workflows/integration.yaml | 1 + tests/integration/diff_test.go | 8 ++++---- tests/integration/dump_test.go | 14 +++++++------- tests/integration/sync_test.go | 12 ++++++------ 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/integration-enterprise.yaml b/.github/workflows/integration-enterprise.yaml index fbce80e50..997ad1c7a 100644 --- a/.github/workflows/integration-enterprise.yaml +++ b/.github/workflows/integration-enterprise.yaml @@ -23,6 +23,7 @@ jobs: - 'kong/kong-gateway:3.5' - 'kong/kong-gateway:3.6' - 'kong/kong-gateway:3.7' + - 'kong/kong-gateway:3.8' - 'kong/kong-gateway-dev:latest' env: KONG_ANONYMOUS_REPORTS: "off" diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 7786e2b09..c411780f6 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -23,6 +23,7 @@ jobs: - 'kong:3.5' - 'kong:3.6' - 'kong:3.7' + - 'kong:3.8' - 'kong/kong:master' env: KONG_ANONYMOUS_REPORTS: "off" diff --git a/tests/integration/diff_test.go b/tests/integration/diff_test.go index ff2fd9b59..bd1bd8557 100644 --- a/tests/integration/diff_test.go +++ b/tests/integration/diff_test.go @@ -758,14 +758,14 @@ func Test_Diff_NoDiffUnorderedArray(t *testing.T) { runWhen string }{ { - name: "no diffs with unordered arrays >=3.5.0 <3.8.1", + name: "no diffs with unordered arrays >=3.5.0 <3.8.0", stateFile: "testdata/diff/004-no-diff-plugin/kong.yaml", - runWhen: ">=3.5.0 <3.8.1", + runWhen: ">=3.5.0 <3.8.0", }, { - name: "no diffs with unordered arrays >=3.8.1", + name: "no diffs with unordered arrays >=3.8.0", stateFile: "testdata/diff/004-no-diff-plugin/kong.yaml", - runWhen: ">=3.8.1", + runWhen: ">=3.8.0", }, } for _, tc := range tests { diff --git a/tests/integration/dump_test.go b/tests/integration/dump_test.go index 87ec7c453..ac0e76a92 100644 --- a/tests/integration/dump_test.go +++ b/tests/integration/dump_test.go @@ -50,16 +50,16 @@ func Test_Dump_SelectTags_3x(t *testing.T) { runWhen string }{ { - name: "dump with select-tags >=3.1.0 <3.8.1", + name: "dump with select-tags >=3.1.0 <3.8.0", stateFile: "testdata/dump/001-entities-with-tags/kong.yaml", expectedFile: "testdata/dump/001-entities-with-tags/expected.yaml", - runWhen: ">=3.1.0 <3.8.1", + runWhen: ">=3.1.0 <3.8.0", }, { - name: "dump with select-tags 3.8.1", + name: "dump with select-tags 3.8.0", stateFile: "testdata/dump/001-entities-with-tags/kong.yaml", expectedFile: "testdata/dump/001-entities-with-tags/expected381.yaml", - runWhen: ">=3.8.1", + runWhen: ">=3.8.0", }, } for _, tc := range tests { @@ -131,14 +131,14 @@ func Test_Dump_SkipConsumers(t *testing.T) { stateFile: "testdata/dump/002-skip-consumers/kong34.yaml", expectedFile: "testdata/dump/002-skip-consumers/expected-no-skip-35.yaml", skipConsumers: false, - runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.5.0 <3.8.1") }, + runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.5.0 <3.8.0") }, }, { - name: "3.8.1 dump with no skip-consumers", + name: "3.8.0 dump with no skip-consumers", stateFile: "testdata/dump/002-skip-consumers/kong34.yaml", expectedFile: "testdata/dump/002-skip-consumers/expected-no-skip-381.yaml", skipConsumers: false, - runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.8.1 <3.9.0") }, + runWhen: func(t *testing.T) { runWhen(t, "enterprise", ">=3.8.0 <3.9.0") }, }, { name: "3.9.0 dump with no skip-consumers", diff --git a/tests/integration/sync_test.go b/tests/integration/sync_test.go index 910e5f957..a84c24460 100644 --- a/tests/integration/sync_test.go +++ b/tests/integration/sync_test.go @@ -3322,7 +3322,7 @@ func Test_Sync_PluginsOnEntitiesFrom_3_0_0(t *testing.T) { runWhen string }{ { - name: "create plugins on services, routes and consumers <3.8.1", + name: "create plugins on services, routes and consumers <3.8.0", kongFile: "testdata/sync/xxx-plugins-on-entities/kong.yaml", expectedState: utils.KongRawState{ Services: svc1_207, @@ -3330,10 +3330,10 @@ func Test_Sync_PluginsOnEntitiesFrom_3_0_0(t *testing.T) { Plugins: plugin_on_entities3x, Consumers: consumer, }, - runWhen: ">=3.0.0 <3.8.1", + runWhen: ">=3.0.0 <3.8.0", }, { - name: "create plugins on services, routes and consumers >=3.8.1", + name: "create plugins on services, routes and consumers >=3.8.0", kongFile: "testdata/sync/xxx-plugins-on-entities/kong.yaml", expectedState: utils.KongRawState{ Services: svc1_207, @@ -3341,7 +3341,7 @@ func Test_Sync_PluginsOnEntitiesFrom_3_0_0(t *testing.T) { Plugins: plugin_on_entities381x, Consumers: consumer, }, - runWhen: ">=3.8.1", + runWhen: ">=3.8.0", }, } @@ -5175,7 +5175,7 @@ func Test_Sync_ConsumerGroupsScopedPlugins_After360(t *testing.T) { }, { name: "creates consumer groups scoped plugins", - runWhen: ">=3.7.0 <3.8.1", + runWhen: ">=3.7.0 <3.8.0", kongFile: "testdata/sync/025-consumer-groups-scoped-plugins/kong3x.yaml", expectedState: utils.KongRawState{ Consumers: consumerGroupsConsumers, @@ -5228,7 +5228,7 @@ func Test_Sync_ConsumerGroupsScopedPlugins_After360(t *testing.T) { }, { name: "creates consumer groups scoped plugins", - runWhen: ">=3.8.1 <3.9.0", + runWhen: ">=3.8.0 <3.9.0", kongFile: "testdata/sync/025-consumer-groups-scoped-plugins/kong3x.yaml", expectedState: utils.KongRawState{ Consumers: consumerGroupsConsumers,