FAB-10834 GetMetadataProvider to accept code bytes

This CR completes the work of removing the chaincode spec and chaincode
deployment spec from the platforms.Platform interface.  There is some
outstanding work remaining to remove it entirely from the package which
will follow this CR.

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

Author: Jason Yellick

core/chaincode/platforms/car/platform.go

@@ -87,6 +87,6 @@ func (carPlatform *Platform) GenerateDockerBuild(path string, code []byte, tw *t
 }
 
 //GetMetadataProvider fetches metadata provider given deployment spec
-func (carPlatform *Platform) GetMetadataProvider(cds *pb.ChaincodeDeploymentSpec) platforms.MetadataProvider {
+func (carPlatform *Platform) GetMetadataProvider(code []byte) platforms.MetadataProvider {
 	return &MetadataProvider{}
 }

core/chaincode/platforms/ccmetadata/targzmetadataprovider.go

@@ -22,26 +22,18 @@ const (
 	ccPackageStatedbDir = "META-INF/statedb/"
 )
 
-type CodePackage interface {
-	Bytes() []byte
-}
-
 //TargzMetadataProvider provides Metadata from chaincode packaged in Targz format
 //(go, java and node platforms)
 type TargzMetadataProvider struct {
-	DepSpec CodePackage
+	Code []byte
 }
 
 func (tgzProv *TargzMetadataProvider) getCode() ([]byte, error) {
-	if tgzProv.DepSpec == nil {
-		return nil, errors.New("nil chaincode deployment spec")
-	}
-
-	if tgzProv.DepSpec.Bytes() == nil {
+	if tgzProv.Code == nil {
 		return nil, errors.New("nil code package")
 	}
 
-	return tgzProv.DepSpec.Bytes(), nil
+	return tgzProv.Code, nil
 }
 
 // GetMetadataAsTarEntries extracts metata data from ChaincodeDeploymentSpec

core/chaincode/platforms/ccmetadata/targzmetadataprovider_test.go

@@ -15,16 +15,14 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-
-	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 type tarEntry struct {
 	name    string
 	content []byte
 }
 
-func getCDS(ccname, path string, code []byte, entries []tarEntry) *pb.ChaincodeDeploymentSpec {
+func getCodePackage(code []byte, entries []tarEntry) []byte {
 	codePackage := bytes.NewBuffer(nil)
 	gw := gzip.NewWriter(codePackage)
 	tw := tar.NewWriter(gw)
@@ -35,23 +33,13 @@ func getCDS(ccname, path string, code []byte, entries []tarEntry) *pb.ChaincodeD
 		tw.Write(e.content)
 	}
 
-	tw.WriteHeader(&tar.Header{Name: path, Size: int64(len(code)), ModTime: zeroTime, AccessTime: zeroTime, ChangeTime: zeroTime})
+	tw.WriteHeader(&tar.Header{Name: "fake-path", Size: int64(len(code)), ModTime: zeroTime, AccessTime: zeroTime, ChangeTime: zeroTime})
 	tw.Write(code)
 
 	tw.Close()
 	gw.Close()
 
-	cds := &pb.ChaincodeDeploymentSpec{
-		ChaincodeSpec: &pb.ChaincodeSpec{
-			ChaincodeId: &pb.ChaincodeID{
-				Name: ccname,
-				Path: path,
-			},
-		},
-		CodePackage: codePackage.Bytes(),
-	}
-
-	return cds
+	return codePackage.Bytes()
 }
 
 func getNumEntries(tarbytes []byte) (int, error) {
@@ -82,17 +70,12 @@ func TestBadDepSpec(t *testing.T) {
 	tp := TargzMetadataProvider{}
 	_, err := tp.GetMetadataAsTarEntries()
 	assert.NotNil(t, err)
-	assert.Equal(t, err.Error(), "nil chaincode deployment spec")
-
-	tp.DepSpec = &pb.ChaincodeDeploymentSpec{}
-	_, err = tp.GetMetadataAsTarEntries()
-	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "nil code package")
 }
 
 func TestNoMetadata(t *testing.T) {
 	entries := []tarEntry{{"path/to/a/file", []byte("somdata")}}
-	cds := getCDS("mycc", "/path/to/my/cc", []byte("cc code"), entries)
+	cds := getCodePackage([]byte("cc code"), entries)
 	tp := TargzMetadataProvider{cds}
 	metadata, err := tp.GetMetadataAsTarEntries()
 	assert.Nil(t, err)
@@ -104,7 +87,7 @@ func TestNoMetadata(t *testing.T) {
 
 func TestMetadata(t *testing.T) {
 	entries := []tarEntry{{"path/to/a/file", []byte("somdata")}, {ccPackageStatedbDir + "/m1", []byte("m1data")}, {ccPackageStatedbDir + "/m2", []byte("m2data")}}
-	cds := getCDS("mycc", "/path/to/my/cc", []byte("cc code"), entries)
+	cds := getCodePackage([]byte("cc code"), entries)
 	tp := TargzMetadataProvider{cds}
 	metadata, err := tp.GetMetadataAsTarEntries()
 	assert.Nil(t, err)

core/chaincode/platforms/golang/platform.go

@@ -530,6 +530,6 @@ func (goPlatform *Platform) GenerateDockerBuild(path string, code []byte, tw *ta
 }
 
 //GetMetadataProvider fetches metadata provider given deployment spec
-func (goPlatform *Platform) GetMetadataProvider(cds *pb.ChaincodeDeploymentSpec) platforms.MetadataProvider {
-	return &ccmetadata.TargzMetadataProvider{cds}
+func (goPlatform *Platform) GetMetadataProvider(code []byte) platforms.MetadataProvider {
+	return &ccmetadata.TargzMetadataProvider{Code: code}
 }

core/chaincode/platforms/java/platform.go

@@ -83,6 +83,6 @@ func (javaPlatform *Platform) GenerateDockerBuild(path string, code []byte, tw *
 }
 
 //GetMetadataProvider fetches metadata provider given deployment spec
-func (javaPlatform *Platform) GetMetadataProvider(cds *pb.ChaincodeDeploymentSpec) platforms.MetadataProvider {
-	return &ccmetadata.TargzMetadataProvider{cds}
+func (javaPlatform *Platform) GetMetadataProvider(code []byte) platforms.MetadataProvider {
+	return &ccmetadata.TargzMetadataProvider{Code: code}
 }

core/chaincode/platforms/mock/platform.go

@@ -203,6 +203,6 @@ func (nodePlatform *Platform) GenerateDockerBuild(path string, code []byte, tw *
 }
 
 //GetMetadataProvider fetches metadata provider given deployment spec
-func (nodePlatform *Platform) GetMetadataProvider(cds *pb.ChaincodeDeploymentSpec) platforms.MetadataProvider {
-	return &ccmetadata.TargzMetadataProvider{cds}
+func (nodePlatform *Platform) GetMetadataProvider(code []byte) platforms.MetadataProvider {
+	return &ccmetadata.TargzMetadataProvider{Code: code}
 }

core/chaincode/platforms/node/platform.go

@@ -38,7 +38,7 @@ type Platform interface {
 	GetDeploymentPayload(path string) ([]byte, error)
 	GenerateDockerfile() (string, error)
 	GenerateDockerBuild(path string, code []byte, tw *tar.Writer) error
-	GetMetadataProvider(spec *pb.ChaincodeDeploymentSpec) MetadataProvider
+	GetMetadataProvider(code []byte) MetadataProvider
 }
 
 type PackageWriter interface {
@@ -93,7 +93,7 @@ func (r *Registry) GetMetadataProvider(spec *pb.ChaincodeDeploymentSpec) (Metada
 	if !ok {
 		return nil, fmt.Errorf("Unknown chaincodeType: %s", spec.ChaincodeSpec.Type)
 	}
-	return platform.GetMetadataProvider(spec), nil
+	return platform.GetMetadataProvider(spec.Bytes()), nil
 }
 
 func (r *Registry) GetDeploymentPayload(spec *pb.ChaincodeSpec) ([]byte, error) {

core/chaincode/platforms/platforms.go

@@ -82,12 +82,15 @@ var _ = Describe("Platforms", func() {
 
 		Describe("GetMetadataProvider", func() {
 			It("returns the result of the underlying platform", func() {
-				spec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG}}
+				spec := &pb.ChaincodeDeploymentSpec{
+					ChaincodeSpec: &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG},
+					CodePackage:   []byte("code-package"),
+				}
 				md, err := registry.GetMetadataProvider(spec)
 				Expect(md).To(BeNil())
 				Expect(err).NotTo(HaveOccurred())
 				Expect(fakePlatform.GetMetadataProviderCallCount()).To(Equal(1))
-				Expect(fakePlatform.GetMetadataProviderArgsForCall(0)).To(Equal(spec))
+				Expect(fakePlatform.GetMetadataProviderArgsForCall(0)).To(Equal([]byte("code-package")))
 			})
 
 			Context("when the platform is unknown", func() {