From d96c3d05e805b61c586693784000f524c7f4b7e9 Mon Sep 17 00:00:00 2001
From: Aman Singh <aman.singh@harness.io>
Date: Tue, 2 Aug 2022 09:26:23 +0530
Subject: [PATCH] fixed acr

---
 cmd/kaniko-acr/main.go    | 13 +++++--------
 pkg/docker/docker_file.go |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cmd/kaniko-acr/main.go b/cmd/kaniko-acr/main.go
index d3dd09c..8724f86 100644
--- a/cmd/kaniko-acr/main.go
+++ b/cmd/kaniko-acr/main.go
@@ -26,7 +26,7 @@ const (
 	clientSecretKeyEnv string = "AZURE_CLIENT_SECRET"
 	tenantKeyEnv       string = "AZURE_TENANT_ID"
 	certPathEnv        string = "AZURE_CLIENT_CERTIFICATE_PATH"
-	dockerConfigPath   string = "/kaniko/.docker/config.json"
+	dockerConfigPath   string = "/kaniko/.docker"
 	defaultDigestFile  string = "/kaniko/digest-file"
 )
 
@@ -296,7 +296,7 @@ func getACRToken(tenantId, clientId, clientSecret, cert, registry string) (strin
 	}
 
 	if clientSecret == "" && cert == "" {
-		return "", fmt.Errorf("one of client secert or cert should be defined")
+		return "", fmt.Errorf("one of client secret or cert should be defined")
 	}
 
 	// in case of authentication via cert
@@ -311,6 +311,7 @@ func getACRToken(tenantId, clientId, clientSecret, cert, registry string) (strin
 	os.Setenv(clientIdEnv, clientId)
 	os.Setenv(clientSecretKeyEnv, clientSecret)
 	os.Setenv(tenantKeyEnv, tenantId)
+	os.Setenv(certPathEnv, ACRCertPath)
 	env, err := azidentity.NewEnvironmentCredential(nil)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to get env credentials from azure")
@@ -366,14 +367,10 @@ func fetchACRToken(tenantId, token, registry string) (string, error) {
 	return "", errors.New("failed to get refresh token from acr")
 }
 
-func setupACRCert(jsonKey string) error {
-	err := ioutil.WriteFile(ACRCertPath, []byte(jsonKey), 0644)
+func setupACRCert(cert string) error {
+	err := ioutil.WriteFile(ACRCertPath, []byte(cert), 0644)
 	if err != nil {
 		return errors.Wrap(err, "failed to write ACR certificate")
 	}
-	err = os.Setenv(certPathEnv, ACRCertPath)
-	if err != nil {
-		return errors.Wrap(err, fmt.Sprintf("failed to set %s environment variable", certPathEnv))
-	}
 	return nil
 }
diff --git a/pkg/docker/docker_file.go b/pkg/docker/docker_file.go
index 3a252a7..4bf7220 100644
--- a/pkg/docker/docker_file.go
+++ b/pkg/docker/docker_file.go
@@ -26,7 +26,8 @@ func CreateDockerCfgFile(username, password, registry, path string) error {
 	authBytes := []byte(fmt.Sprintf("%s:%s", username, password))
 	encodedString := base64.StdEncoding.EncodeToString(authBytes)
 	jsonBytes := []byte(fmt.Sprintf(`{"auths": {"%s": {"auth": "%s"}}}`, "https://"+registry, encodedString))
-	err = ioutil.WriteFile(path, jsonBytes, 0644)
+	filePath := path + "/config.json"
+	err = ioutil.WriteFile(filePath, jsonBytes, 0644)
 	if err != nil {
 		return errors.Wrap(err, "failed to create docker config file")
 	}