'release' output does not require META-INF prefix

When using an external builder, the `release` executable is provided
with the directory to populate with metadata information for the peer to
consume. Given it's defined role, it doesn't make sense to require an
additional META-INF subdirectory within it.

Update the metadata provider to implicitly prepend the META-INF prefix
when packaging the output and update the integration test implementation
to adhere to the contract.

FAB-16861 #done

Change-Id: Ia64bd6bb91a72fcf3a0e9a6a8ced249fd70bfd16
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/chaincode/lifecycle/event_broker_test.go

@@ -7,6 +7,10 @@ SPDX-License-Identifier: Apache-2.0
 package lifecycle_test
 
 import (
+	"archive/tar"
+	"bytes"
+	"io"
+
 	lb "github.com/hyperledger/fabric-protos-go/peer/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle/mock"
@@ -143,8 +147,7 @@ var _ = Describe("EventBroker", func() {
 			}
 		})
 
-		By("invoking ProcessInstallEvent function")
-		It("invokes listener", func() {
+		It("invokes listener when ProcessInstallEvent is called", func() {
 			eventBroker.ProcessInstallEvent(localChaincode)
 			Expect(fakeListener.HandleChaincodeDeployCallCount()).To(Equal(1))
 			def, md := fakeListener.HandleChaincodeDeployArgsForCall(0)
@@ -158,8 +161,7 @@ var _ = Describe("EventBroker", func() {
 			Expect(fakeListener.ChaincodeDeployDoneCallCount()).To(Equal(1))
 		})
 
-		By("invoking ProcessApproveOrDefineEvent function")
-		It("invokes listener", func() {
+		It("invokes listener when ProcessApproveOrDefineEvent is called", func() {
 			eventBroker.ProcessApproveOrDefineEvent("channel-1", "chaincode-1", cachedChaincodeDef)
 			Expect(fakeListener.HandleChaincodeDeployCallCount()).To(Equal(1))
 			Expect(fakeListener.ChaincodeDeployDoneCallCount()).To(Equal(0))
@@ -181,7 +183,19 @@ var _ = Describe("EventBroker", func() {
 					Hash:    []byte("external-built-cc"),
 					Version: "version-1",
 				}))
-				Expect(len(md)).To(Equal(2048)) // A tar, and not our mock value
+
+				mdContents := map[string]struct{}{}
+				tr := tar.NewReader(bytes.NewBuffer(md))
+				for {
+					hdr, err := tr.Next()
+					if err == io.EOF {
+						break
+					}
+					Expect(err).NotTo(HaveOccurred())
+					mdContents[hdr.Name] = struct{}{}
+				}
+				Expect(mdContents).To(HaveKey("META-INF/"))
+				Expect(mdContents).To(HaveKey("META-INF/index.json"))
 			})
 		})
 

core/container/externalbuilders/metadataprovider.go

@@ -33,13 +33,11 @@ func (mp *MetadataProvider) PackageMetadata(ccid string) ([]byte, error) {
 	if os.IsNotExist(err) {
 		return nil, nil
 	}
-
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not stat path")
 	}
 
 	buffer := bytes.NewBuffer(nil)
-
 	tw := tar.NewWriter(buffer)
 
 	logger.Debugf("Walking package release dir '%s'", releasePath)
@@ -48,21 +46,17 @@ func (mp *MetadataProvider) PackageMetadata(ccid string) ([]byte, error) {
 			return err
 		}
 
-		if releasePath == file {
-			// No need to add '.' to our tar
-			return nil
-		}
-
 		header, err := tar.FileInfoHeader(fi, file)
 		if err != nil {
 			return err
 		}
 
-		header.Name, err = filepath.Rel(releasePath, file)
+		name, err := filepath.Rel(releasePath, file)
 		if err != nil {
 			return err
 		}
 
+		header.Name = filepath.Join("META-INF", name)
 		if fi.IsDir() {
 			header.Name += "/"
 		}

core/container/externalbuilders/metadataprovider_test.go

@@ -18,9 +18,7 @@ import (
 )
 
 var _ = Describe("Metadataprovider", func() {
-	var (
-		mp *externalbuilders.MetadataProvider
-	)
+	var mp *externalbuilders.MetadataProvider
 
 	BeforeEach(func() {
 		mp = &externalbuilders.MetadataProvider{

core/container/externalbuilders/testdata/persisted_build/release/META-INF/index.json renamed to core/container/externalbuilders/testdata/persisted_build/release/index.json

@@ -7,7 +7,7 @@
 set -euo pipefail
 
 if [ "$#" -ne 3 ]; then
-    echo "Expected 3 directories got $#"
+    >&2 echo "Expected 3 directories got $#"
     exit 1
 fi
 
@@ -16,8 +16,7 @@ META="$2"
 BLD="$3"
 
 if [ -e "$SRC/metadata" ] ; then
-  mkdir "$BLD/metadata"
-  mv "$SRC/metadata" "$BLD/metadata/META-INF"
+  cp -a "$SRC/metadata" "$BLD"
 fi
 
 cp "$(jq -r .path "$META/metadata.json")" "$BLD/chaincode"

integration/externalbuilders/binary/bin/build

@@ -7,7 +7,7 @@
 set -euo pipefail
 
 if [ "$#" -ne 2 ]; then
-    echo "Expected 2 directories got $#"
+    >&2 echo "Expected 2 directories got $#"
     exit 2
 fi
 
@@ -18,5 +18,5 @@ if [ "$(jq -r .type "$META/metadata.json")" == "binary" ]; then
     exit 0
 fi
 
-echo "binary is the only supported type"
+>&2 echo "binary is the only supported type"
 exit 1

integration/externalbuilders/binary/bin/detect

@@ -7,13 +7,13 @@
 set -euo pipefail
 
 if [ "$#" -ne 2 ]; then
-    echo "Expected 2 directories got $#"
+    >&2 echo "Expected 2 directories got $#"
     exit 2
 fi
 
 BLD="$1"
 RELEASE="$2"
 
-if [ -d "$BLD/metadata/META-INF" ] ; then
-   cp -a "$BLD/metadata/META-INF" "$RELEASE"
+if [ -d "$BLD/metadata" ] ; then
+   cp -a "$BLD/metadata/"* "$RELEASE"
 fi

integration/externalbuilders/binary/bin/release

@@ -7,7 +7,7 @@
 set -euo pipefail
 
 if [ "$#" -ne 2 ]; then
-    echo "Expected 2 directories got $#"
+    >&2 echo "Expected 2 directories got $#"
     exit 1
 fi