Make the map in MergeConfigMap case insensitive

Author: bep

viper.go

@@ -1267,11 +1267,13 @@ func (v *Viper) MergeConfig(in io.Reader) error {
 }
 
 // MergeConfigMap merges the configuration from the map given with an existing config.
+// Note that the map given may be modified.
 func MergeConfigMap(cfg map[string]interface{}) error { return v.MergeConfigMap(cfg) }
 func (v *Viper) MergeConfigMap(cfg map[string]interface{}) error {
 	if v.config == nil {
 		v.config = make(map[string]interface{})
 	}
+	insensitiviseMap(cfg)
 	mergeMaps(cfg, v.config, nil)
 	return nil
 }

viper_test.go

@@ -1252,15 +1252,22 @@ func TestMergeConfigMap(t *testing.T) {
 	assert(37890)
 
 	update := map[string]interface{}{
-		"hello": map[string]interface{}{
-			"pop": 1234,
+		"Hello": map[string]interface{}{
+			"Pop": 1234,
+		},
+		"World": map[interface{}]interface{}{
+			"Rock": 345,
 		},
 	}
 
 	if err := v.MergeConfigMap(update); err != nil {
 		t.Fatal(err)
 	}
 
+	if rock := v.GetInt("world.rock"); rock != 345 {
+		t.Fatal("Got rock:", rock)
+	}
+
 	assert(1234)
 
 }