[FAB-7571] allow '+' char in chaincode version

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

Author: sykesm

core/scc/lscc/errors.go

@@ -75,7 +75,7 @@ func (f EmptyChaincodeNameErr) Error() string {
 type InvalidVersionErr string
 
 func (f InvalidVersionErr) Error() string {
-	return fmt.Sprintf("invalid chaincode version '%s'. Versions can only consist of alphanumerics, '_',  '-', and '.'", string(f))
+	return fmt.Sprintf("invalid chaincode version '%s'. Versions can only consist of alphanumerics, '_',  '-', '+', and '.'", string(f))
 }
 
 //ChaincodeMismatchErr chaincode name from two places don't match

core/scc/lscc/lscc.go

@@ -76,7 +76,7 @@ const (
 	GETINSTALLEDCHAINCODES = "getinstalledchaincodes"
 
 	allowedCharsChaincodeName = "[A-Za-z0-9_-]+"
-	allowedCharsVersion       = "[A-Za-z0-9_.-]+"
+	allowedCharsVersion       = "[A-Za-z0-9_.+-]+"
 
 	// Collecion-specific constants
 
@@ -350,7 +350,7 @@ func (lscc *lifeCycleSysCC) isValidChaincodeName(chaincodeName string) error {
 
 // isValidChaincodeVersion checks the validity of chaincode version. Versions
 // should never be blank and should only consist of alphanumerics, '_',  '-',
-// and '.'
+// '+', and '.'
 func (lscc *lifeCycleSysCC) isValidChaincodeVersion(chaincodeName string, version string) error {
 	if version == "" {
 		return EmptyVersionErr(chaincodeName)

core/scc/lscc/lscc_test.go

@@ -106,6 +106,8 @@ func TestInstall(t *testing.T) {
 	testInstall(t, "", "0", path, EmptyChaincodeNameErr("").Error(), "Alice", scc, stub)
 	testInstall(t, "example02", "1{}0", path, InvalidVersionErr("1{}0").Error(), "Alice", scc, stub)
 	testInstall(t, "example02", "0", path, "Authorization for INSTALL has been denied", "Bob", scc, stub)
+	testInstall(t, "example02-2", "1.0-alpha+001", path, "", "Alice", scc, stub)
+	testInstall(t, "example02-2", "1.0+sha.c0ffee", path, "", "Alice", scc, stub)
 
 	scc.support.(*lscc.MockSupport).PutChaincodeToLocalStorageErr = errors.New("barf")