mirror of
https://github.com/spf13/viper.git
synced 2024-04-21 12:31:38 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d33b5a963 |
@@ -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
|
||||
}
|
||||
|
||||
+9
-2
@@ -1252,8 +1252,11 @@ 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,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -1261,6 +1264,10 @@ func TestMergeConfigMap(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if rock := v.GetInt("world.rock"); rock != 345 {
|
||||
t.Fatal("Got rock:", rock)
|
||||
}
|
||||
|
||||
assert(1234)
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user