From ee31dc93b61c36d613a8ec056eeb12f11a7b3634 Mon Sep 17 00:00:00 2001
From: Tejal Desai <tejaldesai@google.com>
Date: Wed, 20 Oct 2021 19:13:24 -0700
Subject: [PATCH] Revert "Support mirror registries with path component
 (#1707)" (#1794)

* Revert "Support mirror registries with path component (#1707)"

This reverts commit 4e218f21623d89ef4161461c1f3c73baf2d7c119.

* fix tests and add co-sign back
---
 .github/workflows/release.yaml  | 20 +++++++++++++++-----
 integration/integration_test.go |  4 ++--
 pkg/image/remote/remote.go      | 21 ++++-----------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 107b1de7f..b9a8b812d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -72,13 +72,9 @@ jobs:
     # Use cosign to sign the images
     - run: |
         export KMS_VAL=gcpkms://projects/kaniko-project/locations/global/keyRings/cosign/cryptoKeys/cosign
-        cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim  
-        cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim 
-        cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:slim  
-
         cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}
         cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}
-        cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:latest  
+        cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:latest
 
   build-debug:
     env:
@@ -274,3 +270,17 @@ jobs:
           gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim
           gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim
           gcr.io/kaniko-project/executor:slim
+
+    - name: Sign images
+      uses: sigstore/cosign-installer@main
+      with:
+        cosign-release: 'v0.2.0'
+
+      # Use cosign to sign the images
+      - run: |
+          export KMS_VAL=gcpkms://projects/kaniko-project/locations/global/keyRings/cosign/cryptoKeys/cosign
+          cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim
+          cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:${{ steps.vars.outputs.tag }}-slim
+          cosign sign -kms $KMS_VAL gcr.io/kaniko-project/executor:slim
+
+
diff --git a/integration/integration_test.go b/integration/integration_test.go
index ba18c86b2..96924f098 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -389,8 +389,8 @@ func TestBuildViaRegistryMirrors(t *testing.T) {
 	dockerRunFlags = append(dockerRunFlags, ExecutorImage,
 		"-f", dockerfile,
 		"-d", kanikoImage,
-		"--registry-mirror", "doesnotexist.example.com/test",
-		"--registry-mirror", "us-mirror.gcr.io/test",
+		"--registry-mirror", "doesnotexist.example.com",
+		"--registry-mirror", "us-mirror.gcr.io",
 		"-c", fmt.Sprintf("git://%s", repo))
 
 	kanikoCmd := exec.Command("docker", dockerRunFlags...)
diff --git a/pkg/image/remote/remote.go b/pkg/image/remote/remote.go
index 88a527839..990a7a1db 100644
--- a/pkg/image/remote/remote.go
+++ b/pkg/image/remote/remote.go
@@ -57,16 +57,16 @@ func RetrieveRemoteImage(image string, opts config.RegistryOptions, customPlatfo
 		}
 
 		for _, registryMirror := range opts.RegistryMirrors {
-			var newRepo name.Repository
+			var newReg name.Registry
 			if opts.InsecurePull || opts.InsecureRegistries.Contains(registryMirror) {
-				newRepo, err = name.NewRepository(registryMirror, name.WeakValidation, name.Insecure)
+				newReg, err = name.NewRegistry(registryMirror, name.WeakValidation, name.Insecure)
 			} else {
-				newRepo, err = name.NewRepository(registryMirror, name.StrictValidation)
+				newReg, err = name.NewRegistry(registryMirror, name.StrictValidation)
 			}
 			if err != nil {
 				return nil, err
 			}
-			ref := setNewRepository(ref, newRepo)
+			ref := setNewRegistry(ref, newReg)
 
 			logrus.Infof("Retrieving image %s from registry mirror %s", ref, registryMirror)
 			remoteImage, err := remote.Image(ref, remoteOptions(registryMirror, opts, customPlatform)...)
@@ -113,19 +113,6 @@ func normalizeReference(ref name.Reference, image string) (name.Reference, error
 	return ref, nil
 }
 
-func setNewRepository(ref name.Reference, newRepo name.Repository) name.Reference {
-	switch r := ref.(type) {
-	case name.Tag:
-		r.Repository = newRepo
-		return r
-	case name.Digest:
-		r.Repository = newRepo
-		return r
-	default:
-		return ref
-	}
-}
-
 func setNewRegistry(ref name.Reference, newReg name.Registry) name.Reference {
 	switch r := ref.(type) {
 	case name.Tag: