FAB-10831 Remove unused GenerateDockerfile parm

The CDS is never actually used in any capacity for GenerateDockerfile so, this CR removes it from the interface definition. Change-Id: I95f595d9877d2e76229ce1b13be197e288e57af1 Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
hyperledger · Jul 10, 2018 · b2db32a · b2db32a
1 parent aff080c
commit b2db32a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 36 deletions.
diff --git a/core/chaincode/platforms/car/platform.go b/core/chaincode/platforms/car/platform.go
@@ -47,7 +47,7 @@ func (carPlatform *Platform) GetDeploymentPayload(path string) ([]byte, error) {
 	return ioutil.ReadFile(path)
 }
 
-func (carPlatform *Platform) GenerateDockerfile(cds *pb.ChaincodeDeploymentSpec) (string, error) {
+func (carPlatform *Platform) GenerateDockerfile() (string, error) {
 
 	var buf []string
 

diff --git a/core/chaincode/platforms/golang/platform.go b/core/chaincode/platforms/golang/platform.go
@@ -476,7 +476,7 @@ func (goPlatform *Platform) GetDeploymentPayload(path string) ([]byte, error) {
 	return payload.Bytes(), nil
 }
 
-func (goPlatform *Platform) GenerateDockerfile(cds *pb.ChaincodeDeploymentSpec) (string, error) {
+func (goPlatform *Platform) GenerateDockerfile() (string, error) {
 
 	var buf []string
 

diff --git a/core/chaincode/platforms/golang/platform_test.go b/core/chaincode/platforms/golang/platform_test.go
@@ -358,7 +358,7 @@ func TestGenerateDockerBuild(t *testing.T) {
 			cds, err = generateFakeCDS(tst.CCName, tst.Path, tst.File, tst.Mode)
 		}
 
-		if _, err = platform.GenerateDockerfile(cds); err != nil {
+		if _, err = platform.GenerateDockerfile(); err != nil {
 			t.Errorf("could not generate docker file for a valid spec: %s, %s", cds.ChaincodeSpec.ChaincodeId.Path, err)
 		}
 		err = platform.GenerateDockerBuild(cds, tw)

diff --git a/core/chaincode/platforms/java/java_test.go b/core/chaincode/platforms/java/java_test.go
@@ -96,14 +96,12 @@ func TestGenerateDockerfile(t *testing.T) {
 		createTestJar(t)
 		defer os.RemoveAll(chaincodePathFolder)
 	}
-	payload, err := platform.GetDeploymentPayload(chaincodePath)
+	_, err = platform.GetDeploymentPayload(spec.Path())
 	if err != nil {
 		t.Fatalf("failed to get Java CC payload: %s", err)
 	}
-	cds := &pb.ChaincodeDeploymentSpec{
-		CodePackage: payload}
 
-	dockerfile, err := platform.GenerateDockerfile(cds)
+	dockerfile, err := platform.GenerateDockerfile()
 	assert.NoError(t, err)
 	assert.Equal(t, expected, dockerfile)
 }

diff --git a/core/chaincode/platforms/java/platform.go b/core/chaincode/platforms/java/platform.go
@@ -66,7 +66,7 @@ func (javaPlatform *Platform) GetDeploymentPayload(path string) ([]byte, error)
 	return payload, nil
 }
 
-func (javaPlatform *Platform) GenerateDockerfile(cds *pb.ChaincodeDeploymentSpec) (string, error) {
+func (javaPlatform *Platform) GenerateDockerfile() (string, error) {
 	var buf []string
 
 	buf = append(buf, cutil.GetDockerfileFromConfig("chaincode.java.Dockerfile"))

diff --git a/core/chaincode/platforms/mock/platform.go b/core/chaincode/platforms/mock/platform.go
diff --git a/core/chaincode/platforms/node/platform.go b/core/chaincode/platforms/node/platform.go
@@ -173,7 +173,7 @@ func (nodePlatform *Platform) GetDeploymentPayload(path string) ([]byte, error)
 	return payload.Bytes(), nil
 }
 
-func (nodePlatform *Platform) GenerateDockerfile(cds *pb.ChaincodeDeploymentSpec) (string, error) {
+func (nodePlatform *Platform) GenerateDockerfile() (string, error) {
 
 	var buf []string
 

diff --git a/core/chaincode/platforms/node/platform_test.go b/core/chaincode/platforms/node/platform_test.go
@@ -109,14 +109,7 @@ func TestGetDeploymentPayload(t *testing.T) {
 }
 
 func TestGenerateDockerfile(t *testing.T) {
-	cds := &peer.ChaincodeDeploymentSpec{
-		ChaincodeSpec: &peer.ChaincodeSpec{
-			Type:        peer.ChaincodeSpec_NODE,
-			ChaincodeId: &peer.ChaincodeID{Path: "there/is/no/way/this/path/exists"},
-			Input:       &peer.ChaincodeInput{Args: [][]byte{[]byte("invoke")}}},
-		CodePackage: []byte("dummy CodePackage content")}
-
-	str, _ := platform.GenerateDockerfile(cds)
+	str, _ := platform.GenerateDockerfile()
 	if !strings.Contains(str, "/fabric-baseimage:") {
 		t.Fatalf("should have generated a docker file using the fabric-baseimage, but got %s", str)
 	}

diff --git a/core/chaincode/platforms/platforms.go b/core/chaincode/platforms/platforms.go
@@ -28,7 +28,7 @@ type Platform interface {
 	ValidatePath(path string) error
 	ValidateCodePackage(code []byte) error
 	GetDeploymentPayload(path string) ([]byte, error)
-	GenerateDockerfile(spec *pb.ChaincodeDeploymentSpec) (string, error)
+	GenerateDockerfile() (string, error)
 	GenerateDockerBuild(spec *pb.ChaincodeDeploymentSpec, tw *tar.Writer) error
 	GetMetadataProvider(spec *pb.ChaincodeDeploymentSpec) ccmetadata.MetadataProvider
 }
@@ -108,7 +108,7 @@ func (r *Registry) GenerateDockerfile(cds *pb.ChaincodeDeploymentSpec) (string,
 	// ----------------------------------------------------------------------------------------------------
 	// Let the platform define the base Dockerfile
 	// ----------------------------------------------------------------------------------------------------
-	base, err := platform.GenerateDockerfile(cds)
+	base, err := platform.GenerateDockerfile()
 	if err != nil {
 		return "", fmt.Errorf("Failed to generate platform-specific Dockerfile: %s", err)
 	}