ref(*): remove the loader pkg; use cnab-go's

cnabio · Aug 14, 2019 · 08b8339 · 08b8339
1 parent 86561fe
commit 08b8339
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 69 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -57,7 +57,7 @@
 
 [[constraint]]
   name = "github.com/deislabs/cnab-go"
-  version = "v0.3.0-beta1"
+  version = "v0.3.1-beta1"
 
 [[override]]
   name = "github.com/google/go-containerregistry"

diff --git a/cmd/duffle/export.go b/cmd/duffle/export.go
@@ -6,9 +6,10 @@ import (
 
 	"github.com/deislabs/duffle/pkg/duffle/home"
 	"github.com/deislabs/duffle/pkg/imagestore/construction"
-	"github.com/deislabs/duffle/pkg/loader"
 	"github.com/deislabs/duffle/pkg/packager"
 
+	"github.com/deislabs/cnab-go/bundle/loader"
+
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/duffle/import.go b/cmd/duffle/import.go
@@ -7,8 +7,9 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/deislabs/cnab-go/bundle/loader"
+
 	"github.com/deislabs/duffle/pkg/duffle/home"
-	"github.com/deislabs/duffle/pkg/loader"
 	"github.com/deislabs/duffle/pkg/packager"
 )
 

diff --git a/cmd/duffle/main.go b/cmd/duffle/main.go
@@ -11,10 +11,10 @@ import (
 
 	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/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/bundle/loader"
 	"github.com/deislabs/cnab-go/claim"
 	"github.com/deislabs/cnab-go/credentials"
 	"github.com/deislabs/cnab-go/driver"

diff --git a/cmd/duffle/relocate.go b/cmd/duffle/relocate.go
@@ -10,18 +10,17 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/deislabs/duffle/pkg/duffle/home"
 	"github.com/deislabs/duffle/pkg/imagestore"
 	"github.com/deislabs/duffle/pkg/imagestore/construction"
-	"github.com/deislabs/duffle/pkg/loader"
 	"github.com/deislabs/duffle/pkg/packager"
 	"github.com/deislabs/duffle/pkg/relocator"
 
 	"github.com/pivotal/image-relocation/pkg/image"
 	"github.com/pivotal/image-relocation/pkg/pathmapping"
 
 	"github.com/deislabs/cnab-go/bundle"
-
-	"github.com/deislabs/duffle/pkg/duffle/home"
+	"github.com/deislabs/cnab-go/bundle/loader"
 
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/validation"

diff --git a/pkg/loader/loader_test.go b/pkg/loader/loader_test.go
diff --git a/pkg/packager/export.go b/pkg/packager/export.go
@@ -11,9 +11,8 @@ import (
 	"github.com/deislabs/duffle/pkg/imagestore"
 
 	"github.com/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/bundle/loader"
 	"github.com/docker/docker/pkg/archive"
-
-	"github.com/deislabs/duffle/pkg/loader"
 )
 
 type Exporter struct {

diff --git a/pkg/packager/export_test.go b/pkg/packager/export_test.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/deislabs/cnab-go/bundle/loader"
+
 	"github.com/deislabs/duffle/pkg/imagestore"
 	"github.com/deislabs/duffle/pkg/imagestore/imagestoremocks"
-
-	"github.com/deislabs/duffle/pkg/loader"
 )
 
 func TestExport(t *testing.T) {

diff --git a/pkg/packager/import.go b/pkg/packager/import.go
@@ -8,10 +8,9 @@ import (
 	"strings"
 
 	"github.com/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/bundle/loader"
 
 	"github.com/docker/docker/pkg/archive"
-
-	"github.com/deislabs/duffle/pkg/loader"
 )
 
 var (

diff --git a/pkg/packager/import_test.go b/pkg/packager/import_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/deislabs/duffle/pkg/loader"
+	"github.com/deislabs/cnab-go/bundle/loader"
 )
 
 func TestImport(t *testing.T) {

diff --git a/vendor/github.com/deislabs/cnab-go/bundle/bundle.go b/vendor/github.com/deislabs/cnab-go/bundle/bundle.go
diff --git a/pkg/loader/loader.go → .../deislabs/cnab-go/bundle/loader/loader.go b/pkg/loader/loader.go → .../deislabs/cnab-go/bundle/loader/loader.go