diff options
| author | Terry Wilson <tmwilson@google.com> | 2023-04-25 10:29:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 10:29:43 -0700 |
| commit | 5cde53cebbfa8cb387a3a720900b73e410d0eae3 (patch) | |
| tree | 8b34c8265d80960a774775bf6e878129d7e94de2 | |
| parent | 8054b2032539b136939f21537a82c465999dc2f0 (diff) | |
| download | grpc-grpc-java-5cde53cebbfa8cb387a3a720900b73e410d0eae3.tar.gz | |
xds,googleapis: Default GRPC_EXPERIMENTAL_XDS_FEDERATION to true (#10093) (#10099)
3 files changed, 5 insertions, 4 deletions
diff --git a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java index 1db4825cc..f690de586 100644 --- a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java +++ b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java @@ -66,8 +66,8 @@ final class GoogleCloudToProdNameResolver extends NameResolver { || System.getProperty("io.grpc.xds.bootstrapConfig") != null; @VisibleForTesting static boolean enableFederation = - !Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")) - && Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")); + Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")) + || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")); private static final String serverUriOverride = System.getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI"); diff --git a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java index 52174c19a..ccf0df538 100644 --- a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java +++ b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java @@ -159,6 +159,7 @@ public class GoogleCloudToProdNameResolverTest { public void hasProvidedBootstrapDelegateToDns() { GoogleCloudToProdNameResolver.isOnGcp = true; GoogleCloudToProdNameResolver.xdsBootstrapProvided = true; + GoogleCloudToProdNameResolver.enableFederation = false; createResolver(); resolver.start(mockListener); assertThat(delegatedResolver.keySet()).containsExactly("dns"); diff --git a/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java b/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java index 6d0e78a2c..e8a450e8d 100644 --- a/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java +++ b/xds/src/main/java/io/grpc/xds/BootstrapperImpl.java @@ -57,8 +57,8 @@ class BootstrapperImpl extends Bootstrapper { // Feature-gating environment variables. static boolean enableFederation = - !Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")) - && Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")); + Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")) + || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_FEDERATION")); // Client features. @VisibleForTesting |