Skip to content

Commit 140d0a5

Browse files
authored
fix(transport): set UniverseDomain in http.NewClient for new auth (#2773)
* Set value when GOOGLE_API_GO_EXPERIMENTAL_ENABLE_NEW_AUTH_LIB=true
1 parent 0c7c227 commit 140d0a5

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

‎transport/grpc/dial.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
247247
DefaultScopes: ds.DefaultScopes,
248248
SkipValidation: skipValidation,
249249
},
250+
UniverseDomain: ds.UniverseDomain,
250251
})
251252
return pool, err
252253
}

‎transport/grpc/dial_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,15 @@ func TestDial(t *testing.T) {
3939
func TestDialPoolNewAuthDialOptions(t *testing.T) {
4040
oldDialContextNewAuth := dialContextNewAuth
4141
var wantNumOpts int
42+
var universeDomain string
4243
// Replace package var in order to assert DialContext args.
4344
dialContextNewAuth = func(ctx context.Context, secure bool, opts *grpctransport.Options) (grpctransport.GRPCClientConnPool, error) {
4445
if len(opts.GRPCDialOpts) != wantNumOpts {
4546
t.Fatalf("got: %d, want: %d", len(opts.GRPCDialOpts), wantNumOpts)
4647
}
48+
if opts.UniverseDomain != universeDomain {
49+
t.Fatalf("got: %q, want: %q", opts.UniverseDomain, universeDomain)
50+
}
4751
return nil, nil
4852
}
4953
defer func() {
@@ -67,9 +71,17 @@ func TestDialPoolNewAuthDialOptions(t *testing.T) {
6771
},
6872
wantNumOpts: 1,
6973
},
74+
{
75+
name: "universe domain",
76+
ds: &internal.DialSettings{
77+
UniverseDomain: "example.com",
78+
},
79+
wantNumOpts: 0,
80+
},
7081
} {
7182
t.Run(testcase.name, func(t *testing.T) {
7283
wantNumOpts = testcase.wantNumOpts
84+
universeDomain = testcase.ds.UniverseDomain
7385
dialPoolNewAuth(context.Background(), false, 1, testcase.ds)
7486
})
7587
}

‎transport/http/dial.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ func newClientNewAuth(ctx context.Context, base http.RoundTripper, ds *internal.
130130
DefaultScopes: ds.DefaultScopes,
131131
SkipValidation: skipValidation,
132132
},
133+
UniverseDomain: ds.UniverseDomain,
133134
})
134135
if err != nil {
135136
return nil, err

0 commit comments

Comments
 (0)