..

Author: ardatan

lib/executor/src/executors/timeout.rs

@@ -169,6 +169,7 @@ impl SubgraphExecutor for TimeoutExecutor {
 #[cfg(test)]
 mod tests {
     use async_trait::async_trait;
+    use hive_router_config::parse_yaml_config;
     use http::Method;
     use ntex_http::HeaderMap;
 
@@ -258,4 +259,36 @@ mod tests {
             "Expected 10000ms for mutation"
         );
     }
+
+    #[test]
+    fn get_timeout_duration_from_fixed_duration() {
+        let yaml_str = r#"
+           traffic_shaping:
+             all:
+                timeout: 
+                    duration: 7s
+        "#;
+        let config = parse_yaml_config(yaml_str.to_string()).unwrap();
+        let mock_executor = MockExecutor {}.to_boxed_arc();
+        let timeout_executor = TimeoutExecutor::try_new(
+            "http://example.com/graphql".parse().unwrap(),
+            &config.traffic_shaping.all.timeout.unwrap(),
+            mock_executor,
+        )
+        .unwrap();
+
+        let headers = HeaderMap::new();
+        let client_request = ClientRequestDetails {
+            operation: OperationDetails {
+                name: Some("TestQuery".to_string()),
+                kind: "query",
+                query: "query TestQuery { field }".into(),
+            },
+            url: "http://example.com/graphql".parse().unwrap(),
+            headers: &headers,
+            method: Method::POST,
+        };
+        let duration = timeout_executor.get_timeout_duration(&client_request);
+        assert_eq!(duration, Some(std::time::Duration::from_millis(7000)));
+    }
 }

lib/router-config/src/traffic_shaping.rs

@@ -46,9 +46,17 @@ pub struct TrafficShapingExecutorConfig {
 #[serde(rename_all = "camelCase")]
 pub enum SubgraphTimeoutConfig {
     Expression(String),
+    #[serde(deserialize_with = "humantime_serde")]
     Duration(Duration),
 }
 
+fn humantime_serde<'de, D>(deserializer: D) -> Result<Duration, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    humantime_serde::deserialize(deserializer)
+}
+
 impl Default for TrafficShapingExecutorConfig {
     fn default() -> Self {
         Self {