use docker.ParseReference for kaniko env templating

pkg/skaffold/build/cluster/kaniko.go

@@ -174,36 +174,21 @@ func generateEnvFromImage(imageStr string) ([]v1.EnvVar, error) {
 }
 
 func parseImageParts(imageStr string) (string, string, string, error) {
-	var repo, name, tag string
-	var err error
-	parts := strings.Split(imageStr, ":")
-	switch len(parts) {
-	case 1:
-		// default tag: latest
-		parts = append(parts, "latest")
-	case 2:
-	case 3:
-		if strings.ContainsRune(parts[0], '/') {
-			err = fmt.Errorf("invalid image uri string: %q", imageStr)
-			return repo, name, tag, err
-		}
-		parts[0] = parts[0] + ":" + parts[1]
-		parts[1] = parts[2]
-		parts = parts[:2]
-	default:
-		err = fmt.Errorf("invalid image uri string: %q", imageStr)
-		return repo, name, tag, err
-	}
-	tag = parts[1]
-	imageParts := strings.Split(parts[0], "/")
-	switch len(imageParts) {
-	case 0:
-		name = parts[1]
-	case 1:
-		name = imageParts[0]
-	default:
-		repo = strings.Join(imageParts[:len(imageParts)-1], "/")
-		name = imageParts[len(imageParts)-1]
-	}
-	return repo, name, tag, err
+	imgRef, err := docker.ParseReference(imageStr)
+	if err != nil {
+		return "", "", "", err
+	}
+
+	repoParts := strings.Split(imgRef.BaseName, "/")
+	if len(repoParts) < 2 {
+		return "", "", "", fmt.Errorf("unable to detect image repository name: %#v", repoParts)
+	}
+
+	repo := strings.Join(repoParts[:len(repoParts)-1], "/")
+	name := repoParts[len(repoParts)-1]
+	tag := imgRef.Tag
+	if tag == "" {
+		tag = "latest"
+	}
+	return repo, name, tag, nil
 }

pkg/skaffold/build/cluster/kaniko_test.go

@@ -72,3 +72,27 @@ func TestEnvInterpolation_IPPort(t *testing.T) {
 	}
 	testutil.CheckElementsMatch(t, expected, actual)
 }
+
+func TestEnvInterpolation_Latest(t *testing.T) {
+	imageStr := "why.com/is/this/such/a/long/repo/name/testimage"
+	artifact := &latest.KanikoArtifact{
+		Env: []v1.EnvVar{{Name: "hui", Value: "buh"}},
+	}
+	generatedEnvs, err := generateEnvFromImage(imageStr)
+	if err != nil {
+		t.Fatalf("error generating env: %s", err)
+	}
+	env, err := evaluateEnv(artifact.Env, generatedEnvs...)
+	if err != nil {
+		t.Fatalf("unable to evaluate env variables: %s", err)
+	}
+
+	actual := env
+	expected := []v1.EnvVar{
+		{Name: "hui", Value: "buh"},
+		{Name: "IMAGE_REPO", Value: "why.com/is/this/such/a/long/repo/name"},
+		{Name: "IMAGE_NAME", Value: "testimage"},
+		{Name: "IMAGE_TAG", Value: "latest"},
+	}
+	testutil.CheckElementsMatch(t, expected, actual)
+}