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

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"

cmd/duffle/export.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/deislabs/cnab-go/bundle/loader"
+	"github.com/spf13/cobra"
+
 	"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/spf13/cobra"
 )
 
 const exportDesc = `

cmd/duffle/import.go

@@ -5,10 +5,10 @@ import (
 	"io"
 	"path/filepath"
 
+	"github.com/deislabs/cnab-go/bundle/loader"
 	"github.com/spf13/cobra"
 
 	"github.com/deislabs/duffle/pkg/duffle/home"
-	"github.com/deislabs/duffle/pkg/loader"
 	"github.com/deislabs/duffle/pkg/packager"
 )
 

cmd/duffle/main.go

@@ -9,17 +9,17 @@ import (
 	"runtime"
 	"strings"
 
-	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"
 	"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"
 )
 
 var (

cmd/duffle/relocate.go

@@ -10,21 +10,18 @@ import (
 	"strconv"
 	"strings"
 
-	"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/deislabs/cnab-go/bundle"
+	"github.com/deislabs/cnab-go/bundle/loader"
 	"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/spf13/cobra"
 	"k8s.io/apimachinery/pkg/util/validation"
+
+	"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/packager"
+	"github.com/deislabs/duffle/pkg/relocator"
 )
 
 const (

pkg/packager/export.go

@@ -8,12 +8,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"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"
+	"github.com/deislabs/duffle/pkg/imagestore"
 )
 
 type Exporter struct {

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) {

pkg/packager/import.go

@@ -8,10 +8,8 @@ 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 (

pkg/packager/import_test.go

@@ -6,9 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/deislabs/cnab-go/bundle/loader"
 	"github.com/stretchr/testify/assert"
-
-	"github.com/deislabs/duffle/pkg/loader"
 )
 
 func TestImport(t *testing.T) {