fix failing proxy chain tests

hashicorp · Nov 6, 2023 · b303828 · b303828
1 parent 50dc671
commit b303828
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/agent/xds/resources_test.go b/agent/xds/resources_test.go
@@ -195,12 +195,14 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", false, nil, nil)
 			},
+			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-with-chain-external-sni",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", false, nil, nil)
 			},
+			alsoRunTestForV2: true,
 		},
 		{
 			name: "connect-proxy-exported-to-peers",
@@ -324,13 +326,6 @@ func getConnectProxyDiscoChainTests(enterprise bool) []goldenTestCase {
 			// TODO(proxystate): requires custom cluster work
 			alsoRunTestForV2: false,
 		},
-		{
-			name: "connect-proxy-with-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
 		{
 			name: "connect-proxy-with-chain-http2",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
@@ -340,14 +335,6 @@ func getConnectProxyDiscoChainTests(enterprise bool) []goldenTestCase {
 			},
 			alsoRunTestForV2: true,
 		},
-		{
-			name: "connect-proxy-with-chain-external-sni",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", enterprise, nil, nil)
-			},
-			//TODO(proxystate): this requires terminating gateway work
-			alsoRunTestForV2: true,
-		},
 		{
 			name: "connect-proxy-with-chain-and-overrides",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {