Skip to content

Commit 8e9463f

Browse files
committed
Extract getGeneratedSuitePath()
1 parent 82cac09 commit 8e9463f

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/analyze.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -660,14 +660,7 @@ export async function runQueries(
660660

661661
const queries: string[] = [];
662662
if (config.augmentationProperties.qualityQueriesInput !== undefined) {
663-
queries.push(
664-
path.join(
665-
util.getCodeQLDatabasePath(config, language),
666-
"temp",
667-
"config-queries.qls",
668-
),
669-
);
670-
663+
queries.push(util.getGeneratedSuitePath(config, language));
671664
for (const qualityQuery of config.augmentationProperties
672665
.qualityQueriesInput) {
673666
queries.push(resolveQuerySuiteAlias(language, qualityQuery.uses));

src/init.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,7 @@ export async function checkPacksForOverlayCompatibility(
113113
}
114114

115115
for (const language of config.languages) {
116-
const suitePath = path.join(
117-
config.dbLocation,
118-
language,
119-
"temp",
120-
"config-queries.qls",
121-
);
116+
const suitePath = util.getGeneratedSuitePath(config, language);
122117
const packDirs = await codeql.resolveQueriesStartingPacks([suitePath]);
123118
if (
124119
packDirs.some(

src/util.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,18 @@ export function getCodeQLDatabasePath(config: Config, language: Language) {
513513
return path.resolve(config.dbLocation, language);
514514
}
515515

516+
/**
517+
* Get the path where the generated query suite for the given language lives.
518+
*/
519+
export function getGeneratedSuitePath(config: Config, language: Language) {
520+
return path.resolve(
521+
config.dbLocation,
522+
language,
523+
"temp",
524+
"config-queries.qls",
525+
);
526+
}
527+
516528
/**
517529
* Parses user input of a github.com or GHES URL to a canonical form.
518530
* Removes any API prefix or suffix if one is present.

0 commit comments

Comments
 (0)