Use Result for process_analysis_request.

DataDog · Nov 6, 2024 · 343be2d · 343be2d
1 parent b5bdd4b
commit 343be2d
Show file tree

Hide file tree

Showing 2 changed files with 150 additions and 228 deletions.
diff --git a/crates/bins/src/bin/datadog_static_analyzer_server/endpoints.rs b/crates/bins/src/bin/datadog_static_analyzer_server/endpoints.rs
@@ -8,6 +8,7 @@ use rocket::{
     serde::json::{json, Json, Value},
     Build, Rocket, Shutdown, State,
 };
+use server::model::analysis_response::AnalysisResponse;
 use server::model::{
     analysis_request::AnalysisRequest, tree_sitter_tree_request::TreeSitterRequest,
 };
@@ -109,7 +110,14 @@ fn languages(span: TraceSpan) -> Value {
 fn analyze(span: TraceSpan, request: Json<AnalysisRequest>) -> Value {
     let _entered = span.enter();
     tracing::debug!("{:?}", &request.0);
-    json!(process_analysis_request(request.into_inner()))
+    let (rule_responses, errors) = match process_analysis_request(request.into_inner()) {
+        Ok(rule_responses) => (rule_responses, vec![]),
+        Err(err) => (vec![], vec![err]),
+    };
+    json!(AnalysisResponse {
+        rule_responses,
+        errors
+    })
 }
 
 #[rocket::post("/get-treesitter-ast", format = "application/json", data = "<request>")]