Skip to content

googleapis: C2P resolver updates on query params handling #12855

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

Merged
shivaspeaks merged 6 commits into from
Jun 11, 2026
+58 −21
Merged

googleapis: C2P resolver updates on query params handling #12855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86fb58f
buildscripts: add regional td config for psm-interop
shivaspeaks Jun 1, 2026
b3b3e1e
Rename PSM_TEST_SUITE value from 'regional-td' to 'regional_td'
shivaspeaks Jun 2, 2026
6c9d48b
Merge branch 'master' of https://github.com/grpc/grpc-java
shivaspeaks Jun 2, 2026
7c34b7d
Merge branch 'master' of https://github.com/grpc/grpc-java
shivaspeaks Jun 11, 2026
eb6265c
drop the whole query
shivaspeaks Jun 11, 2026
2c0d778
add test to verify ignore multiple dups and support ?force-xds=foo
shivaspeaks Jun 11, 2026
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
16 changes: 3 additions & 13 deletions googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@ private static synchronized BootstrapInfo getBootstrapInfo(boolean isForcedXds)
QueryParams queryParams = QueryParams.fromRawQuery(grpcUri.getRawQuery());
this.forceXds = checkForceXds(queryParams);
this.schemeOverride = (forceXds || isOnGcp) ? "xds" : "dns";
stripForceXds(queryParams);
String newQuery = queryParams.toRawQuery();

