Skip to content

s2a fix: don't check transport channel provider endpoint. #3784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −23
Open

s2a fix: don't check transport channel provider endpoint. #3784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09b024e
don't check transport channel provider endpoint.
rmehta19 May 6, 2025
c4ed18e
merge upstream.
rmehta19 May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gax-java/gax/src/main/java/com/google/api/gax/rpc/EndpointContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
21 changes: 0 additions & 21 deletions gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -479,7 +478,6 @@ void shouldUseS2A_envVarNotSet_returnsFalse() throws IOException {
defaultEndpointContextBuilder
.setEnvProvider(envProvider)
.setClientSettingsEndpoint("")
.setTransportChannelProviderEndpoint("")
.setUsingGDCH(false);
Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
}
Expand All @@ -492,7 +490,6 @@ void shouldUseS2A_UsingGDCH_returnsFalse() throws IOException {
defaultEndpointContextBuilder
.setEnvProvider(envProvider)
.setClientSettingsEndpoint("")
.setTransportChannelProviderEndpoint("")
.setUsingGDCH(true);
Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
}
Expand All @@ -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();
}
Expand All @@ -531,7 +514,6 @@ void shouldUseS2A_mtlsEndpointNull_returnsFalse() throws IOException {
defaultEndpointContextBuilder
.setEnvProvider(envProvider)
.setClientSettingsEndpoint("")
.setTransportChannelProviderEndpoint("")
.setUsingGDCH(false)
.setMtlsEndpoint(null);
Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
Expand All @@ -545,7 +527,6 @@ void shouldUseS2A_mtlsEndpointEmpty_returnsFalse() throws IOException {
defaultEndpointContextBuilder
.setEnvProvider(envProvider)
.setClientSettingsEndpoint("")
.setTransportChannelProviderEndpoint("")
.setMtlsEndpoint("")
.setUsingGDCH(false);
Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isFalse();
Expand All @@ -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();
Expand All @@ -573,7 +553,6 @@ void shouldUseS2A_success() throws IOException {
defaultEndpointContextBuilder
.setEnvProvider(envProvider)
.setClientSettingsEndpoint("")
.setTransportChannelProviderEndpoint("")
.setUsingGDCH(false);
Truth.assertThat(defaultEndpointContextBuilder.shouldUseS2A()).isTrue();
}
Expand Down
Loading