FAB-11211 Utilize old and new cc pkg in cclifecycle

This CR enables the cclifecycle to utilize both the old
ChaincodeDeploymentSpec package as well as the new
ChaincodeInstallPackage by adding a function to list
installed chaincodes to the persistence package provider.
It first searches both the persistence store as well
as the ccprovider.

FAB-11211 #done

Change-Id: I7869f0fa10f884daec1adb5616e2cd11edfb07d9
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

Author: wlahti

core/cclifecycle/util.go

@@ -7,72 +7,20 @@ SPDX-License-Identifier: Apache-2.0
 package cc
 
 import (
-	"os"
-	"strings"
-
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/chaincode"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/core/common/privdata"
 	"github.com/pkg/errors"
 )
 
-// DirEnumerator enumerates directories
-type DirEnumerator func(string) ([]os.FileInfo, error)
-
-// ChaincodeExtractor extracts chaincode from a given path
-type ChaincodeExtractor func(ccname string, ccversion string, path string) (ccprovider.CCPackage, error)
-
 var (
 	// AcceptAll returns a predicate that accepts all Metadata
 	AcceptAll ChaincodePredicate = func(cc chaincode.Metadata) bool {
 		return true
 	}
 )
 
-// InstalledCCs retrieves the installed chaincodes
-func InstalledCCs(dir string, ls DirEnumerator, ccFromPath ChaincodeExtractor) ([]chaincode.InstalledChaincode, error) {
-	var chaincodes []chaincode.InstalledChaincode
-	if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
-		return nil, nil
-	}
-	files, err := ls(dir)
-	if err != nil {
-		return nil, errors.Wrapf(err, "failed reading directory %s", dir)
-	}
-
-	for _, f := range files {
-		// Skip directories, we're only interested in normal files
-		if f.IsDir() {
-			continue
-		}
-		// A chaincode file name is of the type "name.version"
-		// We're only interested in the name.
-		// Skip files that don't adhere to the file naming convention of "A.B"
-		i := strings.Index(f.Name(), ".")
-		if i == -1 {
-			Logger.Info("Skipping", f.Name(), "because of missing separator '.'")
-			continue
-		}
-		ccName := f.Name()[:i]      // Everything before the separator
-		ccVersion := f.Name()[i+1:] // Everything after the separator
-
-		ccPackage, err := ccFromPath(ccName, ccVersion, dir)
-		if err != nil {
-			Logger.Warning("Failed obtaining chaincode information about", ccName, ccVersion, ":", err)
-			return nil, errors.Wrapf(err, "failed obtaining information about %s, version %s", ccName, ccVersion)
-		}
-
-		chaincodes = append(chaincodes, chaincode.InstalledChaincode{
-			Name:    ccName,
-			Version: ccVersion,
-			Id:      ccPackage.GetId(),
-		})
-	}
-	Logger.Debug("Returning", chaincodes)
-	return chaincodes, nil
-}
-
 // ChaincodePredicate accepts or rejects chaincode based on its metadata
 type ChaincodePredicate func(cc chaincode.Metadata) bool
 

core/cclifecycle/util_test.go

