xds/bootstrap: refactor to support top level and per-authority server…

… config (#4892)
grpc · Nov 2, 2021 · 29deb6b · 29deb6b
1 parent 1163cfa
commit 29deb6b
Show file tree

Hide file tree

Showing 12 changed files with 384 additions and 251 deletions.
diff --git a/xds/csds/csds.go b/xds/csds/csds.go
@@ -127,7 +127,7 @@ func (s *ClientStatusDiscoveryServer) buildClientStatusRespForReq(req *v3statusp
  ret := &v3statuspb.ClientStatusResponse{
  Config: []*v3statuspb.ClientConfig{
  {
- Node: nodeProtoToV3(s.xdsClient.BootstrapConfig().NodeProto),
+ Node: nodeProtoToV3(s.xdsClient.BootstrapConfig().XDSServer.NodeProto),
  GenericXdsConfigs: configs,
  },
  },

diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
@@ -103,10 +103,12 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
  balancerName = tdURL
  }
  config := &bootstrap.Config{
- BalancerName: balancerName,
- Creds: grpc.WithCredentialsBundle(google.NewDefaultCredentials()),
- TransportAPI: version.TransportV3,
- NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),
+ XDSServer: &bootstrap.ServerConfig{
+ ServerURI: balancerName,
+ Creds: grpc.WithCredentialsBundle(google.NewDefaultCredentials()),
+ TransportAPI: version.TransportV3,
+ NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),
+ },
  }
 
  // Create singleton xds client with this config. The xds client will be

diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
@@ -211,15 +211,18 @@ func TestBuildXDS(t *testing.T) {
  }
  }
  wantConfig := &bootstrap.Config{
- BalancerName: tdURL,
- TransportAPI: version.TransportV3,
- NodeProto: wantNode,
+ XDSServer: &bootstrap.ServerConfig{
+ ServerURI: tdURL,
+ TransportAPI: version.TransportV3,
+ NodeProto: wantNode,
+ },
  }
  if tt.tdURI != "" {
- wantConfig.BalancerName = tt.tdURI
+ wantConfig.XDSServer.ServerURI = tt.tdURI
  }
  cmpOpts := cmp.Options{
- cmpopts.IgnoreFields(bootstrap.Config{}, "Creds"),
+ cmpopts.IgnoreFields(bootstrap.ServerConfig{}, "Creds"),
+ cmp.AllowUnexported(bootstrap.ServerConfig{}),
  protocmp.Transform(),
  }
  select {