From 545e982afd3f715a2960592be2d495da0a6f1966 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Tue, 2 May 2023 09:21:21 -0700
Subject: [PATCH] googleapis: Enable ignore_resource_deletion in bootstrap

---
 .../io/grpc/googleapis/GoogleCloudToProdNameResolver.java     | 2 +-
 .../io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
index f690de5866..2dd07a17b0 100644
--- a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
+++ b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
@@ -209,7 +209,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
     serverBuilder.put("server_uri", serverUri);
     serverBuilder.put("channel_creds",
         ImmutableList.of(ImmutableMap.of("type", "google_default")));
-    serverBuilder.put("server_features", ImmutableList.of("xds_v3"));
+    serverBuilder.put("server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion"));
     ImmutableMap.Builder<String, Object> authoritiesBuilder = ImmutableMap.builder();
     authoritiesBuilder.put(
         C2P_AUTHORITY,
diff --git a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
index ccf0df5386..f249ddbaf0 100644
--- a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
+++ b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
@@ -187,7 +187,7 @@ public class GoogleCloudToProdNameResolverTest {
     assertThat(server).containsExactly(
         "server_uri", "directpath-pa.googleapis.com",
         "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")),
-        "server_features", ImmutableList.of("xds_v3"));
+        "server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion"));
     Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
     assertThat(authorities).containsExactly(
         "traffic-director-c2p.xds.googleapis.com",
@@ -217,7 +217,7 @@ public class GoogleCloudToProdNameResolverTest {
     assertThat(server).containsExactly(
         "server_uri", "directpath-pa.googleapis.com",
         "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")),
-        "server_features", ImmutableList.of("xds_v3"));
+        "server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion"));
     Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
     assertThat(authorities).containsExactly(
         "traffic-director-c2p.xds.googleapis.com",