rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 23:04:41 +00:00
Code Issues Releases Wiki Activity

Reliably merge the yaml maps data

Browse Source
This commit is contained in:
Darren Shepherd
2015-03-18 06:22:19 -07:00
parent 91dd56e595
commit 3756bbae90
3 changed files with 126 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/disk.go
View File

@@ -62,26 +62,34 @@ func readSavedConfig(bytes []byte) (map[interface{}]interface{}, error) {
}
func readConfig(bytes []byte, files ...string) (map[interface{}]interface{}, error) {
data := make(map[interface{}]interface{})
// You can't just overlay yaml bytes on to maps, it won't merge, but instead
// just override the keys and not merge the map values.
left := make(map[interface{}]interface{})
for _, conf := range files {
content, err := readConfigFile(conf)
if err != nil {
return nil, err
}
err = yaml.Unmarshal(content, &data)
right := make(map[interface{}]interface{})
err = yaml.Unmarshal(content, &right)
if err != nil {
return nil, err
}
util.MergeMaps(left, right)
}
if bytes != nil && len(bytes) > 0 {
if err := yaml.Unmarshal(bytes, &data); err != nil {
right := make(map[interface{}]interface{})
if err := yaml.Unmarshal(bytes, &right); err != nil {
return nil, err
}
util.MergeMaps(left, right)
}
return data, nil
return left, nil
}
func readConfigFile(file string) ([]byte, error) {