Skip to content

Commit af57081

Browse files
committed
chore: Fix tests to not validate the URI
1 parent b7867f4 commit af57081

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/rpc/ClientContext.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import com.google.common.collect.ImmutableMap;
5858
import com.google.common.collect.Sets;
5959
import java.io.IOException;
60-
import java.net.URI;
6160
import java.util.Collections;
6261
import java.util.HashMap;
6362
import java.util.List;
@@ -355,13 +354,6 @@ static GdchCredentials getGdchCredentials(
355354
} else {
356355
throw new IllegalArgumentException("Could not infer GDCH api audience from settings");
357356
}
358-
359-
URI gdchAudienceUri;
360-
try {
361-
gdchAudienceUri = URI.create(audienceString);
362-
} catch (IllegalArgumentException ex) { // thrown when passing a malformed uri string
363-
throw new IllegalArgumentException("The GDC-H API audience string is not a valid URI", ex);
364-
}
365357
return ((GdchCredentials) credentials).createWithGdchAudience(audienceString);
366358
}
367359

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/rpc/ClientContextTest.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static com.google.common.truth.Truth.assertThat;
3434
import static org.junit.jupiter.api.Assertions.assertEquals;
3535
import static org.junit.jupiter.api.Assertions.assertFalse;
36+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
3637
import static org.junit.jupiter.api.Assertions.assertNotNull;
3738
import static org.junit.jupiter.api.Assertions.assertNotSame;
3839
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -63,7 +64,6 @@
6364
import com.google.common.collect.ImmutableMap;
6465
import com.google.common.truth.Truth;
6566
import java.io.IOException;
66-
import java.net.URI;
6767
import java.util.Collections;
6868
import java.util.List;
6969
import java.util.Map;
@@ -1025,7 +1025,8 @@ void testCreateClientContext_withGdchCredentialAndValidAudience() throws IOExcep
10251025
}
10261026

10271027
@Test
1028-
void testCreateClientContext_withGdchCredentialAndInvalidAudience_throws() throws IOException {
1028+
void testCreateClientContext_withGdchCredentialAndInvalidAudience_doesNotThrow()
1029+
throws IOException {
10291030
TransportChannelProvider transportChannelProvider = getFakeTransportChannelProvider();
10301031
Credentials creds = getMockGdchCredentials();
10311032
CredentialsProvider provider = FixedCredentialsProvider.create(creds);
@@ -1041,17 +1042,14 @@ void testCreateClientContext_withGdchCredentialAndInvalidAudience_throws() throw
10411042
clientSettingsBuilder.setCredentialsProvider(provider);
10421043
clientSettingsBuilder.setTransportChannelProvider(transportChannelProvider);
10431044
final ClientSettings withGdchCredentialsAndMalformedApiAudience = clientSettingsBuilder.build();
1044-
// should throw
1045-
String exMessage =
1046-
assertThrows(
1047-
IllegalArgumentException.class,
1048-
() -> ClientContext.create(withGdchCredentialsAndMalformedApiAudience))
1049-
.getMessage();
1050-
assertThat(exMessage).contains("The GDC-H API audience string is not a valid URI");
1045+
1046+
// There is an invalid URI for the GDCH audience, but we do not validate the URI
1047+
// There are some use cases where there the GDCH audience is not a URI.
1048+
ClientContext clientContext = ClientContext.create(withGdchCredentialsAndMalformedApiAudience);
1049+
assertInstanceOf(GdchCredentials.class, clientContext.getCredentials());
10511050

10521051
Credentials fromProvider = provider.getCredentials();
1053-
verify((GdchCredentials) fromProvider, times(0))
1054-
.createWithGdchAudience(URI.create("test-endpoint"));
1052+
verify((GdchCredentials) fromProvider, times(0)).createWithGdchAudience("test-endpoint");
10551053
}
10561054

10571055
@Test

0 commit comments

Comments
 (0)