return the new values if modifications dont yet exist

Signed-off-by: David Pait <DP19@users.noreply.github.com>

pkg/chartutil/coalesce.go

@@ -176,11 +176,13 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) {
 // dest is considered authoritative.
 func CoalesceTables(dst, src map[string]interface{}) map[string]interface{} {
 	// When --reuse-values is set but there are no modifications yet, return new values
-	if src == nil {
-		return dst
-	}
-	if dst == nil {
-		return src
+	if dst == nil || src == nil {
+		if src == nil {
+			return dst
+		}
+		if dst == nil {
+			return src
+		}
 	}
 	// Because dest has higher precedence than src, dest values override src
 	// values.

pkg/chartutil/coalesce_test.go

@@ -217,13 +217,13 @@ func TestCoalesceTables(t *testing.T) {
 		"address": map[string]interface{}{
 			"street":  "123 Spouter Inn Ct.",
 			"city":    "Nantucket",
-			"country": "US",
+			"country": nil,
 		},
 		"details": map[string]interface{}{
 			"friends": []string{"Tashtego"},
 		},
 		"boat": "pequod",
-		"hole": "black",
+		"hole": nil,
 	}
 
 	// What we expect is that anything in dst should have all values set,
@@ -231,7 +231,7 @@ func TestCoalesceTables(t *testing.T) {
 	CoalesceTables(dst2, nil)
 
 	if dst2["name"] != "Ishmael" {
-		t.Errorf("Unexpected name: %s", dst2["name"])
+		t.Errorf("Unexpected name: %s", dst["name"])
 	}
 
 	addr2, ok := dst2["address"].(map[string]interface{})
@@ -247,21 +247,21 @@ func TestCoalesceTables(t *testing.T) {
 		t.Errorf("Unexpected city: %v", addr2["city"])
 	}
 
-	if addr2["country"].(string) != "US" {
-		t.Errorf("Unexpected Country: %v", addr2["country"])
+	if _, ok = addr2["country"]; ok {
+		t.Error("The country is not left out.")
 	}
 
 	if det2, ok := dst2["details"].(map[string]interface{}); !ok {
-		t.Fatalf("Details is the wrong type: %v", dst2["details"])
+		t.Fatalf("Details is the wrong type: %v", dst["details"])
 	} else if _, ok := det2["friends"]; !ok {
 		t.Error("Could not find your friends. Maybe you don't have any. :-(")
 	}
 
 	if dst2["boat"].(string) != "pequod" {
-		t.Errorf("Expected boat string, got %v", dst2["boat"])
+		t.Errorf("Expected boat string, got %v", dst["boat"])
 	}
 
-	if dst2["hole"].(string) != "black" {
-		t.Errorf("Expected hole string, got %v", dst2["boat"])
+	if _, ok = dst["hole"]; ok {
+		t.Error("The hole still exists.")
 	}
 }