Merge branch 'master' into release.1.9

CHANGELOG.md

@@ -74,6 +74,7 @@ issues.
   * Spurious `duplicate endpoint /**` error for APIs sharing the same base path ([#507](https://github.com/avenga/couper/pull/507))
   * Invalid (by [OpenAPI validation](./docs/REFERENCE.md#openapi-block)) backend response missing in [`backend_responses`](./docs/REFERENCE.md#backend_responses) ([#501](https://github.com/avenga/couper/pull/501))
   * Ignore the `expected_status` check for a request configured via a [`proxy`](./docs/REFERENCE.md#proxy-block) or [`request`](./docs/REFERENCE.md#request-block) block if a [`backend` error](./docs/ERRORS.md#endpoint-error-types) occured ([#505](https://github.com/avenga/couper/pull/505))
+  * `merge()` function removes key with `null` value. ([#518](https://github.com/avenga/couper/pull/518))
 
 * **Removed**
   * support for `beta_oidc` block (use [`oidc` block](./docs/REFERENCE.md#oidc-block) instead) ([#475](https://github.com/avenga/couper/pull/475))

eval/lib/merge.go

@@ -7,9 +7,7 @@ import (
 	"github.com/zclconf/go-cty/cty/function"
 )
 
-var (
-	MergeFunc = newMergeFunction()
-)
+var MergeFunc = newMergeFunction()
 
 func newMergeFunction() function.Function {
 	return function.New(&function.Spec{
@@ -76,9 +74,7 @@ func mergeObjects(args []cty.Value) cty.Value {
 
 		for it := arg.ElementIterator(); it.Next(); {
 			k, v := it.Element()
-			if v.IsNull() {
-				delete(outputMap, k.AsString())
-			} else if existingVal, ok := outputMap[k.AsString()]; !ok {
+			if existingVal, ok := outputMap[k.AsString()]; !ok {
 				// key not set
 				outputMap[k.AsString()] = v
 			} else if vType := v.Type(); vType.IsPrimitiveType() {
@@ -97,7 +93,7 @@ func mergeObjects(args []cty.Value) cty.Value {
 }
 
 func mergeTuples(args []cty.Value) cty.Value {
-	outputList := []cty.Value{}
+	var outputList []cty.Value
 	for _, arg := range args {
 		if arg.IsNull() {
 			continue

eval/lib/merge_test.go

@@ -17,6 +17,9 @@ func TestMerge(t *testing.T) {
 	cf, err := configload.LoadBytes([]byte(`server "test" {}`), "couper.hcl")
 	helper.Must(err)
 
+	hclContext := cf.Context.Value(request.ContextType).(*eval.Context).HCLContext()
+	mergeFn := hclContext.Functions["merge"]
+
 	tests := []struct {
 		name string
 		args []cty.Value
@@ -144,34 +147,44 @@ func TestMerge(t *testing.T) {
 			/*
 				merge(
 					{"k2": {"k2.2": 2}},
-					{"k2": null},
-					{"k2": {"k4.2": 4}}
+					{"k0": null},
+					{"k2": {"k4.2": 4}},
+					{"k2": {"k4.0": null}}
 				)
 			*/
-			"merge objects with tombstone null",
+			"merge objects with null",
 			[]cty.Value{
 				cty.ObjectVal(map[string]cty.Value{
 					"k2": cty.ObjectVal(map[string]cty.Value{
 						"k2.2": cty.NumberIntVal(2),
 					}),
 				}),
 				cty.ObjectVal(map[string]cty.Value{
-					"k2": cty.NullVal(cty.Bool),
+					"k0": cty.NullVal(cty.Bool),
 				}),
 				cty.ObjectVal(map[string]cty.Value{
 					"k2": cty.MapVal(map[string]cty.Value{
 						"k4.2": cty.NumberIntVal(4),
 					}),
 				}),
+				cty.ObjectVal(map[string]cty.Value{
+					"k2": cty.MapVal(map[string]cty.Value{
+						"k4.0": cty.NullVal(cty.Bool),
+					}),
+				}),
 			},
 			/*
 				{
+				  "k0": null,
 				  "k2": {"k4.2": 4}
 				}
 			*/
 			cty.ObjectVal(map[string]cty.Value{
-				"k2": cty.MapVal(map[string]cty.Value{
+				"k0": cty.NullVal(cty.Bool),
+				"k2": cty.ObjectVal(map[string]cty.Value{
+					"k2.2": cty.NumberIntVal(2),
 					"k4.2": cty.NumberIntVal(4),
+					"k4.0": cty.NullVal(cty.Bool),
 				}),
 			}),
 		},
@@ -264,17 +277,14 @@ func TestMerge(t *testing.T) {
 		},
 	}
 
-	hclContext := cf.Context.Value(request.ContextType).(*eval.Context).HCLContext()
-
 	for _, tt := range tests {
 		t.Run(tt.name, func(subT *testing.T) {
-			helper := test.New(subT)
-
-			mergedV, err := hclContext.Functions["merge"].Call(tt.args)
-			helper.Must(err)
+			h := test.New(subT)
 
+			mergedV, merr := mergeFn.Call(tt.args)
+			h.Must(merr)
 			if !mergedV.RawEquals(tt.want) {
-				subT.Errorf("Wrong return value; expected %#v, got: %#v", tt.want, mergedV)
+				subT.Errorf("Wrong return value:\nwant:\t%#v\ngot:\t%#v\n", tt.want, mergedV)
 			}
 		})
 	}

server/http_integration_test.go

@@ -5208,7 +5208,7 @@ func TestEndpoint_ResponseNilEvaluation(t *testing.T) {
 		{"/conditional/nested", true, ""},
 		{"/conditional/nested/true", true, ""},
 		{"/conditional/nested/false", true, ""},
-		{"/functions/arg-items", true, `{"foo":"bar","obj":{"key":"val"}}`},
+		{"/functions/arg-items", true, `{"foo":"bar","obj":{"key":"val"},"xxxx":null}`},
 		{"/functions/tuple-expr", true, `{"array":["a","b"]}`},
 		{"/rte1", true, "2"},
 		{"/rte2", true, "2"},