default onRequest

tailcallhq · May 10, 2024 · f7ab336 · f7ab336
1 parent ea41992
commit f7ab336
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/src/blueprint/operators/http.rs b/src/blueprint/operators/http.rs
@@ -63,7 +63,7 @@ pub fn compile_http(
             let on_request = http
                 .on_request
                 .clone()
-                .or(config_module.upstream.on_request.clone());
+                .or(config_module.upstream.on_request.clone()).or(Some("onRequest".to_string()));
             let http_filter = http::HttpFilter { on_request };
             if !http.group_by.is_empty() && http.method == Method::GET {
                 let group_by = Some(GroupBy::new(http.group_by.clone()));

diff --git a/tests/core/snapshots/test-js-request-response-2.md_merged.snap b/tests/core/snapshots/test-js-request-response-2.md_merged.snap
@@ -2,7 +2,7 @@
 source: tests/core/spec.rs
 expression: merged
 ---
-schema @server @upstream(onRequest: "onRequest") @link(src: "test.js", type: Script) {
+schema @server @upstream @link(src: "test.js", type: Script) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/test-js-request-response.md_merged.snap b/tests/core/snapshots/test-js-request-response.md_merged.snap
@@ -2,7 +2,7 @@
 source: tests/core/spec.rs
 expression: merged
 ---
-schema @server @upstream(onRequest: "onRequest") @link(src: "test.js", type: Script) {
+schema @server @upstream @link(src: "test.js", type: Script) {
   query: Query
 }
 

diff --git a/tests/execution/test-js-multiple-scripts.md b/tests/execution/test-js-multiple-scripts.md
@@ -13,11 +13,7 @@ function onRequest(request) {}
 ```
 
 ```graphql @server
-schema
-  @server
-  @upstream(onRequest: "onRequest")
-  @link(type: Script, src: "test1.js")
-  @link(type: Script, src: "test2.js") {
+schema @server @link(type: Script, src: "test1.js") @link(type: Script, src: "test2.js") {
   query: Query
 }
 

diff --git a/tests/execution/test-js-request-response-2.md b/tests/execution/test-js-request-response-2.md
@@ -25,7 +25,7 @@ function onRequest({request}) {
 ```
 
 ```graphql @server
-schema @server @upstream(onRequest: "onRequest") @link(type: Script, src: "test.js") {
+schema @server @link(type: Script, src: "test.js") {
   query: Query
 }
 

diff --git a/tests/execution/test-js-request-response.md b/tests/execution/test-js-request-response.md
@@ -23,7 +23,7 @@ function onRequest({request}) {
 ```
 
 ```graphql @server
-schema @server @upstream(onRequest: "onRequest") @link(type: Script, src: "test.js") {
+schema @server @link(type: Script, src: "test.js") {
   query: Query
 }