Skip to content

Commit

Permalink
use WithOverwriteWithEmptyValue to support merging boolean pointers
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
  • Loading branch information
ndeloof committed Nov 30, 2022
1 parent 999ce24 commit 9ac5784
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
6 changes: 5 additions & 1 deletion loader/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ func mergeServices(base, override []types.ServiceConfig) ([]types.ServiceConfig,
}

func _merge(baseService *types.ServiceConfig, overrideService *types.ServiceConfig) (*types.ServiceConfig, error) {
if err := mergo.Merge(baseService, overrideService, mergo.WithAppendSlice, mergo.WithOverride, mergo.WithTransformers(serviceSpecials)); err != nil {
if err := mergo.Merge(baseService, overrideService,
mergo.WithAppendSlice,
mergo.WithOverride,
mergo.WithOverwriteWithEmptyValue,
mergo.WithTransformers(serviceSpecials)); err != nil {
return nil, err
}
if overrideService.Command != nil {
Expand Down
16 changes: 16 additions & 0 deletions loader/merge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,22 @@ func TestMergeUlimitsConfig(t *testing.T) {
)
}

func TestInitOverride(t *testing.T) {
var (
bt = true
bf = false
)
base := types.ServiceConfig{
Init: &bt,
}
override := types.ServiceConfig{
Init: &bf,
}
config, err := _merge(&base, &override)
assert.NilError(t, err)
assert.Check(t, *config.Init == false)
}

func TestMergeServiceNetworkConfig(t *testing.T) {
specials := &specials{
m: map[reflect.Type]func(dst, src reflect.Value) error{
Expand Down

0 comments on commit 9ac5784

Please sign in to comment.