Merge pull request #833 from vdice/ref/rm-driver-pkg

ref(pkg/driver): remove pkg/driver; use cnab-go for needed logic
cnabio · Aug 19, 2019 · ef79d26 · ef79d26
2 parents 006db28 + 6447f00
commit ef79d26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/duffle/main.go b/cmd/duffle/main.go
@@ -14,10 +14,10 @@ import (
 	"github.com/deislabs/cnab-go/claim"
 	"github.com/deislabs/cnab-go/credentials"
 	"github.com/deislabs/cnab-go/driver"
+	"github.com/deislabs/cnab-go/driver/lookup"
 	"github.com/deislabs/cnab-go/utils/crud"
 	"github.com/spf13/cobra"
 
-	duffleDriver "github.com/deislabs/duffle/pkg/driver"
 	"github.com/deislabs/duffle/pkg/duffle/home"
 	"github.com/deislabs/duffle/pkg/reference"
 )
@@ -112,7 +112,7 @@ func must(err error) {
 
 // prepareDriver prepares a driver per the user's request.
 func prepareDriver(driverName string, relMap string) (driver.Driver, error) {
-	driverImpl, err := duffleDriver.Lookup(driverName)
+	driverImpl, err := lookup.Lookup(driverName)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/driver/lookup.go → .../deislabs/cnab-go/driver/lookup/lookup.go b/pkg/driver/lookup.go → .../deislabs/cnab-go/driver/lookup/lookup.go