flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

googleapis: Enable ignore_resource_deletion in bootstrap

This commit is contained in:
Eric Anderson 2023-05-02 09:21:21 -07:00
parent 95207d2ac2
commit 545e982afd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java
View File

@ -209,7 +209,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
serverBuilder.put("server_uri", serverUri); serverBuilder.put("server_uri", serverUri);
serverBuilder.put("channel_creds", serverBuilder.put("channel_creds",
ImmutableList.of(ImmutableMap.of("type", "google_default"))); 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(); ImmutableMap.Builder<String, Object> authoritiesBuilder = ImmutableMap.builder();
authoritiesBuilder.put( authoritiesBuilder.put(
C2P_AUTHORITY, C2P_AUTHORITY,

4
googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java
View File

@ -187,7 +187,7 @@ public class GoogleCloudToProdNameResolverTest {
assertThat(server).containsExactly( assertThat(server).containsExactly(
"server_uri", "directpath-pa.googleapis.com", "server_uri", "directpath-pa.googleapis.com",
"channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")), "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"); Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
assertThat(authorities).containsExactly( assertThat(authorities).containsExactly(
"traffic-director-c2p.xds.googleapis.com", "traffic-director-c2p.xds.googleapis.com",
@ -217,7 +217,7 @@ public class GoogleCloudToProdNameResolverTest {
assertThat(server).containsExactly( assertThat(server).containsExactly(
"server_uri", "directpath-pa.googleapis.com", "server_uri", "directpath-pa.googleapis.com",
"channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")), "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"); Map<String, ?> authorities = (Map<String, ?>) bootstrap.get("authorities");
assertThat(authorities).containsExactly( assertThat(authorities).containsExactly(
"traffic-director-c2p.xds.googleapis.com", "traffic-director-c2p.xds.googleapis.com",