Factorize pull flag between commands

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: silvin-lubecki

internal/commands/inspect.go

@@ -13,7 +13,7 @@ import (
 type inspectOptions struct {
 	parametersOptions
 	registryOptions
-	pull bool
+	pullOptions
 }
 
 func inspectCmd(dockerCli command.Cli) *cobra.Command {
@@ -28,7 +28,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 	}
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.registryOptions.addFlags(cmd.Flags())
-	cmd.Flags().BoolVar(&opts.pull, "pull", false, "Pull the bundle")
+	opts.pullOptions.addFlags(cmd.Flags())
 	return cmd
 }
 

internal/commands/install.go

@@ -17,11 +17,11 @@ type installOptions struct {
 	parametersOptions
 	credentialOptions
 	registryOptions
+	pullOptions
 	orchestrator     string
 	kubeNamespace    string
 	stackName        string
 	sendRegistryAuth bool
-	pull             bool
 }
 
 type nameKind uint
@@ -58,11 +58,11 @@ func installCmd(dockerCli command.Cli) *cobra.Command {
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.credentialOptions.addFlags(cmd.Flags())
 	opts.registryOptions.addFlags(cmd.Flags())
+	opts.pullOptions.addFlags(cmd.Flags())
 	cmd.Flags().StringVarP(&opts.orchestrator, "orchestrator", "o", "", "Orchestrator to install on (swarm, kubernetes)")
 	cmd.Flags().StringVar(&opts.kubeNamespace, "kubernetes-namespace", "default", "Kubernetes namespace to install into")
 	cmd.Flags().StringVar(&opts.stackName, "name", "", "Installation name (defaults to application name)")
 	cmd.Flags().BoolVar(&opts.sendRegistryAuth, "with-registry-auth", false, "Sends registry auth")
-	cmd.Flags().BoolVar(&opts.pull, "pull", false, "Pull the bundle")
 
 	return cmd
 }

internal/commands/root.go

@@ -82,3 +82,11 @@ type registryOptions struct {
 func (o *registryOptions) addFlags(flags *pflag.FlagSet) {
 	flags.StringSliceVar(&o.insecureRegistries, "insecure-registries", nil, "Use HTTP instead of HTTPS when pulling from/pushing to those registries")
 }
+
+type pullOptions struct {
+	pull bool
+}
+
+func (o *pullOptions) addFlags(flags *pflag.FlagSet) {
+	flags.BoolVar(&o.pull, "pull", false, "Pull the bundle")
+}

internal/commands/upgrade.go

@@ -15,8 +15,8 @@ type upgradeOptions struct {
 	parametersOptions
 	credentialOptions
 	registryOptions
+	pullOptions
 	bundleOrDockerApp string
-	pull              bool
 }
 
 func upgradeCmd(dockerCli command.Cli) *cobra.Command {
@@ -32,8 +32,8 @@ func upgradeCmd(dockerCli command.Cli) *cobra.Command {
 	opts.parametersOptions.addFlags(cmd.Flags())
 	opts.credentialOptions.addFlags(cmd.Flags())
 	opts.registryOptions.addFlags(cmd.Flags())
+	opts.pullOptions.addFlags(cmd.Flags())
 	cmd.Flags().StringVar(&opts.bundleOrDockerApp, "bundle", "", "Override with new bundle or Docker App")
-	cmd.Flags().BoolVar(&opts.pull, "pull", false, "Pull the bundle")
 
 	return cmd
 }