Use the mergeBundleParameters on inspect

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>

Author: rumpl

cmd/docker-app/cnab.go

@@ -19,14 +19,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-func stringsKVToStringInterface(src map[string]string) map[string]interface{} {
-	result := map[string]interface{}{}
-	for k, v := range src {
-		result[k] = v
-	}
-	return result
-}
-
 func prepareCredentialSet(contextName string, contextStore store.Store, b *bundle.Bundle, namedCredentialsets []string) (map[string]string, error) {
 	creds := map[string]string{}
 	for _, file := range namedCredentialsets {

cmd/docker-app/inspect.go

@@ -3,53 +3,45 @@ package main
 import (
 	"github.com/deislabs/duffle/pkg/action"
 	"github.com/deislabs/duffle/pkg/claim"
-	"github.com/docker/app/types/parameters"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	cliopts "github.com/docker/cli/opts"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
-var (
-	inspectParametersFile []string
-	inspectEnv            []string
-)
-
 // inspectCmd represents the inspect command
 func inspectCmd(dockerCli command.Cli) *cobra.Command {
+	var opts parametersOptions
 	cmd := &cobra.Command{
 		Use:   "inspect [<app-name>] [-s key=value...] [-f parameters-file...]",
 		Short: "Shows metadata, parameters and a summary of the compose file for a given application",
 		Args:  cli.RequiresMaxArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			muteDockerCli(dockerCli)
 			appname := firstOrEmpty(args)
-			bundle, err := resolveBundle(dockerCli, "", appname)
-			if err != nil {
-				return err
-			}
-			params, err := parameters.LoadFiles(inspectParametersFile)
+
+			c, err := claim.New("inspect")
 			if err != nil {
 				return err
 			}
-			overrides, err := parameters.FromFlatten(cliopts.ConvertKVStringsToMap(inspectEnv))
+			driverImpl, err := prepareDriver(dockerCli)
 			if err != nil {
 				return err
 			}
-			if params, err = parameters.Merge(params, overrides); err != nil {
-				return err
-			}
-			c, err := claim.New("inspect")
+			bundle, err := resolveBundle(dockerCli, "", appname)
 			if err != nil {
 				return err
 			}
-			driverImpl, err := prepareDriver(dockerCli)
+			c.Bundle = bundle
+
+			parameters, err := mergeBundleParameters(c.Bundle,
+				withFileParameters(opts.parametersFiles),
+				withCommandLineParameters(opts.overrides),
+			)
 			if err != nil {
 				return err
 			}
-			c.Bundle = bundle
-			c.Parameters = stringsKVToStringInterface(params.Flatten())
+			c.Parameters = parameters
 
 			a := &action.RunCustom{
 				Action: "inspect",
@@ -59,7 +51,6 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 			return errors.Wrap(err, "Inspect failed")
 		},
 	}
-	cmd.Flags().StringArrayVarP(&inspectParametersFile, "parameters-files", "f", []string{}, "Override with parameters from files")
-	cmd.Flags().StringArrayVarP(&inspectEnv, "set", "s", []string{}, "Override parameters values")
+	opts.addFlags(cmd.Flags())
 	return cmd
 }