appease checks

google · Apr 14, 2022 · 589fbd9 · 589fbd9
1 parent 6f05eeb
commit 589fbd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkg/authn/authn.go b/pkg/authn/authn.go
@@ -46,6 +46,7 @@ type AuthConfig struct {
 // JSON unmarshalling since AuthConfig methods are not inherited
 type authConfig AuthConfig
 
+// UnmarshalJSON implements json.Unmarshaler
 func (a *AuthConfig) UnmarshalJSON(data []byte) error {
 	var shadow authConfig
 	err := json.Unmarshal(data, &shadow)
@@ -68,9 +69,9 @@ func (a *AuthConfig) UnmarshalJSON(data []byte) error {
 	return err
 }
 
+// MarshalJSON implements json.Marshaler
 func (a AuthConfig) MarshalJSON() ([]byte, error) {
-	var shadow authConfig
-	shadow = (authConfig)(a)
+	shadow := (authConfig)(a)
 	shadow.Auth = encodeDockerConfigFieldAuth(shadow.Username, shadow.Password)
 	return json.Marshal(shadow)
 }

diff --git a/pkg/authn/kubernetes/keychain.go b/pkg/authn/kubernetes/keychain.go
@@ -103,7 +103,7 @@ func NewInCluster(ctx context.Context, opt Options) (authn.Keychain, error) {
 	return New(ctx, client, opt)
 }
 
-type dockerConfigJson struct {
+type dockerConfigJSON struct {
 	Auths map[string]authn.AuthConfig
 }
 
@@ -115,7 +115,7 @@ func NewFromPullSecrets(ctx context.Context, secrets []corev1.Secret) (authn.Key
 		creds: make(map[string][]authn.AuthConfig),
 	}
 
-	var cfg dockerConfigJson
+	var cfg dockerConfigJSON
 
 	// From: https://github.com/kubernetes/kubernetes/blob/0dcafb1f37ee522be3c045753623138e5b907001/pkg/credentialprovider/keyring.go
 	for _, secret := range secrets {

diff --git a/pkg/authn/kubernetes/keychain_test.go b/pkg/authn/kubernetes/keychain_test.go
@@ -57,7 +57,7 @@ var dockerConfigJSONSecretType = secretType{
 	name: corev1.SecretTypeDockerConfigJson,
 	key:  corev1.DockerConfigJsonKey,
 	marshal: func(t *testing.T, target string, auth authn.AuthConfig) []byte {
-		return toJSON(t, dockerConfigJson{
+		return toJSON(t, dockerConfigJSON{
 			Auths: map[string]authn.AuthConfig{target: auth},
 		})
 	},