nil check for r.cc in r.onError, before calling r.cc.ReportError(err)

xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go

@@ -1272,6 +1272,11 @@ func (s) TestEDS_EndpointWithMultipleAddresses(t *testing.T) {
 			// Create bootstrap configuration pointing to the above management server.
 			nodeID := uuid.New().String()
 			bootstrapContents := e2e.DefaultBootstrapContents(t, nodeID, mgmtServer.Address)
+			config, err := bootstrap.NewConfigForTesting(bootstrapContents)
+			if err != nil {
+				t.Fatalf("Failed to create an bootstrap config from contents: %v, %v", bootstrapContents, err)
+			}
+			pool := xdsclient.NewPool(config)
 
 			// Create xDS resources for consumption by the test. We start off with a
 			// single backend in a single EDS locality.
@@ -1288,9 +1293,8 @@ func (s) TestEDS_EndpointWithMultipleAddresses(t *testing.T) {
 
 			// Create an xDS client talking to the above management server, configured
 			// with a short watch expiry timeout.
-			xdsClient, close, err := xdsclient.NewForTesting(xdsclient.OptionsForTesting{
-				Name:     t.Name(),
-				Contents: bootstrapContents,
+			xdsClient, close, err := pool.NewClientForTesting(xdsclient.OptionsForTesting{
+				Name: t.Name(),
 			})
 			if err != nil {
 				t.Fatalf("Failed to create an xDS client: %v", err)

xds/internal/resolver/xds_resolver.go

@@ -85,6 +85,7 @@ func init() {
 
 	rinternal.NewWRR = wrr.NewRandom
 	rinternal.NewXDSClient = func(name string) (xdsclient.XDSClient, func(), error) { return xdsClientPool.NewClient(name) }
+
 }
 
 type xdsResolverBuilder struct {

xds/server_options.go

@@ -60,10 +60,10 @@ type ServingModeChangeArgs struct {
 	Err error
 }
 
-// BootstrapContentsForTesting returns a grpc.ServerOption with the default
-// pool set with the provided bootstrap congiguration. It allows users to
-// inject a bootstrap configuration to be used by only this server, instead of
-// the global configuration from the environment variables.
+// BootstrapContentsForTesting returns a grpc.ServerOption with a new pool set
+// with the provided bootstrap configuration. It allows users to inject a
+// bootstrap configuration to be used by only this server, instead of the
+// global configuration from the environment variables.
 //
 // # Testing Only
 //
@@ -72,8 +72,7 @@ type ServingModeChangeArgs struct {
 //
 // # Experimental
 //
-// Notice: This API is EXPERIMENTAL but kept for backward compatibility. Use
-// `ClientPoolForTesting` to set the pool directly. It will be removed in
+// Notice: This API is EXPERIMENTAL and may be changed or removed in a
 // later release.
 func BootstrapContentsForTesting(bootstrapContents []byte) grpc.ServerOption {
 	config, err := bootstrap.NewConfigForTesting(bootstrapContents)
@@ -92,6 +91,8 @@ func BootstrapContentsForTesting(bootstrapContents []byte) grpc.ServerOption {
 // This function should ONLY be used for testing and may not work with some
 // other features, including the CSDS service.
 //
+// # Experimental
+//
 // Notice: This API is EXPERIMENTAL and may be changed or removed in a
 // later release.
 func ClientPoolForTesting(pool *xdsclient.Pool) grpc.ServerOption {

xds/server_test.go

@@ -121,18 +121,14 @@ func (s) TestNewServer_Success(t *testing.T) {
 			desc: "without_xds_creds",
 			serverOpts: []grpc.ServerOption{
 				grpc.Creds(insecure.NewCredentials()),
-				func() grpc.ServerOption {
-					return BootstrapContentsForTesting(generateBootstrapContents(t, uuid.NewString(), nonExistentManagementServer))
-				}(),
+				BootstrapContentsForTesting(generateBootstrapContents(t, uuid.NewString(), nonExistentManagementServer)),
 			},
 		},
 		{
 			desc: "with_xds_creds",
 			serverOpts: []grpc.ServerOption{
 				grpc.Creds(xdsCreds),
-				func() grpc.ServerOption {
-					return BootstrapContentsForTesting(generateBootstrapContents(t, uuid.NewString(), nonExistentManagementServer))
-				}(),
+				BootstrapContentsForTesting(generateBootstrapContents(t, uuid.NewString(), nonExistentManagementServer)),
 			},
 			wantXDSCredsInUse: true,
 		},