@@ -8,147 +8,19 @@ package cc_test
 
 import (
 	"bytes"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path"
 	"testing"
-	"time"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/chaincode"
 	"github.com/hyperledger/fabric/core/cclifecycle"
 	"github.com/hyperledger/fabric/core/cclifecycle/mocks"
 	"github.com/hyperledger/fabric/core/common/ccprovider"
 	"github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/protos/peer"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
 
-func TestInstalledCCs(t *testing.T) {
-	tmpDir := setupDirectoryStructure(t)
-	defer func() {
-		os.RemoveAll(tmpDir)
-	}()
-	testCases := []struct {
-		name              string
-		directory         string
-		expected          []chaincode.InstalledChaincode
-		errorContains     string
-		ls                cc.DirEnumerator
-		extractCCFromPath cc.ChaincodeExtractor
-	}{
-		{
-			name:              "None empty directory",
-			ls:                ioutil.ReadDir,
-			extractCCFromPath: ccprovider.LoadPackage,
-			expected: []chaincode.InstalledChaincode{
-				{
-					Name:    "example02",
-					Version: "1.0",
-					Id:      []byte{45, 186, 93, 188, 51, 158, 115, 22, 174, 162, 104, 63, 175, 131, 156, 27, 123, 30, 226, 49, 61, 183, 146, 17, 37, 136, 17, 141, 240, 102, 170, 53},
-				},
-				{
-					Name:    "example04",
-					Version: "1",
-					Id:      []byte{45, 186, 93, 188, 51, 158, 115, 22, 174, 162, 104, 63, 175, 131, 156, 27, 123, 30, 226, 49, 61, 183, 146, 17, 37, 136, 17, 141, 240, 102, 170, 53},
-				},
-			},
-			directory: "nonempty",
-		},
-		{
-			name:              "None present directory",
-			ls:                ioutil.ReadDir,
-			extractCCFromPath: ccprovider.LoadPackage,
-			expected:          nil,
-			directory:         "notexistent",
-		},
-		{
-			name:              "Empty directory",
-			ls:                ioutil.ReadDir,
-			extractCCFromPath: ccprovider.LoadPackage,
-			expected:          nil,
-			directory:         "empty",
-		},
-		{
-			name: "No permission to open directory",
-			ls: func(_ string) ([]os.FileInfo, error) {
-				return nil, errors.New("permission denied")
-			},
-			extractCCFromPath: ccprovider.LoadPackage,
-			expected:          nil,
-			directory:         "nopermission",
-			errorContains:     "permission denied",
-		},
-		{
-			name: "No permission on chaincode files",
-			ls:   ioutil.ReadDir,
-			extractCCFromPath: func(_ string, _ string, _ string) (ccprovider.CCPackage, error) {
-				return nil, errors.New("permission denied")
-			},
-			expected:      nil,
-			directory:     "nopermissionforfiles",
-			errorContains: "permission denied",
-		},
-	}
-	_ = testCases
-
-	for _, test := range testCases {
-		test := test
-		t.Run(test.name, func(t *testing.T) {
-			res, err := cc.InstalledCCs(path.Join(tmpDir, test.directory), test.ls, test.extractCCFromPath)
-			assert.Equal(t, test.expected, res)
-			if test.errorContains == "" {
-				assert.NoError(t, err)
-			} else {
-				assert.Contains(t, err.Error(), test.errorContains)
-			}
-		})
-	}
-
-}
-
-func setupDirectoryStructure(t *testing.T) string {
-	files := []string{
-		"example02.1.0", // Version contains the delimiter '.' is a valid case
-		"example03",     // No version specified
-		"example04.1",   // Version doesn't contain the '.' delimiter
-	}
-	rand.Seed(time.Now().UnixNano())
-	tmp := path.Join(os.TempDir(), fmt.Sprintf("%d", rand.Int()))
-	assert.NoError(t, os.Mkdir(tmp, 0755))
-	dir := path.Join(tmp, "empty")
-	assert.NoError(t, os.Mkdir(dir, 0755))
-	dir = path.Join(tmp, "nonempty")
-	assert.NoError(t, os.Mkdir(dir, 0755))
-	dir = path.Join(tmp, "nopermission")
-	assert.NoError(t, os.Mkdir(dir, 0755))
-	dir = path.Join(tmp, "nopermissionforfiles")
-	assert.NoError(t, os.Mkdir(dir, 0755))
-	noPermissionFile := path.Join(tmp, "nopermissionforfiles", "nopermission.1")
-	_, err := os.Create(noPermissionFile)
-	assert.NoError(t, err)
-	dir = path.Join(tmp, "nonempty")
-	assert.NoError(t, os.Mkdir(path.Join(tmp, "nonempty", "directory"), 0755))
-	for _, f := range files {
-		file, err := os.Create(path.Join(dir, f))
-		assert.NoError(t, err)
-		cds := &peer.ChaincodeDeploymentSpec{
-			ChaincodeSpec: &peer.ChaincodeSpec{
-				ChaincodeId: &peer.ChaincodeID{},
-			},
-		}
-		b, _ := proto.Marshal(cds)
-		file.Write(b)
-		file.Close()
-	}
-
-	return tmp
-}
-
 func TestChaincodeInspection(t *testing.T) {
 	acceptAll := func(cc chaincode.Metadata) bool {
 		return true