cmd/ctr, service/containers: implement container filter

Signed-off-by: Stephen J Day <stephen.day@docker.com>

cmd/ctr/list.go

@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 	"text/tabwriter"
 
 	"github.com/containerd/containerd"
 	tasks "github.com/containerd/containerd/api/services/tasks/v1"
-	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/urfave/cli"
 )
 
@@ -31,24 +31,18 @@ var taskListCommand = cli.Command{
 	},
 }
 
-var containerListCommand = cli.Command{
-	Name:    "containers",
-	Usage:   "manage containers (metadata)",
-	Aliases: []string{"c"},
-	Subcommands: []cli.Command{
-		{
-			Name:    "list",
-			Usage:   "list tasks",
-			Aliases: []string{"ls"},
-			Flags: []cli.Flag{
-				cli.BoolFlag{
-					Name:  "quiet, q",
-					Usage: "print only the container id",
-				},
-			},
-			Action: containerListFn,
+var containersListCommand = cli.Command{
+	Name:      "list",
+	Usage:     "list all tasks or those that match a filter",
+	ArgsUsage: "[filter, ...]",
+	Aliases:   []string{"ls"},
+	Flags: []cli.Flag{
+		cli.BoolFlag{
+			Name:  "quiet, q",
+			Usage: "print only the container id",
 		},
 	},
+	Action: containerListFn,
 }
 
 func taskListFn(context *cli.Context) error {
@@ -62,66 +56,25 @@ func taskListFn(context *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	containers, err := client.Containers(ctx)
-	if err != nil {
-		return err
-	}
 
 	s := client.TaskService()
-
-	tasksResponse, err := s.List(ctx, &tasks.ListTasksRequest{})
+	response, err := s.List(ctx, &tasks.ListTasksRequest{})
 	if err != nil {
 		return err
 	}
 
-	// Join with tasks to get status.
-	tasksByContainerID := map[string]*tasktypes.Task{}
-	for _, task := range tasksResponse.Tasks {
-		tasksByContainerID[task.ContainerID] = task
-	}
-
 	if quiet {
-		for _, c := range containers {
-			task, ok := tasksByContainerID[c.ID()]
-			if ok {
-				fmt.Printf("%s\t%d\n", c.ID(), task.Pid)
-			} else {
-				//Since task is not running, PID is printed 0
-				fmt.Printf("%s\t%d\n", c.ID(), 0)
-			}
+		for _, task := range response.Tasks {
+			fmt.Println(task.ID)
 		}
 	} else {
-
-		w := tabwriter.NewWriter(os.Stdout, 10, 1, 3, ' ', 0)
-		fmt.Fprintln(w, "TASK-ID\tIMAGE\tPID\tSTATUS")
-		for _, c := range containers {
-			var imageName string
-			if image, err := c.Image(ctx); err != nil {
-				if err != containerd.ErrNoImage {
-					return err
-				}
-				imageName = "-"
-			} else {
-				imageName = image.Name()
-			}
-			var (
-				status string
-				pid    uint32
-			)
-			task, ok := tasksByContainerID[c.ID()]
-			if ok {
-				status = task.Status.String()
-				pid = task.Pid
-			} else {
-				status = "STOPPED" // TODO(stevvooe): Is this assumption correct?
-				pid = 0
-			}
-
-			if _, err := fmt.Fprintf(w, "%s\t%s\t%d\t%s\n",
-				c.ID(),
-				imageName,
-				pid,
-				status,
+		w := tabwriter.NewWriter(os.Stdout, 4, 8, 4, ' ', 0)
+		fmt.Fprintln(w, "TASK\tPID\tSTATUS\t")
+		for _, task := range response.Tasks {
+			if _, err := fmt.Fprintf(w, "%s\t%d\t%s\n",
+				task.ID,
+				task.Pid,
+				task.Status.String(),
 			); err != nil {
 				return err
 			}
@@ -133,6 +86,7 @@ func taskListFn(context *cli.Context) error {
 
 func containerListFn(context *cli.Context) error {
 	var (
+		filters     = context.Args()
 		quiet       = context.Bool("quiet")
 		ctx, cancel = appContext(context)
 	)
@@ -142,18 +96,28 @@ func containerListFn(context *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	containers, err := client.Containers(ctx)
+	containers, err := client.Containers(ctx, filters...)
 	if err != nil {
 		return err
 	}
+
 	if quiet {
 		for _, c := range containers {
 			fmt.Printf("%s\n", c.ID())
 		}
 	} else {
-		cl := tabwriter.NewWriter(os.Stdout, 10, 1, 3, ' ', 0)
-		fmt.Fprintln(cl, "ID\tIMAGE\tRUNTIME\tSIZE")
+		w := tabwriter.NewWriter(os.Stdout, 4, 8, 4, ' ', 0)
+		fmt.Fprintln(w, "CONTAINER\tIMAGE\tRUNTIME\tLABELS\t")
 		for _, c := range containers {
+			var labelStrings []string
+			for k, v := range c.Proto().Labels {
+				labelStrings = append(labelStrings, strings.Join([]string{k, v}, "="))
+			}
+			labels := strings.Join(labelStrings, ",")
+			if labels == "" {
+				labels = "-"
+			}
+
 			var imageName string
 			if image, err := c.Image(ctx); err != nil {
 				if err != containerd.ErrNoImage {
@@ -163,17 +127,18 @@ func containerListFn(context *cli.Context) error {
 			} else {
 				imageName = image.Name()
 			}
+
 			proto := c.Proto()
-			if _, err := fmt.Fprintf(cl, "%s\t%s\t%s\t%d\n",
+			if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%v\t\n",
 				c.ID(),
 				imageName,
 				proto.Runtime.Name,
-				proto.Size(),
+				labels,
 			); err != nil {
 				return err
 			}
 		}
-		return cl.Flush()
+		return w.Flush()
 	}
 	return nil
 }