public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-22 10:09:07 +02:00
Code Issues Projects Releases Wiki Activity

bump mergo to 0.3.14 (#751)

Browse Source 
bump merge to 0.3.14

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero
2023-03-17 18:37:15 +08:00
committed by GitHub
parent 011066f653
commit a817997ed8
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/environment/environment.go
+3 -3
View File
@@ -68,7 +68,7 @@ func (e *Environment) Merge(other *Environment) (*Environment, error) {
}
copy := e.DeepCopy()
if other != nil {
if err := mergo.Merge(&copy, other, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
if err := mergo.Merge(&copy, other, mergo.WithOverride); err != nil {
return nil, err
}
}
@@ -78,11 +78,11 @@ func (e *Environment) Merge(other *Environment) (*Environment, error) {
func (e *Environment) GetMergedValues() (map[string]interface{}, error) {
vals := map[string]interface{}{}
if err := mergo.Merge(&vals, e.Defaults, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
if err := mergo.Merge(&vals, e.Defaults, mergo.WithOverride); err != nil {
return nil, err
}
if err := mergo.Merge(&vals, e.Values, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
if err := mergo.Merge(&vals, e.Values, mergo.WithOverride); err != nil {
return nil, err
}