From f793a834e65de34a4e70aaf098f9891d8e9db077 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 6 Dec 2021 17:13:21 -0800 Subject: [PATCH 1/3] Replace C2P resolver env var with experimental scheme suffix --- .../grpc/xds/GoogleCloudToProdNameResolverProvider.java | 9 ++------- .../io/grpc/xds/GoogleCloudToProdNameResolverTest.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolverProvider.java b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolverProvider.java index be8324b93cf..e7f9cb45ff8 100644 --- a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolverProvider.java +++ b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolverProvider.java @@ -29,9 +29,7 @@ @Internal public final class GoogleCloudToProdNameResolverProvider extends NameResolverProvider { - private static final boolean enableC2PResolver = - Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER")); - private static final String SCHEME = "google-c2p"; + private static final String SCHEME = "google-c2p-experimental"; @Override public NameResolver newNameResolver(URI targetUri, Args args) { @@ -50,10 +48,7 @@ public String getDefaultScheme() { @Override protected boolean isAvailable() { - if (enableC2PResolver) { - return true; - } - return false; + return true; } @Override diff --git a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java index 421b2a1dd0a..58be7108405 100644 --- a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java +++ b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java @@ -69,7 +69,7 @@ public class GoogleCloudToProdNameResolverTest { @Rule public final MockitoRule mocks = MockitoJUnit.rule(); - private static final URI TARGET_URI = URI.create("google-c2p:///googleapis.com"); + private static final URI TARGET_URI = URI.create("google-c2p-experimental:///googleapis.com"); private static final String ZONE = "us-central1-a"; private static final int DEFAULT_PORT = 887; From c75ce229da0e7a6193ae43e584af7ab3c0e83919 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 7 Dec 2021 12:12:10 -0800 Subject: [PATCH 2/3] update another test --- .../io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java index 372c8af8f41..b11f09371f2 100644 --- a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java +++ b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java @@ -73,7 +73,7 @@ NameResolverProvider.class, getClass().getClassLoader())) { @Test public void newNameResolver() { - assertThat(provider.newNameResolver(URI.create("google-c2p:///foo.googleapis.com"), args)) + assertThat(provider.newNameResolver(URI.create("google-c2p-experimental:///foo.googleapis.com"), args)) .isInstanceOf(GoogleCloudToProdNameResolver.class); } } From 6b9a054c89878a645b288eafb14de009957a8053 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Tue, 7 Dec 2021 12:39:43 -0800 Subject: [PATCH 3/3] fix style --- .../io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java index b11f09371f2..cc6621028c8 100644 --- a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java +++ b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverProviderTest.java @@ -73,7 +73,8 @@ NameResolverProvider.class, getClass().getClassLoader())) { @Test public void newNameResolver() { - assertThat(provider.newNameResolver(URI.create("google-c2p-experimental:///foo.googleapis.com"), args)) + assertThat(provider + .newNameResolver(URI.create("google-c2p-experimental:///foo.googleapis.com"), args)) .isInstanceOf(GoogleCloudToProdNameResolver.class); } }