diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go index 58c0eba9547d..02b1add4cc0b 100644 --- a/xds/googledirectpath/googlec2p.go +++ b/xds/googledirectpath/googlec2p.go @@ -110,7 +110,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts { "server_uri": "%s", "channel_creds": [{"type": "google_default"}], - "server_features": ["xds_v3", "ignore_resource_deletion"] + "server_features": ["xds_v3", "ignore_resource_deletion", "xds.config.resource-in-sotw"] }`, balancerName))) if err != nil { return nil, fmt.Errorf("failed to build bootstrap configuration: %v", err) @@ -120,7 +120,8 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts ClientDefaultListenerResourceNameTemplate: "%s", Authorities: map[string]*bootstrap.Authority{ c2pAuthority: { - XDSServer: serverConfig, + XDSServer: serverConfig, + ClientListenerResourceNameTemplate: fmt.Sprintf("xdstp://%s/envoy.config.listener.v3.Listener/%%s", c2pAuthority), }, }, NodeProto: newNode(<-zoneCh, <-ipv6CapableCh), diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go index 3d8cca065942..a65d46a86375 100644 --- a/xds/googledirectpath/googlec2p_test.go +++ b/xds/googledirectpath/googlec2p_test.go @@ -213,7 +213,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", "ignore_resource_deletion"] + "server_features": ["xds_v3", "ignore_resource_deletion", "xds.config.resource-in-sotw"] }`, tdURL))) if err != nil { t.Fatalf("Failed to build server bootstrap config: %v", err) @@ -223,7 +223,8 @@ func TestBuildXDS(t *testing.T) { ClientDefaultListenerResourceNameTemplate: "%s", Authorities: map[string]*bootstrap.Authority{ "traffic-director-c2p.xds.googleapis.com": { - XDSServer: wantServerConfig, + XDSServer: wantServerConfig, + ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s", }, }, NodeProto: wantNode,