Merge pull request #1169 from elodani/master

fix: empty map merge was not working after mergo bump
This commit is contained in:
KUOKA Yusuke
2020-04-04 14:00:41 +09:00
committed by GitHub
+1 -1
View File
@@ -73,7 +73,7 @@ func (ld *EnvironmentValuesLoader) LoadEnvironmentValues(missingFileHandler *str
if err != nil {
return nil, err
}
if err := mergo.Merge(&result, &vals, mergo.WithOverride); err != nil {
if err := mergo.Merge(&result, &vals, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
return nil, fmt.Errorf("failed to merge %v: %v", m, err)
}
}