fix(transport): skip s2a for now if service has direct path enabled (#…

…2385)
googleapis · Jan 30, 2024 · 54c764a · 54c764a
1 parent 03042ec
commit 54c764a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/internal/cba.go b/internal/cba.go
@@ -310,7 +310,7 @@ func shouldUseS2A(clientCertSource cert.Source, settings *DialSettings) bool {
 	if settings.HTTPClient != nil {
 		return false
 	}
-	return true
+	return !settings.EnableDirectPath && !settings.EnableDirectPathXds
 }
 
 func isGoogleS2AEnabled() bool {

diff --git a/internal/cba_test.go b/internal/cba_test.go
@@ -166,6 +166,26 @@ func TestGetGRPCTransportConfigAndEndpoint(t *testing.T) {
 			validConfigResp,
 			testMTLSEndpoint,
 		},
+		{
+			"no client cert, S2A address not empty, EnableDirectPath == true",
+			&DialSettings{
+				DefaultMTLSEndpoint: testMTLSEndpoint,
+				DefaultEndpoint:     testRegularEndpoint,
+				EnableDirectPath:    true,
+			},
+			validConfigResp,
+			testRegularEndpoint,
+		},
+		{
+			"no client cert, S2A address not empty, EnableDirectPathXds == true",
+			&DialSettings{
+				DefaultMTLSEndpoint: testMTLSEndpoint,
+				DefaultEndpoint:     testRegularEndpoint,
+				EnableDirectPathXds: true,
+			},
+			validConfigResp,
+			testRegularEndpoint,
+		},
 		{
 			"no client cert, S2A address empty",
 			&DialSettings{
@@ -244,6 +264,28 @@ func TestGetHTTPTransportConfigAndEndpoint_s2a(t *testing.T) {
 			testMTLSEndpoint,
 			false,
 		},
+		{
+			"no client cert, S2A address not empty, EnableDirectPath == true",
+			&DialSettings{
+				DefaultMTLSEndpoint: testMTLSEndpoint,
+				DefaultEndpoint:     testRegularEndpoint,
+				EnableDirectPath:    true,
+			},
+			validConfigResp,
+			testRegularEndpoint,
+			true,
+		},
+		{
+			"no client cert, S2A address not empty, EnableDirectPathXds == true",
+			&DialSettings{
+				DefaultMTLSEndpoint: testMTLSEndpoint,
+				DefaultEndpoint:     testRegularEndpoint,
+				EnableDirectPathXds: true,
+			},
+			validConfigResp,
+			testRegularEndpoint,
+			true,
+		},
 		{
 			"no client cert, S2A address empty",
 			&DialSettings{