removed stray comments

tests/integration/diff_test.go

@@ -751,21 +751,39 @@ func Test_Diff_Unmasked_NewerThan3x(t *testing.T) {
 
 // test scope:
 //   - 3.5
-//
-// Failed for 3.8.1.0
 func Test_Diff_NoDiffUnorderedArray(t *testing.T) {
-	runWhen(t, "enterprise", ">=3.5.0")
-	setup(t)
+	tests := []struct {
+		name      string
+		stateFile string
+		runWhen   string
+	}{
+		{
+			name:      "no diffs with unordered arrays >=3.5.0 <3.8.1",
+			stateFile: "testdata/diff/004-no-diff-plugin/kong.yaml",
+			runWhen:   ">=3.5.0 <3.8.1",
+		},
+		// Uncomment post solving: https://konghq.atlassian.net/browse/FTI-6303
+		// {
+		// 	name:      "no diffs with unordered arrays >=3.8.1",
+		// 	stateFile: "testdata/diff/004-no-diff-plugin/kong.yaml",
+		// 	runWhen:   ">=3.8.1",
+		// },
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			runWhen(t, "enterprise", tc.runWhen)
+			setup(t)
 
-	// test that the diff command does not return any changes when
-	// array fields are not sorted.
-	stateFile := "testdata/diff/004-no-diff-plugin/kong.yaml"
-	assert.NoError(t, sync(stateFile, "--timeout", "60"))
+			// test that the diff command does not return any changes when
+			// array fields are not sorted.
+			assert.NoError(t, sync(tc.stateFile, "--timeout", "60"))
 
-	out, err := diff(stateFile)
-	assert.NoError(t, err)
-	assert.Equal(t, emptyOutput, out)
-	reset(t)
+			out, err := diff(tc.stateFile)
+			assert.NoError(t, err)
+			assert.Equal(t, emptyOutput, out)
+			reset(t)
+		})
+	}
 }
 
 // test scope:

tests/integration/dump_test.go

@@ -42,8 +42,6 @@ func Test_Dump_SelectTags_30(t *testing.T) {
 	}
 }
 
-// Fails on 3.8.1
-// "ai_metrics: false" present in actual, but not expected
 func Test_Dump_SelectTags_3x(t *testing.T) {
 	tests := []struct {
 		name         string
@@ -128,9 +126,6 @@ func Test_Dump_SkipConsumers(t *testing.T) {
 			skipConsumers: true,
 			runWhen:       func(t *testing.T) { runWhen(t, "enterprise", ">=3.5.0") },
 		},
-		// Failing on 3.8.1
-		// Schema changes?
-		// nulls for port, timeouts, etc expected but found real values in actual
 		{
 			name:          "3.5 dump with no skip-consumers",
 			stateFile:     "testdata/dump/002-skip-consumers/kong34.yaml",

tests/integration/sync_test.go

@@ -1414,6 +1414,7 @@ var (
 					"cluster_max_redirections": float64(5),
 					"cluster_nodes":            nil,
 					"connect_timeout":          float64(2000),
+					"connection_is_proxied":    bool(false),
 					"database":                 float64(0),
 					"host":                     string("127.0.0.1"),
 					"keepalive_backlog":        nil,
@@ -1466,6 +1467,7 @@ var (
 					"cluster_max_redirections": float64(5),
 					"cluster_nodes":            nil,
 					"connect_timeout":          float64(2000),
+					"connection_is_proxied":    bool(false),
 					"database":                 float64(0),
 					"host":                     string("127.0.0.1"),
 					"keepalive_backlog":        nil,
@@ -1515,6 +1517,7 @@ var (
 					"cluster_max_redirections": float64(5),
 					"cluster_nodes":            nil,
 					"connect_timeout":          float64(2000),
+					"connection_is_proxied":    bool(false),
 					"database":                 float64(0),
 					"host":                     string("127.0.0.1"),
 					"keepalive_backlog":        nil,
@@ -2956,8 +2959,6 @@ func Test_Sync_PluginsOnEntitiesTill_3_0_0(t *testing.T) {
 
 // test scope:
 //   - 3.0.0+
-//
-// Fails on 3.8.1, ai_metrics not found in expected
 func Test_Sync_PluginsOnEntitiesFrom_3_0_0(t *testing.T) {
 	// setup stage
 	client, err := getTestClient()
@@ -4821,7 +4822,6 @@ func Test_Sync_ConsumerGroupsScopedPlugins_After360(t *testing.T) {
 				},
 			},
 		},
-		// Fails on 3.8.1, schema changes, nulls present in expected instead of real values for ports, hosts, timeouts, etc
 		{
 			name:     "creates consumer groups scoped plugins",
 			runWhen:  ">=3.7.0 <3.8.1",