fix lifecycle change summarizer to show relocated image

fixes #187

pkg/import/change_summarizer.go

@@ -31,7 +31,7 @@ func SummarizeChange(
 		StackRefGetter: stackFactory,
 	}
 
-	err = writeLifecycleChange(ctx, desc.Lifecycle, iDiffer, cs, &summarizer)
+	err = writeLifecycleChange(ctx, kpConfig, desc.Lifecycle, iDiffer, cs, &summarizer)
 	if err != nil {
 		return
 	}

pkg/import/change_writer.go

@@ -20,14 +20,14 @@ type changeWriter interface {
 	writeChange(header string)
 }
 
-func writeLifecycleChange(ctx context.Context, newLifecycle Lifecycle, differ *ImportDiffer, cs buildk8s.ClientSet, cw changeWriter) error {
+func writeLifecycleChange(ctx context.Context, kpConfig config.KpConfig, newLifecycle Lifecycle, differ *ImportDiffer, cs buildk8s.ClientSet, cw changeWriter) error {
 	if newLifecycle.Image != "" {
 		oldImg, err := lifecycle.GetImage(ctx, cs.K8sClient)
 		if err != nil {
 			return err
 		}
 
-		diff, err := differ.DiffLifecycle(oldImg, newLifecycle.Image)
+		diff, err := differ.DiffLifecycle(kpConfig, oldImg, newLifecycle.Image)
 		if err != nil {
 			return err
 		}

pkg/import/import_differ.go

@@ -6,6 +6,8 @@ package _import
 import (
 	"context"
 	"fmt"
+	"path"
+	"strings"
 	"sync"
 
 	"github.com/google/go-containerregistry/pkg/authn"
@@ -33,8 +35,19 @@ type ImportDiffer struct {
 	StackRefGetter StackRefGetter
 }
 
-func (id *ImportDiffer) DiffLifecycle(oldImg string, newImg string) (string, error) {
-	return id.Differ.Diff(oldImg, newImg)
+func (id *ImportDiffer) DiffLifecycle(kpConfig config.KpConfig, oldImg string, newImg string) (string, error) {
+	canonicalRepo, err := kpConfig.CanonicalRepository()
+	if err != nil {
+		return "", err
+	}
+
+	newLifecycleImg := path.Join(canonicalRepo, "lifecycle")
+	s := strings.Split(newImg, "@")
+	if len(s) == 2 {
+		newLifecycleImg = fmt.Sprintf("%s@%s", newLifecycleImg, s[1])
+	}
+
+	return id.Differ.Diff(oldImg, newLifecycleImg)
 }
 
 func (id *ImportDiffer) DiffClusterStore(keychain authn.Keychain, kpConfig config.KpConfig, oldCS *v1alpha1.ClusterStore, newCS ClusterStore) (string, error) {

pkg/import/import_differ_test.go

@@ -203,4 +203,29 @@ func testImportDiffer(t *testing.T, when spec.G, it spec.S) {
 			require.Equal(t, nil, diffArg0)
 		})
 	})
+
+	when("DiffLifecycle", func() {
+		oldLifecycle := "my-cool-repo/lifecycle@some-digest"
+		it("diffs lifecycle with digest", func() {
+			newLifecycle := "someregistry/lifecycle@some-new-digest"
+			diff, err := importDiffer.DiffLifecycle(kpConfig, oldLifecycle, newLifecycle)
+			require.NoError(t, err)
+			require.Equal(t, "some-diff", diff)
+
+			diffArg0, diffArg1 := fakeDiffer.Args()
+			require.Equal(t, oldLifecycle, diffArg0)
+			require.Equal(t, "my-cool-repo/lifecycle@some-new-digest", diffArg1)
+		})
+
+		it("diffs lifecycle with no digest", func() {
+			newLifecycle := "someregistry/lifecycle"
+			diff, err := importDiffer.DiffLifecycle(kpConfig, oldLifecycle, newLifecycle)
+			require.NoError(t, err)
+			require.Equal(t, "some-diff", diff)
+
+			diffArg0, diffArg1 := fakeDiffer.Args()
+			require.Equal(t, oldLifecycle, diffArg0)
+			require.Equal(t, "my-cool-repo/lifecycle", diffArg1)
+		})
+	})
 }