[FAB-17900] Fixes numeric env variable override bug

Signed-off-by: Tiffany Harris <[email protected]>
CanisMinor-1037 · May 29, 2020 · adf7436 · adf7436
1 parent 7199378
commit adf7436
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/common/viperutil/config_util.go b/common/viperutil/config_util.go
@@ -93,6 +93,7 @@ func getKeysRecursively(base string, getKey viperGetter, nodeKeys map[string]int
 
 func unmarshalJSON(val interface{}) (map[string]string, bool) {
 	mp := map[string]string{}
+
 	s, ok := val.(string)
 	if !ok {
 		logger.Debugf("Unmarshal JSON: value is not a string: %v", val)
@@ -303,7 +304,7 @@ func bccspHook(f reflect.Type, t reflect.Type, data interface{}) (interface{}, e
 
 	config := factory.GetDefaultOpts()
 
-	err := mapstructure.Decode(data, config)
+	err := mapstructure.WeakDecode(data, config)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not decode bcssp type")
 	}

diff --git a/internal/peer/common/common.go b/internal/peer/common/common.go
@@ -135,7 +135,7 @@ func InitCrypto(mspMgrConfigDir, localMSPID, localMSPType string) error {
 	SetBCCSPKeystorePath()
 	bccspConfig := factory.GetDefaultOpts()
 	if config := viper.Get("peer.BCCSP"); config != nil {
-		err = mapstructure.Decode(config, bccspConfig)
+		err = mapstructure.WeakDecode(config, bccspConfig)
 		if err != nil {
 			return errors.WithMessage(err, "could not decode peer BCCSP configuration")
 		}