robojerk/codeql-action

Add extra integration test for packaging

Browse source 
Also, update the options and inputs documentation.
This commit is contained in:
Andrew Eisenberg 2021-06-24 14:50:34 -07:00
parent 6e577cfca3
commit 4087f37d90
11 changed files with 83 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/config-utils.test.ts
View file

@ -1596,7 +1596,7 @@ test(
{},
" + ",
[Language.cpp],
/Remove the '\+'/
/remove the '\+'/
);
test(

12
src/config-utils.ts
View file

@ -843,7 +843,7 @@ export async function getDefaultConfig(
);
}
const packs = parsePacksInput(packsInput, languages) ?? {};
const packs = parsePacksFromInput(packsInput, languages) ?? {};
return {
languages,
@ -1075,7 +1075,7 @@ export function parsePacksFromConfig(
return packs;
}
function parsePacksInput(
function parsePacksFromInput(
packsInput: string | undefined,
languages: Language[]
): Packs | undefined {
@ -1085,7 +1085,7 @@ function parsePacksInput(
if (languages.length > 1) {
throw new Error(
"Cannot specify a 'packs' input in a multi-language analysis. Use a codeql-config.yml file instead and specify packs by library."
"Cannot specify a 'packs' input in a multi-language analysis. Use a codeql-config.yml file instead and specify packs by language."
);
} else if (languages.length === 0) {
throw new Error("No languages specified. Cannot process the packs input.");
@ -1095,7 +1095,9 @@ function parsePacksInput(
if (packsInput.startsWith("+")) {
packsInput = packsInput.substring(1).trim();
if (!packsInput) {
throw new Error("Remove the '+' from the packs input.");
throw new Error(
"A '+' was used in the 'packs' input to specify that you wished to add some packs to your CodeQL analysis. However, no packs were specified. Please either remove the '+' or specify some packs."
);
}
}
@ -1139,7 +1141,7 @@ export function parsePacks(
languages: Language[],
configFile: string
) {
const packsFromInput = parsePacksInput(rawPacksInput, languages);
const packsFromInput = parsePacksFromInput(rawPacksInput, languages);
const packsFomConfig = parsePacksFromConfig(
rawPacksFromConfig,
languages,

5
src/runner.ts
View file

@ -132,11 +132,12 @@ program
)
.option(
"--packs <packs>",
`Comma-separated list of packs to run. Reference a pack in the format scope/name[@version]. If version is not
`[Experimental] Comma-separated list of packs to run. Reference a pack in the format scope/name[@version]. If version is not
specified, then the latest version of the pack is used. By default, this overrides the same setting in a
configuration file; prefix with "+" to use both sets of packs.
This option is only available in single-language analyses.`
This option is only available in single-language analyses. To use packs in multi-language
analyses, you must specify packs in the codeql-config.yml file.`
)
.option("--config-file <file>", "Path to config file.")
.option(