Bump cnab-go dep

Gopkg.toml

@@ -61,7 +61,7 @@
 
 [[constraint]]
   name = "github.com/deislabs/cnab-go"
-  version = "v0.1.2-beta1"
+  version = "v0.2.0-beta1"
 
 [[override]]
   name = "github.com/google/go-containerregistry"

cmd/duffle/install.go

@@ -136,7 +136,9 @@ func (i *installCmd) run() error {
 	}
 
 	c.Bundle = bun
-	c.Parameters, err = calculateParamValues(bun, i.valuesFile, i.setParams, i.setFiles)
+	// calculateParamValues determines if values can be changed in later actions, but we don't have
+	// previous values so install passes nil.
+	c.Parameters, err = calculateParamValues(bun, i.valuesFile, i.setParams, i.setFiles, nil)
 	if err != nil {
 		return err
 	}
@@ -221,7 +223,10 @@ func parseValues(file string) (map[string]interface{}, error) {
 	return v.AllSettings(), nil
 }
 
-func calculateParamValues(bun *bundle.Bundle, valuesFile string, setParams, setFilePaths []string) (map[string]interface{}, error) {
+func calculateParamValues(bun *bundle.Bundle, valuesFile string, setParams, setFilePaths []string, prevVals map[string]interface{}) (map[string]interface{}, error) {
+	if prevVals == nil {
+		prevVals = map[string]interface{}{}
+	}
 	vals := map[string]interface{}{}
 	if valuesFile != "" {
 		var err error
@@ -261,5 +266,5 @@ func calculateParamValues(bun *bundle.Bundle, valuesFile string, setParams, setF
 		vals[parts[0]] = string(content)
 	}
 
-	return bundle.ValuesOrDefaults(vals, bun)
+	return bundle.ValuesOrDefaults(vals, prevVals, bun)
 }

cmd/duffle/run.go

@@ -68,7 +68,7 @@ Credentials and parameters may be passed to the bundle during a target action.
 
 			// Override parameters only if some are set.
 			if valuesFile != "" || len(setParams) > 0 {
-				c.Parameters, err = calculateParamValues(c.Bundle, valuesFile, setParams, setFiles)
+				c.Parameters, err = calculateParamValues(c.Bundle, valuesFile, setParams, setFiles, c.Parameters)
 				if err != nil {
 					return err
 				}

cmd/duffle/uninstall.go

@@ -89,7 +89,7 @@ func (un *uninstallCmd) run() error {
 		if claim.Bundle == nil {
 			return errors.New("parameters can only be set if a bundle is provided")
 		}
-		params, err := calculateParamValues(claim.Bundle, un.valuesFile, un.setParams, []string{})
+		params, err := calculateParamValues(claim.Bundle, un.valuesFile, un.setParams, []string{}, claim.Parameters)
 		if err != nil {
 			return err
 		}

cmd/duffle/upgrade.go

@@ -109,7 +109,7 @@ func (up *upgradeCmd) run() error {
 
 	// Override parameters only if some are set.
 	if up.valuesFile != "" || len(up.setParams) > 0 {
-		claim.Parameters, err = calculateParamValues(claim.Bundle, up.valuesFile, up.setParams, up.setFiles)
+		claim.Parameters, err = calculateParamValues(claim.Bundle, up.valuesFile, up.setParams, up.setFiles, claim.Parameters)
 		if err != nil {
 			return err
 		}