Skip to content

Commit 545e982

Browse files
committed
googleapis: Enable ignore_resource_deletion in bootstrap
1 parent 95207d2 commit 545e982

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public void run() {
209209
serverBuilder.put("server_uri", serverUri);
210210
serverBuilder.put("channel_creds",
211211
ImmutableList.of(ImmutableMap.of("type", "google_default")));
212-
serverBuilder.put("server_features", ImmutableList.of("xds_v3"));
212+
serverBuilder.put("server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion"));
213213
ImmutableMap.Builder<String, Object> authoritiesBuilder = ImmutableMap.builder();
214214
authoritiesBuilder.put(
215215
C2P_AUTHORITY,

googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void onGcpAndNoProvidedBootstrapDelegateToXds() {
187187
assertThat(server).containsExactly(
188188
"server_uri", "directpath-pa.googleapis.com",
189189
"channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")),
190-
"server_features", ImmutableList.of("xds_v3"));
190+
"server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion"));
191191
Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
192192
assertThat(authorities).containsExactly(
193193
"traffic-director-c2p.xds.googleapis.com",
@@ -217,7 +217,7 @@ public void onGcpAndNoProvidedBootstrapAndFederationEnabledDelegateToXds() {
217217
assertThat(server).containsExactly(
218218
"server_uri", "directpath-pa.googleapis.com",
219219
"channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")),
220-
"server_features", ImmutableList.of("xds_v3"));
220+
"server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion"));
221221
Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
222222
assertThat(authorities).containsExactly(
223223
"traffic-director-c2p.xds.googleapis.com",

0 commit comments

Comments
 (0)