xds: propagate bootstrap error to grpc.Dial

[menghanl]

This change is 

[easwars]

Reviewed 6 of 6 files at r1.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @menghanl)

---

xds/internal/balancer/edsbalancer/xds_client_wrapper.go, line 137 at r1 (raw file):

		clientConfig = &bootstrap.Config{
			BalancerName: config.BalancerName,
		}

Nit: Fold into a single line since we are setting only one field?

---

xds/internal/balancer/edsbalancer/xds_client_wrapper.go, line 141 at r1 (raw file):

	} else if clientConfig.BalancerName == "" {
		clientConfig.BalancerName = config.BalancerName
	}

Do we need the else, given that NewConfig has been updated to return an error when BalancerName is empty?

---

xds/internal/client/bootstrap/bootstrap_test.go, line 247 at r1 (raw file):

Quoted 9 lines of code…

			if test.wantError {
				if err == nil {
					t.Fatalf("wantError: %v, got error %v", test.wantError, err)
				}
				return
			}
			if err != nil {
				t.Fatalf("unexpected error %v", err)
			}

Could this be handled with a single conditional statement like:

if (err != nil) != test.wantErr {
  t.Fatalf("NewConfig() returned err: %v, wantErr: %v", err, test.wantErr)
}

[menghanl]

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @easwars)

---

xds/internal/balancer/edsbalancer/xds_client_wrapper.go, line 137 at r1 (raw file):

Previously, easwars (Easwar Swaminathan) wrote…

		clientConfig = &bootstrap.Config{
			BalancerName: config.BalancerName,
		}

Nit: Fold into a single line since we are setting only one field?

Done

---

xds/internal/balancer/edsbalancer/xds_client_wrapper.go, line 141 at r1 (raw file):

Previously, easwars (Easwar Swaminathan) wrote…

	} else if clientConfig.BalancerName == "" {
		clientConfig.BalancerName = config.BalancerName
	}

Do we need the else, given that NewConfig has been updated to return an error when BalancerName is empty?

Done. Needed to make some changes to tests to get BalancerName (which is being removed in another PR...).

---

xds/internal/client/bootstrap/bootstrap_test.go, line 247 at r1 (raw file):

Previously, easwars (Easwar Swaminathan) wrote…

			if test.wantError {
				if err == nil {
					t.Fatalf("wantError: %v, got error %v", test.wantError, err)
				}
				return
			}
			if err != nil {
				t.Fatalf("unexpected error %v", err)
			}

Could this be handled with a single conditional statement like:

if (err != nil) != test.wantErr {
  t.Fatalf("NewConfig() returned err: %v, wantErr: %v", err, test.wantErr)
}

I need it to return in case of errors, otherwise the following code will nil panic.

I reversed the order, to make it look slightly better. But there are still two if statements

[easwars]

Reviewed 4 of 4 files at r2.
Reviewable status: complete! all files reviewed, all discussions resolved