Extend tests to test overwrites of path attribute

config/runtime/server.go

@@ -435,7 +435,7 @@ func newInlineBackend(
 		if diags.HasErrors() {
 			return nil, diags
 		}
-		// TODO: affects path / endpoint inheritance below?
+
 		parentAttr, _ := inlineDef.Body().JustAttributes()
 		content := &hcl.BodyContent{
 			Attributes:       parentAttr,
@@ -464,8 +464,7 @@ func newInlineBackend(
 	// to handle possible overrides like 'path' for endpoints. Only if the most recent definition
 	// has no own attribute defined, use the parents one.
 	if len(bodies) > 0 && reflect.TypeOf(inlineDef) == reflect.TypeOf(&config.Endpoint{}) {
-		// TODO: working code with prepending inlineDef attr Body above ?
-		inheritableAttributes := []string{"path"} //, "add_query_params", "remove_query_params", "set_query_params"}
+		inheritableAttributes := []string{"path"}
 		inheritAttributes := make(hcl.Attributes)
 
 		recentBody := bodies[len(bodies)-1]

server/http_integration_test.go

@@ -542,20 +542,21 @@ func TestHTTPServer_Gzip(t *testing.T) {
 func TestHTTPServer_QueryParams(t *testing.T) {
 	client := newClient()
 
-	confPath := path.Join("testdata/integration/endpoint_eval/04_couper.hcl")
-	shutdown, _ := newCouper(confPath, test.New(t))
+	const confPath = "testdata/integration/endpoint_eval/"
 
 	type expectation struct {
 		Query url.Values
+		Path  string
 	}
 
 	type testCase struct {
+		file  string
 		query string
 		exp   expectation
 	}
 
 	for _, tc := range []testCase{
-		{"a=b%20c&aeb_del=1&ae_del=1&CaseIns=1&caseIns=1&def_del=1", expectation{
+		{"04_couper.hcl", "a=b%20c&aeb_del=1&ae_del=1&CaseIns=1&caseIns=1&def_del=1", expectation{
 			Query: url.Values{
 				"a":           []string{"b c"},
 				"ae_a_and_b":  []string{"A&B", "A&B"},
@@ -583,8 +584,32 @@ func TestHTTPServer_QueryParams(t *testing.T) {
 				"foo":         []string{""},
 				"xxx":         []string{"ddd", "zzz", "aaa", "bbb", "eee", "ccc"},
 			},
+			Path: "/",
+		}},
+		{"05_couper.hcl", "", expectation{
+			Query: url.Values{
+				"ae":  []string{"ae"},
+				"def": []string{"def"},
+			},
+			Path: "/yyy",
+		}},
+		{"06_couper.hcl", "", expectation{
+			Query: url.Values{
+				"ae":  []string{"ae"},
+				"def": []string{"def"},
+			},
+			Path: "/zzz",
+		}},
+		{"07_couper.hcl", "", expectation{
+			Query: url.Values{
+				"ae":  []string{"ae"},
+				"def": []string{"def"},
+			},
+			Path: "/xxx",
 		}},
 	} {
+		shutdown, _ := newCouper(path.Join(confPath, tc.file), test.New(t))
+
 		t.Run("_"+tc.query, func(subT *testing.T) {
 			helper := test.New(subT)
 
@@ -613,9 +638,9 @@ func TestHTTPServer_QueryParams(t *testing.T) {
 				t.Errorf("\nwant: \n%#v\ngot: \n%#v\npayload:\n%s", tc.exp, jsonResult, string(resBytes))
 			}
 		})
-	}
 
-	cleanup(shutdown, t)
+		cleanup(shutdown, t)
+	}
 }
 
 func TestHTTPServer_Endpoint_Evaluation(t *testing.T) {

server/testdata/integration/endpoint_eval/05_couper.hcl

@@ -0,0 +1,24 @@
+server "api" {
+  api {
+    endpoint "/" {
+      path = "/yyy"
+      backend = "anything"
+
+      set_query_params = {
+        ae = "ae"
+      }
+    }
+  }
+}
+
+definitions {
+  # backend origin within a definition block gets replaced with the integration test "anything" server.
+  backend "anything" {
+    path = "/xxx"
+    origin = "http://anyserver/"
+
+    set_query_params = {
+      def = "def"
+    }
+  }
+}

server/testdata/integration/endpoint_eval/06_couper.hcl

@@ -0,0 +1,26 @@
+server "api" {
+  api {
+    endpoint "/" {
+      path = "/yyy"
+      backend "anything" {
+        path = "/zzz"
+      }
+
+      add_query_params = {
+        ae = "ae"
+      }
+    }
+  }
+}
+
+definitions {
+  # backend origin within a definition block gets replaced with the integration test "anything" server.
+  backend "anything" {
+    path = "/xxx"
+    origin = "http://anyserver/"
+
+    add_query_params = {
+      def = "def"
+    }
+  }
+}

server/testdata/integration/endpoint_eval/07_couper.hcl

@@ -0,0 +1,23 @@
+server "api" {
+  api {
+    endpoint "/" {
+      backend = "anything"
+
+      add_query_params = {
+        ae = "ae"
+      }
+    }
+  }
+}
+
+definitions {
+  # backend origin within a definition block gets replaced with the integration test "anything" server.
+  backend "anything" {
+    path = "/xxx"
+    origin = "http://anyserver/"
+
+    add_query_params = {
+      def = "def"
+    }
+  }
+}