robojerk/codeql-action

Improve formatting of fatal errors

Browse source
This commit is contained in:
Henry Mercer 2023-07-21 14:39:30 +01:00
parent 2eb34f2fb9
commit fdedc91de2
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/codeql.ts
View file

@ -1161,8 +1161,8 @@ async function runTool(
}
function extractFatalErrors(error: string): string | undefined {
const fatalErrors: string[] = [];
const fatalErrorRegex = /.*fatal error occurred:/gi;
let fatalErrors: string[] = [];
let lastFatalErrorIndex: number | undefined;
let match: RegExpMatchArray | null;
while ((match = fatalErrorRegex.exec(error)) !== null) {
@ -1177,12 +1177,23 @@ function extractFatalErrors(error: string): string | undefined {
// No other errors
return lastError;
}
const separator = fatalErrors.some((e) => e.includes("\n")) ? "\n" : " ";
return [lastError, "Context:", ...fatalErrors.reverse()].join(separator);
const isOneLiner = !fatalErrors.some((e) => e.includes("\n"));
if (isOneLiner) {
fatalErrors = fatalErrors.map(ensureEndsInPeriod);
}
return [
ensureEndsInPeriod(lastError),
"Context:",
...fatalErrors.reverse(),
].join(isOneLiner ? " " : "\n");
}
return undefined;
}
function ensureEndsInPeriod(text: string): string {
return text[text.length - 1] === "." ? text : `${text}.`;
}
/**
* If appropriate, generates a code scanning configuration that is to be used for a scan.
* If the configuration is not to be generated, returns undefined.