Merge pull request kubernetes#83546 from Asalle/fix-golint-passwordfile

k8s-ci-robot · web-flow · commit 7c1dfd1b83a9 · 2020-02-08T10:15:54.000-08:00
Fix golint in staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -380,7 +380,6 @@ staging/src/k8s.io/apiserver/pkg/util/proxy
 staging/src/k8s.io/apiserver/pkg/util/webhook
 staging/src/k8s.io/apiserver/pkg/util/wsstream
 staging/src/k8s.io/apiserver/plugin/pkg/audit/log
-staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile
 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc
 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/tokentest
 staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile/passwordfile.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/password/passwordfile/passwordfile.go
@@ -31,6 +31,7 @@ import (
 	"k8s.io/apiserver/pkg/authentication/user"
 )
 
+// PasswordAuthenticator authenticates users by password
 type PasswordAuthenticator struct {
 	users map[string]*userPasswordInfo
 }
@@ -81,6 +82,7 @@ func NewCSV(path string) (*PasswordAuthenticator, error) {
 	return &PasswordAuthenticator{users}, nil
 }
 
+// AuthenticatePassword returns user info if authentication is successful, nil otherwise
 func (a *PasswordAuthenticator) AuthenticatePassword(ctx context.Context, username, password string) (*authenticator.Response, bool, error) {
 	user, ok := a.users[username]
 	if !ok {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import (`
`31`	`31`	`"k8s.io/apiserver/pkg/authentication/user"`
`32`	`32`	`)`
`33`	`33`
	`34`	`+// PasswordAuthenticator authenticates users by password`
`34`	`35`	`type PasswordAuthenticator struct {`
`35`	`36`	`users map[string]*userPasswordInfo`
`36`	`37`	`}`
`@@ -81,6 +82,7 @@ func NewCSV(path string) (*PasswordAuthenticator, error) {`
`81`	`82`	`return &PasswordAuthenticator{users}, nil`
`82`	`83`	`}`
`83`	`84`
	`85`	`+// AuthenticatePassword returns user info if authentication is successful, nil otherwise`
`84`	`86`	`func (a PasswordAuthenticator) AuthenticatePassword(ctx context.Context, username, password string) (authenticator.Response, bool, error) {`
`85`	`87`	`user, ok := a.users[username]`
`86`	`88`	`if !ok {`