Merge pull request acorn-io#1718 from iwilltry42/iwilltry42/issue1563

fix: resolvelocal should always return full ID if image is found (acorn-io#1563)

integration/client/apps/apps_test.go

@@ -1,6 +1,7 @@
 package apps
 
 import (
+	"fmt"
 	"strings"
 	"testing"
 
@@ -461,3 +462,37 @@ func TestAppRun(t *testing.T) {
 	assert.Equal(t, "secret", app.Spec.Secrets[0].Secret)
 	assert.Equal(t, "value", app.Spec.DeployArgs["key"])
 }
+
+func TestAppRunImageVariations(t *testing.T) {
+	helper.EnsureCRDs(t)
+	restConfig := helper.StartAPI(t)
+
+	ctx := helper.GetCTX(t)
+	kclient := helper.MustReturn(kclient.Default)
+	ns := helper.TempNamespace(t, kclient)
+
+	imageID := client2.NewImage(t, ns.Name)
+
+	c, err := client.New(restConfig, "", ns.Name)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := c.ImageTag(ctx, imageID, "foo/bar:baz"); err != nil {
+		t.Fatal(err)
+	}
+
+	imageNames := []string{
+		"foo/bar:baz",
+		imageID,
+		fmt.Sprintf("sha256:%s", imageID),
+		imageID[:8],
+	}
+
+	for _, imageName := range imageNames {
+		_, err := c.AppRun(ctx, imageName, nil)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}

pkg/tags/tags.go

@@ -84,11 +84,9 @@ func ResolveLocal(ctx context.Context, c kclient.Client, namespace, image string
 		if IsLocalReference(image) {
 			return "", false, err
 		}
+		return image, false, nil
 	} else if err != nil {
 		return "", false, err
-	} else if !localImage.Remote {
-		// The name will match the name we used to lookup, so trim the digest
-		return strings.TrimPrefix(localImage.Digest, "sha256:"), true, nil
 	}
-	return image, false, nil
+	return strings.TrimPrefix(localImage.Digest, "sha256:"), !localImage.Remote, nil
 }