FAB-10828 ValidateDepSpec to ValidateCodePackage

Part of an ongoing series to remove all references to the chaincode
protos from the platforms package so that they can eventually be
replaced.  ValidateDeploymentSpec was only ever inspecting the code
package bytes and nothing else about the spec, so changing this method
to take the bytes directly.

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

Author: Jason Yellick

core/chaincode/platforms/car/platform.go

@@ -37,7 +37,7 @@ func (carPlatform *Platform) ValidatePath(path string) error {
 	return nil
 }
 
-func (carPlatform *Platform) ValidateDeploymentSpec(cds *pb.ChaincodeDeploymentSpec) error {
+func (carPlatform *Platform) ValidateCodePackage(codePackage []byte) error {
 	// CAR platform will validate the code package within chaintool
 	return nil
 }

core/chaincode/platforms/golang/platform.go

@@ -120,9 +120,9 @@ func (goPlatform *Platform) ValidatePath(rawPath string) error {
 	return nil
 }
 
-func (goPlatform *Platform) ValidateDeploymentSpec(cds *pb.ChaincodeDeploymentSpec) error {
+func (goPlatform *Platform) ValidateCodePackage(code []byte) error {
 
-	if cds.CodePackage == nil || len(cds.CodePackage) == 0 {
+	if len(code) == 0 {
 		// Nothing to validate if no CodePackage was included
 		return nil
 	}
@@ -138,7 +138,7 @@ func (goPlatform *Platform) ValidateDeploymentSpec(cds *pb.ChaincodeDeploymentSp
 	// resilient in enforcing constraints. However, we should still do our best to keep as much
 	// garbage out of the system as possible.
 	re := regexp.MustCompile(`(/)?src/.*`)
-	is := bytes.NewReader(cds.CodePackage)
+	is := bytes.NewReader(code)
 	gr, err := gzip.NewReader(is)
 	if err != nil {
 		return fmt.Errorf("failure opening codepackage gzip stream: %s", err)

core/chaincode/platforms/golang/platform_test.go

@@ -90,7 +90,7 @@ func TestValidateCDS(t *testing.T) {
 	for _, s := range specs {
 		cds, err := generateFakeCDS(s.CCName, s.Path, s.File, s.Mode)
 
-		err = platform.ValidateDeploymentSpec(cds)
+		err = platform.ValidateCodePackage(cds.Bytes())
 		if s.SuccessExpected == true && err != nil {
 			t.Errorf("Unexpected failure: %s", err)
 		}

core/chaincode/platforms/java/platform.go

@@ -38,7 +38,7 @@ func (javaPlatform *Platform) ValidatePath(rawPath string) error {
 	return nil
 }
 
-func (javaPlatform *Platform) ValidateDeploymentSpec(cds *pb.ChaincodeDeploymentSpec) error {
+func (javaPlatform *Platform) ValidateCodePackage(code []byte) error {
 	// FIXME: Java platform needs to implement its own validation similar to GOLANG
 	return nil
 }

core/chaincode/platforms/mock/platform.go

@@ -73,9 +73,9 @@ func (nodePlatform *Platform) ValidatePath(rawPath string) error {
 	return nil
 }
 
-func (nodePlatform *Platform) ValidateDeploymentSpec(cds *pb.ChaincodeDeploymentSpec) error {
+func (nodePlatform *Platform) ValidateCodePackage(code []byte) error {
 
-	if cds.CodePackage == nil || len(cds.CodePackage) == 0 {
+	if len(code) == 0 {
 		// Nothing to validate if no CodePackage was included
 		return nil
 	}
@@ -88,7 +88,7 @@ func (nodePlatform *Platform) ValidateDeploymentSpec(cds *pb.ChaincodeDeployment
 	// resilient in enforcing constraints. However, we should still do our best to keep as much
 	// garbage out of the system as possible.
 	re := regexp.MustCompile(`(/)?src/.*`)
-	is := bytes.NewReader(cds.CodePackage)
+	is := bytes.NewReader(code)
 	gr, err := gzip.NewReader(is)
 	if err != nil {
 		return fmt.Errorf("failure opening codepackage gzip stream: %s", err)

core/chaincode/platforms/node/platform.go

@@ -41,8 +41,8 @@ func TestValidatePath(t *testing.T) {
 
 }
 
-func TestValidateDeploymentSpec(t *testing.T) {
-	err := platform.ValidateDeploymentSpec(&peer.ChaincodeDeploymentSpec{CodePackage: []byte("dummy CodePackage content")})
+func TestValidateCodePackage(t *testing.T) {
+	err := platform.ValidateCodePackage([]byte("dummy CodePackage content"))
 	if err == nil {
 		t.Fatalf("should have returned an error on an invalid chaincode package")
 	} else if !strings.HasPrefix(err.Error(), "failure opening codepackage gzip stream") {
@@ -54,7 +54,7 @@ func TestValidateDeploymentSpec(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = platform.ValidateDeploymentSpec(&peer.ChaincodeDeploymentSpec{CodePackage: cp})
+	err = platform.ValidateCodePackage(cp)
 	if err == nil {
 		t.Fatal("should have failed to validate because file in the archive is in the root folder instead of 'src'")
 	} else if !strings.HasPrefix(err.Error(), "illegal file detected in payload") {
@@ -66,7 +66,7 @@ func TestValidateDeploymentSpec(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = platform.ValidateDeploymentSpec(&peer.ChaincodeDeploymentSpec{CodePackage: cp})
+	err = platform.ValidateCodePackage(cp)
 	if err == nil {
 		t.Fatal("should have failed to validate because file in the archive is executable")
 	} else if !strings.HasPrefix(err.Error(), "illegal file mode detected for file") {
@@ -78,7 +78,7 @@ func TestValidateDeploymentSpec(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = platform.ValidateDeploymentSpec(&peer.ChaincodeDeploymentSpec{CodePackage: cp})
+	err = platform.ValidateCodePackage(cp)
 	if err == nil {
 		t.Fatal("should have failed to validate because no 'package.json' found")
 	} else if !strings.HasPrefix(err.Error(), "no package.json found at the root of the chaincode package") {
@@ -90,7 +90,7 @@ func TestValidateDeploymentSpec(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = platform.ValidateDeploymentSpec(&peer.ChaincodeDeploymentSpec{CodePackage: cp})
+	err = platform.ValidateCodePackage(cp)
 	if err != nil {
 		t.Fatalf("should have returned no errors, but got '%s'", err)
 	}

core/chaincode/platforms/node/platform_test.go

@@ -26,7 +26,7 @@ import (
 type Platform interface {
 	Name() string
 	ValidatePath(path string) error
-	ValidateDeploymentSpec(spec *pb.ChaincodeDeploymentSpec) error
+	ValidateCodePackage(code []byte) error
 	GetDeploymentPayload(spec *pb.ChaincodeSpec) ([]byte, error)
 	GenerateDockerfile(spec *pb.ChaincodeDeploymentSpec) (string, error)
 	GenerateDockerBuild(spec *pb.ChaincodeDeploymentSpec, tw *tar.Writer) error
@@ -77,7 +77,7 @@ func (r *Registry) ValidateDeploymentSpec(spec *pb.ChaincodeDeploymentSpec) erro
 	if !ok {
 		return fmt.Errorf("Unknown chaincodeType: %s", spec.ChaincodeSpec.Type)
 	}
-	return platform.ValidateDeploymentSpec(spec)
+	return platform.ValidateCodePackage(spec.Bytes())
 }
 
 func (r *Registry) GetMetadataProvider(spec *pb.ChaincodeDeploymentSpec) (ccmetadata.MetadataProvider, error) {

core/chaincode/platforms/platforms.go

@@ -60,12 +60,15 @@ var _ = Describe("Platforms", func() {
 
 		Describe("ValidateDeploymentSpec", func() {
 			It("returns the result of the underlying platform", func() {
-				fakePlatform.ValidateDeploymentSpecReturns(errors.New("fake-error"))
-				spec := &pb.ChaincodeDeploymentSpec{ChaincodeSpec: &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG}}
+				fakePlatform.ValidateCodePackageReturns(errors.New("fake-error"))
+				spec := &pb.ChaincodeDeploymentSpec{
+					ChaincodeSpec: &pb.ChaincodeSpec{Type: pb.ChaincodeSpec_GOLANG},
+					CodePackage:   []byte("code-package"),
+				}
 				err := registry.ValidateDeploymentSpec(spec)
 				Expect(err).To(MatchError(errors.New("fake-error")))
-				Expect(fakePlatform.ValidateDeploymentSpecCallCount()).To(Equal(1))
-				Expect(fakePlatform.ValidateDeploymentSpecArgsForCall(0)).To(Equal(spec))
+				Expect(fakePlatform.ValidateCodePackageCallCount()).To(Equal(1))
+				Expect(fakePlatform.ValidateCodePackageArgsForCall(0)).To(Equal([]byte("code-package")))
 			})
 
 			Context("when the platform is unknown", func() {

core/chaincode/platforms/platforms_test.go

@@ -6,10 +6,16 @@ SPDX-License-Identifier: Apache-2.0
 
 package peer
 
+// Path implements the platforms.PathDescriber interface
 func (cs *ChaincodeSpec) Path() string {
 	if cs.ChaincodeId == nil {
 		return ""
 	}
 
 	return cs.ChaincodeId.Path
 }
+
+// Bytes implements the platforms.CodePackage interface
+func (cds *ChaincodeDeploymentSpec) Bytes() []byte {
+	return cds.CodePackage
+}