Merge pull request #2786 from github/henrymercer/more-config-errors

Add some more configuration errors
github · Mar 3, 2025 · 2db5b5a · 2db5b5a
2 parents 8392354 + d59d0eb
commit 2db5b5a
Showing 6 changed files with 22 additions and 4 deletions.
diff --git a/lib/cli-errors.js b/lib/cli-errors.js
diff --git a/lib/cli-errors.js.map b/lib/cli-errors.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/src/cli-errors.ts b/src/cli-errors.ts
@@ -119,6 +119,7 @@ function extractAutobuildErrors(error: string): string | undefined {
 /** Error messages from the CLI that we consider configuration errors and handle specially. */
 export enum CliConfigErrorCategory {
   AutobuildError = "AutobuildError",
+  CouldNotCreateTempDir = "CouldNotCreateTempDir",
   ExternalRepositoryCloneFailed = "ExternalRepositoryCloneFailed",
   GradleBuildFailed = "GradleBuildFailed",
   IncompatibleWithActionVersion = "IncompatibleWithActionVersion",
@@ -159,6 +160,9 @@ export const cliErrorsConfig: Record<
       new RegExp("We were unable to automatically build your code"),
     ],
   },
+  [CliConfigErrorCategory.CouldNotCreateTempDir]: {
+    cliErrorMessageCandidates: [new RegExp("Could not create temp directory")],
+  },
   [CliConfigErrorCategory.ExternalRepositoryCloneFailed]: {
     cliErrorMessageCandidates: [
       new RegExp("Failed to clone external Git repository"),

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -377,7 +377,13 @@ export async function setupCodeQL(
       zstdAvailability,
     };
   } catch (e) {
-    throw new Error(
+    const ErrorClass =
+      e instanceof util.ConfigurationError ||
+      (e instanceof Error && e.message.includes("ENOSPC")) // out of disk space
+        ? util.ConfigurationError
+        : Error;
+
+    throw new ErrorClass(
       `Unable to download and extract CodeQL CLI: ${getErrorMessage(e)}${
         e instanceof Error && e.stack ? `\n\nDetails: ${e.stack}` : ""
       }`,