Simpler

Author: ardatan

lib/executor/src/executors/http.rs

@@ -92,50 +92,12 @@ impl HTTPSubgraphExecutor {
         }
     }
 
-    fn build_request_body<'exec, 'req>(
+    fn sign_hmac(
         &self,
-        execution_request: &HttpExecutionRequest<'exec, 'req>,
-    ) -> Result<Vec<u8>, SubgraphExecutorError> {
-        let mut body = Vec::with_capacity(4096);
-        body.put(FIRST_QUOTE_STR);
-        write_and_escape_string(&mut body, execution_request.query);
-        let mut first_variable = true;
-        if let Some(variables) = &execution_request.variables {
-            for (variable_name, variable_value) in variables {
-                if first_variable {
-                    body.put(FIRST_VARIABLE_STR);
-                    first_variable = false;
-                } else {
-                    body.put(COMMA);
-                }
-                body.put(QUOTE);
-                body.put(variable_name.as_bytes());
-                body.put(QUOTE);
-                body.put(COLON);
-                let value_str = sonic_rs::to_string(variable_value).map_err(|err| {
-                    SubgraphExecutorError::VariablesSerializationFailure(
-                        variable_name.to_string(),
-                        err.to_string(),
-                    )
-                })?;
-                body.put(value_str.as_bytes());
-            }
-        }
-        if let Some(representations) = &execution_request.representations {
-            if first_variable {
-                body.put(FIRST_VARIABLE_STR);
-                first_variable = false;
-            } else {
-                body.put(COMMA);
-            }
-            body.put("\"representations\":".as_bytes());
-            body.extend_from_slice(representations);
-        }
-        // "first_variable" should be still true if there are no variables
-        if !first_variable {
-            body.put(CLOSE_BRACE);
-        }
-
+        execution_request: &HttpExecutionRequest,
+        body: &mut Vec<u8>,
+        first_extension: &mut bool,
+    ) -> Result<(), SubgraphExecutorError> {
         let should_sign_hmac = match &self.should_sign_hmac {
             BooleanOrProgram::Boolean(b) => *b,
             BooleanOrProgram::Program(expr) => {
@@ -168,8 +130,6 @@ impl HTTPSubgraphExecutor {
             }
         };
 
-        let mut first_extension = true;
-
         if should_sign_hmac {
             if self.config.hmac_signature.secret.is_empty() {
                 return Err(SubgraphExecutorError::HMACSignatureError(
@@ -188,9 +148,9 @@ impl HTTPSubgraphExecutor {
             mac.update(&body_without_extensions);
             let result = mac.finalize();
             let result_bytes = result.into_bytes();
-            if first_extension {
+            if *first_extension {
                 body.put(FIRST_EXTENSION_STR);
-                first_extension = false;
+                *first_extension = false;
             } else {
                 body.put(COMMA);
             }
@@ -203,6 +163,58 @@ impl HTTPSubgraphExecutor {
             body.put(hmac_hex.as_bytes());
             body.put(QUOTE);
         }
+        Ok(())
+    }
+
+    fn build_request_body<'exec, 'req>(
+        &self,
+        execution_request: &HttpExecutionRequest<'exec, 'req>,
+    ) -> Result<Vec<u8>, SubgraphExecutorError> {
+        let mut body = Vec::with_capacity(4096);
+        body.put(FIRST_QUOTE_STR);
+        write_and_escape_string(&mut body, execution_request.query);
+        let mut first_variable = true;
+        if let Some(variables) = &execution_request.variables {
+            for (variable_name, variable_value) in variables {
+                if first_variable {
+                    body.put(FIRST_VARIABLE_STR);
+                    first_variable = false;
+                } else {
+                    body.put(COMMA);
+                }
+                body.put(QUOTE);
+                body.put(variable_name.as_bytes());
+                body.put(QUOTE);
+                body.put(COLON);
+                let value_str = sonic_rs::to_string(variable_value).map_err(|err| {
+                    SubgraphExecutorError::VariablesSerializationFailure(
+                        variable_name.to_string(),
+                        err.to_string(),
+                    )
+                })?;
+                body.put(value_str.as_bytes());
+            }
+        }
+        if let Some(representations) = &execution_request.representations {
+            if first_variable {
+                body.put(FIRST_VARIABLE_STR);
+                first_variable = false;
+            } else {
+                body.put(COMMA);
+            }
+            body.put("\"representations\":".as_bytes());
+            body.extend_from_slice(representations);
+        }
+        // "first_variable" should be still true if there are no variables
+        if !first_variable {
+            body.put(CLOSE_BRACE);
+        }
+
+        let mut first_extension = true;
+
+        if !self.config.hmac_signature.is_disabled() {
+            self.sign_hmac(execution_request, &mut body, &mut first_extension)?;
+        }
 
         if let Some(extensions) = &execution_request.extensions {
             for (extension_name, extension_value) in extensions {