robojerk/codeql-action

Refactoring: Simplify retrieving error message

Browse source
This commit is contained in:
Henry Mercer 2024-09-16 22:38:35 +02:00
parent bbd7c801a0
commit dd7307d603
54 changed files with 106 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/codeql.ts
View file

@ -31,7 +31,7 @@ import * as setupCodeql from "./setup-codeql";
import { ToolsFeature, isSupportedToolsFeature } from "./tools-features";
import { shouldEnableIndirectTracing } from "./tracer-config";
import * as util from "./util";
import { BuildMode, wrapError, cloneObject } from "./util";
import { BuildMode, cloneObject, getErrorMessage } from "./util";
type Options = Array<string | number | boolean>;
@ -398,7 +398,7 @@ export async function setupCodeQL(
};
} catch (e) {
throw new Error(
`Unable to download and extract CodeQL CLI: ${wrapError(e).message}`,
`Unable to download and extract CodeQL CLI: ${getErrorMessage(e)}`,
);
}
}
@ -707,7 +707,7 @@ export async function getCodeQLForCmd(
e instanceof util.ConfigurationError
? util.ConfigurationError
: Error;
throw new ErrorConstructor(`${prefix} ${util.wrapError(e).message}`);
throw new ErrorConstructor(`${prefix} ${getErrorMessage(e)}`);
} else {
throw e;
}