Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • oss/libraries/go/application/configuration
1 result
Select Git revision
Show changes
Commits on Source (3)
<a name="v1.13.0"></a>
## [v1.13.0] - 2022-10-24
### Bug Fixes
- fix allow override
<a name="v1.12.0"></a>
## [v1.12.0] - 2022-10-23
### Add Features
......@@ -146,6 +152,7 @@
<a name="v1.0.0"></a>
## v1.0.0 - 2022-09-18
[v1.13.0]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.12.0...v1.13.0
[v1.12.0]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.4...v1.12.0
[v1.11.4]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.3...v1.11.4
[v1.11.3]: https://gitlab.schukai.com/oss/libraries/go/application/configuration/compare/v1.11.2...v1.11.3
......
......@@ -14,7 +14,7 @@ func (s *Settings[C]) Merge(change C) *Settings[C] {
s.Lock()
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)
}
......
// 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)
}
{"version":"1.12.0"}
{"version":"1.13.0"}