glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2024-12-23 03:57:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the map in MergeConfigMap case insensitive

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2018-12-07 11:02:11 +01:00
parent 41cd1c3aa3
commit 6d33b5a963
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
viper.go
View file

@ -1267,11 +1267,13 @@ func (v *Viper) MergeConfig(in io.Reader) error {
} }
// MergeConfigMap merges the configuration from the map given with an existing config. // 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 MergeConfigMap(cfg map[string]interface{}) error { return v.MergeConfigMap(cfg) }
func (v *Viper) MergeConfigMap(cfg map[string]interface{}) error { func (v *Viper) MergeConfigMap(cfg map[string]interface{}) error {
if v.config == nil { if v.config == nil {
v.config = make(map[string]interface{}) v.config = make(map[string]interface{})
} }
insensitiviseMap(cfg)
mergeMaps(cfg, v.config, nil) mergeMaps(cfg, v.config, nil)
return nil return nil
} }

11
viper_test.go
View file

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