fix(transport): set UniverseDomain in http.NewClient for new auth (#2773)

quartzmo · web-flow · commit 140d0a5e70eb · 2024-09-05T16:34:28.000-05:00
* Set value when GOOGLE_API_GO_EXPERIMENTAL_ENABLE_NEW_AUTH_LIB=true
diff --git a/transport/grpc/dial.go b/transport/grpc/dial.go
@@ -247,6 +247,7 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
 			DefaultScopes:                   ds.DefaultScopes,
 			SkipValidation:                  skipValidation,
 		},
+		UniverseDomain: ds.UniverseDomain,
 	})
 	return pool, err
 }
diff --git a/transport/grpc/dial_test.go b/transport/grpc/dial_test.go
@@ -39,11 +39,15 @@ func TestDial(t *testing.T) {
 func TestDialPoolNewAuthDialOptions(t *testing.T) {
 	oldDialContextNewAuth := dialContextNewAuth
 	var wantNumOpts int
+	var universeDomain string
 	// Replace package var in order to assert DialContext args.
 	dialContextNewAuth = func(ctx context.Context, secure bool, opts *grpctransport.Options) (grpctransport.GRPCClientConnPool, error) {
 		if len(opts.GRPCDialOpts) != wantNumOpts {
 			t.Fatalf("got: %d, want: %d", len(opts.GRPCDialOpts), wantNumOpts)
 		}
+		if opts.UniverseDomain != universeDomain {
+			t.Fatalf("got: %q, want: %q", opts.UniverseDomain, universeDomain)
+		}
 		return nil, nil
 	}
 	defer func() {
@@ -67,9 +71,17 @@ func TestDialPoolNewAuthDialOptions(t *testing.T) {
 			},
 			wantNumOpts: 1,
 		},
+		{
+			name: "universe domain",
+			ds: &internal.DialSettings{
+				UniverseDomain: "example.com",
+			},
+			wantNumOpts: 0,
+		},
 	} {
 		t.Run(testcase.name, func(t *testing.T) {
 			wantNumOpts = testcase.wantNumOpts
+			universeDomain = testcase.ds.UniverseDomain
 			dialPoolNewAuth(context.Background(), false, 1, testcase.ds)
 		})
 	}
diff --git a/transport/http/dial.go b/transport/http/dial.go
@@ -130,6 +130,7 @@ func newClientNewAuth(ctx context.Context, base http.RoundTripper, ds *internal.
 			DefaultScopes:           ds.DefaultScopes,
 			SkipValidation:          skipValidation,
 		},
+		UniverseDomain: ds.UniverseDomain,
 	})
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,7 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna`
`247`	`247`	`DefaultScopes: ds.DefaultScopes,`
`248`	`248`	`SkipValidation: skipValidation,`
`249`	`249`	`},`
	`250`	`+ UniverseDomain: ds.UniverseDomain,`
`250`	`251`	`})`
`251`	`252`	`return pool, err`
`252`	`253`	`}`