Skip to content
Snippets Groups Projects
Verified Commit 1b4021d0 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix allow override

parent 60370808
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ func (s *Settings[C]) Merge(change C) *Settings[C] { ...@@ -14,7 +14,7 @@ func (s *Settings[C]) Merge(change C) *Settings[C] {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
if err := mergo.Merge(&s.config, change); err != nil { if err := mergo.Merge(&s.config, change, mergo.WithOverride, mergo.WithTypeCheck); err != nil {
s.errors = append(s.errors, err) s.errors = append(s.errors, err)
} }
......
// Copyright 2022 schukai GmbH
// SPDX-License-Identifier: AGPL-3.0
package configuration
import (
"github.com/stretchr/testify/assert"
"testing"
)
func TestMerge(t *testing.T) {
var configS, configD ConfigStruct2
source := New(configS)
source.config.H.HA = 2
dest := New(configD)
dest.config.H.HA = 1
assert.Equal(t, dest.config.H.HA, 1)
dest.Merge(source.config)
assert.Equal(t, dest.config.H.HA, 2)
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment