Add an orchestrator column in the docker stack ls command

silvin-lubecki · silvin-lubecki · commit 8108934ec06b · 2018-03-28T00:37:26.000+02:00
Signed-off-by: Silvin Lubecki &lt;silvin.lubecki@docker.com&gt;
diff --git a/cli/command/formatter/stack.go b/cli/command/formatter/stack.go
@@ -5,9 +5,10 @@ import (
 )
 
 const (
-	defaultStackTableFormat = "table {{.Name}}\t{{.Services}}"
+	defaultStackTableFormat = "table {{.Name}}\t{{.Services}}\t{{.Orchestrator}}"
 
-	stackServicesHeader = "SERVICES"
+	stackServicesHeader      = "SERVICES"
+	stackOrchestrastorHeader = "ORCHESTRATOR"
 )
 
 // Stack contains deployed stack information.
@@ -16,6 +17,8 @@ type Stack struct {
 	Name string
 	// Services is the number of the services
 	Services int
+	// Orchestratort is the platform on which the stack is deployed
+	Orchestrator string
 }
 
 // NewStackFormat returns a format for use with a stack Context
@@ -48,8 +51,9 @@ type stackContext struct {
 func newStackContext() *stackContext {
 	stackCtx := stackContext{}
 	stackCtx.header = map[string]string{
-		"Name":     nameHeader,
-		"Services": stackServicesHeader,
+		"Name":         nameHeader,
+		"Services":     stackServicesHeader,
+		"Orchestrator": stackOrchestrastorHeader,
 	}
 	return &stackCtx
 }
@@ -65,3 +69,7 @@ func (s *stackContext) Name() string {
 func (s *stackContext) Services() string {
 	return strconv.Itoa(s.s.Services)
 }
+
+func (s *stackContext) Orchestrator() string {
+	return s.s.Orchestrator
+}
diff --git a/cli/command/formatter/stack_test.go b/cli/command/formatter/stack_test.go
@@ -27,9 +27,9 @@ func TestStackContextWrite(t *testing.T) {
 		// Table format
 		{
 			Context{Format: NewStackFormat("table")},
-			`NAME                SERVICES
-baz                 2
-bar                 1
+			`NAME                SERVICES            ORCHESTRATOR
+baz                 2                   orchestrator1
+bar                 1                   orchestrator2
 `,
 		},
 		{
@@ -49,8 +49,8 @@ bar
 	}
 
 	stacks := []*Stack{
-		{Name: "baz", Services: 2},
-		{Name: "bar", Services: 1},
+		{Name: "baz", Services: 2, Orchestrator: "orchestrator1"},
+		{Name: "bar", Services: 1, Orchestrator: "orchestrator2"},
 	}
 	for _, testcase := range cases {
 		out := bytes.NewBufferString("")
diff --git a/cli/command/stack/kubernetes/list.go b/cli/command/stack/kubernetes/list.go
@@ -46,8 +46,9 @@ func getStacks(kubeCli *KubeCli) ([]*formatter.Stack, error) {
 	var formattedStacks []*formatter.Stack
 	for _, stack := range stacks {
 		formattedStacks = append(formattedStacks, &formatter.Stack{
-			Name:     stack.name,
-			Services: len(stack.getServices()),
+			Name:         stack.name,
+			Services:     len(stack.getServices()),
+			Orchestrator: "Kubernetes",
 		})
 	}
 	return formattedStacks, nil
diff --git a/cli/command/stack/swarm/list.go b/cli/command/stack/swarm/list.go
@@ -59,8 +59,9 @@ func getStacks(ctx context.Context, apiclient client.APIClient) ([]*formatter.St
 		ztack, ok := m[name]
 		if !ok {
 			m[name] = &formatter.Stack{
-				Name:     name,
-				Services: 1,
+				Name:         name,
+				Services:     1,
+				Orchestrator: "Swarm",
 			}
 		} else {
 			ztack.Services++
diff --git a/cli/command/stack/testdata/stack-list-sort-natural.golden b/cli/command/stack/testdata/stack-list-sort-natural.golden
@@ -1,4 +1,4 @@
-NAME                  SERVICES
-service-name-1-foo    1
-service-name-2-foo    1
-service-name-10-foo   1
+NAME                  SERVICES            ORCHESTRATOR
+service-name-1-foo    1                   Swarm
+service-name-2-foo    1                   Swarm
+service-name-10-foo   1                   Swarm
diff --git a/cli/command/stack/testdata/stack-list-sort.golden b/cli/command/stack/testdata/stack-list-sort.golden
@@ -1,3 +1,3 @@
-NAME                SERVICES
-service-name-bar    1
-service-name-foo    1
+NAME                SERVICES            ORCHESTRATOR
+service-name-bar    1                   Swarm
+service-name-foo    1                   Swarm
diff --git a/cli/command/stack/testdata/stack-list-without-format.golden b/cli/command/stack/testdata/stack-list-without-format.golden
@@ -1,2 +1,2 @@
-NAME                SERVICES
-service-name-foo    1
+NAME                SERVICES            ORCHESTRATOR
+service-name-foo    1                   Swarm

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ func TestStackContextWrite(t *testing.T) {`
`27`	`27`	`// Table format`
`28`	`28`	`{`
`29`	`29`	`Context{Format: NewStackFormat("table")},`
`30`		- `NAME SERVICES
`31`		`-baz 2`
`32`		`-bar 1`
	`30`	+ `NAME SERVICES ORCHESTRATOR
	`31`	`+baz 2 orchestrator1`
	`32`	`+bar 1 orchestrator2`
`33`	`33`	`,
`34`	`34`	`},`
`35`	`35`	`{`
`@@ -49,8 +49,8 @@ bar`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`stacks := []*Stack{`
`52`		`- {Name: "baz", Services: 2},`
`53`		`- {Name: "bar", Services: 1},`
	`52`	`+ {Name: "baz", Services: 2, Orchestrator: "orchestrator1"},`
	`53`	`+ {Name: "bar", Services: 1, Orchestrator: "orchestrator2"},`
`54`	`54`	`}`
`55`	`55`	`for _, testcase := range cases {`
`56`	`56`	`out := bytes.NewBufferString("")`