Merge branch 'main' into fix/safe-handling-utf-8-string-in-line-breaker

tailcallhq · Dec 26, 2024 · cc76682 · cc76682
2 parents 08fd4b6 + 4cf48a1
commit cc76682
Show file tree

Hide file tree

Showing 525 changed files with 2,457 additions and 899 deletions.
diff --git a/generated/.tailcallrc.schema.json b/generated/.tailcallrc.schema.json
@@ -2,9 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "RuntimeConfig",
   "type": "object",
-  "required": [
-    "links"
-  ],
   "properties": {
     "links": {
       "description": "A list of all links in the schema.",
@@ -15,7 +12,6 @@
     },
     "server": {
       "description": "Dictates how the server behaves and helps tune tailcall for all ingress requests. Features such as request batching, SSL, HTTP2 etc. can be configured here.",
-      "default": {},
       "allOf": [
         {
           "$ref": "#/definitions/Server"
@@ -32,7 +28,6 @@
     },
     "upstream": {
       "description": "Dictates how tailcall should handle upstream requests/responses. Tuning upstream can improve performance and reliability for connections.",
-      "default": {},
       "allOf": [
         {
           "$ref": "#/definitions/Upstream"

diff --git a/src/core/config/config.rs b/src/core/config/config.rs
@@ -43,17 +43,18 @@ pub struct RuntimeConfig {
     /// Dictates how the server behaves and helps tune tailcall for all ingress
     /// requests. Features such as request batching, SSL, HTTP2 etc. can be
     /// configured here.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "is_default")]
     pub server: Server,
 
     ///
     /// Dictates how tailcall should handle upstream requests/responses.
     /// Tuning upstream can improve performance and reliability for connections.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "is_default")]
     pub upstream: Upstream,
 
     ///
     /// A list of all links in the schema.
+    #[serde(default, skip_serializing_if = "is_default")]
     pub links: Vec<Link>,
 
     /// Enable [opentelemetry](https://opentelemetry.io) support

diff --git a/src/core/config/transformer/subgraph.rs b/src/core/config/transformer/subgraph.rs
@@ -59,7 +59,12 @@ impl Transform for Subgraph {
                             let key = Key { fields };
 
                             to_directive(key.to_directive()).map(|directive| {
-                                ty.directives.push(directive);
+                                // Prevent transformer to push the same directive multiple times
+                                if !ty.directives.iter().any(|d| {
+                                    d.name == directive.name && d.arguments == directive.arguments
+                                }) {
+                                    ty.directives.push(directive);
+                                }
                             })
                         }
                         None => Valid::succeed(()),

diff --git a/tests/core/parse.rs b/tests/core/parse.rs
@@ -15,7 +15,8 @@ use tailcall::cli::javascript;
 use tailcall::core::app_context::AppContext;
 use tailcall::core::blueprint::Blueprint;
 use tailcall::core::cache::InMemoryCache;
-use tailcall::core::config::{ConfigModule, Source};
+use tailcall::core::config::{ConfigModule, Link, RuntimeConfig, Source};
+use tailcall::core::merge_right::MergeRight;
 use tailcall::core::runtime::TargetRuntime;
 use tailcall::core::worker::{Command, Event};
 use tailcall::core::{EnvIO, WorkerIO};
@@ -51,14 +52,15 @@ impl ExecutionSpec {
             .peekable();
 
         let mut name: Option<String> = None;
-        let mut server: Vec<(Source, String)> = Vec::with_capacity(2);
+        let mut config = RuntimeConfig::default();
         let mut mock: Option<Vec<Mock>> = None;
         let mut env: Option<HashMap<String, String>> = None;
         let mut files: BTreeMap<String, String> = BTreeMap::new();
         let mut test: Option<Vec<APIRequest>> = None;
         let mut runner: Option<Annotation> = None;
         let mut check_identity = false;
         let mut sdl_error = false;
+        let mut links_counter = 0;
 
         while let Some(node) = children.next() {
             match node {
@@ -172,8 +174,16 @@ impl ExecutionSpec {
 
                             match name {
                                 "config" => {
-                                    // Server configs are only parsed if the test isn't skipped.
-                                    server.push((source, content));
+                                    config = config.merge_right(
+                                        RuntimeConfig::from_source(source, &content).unwrap(),
+                                    );
+                                }
+                                "schema" => {
+                                    // Schemas configs are only parsed if the test isn't skipped.
+                                    let name = format!("schema_{}.graphql", links_counter);
+                                    files.insert(name.clone(), content);
+                                    config.links.push(Link { src: name, ..Default::default() });
+                                    links_counter += 1;
                                 }
                                 "mock" => {
                                     if mock.is_none() {
@@ -240,9 +250,9 @@ impl ExecutionSpec {
             }
         }
 
-        if server.is_empty() {
+        if links_counter == 0 {
             return Err(anyhow!(
-                "Unexpected blocks in {:?}: You must define a GraphQL Config in an execution test.",
+                "Unexpected blocks in {:?}: You must define a GraphQL Schema in an execution test.",
                 path,
             ));
         }
@@ -252,7 +262,7 @@ impl ExecutionSpec {
             name: name.unwrap_or_else(|| path.file_name().unwrap().to_str().unwrap().to_string()),
             safe_name: path.file_name().unwrap().to_str().unwrap().to_string(),
 
-            server,
+            config,
             mock,
             env,
             test,

diff --git a/tests/core/runtime.rs b/tests/core/runtime.rs
@@ -10,7 +10,7 @@ use derive_setters::Setters;
 use tailcall::cli::javascript::init_worker_io;
 use tailcall::core::blueprint::Script;
 use tailcall::core::cache::InMemoryCache;
-use tailcall::core::config::Source;
+use tailcall::core::config::RuntimeConfig;
 use tailcall::core::runtime::TargetRuntime;
 use tailcall::core::worker::{Command, Event};
 
@@ -25,7 +25,7 @@ pub struct ExecutionSpec {
     pub name: String,
     pub safe_name: String,
 
-    pub server: Vec<(Source, String)>,
+    pub config: RuntimeConfig,
     pub mock: Option<Vec<Mock>>,
     pub env: Option<HashMap<String, String>>,
     pub test: Option<Vec<APIRequest>>,

diff --git a/tests/core/snapshots/add-field-index-list.md_merged.snap b/tests/core/snapshots/add-field-index-list.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/add-field-many-list.md_merged.snap b/tests/core/snapshots/add-field-many-list.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/add-field-many.md_merged.snap b/tests/core/snapshots/add-field-many.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/add-field-modify.md_merged.snap b/tests/core/snapshots/add-field-modify.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/add-field-with-composition.md_merged.snap b/tests/core/snapshots/add-field-with-composition.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/add-field-with-modify.md_merged.snap b/tests/core/snapshots/add-field-with-modify.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/add-field.md_merged.snap b/tests/core/snapshots/add-field.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/apollo-federation-entities-batch.md_merged.snap b/tests/core/snapshots/apollo-federation-entities-batch.md_merged.snap
@@ -3,7 +3,10 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(enableFederation: true, port: 8000) @upstream(batch: {delay: 100, headers: []}, httpCache: 42) {
+schema
+  @server(enableFederation: true, port: 8000)
+  @upstream(batch: {delay: 100, headers: []}, httpCache: 42)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/apollo-federation-entities.md_merged.snap b/tests/core/snapshots/apollo-federation-entities.md_merged.snap
@@ -6,7 +6,8 @@ snapshot_kind: text
 schema
   @server(enableFederation: true, port: 8000)
   @upstream(batch: {delay: 100, headers: []}, httpCache: 42)
-  @link(src: "./posts.graphql", type: Config) {
+  @link(src: "./posts.graphql", type: Config)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/apollo-tracing.md_merged.snap b/tests/core/snapshots/apollo-tracing.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(hostname: "0.0.0.0", port: 8000) @upstream {
+schema @server @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/async-cache-disabled.md_merged.snap b/tests/core/snapshots/async-cache-disabled.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000, queryValidation: false) @upstream {
+schema @server(port: 8000, queryValidation: false) @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/async-cache-enable-multiple-resolvers.md_merged.snap b/tests/core/snapshots/async-cache-enable-multiple-resolvers.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000, queryValidation: false) @upstream {
+schema @server(port: 8000, queryValidation: false) @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/async-cache-enabled.md_merged.snap b/tests/core/snapshots/async-cache-enabled.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000, queryValidation: false) @upstream {
+schema @server(port: 8000, queryValidation: false) @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/async-cache-global.md_merged.snap b/tests/core/snapshots/async-cache-global.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000, queryValidation: false) @upstream {
+schema @server(port: 8000, queryValidation: false) @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/async-cache-inflight-request.md_merged.snap b/tests/core/snapshots/async-cache-inflight-request.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000, queryValidation: false) @upstream {
+schema @server(port: 8000, queryValidation: false) @upstream @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/auth-basic.md_merged.snap b/tests/core/snapshots/auth-basic.md_merged.snap
@@ -3,7 +3,11 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000) @upstream @link(id: "htpasswd", src: ".htpasswd", type: Htpasswd) {
+schema
+  @server(port: 8000)
+  @upstream
+  @link(id: "htpasswd", src: ".htpasswd", type: Htpasswd)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
   mutation: Mutation
 }

diff --git a/tests/core/snapshots/auth-jwt.md_merged.snap b/tests/core/snapshots/auth-jwt.md_merged.snap
@@ -3,7 +3,11 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server(port: 8000) @upstream @link(id: "jwks", src: "jwks.json", type: Jwks) {
+schema
+  @server(port: 8000)
+  @upstream
+  @link(id: "jwks", src: "jwks.json", type: Jwks)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
   mutation: Mutation
 }

diff --git a/tests/core/snapshots/auth-multiple-complex.md_merged.snap b/tests/core/snapshots/auth-multiple-complex.md_merged.snap
@@ -8,7 +8,8 @@ schema
   @upstream
   @link(id: "a", src: ".htpasswd_a", type: Htpasswd)
   @link(id: "b", src: ".htpasswd_b", type: Htpasswd)
-  @link(id: "c", src: ".htpasswd_c", type: Htpasswd) {
+  @link(id: "c", src: ".htpasswd_c", type: Htpasswd)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/auth-multiple.md_merged.snap b/tests/core/snapshots/auth-multiple.md_merged.snap
@@ -8,7 +8,8 @@ schema
   @upstream
   @link(id: "a", src: ".htpasswd_a", type: Htpasswd)
   @link(id: "b", src: ".htpasswd_b", type: Htpasswd)
-  @link(id: "c", src: ".htpasswd_c", type: Htpasswd) {
+  @link(id: "c", src: ".htpasswd_c", type: Htpasswd)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/auth.md_merged.snap b/tests/core/snapshots/auth.md_merged.snap
@@ -7,7 +7,8 @@ schema
   @server
   @upstream
   @link(id: "htpasswd", src: ".htpasswd", type: Htpasswd)
-  @link(id: "jwks", src: "jwks.json", type: Jwks) {
+  @link(id: "jwks", src: "jwks.json", type: Jwks)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/auth_order.md_merged.snap b/tests/core/snapshots/auth_order.md_merged.snap
@@ -3,7 +3,11 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream @link(id: "htpasswd", src: ".htpasswd", type: Htpasswd) {
+schema
+  @server
+  @upstream
+  @link(id: "htpasswd", src: ".htpasswd", type: Htpasswd)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/batching-default.md_merged.snap b/tests/core/snapshots/batching-default.md_merged.snap
@@ -3,7 +3,7 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream(batch: {delay: 10, headers: []}, httpCache: 42) {
+schema @server @upstream(batch: {delay: 10, headers: []}, httpCache: 42) @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/batching-disabled.md_merged.snap b/tests/core/snapshots/batching-disabled.md_merged.snap
@@ -3,7 +3,10 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream(batch: {delay: 0, headers: [], maxSize: 100}, httpCache: 42) {
+schema
+  @server
+  @upstream(batch: {delay: 0, headers: [], maxSize: 100}, httpCache: 42)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/batching-group-by-default.md_merged.snap b/tests/core/snapshots/batching-group-by-default.md_merged.snap
@@ -3,7 +3,10 @@ source: tests/core/spec.rs
 expression: formatter
 snapshot_kind: text
 ---
-schema @server @upstream(batch: {delay: 1, headers: [], maxSize: 1000}, httpCache: 42) {
+schema
+  @server
+  @upstream(batch: {delay: 1, headers: [], maxSize: 1000}, httpCache: 42)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }
 

diff --git a/tests/core/snapshots/batching-group-by-optional-key.md_merged.snap b/tests/core/snapshots/batching-group-by-optional-key.md_merged.snap
@@ -5,7 +5,8 @@ snapshot_kind: text
 ---
 schema
   @server(port: 8000, queryValidation: false)
-  @upstream(batch: {delay: 1, headers: [], maxSize: 1000}, httpCache: 42) {
+  @upstream(batch: {delay: 1, headers: [], maxSize: 1000}, httpCache: 42)
+  @link(src: "schema_0.graphql", type: Config) {
   query: Query
 }