FAB-16158 Remove ContainerInfo as dep

Because package info was passed as a ChaincodeContainerInfo struct, it
managed to find its way through most of the container code.  However,
this struct is ill suited for the realities of building/launching
containers, and mostly duplicates the package metadata.  This CR
switches to using the package metadata and removes the container info as
a dependency.

Change-Id: I983c69d4296f2b4a41c712eb276b5eade4205d82
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

core/chaincode/platforms/builder.go

@@ -10,14 +10,13 @@ import (
 	"io"
 
 	docker "github.com/fsouza/go-dockerclient"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
 )
 
 type Builder struct {
 	Registry *Registry
 	Client   *docker.Client
 }
 
-func (b *Builder) GenerateDockerBuild(ccci *ccprovider.ChaincodeContainerInfo, codePackage io.Reader) (io.Reader, error) {
-	return b.Registry.GenerateDockerBuild(ccci.Type, ccci.Path, codePackage, b.Client)
+func (b *Builder) GenerateDockerBuild(ccType, path string, codePackage io.Reader) (io.Reader, error) {
+	return b.Registry.GenerateDockerBuild(ccType, path, codePackage, b.Client)
 }

core/container/container.go

@@ -13,7 +13,6 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/chaincode/persistence"
 	pintf "github.com/hyperledger/fabric/core/chaincode/persistence/intf"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 
 	"github.com/pkg/errors"
@@ -25,7 +24,7 @@ var vmLogger = flogging.MustGetLogger("container")
 
 //VM is an abstract virtual image for supporting arbitrary virual machines
 type VM interface {
-	Build(ccci *ccprovider.ChaincodeContainerInfo, codePackageStream io.Reader) (Instance, error)
+	Build(ccid ccintf.CCID, metadata *persistence.ChaincodePackageMetadata, codePackageStream io.Reader) (Instance, error)
 }
 
 //go:generate counterfeiter -o mock/instance.go --fake-name Instance . Instance
@@ -95,16 +94,10 @@ func (r *Router) Build(ccid ccintf.CCID) error {
 		return errors.WithMessage(err, "get chaincode package for external build failed")
 	}
 
-	ccci := &ccprovider.ChaincodeContainerInfo{
-		Path:      metadata.Path,
-		Type:      metadata.Type,
-		PackageID: packageID,
-	}
-
 	var instance Instance
 	var externalErr error
 	if r.ExternalVM != nil {
-		instance, externalErr = r.ExternalVM.Build(ccci, codeStream)
+		instance, externalErr = r.ExternalVM.Build(ccid, metadata, codeStream)
 		codeStream.Close()
 	}
 
@@ -113,7 +106,7 @@ func (r *Router) Build(ccid ccintf.CCID) error {
 		if err != nil {
 			return errors.WithMessage(err, "get chaincode package for docker build failed")
 		}
-		instance, err = r.DockerVM.Build(ccci, codeStream)
+		instance, err = r.DockerVM.Build(ccid, metadata, codeStream)
 		codeStream.Close()
 	}
 

core/container/container_test.go

@@ -14,7 +14,6 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/hyperledger/fabric/core/chaincode/persistence"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/container/mock"
@@ -62,11 +61,11 @@ var _ = Describe("Container", func() {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(fakeDockerVM.BuildCallCount()).To(Equal(0))
 				Expect(fakeExternalVM.BuildCallCount()).To(Equal(1))
-				ccci, codeStream := fakeExternalVM.BuildArgsForCall(0)
-				Expect(ccci).To(Equal(&ccprovider.ChaincodeContainerInfo{
-					PackageID: "package-id",
-					Type:      "package-type",
-					Path:      "package-path",
+				ccid, md, codeStream := fakeExternalVM.BuildArgsForCall(0)
+				Expect(ccid).To(Equal(ccintf.CCID("package-id")))
+				Expect(md).To(Equal(&persistence.ChaincodePackageMetadata{
+					Type: "package-type",
+					Path: "package-path",
 				}))
 				codePackage, err := ioutil.ReadAll(codeStream)
 				Expect(err).NotTo(HaveOccurred())
@@ -96,11 +95,11 @@ var _ = Describe("Container", func() {
 					Expect(err).To(MatchError("failed external (fake-external-error) and docker build: fake-docker-error"))
 					Expect(fakeExternalVM.BuildCallCount()).To(Equal(1))
 					Expect(fakeDockerVM.BuildCallCount()).To(Equal(1))
-					ccci, codeStream := fakeDockerVM.BuildArgsForCall(0)
-					Expect(ccci).To(Equal(&ccprovider.ChaincodeContainerInfo{
-						PackageID: "package-id",
-						Type:      "package-type",
-						Path:      "package-path",
+					ccid, md, codeStream := fakeDockerVM.BuildArgsForCall(0)
+					Expect(ccid).To(Equal(ccintf.CCID("package-id")))
+					Expect(md).To(Equal(&persistence.ChaincodePackageMetadata{
+						Type: "package-type",
+						Path: "package-path",
 					}))
 					codePackage, err := ioutil.ReadAll(codeStream)
 					Expect(err).NotTo(HaveOccurred())

core/container/dockercontroller/dockercontroller.go

@@ -24,7 +24,7 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
+	"github.com/hyperledger/fabric/core/chaincode/persistence"
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	pb "github.com/hyperledger/fabric/protos/peer"
@@ -73,7 +73,7 @@ type dockerClient interface {
 }
 
 type PlatformBuilder interface {
-	GenerateDockerBuild(ccci *ccprovider.ChaincodeContainerInfo, codePackage io.Reader) (io.Reader, error)
+	GenerateDockerBuild(ccType, path string, codePackage io.Reader) (io.Reader, error)
 }
 
 type ContainerInstance struct {
@@ -172,8 +172,7 @@ func (vm *DockerVM) buildImage(ccid ccintf.CCID, reader io.Reader) error {
 }
 
 // Build is responsible for building an image if it does not already exist.
-func (vm *DockerVM) Build(ccci *ccprovider.ChaincodeContainerInfo, codePackage io.Reader) (container.Instance, error) {
-	ccid := ccintf.New(ccci.PackageID)
+func (vm *DockerVM) Build(ccid ccintf.CCID, metadata *persistence.ChaincodePackageMetadata, codePackage io.Reader) (container.Instance, error) {
 	imageName, err := vm.GetVMNameForDocker(ccid)
 	if err != nil {
 		return nil, err
@@ -182,15 +181,12 @@ func (vm *DockerVM) Build(ccci *ccprovider.ChaincodeContainerInfo, codePackage i
 	// This is an awkward translation, but better here in a future dead path
 	// than elsewhere.  The old enum types are capital, but at least as implemented
 	// lifecycle tools seem to allow type to be set lower case.
-	ccType := strings.ToUpper(ccci.Type)
-
-	ccciTranslated := *ccci
-	ccciTranslated.Type = ccType
+	ccType := strings.ToUpper(metadata.Type)
 
 	_, err = vm.Client.InspectImage(imageName)
 	switch err {
 	case docker.ErrNoSuchImage:
-		dockerfileReader, err := vm.PlatformBuilder.GenerateDockerBuild(&ccciTranslated, codePackage)
+		dockerfileReader, err := vm.PlatformBuilder.GenerateDockerBuild(ccType, metadata.Path, codePackage)
 		if err != nil {
 			return nil, errors.Wrap(err, "platform builder failed")
 		}

core/container/dockercontroller/dockercontroller_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/hyperledger/fabric/common/metrics/disabled"
 	"github.com/hyperledger/fabric/common/metrics/metricsfakes"
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/core/common/ccprovider"
+	"github.com/hyperledger/fabric/core/chaincode/persistence"
 	"github.com/hyperledger/fabric/core/container/ccintf"
 	"github.com/hyperledger/fabric/core/container/dockercontroller/mock"
 	pb "github.com/hyperledger/fabric/protos/peer"
@@ -51,12 +51,9 @@ func TestIntegrationPath(t *testing.T) {
 	}
 	ccid := ccintf.CCID("simple")
 
-	instance, err := dc.Build(&ccprovider.ChaincodeContainerInfo{
-		PackageID: "simple",
-		Type:      "type",
-		Path:      "path",
-		Name:      "name",
-		Version:   "version",
+	instance, err := dc.Build("simple", &persistence.ChaincodePackageMetadata{
+		Type: "type",
+		Path: "path",
 	}, bytes.NewBuffer([]byte("code-package")))
 	require.NoError(t, err)
 
@@ -409,12 +406,9 @@ func Test_buildImageFailure(t *testing.T) {
 
 func TestBuild(t *testing.T) {
 	buildMetrics := NewBuildMetrics(&disabled.Provider{})
-	ccci := &ccprovider.ChaincodeContainerInfo{
-		PackageID: "chaincode-name:chaincode-version",
-		Name:      "name",
-		Version:   "version",
-		Type:      "type",
-		Path:      "path",
+	md := &persistence.ChaincodePackageMetadata{
+		Type: "type",
+		Path: "path",
 	}
 
 	t.Run("when the image does not exist", func(t *testing.T) {
@@ -425,18 +419,15 @@ func TestBuild(t *testing.T) {
 		fakePlatformBuilder.GenerateDockerBuildReturns(&bytes.Buffer{}, nil)
 
 		dvm := &DockerVM{Client: client, BuildMetrics: buildMetrics, PlatformBuilder: fakePlatformBuilder}
-		_, err := dvm.Build(ccci, bytes.NewBuffer([]byte("code-package")))
+		_, err := dvm.Build("chaincode-name:chaincode-version", md, bytes.NewBuffer([]byte("code-package")))
 		assert.NoError(t, err, "should have built successfully")
 
 		assert.Equal(t, 1, client.BuildImageCallCount())
 
 		require.Equal(t, 1, fakePlatformBuilder.GenerateDockerBuildCallCount())
-		ccci, codePackageStream := fakePlatformBuilder.GenerateDockerBuildArgsForCall(0)
-		assert.Equal(t, "chaincode-name:chaincode-version", string(ccci.PackageID))
-		assert.Equal(t, "TYPE", ccci.Type)
-		assert.Equal(t, "path", ccci.Path)
-		assert.Equal(t, "name", ccci.Name)
-		assert.Equal(t, "version", ccci.Version)
+		ccType, path, codePackageStream := fakePlatformBuilder.GenerateDockerBuildArgsForCall(0)
+		assert.Equal(t, "TYPE", ccType)
+		assert.Equal(t, "path", path)
 		codePackage, err := ioutil.ReadAll(codePackageStream)
 		require.NoError(t, err)
 		assert.Equal(t, []byte("code-package"), codePackage)
@@ -448,7 +439,7 @@ func TestBuild(t *testing.T) {
 		client.InspectImageReturns(nil, errors.New("inspecting-image-fails"))
 
 		dvm := &DockerVM{Client: client, BuildMetrics: buildMetrics}
-		_, err := dvm.Build(ccci, bytes.NewBuffer([]byte("code-package")))
+		_, err := dvm.Build("chaincode-name:chaincode-version", md, bytes.NewBuffer([]byte("code-package")))
 		assert.EqualError(t, err, "docker image inspection failed: inspecting-image-fails")
 
 		assert.Equal(t, 0, client.BuildImageCallCount())
@@ -458,7 +449,7 @@ func TestBuild(t *testing.T) {
 		client := &mock.DockerClient{}
 
 		dvm := &DockerVM{Client: client, BuildMetrics: buildMetrics}
-		_, err := dvm.Build(ccci, bytes.NewBuffer([]byte("code-package")))
+		_, err := dvm.Build("chaincode-name:chaincode-version", md, bytes.NewBuffer([]byte("code-package")))
 		assert.NoError(t, err)
 
 		assert.Equal(t, 0, client.BuildImageCallCount())
@@ -473,7 +464,7 @@ func TestBuild(t *testing.T) {
 		fakePlatformBuilder.GenerateDockerBuildReturns(nil, errors.New("fake-builder-error"))
 
 		dvm := &DockerVM{Client: client, BuildMetrics: buildMetrics, PlatformBuilder: fakePlatformBuilder}
-		_, err := dvm.Build(ccci, bytes.NewBuffer([]byte("code-package")))
+		_, err := dvm.Build("chaincode-name:chaincode-version", md, bytes.NewBuffer([]byte("code-package")))
 		assert.Equal(t, 1, client.InspectImageCallCount())
 		assert.Equal(t, 1, fakePlatformBuilder.GenerateDockerBuildCallCount())
 		assert.Equal(t, 0, client.BuildImageCallCount())
@@ -488,7 +479,7 @@ func TestBuild(t *testing.T) {
 		fakePlatformBuilder := &mock.PlatformBuilder{}
 
 		dvm := &DockerVM{Client: client, BuildMetrics: buildMetrics, PlatformBuilder: fakePlatformBuilder}
-		_, err := dvm.Build(ccci, bytes.NewBuffer([]byte("code-package")))
+		_, err := dvm.Build("chaincode-name:chaincode-version", md, bytes.NewBuffer([]byte("code-package")))
 		assert.Equal(t, 1, client.InspectImageCallCount())
 		assert.Equal(t, 1, client.BuildImageCallCount())
 		assert.EqualError(t, err, "docker image build failed: no-build-for-you")