Skip to content

Commit 804632e

Browse files
authored
fix(auth): don't try to detect default creds it opt configured (#10143)
1 parent 11e1334 commit 804632e

2 files changed

Lines changed: 17 additions & 11 deletions

File tree

auth/grpctransport/grpctransport.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,16 @@ func dial(ctx context.Context, secure bool, opts *Options) (*grpc.ClientConn, er
216216
// Authentication can only be sent when communicating over a secure connection.
217217
if !opts.DisableAuthentication {
218218
metadata := opts.Metadata
219-
creds, err := credentials.DetectDefault(opts.resolveDetectOptions())
220-
if err != nil {
221-
return nil, err
222-
}
219+
220+
var creds *auth.Credentials
223221
if opts.Credentials != nil {
224222
creds = opts.Credentials
223+
} else {
224+
var err error
225+
creds, err = credentials.DetectDefault(opts.resolveDetectOptions())
226+
if err != nil {
227+
return nil, err
228+
}
225229
}
226230

227231
qp, err := creds.QuotaProjectID(ctx)

auth/httptransport/transport.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,15 @@ func newTransport(base http.RoundTripper, opts *Options) (http.RoundTripper, err
5858
Key: opts.APIKey,
5959
}
6060
default:
61-
creds, err := credentials.DetectDefault(opts.resolveDetectOptions())
62-
if err != nil {
63-
return nil, err
61+
var creds *auth.Credentials
62+
if opts.Credentials != nil {
63+
creds = opts.Credentials
64+
} else {
65+
var err error
66+
creds, err = credentials.DetectDefault(opts.resolveDetectOptions())
67+
if err != nil {
68+
return nil, err
69+
}
6470
}
6571
qp, err := creds.QuotaProjectID(context.Background())
6672
if err != nil {
@@ -72,10 +78,6 @@ func newTransport(base http.RoundTripper, opts *Options) (http.RoundTripper, err
7278
}
7379
headers.Set(quotaProjectHeaderKey, qp)
7480
}
75-
76-
if opts.Credentials != nil {
77-
creds = opts.Credentials
78-
}
7981
creds.TokenProvider = auth.NewCachedTokenProvider(creds.TokenProvider, nil)
8082
trans = &authTransport{
8183
base: trans,

0 commit comments

Comments
 (0)