From 89119515af3aa2eff87d195c33208bd15439a48c Mon Sep 17 00:00:00 2001
From: Simon Aronsson <simme@arcticbit.se>
Date: Mon, 21 Dec 2020 18:20:38 +0100
Subject: [PATCH] clean up scope builder and remove fmt print

---
 pkg/registry/auth/auth.go | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkg/registry/auth/auth.go b/pkg/registry/auth/auth.go
index ae708b6..99e307c 100644
--- a/pkg/registry/auth/auth.go
+++ b/pkg/registry/auth/auth.go
@@ -153,26 +153,25 @@ func GetAuthURL(challenge string, img string) (*url.URL, error) {
 // GetScopeFromImageName normalizes an image name for use as scope during auth and head requests
 func GetScopeFromImageName(img, svc string) string {
 	parts := strings.Split(img, "/")
-	scopeImage := ""
+
 	if len(parts) > 2 {
 		if strings.Contains(svc, "docker.io") {
-			fmt.Printf("Identified dockerhub image")
-			scopeImage = fmt.Sprintf("%s/%s", parts[1], strings.Join(parts[2:], "/"))
-		} else {
-			scopeImage = strings.Join(parts, "/")
+			return fmt.Sprintf("%s/%s", parts[1], strings.Join(parts[2:], "/"))
 		}
-	} else if len(parts) == 2 {
+		return strings.Join(parts, "/")
+	}
+
+	if len(parts) == 2 {
 		if strings.Contains(parts[0], "docker.io") {
-			scopeImage = fmt.Sprintf("library/%s", parts[1])
-		} else {
-			scopeImage = strings.Replace(img, svc+"/", "", 1)
+			return fmt.Sprintf("library/%s", parts[1])
 		}
-	} else if strings.Contains(svc, "docker.io") {
-		scopeImage = fmt.Sprintf("library/%s", parts[0])
-	} else {
-		scopeImage = img
+		return strings.Replace(img, svc+"/", "", 1)
+	}
+
+	if strings.Contains(svc, "docker.io") {
+		return fmt.Sprintf("library/%s", parts[0])
 	}
-	return scopeImage
+	return img
 }
 
 // GetChallengeURL creates a URL object based on the image info