Move Kubernetes stack retrieval to the kubernetes namespace

mat007 · mat007 · commit 691eeff5a5db · 2018-05-10T11:31:06.000+02:00
Signed-off-by: Mathieu Champlon &lt;mathieu.champlon@docker.com&gt;
diff --git a/cli/command/stack/kubernetes/list.go b/cli/command/stack/kubernetes/list.go
@@ -1,14 +1,29 @@
 package kubernetes
 
 import (
+	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/cli/command/stack/options"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// GetStacks lists the kubernetes stacks.
-func GetStacks(kubeCli *KubeCli, opts options.List) ([]*formatter.Stack, error) {
-	composeClient, err := kubeCli.composeClient()
+// GetStacks lists the kubernetes stacks
+func GetStacks(dockerCli command.Cli, opts options.List, kopts Options) ([]*formatter.Stack, error) {
+	if opts.AllNamespaces || len(opts.Namespaces) == 0 {
+		if dockerCli.ClientInfo().HasAll() {
+			opts.AllNamespaces = true
+		}
+		return getStacks(dockerCli, opts, kopts)
+	}
+	return getStacksWithNamespaces(dockerCli, opts, kopts)
+}
+
+func getStacks(dockerCli command.Cli, opts options.List, kopts Options) ([]*formatter.Stack, error) {
+	kli, err := WrapCli(dockerCli, kopts)
+	if err != nil {
+		return nil, err
+	}
+	composeClient, err := kli.composeClient()
 	if err != nil {
 		return nil, err
 	}
@@ -31,3 +46,28 @@ func GetStacks(kubeCli *KubeCli, opts options.List) ([]*formatter.Stack, error)
 	}
 	return formattedStacks, nil
 }
+
+func getStacksWithNamespaces(dockerCli command.Cli, opts options.List, kopts Options) ([]*formatter.Stack, error) {
+	stacks := []*formatter.Stack{}
+	for _, namespace := range removeDuplicates(opts.Namespaces) {
+		kopts.Namespace = namespace
+		ss, err := getStacks(dockerCli, opts, kopts)
+		if err != nil {
+			return nil, err
+		}
+		stacks = append(stacks, ss...)
+	}
+	return stacks, nil
+}
+
+func removeDuplicates(namespaces []string) []string {
+	mnms := map[string]struct{}{}
+	for _, nm := range namespaces {
+		mnms[nm] = struct{}{}
+	}
+	namespaces = []string{}
+	for nm := range mnms {
+		namespaces = append(namespaces, nm)
+	}
+	return namespaces
+}
diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go
@@ -47,27 +47,16 @@ func runList(cmd *cobra.Command, dockerCli command.Cli, opts options.List) error
 		stacks = append(stacks, ss...)
 	}
 	if dockerCli.ClientInfo().HasKubernetes() {
-		kopts := kubernetes.NewOptions(cmd.Flags())
-		if opts.AllNamespaces || len(opts.Namespaces) == 0 {
-			if dockerCli.ClientInfo().HasAll() {
-				opts.AllNamespaces = true
-			}
-			ss, err := getStacks(dockerCli, opts, kopts)
-			if err != nil {
-				return err
-			}
-			stacks = append(stacks, ss...)
-		} else {
-			for _, nm := range removeDuplicates(opts.Namespaces) {
-				kopts.Namespace = nm
-				ss, err := getStacks(dockerCli, opts, kopts)
-				if err != nil {
-					return err
-				}
-				stacks = append(stacks, ss...)
-			}
+		ss, err := kubernetes.GetStacks(dockerCli, opts, kubernetes.NewOptions(cmd.Flags()))
+		if err != nil {
+			return err
 		}
+		stacks = append(stacks, ss...)
 	}
+	return format(dockerCli, opts, stacks)
+}
+
+func format(dockerCli command.Cli, opts options.List, stacks []*formatter.Stack) error {
 	format := opts.Format
 	if format == "" || format == formatter.TableFormatKey {
 		format = formatter.SwarmStackTableFormat
@@ -86,27 +75,3 @@ func runList(cmd *cobra.Command, dockerCli command.Cli, opts options.List) error
 	})
 	return formatter.StackWrite(stackCtx, stacks)
 }
-
-func getStacks(dockerCli command.Cli, opts options.List, kopts kubernetes.Options) ([]*formatter.Stack, error) {
-	kli, err := kubernetes.WrapCli(dockerCli, kopts)
-	if err != nil {
-		return nil, err
-	}
-	ss, err := kubernetes.GetStacks(kli, opts)
-	if err != nil {
-		return nil, err
-	}
-	return ss, nil
-}
-
-func removeDuplicates(namespaces []string) []string {
-	mnms := map[string]struct{}{}
-	for _, nm := range namespaces {
-		mnms[nm] = struct{}{}
-	}
-	namespaces = []string{}
-	for nm := range mnms {
-		namespaces = append(namespaces, nm)
-	}
-	return namespaces
-}
