[FAB-8866] Handle old config naming for file store

Change-Id: Ieeb1932c05f0275716cc021f951a5ab5e155b8f4 Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Mar 14, 2018 · 1309704 · 1309704
1 parent 9f6e5f6
commit 1309704
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/pkg/msp/filecertstore.go b/pkg/msp/filecertstore.go
@@ -18,10 +18,10 @@ import (
 )
 
 // NewFileCertStore ...
-func NewFileCertStore(cryptoConfogMspPath string) (core.KVStore, error) {
-	_, orgName := path.Split(path.Dir(path.Dir(path.Dir(cryptoConfogMspPath))))
+func NewFileCertStore(cryptoConfigMSPPath string) (core.KVStore, error) {
+	_, orgName := path.Split(path.Dir(path.Dir(path.Dir(cryptoConfigMSPPath))))
 	opts := &keyvaluestore.FileKeyValueStoreOptions{
-		Path: cryptoConfogMspPath,
+		Path: cryptoConfigMSPPath,
 		KeySerializer: func(key interface{}) (string, error) {
 			ck, ok := key.(*msp.CertKey)
 			if !ok {
@@ -30,7 +30,10 @@ func NewFileCertStore(cryptoConfogMspPath string) (core.KVStore, error) {
 			if ck == nil || ck.MSPID == "" || ck.Username == "" {
 				return "", errors.New("invalid key")
 			}
-			certDir := path.Join(strings.Replace(cryptoConfogMspPath, "{username}", ck.Username, -1), "signcerts")
+
+			// TODO: refactor to case insensitive or remove eventually.
+			r := strings.NewReplacer("{userName}", ck.Username, "{username}", ck.Username)
+			certDir := path.Join(r.Replace(cryptoConfigMSPPath), "signcerts")
 			return path.Join(certDir, fmt.Sprintf("%s@%s-cert.pem", ck.Username, orgName)), nil
 		},
 	}

diff --git a/pkg/msp/filekeystore.go b/pkg/msp/filekeystore.go
@@ -18,9 +18,9 @@ import (
 )
 
 // NewFileKeyStore ...
-func NewFileKeyStore(cryptoConfogMspPath string) (core.KVStore, error) {
+func NewFileKeyStore(cryptoConfigMSPPath string) (core.KVStore, error) {
 	opts := &keyvaluestore.FileKeyValueStoreOptions{
-		Path: cryptoConfogMspPath,
+		Path: cryptoConfigMSPPath,
 		KeySerializer: func(key interface{}) (string, error) {
 			pkk, ok := key.(*msp.PrivKeyKey)
 			if !ok {
@@ -29,7 +29,11 @@ func NewFileKeyStore(cryptoConfogMspPath string) (core.KVStore, error) {
 			if pkk == nil || pkk.MSPID == "" || pkk.Username == "" || pkk.SKI == nil {
 				return "", errors.New("invalid key")
 			}
-			keyDir := path.Join(strings.Replace(cryptoConfogMspPath, "{username}", pkk.Username, -1), "keystore")
+
+			// TODO: refactor to case insensitive or remove eventually.
+			r := strings.NewReplacer("{userName}", pkk.Username, "{username}", pkk.Username)
+			keyDir := path.Join(r.Replace(cryptoConfigMSPPath), "keystore")
+
 			return path.Join(keyDir, hex.EncodeToString(pkk.SKI)+"_sk"), nil
 		},
 	}