fix: merge environment values by ovewriting with empty values (#1162)

Fixes #1154
This commit is contained in:
KUOKA Yusuke
2020-03-29 20:47:23 +09:00
committed by GitHub
parent 35e5454994
commit 6643a41ea3
4 changed files with 102 additions and 2 deletions
+1 -1
View File
@@ -58,7 +58,7 @@ func (e *Environment) Merge(other *Environment) (*Environment, error) {
}
copy := e.DeepCopy()
if other != nil {
if err := mergo.Merge(&copy, other, mergo.WithOverride); err != nil {
if err := mergo.Merge(&copy, other, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
return nil, err
}
}