Merge pull request #27 from advanced-security/fix-container-path-issue

Fix container path issue and bump version to v0.1.5

Author: GeekMasher

.release.yml

@@ -1,6 +1,6 @@
 name: "codeql-extractor-action"
 repository: "advanced-security/codeql-extractor-action"
-version: 0.1.4
+version: 0.1.5
 
 ecosystems:
   - Docs

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "codeql-extractor-action"
 description = "GitHub Action for CodeQL Extractors"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["GeekMasher"]
 
 license = "MIT"

Cargo.toml

@@ -29,7 +29,7 @@ This action is designed to be used in conjunction with the [CodeQL][CodeQL] anal
 
 ```yml
 - name: "CodeQL Extractor Action"
-  uses: advanced-security/[email protected].4
+  uses: advanced-security/[email protected].5
   with:
     # Repository reference (e.g. "owner/repo", "owner/repo@ref")
     extractor: "advanced-security/codeql-extractor-iac"

README.md

@@ -1,3 +1,3 @@
-FROM ghcr.io/advanced-security/codeql-extractor-action:v0.1.4
+FROM ghcr.io/advanced-security/codeql-extractor-action:v0.1.5
 
 ENTRYPOINT [ "codeql-extractor-action" ]

action.Dockerfile

@@ -287,7 +287,21 @@ async fn main() -> Result<()> {
         groupend!();
     }
 
-    action.set_sarif_results(sarif_output.display().to_string());
+    // If the action is running in Actions, the SARIF file must be a relative path
+    // This is because we assume that this code is running in a container which mounts
+    // the repository at /github/workspace
+    if std::env::var("CI").is_ok() {
+        // If running in a CI environment, set the SARIF as a relative path
+        let relative_path = sarif_output.strip_prefix(&cwd).unwrap_or(&sarif_output);
+        log::debug!(
+            "CI environment detected, setting SARIF path as relative: {}",
+            relative_path.display()
+        );
+        action.set_sarif_results(relative_path.display().to_string());
+    } else {
+        log::debug!("Setting SARIF path as absolute: {}", sarif_output.display());
+        action.set_sarif_results(sarif_output.display().to_string());
+    }
 
     log::info!("All databases created and analyzed");