Merge pull request #514 from luraproject/fix_static_nil_data

check if the data field is null before adding the static values

proxy/static.go

@@ -25,6 +25,8 @@ func NewStaticMiddleware(endpointConfig *config.EndpointConfig) Middleware {
 
 			if result == nil {
 				result = &Response{Data: map[string]interface{}{}}
+			} else if result.Data == nil {
+				result.Data = map[string]interface{}{}
 			}
 
 			for k, v := range cfg.Data {

proxy/static_test.go

@@ -4,6 +4,7 @@ package proxy
 import (
 	"context"
 	"errors"
+	"reflect"
 	"testing"
 
 	"github.com/luraproject/lura/config"
@@ -103,6 +104,38 @@ type staticMatcherTestCase struct {
 	expected bool
 }
 
+func TestNewStaticMiddleware(t *testing.T) {
+	data := map[string]interface{}{
+		"new-1": true,
+		"new-2": map[string]interface{}{"k1": 42},
+		"new-3": "42",
+	}
+	extra := config.ExtraConfig{
+		Namespace: map[string]interface{}{
+			staticKey: map[string]interface{}{
+				"data":     data,
+				"strategy": staticIfCompleteStrategy,
+			},
+		},
+	}
+
+	mw := NewStaticMiddleware(&config.EndpointConfig{ExtraConfig: extra})
+
+	p := mw(func(_ context.Context, r *Request) (*Response, error) {
+		return &Response{IsComplete: true}, nil
+	})
+
+	resp, err := p(context.Background(), nil)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if !reflect.DeepEqual(data, resp.Data) {
+		t.Errorf("unexpected data: %+v", resp.Data)
+	}
+}
+
 func Test_staticAlwaysMatch(t *testing.T) {
 	extra := config.ExtraConfig{
 		Namespace: map[string]interface{}{
@@ -311,7 +344,13 @@ func Test_staticIfIncompleteMatch(t *testing.T) {
 
 func testStaticMatcher(t *testing.T, marcher func(*Response, error) bool, testCase staticMatcherTestCase) {
 	if marcher(testCase.response, testCase.err) != testCase.expected {
-		t.Errorf("[%s] unexepecting match result (%v) with: %v, %v", testCase.name, testCase.expected, testCase.response, testCase.err)
+		t.Errorf(
+			"[%s] unexepecting match result (%v) with: %v, %v",
+			testCase.name,
+			testCase.expected,
+			testCase.response,
+			testCase.err,
+		)
 	}
 }