Factorize simple custom action commands

Signed-off-by: Silvin Lubecki <[email protected]>

Author: silvin-lubecki

internal/commands/cnab.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/deislabs/duffle/pkg/action"
 	"github.com/deislabs/duffle/pkg/bundle"
 	"github.com/deislabs/duffle/pkg/claim"
 	"github.com/deislabs/duffle/pkg/credentials"
@@ -241,3 +242,37 @@ func socketPath(host string) string {
 func isDockerHostLocal(host string) bool {
 	return host == "" || strings.HasPrefix(host, "unix://") || strings.HasPrefix(host, "npipe://")
 }
+
+func prepareCustomAction(actionName string, dockerCli command.Cli, appname string,
+	registryOpts registryOptions, pullOpts pullOptions, paramsOpts parametersOptions) (*action.RunCustom, *claim.Claim, error) {
+	defer muteDockerCli(dockerCli)()
+
+	c, err := claim.New(actionName)
+	if err != nil {
+		return nil, nil, err
+	}
+	driverImpl, err := prepareDriver(dockerCli, bindMount{})
+	if err != nil {
+		return nil, nil, err
+	}
+	bundle, err := resolveBundle(dockerCli, appname, pullOpts.pull, registryOpts.insecureRegistries)
+	if err != nil {
+		return nil, nil, err
+	}
+	c.Bundle = bundle
+
+	parameters, err := mergeBundleParameters(c.Bundle,
+		withFileParameters(paramsOpts.parametersFiles),
+		withCommandLineParameters(paramsOpts.overrides),
+	)
+	if err != nil {
+		return nil, nil, err
+	}
+	c.Parameters = parameters
+
+	a := &action.RunCustom{
+		Action: internal.Namespace + actionName,
+		Driver: driverImpl,
+	}
+	return a, c, nil
+}

internal/commands/inspect.go

@@ -1,9 +1,6 @@
 package commands
 
 import (
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/claim"
-	"github.com/docker/app/internal"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/pkg/errors"
@@ -33,35 +30,9 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 }
 
 func runInspect(dockerCli command.Cli, appname string, opts inspectOptions) error {
-	defer muteDockerCli(dockerCli)()
-
-	c, err := claim.New("inspect")
-	if err != nil {
-		return err
-	}
-	driverImpl, err := prepareDriver(dockerCli, bindMount{})
-	if err != nil {
-		return err
-	}
-	bundle, err := resolveBundle(dockerCli, appname, opts.pull, opts.insecureRegistries)
+	a, c, err := prepareCustomAction("inspect", dockerCli, appname, opts.registryOptions, opts.pullOptions, opts.parametersOptions)
 	if err != nil {
 		return err
 	}
-	c.Bundle = bundle
-
-	parameters, err := mergeBundleParameters(c.Bundle,
-		withFileParameters(opts.parametersFiles),
-		withCommandLineParameters(opts.overrides),
-	)
-	if err != nil {
-		return err
-	}
-	c.Parameters = parameters
-
-	a := &action.RunCustom{
-		Action: internal.Namespace + "inspect",
-		Driver: driverImpl,
-	}
-	err = a.Run(c, nil, dockerCli.Out())
-	return errors.Wrap(err, "Inspect failed")
+	return errors.Wrap(a.Run(c, nil, dockerCli.Out()), "Inspect failed")
 }

internal/commands/render.go

@@ -4,8 +4,6 @@ import (
 	"io"
 	"os"
 
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/claim"
 	"github.com/docker/app/internal"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
@@ -43,37 +41,12 @@ func renderCmd(dockerCli command.Cli) *cobra.Command {
 }
 
 func runRender(dockerCli command.Cli, appname string, opts renderOptions) error {
-	defer muteDockerCli(dockerCli)()
-
-	c, err := claim.New("render")
-	if err != nil {
-		return err
-	}
-	driverImpl, err := prepareDriver(dockerCli, bindMount{})
-	if err != nil {
-		return err
-	}
-	bundle, err := resolveBundle(dockerCli, appname, opts.pull, opts.insecureRegistries)
+	a, c, err := prepareCustomAction("render", dockerCli, appname, opts.registryOptions, opts.pullOptions, opts.parametersOptions)
 	if err != nil {
 		return err
 	}
-	c.Bundle = bundle
-
-	parameters, err := mergeBundleParameters(c.Bundle,
-		withFileParameters(opts.parametersFiles),
-		withCommandLineParameters(opts.overrides),
-	)
-	if err != nil {
-		return err
-	}
-	c.Parameters = parameters
 	c.Parameters[internal.Namespace+"render-format"] = opts.formatDriver
 
-	a := &action.RunCustom{
-		Action: internal.Namespace + "render",
-		Driver: driverImpl,
-	}
-
 	var writer io.Writer = dockerCli.Out()
 	if opts.renderOutput != "-" {
 		f, err := os.Create(opts.renderOutput)