Change getGeneratedCodeScanningConfigPath to not require full Config

This commit is contained in:
Michael B. Gale
2026-10-12 10:16:00 +01:00
parent f2e590e24a
commit d509c62268
2 changed files with 14 additions and 10 deletions

12
lib/entry-points.js generated
View File

@@ -177252,7 +177252,7 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
"--print-metrics-summary",
"--sarif-add-baseline-file-info",
`--sarif-codescanning-config=${getGeneratedCodeScanningConfigPath(
config
config.tempDir
)}`,
"--sarif-group-rules-by-pack",
"--sarif-include-query-help=always",
@@ -177341,7 +177341,7 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
"--format=sarif-latest",
`--output=${sarifFile}`,
`--sarif-codescanning-config=${getGeneratedCodeScanningConfigPath(
config
config.tempDir
)}`,
...diagnosticDir !== void 0 ? [`--diagnostic-dir=${diagnosticDir}`] : [],
...getExtraOptionsFromEnv(["diagnostics", "export"])
@@ -177500,7 +177500,9 @@ async function runCliJson(cmd, args = [], opts = {}) {
}
}
async function writeCodeScanningConfigFile(config, logger2) {
const codeScanningConfigFile = getGeneratedCodeScanningConfigPath(config);
const codeScanningConfigFile = getGeneratedCodeScanningConfigPath(
config.tempDir
);
const augmentedConfig = appendExtraQueryExclusions(
config.extraQueryExclusions,
config.computedConfig
@@ -177533,8 +177535,8 @@ async function getTrapCachingExtractorConfigArgsForLang(config, language) {
`-O=${language}.trap.cache.write=${write}`
];
}
function getGeneratedCodeScanningConfigPath(config) {
return path15.resolve(config.tempDir, "user-config.yaml");
function getGeneratedCodeScanningConfigPath(tempDir) {
return path15.resolve(tempDir, "user-config.yaml");
}
function getExtractionVerbosityArguments(enableDebugLogging) {
return enableDebugLogging ? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`] : [];

View File

@@ -817,7 +817,7 @@ async function getCodeQLForCmd(
"--print-metrics-summary",
"--sarif-add-baseline-file-info",
`--sarif-codescanning-config=${getGeneratedCodeScanningConfigPath(
config,
config.tempDir,
)}`,
"--sarif-group-rules-by-pack",
"--sarif-include-query-help=always",
@@ -928,7 +928,7 @@ async function getCodeQLForCmd(
"--format=sarif-latest",
`--output=${sarifFile}`,
`--sarif-codescanning-config=${getGeneratedCodeScanningConfigPath(
config,
config.tempDir,
)}`,
...(diagnosticDir !== undefined
? [`--diagnostic-dir=${diagnosticDir}`]
@@ -1191,7 +1191,9 @@ async function writeCodeScanningConfigFile(
config: Config,
logger: Logger,
): Promise<string> {
const codeScanningConfigFile = getGeneratedCodeScanningConfigPath(config);
const codeScanningConfigFile = getGeneratedCodeScanningConfigPath(
config.tempDir,
);
// Apply the `extraQueryExclusions` from the CodeQL Action state to the CLI configuration.
// We do this here at the latest possible point before passing the CLI configuration on to
@@ -1247,8 +1249,8 @@ export async function getTrapCachingExtractorConfigArgsForLang(
*
* This will not exist if the configuration is being parsed in the Action.
*/
function getGeneratedCodeScanningConfigPath(config: Config): string {
return path.resolve(config.tempDir, "user-config.yaml");
function getGeneratedCodeScanningConfigPath(tempDir: string): string {
return path.resolve(tempDir, "user-config.yaml");
}
function getExtractionVerbosityArguments(