Merge pull request #25 from tmax-cloud/fix/secret-error

[fix] Fix secret parse error

Author: cqbqdd11519

internal/utils/secret.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	corev1 "k8s.io/api/core/v1"
@@ -69,7 +70,7 @@ func (s *ImagePullSecret) GetHostBasicAuth(host string) (string, error) {
 	username, isUserPresent := loginAuth[DockerConfigUserKey]
 	password, isPasswordPresent := loginAuth[DockerConfigPasswordKey]
 	if isUserPresent && isPasswordPresent {
-		return fmt.Sprintf("%s:%s", username, password), nil
+		return base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", username, password))), nil
 	}
 	return "", fmt.Errorf("there is neither basic auth nor id/pw in docker config json for host %s", host)
 }

internal/utils/secret_test.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"encoding/base64"
 	"github.com/bmizerany/assert"
 	corev1 "k8s.io/api/core/v1"
 	"reflect"
@@ -143,7 +144,7 @@ func TestImagePullSecret_GetHostBasicAuth(t *testing.T) {
 			auths: map[string]DockerLoginCredential{
 				"https://found-host": {"user": "testID", "password": "testPW"},
 			},
-			expectedAuth:        "testID:testPW",
+			expectedAuth:        base64.StdEncoding.EncodeToString([]byte("testID:testPW")),
 			expectedErrorOccurs: false,
 			expectedErrorString: "",
 		},

pkg/server/validator.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"github.com/tmax-cloud/image-validating-webhook/internal/utils"
 	"github.com/tmax-cloud/registry-operator/pkg/image"
@@ -191,7 +190,7 @@ func (h *validator) getBasicAuthForRegistry(host string) (string, error) {
 			continue
 		}
 
-		return base64.StdEncoding.EncodeToString([]byte(basicAuth)), nil
+		return basicAuth, nil
 	}
 
 	// DO NOT return error - the image may be public