Bump github.com/deislabs/duffle and github.com/deislabs/cnab-go

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

Author: silvin-lubecki

Gopkg.lock

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/credentials"
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/yaml"
 	"gotest.tools/assert"

e2e/commands_test.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/credentials"
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/docker/app/internal/store"
 	dockerConfigFile "github.com/docker/cli/cli/config/configfile"
 	"gotest.tools/assert"

e2e/main_test.go

@@ -47,14 +47,14 @@
 	"parameters": {
 		"api_host": {
 			"type": "string",
-			"defaultValue": "example.com",
+			"default": "example.com",
 			"destination": {
 				"env": "docker_param1"
 			}
 		},
 		"com.docker.app.kubernetes-namespace": {
 			"type": "string",
-			"defaultValue": "",
+			"default": "",
 			"metadata": {
 				"description": "Namespace in which to deploy"
 			},
@@ -70,7 +70,7 @@
 		},
 		"com.docker.app.orchestrator": {
 			"type": "string",
-			"defaultValue": "",
+			"default": "",
 			"allowedValues": [
 				"",
 				"swarm",
@@ -91,7 +91,7 @@
 		},
 		"com.docker.app.render-format": {
 			"type": "string",
-			"defaultValue": "yaml",
+			"default": "yaml",
 			"allowedValues": [
 				"yaml",
 				"json"
@@ -108,7 +108,7 @@
 		},
 		"com.docker.app.share-registry-creds": {
 			"type": "bool",
-			"defaultValue": false,
+			"default": false,
 			"metadata": {
 				"description": "Share registry credentials with the invocation image"
 			},
@@ -118,14 +118,14 @@
 		},
 		"static_subdir": {
 			"type": "string",
-			"defaultValue": "data/static",
+			"default": "data/static",
 			"destination": {
 				"env": "docker_param2"
 			}
 		},
 		"web_port": {
 			"type": "string",
-			"defaultValue": "8082",
+			"default": "8082",
 			"destination": {
 				"env": "docker_param3"
 			}

e2e/testdata/bundle-with-tag.json.golden

@@ -47,14 +47,14 @@
 	"parameters": {
 		"api_host": {
 			"type": "string",
-			"defaultValue": "example.com",
+			"default": "example.com",
 			"destination": {
 				"env": "docker_param1"
 			}
 		},
 		"com.docker.app.kubernetes-namespace": {
 			"type": "string",
-			"defaultValue": "",
+			"default": "",
 			"metadata": {
 				"description": "Namespace in which to deploy"
 			},
@@ -70,7 +70,7 @@
 		},
 		"com.docker.app.orchestrator": {
 			"type": "string",
-			"defaultValue": "",
+			"default": "",
 			"allowedValues": [
 				"",
 				"swarm",
@@ -91,7 +91,7 @@
 		},
 		"com.docker.app.render-format": {
 			"type": "string",
-			"defaultValue": "yaml",
+			"default": "yaml",
 			"allowedValues": [
 				"yaml",
 				"json"
@@ -108,7 +108,7 @@
 		},
 		"com.docker.app.share-registry-creds": {
 			"type": "bool",
-			"defaultValue": false,
+			"default": false,
 			"metadata": {
 				"description": "Share registry credentials with the invocation image"
 			},
@@ -118,14 +118,14 @@
 		},
 		"static_subdir": {
 			"type": "string",
-			"defaultValue": "data/static",
+			"default": "data/static",
 			"destination": {
 				"env": "docker_param2"
 			}
 		},
 		"web_port": {
 			"type": "string",
-			"defaultValue": "8082",
+			"default": "8082",
 			"destination": {
 				"env": "docker_param3"
 			}

e2e/testdata/simple-bundle.json.golden

@@ -23,7 +23,7 @@
     },
     "parameters": {
         "port": {
-            "defaultValue": 8080,
+            "default": 8080,
             "type": "int",
             "destination": {
                 "env": "PORT"

examples/cnab-helm/bundle.json

@@ -10,11 +10,12 @@ import (
 	"os"
 	"strings"
 
+	"github.com/deislabs/cnab-go/action"
 	"github.com/deislabs/cnab-go/bundle"
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/claim"
-	"github.com/deislabs/duffle/pkg/credentials"
-	"github.com/deislabs/duffle/pkg/driver"
+	"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"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
@@ -176,12 +177,12 @@ 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 := driver.Lookup("docker")
+	driverImpl, err := duffleDriver.Lookup("docker")
 	if err != nil {
 		return driverImpl, nil, err
 	}
 	errBuf := bytes.NewBuffer(nil)
-	if d, ok := driverImpl.(*driver.DockerDriver); ok {
+	if d, ok := driverImpl.(*duffleDriver.DockerDriver); ok {
 		d.SetDockerCli(dockerCli)
 		if stdout != nil {
 			d.SetContainerOut(stdout)

internal/commands/cnab.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/credentials"
+	"github.com/deislabs/cnab-go/action"
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/docker/app/internal/store"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"

internal/commands/install.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/claim"
 	"github.com/docker/app/internal/store"
 	"gotest.tools/assert"
 	"gotest.tools/fs"

internal/commands/list_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/deislabs/cnab-go/bundle"
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/claim"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/store"
 	"gotest.tools/assert"
@@ -102,8 +102,8 @@ func TestMergeBundleParameters(t *testing.T) {
 		bundle := &bundle.Bundle{
 			Parameters: map[string]bundle.ParameterDefinition{
 				"param": {
-					DefaultValue: "default",
-					DataType:     "string",
+					Default:  "default",
+					DataType: "string",
 				},
 			},
 		}
@@ -123,8 +123,8 @@ func TestMergeBundleParameters(t *testing.T) {
 		bundle := &bundle.Bundle{
 			Parameters: map[string]bundle.ParameterDefinition{
 				"param": {
-					DefaultValue: "default",
-					DataType:     "string",
+					Default:  "default",
+					DataType: "string",
 				},
 			},
 		}
@@ -163,8 +163,8 @@ func TestMergeBundleParameters(t *testing.T) {
 		bundle := &bundle.Bundle{
 			Parameters: map[string]bundle.ParameterDefinition{
 				"param": {
-					DefaultValue: "default",
-					DataType:     "string",
+					Default:  "default",
+					DataType: "string",
 				},
 			},
 		}