Merge pull request #656 from rumpl/rework-image-list

Merge repo and tag on image list

Author: glours

e2e/images_test.go

@@ -13,10 +13,10 @@ import (
 
 var (
 	reg      = regexp.MustCompile("Digest is (.*).")
-	expected = `REPOSITORY             TAG    APP NAME
-%s        push-pull
-a-simple-app           latest simple
-b-simple-app           latest simple
+	expected = `APP IMAGE                                                                                      APP NAME
+%s push-pull
+a-simple-app:latest                                                                            simple
+b-simple-app:latest                                                                            simple
 `
 )
 
@@ -48,9 +48,9 @@ func TestImageList(t *testing.T) {
 		dir := fs.NewDir(t, "")
 		defer dir.Remove()
 
-		insertBundles(t, cmd, dir, info)
+		digest := insertBundles(t, cmd, dir, info)
 
-		expectedOutput := fmt.Sprintf(expected, info.registryAddress+"/c-myapp")
+		expectedOutput := fmt.Sprintf(expected, info.registryAddress+"/c-myapp@"+digest)
 		cmd.Command = dockerCli.Command("app", "image", "ls")
 		result := icmd.RunCmd(cmd).Assert(t, icmd.Success)
 		assert.Equal(t, result.Stdout(), expectedOutput)
@@ -84,7 +84,7 @@ Deleted: b-simple-app:latest`,
 			Err:      `Error: no such image b-simple-app:latest`,
 		})
 
-		expectedOutput := "REPOSITORY TAG APP NAME\n"
+		expectedOutput := "APP IMAGE APP NAME\n"
 		cmd.Command = dockerCli.Command("app", "image", "ls")
 		result := icmd.RunCmd(cmd).Assert(t, icmd.Success)
 		assert.Equal(t, result.Stdout(), expectedOutput)

internal/commands/image/list.go

@@ -64,10 +64,6 @@ func getPackages(bundleStore store.BundleStore, references []reference.Named) ([
 			ref:    ref,
 		}
 
-		if r, ok := ref.(reference.NamedTagged); ok {
-			pk.taggedRef = r
-		}
-
 		packages[i] = pk
 	}
 
@@ -106,14 +102,8 @@ var (
 		header string
 		value  func(p pkg) string
 	}{
-		{"REPOSITORY", func(p pkg) string {
-			return reference.FamiliarName(p.ref)
-		}},
-		{"TAG", func(p pkg) string {
-			if p.taggedRef != nil {
-				return p.taggedRef.Tag()
-			}
-			return ""
+		{"APP IMAGE", func(p pkg) string {
+			return reference.FamiliarString(p.ref)
 		}},
 		{"APP NAME", func(p pkg) string {
 			return p.bundle.Name
@@ -122,7 +112,6 @@ var (
 )
 
 type pkg struct {
-	ref       reference.Named
-	taggedRef reference.NamedTagged
-	bundle    *bundle.Bundle
+	ref    reference.Named
+	bundle *bundle.Bundle
 }