Merge pull request #522 from silvin-lubecki/list-per-date

List installations per last modification date

Author: silvin-lubecki

internal/commands/list.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 	"io"
+	"sort"
 	"strings"
 	"text/tabwriter"
 	"time"
@@ -53,28 +54,15 @@ func listCmd(dockerCli command.Cli) *cobra.Command {
 
 func runList(dockerCli command.Cli, opts listOptions) error {
 	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
-
-	appstore, err := store.NewApplicationStore(config.Dir())
-	if err != nil {
-		return err
-	}
-	installationStore, err := appstore.InstallationStore(targetContext)
+	installations, err := getInstallations(targetContext, config.Dir())
 	if err != nil {
 		return err
 	}
 
-	installations, err := installationStore.List()
-	if err != nil {
-		return err
-	}
 	w := tabwriter.NewWriter(dockerCli.Out(), 0, 0, 1, ' ', 0)
 	printHeaders(w)
 
-	for _, name := range installations {
-		installation, err := installationStore.Read(name)
-		if err != nil {
-			return err
-		}
+	for _, installation := range installations {
 		printValues(w, installation)
 	}
 	return w.Flush()
@@ -95,3 +83,31 @@ func printValues(w io.Writer, installation *store.Installation) {
 	}
 	fmt.Fprintln(w, strings.Join(values, "\t"))
 }
+
+func getInstallations(targetContext, configDir string) ([]*store.Installation, error) {
+	appstore, err := store.NewApplicationStore(configDir)
+	if err != nil {
+		return nil, err
+	}
+	installationStore, err := appstore.InstallationStore(targetContext)
+	if err != nil {
+		return nil, err
+	}
+	installationNames, err := installationStore.List()
+	if err != nil {
+		return nil, err
+	}
+	installations := make([]*store.Installation, len(installationNames))
+	for i, name := range installationNames {
+		installation, err := installationStore.Read(name)
+		if err != nil {
+			return nil, err
+		}
+		installations[i] = installation
+	}
+	// Sort installations with last modified first
+	sort.Slice(installations, func(i, j int) bool {
+		return installations[i].Modified.After(installations[j].Modified)
+	})
+	return installations, nil
+}

internal/commands/list_test.go

@@ -0,0 +1,43 @@
+package commands
+
+import (
+	"testing"
+	"time"
+
+	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/docker/app/internal/store"
+	"gotest.tools/assert"
+	"gotest.tools/fs"
+)
+
+func TestGetInstallationsSorted(t *testing.T) {
+	tmpDir := fs.NewDir(t, "")
+	defer tmpDir.Remove()
+	appstore, err := store.NewApplicationStore(tmpDir.Path())
+	assert.NilError(t, err)
+	installationStore, err := appstore.InstallationStore("my-context")
+	assert.NilError(t, err)
+	now := time.Now()
+
+	oldInstallation := &store.Installation{
+		Claim: claim.Claim{
+			Name:     "old-installation",
+			Modified: now.Add(-1 * time.Hour),
+		},
+	}
+	newInstallation := &store.Installation{
+		Claim: claim.Claim{
+			Name:     "new-installation",
+			Modified: now,
+		},
+	}
+	assert.NilError(t, installationStore.Store(newInstallation))
+	assert.NilError(t, installationStore.Store(oldInstallation))
+
+	installations, err := getInstallations("my-context", tmpDir.Path())
+	assert.NilError(t, err)
+	assert.Equal(t, len(installations), 2)
+	// First installation is the last modified
+	assert.Equal(t, installations[0].Name, "new-installation")
+	assert.Equal(t, installations[1].Name, "old-installation")
+}