github/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2025-12-24 08:10:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make submitting advanced analysis when default setup on a user error

Browse Source
This commit is contained in:
Henry Mercer
2023-07-28 18:21:38 +01:00
parent 5691205077
commit 79690d4663
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/upload-lib.js generated
View File

@@ -331,7 +331,10 @@ async function waitForProcessing(repositoryNwo, sarifID, logger, options = {
break; break;
} }
else if (status === "failed") { else if (status === "failed") {
throw new Error(`Code Scanning could not process the submitted SARIF file:\n${response.data.errors}`); const message = `Code Scanning could not process the submitted SARIF file:\n${response.data.errors}`;
throw areProcessingErrorsUserError(response.data.errors)
? new util_1.UserError(message)
: new Error(message);
} }
else { else {
util.assertNever(status); util.assertNever(status);
@@ -346,6 +349,11 @@ async function waitForProcessing(repositoryNwo, sarifID, logger, options = {
} }
} }
exports.waitForProcessing = waitForProcessing; exports.waitForProcessing = waitForProcessing;
function areProcessingErrorsUserError(processingErrors) {
return (processingErrors.length === 1 &&
processingErrors[0] ===
"CodeQL analyses from advanced configurations cannot be processed when the default setup is enabled");
}
/** /**
* Checks the processing result for an unsuccessful execution. Throws if the * Checks the processing result for an unsuccessful execution. Throws if the
* result is not a failure with a single "unsuccessful execution" error. * result is not a failure with a single "unsuccessful execution" error.

2
lib/upload-lib.js.map
View File

File diff suppressed because one or more lines are too long

17
src/upload-lib.ts
View File

@@ -15,7 +15,7 @@ import * as fingerprints from "./fingerprints";
import { Logger } from "./logging"; import { Logger } from "./logging";
import { parseRepositoryNwo, RepositoryNwo } from "./repository"; import { parseRepositoryNwo, RepositoryNwo } from "./repository";
import * as util from "./util"; import * as util from "./util";
import { SarifFile, SarifResult, SarifRun, wrapError } from "./util"; import { SarifFile, SarifResult, SarifRun, UserError, wrapError } from "./util";
// Takes a list of paths to sarif files and combines them together, // Takes a list of paths to sarif files and combines them together,
// returning the contents of the combined sarif file. // returning the contents of the combined sarif file.
@@ -472,9 +472,10 @@ export async function waitForProcessing(
} else if (status === "complete") { } else if (status === "complete") {
break; break;
} else if (status === "failed") { } else if (status === "failed") {
throw new Error( const message = `Code Scanning could not process the submitted SARIF file:\n${response.data.errors}`;
`Code Scanning could not process the submitted SARIF file:\n${response.data.errors}`, throw areProcessingErrorsUserError(response.data.errors as string[])
); ? new UserError(message)
: new Error(message);
} else { } else {
util.assertNever(status); util.assertNever(status);
} }
@@ -488,6 +489,14 @@ export async function waitForProcessing(
} }
} }
function areProcessingErrorsUserError(processingErrors: string[]): boolean {
return (
processingErrors.length === 1 &&
processingErrors[0] ===
"CodeQL analyses from advanced configurations cannot be processed when the default setup is enabled"
);
}
/** /**
* Checks the processing result for an unsuccessful execution. Throws if the * Checks the processing result for an unsuccessful execution. Throws if the
* result is not a failure with a single "unsuccessful execution" error. * result is not a failure with a single "unsuccessful execution" error.