Merge pull request #1367 from Ace-Tang/fix_merge_map

bugfix: fix map type can not be merged
AliyunContainerService · May 24, 2018 · feb98c0 · feb98c0
2 parents 1adfb78 + 558d4d2
commit feb98c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -176,9 +176,14 @@ func doMerge(src, dest reflect.Value) error {
 
 	case reflect.Map:
 		for _, key := range src.MapKeys() {
-			if err := doMerge(src.MapIndex(key), dest.MapIndex(key)); err != nil {
-				return err
+			srcElem := src.MapIndex(key)
+			if !srcElem.IsValid() || isEmptyValue(srcElem) {
+				continue
+			}
+			if dest.IsNil() {
+				dest.Set(reflect.MakeMap(dest.Type()))
 			}
+			dest.SetMapIndex(key, srcElem)
 		}
 
 	case reflect.Slice:

diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
@@ -191,9 +191,19 @@ func TestMerge(t *testing.T) {
 			ok:       true,
 		}, {
 			src:      &simple{Sa: 1, Sc: true, Sd: map[string]string{"go": "gogo"}, Se: nestS{Na: 11}, Sf: []string{"foo"}},
-			dest:     &simple{Sa: 2, Sb: "world", Sc: false, Sd: map[string]string{"go": "gogo"}, Se: nestS{Na: 22}, Sf: []string{"foo"}},
+			dest:     &simple{Sa: 2, Sb: "world", Sc: false, Sd: map[string]string{"go": "old"}, Se: nestS{Na: 22}, Sf: []string{"foo"}},
 			expected: &simple{Sa: 1, Sb: "world", Sc: true, Sd: map[string]string{"go": "gogo"}, Se: nestS{Na: 11}, Sf: []string{"foo", "foo"}},
 			ok:       true,
+		}, {
+			src:      &simple{Sd: map[string]string{"go": "gogo", "a": "b"}},
+			dest:     &simple{Sd: map[string]string{"go": "old"}},
+			expected: &simple{Sd: map[string]string{"go": "gogo", "a": "b"}},
+			ok:       true,
+		}, {
+			src:      &simple{Sd: map[string]string{"go": "gogo", "a": "b"}},
+			dest:     &simple{},
+			expected: &simple{Sd: map[string]string{"go": "gogo", "a": "b"}},
+			ok:       true,
 		},
 	} {
 		err := Merge(tm.src, tm.dest)