robojerk/codeql-action

fix when there are additional suites and custom queries

Browse source
This commit is contained in:
Robert Brignull 2020-06-01 13:56:27 +01:00
parent d7a2025f2d
commit 655c4497ce
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/finalize-db.js generated
View file

@ -86,6 +86,10 @@ async function runResolveQueries(codeqlCmd, queries) {
}
async function resolveQueryLanguages(codeqlCmd, config) {
let res = new Map();
const languages = await util.getLanguages();
for (const language of languages) {
res[language] = [];
}
if (config.additionalSuites.length !== 0) {
const suites = [];
for (const language of await util.getLanguages()) {
@ -95,13 +99,13 @@ async function resolveQueryLanguages(codeqlCmd, config) {
}
const resolveQueriesOutputObject = await runResolveQueries(codeqlCmd, suites);
for (const [language, queries] of Object.entries(resolveQueriesOutputObject.byLanguage)) {
res[language] = Object.keys(queries);
res[language].push(...Object.keys(queries));
}
}
if (config.additionalQueries.length !== 0) {
const resolveQueriesOutputObject = await runResolveQueries(codeqlCmd, config.additionalQueries);
for (const [language, queries] of Object.entries(resolveQueriesOutputObject.byLanguage)) {
res[language] = Object.keys(queries);
res[language].push(...Object.keys(queries));
}
const noDeclaredLanguage = resolveQueriesOutputObject.noDeclaredLanguage;
const noDeclaredLanguageQueries = Object.keys(noDeclaredLanguage);

2
lib/finalize-db.js.map
View file

File diff suppressed because one or more lines are too long

9
src/finalize-db.ts
View file

@ -108,6 +108,11 @@ async function runResolveQueries(codeqlCmd: string, queries: string[]): Promise<
async function resolveQueryLanguages(codeqlCmd: string, config: configUtils.Config): Promise<Map<string, string[]>> {
let res = new Map();
const languages = await util.getLanguages();
for (const language of languages) {
res[language] = [];
}
if (config.additionalSuites.length !== 0) {
const suites: string[] = [];
for (const language of await util.getLanguages()) {
@ -119,7 +124,7 @@ async function resolveQueryLanguages(codeqlCmd: string, config: configUtils.Conf
const resolveQueriesOutputObject = await runResolveQueries(codeqlCmd, suites);
for (const [language, queries] of Object.entries(resolveQueriesOutputObject.byLanguage)) {
res[language] = Object.keys(<any>queries);
res[language].push(...Object.keys(<any>queries));
}
}
@ -127,7 +132,7 @@ async function resolveQueryLanguages(codeqlCmd: string, config: configUtils.Conf
const resolveQueriesOutputObject = await runResolveQueries(codeqlCmd, config.additionalQueries);
for (const [language, queries] of Object.entries(resolveQueriesOutputObject.byLanguage)) {
res[language] = Object.keys(<any>queries);
res[language].push(...Object.keys(<any>queries));
}
const noDeclaredLanguage = resolveQueriesOutputObject.noDeclaredLanguage;