Preconditions.checkArgument(
targetPath.startsWith("/"),
Expand All @@ -147,7 +145,7 @@ private static synchronized BootstrapInfo getBootstrapInfo(boolean isForcedXds)
syncContext = checkNotNull(args, "args").getSynchronizationContext();

Uri.Builder modifiedTargetBuilder = grpcUri.toBuilder().setScheme(schemeOverride);
modifiedTargetBuilder.setRawQuery(newQuery);
modifiedTargetBuilder.setRawQuery(null);
if (schemeOverride.equals("xds")) {
modifiedTargetBuilder.setRawAuthority(C2P_AUTHORITY);
}
Expand Down Expand Up @@ -180,8 +178,6 @@ private static synchronized BootstrapInfo getBootstrapInfo(boolean isForcedXds)
QueryParams queryParams = QueryParams.fromRawQuery(targetUri.getRawQuery());
this.forceXds = checkForceXds(queryParams);
this.schemeOverride = (forceXds || isOnGcp) ? "xds" : "dns";
stripForceXds(queryParams);
String newQuery = queryParams.toRawQuery();

Preconditions.checkArgument(
targetUri.isPathAbsolute(),
Expand All @@ -195,11 +191,7 @@ private static synchronized BootstrapInfo getBootstrapInfo(boolean isForcedXds)
authority = GrpcUtil.checkAuthority(pathSegments.get(0));
syncContext = checkNotNull(args, "args").getSynchronizationContext();
Uri.Builder modifiedTargetBuilder = targetUri.toBuilder().setScheme(schemeOverride);
if (newQuery != null) {
modifiedTargetBuilder.setRawQuery(newQuery);
} else {
modifiedTargetBuilder.setRawQuery(null);
}
modifiedTargetBuilder.setRawQuery(null);

if (schemeOverride.equals("xds")) {
modifiedTargetBuilder.setRawAuthority(C2P_AUTHORITY);
Expand Down Expand Up @@ -411,9 +403,7 @@ private static boolean checkForceXds(QueryParams params) {
return false;
}

private static void stripForceXds(QueryParams params) {
params.asList().removeIf(entry -> "force-xds".equals(entry.getKey()));
}


private enum HttpConnectionFactory implements HttpConnectionProvider {
INSTANCE;
Expand Down
63 changes: 55 additions & 8 deletions googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ public void notOnGcpButForceXds_DelegateToXds() {
}

@Test
public void notOnGcpButForceXds_KeyValueTrue_DelegateToXds() {
public void notOnGcpButForceXds_WithValue_DelegateToXds() {
GoogleCloudToProdNameResolver.isOnGcp = false;
String target = TARGET_URI + "?force-xds=true";
String target = TARGET_URI + "?force-xds=foo";
resolver = enableRfc3986UrisParam
? new GoogleCloudToProdNameResolver(
Uri.create(target), args, fakeExecutorResource, nsRegistry.asFactory())
Expand All @@ -235,6 +235,53 @@ public void notOnGcpButForceXds_KeyValueTrue_DelegateToXds() {
}
}

@Test
public void notOnGcpButForceXds_PercentEncoded_DelegateToXds() {
GoogleCloudToProdNameResolver.isOnGcp = false;
String target = TARGET_URI + "?force%2Dxds";
resolver = enableRfc3986UrisParam
? new GoogleCloudToProdNameResolver(
Uri.create(target), args, fakeExecutorResource, nsRegistry.asFactory())
: new GoogleCloudToProdNameResolver(
URI.create(target), args, fakeExecutorResource, nsRegistry.asFactory());
resolver.start(mockListener);
fakeExecutor.runDueTasks();
assertThat(delegatedResolver.keySet()).containsExactly("xds");

if (enableRfc3986UrisParam) {
Uri delegatedRfcUriValue = delegatedRfcUri.get("xds");
assertThat(delegatedRfcUriValue).isNotNull();
assertThat(delegatedRfcUriValue.getRawQuery()).isNull();
} else {
URI delegatedUriValue = delegatedUri.get("xds");
assertThat(delegatedUriValue).isNotNull();
assertThat(delegatedUriValue.getQuery()).isNull();
}
}

@Test
public void notOnGcpButForceXds_DuplicateKeys_DelegateToXds() {
GoogleCloudToProdNameResolver.isOnGcp = false;
String target = TARGET_URI + "?force-xds=&force-xds=true";
resolver = enableRfc3986UrisParam
? new GoogleCloudToProdNameResolver(
Uri.create(target), args, fakeExecutorResource, nsRegistry.asFactory())
: new GoogleCloudToProdNameResolver(
URI.create(target), args, fakeExecutorResource, nsRegistry.asFactory());
resolver.start(mockListener);
fakeExecutor.runDueTasks();
assertThat(delegatedResolver.keySet()).containsExactly("xds");

if (enableRfc3986UrisParam) {
Uri delegatedRfcUriValue = delegatedRfcUri.get("xds");
assertThat(delegatedRfcUriValue).isNotNull();
assertThat(delegatedRfcUriValue.getRawQuery()).isNull();
} else {
URI delegatedUriValue = delegatedUri.get("xds");
assertThat(delegatedUriValue).isNotNull();
assertThat(delegatedUriValue.getQuery()).isNull();
}
}

@Test
public void notOnGcpButForceXds_WithMultipleParams_DelegateToXds() {
Expand All @@ -252,11 +299,11 @@ public void notOnGcpButForceXds_WithMultipleParams_DelegateToXds() {
if (enableRfc3986UrisParam) {
Uri delegatedRfcUriValue = delegatedRfcUri.get("xds");
assertThat(delegatedRfcUriValue).isNotNull();
assertThat(delegatedRfcUriValue.getRawQuery()).isEqualTo("foo=bar&baz=qux");
assertThat(delegatedRfcUriValue.getRawQuery()).isNull();
} else {
URI delegatedUriValue = delegatedUri.get("xds");
assertThat(delegatedUriValue).isNotNull();
assertThat(delegatedUriValue.getQuery()).isEqualTo("foo=bar&baz=qux");
assertThat(delegatedUriValue.getQuery()).isNull();
}
}

Expand All @@ -276,11 +323,11 @@ public void notOnGcpButForceXds_WithEncodedAmpersand_DelegateToXds() {
if (enableRfc3986UrisParam) {
Uri delegatedRfcUriValue = delegatedRfcUri.get("xds");
assertThat(delegatedRfcUriValue).isNotNull();
assertThat(delegatedRfcUriValue.getRawQuery()).isEqualTo("foo=bar%26baz");
assertThat(delegatedRfcUriValue.getRawQuery()).isNull();
} else {
URI delegatedUriValue = delegatedUri.get("xds");
assertThat(delegatedUriValue).isNotNull();
assertThat(delegatedUriValue.getRawQuery()).isEqualTo("foo=bar%26baz");
assertThat(delegatedUriValue.getRawQuery()).isNull();
}
}

Expand All @@ -299,11 +346,11 @@ public void notOnGcpButForceXds_CaseSensitive_DelegateToDns() {
if (enableRfc3986UrisParam) {
Uri delegatedRfcUriValue = delegatedRfcUri.get("dns");
assertThat(delegatedRfcUriValue).isNotNull();
assertThat(delegatedRfcUriValue.getRawQuery()).isEqualTo("FORCE-XDS");
assertThat(delegatedRfcUriValue.getRawQuery()).isNull();
} else {
URI delegatedUriValue = delegatedUri.get("dns");
assertThat(delegatedUriValue).isNotNull();
assertThat(delegatedUriValue.getQuery()).isEqualTo("FORCE-XDS");
assertThat(delegatedUriValue.getQuery()).isNull();
}
}

Expand Down
Loading