Convert "Invalid source root" errors to UserErrors

github · Oct 4, 2022 · 7c40d0f · 7c40d0f
1 parent 4cf8004
commit 7c40d0f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/lib/init.js b/lib/init.js
diff --git a/lib/init.js.map b/lib/init.js.map
diff --git a/src/init.ts b/src/init.ts
@@ -117,9 +117,10 @@ export async function runInit(
       }
     }
   } catch (e) {
-    // Handle the situation where init is called twice
-    // for the same database in the same job.
+    // Check if we need to re-throw the error as a UserError in order to avoid
+    // counting this error towards our internal error budget.
     if (
+      // Init action called twice
       e instanceof Error &&
       e.message?.includes("Refusing to create databases") &&
       e.message.includes("exists and is not an empty directory.")
@@ -129,7 +130,10 @@ export async function runInit(
       );
     } else if (
       e instanceof Error &&
-      e.message?.includes("is not compatible with this CodeQL CLI")
+      // Version of CodeQL CLI is incompatible with this version of the CodeQL Action
+      (e.message?.includes("is not compatible with this CodeQL CLI") ||
+        // Expected source location for database creation does not exist
+        e.message?.includes("Invalid source root"))
     ) {
       throw new util.UserError(e.message);
     } else {