Use the --resolve-query-specs parameter of pack download
This will allow the command to resolve packs with paths. Also, use a more concise version of `tr`.
This commit is contained in:
parent
06b15c22b1
commit
922dc2b976
14 changed files with 15 additions and 33 deletions
11
lib/analyze.js
generated
11
lib/analyze.js
generated
|
|
@ -136,7 +136,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
|
|||
if (hasPackWithCustomQueries) {
|
||||
logger.info("Performing analysis with custom CodeQL Packs.");
|
||||
logger.startGroup(`Downloading custom packs for ${language}`);
|
||||
const results = await codeql.packDownload(removePackPath(packsWithVersion));
|
||||
const results = await codeql.packDownload(packsWithVersion);
|
||||
logger.info(`Downloaded packs: ${results.packs
|
||||
.map((r) => `${r.name}@${r.version || "latest"}`)
|
||||
.join(", ")}`);
|
||||
|
|
@ -294,15 +294,6 @@ async function injectLinesOfCode(sarifFile, language, locPromise) {
|
|||
fs.writeFileSync(sarifFile, JSON.stringify(sarif));
|
||||
}
|
||||
}
|
||||
/**
|
||||
* `codeql pack download` command does not support downloading pack specifiers with paths
|
||||
* in them. This removes the path from the pack specifier.
|
||||
* @param packsWithVersion array of pack specifiers, some of which may have paths in them
|
||||
* @returns array of pack specifiers without paths
|
||||
*/
|
||||
function removePackPath(packsWithVersion) {
|
||||
return packsWithVersion.map((pack) => pack.split(":")[0]);
|
||||
}
|
||||
function printLinesOfCodeSummary(logger, language, lineCounts) {
|
||||
if (language in lineCounts) {
|
||||
logger.info(`Counted a baseline of ${lineCounts[language]} lines of code for ${language}.`);
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
1
lib/codeql.js
generated
1
lib/codeql.js
generated
|
|
@ -641,6 +641,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
|||
"pack",
|
||||
"download",
|
||||
"--format=json",
|
||||
"--resolve-query-specs",
|
||||
...getExtraOptionsFromEnv(["pack", "download"]),
|
||||
...packs,
|
||||
];
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue