Add a new column in the list command, showing the application reference, or nothing if built locally

Signed-off-by: Silvin Lubecki <[email protected]>

Author: silvin-lubecki

e2e/commands_test.go

@@ -325,8 +325,8 @@ func testDockerAppLifecycle(t *testing.T, useBindMount bool) {
 	cmd.Command = dockerCli.Command("app", "list")
 	checkContains(t, icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(),
 		[]string{
-			`INSTALLATION\s+APPLICATION\s+LAST ACTION\s+RESULT\s+CREATED\s+MODIFIED`,
-			fmt.Sprintf(`%s\s+simple \(1.1.0-beta1\)\s+install\s+failure\s+.+second?\s+.+second`, appName),
+			`INSTALLATION\s+APPLICATION\s+LAST ACTION\s+RESULT\s+CREATED\s+MODIFIED\s+REFERENCE`,
+			fmt.Sprintf(`%s\s+simple \(1.1.0-beta1\)\s+install\s+failure\s+.+second[s]?\s+.+second[s]?\s+`, appName),
 		})
 
 	// Upgrading a failed installation is not allowed
@@ -361,8 +361,8 @@ func testDockerAppLifecycle(t *testing.T, useBindMount bool) {
 	cmd.Command = dockerCli.Command("app", "list")
 	checkContains(t, icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(),
 		[]string{
-			`INSTALLATION\s+APPLICATION\s+LAST ACTION\s+RESULT\s+CREATED\s+MODIFIED`,
-			fmt.Sprintf(`%s\s+simple \(1.1.0-beta1\)\s+install\s+success\s+.+second.\s+.+second`, appName),
+			`INSTALLATION\s+APPLICATION\s+LAST ACTION\s+RESULT\s+CREATED\s+MODIFIED\s+REFERENCE`,
+			fmt.Sprintf(`%s\s+simple \(1.1.0-beta1\)\s+install\s+success\s+.+second[s]?\s+.+second[s]?\s+`, appName),
 		})
 
 	// Installing again the same application is forbidden

e2e/pushpull_test.go

@@ -104,20 +104,28 @@ func TestPushPullInstall(t *testing.T) {
 	runWithDindSwarmAndRegistry(t, func(info dindSwarmAndRegistryInfo) {
 		cmd := info.configuredCmd
 		ref := info.registryAddress + "/test/push-pull"
-		cmd.Command = dockerCli.Command("app", "push", "--tag", ref, "--insecure-registries="+info.registryAddress, filepath.Join("testdata", "push-pull", "push-pull.dockerapp"))
+		tag := ":v.0.0.1"
+		cmd.Command = dockerCli.Command("app", "push", "--tag", ref+tag, "--insecure-registries="+info.registryAddress, filepath.Join("testdata", "push-pull", "push-pull.dockerapp"))
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
-		cmd.Command = dockerCli.Command("app", "pull", ref, "--insecure-registries="+info.registryAddress)
+		cmd.Command = dockerCli.Command("app", "pull", ref+tag, "--insecure-registries="+info.registryAddress)
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
 		// stop the registry
 		info.stopRegistry()
 
 		// install without --pull should succeed (rely on local store)
-		cmd.Command = dockerCli.Command("app", "install", "--insecure-registries="+info.registryAddress, ref, "--name", t.Name())
+		cmd.Command = dockerCli.Command("app", "install", "--insecure-registries="+info.registryAddress, ref+tag, "--name", t.Name())
 		icmd.RunCmd(cmd).Assert(t, icmd.Success)
 		cmd.Command = dockerCli.Command("service", "ls")
 		assert.Check(t, cmp.Contains(icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(), ref))
 
+		// listing the installed application shows the pulled application reference
+		cmd.Command = dockerCli.Command("app", "list")
+		checkContains(t, icmd.RunCmd(cmd).Assert(t, icmd.Success).Combined(),
+			[]string{
+				fmt.Sprintf(`%s\s+push-pull \(1.1.0-beta1\)\s+install\s+success\s+.+second[s]?\s+.+second[s]?\s+%s`, t.Name(), ref+tag),
+			})
+
 		// install with --pull should fail (registry is stopped)
 		cmd.Command = dockerCli.Command("app", "install", "--pull", "--insecure-registries="+info.registryAddress, ref, "--name", t.Name()+"2")
 		assert.Check(t, cmp.Contains(icmd.RunCmd(cmd).Assert(t, icmd.Expected{ExitCode: 1}).Combined(), "failed to resolve bundle manifest"))

internal/commands/list.go

@@ -7,8 +7,6 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/deislabs/duffle/pkg/claim"
-
 	"github.com/docker/app/internal/store"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -24,14 +22,16 @@ type listOptions struct {
 var (
 	listColumns = []struct {
 		header string
-		value  func(c *claim.Claim) string
+		value  func(i *store.Installation) string
 	}{
-		{"INSTALLATION", func(c *claim.Claim) string { return c.Name }},
-		{"APPLICATION", func(c *claim.Claim) string { return fmt.Sprintf("%s (%s)", c.Bundle.Name, c.Bundle.Version) }},
-		{"LAST ACTION", func(c *claim.Claim) string { return c.Result.Action }},
-		{"RESULT", func(c *claim.Claim) string { return c.Result.Status }},
-		{"CREATED", func(c *claim.Claim) string { return units.HumanDuration(time.Since(c.Created)) }},
-		{"MODIFIED", func(c *claim.Claim) string { return units.HumanDuration(time.Since(c.Modified)) }}}
+		{"INSTALLATION", func(i *store.Installation) string { return i.Name }},
+		{"APPLICATION", func(i *store.Installation) string { return fmt.Sprintf("%s (%s)", i.Bundle.Name, i.Bundle.Version) }},
+		{"LAST ACTION", func(i *store.Installation) string { return i.Result.Action }},
+		{"RESULT", func(i *store.Installation) string { return i.Result.Status }},
+		{"CREATED", func(i *store.Installation) string { return units.HumanDuration(time.Since(i.Created)) }},
+		{"MODIFIED", func(i *store.Installation) string { return units.HumanDuration(time.Since(i.Modified)) }},
+		{"REFERENCE", func(i *store.Installation) string { return i.Reference }},
+	}
 )
 
 func listCmd(dockerCli command.Cli) *cobra.Command {
@@ -70,12 +70,12 @@ func runList(dockerCli command.Cli, opts listOptions) error {
 	w := tabwriter.NewWriter(dockerCli.Out(), 0, 0, 1, ' ', 0)
 	printHeaders(w)
 
-	for _, c := range installations {
-		installation, err := installationStore.Read(c)
+	for _, name := range installations {
+		installation, err := installationStore.Read(name)
 		if err != nil {
 			return err
 		}
-		printValues(w, &installation)
+		printValues(w, installation)
 	}
 	return w.Flush()
 }
@@ -88,7 +88,7 @@ func printHeaders(w io.Writer) {
 	fmt.Fprintln(w, strings.Join(headers, "\t"))
 }
 
-func printValues(w io.Writer, installation *claim.Claim) {
+func printValues(w io.Writer, installation *store.Installation) {
 	var values []string
 	for _, column := range listColumns {
 		values = append(values, column.value(installation))