Refactor + fixes

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
docker · Jun 21, 2018 · 8c67022 · 8c67022
1 parent ba06122
commit 8c67022
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/cli/command/orchestrator_test.go b/cli/command/orchestrator_test.go
@@ -104,9 +104,6 @@ func TestOrchestratorSwitch(t *testing.T) {
 			cli := &DockerCli{client: apiclient, err: os.Stderr}
 			cliconfig.SetDir(dir.Path())
 			options := flags.NewClientOptions()
-			if testcase.flagOrchestrator != "" {
-				options.Common.StackOrchestrator = testcase.flagOrchestrator
-			}
 			err := cli.Initialize(options)
 			assert.NilError(t, err)
 

diff --git a/cli/command/stack/cmd.go b/cli/command/stack/cmd.go
@@ -107,10 +107,10 @@ func checkSupportedFlag(cmd *cobra.Command, orchestrator command.Orchestrator) e
 			return
 		}
 		if _, ok := f.Annotations["kubernetes"]; ok && !orchestrator.HasKubernetes() {
-			errs = append(errs, fmt.Sprintf("\"--%s\" is only supported on a Docker cli with kubernetes features enabled", f.Name))
+			errs = append(errs, fmt.Sprintf(`"--%s" is only supported on a Docker cli with kubernetes features enabled`, f.Name))
 		}
 		if _, ok := f.Annotations["swarm"]; ok && !orchestrator.HasSwarm() {
-			errs = append(errs, fmt.Sprintf("\"--%s\" is only supported on a Docker cli with swarm features enabled", f.Name))
+			errs = append(errs, fmt.Sprintf(`"--%s" is only supported on a Docker cli with swarm features enabled`, f.Name))
 		}
 	})
 	for _, subcmd := range cmd.Commands() {

diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go
@@ -25,7 +25,7 @@ func newDeployCommand(dockerCli command.Cli, common *commonOptions) *cobra.Comma
 			case common.orchestrator.HasAll():
 				return errUnsupportedAllOrchestrator
 			case common.orchestrator.HasKubernetes():
-				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags()), common.orchestrator)
+				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags(), common.orchestrator))
 				if err != nil {
 					return err
 				}

diff --git a/cli/command/stack/kubernetes/cli.go b/cli/command/stack/kubernetes/cli.go
@@ -23,13 +23,16 @@ type KubeCli struct {
 
 // Options contains resolved parameters to initialize kubernetes clients
 type Options struct {
-	Namespace string
-	Config    string
+	Namespace    string
+	Config       string
+	Orchestrator command.Orchestrator
 }
 
 // NewOptions returns an Options initialized with command line flags
-func NewOptions(flags *flag.FlagSet) Options {
-	var opts Options
+func NewOptions(flags *flag.FlagSet, orchestrator command.Orchestrator) Options {
+	opts := Options{
+		Orchestrator: orchestrator,
+	}
 	if namespace, err := flags.GetString("namespace"); err == nil {
 		opts.Namespace = namespace
 	}
@@ -46,7 +49,7 @@ func AddNamespaceFlag(flags *flag.FlagSet) {
 }
 
 // WrapCli wraps command.Cli with kubernetes specifics
-func WrapCli(dockerCli command.Cli, opts Options, orchestrator command.Orchestrator) (*KubeCli, error) {
+func WrapCli(dockerCli command.Cli, opts Options) (*KubeCli, error) {
 	cli := &KubeCli{
 		Cli: dockerCli,
 	}
@@ -73,7 +76,7 @@ func WrapCli(dockerCli command.Cli, opts Options, orchestrator command.Orchestra
 	}
 	cli.clientSet = clientSet
 
-	if orchestrator.HasAll() {
+	if opts.Orchestrator.HasAll() {
 		if err := cli.checkHostsMatch(); err != nil {
 			return nil, err
 		}

diff --git a/cli/command/stack/list.go b/cli/command/stack/list.go
@@ -45,7 +45,7 @@ func runList(cmd *cobra.Command, dockerCli command.Cli, opts options.List, orche
 		stacks = append(stacks, ss...)
 	}
 	if orchestrator.HasKubernetes() {
-		kubeCli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags()), orchestrator)
+		kubeCli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags(), orchestrator))
 		if err != nil {
 			return err
 		}

diff --git a/cli/command/stack/ps.go b/cli/command/stack/ps.go
@@ -23,7 +23,7 @@ func newPsCommand(dockerCli command.Cli, common *commonOptions) *cobra.Command {
 			case common.orchestrator.HasAll():
 				return errUnsupportedAllOrchestrator
 			case common.orchestrator.HasKubernetes():
-				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags()), common.orchestrator)
+				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags(), common.orchestrator))
 				if err != nil {
 					return err
 				}

diff --git a/cli/command/stack/remove.go b/cli/command/stack/remove.go
@@ -23,7 +23,7 @@ func newRemoveCommand(dockerCli command.Cli, common *commonOptions) *cobra.Comma
 			case common.orchestrator.HasAll():
 				return errUnsupportedAllOrchestrator
 			case common.orchestrator.HasKubernetes():
-				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags()), common.orchestrator)
+				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags(), common.orchestrator))
 				if err != nil {
 					return err
 				}

diff --git a/cli/command/stack/services.go b/cli/command/stack/services.go
@@ -23,7 +23,7 @@ func newServicesCommand(dockerCli command.Cli, common *commonOptions) *cobra.Com
 			case common.orchestrator.HasAll():
 				return errUnsupportedAllOrchestrator
 			case common.orchestrator.HasKubernetes():
-				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags()), common.orchestrator)
+				kli, err := kubernetes.WrapCli(dockerCli, kubernetes.NewOptions(cmd.Flags(), common.orchestrator))
 				if err != nil {
 					return err
 				}