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 <[email protected]>
Kong · Dec 13, 2024 · 983b82e · 983b82e
1 parent 41c5236
commit 983b82e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -3322,26 +3322,26 @@ 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,
 				Routes:    route1_20x,
 				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,
 				Routes:    route1_20x,
 				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,