Update deislabs/cnab-go dependency to include more CNAB base types

Gopkg.toml

@@ -28,7 +28,11 @@
 
 [[override]]
   name = "github.com/docker/go-metrics"
-  revision = "d466d4f6fd960e01820085bd7e1a24426ee7ef18"
+  revision = "db152003892af64a8a892e1ee49edf8b6580a657"
+
+[[override]]
+  version = "0.9.0"
+  name = "github.com/prometheus/client_golang"
 
 [[constraint]]
   name = "github.com/gosuri/uitable"
@@ -46,10 +50,52 @@
   non-go = true
   unused-packages = true
   go-tests = true
+
 [[constraint]]
   name = "github.com/docker/go"
   version = "1.5.1-1"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/pivotal/image-relocation"
+  revision = "532dd0b42e7a50010d7868364309cd314a2bb376"
+
+[[override]]
+  name = "github.com/google/go-containerregistry"
+  revision = "5296537b6d5d12241dd0a8b1ef70a59cba62f48c"
+
+[[constraint]]
+  name = "github.com/deislabs/cnab-go"
+  source = "github.com/radu-matei/cnab-go"
+  branch = "add-duffle-types"
+
+[[override]]
+  name = "k8s.io/apimachinery"
+  revision = "kubernetes-1.11.2"
+
+[[override]]
+  name = "k8s.io/api"
+  revision = "kubernetes-1.11.2"
+
+[[override]]
+  name = "k8s.io/client-go"
+  revision = "kubernetes-1.11.2"
+
+[[override]]
+  name = "k8s.io/kubernetes"
+  revision = "kubernetes-1.11.2"
+
+[[override]]
+  name = "k8s.io/kube-openapi"
+  revision = "d8ea2fe547a448256204cfc68dfee7b26c720acb"
+
+[[override]]
+  name = "github.com/docker/compose-on-kubernetes"
+  revision = "a6086e2369e39c2058a003a7eb42e567ecfd1f03"
+
+[[override]]
+  name = "github.com/containerd/containerd"
+  revision = "7f5f1176dd9fb3cc8d3ce5de91759ed3dc969fa2"
+
+[[override]]
+  name = "golang.org/x/sys"
+  revision = "f49334f85ddcf0f08d7fb6dd7363e9e6d6b777eb"

cmd/duffle/claims_show.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/claim"
 
 	"github.com/spf13/cobra"
 )

cmd/duffle/claims_show_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/claim"
 
 	"github.com/deislabs/cnab-go/bundle"
 	"github.com/stretchr/testify/assert"

cmd/duffle/claims_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/claim"
 
 	"github.com/deislabs/cnab-go/bundle"
 	"github.com/stretchr/testify/assert"

cmd/duffle/credential_add.go

@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/deislabs/duffle/pkg/duffle/home"
+
+	"github.com/deislabs/cnab-go/credentials"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-
-	"github.com/deislabs/duffle/pkg/credentials"
-	"github.com/deislabs/duffle/pkg/duffle/home"
 )
 
 const credentialAddDesc = `

cmd/duffle/credential_edit.go

@@ -6,12 +6,12 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
+	"github.com/deislabs/duffle/pkg/duffle/home"
+
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 	survey "gopkg.in/AlecAivazis/survey.v1"
-
-	"github.com/deislabs/duffle/pkg/credentials"
-	"github.com/deislabs/duffle/pkg/duffle/home"
 )
 
 const credentialEditDesc = `

cmd/duffle/credential_generate.go

@@ -9,13 +9,13 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/deislabs/duffle/pkg/duffle/home"
+
 	"github.com/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/spf13/cobra"
 	survey "gopkg.in/AlecAivazis/survey.v1"
 	yaml "gopkg.in/yaml.v2"
