From c56f16b1632a4f6332565e3156f9201e7d30e934 Mon Sep 17 00:00:00 2001
From: Sam Stoelinga <sammiestoel@gmail.com>
Date: Sat, 21 Mar 2020 16:45:04 -0700
Subject: [PATCH] Create constant for Docker conf location

---
 pkg/executor/push.go      | 3 ++-
 pkg/executor/push_test.go | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/executor/push.go b/pkg/executor/push.go
index e10fed35e..f4483de16 100644
--- a/pkg/executor/push.go
+++ b/pkg/executor/push.go
@@ -53,6 +53,7 @@ type withUserAgent struct {
 
 const (
 	UpstreamClientUaKey = "UPSTREAM_CLIENT_TYPE"
+	DockerConfLocation  = "/kaniko/.docker/config.json"
 )
 
 func (w *withUserAgent) RoundTrip(r *http.Request) (*http.Response, error) {
@@ -129,7 +130,7 @@ func CheckPushPermissions(opts *config.KanikoOptions) error {
 		if strings.Contains(destRef.RegistryStr(), "gcr.io") {
 			// Checking for existence of docker.config as it's normally required for
 			// authenticated registries and prevent overwriting user provided docker conf
-			if _, err := fs.Stat("/kaniko/.docker/config.json"); os.IsNotExist(err) {
+			if _, err := fs.Stat(DockerConfLocation); os.IsNotExist(err) {
 				if err := execCommand("docker-credential-gcr", "configure-docker").Run(); err != nil {
 					return errors.Wrap(err, "error while configuring docker-credential-gcr helper")
 				}
diff --git a/pkg/executor/push_test.go b/pkg/executor/push_test.go
index 035a66575..f9c54db0f 100644
--- a/pkg/executor/push_test.go
+++ b/pkg/executor/push_test.go
@@ -334,7 +334,6 @@ func TestCheckPushPermissionsGCR(t *testing.T) {
 		Destinations: []string{"gcr.io/test-image"},
 	}
 	fs = afero.NewMemMapFs()
-	//afero.WriteFile(fs, "/kaniko/.docker/config.json", []byte(""), os.FileMode(0644))
 	CheckPushPermissions(&opts)
 	if called != true {
 		t.Error("execCommand should have been called")
@@ -350,7 +349,7 @@ func TestCheckPushPermissionsGCRExistingDockerConf(t *testing.T) {
 		Destinations: []string{"gcr.io/test-image"},
 	}
 	fs = afero.NewMemMapFs()
-	afero.WriteFile(fs, "/kaniko/.docker/config.json", []byte(""), os.FileMode(0644))
+	afero.WriteFile(fs, DockerConfLocation, []byte(""), os.FileMode(0644))
 	CheckPushPermissions(&opts)
 	if called != false {
 		t.Error("execCommand should not have been called")