robojerk/codeql-action

Ensure queries[language] objects are initialized

Browse source
This commit is contained in:
Arthur Baars 2021-05-20 18:18:55 +00:00
parent 8fa2ef886e
commit ec011ddfdb
3 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/config-utils.js generated
View file

@ -394,6 +394,14 @@ function shouldAddConfigFileQueries(queriesInput) {
async function getDefaultConfig(languagesInput, queriesInput, dbLocation, repository, tempDir, toolCacheDir, codeQL, checkoutPath, gitHubVersion, apiDetails, logger) { async function getDefaultConfig(languagesInput, queriesInput, dbLocation, repository, tempDir, toolCacheDir, codeQL, checkoutPath, gitHubVersion, apiDetails, logger) {
const languages = await getLanguages(languagesInput, repository, apiDetails, logger); const languages = await getLanguages(languagesInput, repository, apiDetails, logger);
const queries = {}; const queries = {};
for (const language of languages) {
if (queries[language] === undefined) {
queries[language] = {
builtin: [],
custom: [],
};
}
}
await addDefaultQueries(codeQL, languages, queries); await addDefaultQueries(codeQL, languages, queries);
if (queriesInput) { if (queriesInput) {
await addQueriesFromWorkflow(codeQL, queriesInput, languages, queries, tempDir, checkoutPath, apiDetails, logger); await addQueriesFromWorkflow(codeQL, queriesInput, languages, queries, tempDir, checkoutPath, apiDetails, logger);
@ -437,6 +445,14 @@ async function loadConfig(languagesInput, queriesInput, configFile, dbLocation,
} }
const languages = await getLanguages(languagesInput, repository, apiDetails, logger); const languages = await getLanguages(languagesInput, repository, apiDetails, logger);
const queries = {}; const queries = {};
for (const language of languages) {
if (queries[language] === undefined) {
queries[language] = {
builtin: [],
custom: [],
};
}
}
const pathsIgnore = []; const pathsIgnore = [];
const paths = []; const paths = [];
let disableDefaultQueries = false; let disableDefaultQueries = false;

2
lib/config-utils.js.map
View file

File diff suppressed because one or more lines are too long

16
src/config-utils.ts
View file

@ -760,6 +760,14 @@ export async function getDefaultConfig(
logger logger
); );
const queries: Queries = {}; const queries: Queries = {};
for (const language of languages) {
if (queries[language] === undefined) {
queries[language] = {
builtin: [],
custom: [],
};
}
}
await addDefaultQueries(codeQL, languages, queries); await addDefaultQueries(codeQL, languages, queries);
if (queriesInput) { if (queriesInput) {
await addQueriesFromWorkflow( await addQueriesFromWorkflow(
@ -834,6 +842,14 @@ async function loadConfig(
); );
const queries: Queries = {}; const queries: Queries = {};
for (const language of languages) {
if (queries[language] === undefined) {
queries[language] = {
builtin: [],
custom: [],
};
}
}
const pathsIgnore: string[] = []; const pathsIgnore: string[] = [];
const paths: string[] = []; const paths: string[] = [];