fix(core): preserve allowedHeaders and fix hyphenated header names (#3383)

Author: victor-develop

src/core/config/config_module/merge.rs

@@ -289,7 +289,7 @@ impl Invariant for Cache {
             .trace(&trace_name)
         }))
         .fuse(self.config.schema.unify(other.config.schema))
-        .map( |(merged_types, merged_enums, schema)| {
+        .map(|(merged_types, merged_enums, schema)| {
             types.extend(merged_types);
             enums.extend(merged_enums);
 
@@ -298,6 +298,7 @@ impl Invariant for Cache {
                 enums,
                 unions: self.config.unions.merge_right(other.config.unions),
                 schema,
+                upstream: self.config.upstream.merge_right(other.config.upstream),
                 ..self.config
             };
 
@@ -505,6 +506,91 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn test_upstream_allowed_headers_propagation() -> Result<()> {
+        use std::collections::BTreeSet;
+
+        use crate::core::config::Config;
+
+        // Create a Config with no allowed_headers
+        let config1 = Config::default();
+
+        // Create a Config with allowed_headers
+        let mut config2 = Config::default();
+        let mut headers = BTreeSet::new();
+        headers.insert("x-user-id".to_string());
+        headers.insert("authorization".to_string());
+        config2.upstream.allowed_headers = Some(headers.clone());
+
+        // Create Cache instances
+        let cache1 = Cache::from(config1.clone());
+        let cache2 = Cache::from(config2.clone());
+
+        // Verify initial state
+        assert_eq!(cache1.config.upstream.allowed_headers, None);
+        assert_eq!(
+            cache2.config.upstream.allowed_headers,
+            Some(headers.clone())
+        );
+
+        // Test merging cache1 and cache2
+        let merged = cache1.clone().unify(cache2.clone()).to_result()?;
+
+        // Verify that allowed_headers from cache2 are preserved in the merged cache
+        assert_eq!(
+            merged.config.upstream.allowed_headers,
+            Some(headers.clone())
+        );
+
+        // Test the reverse order (cache2 and cache1)
+        let merged_reverse = cache2.unify(cache1).to_result()?;
+
+        // Verify that allowed_headers from cache2 are still preserved
+        assert_eq!(
+            merged_reverse.config.upstream.allowed_headers,
+            Some(headers)
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_upstream_merge_right_order() -> Result<()> {
+        use crate::core::config::Config;
+
+        // Create a Config with specific upstream settings
+        let mut config1 = Config::default();
+        config1.upstream.connect_timeout = Some(30);
+        config1.upstream.timeout = Some(60);
+
+        // Create another Config with different upstream settings
+        let mut config2 = Config::default();
+        config2.upstream.timeout = Some(120); // This should override config1's timeout
+        config2.upstream.http_cache = Some(1000); // This should be added to the merged config
+
+        // Create Cache instances
+        let cache1 = Cache::from(config1.clone());
+        let cache2 = Cache::from(config2.clone());
+
+        // Test merging cache1 and cache2
+        let merged = cache1.clone().unify(cache2.clone()).to_result()?;
+
+        // Verify that values from cache2 override those from cache1
+        assert_eq!(merged.config.upstream.connect_timeout, Some(30));
+        assert_eq!(merged.config.upstream.timeout, Some(120)); // Should be from config2
+        assert_eq!(merged.config.upstream.http_cache, Some(1000)); // Should be from config2
+
+        // Test the reverse order (cache2 and cache1)
+        let merged_reverse = cache2.unify(cache1).to_result()?;
+
+        // Verify that values from cache1 override those from cache2
+        assert_eq!(merged_reverse.config.upstream.connect_timeout, Some(30)); // Should be from config1
+        assert_eq!(merged_reverse.config.upstream.timeout, Some(60)); // Should be from config1
+        assert_eq!(merged_reverse.config.upstream.http_cache, Some(1000)); // Should be from config2
+
+        Ok(())
+    }
+
     mod core_type {
         use super::*;
         use crate::core::Type;

src/core/mustache/parse.rs

@@ -21,12 +21,14 @@ impl Mustache {
 fn parse_name(input: &str) -> IResult<&str, String> {
     let spaces = nom::character::complete::multispace0;
     let alpha = nom::character::complete::alpha1;
-    let alphanumeric_or_underscore = nom::multi::many0(nom::branch::alt((
+    let alphanumeric_or_underscore_or_hyphen = nom::multi::many0(nom::branch::alt((
         nom::character::complete::alphanumeric1,
         nom::bytes::complete::tag("_"),
+        nom::bytes::complete::tag("-"),
     )));
 
-    let parser = nom::sequence::tuple((spaces, alpha, alphanumeric_or_underscore, spaces));
+    let parser =
+        nom::sequence::tuple((spaces, alpha, alphanumeric_or_underscore_or_hyphen, spaces));
 
     nom::combinator::map(parser, |(_, a, b, _)| {
         let b: String = b.into_iter().collect();
@@ -269,4 +271,17 @@ mod tests {
             ])])
         );
     }
+
+    #[test]
+    fn test_hyphenated_variable_names() {
+        let s = r"{{headers.user-id}}";
+        let mustache: Mustache = Mustache::parse(s);
+        assert_eq!(
+            mustache,
+            Mustache::from(vec![Segment::Expression(vec![
+                "headers".to_string(),
+                "user-id".to_string(),
+            ])])
+        );
+    }
 }

tests/core/snapshots/test-upstream-headers.md_0.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: response
-snapshot_kind: text
 ---
 {
   "status": 200,
@@ -17,7 +16,9 @@ snapshot_kind: text
         {
           "id": 3
         }
-      ]
+      ],
+      "fooField": "bar",
+      "barField": "baz"
     }
   }
 }

tests/core/snapshots/test-upstream-headers.md_client.snap

@@ -1,13 +1,14 @@
 ---
 source: tests/core/spec.rs
 expression: formatted
-snapshot_kind: text
 ---
 type Post {
   id: Int
 }
 
 type Query {
+  barField: String
+  fooField: String
   posts: [Post]
 }
 

tests/core/snapshots/test-upstream-headers.md_merged.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/core/spec.rs
 expression: formatter
-snapshot_kind: text
 ---
 schema @server @upstream(allowedHeaders: ["X-bar", "x-foo"]) @link(src: "schema_0.graphql", type: Config) {
   query: Query
@@ -12,5 +11,7 @@ type Post {
 }
 
 type Query {
+  barField: String @expr(body: "{{.headers.x-bar}}")
+  fooField: String @expr(body: "{{.headers.x-foo}}")
   posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
 }

tests/execution/test-upstream-headers.md

@@ -11,6 +11,8 @@ schema {
 }
 type Query {
   posts: [Post] @http(url: "http://jsonplaceholder.typicode.com/posts")
+  fooField: String @expr(body: "{{.headers.x-foo}}")
+  barField: String @expr(body: "{{.headers.x-bar}}")
 }
 type Post {
   id: Int
@@ -44,5 +46,5 @@ type Post {
     X-foo: bar
     X-bar: baz
   body:
-    query: query { posts { id } }
+    query: query { posts { id } fooField barField }
 ```