Improving handling of uploadFailedSarifResult -> [Object object]

github · May 23, 2023 · 948803c · 948803c
1 parent b42c6f2
commit 948803c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/lib/init-action-post-helper.js b/lib/init-action-post-helper.js
diff --git a/lib/init-action-post-helper.js.map b/lib/init-action-post-helper.js.map
diff --git a/src/init-action-post-helper.ts b/src/init-action-post-helper.ts
@@ -171,9 +171,15 @@ export async function run(
     process.env["CODEQL_ACTION_EXPECT_UPLOAD_FAILED_SARIF"] === "true" &&
     !uploadFailedSarifResult.raw_upload_size_bytes
   ) {
+    let error: string
+    if (uploadFailedSarifResult instanceof Error) {
+      error = (uploadFailedSarifResult as Error).toString();
+    } else {
+      error = JSON.stringify(uploadFailedSarifResult)
+    }
     throw new Error(
       "Expected to upload a failed SARIF file for this CodeQL code scanning run, " +
-        `but the result was instead ${uploadFailedSarifResult}.`
+        `but the result was instead ${error}.`
     );
   }