Add a helper to generate CredentialSetOpts from credentialOptions

Signed-off-by: Ian Campbell <[email protected]>

Author: Ian Campbell

internal/commands/install.go

@@ -66,8 +66,8 @@ func installCmd(dockerCli command.Cli) *cobra.Command {
 
 func runInstall(dockerCli command.Cli, appname string, opts installOptions) error {
 	defer muteDockerCli(dockerCli)()
-	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
-	bind, err := requiredBindMount(targetContext, opts.orchestrator, dockerCli.ContextStore())
+	opts.SetDefaultTargetContext(dockerCli)
+	bind, err := requiredBindMount(opts.targetContext, opts.orchestrator, dockerCli.ContextStore())
 	if err != nil {
 		return err
 	}
@@ -106,10 +106,7 @@ func runInstall(dockerCli command.Cli, appname string, opts installOptions) erro
 	); err != nil {
 		return err
 	}
-	creds, err := prepareCredentialSet(bndl,
-		addNamedCredentialSets(opts.credentialsets),
-		addDockerCredentials(targetContext, dockerCli.ContextStore()),
-		addRegistryCredentials(opts.sendRegistryAuth, dockerCli))
+	creds, err := prepareCredentialSet(bndl, opts.CredentialSetOpts(dockerCli)...)
 	if err != nil {
 		return err
 	}

internal/commands/root.go

@@ -77,6 +77,18 @@ func (o *credentialOptions) addFlags(flags *pflag.FlagSet) {
 	flags.BoolVar(&o.sendRegistryAuth, "with-registry-auth", false, "Sends registry auth")
 }
 
+func (o *credentialOptions) SetDefaultTargetContext(dockerCli command.Cli) {
+	o.targetContext = getTargetContext(o.targetContext, dockerCli.CurrentContext())
+}
+
+func (o *credentialOptions) CredentialSetOpts(dockerCli command.Cli) []credentialSetOpt {
+	return []credentialSetOpt{
+		addNamedCredentialSets(o.credentialsets),
+		addDockerCredentials(o.targetContext, dockerCli.ContextStore()),
+		addRegistryCredentials(o.sendRegistryAuth, dockerCli),
+	}
+}
+
 type registryOptions struct {
 	insecureRegistries []string
 }

internal/commands/status.go

@@ -38,8 +38,8 @@ func runStatus(dockerCli command.Cli, claimName string, opts credentialOptions)
 	if err != nil {
 		return err
 	}
-	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
-	bind, err := requiredClaimBindMount(c, targetContext, dockerCli)
+	opts.SetDefaultTargetContext(dockerCli)
+	bind, err := requiredClaimBindMount(c, opts.targetContext, dockerCli)
 	if err != nil {
 		return err
 	}
@@ -52,10 +52,7 @@ func runStatus(dockerCli command.Cli, claimName string, opts credentialOptions)
 	); err != nil {
 		return err
 	}
-	creds, err := prepareCredentialSet(c.Bundle,
-		addNamedCredentialSets(opts.credentialsets),
-		addDockerCredentials(targetContext, dockerCli.ContextStore()),
-		addRegistryCredentials(opts.sendRegistryAuth, dockerCli))
+	creds, err := prepareCredentialSet(c.Bundle, opts.CredentialSetOpts(dockerCli)...)
 	if err != nil {
 		return err
 	}

internal/commands/uninstall.go

@@ -37,19 +37,16 @@ func runUninstall(dockerCli command.Cli, claimName string, opts credentialOption
 	if err != nil {
 		return err
 	}
-	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
-	bind, err := requiredClaimBindMount(c, targetContext, dockerCli)
+	opts.SetDefaultTargetContext(dockerCli)
+	bind, err := requiredClaimBindMount(c, opts.targetContext, dockerCli)
 	if err != nil {
 		return err
 	}
 	driverImpl, errBuf, err := prepareDriver(dockerCli, bind, nil)
 	if err != nil {
 		return err
 	}
-	creds, err := prepareCredentialSet(c.Bundle,
-		addNamedCredentialSets(opts.credentialsets),
-		addDockerCredentials(targetContext, dockerCli.ContextStore()),
-		addRegistryCredentials(opts.sendRegistryAuth, dockerCli))
+	creds, err := prepareCredentialSet(c.Bundle, opts.CredentialSetOpts(dockerCli)...)
 	if err != nil {
 		return err
 	}

internal/commands/upgrade.go

@@ -40,7 +40,7 @@ func upgradeCmd(dockerCli command.Cli) *cobra.Command {
 
 func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOptions) error {
 	defer muteDockerCli(dockerCli)()
-	targetContext := getTargetContext(opts.targetContext, dockerCli.CurrentContext())
+	opts.SetDefaultTargetContext(dockerCli)
 	h := duffleHome()
 	claimStore := claim.NewClaimStore(crud.NewFileSystemStore(h.Claims(), "json"))
 	c, err := claimStore.Read(installationName)
@@ -63,18 +63,15 @@ func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOpti
 		return err
 	}
 
-	bind, err := requiredClaimBindMount(c, targetContext, dockerCli)
+	bind, err := requiredClaimBindMount(c, opts.targetContext, dockerCli)
 	if err != nil {
 		return err
 	}
 	driverImpl, errBuf, err := prepareDriver(dockerCli, bind, nil)
 	if err != nil {
 		return err
 	}
-	creds, err := prepareCredentialSet(c.Bundle,
-		addNamedCredentialSets(opts.credentialsets),
-		addDockerCredentials(targetContext, dockerCli.ContextStore()),
-		addRegistryCredentials(opts.sendRegistryAuth, dockerCli))
+	creds, err := prepareCredentialSet(c.Bundle, opts.CredentialSetOpts(dockerCli)...)
 	if err != nil {
 		return err
 	}