From b0635fa1d40dec3132c38517c6b2f9a8eb4c8cf2 Mon Sep 17 00:00:00 2001
From: Terry Wilson <tmwilson@google.com>
Date: Tue, 24 Jan 2023 15:57:11 -0800
Subject: [PATCH] googleapis: Allow user set c2p bootstrap config (#9856)

Instead of always overriding the bootstrap with a custom c2p config, now
we allow user defined ones to also be used. This only applies when
running in GCP with federation.
---
 .../GoogleCloudToProdNameResolver.java        | 22 ++++++++++++-------
 .../GoogleCloudToProdNameResolverTest.java    | 19 ++++++++++++++--
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
index df592802fa..1db4825ccb 100644
--- a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
+++ b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
@@ -156,22 +156,28 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
     class Resolve implements Runnable {
       @Override
       public void run() {
-        String zone;
-        boolean supportIpv6;
         ImmutableMap<String, ?> rawBootstrap = null;
         try {
-          zone = queryZoneMetadata(METADATA_URL_ZONE);
-          supportIpv6 = queryIpv6SupportMetadata(METADATA_URL_SUPPORT_IPV6);
-          rawBootstrap = generateBootstrap(zone, supportIpv6);
+          // User provided bootstrap configs are only supported with federation. If federation is
+          // not enabled or there is no user provided config, we set a custom bootstrap override.
+          // Otherwise, we don't set the override, which will allow a user provided bootstrap config
+          // to take effect.
+          if (!enableFederation || !xdsBootstrapProvided) {
+            rawBootstrap = generateBootstrap(queryZoneMetadata(METADATA_URL_ZONE),
+                queryIpv6SupportMetadata(METADATA_URL_SUPPORT_IPV6));
+          }
         } catch (IOException e) {
-          listener.onError(Status.INTERNAL.withDescription("Unable to get metadata").withCause(e));
+          listener.onError(
+              Status.INTERNAL.withDescription("Unable to get metadata").withCause(e));
         } finally {
           final ImmutableMap<String, ?> finalRawBootstrap = rawBootstrap;
           syncContext.execute(new Runnable() {
             @Override
             public void run() {
-              if (!shutdown && finalRawBootstrap != null) {
-                bootstrapSetter.setBootstrap(finalRawBootstrap);
+              if (!shutdown) {
+                if (finalRawBootstrap != null) {
+                  bootstrapSetter.setBootstrap(finalRawBootstrap);
+                }
                 delegate.start(listener);
                 succeeded = true;
               }
diff --git a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
index a7c4ab059b..52174c19a3 100644
--- a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
+++ b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
@@ -195,9 +195,9 @@ public class GoogleCloudToProdNameResolverTest {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void onGcpAndProvidedBootstrapAndFederationEnabledDelegateToXds() {
+  public void onGcpAndNoProvidedBootstrapAndFederationEnabledDelegateToXds() {
     GoogleCloudToProdNameResolver.isOnGcp = true;
-    GoogleCloudToProdNameResolver.xdsBootstrapProvided = true;
+    GoogleCloudToProdNameResolver.xdsBootstrapProvided = false;
     GoogleCloudToProdNameResolver.enableFederation = true;
     createResolver();
     resolver.start(mockListener);
@@ -223,6 +223,21 @@ public class GoogleCloudToProdNameResolverTest {
         ImmutableMap.of("xds_servers", ImmutableList.of(server)));
   }
 
+  @SuppressWarnings("unchecked")
+  @Test
+  public void onGcpAndProvidedBootstrapAndFederationEnabledDontDelegateToXds() {
+    GoogleCloudToProdNameResolver.isOnGcp = true;
+    GoogleCloudToProdNameResolver.xdsBootstrapProvided = true;
+    GoogleCloudToProdNameResolver.enableFederation = true;
+    createResolver();
+    resolver.start(mockListener);
+    fakeExecutor.runDueTasks();
+    assertThat(delegatedResolver.keySet()).containsExactly("xds");
+    verify(Iterables.getOnlyElement(delegatedResolver.values())).start(mockListener);
+    // Bootstrapper should not have been set, since there was no user provided config.
+    assertThat(fakeBootstrapSetter.bootstrapRef.get()).isNull();
+  }
+
   @Test
   public void failToQueryMetadata() {
     GoogleCloudToProdNameResolver.isOnGcp = true;