-
-	"github.com/deislabs/duffle/pkg/credentials"
-	"github.com/deislabs/duffle/pkg/duffle/home"
 )
 
 const credentialGenerateHelp = `Generate credentials from a CNAB bundle

cmd/duffle/credential_list.go

@@ -6,12 +6,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/deislabs/duffle/pkg/duffle/home"
+
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/gosuri/uitable"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-
-	"github.com/deislabs/duffle/pkg/credentials"
-	"github.com/deislabs/duffle/pkg/duffle/home"
 )
 
 type credentialListCmd struct {

cmd/duffle/credential_show.go

@@ -5,11 +5,10 @@ import (
 	"io"
 	"path/filepath"
 
-	"github.com/deislabs/duffle/pkg/credentials"
 	"github.com/deislabs/duffle/pkg/duffle/home"
 
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/ghodss/yaml"
-
 	"github.com/spf13/cobra"
 )
 

cmd/duffle/credential_show_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/credentials"
+	"github.com/deislabs/cnab-go/credentials"
 )
 
 func TestPrintCredentials(t *testing.T) {

cmd/duffle/install.go

@@ -7,14 +7,14 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/deislabs/duffle/pkg/duffle/home"
+	"github.com/deislabs/duffle/pkg/repo"
+
+	"github.com/deislabs/cnab-go/action"
 	"github.com/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/claim"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/claim"
-	"github.com/deislabs/duffle/pkg/duffle/home"
-	"github.com/deislabs/duffle/pkg/repo"
 )
 
 const installUsage = `Installs a Cloud Native Application Bundle (CNAB)

cmd/duffle/main.go

@@ -7,16 +7,17 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/deislabs/cnab-go/bundle"
-	"github.com/spf13/cobra"
-
-	"github.com/deislabs/duffle/pkg/claim"
-	"github.com/deislabs/duffle/pkg/credentials"
-	"github.com/deislabs/duffle/pkg/driver"
+	duffleDriver "github.com/deislabs/duffle/pkg/driver"
 	"github.com/deislabs/duffle/pkg/duffle/home"
 	"github.com/deislabs/duffle/pkg/loader"
 	"github.com/deislabs/duffle/pkg/reference"
-	"github.com/deislabs/duffle/pkg/utils/crud"
+
+	"github.com/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/claim"
+	"github.com/deislabs/cnab-go/credentials"
+	"github.com/deislabs/cnab-go/driver"
+	"github.com/deislabs/cnab-go/utils/crud"
+	"github.com/spf13/cobra"
 )
 
 var (
@@ -104,7 +105,7 @@ func must(err error) {
 
 // prepareDriver prepares a driver per the user's request.
 func prepareDriver(driverName string) (driver.Driver, error) {
-	driverImpl, err := driver.Lookup(driverName)
+	driverImpl, err := duffleDriver.Lookup(driverName)
 	if err != nil {
 		return driverImpl, err
 	}

cmd/duffle/main_test.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/credentials"
 	"github.com/deislabs/duffle/pkg/duffle/home"
 
 	"github.com/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/credentials"
 	"github.com/ghodss/yaml"
 	"github.com/stretchr/testify/assert"
 )

cmd/duffle/run.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/action"
+	"github.com/deislabs/cnab-go/claim"
 )
 
 func newRunCmd(w io.Writer) *cobra.Command {

cmd/duffle/status.go

@@ -8,8 +8,8 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
-	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/action"
+	"github.com/deislabs/cnab-go/claim"
 )
 
 func newStatusCmd(w io.Writer) *cobra.Command {

cmd/duffle/uninstall.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/deislabs/duffle/pkg/action"
+	"github.com/deislabs/cnab-go/action"
 )
 
 const uninstallUsage = `Uninstalls an installation of a CNAB bundle.

cmd/duffle/upgrade.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/deislabs/duffle/pkg/action"
+	"github.com/deislabs/cnab-go/action"
 )
 
 const upgradeUsage = `perform the upgrade action in the CNAB bundle`

cmd/duffle/upgrade_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/deislabs/cnab-go/bundle"
 
-	"github.com/deislabs/duffle/pkg/claim"
+	"github.com/deislabs/cnab-go/claim"
 )
 
 func TestUpgradePersistsClaim(t *testing.T) {