From f7ab336428ea2f4a18552828697c5cb5d9eb36a8 Mon Sep 17 00:00:00 2001 From: Kunam Balaram Reddy Date: Fri, 10 May 2024 08:52:25 +0530 Subject: [PATCH] default onRequest --- src/blueprint/operators/http.rs | 2 +- .../snapshots/test-js-request-response-2.md_merged.snap | 2 +- .../core/snapshots/test-js-request-response.md_merged.snap | 2 +- tests/execution/test-js-multiple-scripts.md | 6 +----- tests/execution/test-js-request-response-2.md | 2 +- tests/execution/test-js-request-response.md | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/blueprint/operators/http.rs b/src/blueprint/operators/http.rs index 6382530bd85..f68a0a99a98 100644 --- 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 index d6af33e0f19..74acf0b4ff9 100644 --- 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 index d6af33e0f19..74acf0b4ff9 100644 --- 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 index 29e0e182f72..f362bab5620 100644 --- 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 index a89bfbb6984..30ede242c75 100644 --- 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 index 21c8c357656..9e61ecf008c 100644 --- 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 }