mirror of
https://github.com/foomo/squadron.git
synced 2025-10-16 12:35:42 +00:00
fix: change mergo settings
This commit is contained in:
parent
6774588349
commit
2383287728
@ -58,11 +58,12 @@ func (u *Unit) UnmarshalYAML(value *yaml.Node) error {
|
||||
if err := yaml.Unmarshal(defaults, &m); err != nil {
|
||||
return errors.Wrap(err, "failed to unmarshal defaults")
|
||||
}
|
||||
if err := mergo.Merge(&u.Values, m); err != nil {
|
||||
if err := mergo.Merge(&m, u.Values, mergo.WithAppendSlice, mergo.WithOverride, mergo.WithSliceDeepCopy); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
u.Extends = ""
|
||||
u.Values = m
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -14,6 +14,9 @@ squadron:
|
||||
image:
|
||||
repository: nginx
|
||||
tag: latest
|
||||
null_obj: null
|
||||
null_tags: null
|
||||
tags:
|
||||
- ONE
|
||||
- TWO
|
||||
- THREE
|
||||
|
||||
3
testdata/extends/snapshop-config.yaml
vendored
3
testdata/extends/snapshop-config.yaml
vendored
@ -14,6 +14,9 @@ squadron:
|
||||
image:
|
||||
repository: nginx
|
||||
tag: latest
|
||||
null_obj: null
|
||||
null_tags: null
|
||||
tags:
|
||||
- ONE
|
||||
- TWO
|
||||
- THREE
|
||||
|
||||
8
testdata/extends/squadron.base.yaml
vendored
8
testdata/extends/squadron.base.yaml
vendored
@ -5,4 +5,10 @@ env:
|
||||
ONE: unknown
|
||||
THREE: baz
|
||||
tags:
|
||||
- unknown
|
||||
- ONE
|
||||
- TWO
|
||||
null_tags:
|
||||
- TWO
|
||||
null_obj:
|
||||
ONE: unknown
|
||||
THREE: baz
|
||||
|
||||
5
testdata/extends/squadron.yaml
vendored
5
testdata/extends/squadron.yaml
vendored
@ -12,5 +12,6 @@ squadron:
|
||||
ONE: foo
|
||||
TWO: bar
|
||||
tags:
|
||||
- ONE
|
||||
- TWO
|
||||
- THREE
|
||||
null_obj: ~
|
||||
null_tags: ~
|
||||
|
||||
Loading…
Reference in New Issue
Block a user