diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 660d2a794..709a1546f 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -91623,11 +91623,11 @@ function isCodeScanningEnabled(config) { function isCodeQualityEnabled(config) { return config.analysisKinds.includes("code-quality" /* CodeQuality */); } -function getDbAnalysisKind(config) { +function getPrimaryAnalysisKind(config) { return isCodeScanningEnabled(config) ? "code-scanning" /* CodeScanning */ : "code-quality" /* CodeQuality */; } -function getDbAnalysisConfig(config) { - return getDbAnalysisKind(config) === "code-scanning" /* CodeScanning */ ? CodeScanning : CodeQuality; +function getPrimaryAnalysisConfig(config) { + return getPrimaryAnalysisKind(config) === "code-scanning" /* CodeScanning */ ? CodeScanning : CodeQuality; } // src/setup-codeql.ts @@ -93607,7 +93607,7 @@ 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); + const dbAnalysisConfig = getPrimaryAnalysisConfig(config); for (const language of config.languages) { try { const queries = []; diff --git a/src/analyze.ts b/src/analyze.ts index 3c82845b0..153b00a1f 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -660,7 +660,7 @@ export async function runQueries( ? `--sarif-run-property=incrementalMode=${incrementalMode.join(",")}` : undefined; - const dbAnalysisConfig = configUtils.getDbAnalysisConfig(config); + const dbAnalysisConfig = configUtils.getPrimaryAnalysisConfig(config); for (const language of config.languages) { try { diff --git a/src/config-utils.ts b/src/config-utils.ts index 1041ad514..626cd4b49 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -1564,26 +1564,26 @@ export function isCodeQualityEnabled(config: Config): boolean { } /** - * Returns the analysis kind for which the database is initialised. This is + * Returns the primary analysis kind that the Action is initialised with. This is * always `AnalysisKind.CodeScanning` unless `AnalysisKind.CodeScanning` is not enabled. * * @returns Returns `AnalysisKind.CodeScanning` if `AnalysisKind.CodeScanning` is enabled; * otherwise `AnalysisKind.CodeQuality`. */ -export function getDbAnalysisKind(config: Config): AnalysisKind { +export function getPrimaryAnalysisKind(config: Config): AnalysisKind { return isCodeScanningEnabled(config) ? AnalysisKind.CodeScanning : AnalysisKind.CodeQuality; } /** - * Returns the analysis configuration for which the database is initialised. This is + * Returns the primary analysis configuration that the Action is initialised with. This is * always `CodeScanning` unless `CodeScanning` is not enabled. * * @returns Returns `CodeScanning` if `AnalysisKind.CodeScanning` is enabled; otherwise `CodeQuality`. */ -export function getDbAnalysisConfig(config: Config): AnalysisConfig { - return getDbAnalysisKind(config) === AnalysisKind.CodeScanning +export function getPrimaryAnalysisConfig(config: Config): AnalysisConfig { + return getPrimaryAnalysisKind(config) === AnalysisKind.CodeScanning ? CodeScanning : CodeQuality; }