tests: reverted to older setup

.ci/setup_kong.sh

@@ -26,3 +26,5 @@ docker run \
 waitContainer "$GATEWAY_CONTAINER_NAME" kong health
 
 waitContainer "$GATEWAY_CONTAINER_NAME" kong version
+
+waitContainer "$GATEWAY_CONTAINER_NAME" env

.ci/setup_kong_check.sh

@@ -60,4 +60,6 @@ docker run -d --name $GATEWAY_CONTAINER_NAME \
   -p 127.0.0.1:8444:8444 \
   $KONG_IMAGE
 
-waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong health"
+waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong health"
+
+waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong version"

.github/workflows/integration.yaml

@@ -39,7 +39,7 @@ jobs:
         with:
           go-version-file: go.mod
       - name: Setup Kong
-        run: make setup-kong-new
+        run: make setup-kong
       - name: Run integration tests
         run: make test-integration
         continue-on-error: ${{ matrix.kong_image == 'kong/kong:master' }}

cmd/common.go

@@ -626,7 +626,7 @@ func containsProxyConfiguration(content reconcilerUtils.KongRawState) bool {
 	return len(content.Services) != 0 ||
 		len(content.Routes) != 0 ||
 		len(content.Plugins) != 0 ||
-		//len(content.FilterChains) != 0 ||
+		len(content.FilterChains) != 0 ||
 		len(content.Upstreams) != 0 ||
 		len(content.Certificates) != 0 ||
 		len(content.CACertificates) != 0 ||

cmd/gateway_validate.go

@@ -413,8 +413,8 @@ func ensureGetAllMethods() error {
 	if _, err := reconcilerUtils.CallGetAll(dummyEmptyState.RBACRoles); err != nil {
 		return err
 	}
-	// if _, err := reconcilerUtils.CallGetAll(dummyEmptyState.FilterChains); err != nil {
-	// 	return err
-	// }
+	if _, err := reconcilerUtils.CallGetAll(dummyEmptyState.FilterChains); err != nil {
+		return err
+	}
 	return nil
 }

tests/integration/dump_test.go

@@ -308,43 +308,43 @@ func Test_Dump_ConsumerGroupConsumersWithCustomID_Konnect(t *testing.T) {
 	assert.Equal(t, expected, output)
 }
 
-// func Test_Dump_FilterChains(t *testing.T) {
-// 	runWhen(t, "kong", ">=3.4.0")
-// 	setup(t)
-
-// 	tests := []struct {
-// 		version  string
-// 		input    string
-// 		expected string
-// 	}{
-// 		{
-// 			version:  "<3.5.0",
-// 			input:    "testdata/dump/004-filter-chains/kong-3.4.x.yaml",
-// 			expected: "testdata/dump/004-filter-chains/expected-3.4.x.yaml",
-// 		},
-// 		{
-// 			version:  ">=3.5.0",
-// 			input:    "testdata/dump/004-filter-chains/kong.yaml",
-// 			expected: "testdata/dump/004-filter-chains/expected.yaml",
-// 		},
-// 	}
-
-// 	for _, tc := range tests {
-// 		t.Run(tc.version, func(t *testing.T) {
-// 			runWhen(t, "kong", tc.version)
-// 			require.NoError(t, sync(context.Background(), tc.input))
-
-// 			var output string
-// 			flags := []string{"-o", "-"}
-// 			output, err := dump(flags...)
-// 			assert.NoError(t, err)
-
-// 			expected, err := readFile(tc.expected)
-// 			assert.NoError(t, err)
-// 			assert.Equal(t, expected, output)
-// 		})
-// 	}
-// }
+func Test_Dump_FilterChains(t *testing.T) {
+	runWhen(t, "kong", ">=3.4.0")
+	setup(t)
+
+	tests := []struct {
+		version  string
+		input    string
+		expected string
+	}{
+		{
+			version:  "<3.5.0",
+			input:    "testdata/dump/004-filter-chains/kong-3.4.x.yaml",
+			expected: "testdata/dump/004-filter-chains/expected-3.4.x.yaml",
+		},
+		{
+			version:  ">=3.5.0",
+			input:    "testdata/dump/004-filter-chains/kong.yaml",
+			expected: "testdata/dump/004-filter-chains/expected.yaml",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.version, func(t *testing.T) {
+			runWhen(t, "kong", tc.version)
+			require.NoError(t, sync(context.Background(), tc.input))
+
+			var output string
+			flags := []string{"-o", "-"}
+			output, err := dump(flags...)
+			assert.NoError(t, err)
+
+			expected, err := readFile(tc.expected)
+			assert.NoError(t, err)
+			assert.Equal(t, expected, output)
+		})
+	}
+}
 
 func Test_SkipConsumersWithConsumerGroups(t *testing.T) {
 	tests := []struct {