grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds,googleapis: Default GRPC_EXPERIMENTAL_XDS_FEDERATION to true (#10093)

This commit is contained in:
Terry Wilson 2023-04-24 11:01:32 -07:00 committed by GitHub
parent 68b67b616e
commit a384c16e8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
View File

@ -66,8 +66,8 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
|| System.getProperty("io.grpc.xds.bootstrapConfig") != null; || System.getProperty("io.grpc.xds.bootstrapConfig") != null;
@VisibleForTesting @VisibleForTesting
static boolean enableFederation = static boolean enableFederation =
!Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")) Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION"))
&& Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")); || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION"));
private static final String serverUriOverride = private static final String serverUriOverride =
System.getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI"); System.getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI");

1
googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
View File

@ -159,6 +159,7 @@ public class GoogleCloudToProdNameResolverTest {
public void hasProvidedBootstrapDelegateToDns() { public void hasProvidedBootstrapDelegateToDns() {
GoogleCloudToProdNameResolver.isOnGcp = true; GoogleCloudToProdNameResolver.isOnGcp = true;
GoogleCloudToProdNameResolver.xdsBootstrapProvided = true; GoogleCloudToProdNameResolver.xdsBootstrapProvided = true;
GoogleCloudToProdNameResolver.enableFederation = false;
createResolver(); createResolver();
resolver.start(mockListener); resolver.start(mockListener);
assertThat(delegatedResolver.keySet()).containsExactly("dns"); assertThat(delegatedResolver.keySet()).containsExactly("dns");

4
xds/src/main/java/io/grpc/xds/BootstrapperImpl.java
View File

@ -57,8 +57,8 @@ class BootstrapperImpl extends Bootstrapper {
// Feature-gating environment variables. // Feature-gating environment variables.
static boolean enableFederation = static boolean enableFederation =
!Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")) Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION"))
&& Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")); || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION"));
// Client features. // Client features.
@VisibleForTesting @VisibleForTesting