Fix config tool merge panic (zilliztech#49)

Signed-off-by: shaoyue.chen <[email protected]>

Makefile

@@ -4,7 +4,7 @@ IMG ?= milvusdb/milvus-operator:dev-latest
 TOOL_IMG ?= milvus-config-tool:dev-latest
 SIT_IMG ?= milvus-operator:sit
 VERSION ?= 0.8.5
-TOOL_VERSION ?= 0.1.1
+TOOL_VERSION ?= 0.2.0
 MILVUS_HELM_VERSION ?= milvus-4.1.8
 RELEASE_IMG ?= milvusdb/milvus-operator:v$(VERSION)
 TOOL_RELEASE_IMG ?= milvusdb/milvus-config-tool:v$(TOOL_VERSION)

pkg/util/util.go

@@ -52,7 +52,11 @@ func SetStringSlice(values map[string]interface{}, v []string, fields ...string)
 	unstructured.SetNestedStringSlice(values, v, fields...)
 }
 
+// MergeValues merges patch into origin, you have to make sure origin is not nil, otherwise it won't work
 func MergeValues(origin, patch map[string]interface{}) {
+	if origin == nil || patch == nil {
+		return
+	}
 	for patchK, patchV := range patch {
 		if _, exist := origin[patchK]; !exist {
 			origin[patchK] = patchV

pkg/util/util_test.go

@@ -123,6 +123,22 @@ var mergeTests = []struct {
 			},
 		},
 	},
+	{
+		def: nil,
+		overrides: map[string]interface{}{
+			"foo": "bar",
+		},
+		expected: nil,
+	},
+	{
+		def: map[string]interface{}{
+			"foo": "bar",
+		},
+		overrides: nil,
+		expected: map[string]interface{}{
+			"foo": "bar",
+		},
+	},
 }
 
 func TestMergeValues(t *testing.T) {

tool/merge/main.go

@@ -51,6 +51,9 @@ func main() {
 	if err != nil {
 		log.Fatal("read destination yaml failed: ", err)
 	}
+	if dst == nil {
+		dst = map[string]interface{}{}
+	}
 	util.MergeValues(dst, src)
 
 	// backward compatibility