Add and use helpers for determining analysis config the DB is initialised with

This commit is contained in:
Michael B. Gale
2025-09-01 14:10:25 +01:00
parent 50b1a4a0cc
commit 559940386d
3 changed files with 76 additions and 11 deletions

25
lib/analyze-action.js generated
View File

@@ -94205,6 +94205,12 @@ function isCodeScanningEnabled(config) {
function isCodeQualityEnabled(config) {
return config.analysisKinds.includes("code-quality" /* CodeQuality */);
}
function getDbAnalysisKind(config) {
return isCodeScanningEnabled(config) ? "code-scanning" /* CodeScanning */ : "code-quality" /* CodeQuality */;
}
function getDbAnalysisConfig(config) {
return getDbAnalysisKind(config) === "code-scanning" /* CodeScanning */ ? CodeScanning : CodeQuality;
}
// src/setup-codeql.ts
var fs9 = __toESM(require("fs"));
@@ -96161,6 +96167,9 @@ function resolveQuerySuiteAlias(language, maybeSuite) {
}
return maybeSuite;
}
function addSarifExtension(analysis, base) {
return `${base}.${analysis.sarifExtension}`;
}
async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, diffRangePackDir, automationDetailsId, codeql, config, logger, features) {
const statusReport = {};
const queryFlags = [memoryFlag, threadsFlag];
@@ -96180,9 +96189,13 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
incrementalMode.push("overlay");
}
const sarifRunPropertyFlag = incrementalMode.length > 0 ? `--sarif-run-property=incrementalMode=${incrementalMode.join(",")}` : void 0;
const dbAnalysisConfig = getDbAnalysisConfig(config);
for (const language of config.languages) {
try {
const sarifFile = isCodeScanningEnabled(config) ? path12.join(sarifFolder, `${language}.sarif`) : path12.join(sarifFolder, `${language}.quality.sarif`);
const sarifFile = path12.join(
sarifFolder,
addSarifExtension(dbAnalysisConfig, language)
);
const queries = [];
if (isCodeQualityEnabled(config) && isCodeScanningEnabled(config)) {
queries.push(getGeneratedSuitePath(config, language));
@@ -96199,7 +96212,9 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
const startTimeInterpretResults = /* @__PURE__ */ new Date();
let analysisSummary;
if (isCodeScanningEnabled(config) || isCodeQualityEnabled(config)) {
logger.startGroup(`Interpreting results for ${language}`);
logger.startGroup(
`Interpreting ${dbAnalysisConfig.name} results for ${language}`
);
let category = automationDetailsId;
if (isCodeQualityEnabled(config)) {
category = fixCodeQualityCategory(logger, automationDetailsId);
@@ -96214,14 +96229,16 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
}
let qualityAnalysisSummary;
if (isCodeQualityEnabled(config) && isCodeScanningEnabled(config)) {
logger.info(`Interpreting quality results for ${language}`);
logger.info(
`Interpreting ${CodeQuality.name} results for ${language}`
);
const qualityCategory = fixCodeQualityCategory(
logger,
automationDetailsId
);
const qualitySarifFile = path12.join(
sarifFolder,
`${language}.quality.sarif`
addSarifExtension(CodeQuality, language)
);
qualityAnalysisSummary = await runInterpretResults(
language,