Fix a couple of naming nits
This commit is contained in:
parent
84e5134df9
commit
acbc6ca6e5
6 changed files with 14 additions and 14 deletions
2
lib/analyze.js
generated
2
lib/analyze.js
generated
|
|
@ -137,7 +137,7 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
|
if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
|
||||||
// If we are using the codescanning config in the CLI,
|
// If we are using the code scanning config in the CLI,
|
||||||
// much of the work needed to generate the query suites
|
// much of the work needed to generate the query suites
|
||||||
// is done in the CLI. We just need to make a single
|
// is done in the CLI. We just need to make a single
|
||||||
// call to run all the queries for each language and
|
// call to run all the queries for each language and
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
10
lib/codeql.js
generated
10
lib/codeql.js
generated
|
|
@ -515,7 +515,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// We default to 3 if no other arguments are provided since this was the default
|
// We default to 3 if no other arguments are provided since this was the default
|
||||||
// behaviour of the Runner. Note this path never happens in the CodeQL Action
|
// behavior of the Runner. Note this path never happens in the CodeQL Action
|
||||||
// because that always passes in a process name.
|
// because that always passes in a process name.
|
||||||
extraArgs.push(`--trace-process-level=${processLevel || 3}`);
|
extraArgs.push(`--trace-process-level=${processLevel || 3}`);
|
||||||
}
|
}
|
||||||
|
|
@ -531,7 +531,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||||
extraArgs.push("--no-internal-use-lua-tracing");
|
extraArgs.push("--no-internal-use-lua-tracing");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const configLocation = await generateCodescanningConfig(codeql, config, featureEnablement);
|
const configLocation = await generateCodeScanningConfig(codeql, config, featureEnablement);
|
||||||
if (configLocation) {
|
if (configLocation) {
|
||||||
extraArgs.push(`--codescanning-config=${configLocation}`);
|
extraArgs.push(`--codescanning-config=${configLocation}`);
|
||||||
}
|
}
|
||||||
|
|
@ -794,8 +794,8 @@ async function getCodeQLForCmd(cmd, checkVersion) {
|
||||||
await new toolrunner.ToolRunner(cmd, args).exec();
|
await new toolrunner.ToolRunner(cmd, args).exec();
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
// To ensure that status reports include the CodeQL CLI version whereever
|
// To ensure that status reports include the CodeQL CLI version wherever
|
||||||
// possbile, we want to call getVersion(), which populates the version value
|
// possible, we want to call getVersion(), which populates the version value
|
||||||
// used by status reporting, at the earliest opportunity. But invoking
|
// used by status reporting, at the earliest opportunity. But invoking
|
||||||
// getVersion() directly here breaks tests that only pretend to create a
|
// getVersion() directly here breaks tests that only pretend to create a
|
||||||
// CodeQL object. So instead we rely on the assumption that all non-test
|
// CodeQL object. So instead we rely on the assumption that all non-test
|
||||||
|
|
@ -889,7 +889,7 @@ async function runTool(cmd, args = []) {
|
||||||
* @param config The configuration to use.
|
* @param config The configuration to use.
|
||||||
* @returns the path to the generated user configuration file.
|
* @returns the path to the generated user configuration file.
|
||||||
*/
|
*/
|
||||||
async function generateCodescanningConfig(codeql, config, featureEnablement) {
|
async function generateCodeScanningConfig(codeql, config, featureEnablement) {
|
||||||
var _a;
|
var _a;
|
||||||
if (!(await util.useCodeScanningConfigInCli(codeql, featureEnablement))) {
|
if (!(await util.useCodeScanningConfigInCli(codeql, featureEnablement))) {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -235,7 +235,7 @@ export async function runQueries(
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
|
if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
|
||||||
// If we are using the codescanning config in the CLI,
|
// If we are using the code scanning config in the CLI,
|
||||||
// much of the work needed to generate the query suites
|
// much of the work needed to generate the query suites
|
||||||
// is done in the CLI. We just need to make a single
|
// is done in the CLI. We just need to make a single
|
||||||
// call to run all the queries for each language and
|
// call to run all the queries for each language and
|
||||||
|
|
|
||||||
|
|
@ -821,7 +821,7 @@ async function getCodeQLForCmd(
|
||||||
extraArgs.push(`--trace-process-name=${processName}`);
|
extraArgs.push(`--trace-process-name=${processName}`);
|
||||||
} else {
|
} else {
|
||||||
// We default to 3 if no other arguments are provided since this was the default
|
// We default to 3 if no other arguments are provided since this was the default
|
||||||
// behaviour of the Runner. Note this path never happens in the CodeQL Action
|
// behavior of the Runner. Note this path never happens in the CodeQL Action
|
||||||
// because that always passes in a process name.
|
// because that always passes in a process name.
|
||||||
extraArgs.push(`--trace-process-level=${processLevel || 3}`);
|
extraArgs.push(`--trace-process-level=${processLevel || 3}`);
|
||||||
}
|
}
|
||||||
|
|
@ -849,7 +849,7 @@ async function getCodeQLForCmd(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const configLocation = await generateCodescanningConfig(
|
const configLocation = await generateCodeScanningConfig(
|
||||||
codeql,
|
codeql,
|
||||||
config,
|
config,
|
||||||
featureEnablement
|
featureEnablement
|
||||||
|
|
@ -1186,8 +1186,8 @@ async function getCodeQLForCmd(
|
||||||
await new toolrunner.ToolRunner(cmd, args).exec();
|
await new toolrunner.ToolRunner(cmd, args).exec();
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
// To ensure that status reports include the CodeQL CLI version whereever
|
// To ensure that status reports include the CodeQL CLI version wherever
|
||||||
// possbile, we want to call getVersion(), which populates the version value
|
// possible, we want to call getVersion(), which populates the version value
|
||||||
// used by status reporting, at the earliest opportunity. But invoking
|
// used by status reporting, at the earliest opportunity. But invoking
|
||||||
// getVersion() directly here breaks tests that only pretend to create a
|
// getVersion() directly here breaks tests that only pretend to create a
|
||||||
// CodeQL object. So instead we rely on the assumption that all non-test
|
// CodeQL object. So instead we rely on the assumption that all non-test
|
||||||
|
|
@ -1303,7 +1303,7 @@ async function runTool(cmd: string, args: string[] = []) {
|
||||||
* @param config The configuration to use.
|
* @param config The configuration to use.
|
||||||
* @returns the path to the generated user configuration file.
|
* @returns the path to the generated user configuration file.
|
||||||
*/
|
*/
|
||||||
async function generateCodescanningConfig(
|
async function generateCodeScanningConfig(
|
||||||
codeql: CodeQL,
|
codeql: CodeQL,
|
||||||
config: Config,
|
config: Config,
|
||||||
featureEnablement: FeatureEnablement
|
featureEnablement: FeatureEnablement
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue