Bump cnab-go and others

Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>

Author: eunomie

Gopkg.lock

@@ -46,15 +46,15 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/containerd/containerd"
-  branch = "master"
+  version = "v1.3.0"
 
 [[override]]
   name = "github.com/docker/cli"
   revision = "d83cd90464377d4164c8f70248d064b979e5ca98"
 
 [[override]]
   name = "github.com/deislabs/cnab-go"
-  version = "v0.3.2-beta1"
+  version = "v0.7.1-beta1"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"
@@ -82,7 +82,7 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/distribution"
-  revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580"
+  revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580" # version needed by containerd v1.3.0
 
 [[override]]
   name = "github.com/docker/swarmkit"

Gopkg.toml

@@ -81,12 +81,10 @@ func TestCnabParameters(t *testing.T) {
 	cmd.Command = dockerCli.Command("app", "run", "--cnab-bundle-json", path.Join(testDir, "bundle.json"), "--name", "cnab-parameters",
 		"--set", "boolParam=true",
 		"--set", "stringParam=value",
-		"--set", "intParam=42",
-		"--set", "floatParam=3.14")
+		"--set", "intParam=42")
 	result := icmd.RunCmd(cmd).Assert(t, icmd.Success)
 	expectedOutput := `boolParam=true
 stringParam=value
-intParam=42
-floatParam=3.14`
+intParam=42`
 	assert.Assert(t, is.Contains(result.Combined(), expectedOutput))
 }

e2e/cnab_test.go

@@ -40,12 +40,6 @@
       "destination": {
         "env": "INT_PARAM"
       }
-    },
-    "floatParam": {
-      "definition": "floatParam_type",
-      "destination": {
-        "env": "FLOAT_PARAM"
-      }
     }
   }
 }

e2e/testdata/cnab-parameters/bundle.json

@@ -9,7 +9,6 @@ case $action in
     echo "boolParam=$BOOL_PARAM" 
     echo "stringParam=$STRING_PARAM" 
     echo "intParam=$INT_PARAM" 
-    echo "floatParam=$FLOAT_PARAM" 
     ;;
     uninstall)
     echo "uninstall action"

e2e/testdata/cnab-parameters/cnab/app/run

@@ -110,7 +110,9 @@ func prepareDriver(dockerCli command.Cli, bindMount BindMount, stdout io.Writer)
 	// Load any driver-specific config out of the environment.
 	driverCfg := map[string]string{}
 	for env := range d.Config() {
-		driverCfg[env] = os.Getenv(env)
+		if value, ok := os.LookupEnv(env); ok {
+			driverCfg[env] = value
+		}
 	}
 	d.SetConfig(driverCfg)
 

internal/cnab/driver.go

@@ -6,6 +6,8 @@ import (
 	"io"
 	"os"
 
+	"github.com/deislabs/cnab-go/driver"
+
 	"github.com/deislabs/cnab-go/action"
 	"github.com/docker/app/internal"
 	bdl "github.com/docker/app/internal/bundle"
@@ -59,13 +61,18 @@ func runRender(dockerCli command.Cli, appname string, opts renderOptions) error
 		w = f
 	}
 
+	cfgFunc := func(op *driver.Operation) error {
+		op.Out = w
+		return nil
+	}
+
 	action, installation, errBuf, err := prepareCustomAction(internal.ActionRenderName, dockerCli, appname, w, opts)
 	if err != nil {
 		return err
 	}
 	installation.Parameters[internal.ParameterRenderFormatName] = opts.formatDriver
 
-	if err := action.Run(&installation.Claim, nil, w); err != nil {
+	if err := action.Run(&installation.Claim, nil, cfgFunc); err != nil {
 		return fmt.Errorf("render failed: %s\n%s", err, errBuf)
 	}
 	return nil

internal/commands/image/render.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/docker/app/internal/cnab"
 
+	"github.com/deislabs/cnab-go/driver"
 	"github.com/docker/app/internal/cliopts"
 
 	"github.com/deislabs/cnab-go/action"
@@ -79,7 +80,11 @@ func runRemove(dockerCli command.Cli, installationName string, opts removeOption
 	uninst := &action.Uninstall{
 		Driver: driverImpl,
 	}
-	if err := uninst.Run(&installation.Claim, creds, os.Stdout); err != nil {
+	cfgFunc := func(op *driver.Operation) error {
+		op.Out = dockerCli.Out()
+		return nil
+	}
+	if err := uninst.Run(&installation.Claim, creds, cfgFunc); err != nil {
 		if err2 := installationStore.Store(installation); err2 != nil {
 			return fmt.Errorf("%s while %s", err2, errBuf)
 		}

internal/commands/remove.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/deislabs/cnab-go/driver"
 	"github.com/docker/app/internal/cliopts"
 
 	"github.com/deislabs/cnab-go/action"
@@ -152,7 +153,11 @@ func runBundle(dockerCli command.Cli, bndl *bundle.Bundle, opts runOptions, ref
 	}
 	{
 		defer muteDockerCli(dockerCli)()
-		err = inst.Run(&installation.Claim, creds, os.Stdout)
+		cfgFunc := func(op *driver.Operation) error {
+			op.Out = dockerCli.Out()
+			return nil
+		}
+		err = inst.Run(&installation.Claim, creds, cfgFunc)
 	}
 	// Even if the installation failed, the installation is persisted with its failure status,
 	// so any installation needs a clean uninstallation.

internal/commands/run.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/deislabs/cnab-go/driver"
+
 	"github.com/deislabs/cnab-go/action"
 	"github.com/deislabs/cnab-go/credentials"
 	"github.com/docker/app/internal/bundle"
@@ -85,7 +87,11 @@ func runUpdate(dockerCli command.Cli, installationName string, opts updateOption
 	u := &action.Upgrade{
 		Driver: driverImpl,
 	}
-	err = u.Run(&installation.Claim, creds, os.Stdout)
+	cfgFunc := func(op *driver.Operation) error {
+		op.Out = dockerCli.Out()
+		return nil
+	}
+	err = u.Run(&installation.Claim, creds, cfgFunc)
 	err2 := installationStore.Store(installation)
 	if err != nil {
 		return fmt.Errorf("Update failed: %s\n%s", err, errBuf)