googledirectpatph: enable ignore_resource_deletion in bootstrap (#6243) (#6246)

dfawley · web-flow · commit d33f68e71202 · 2023-05-02T14:24:31.000-07:00
diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
@@ -120,7 +120,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
 	{
 		"server_uri": "%s",
 		"channel_creds": [{"type": "google_default"}],
-		"server_features": ["xds_v3"]
+		"server_features": ["xds_v3", "ignore_resource_deletion"]
 	}`, balancerName)))
 	if err != nil {
 		return nil, fmt.Errorf("failed to build bootstrap configuration: %v", err)
diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
@@ -216,7 +216,7 @@ func TestBuildXDS(t *testing.T) {
 			wantServerConfig, err := bootstrap.ServerConfigFromJSON([]byte(fmt.Sprintf(`{
 				"server_uri": "%s",
 				"channel_creds": [{"type": "google_default"}],
-				"server_features": ["xds_v3"]
+				"server_features": ["xds_v3", "ignore_resource_deletion"]
 			}`, tdURL)))
 			if err != nil {
 				t.Fatalf("Failed to build server bootstrap config: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts`
`120`	`120`	`{`
`121`	`121`	`"server_uri": "%s",`
`122`	`122`	`"channel_creds": [{"type": "google_default"}],`
`123`		`- "server_features": ["xds_v3"]`
	`123`	`+ "server_features": ["xds_v3", "ignore_resource_deletion"]`
`124`	`124`	}`, balancerName)))
`125`	`125`	`if err != nil {`
`126`	`126`	`return nil, fmt.Errorf("failed to build bootstrap configuration: %v", err)`