Skip to content

Commit d64b1d0

Browse files
codyosscodyoss
authored
fix: various auth transition bugs (#2533)
- Better support for oauth2.Credential conversion - set quota project when setting tokensource based cred - honor SkipValidation option - if DefaultEndpointTemplate is not set pass old DefaultEndpoint. As we just do a string replace code works without formatting derective present. - simiplfiy poolAdapter calls to delegate more
1 parent 9622a0d commit d64b1d0

File tree

6 files changed

+101
-63
lines changed

6 files changed

+101
-63
lines changed

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module google.golang.org/api
33
go 1.19
44

55
require (
6-
cloud.google.com/go/auth v0.2.1
6+
cloud.google.com/go/auth v0.2.2
77
cloud.google.com/go/auth/oauth2adapt v0.2.1
88
cloud.google.com/go/compute/metadata v0.3.0
99
github.com/google/go-cmp v0.6.0
@@ -14,13 +14,13 @@ require (
1414
go.opencensus.io v0.24.0
1515
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
1616
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
17-
golang.org/x/net v0.22.0
17+
golang.org/x/net v0.24.0
1818
golang.org/x/oauth2 v0.19.0
1919
golang.org/x/sync v0.6.0
2020
golang.org/x/time v0.5.0
2121
google.golang.org/genproto/googleapis/bytestream v0.0.0-20240325203815-454cdb8f5daa
2222
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be
23-
google.golang.org/grpc v1.63.0
23+
google.golang.org/grpc v1.63.2
2424
google.golang.org/protobuf v1.33.0
2525
)
2626

@@ -33,7 +33,7 @@ require (
3333
go.opentelemetry.io/otel v1.24.0 // indirect
3434
go.opentelemetry.io/otel/metric v1.24.0 // indirect
3535
go.opentelemetry.io/otel/trace v1.24.0 // indirect
36-
golang.org/x/crypto v0.21.0 // indirect
37-
golang.org/x/sys v0.18.0 // indirect
36+
golang.org/x/crypto v0.22.0 // indirect
37+
golang.org/x/sys v0.19.0 // indirect
3838
golang.org/x/text v0.14.0 // indirect
3939
)

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2-
cloud.google.com/go/auth v0.2.1 h1:RMl6PI2MH1Qc3CM7XNJJHGwbC4WHQppSAjL0Cvu/M/g=
3-
cloud.google.com/go/auth v0.2.1/go.mod h1:khQRBNrvNoHiHhV1iu2x8fSnlNbCaVHilznW5MAI5GY=
2+
cloud.google.com/go/auth v0.2.2 h1:gmxNJs4YZYcw6YvKRtVBaF2fyUE6UrWPyzU8jHvYfmI=
3+
cloud.google.com/go/auth v0.2.2/go.mod h1:2bDNJWtWziDT3Pu1URxHHbkHE/BbOCuyUiKIGcNvafo=
44
cloud.google.com/go/auth/oauth2adapt v0.2.1 h1:VSPmMmUlT8CkIZ2PzD9AlLN+R3+D1clXMWHHa6vG/Ag=
55
cloud.google.com/go/auth/oauth2adapt v0.2.1/go.mod h1:tOdK/k+D2e4GEwfBRA48dKNQiDsqIXxLh7VU319eV0g=
66
cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc=
@@ -80,8 +80,8 @@ go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y
8080
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
8181
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8282
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
83-
golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
84-
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
83+
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
84+
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
8585
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
8686
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
8787
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -92,8 +92,8 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r
9292
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9393
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9494
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
95-
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
96-
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
95+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
96+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
9797
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
9898
golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg=
9999
golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8=
@@ -106,8 +106,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
106106
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
107107
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
108108
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
109-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
110-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
109+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
110+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
111111
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
112112
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
113113
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -136,8 +136,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
136136
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
137137
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
138138
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
139-
google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
140-
google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
139+
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
140+
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
141141
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
142142
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
143143
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎go.work.sum

+5
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6
136136
go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo=
137137
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
138138
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
139+
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
139140
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
140141
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
141142
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
@@ -145,6 +146,7 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
145146
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
146147
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
147148
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
149+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
148150
golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
149151
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
150152
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -157,9 +159,11 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
157159
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
158160
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
159161
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
162+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
160163
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
161164
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
162165
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
166+
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
163167
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
164168
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
165169
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -186,4 +190,5 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2/go.
186190
google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
187191
google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
188192
google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
193+
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
189194
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

‎transport/grpc/dial.go

+29-12
Original file line numberDiff line numberDiff line change
@@ -174,21 +174,30 @@ func DialPool(ctx context.Context, opts ...option.ClientOption) (ConnPool, error
174174
// dialPoolNewAuth is an adapter to call new auth library.
175175
func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *internal.DialSettings) (grpctransport.GRPCClientConnPool, error) {
176176
// honor options if set
177-
var ts oauth2.TokenSource
177+
var creds *auth.Credentials
178178
if ds.InternalCredentials != nil {
179-
ts = ds.InternalCredentials.TokenSource
179+
creds = oauth2adapt.AuthCredentialsFromOauth2Credentials(ds.InternalCredentials)
180180
} else if ds.Credentials != nil {
181-
ts = ds.Credentials.TokenSource
181+
creds = oauth2adapt.AuthCredentialsFromOauth2Credentials(ds.Credentials)
182+
} else if ds.AuthCredentials != nil {
183+
creds = ds.AuthCredentials
182184
} else if ds.TokenSource != nil {
183-
ts = ds.TokenSource
185+
credOpts := &auth.CredentialsOptions{
186+
TokenProvider: oauth2adapt.TokenProviderFromTokenSource(ds.TokenSource),
187+
}
188+
if ds.QuotaProject != "" {
189+
credOpts.QuotaProjectIDProvider = auth.CredentialsPropertyFunc(func(ctx context.Context) (string, error) {
190+
return ds.QuotaProject, nil
191+
})
192+
}
193+
creds = auth.NewCredentials(credOpts)
184194
}
185-
var creds *auth.Credentials
186-
if ds.AuthCredentials != nil {
187-
creds = ds.AuthCredentials
188-
} else if ts != nil {
189-
creds = auth.NewCredentials(&auth.CredentialsOptions{
190-
TokenProvider: oauth2adapt.TokenProviderFromTokenSource(ts),
191-
})
195+
196+
var skipValidation bool
197+
// If our clients explicitly setup the credential skip validation as it is
198+
// assumed correct
199+
if ds.SkipValidation || ds.InternalCredentials != nil {
200+
skipValidation = true
192201
}
193202

194203
var aud string
@@ -202,6 +211,13 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
202211
if ds.RequestReason != "" {
203212
metadata["X-goog-request-reason"] = ds.RequestReason
204213
}
214+
215+
// Defaults for older clients that don't set this value yet
216+
var defaultEndpointTemplate string
217+
if ds.DefaultEndpointTemplate == "" {
218+
defaultEndpointTemplate = ds.DefaultEndpoint
219+
}
220+
205221
pool, err := grpctransport.Dial(ctx, secure, &grpctransport.Options{
206222
DisableTelemetry: ds.TelemetryDisabled,
207223
DisableAuthentication: ds.NoAuth,
@@ -223,9 +239,10 @@ func dialPoolNewAuth(ctx context.Context, secure bool, poolSize int, ds *interna
223239
EnableDirectPathXds: ds.EnableDirectPathXds,
224240
EnableJWTWithScope: ds.EnableJwtWithScope,
225241
DefaultAudience: ds.DefaultAudience,
226-
DefaultEndpointTemplate: ds.DefaultEndpointTemplate,
242+
DefaultEndpointTemplate: defaultEndpointTemplate,
227243
DefaultMTLSEndpoint: ds.DefaultMTLSEndpoint,
228244
DefaultScopes: ds.DefaultScopes,
245+
SkipValidation: skipValidation,
229246
},
230247
})
231248
return pool, err

‎transport/grpc/pool.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ func (p *poolAdapter) Close() error {
109109
}
110110

111111
func (p *poolAdapter) Invoke(ctx context.Context, method string, args interface{}, reply interface{}, opts ...grpc.CallOption) error {
112-
return p.Conn().Invoke(ctx, method, args, reply, opts...)
112+
return p.pool.Invoke(ctx, method, args, reply, opts...)
113113
}
114114

115115
func (p *poolAdapter) NewStream(ctx context.Context, desc *grpc.StreamDesc, method string, opts ...grpc.CallOption) (grpc.ClientStream, error) {
116-
return p.Conn().NewStream(ctx, desc, method, opts...)
116+
return p.pool.NewStream(ctx, desc, method, opts...)
117117
}

‎transport/http/dial.go

+50-34
Original file line numberDiff line numberDiff line change
@@ -62,57 +62,73 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*http.Client,
6262
}
6363

6464
// newClientNewAuth is an adapter to call new auth library.
65-
func newClientNewAuth(ctx context.Context, settings *internal.DialSettings) (*http.Client, error) {
65+
func newClientNewAuth(ctx context.Context, ds *internal.DialSettings) (*http.Client, error) {
6666
// honor options if set
67-
var ts oauth2.TokenSource
68-
if settings.InternalCredentials != nil {
69-
ts = settings.InternalCredentials.TokenSource
70-
} else if settings.Credentials != nil {
71-
ts = settings.Credentials.TokenSource
72-
} else if settings.TokenSource != nil {
73-
ts = settings.TokenSource
74-
}
7567
var creds *auth.Credentials
76-
if settings.AuthCredentials != nil {
77-
creds = settings.AuthCredentials
78-
} else if ts != nil {
79-
creds = auth.NewCredentials(&auth.CredentialsOptions{
80-
TokenProvider: oauth2adapt.TokenProviderFromTokenSource(ts),
81-
})
68+
if ds.InternalCredentials != nil {
69+
creds = oauth2adapt.AuthCredentialsFromOauth2Credentials(ds.InternalCredentials)
70+
} else if ds.Credentials != nil {
71+
creds = oauth2adapt.AuthCredentialsFromOauth2Credentials(ds.Credentials)
72+
} else if ds.AuthCredentials != nil {
73+
creds = ds.AuthCredentials
74+
} else if ds.TokenSource != nil {
75+
credOpts := &auth.CredentialsOptions{
76+
TokenProvider: oauth2adapt.TokenProviderFromTokenSource(ds.TokenSource),
77+
}
78+
if ds.QuotaProject != "" {
79+
credOpts.QuotaProjectIDProvider = auth.CredentialsPropertyFunc(func(ctx context.Context) (string, error) {
80+
return ds.QuotaProject, nil
81+
})
82+
}
83+
creds = auth.NewCredentials(credOpts)
84+
}
85+
86+
var skipValidation bool
87+
// If our clients explicitly setup the credential skip validation as it is
88+
// assumed correct
89+
if ds.SkipValidation || ds.InternalCredentials != nil {
90+
skipValidation = true
91+
}
92+
93+
// Defaults for older clients that don't set this value yet
94+
var defaultEndpointTemplate string
95+
if ds.DefaultEndpointTemplate == "" {
96+
defaultEndpointTemplate = ds.DefaultEndpoint
8297
}
8398

8499
var aud string
85-
if len(settings.Audiences) > 0 {
86-
aud = settings.Audiences[0]
100+
if len(ds.Audiences) > 0 {
101+
aud = ds.Audiences[0]
87102
}
88103
headers := http.Header{}
89-
if settings.QuotaProject != "" {
90-
headers.Set("X-goog-user-project", settings.QuotaProject)
104+
if ds.QuotaProject != "" {
105+
headers.Set("X-goog-user-project", ds.QuotaProject)
91106
}
92-
if settings.RequestReason != "" {
93-
headers.Set("X-goog-request-reason", settings.RequestReason)
107+
if ds.RequestReason != "" {
108+
headers.Set("X-goog-request-reason", ds.RequestReason)
94109
}
95110
client, err := httptransport.NewClient(&httptransport.Options{
96-
DisableTelemetry: settings.TelemetryDisabled,
97-
DisableAuthentication: settings.NoAuth,
111+
DisableTelemetry: ds.TelemetryDisabled,
112+
DisableAuthentication: ds.NoAuth,
98113
Headers: headers,
99-
Endpoint: settings.Endpoint,
100-
APIKey: settings.APIKey,
114+
Endpoint: ds.Endpoint,
115+
APIKey: ds.APIKey,
101116
Credentials: creds,
102-
ClientCertProvider: settings.ClientCertSource,
117+
ClientCertProvider: ds.ClientCertSource,
103118
DetectOpts: &credentials.DetectOptions{
104-
Scopes: settings.Scopes,
119+
Scopes: ds.Scopes,
105120
Audience: aud,
106-
CredentialsFile: settings.CredentialsFile,
107-
CredentialsJSON: settings.CredentialsJSON,
121+
CredentialsFile: ds.CredentialsFile,
122+
CredentialsJSON: ds.CredentialsJSON,
108123
Client: oauth2.NewClient(ctx, nil),
109124
},
110125
InternalOptions: &httptransport.InternalOptions{
111-
EnableJWTWithScope: settings.EnableJwtWithScope,
112-
DefaultAudience: settings.DefaultAudience,
113-
DefaultEndpointTemplate: settings.DefaultEndpointTemplate,
114-
DefaultMTLSEndpoint: settings.DefaultMTLSEndpoint,
115-
DefaultScopes: settings.DefaultScopes,
126+
EnableJWTWithScope: ds.EnableJwtWithScope,
127+
DefaultAudience: ds.DefaultAudience,
128+
DefaultEndpointTemplate: defaultEndpointTemplate,
129+
DefaultMTLSEndpoint: ds.DefaultMTLSEndpoint,
130+
DefaultScopes: ds.DefaultScopes,
131+
SkipValidation: skipValidation,
116132
},
117133
})
118134
if err != nil {

0 commit comments

Comments
 (0)