From 09b024e92eb74943aa1142bb2e33bd9a65e58c1b Mon Sep 17 00:00:00 2001
From: Riya Mehta <riyamehta@google.com>
Date: Tue, 6 May 2025 15:21:05 -0700
Subject: [PATCH] don't check transport channel provider endpoint.

---
 .../google/api/gax/rpc/EndpointContext.java   |  3 +--
 .../api/gax/rpc/EndpointContextTest.java      | 21 -------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/gax-java/gax/src/main/java/com/google/api/gax/rpc/EndpointContext.java b/gax-java/gax/src/main/java/com/google/api/gax/rpc/EndpointContext.java
index ce5cf8c786..f3d1c4245f 100644
--- a/gax-java/gax/src/main/java/com/google/api/gax/rpc/EndpointContext.java
+++ b/gax-java/gax/src/main/java/com/google/api/gax/rpc/EndpointContext.java
@@ -327,8 +327,7 @@ boolean shouldUseS2A() {
       }
 
       // If a custom endpoint is being used, skip S2A.
-      if (!Strings.isNullOrEmpty(clientSettingsEndpoint())
-          || !Strings.isNullOrEmpty(transportChannelProviderEndpoint())) {
+      if (!Strings.isNullOrEmpty(clientSettingsEndpoint())) {
         return false;
       }
 
diff --git a/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java b/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
index dd1d383801..d66a7c7001 100644
--- a/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
+++ b/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
@@ -381,7 +381,6 @@ void endpointContextBuild_shouldUseS2A_tlsEndpoint() throws IOException {
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setUsingGDCH(false);
     EndpointContext endpointContext = defaultEndpointContextBuilder.build();
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isTrue();
@@ -479,7 +478,6 @@ void shouldUseS2A_envVarNotSet_returnsFalse() throws IOException {
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setUsingGDCH(false);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
   }
@@ -492,7 +490,6 @@ void shouldUseS2A_UsingGDCH_returnsFalse() throws IOException {
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setUsingGDCH(true);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
   }
@@ -505,20 +502,6 @@ void shouldUseS2A_customEndpointSetViaClientSettings_returnsFalse() throws IOExc
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("test.endpoint.com:443")
-            .setTransportChannelProviderEndpoint("")
-            .setUsingGDCH(false);
-    Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
-  }
-
-  @Test
-  void shouldUseS2A_customEndpointSetViaTransportChannelProvider_returnsFalse() throws IOException {
-    EnvironmentProvider envProvider = Mockito.mock(EnvironmentProvider.class);
-    Mockito.when(envProvider.getenv(EndpointContext.S2A_ENV_ENABLE_USE_S2A)).thenReturn("true");
-    defaultEndpointContextBuilder =
-        defaultEndpointContextBuilder
-            .setEnvProvider(envProvider)
-            .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("test.endpoint.com:443")
             .setUsingGDCH(false);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
   }
@@ -531,7 +514,6 @@ void shouldUseS2A_mtlsEndpointNull_returnsFalse() throws IOException {
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setUsingGDCH(false)
             .setMtlsEndpoint(null);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
@@ -545,7 +527,6 @@ void shouldUseS2A_mtlsEndpointEmpty_returnsFalse() throws IOException {
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setMtlsEndpoint("")
             .setUsingGDCH(false);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
@@ -559,7 +540,6 @@ void shouldUseS2A_mtlsEndpointNotGoogleDefaultUniverse_returnsFalse() throws IOE
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setMtlsEndpoint("test.mtls.abcd.com:443")
             .setUsingGDCH(false);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
@@ -573,7 +553,6 @@ void shouldUseS2A_success() throws IOException {
         defaultEndpointContextBuilder
             .setEnvProvider(envProvider)
             .setClientSettingsEndpoint("")
-            .setTransportChannelProviderEndpoint("")
             .setUsingGDCH(false);
     Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isTrue();
   }