Skip to content

Commit 50de627

Browse files
author
tianhongw
committed
fix golint errors in staging/src/k8s.io/client-go/plugin/pkg/client/auth/oidc
1 parent 71ad0a9 commit 50de627

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

hack/.golint_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,6 @@ staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake
412412
staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake
413413
staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake
414414
staging/src/k8s.io/client-go/metadata/fake
415-
staging/src/k8s.io/client-go/plugin/pkg/client/auth/oidc
416415
staging/src/k8s.io/client-go/rest
417416
staging/src/k8s.io/client-go/rest/fake
418417
staging/src/k8s.io/client-go/rest/watch

staging/src/k8s.io/client-go/plugin/pkg/client/auth/oidc/oidc.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
)
3636

3737
const (
38-
cfgIssuerUrl = "idp-issuer-url"
38+
cfgIssuerURL = "idp-issuer-url"
3939
cfgClientID = "client-id"
4040
cfgClientSecret = "client-secret"
4141
cfgCertificateAuthority = "idp-certificate-authority"
@@ -109,9 +109,9 @@ func (c *clientCache) setClient(clusterAddress, issuer, clientID string, client
109109
}
110110

111111
func newOIDCAuthProvider(clusterAddress string, cfg map[string]string, persister restclient.AuthProviderConfigPersister) (restclient.AuthProvider, error) {
112-
issuer := cfg[cfgIssuerUrl]
112+
issuer := cfg[cfgIssuerURL]
113113
if issuer == "" {
114-
return nil, fmt.Errorf("Must provide %s", cfgIssuerUrl)
114+
return nil, fmt.Errorf("Must provide %s", cfgIssuerURL)
115115
}
116116

117117
clientID := cfg[cfgClientID]
@@ -216,7 +216,7 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
216216
return r.wrapped.RoundTrip(r2)
217217
}
218218

219-
func (t *roundTripper) WrappedRoundTripper() http.RoundTripper { return t.wrapped }
219+
func (r *roundTripper) WrappedRoundTripper() http.RoundTripper { return r.wrapped }
220220

221221
func (p *oidcAuthProvider) idToken() (string, error) {
222222
p.mu.Lock()
@@ -240,7 +240,7 @@ func (p *oidcAuthProvider) idToken() (string, error) {
240240
}
241241

242242
// Determine provider's OAuth2 token endpoint.
243-
tokenURL, err := tokenEndpoint(p.client, p.cfg[cfgIssuerUrl])
243+
tokenURL, err := tokenEndpoint(p.client, p.cfg[cfgIssuerURL])
244244
if err != nil {
245245
return "", err
246246
}
@@ -263,7 +263,7 @@ func (p *oidcAuthProvider) idToken() (string, error) {
263263
// providers (Okta) don't return this value.
264264
//
265265
// See https://github.com/kubernetes/kubernetes/issues/36847
266-
return "", fmt.Errorf("token response did not contain an id_token, either the scope \"openid\" wasn't requested upon login, or the provider doesn't support id_tokens as part of the refresh response.")
266+
return "", fmt.Errorf("token response did not contain an id_token, either the scope \"openid\" wasn't requested upon login, or the provider doesn't support id_tokens as part of the refresh response")
267267
}
268268

269269
// Create a new config to persist.

0 commit comments

Comments
 (0)