Merge pull request #6 from advanced-security/sarif-updates

feat: Update SARIF parsing and loading

Author: GeekMasher

Cargo.lock

@@ -30,4 +30,4 @@ ghastoolkit = { version = "^0.11", features = ["toolcache"] }
 # GitHub API
 octocrab = "^0.44"
 openssl = { version = "0.10", features = ["vendored"] }
-serde_json = "1.0.140"
+serde_json = "1.0"

Cargo.toml

@@ -188,8 +188,10 @@ async fn main() -> Result<()> {
         }
 
         log::info!("Post-processing SARIF results");
-        if let Ok(sarif_content) = std::fs::read_to_string(&sarif_path) {
-            if let Ok(mut sarif) = serde_json::from_str::<Sarif>(&sarif_content) {
+
+        match Sarif::try_from(sarif_path.clone()) {
+            Ok(mut sarif) => {
+                log::info!("Updating SARIF tool name for language: {language}");
                 sarif.runs.iter_mut().for_each(|run| {
                     run.tool.driver.name = format!("CodeQL - {language}");
                 });
@@ -201,12 +203,17 @@ async fn main() -> Result<()> {
                     log::info!("SARIF file written successfully: {sarif_path:?}");
                 }
             }
+            Err(e) => {
+                log::error!("Failed to read and parse SARIF file: {e}");
+            }
         }
 
         // Reload the database to get analysis info
         database.reload()?;
         log::info!("CodeQL Database LoC :: {}", database.lines_of_code());
 
+        log::info!("SARIF Output Path :: {sarif_path:?}");
+
         log::info!("Analysis complete :: {database:?}");
         groupend!();
     }