From 0353dfce59e0b5c1e3fb35b0ae609a9d1362365c Mon Sep 17 00:00:00 2001
From: Thomas Miller <thomas@tlm.id.au>
Date: Tue, 27 Nov 2018 09:32:28 +1000
Subject: [PATCH] Adds support for merging slices

- Work allows slices to be merged by appending of src onto target
---
 viper.go      |  6 ++++++
 viper_test.go | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/viper.go b/viper.go
index 3debcde..371c042 100644
--- a/viper.go
+++ b/viper.go
@@ -1510,6 +1510,12 @@ func mergeMaps(
 		case map[string]interface{}:
 			jww.TRACE.Printf("merging maps")
 			mergeMaps(sv.(map[string]interface{}), ttv, nil)
+		case []interface{}:
+			jww.TRACE.Printf("merging slices")
+			tgt[tk] = append(tgt[tk].([]interface{}), sv.([]interface{})...)
+			if itgt != nil {
+				itgt[tk] = append(itgt[tk].([]interface{}), sv.([]interface{})...)
+			}
 		default:
 			jww.TRACE.Printf("setting value")
 			tgt[tk] = sv
diff --git a/viper_test.go b/viper_test.go
index 15966e4..06ac4ed 100644
--- a/viper_test.go
+++ b/viper_test.go
@@ -1079,6 +1079,11 @@ hello:
     - uk
     - fr
     - de
+list:
+- one
+list2:
+- name: name1
+  value: value1
 `)
 
 var yamlMergeExampleSrc = []byte(`
@@ -1088,6 +1093,14 @@ hello:
     universe:
     - mw
     - ad
+list:
+- two
+- three
+list2:
+- name: name2
+  value: value2
+- name: name3
+  value: value3
 fu: bar
 `)
 
@@ -1118,6 +1131,18 @@ func TestMergeConfig(t *testing.T) {
 		t.Fatalf("fu != \"\", = %s", fu)
 	}
 
+	if list := v.GetStringSlice("list"); len(list) != 1 {
+		t.Fatalf("len(list) != 1, = %d", len(list))
+	}
+
+	list2 := []interface{}{}
+	if err := v.UnmarshalKey("list2", &list2); err != nil {
+		t.Fatal(err)
+	}
+	if len(list2) != 1 {
+		t.Fatalf("len(list2) != 1, = %d", len(list2))
+	}
+
 	if err := v.MergeConfig(bytes.NewBuffer(yamlMergeExampleSrc)); err != nil {
 		t.Fatal(err)
 	}
@@ -1145,6 +1170,18 @@ func TestMergeConfig(t *testing.T) {
 	if fu := v.GetString("fu"); fu != "bar" {
 		t.Fatalf("fu != \"bar\", = %s", fu)
 	}
+
+	if list := v.GetStringSlice("list"); len(list) != 3 {
+		t.Fatalf("len(list) != 3, = %d", len(list))
+	}
+
+	list2 = []interface{}{}
+	if err := v.UnmarshalKey("list2", &list2); err != nil {
+		t.Fatal(err)
+	}
+	if len(list2) != 3 {
+		t.Fatalf("len(list2) != 3, = %d", len(list2))
+	}
 }
 
 func TestMergeConfigNoMerge(t *testing.T) {