Remove remaining duffle dependency and minor refactoring of parameter handling due to cnab-go update

Signed-off-by: Jean-Christophe Sirot <jean-christophe.sirot@docker.com>

Author: Jean-Christophe Sirot

Gopkg.lock

@@ -39,10 +39,6 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/docker/cli"
   branch = "19.03"
 
-[[override]]
-  name = "github.com/deislabs/duffle"
-  revision = "5930527762a46c7adfcfccaec1e6a2ddf5841319"
-
 [[override]]
   name = "github.com/deislabs/cnab-go"
   branch = "master"

Gopkg.toml

@@ -15,8 +15,7 @@ import (
 	"github.com/deislabs/cnab-go/claim"
 	"github.com/deislabs/cnab-go/credentials"
 	"github.com/deislabs/cnab-go/driver"
-	duffleDriver "github.com/deislabs/duffle/pkg/driver"
-	"github.com/deislabs/duffle/pkg/loader"
+	dockerDriver "github.com/deislabs/cnab-go/driver/docker"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
 	appstore "github.com/docker/app/internal/store"
@@ -179,44 +178,37 @@ func getTargetContext(optstargetContext, currentContext string) string {
 }
 
 // prepareDriver prepares a driver per the user's request.
-func prepareDriver(dockerCli command.Cli, bindMount bindMount, stdout io.Writer) (driver.Driver, *bytes.Buffer, error) {
-	driverImpl, err := duffleDriver.Lookup("docker")
-	if err != nil {
-		return driverImpl, nil, err
-	}
+func prepareDriver(dockerCli command.Cli, bindMount bindMount, stdout io.Writer) (driver.Driver, *bytes.Buffer) {
+	d := &dockerDriver.Driver{}
 	errBuf := bytes.NewBuffer(nil)
-	if d, ok := driverImpl.(*duffleDriver.DockerDriver); ok {
-		d.SetDockerCli(dockerCli)
-		if stdout != nil {
-			d.SetContainerOut(stdout)
-		}
-		d.SetContainerErr(errBuf)
-		if bindMount.required {
-			d.AddConfigurationOptions(func(config *container.Config, hostConfig *container.HostConfig) error {
-				config.User = "0:0"
-				mounts := []mount.Mount{
-					{
-						Type:   mount.TypeBind,
-						Source: bindMount.endpoint,
-						Target: bindMount.endpoint,
-					},
-				}
-				hostConfig.Mounts = mounts
-				return nil
-			})
-		}
+	d.SetDockerCli(dockerCli)
+	if stdout != nil {
+		d.SetContainerOut(stdout)
+	}
+	d.SetContainerErr(errBuf)
+	if bindMount.required {
+		d.AddConfigurationOptions(func(config *container.Config, hostConfig *container.HostConfig) error {
+			config.User = "0:0"
+			mounts := []mount.Mount{
+				{
+					Type:   mount.TypeBind,
+					Source: bindMount.endpoint,
+					Target: bindMount.endpoint,
+				},
+			}
+			hostConfig.Mounts = mounts
+			return nil
+		})
 	}
 
 	// Load any driver-specific config out of the environment.
-	if configurable, ok := driverImpl.(driver.Configurable); ok {
-		driverCfg := map[string]string{}
-		for env := range configurable.Config() {
-			driverCfg[env] = os.Getenv(env)
-		}
-		configurable.SetConfig(driverCfg)
+	driverCfg := map[string]string{}
+	for env := range d.Config() {
+		driverCfg[env] = os.Getenv(env)
 	}
+	d.SetConfig(driverCfg)
 
-	return driverImpl, errBuf, err
+	return d, errBuf
 }
 
 func getAppNameKind(name string) (string, nameKind) {
@@ -251,6 +243,15 @@ func extractAndLoadAppBasedBundle(dockerCli command.Cli, name string) (*bundle.B
 	return bndl, "", err
 }
 
+func loadBundleFromFile(filename string) (*bundle.Bundle, error) {
+	b := &bundle.Bundle{}
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return b, err
+	}
+	return bundle.Unmarshal(data)
+}
+
 //resolveBundle looks for a CNAB bundle which can be in a Docker App Package format or
 // a bundle stored locally or in the bundle store. It returns a built or found bundle,
 // a reference to the bundle if it is found in the bundlestore, and an error.
@@ -269,7 +270,8 @@ func resolveBundle(dockerCli command.Cli, bundleStore appstore.BundleStore, name
 		if strings.HasSuffix(name, internal.AppExtension) {
 			return extractAndLoadAppBasedBundle(dockerCli, name)
 		}
-		bndl, err := loader.NewLoader().Load(name)
+		bndl, err := loadBundleFromFile(name)
+		//bndl, err := loader.NewLoader().Load(name)
 		return bndl, "", err
 	case nameKindDir, nameKindEmpty:
 		if pullRef {
@@ -354,10 +356,7 @@ func prepareCustomAction(actionName string, dockerCli command.Cli, appname strin
 	if err != nil {
 		return nil, nil, nil, err
 	}
-	driverImpl, errBuf, err := prepareDriver(dockerCli, bindMount{}, stdout)
-	if err != nil {
-		return nil, nil, nil, err
-	}
+	driverImpl, errBuf := prepareDriver(dockerCli, bindMount{}, stdout)
 	bundle, ref, err := resolveBundle(dockerCli, bundleStore, appname, pullOpts.pull, registryOpts.insecureRegistries)
 	if err != nil {
 		return nil, nil, nil, err

internal/commands/cnab.go

@@ -106,10 +106,7 @@ func runInstall(dockerCli command.Cli, appname string, opts installOptions) erro
 		return err
 	}
 
-	driverImpl, errBuf, err := prepareDriver(dockerCli, bind, nil)
-	if err != nil {
-		return err
-	}
+	driverImpl, errBuf := prepareDriver(dockerCli, bind, nil)
 	installation.Bundle = bndl
 
 	if err := mergeBundleParameters(installation,

internal/commands/install.go

@@ -100,11 +100,11 @@ func mergeBundleParameters(installation *store.Installation, ops ...mergeBundleO
 			return err
 		}
 	}
-	if err := matchAndMergeParametersDefinition(installation.Parameters, cfg.params, cfg.bundle, cfg.strictMode, cfg.stderr); err != nil {
+	mergedValues, err := matchAndMergeParametersDefinition(installation.Parameters, cfg)
+	if err != nil {
 		return err
 	}
-	var err error
-	installation.Parameters, err = bundle.ValuesOrDefaults(installation.Parameters, bndl)
+	installation.Parameters, err = bundle.ValuesOrDefaults(mergedValues, installation.Parameters, bndl)
 	return err
 }
 
@@ -116,23 +116,27 @@ func getParameterFromBundle(name string, bndl *bundle.Bundle) (bundle.ParameterD
 	return param, found
 }
 
-func matchAndMergeParametersDefinition(currentValues map[string]interface{}, parameterValues map[string]string, bundle *bundle.Bundle, strictMode bool, stderr io.Writer) error {
-	for k, v := range parameterValues {
-		param, ok := getParameterFromBundle(k, bundle)
+func matchAndMergeParametersDefinition(currentValues map[string]interface{}, cfg *mergeBundleConfig) (map[string]interface{}, error) {
+	mergedValues := make(map[string]interface{})
+	for k, v := range currentValues {
+		mergedValues[k] = v
+	}
+	for k, v := range cfg.params {
+		param, ok := getParameterFromBundle(k, cfg.bundle)
 		if !ok {
-			if strictMode {
-				return fmt.Errorf("parameter %q is not defined in the bundle", k)
+			if cfg.strictMode {
+				return nil, fmt.Errorf("parameter %q is not defined in the bundle", k)
 			}
-			fmt.Fprintf(stderr, "Warning: parameter %q is not defined in the bundle\n", k)
+			fmt.Fprintf(cfg.stderr, "Warning: parameter %q is not defined in the bundle\n", k)
 			continue
 		}
-		definition, ok := bundle.Definitions[param.Definition]
+		definition, ok := cfg.bundle.Definitions[param.Definition]
 		if !ok {
-			return fmt.Errorf("invalid bundle: definition not found for parameter %q", k)
+			return nil, fmt.Errorf("invalid bundle: definition not found for parameter %q", k)
 		}
 		value, err := definition.ConvertValue(v)
 		if err != nil {
-			return errors.Wrapf(err, "invalid value for parameter %q", k)
+			return nil, errors.Wrapf(err, "invalid value for parameter %q", k)
 		}
 		valErrors, err := definition.Validate(value)
 		if valErrors != nil {
@@ -141,12 +145,12 @@ func matchAndMergeParametersDefinition(currentValues map[string]interface{}, par
 				errs[i] = v.Error
 			}
 			errMsg := strings.Join(errs, ", ")
-			return errors.Wrapf(fmt.Errorf(errMsg), "invalid value for parameter %q", k)
+			return nil, errors.Wrapf(fmt.Errorf(errMsg), "invalid value for parameter %q", k)
 		}
 		if err != nil {
-			return errors.Wrapf(err, "invalid value for parameter %q", k)
+			return nil, errors.Wrapf(err, "invalid value for parameter %q", k)
 		}
-		currentValues[k] = value
+		mergedValues[k] = value
 	}
-	return nil
+	return mergedValues, nil
 }

internal/commands/parameters.go

@@ -69,10 +69,7 @@ func runStatus(dockerCli command.Cli, installationName string, opts credentialOp
 	if err != nil {
 		return err
 	}
-	driverImpl, errBuf, err := prepareDriver(dockerCli, bind, nil)
-	if err != nil {
-		return err
-	}
+	driverImpl, errBuf := prepareDriver(dockerCli, bind, nil)
 	if err := mergeBundleParameters(installation,
 		withSendRegistryAuth(opts.sendRegistryAuth),
 	); err != nil {

internal/commands/status.go

@@ -63,10 +63,7 @@ func runUninstall(dockerCli command.Cli, installationName string, opts uninstall
 	if err != nil {
 		return err
 	}
-	driverImpl, errBuf, err := prepareDriver(dockerCli, bind, nil)
-	if err != nil {
-		return err
-	}
+	driverImpl, errBuf := prepareDriver(dockerCli, bind, nil)
 	creds, err := prepareCredentialSet(installation.Bundle, opts.CredentialSetOpts(dockerCli, credentialStore)...)
 	if err != nil {
 		return err

internal/commands/uninstall.go

@@ -76,10 +76,7 @@ func runUpgrade(dockerCli command.Cli, installationName string, opts upgradeOpti
 	if err != nil {
 		return err
 	}
-	driverImpl, errBuf, err := prepareDriver(dockerCli, bind, nil)
-	if err != nil {
-		return err
-	}
+	driverImpl, errBuf := prepareDriver(dockerCli, bind, nil)
 	creds, err := prepareCredentialSet(installation.Bundle, opts.CredentialSetOpts(dockerCli, credentialStore)...)
 	if err != nil {
 		return err