diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 02a27b8a2..a8362b779 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -90121,6 +90121,15 @@ var path16 = __toESM(require("path")); var import_perf_hooks2 = require("perf_hooks"); var io5 = __toESM(require_io()); +// src/analyses.ts +var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { + AnalysisKind2["CodeScanning"] = "code-scanning"; + AnalysisKind2["CodeQuality"] = "code-quality"; + return AnalysisKind2; +})(AnalysisKind || {}); +var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); +var codeQualityQueries = ["code-quality"]; + // src/api-client.ts var core5 = __toESM(require_core()); var githubUtils = __toESM(require_utils4()); @@ -90528,14 +90537,6 @@ var fs9 = __toESM(require("fs")); var path10 = __toESM(require("path")); var semver4 = __toESM(require_semver2()); -// src/analyses.ts -var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { - AnalysisKind2["CodeScanning"] = "code-scanning"; - AnalysisKind2["CodeQuality"] = "code-quality"; - return AnalysisKind2; -})(AnalysisKind || {}); -var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); - // src/caching-utils.ts var core6 = __toESM(require_core()); async function getTotalCacheSize(paths, logger, quiet = false) { @@ -93624,8 +93625,8 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, const queries = []; if (isCodeQualityEnabled(config)) { queries.push(getGeneratedSuitePath(config, language)); - for (const qualityQuery of config.augmentationProperties.qualityQueriesInput) { - queries.push(resolveQuerySuiteAlias(language, qualityQuery.uses)); + for (const qualityQuery of codeQualityQueries) { + queries.push(resolveQuerySuiteAlias(language, qualityQuery)); } } logger.startGroup(`Running queries for ${language}`); @@ -93656,8 +93657,8 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag, ); qualityAnalysisSummary = await runInterpretResults( language, - config.augmentationProperties.qualityQueriesInput.map( - (i) => resolveQuerySuiteAlias(language, i.uses) + codeQualityQueries.map( + (i) => resolveQuerySuiteAlias(language, i) ), qualitySarifFile, config.debugMode, diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 2645ea73d..9de1980b1 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -117140,6 +117140,14 @@ var import_archiver = __toESM(require_archiver()); // src/analyze.ts var io5 = __toESM(require_io()); +// src/analyses.ts +var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { + AnalysisKind2["CodeScanning"] = "code-scanning"; + AnalysisKind2["CodeQuality"] = "code-quality"; + return AnalysisKind2; +})(AnalysisKind || {}); +var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); + // src/autobuild.ts var core11 = __toESM(require_core()); @@ -117283,14 +117291,6 @@ var cliErrorsConfig = { // src/config-utils.ts var semver4 = __toESM(require_semver2()); -// src/analyses.ts -var AnalysisKind = /* @__PURE__ */ ((AnalysisKind2) => { - AnalysisKind2["CodeScanning"] = "code-scanning"; - AnalysisKind2["CodeQuality"] = "code-quality"; - return AnalysisKind2; -})(AnalysisKind || {}); -var supportedAnalysisKinds = new Set(Object.values(AnalysisKind)); - // src/caching-utils.ts var core6 = __toESM(require_core()); diff --git a/src/analyses.ts b/src/analyses.ts index 3ef85745f..e80cdfb20 100644 --- a/src/analyses.ts +++ b/src/analyses.ts @@ -38,3 +38,6 @@ export async function parseAnalysisKinds( new Set(components.map((component) => component as AnalysisKind)), ); } + +/** The queries to use for Code Quality analyses. */ +export const codeQualityQueries: string[] = ["code-quality"]; diff --git a/src/analyze.ts b/src/analyze.ts index 2a4242db5..19bfcf028 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -12,6 +12,7 @@ import { getTemporaryDirectory, PullRequestBranches, } from "./actions-util"; +import * as analyses from "./analyses"; import { getApiClient } from "./api-client"; import { setupCppAutobuild } from "./autobuild"; import { type CodeQL } from "./codeql"; @@ -664,9 +665,8 @@ export async function runQueries( const queries: string[] = []; if (configUtils.isCodeQualityEnabled(config)) { queries.push(util.getGeneratedSuitePath(config, language)); - for (const qualityQuery of config.augmentationProperties - .qualityQueriesInput) { - queries.push(resolveQuerySuiteAlias(language, qualityQuery.uses)); + for (const qualityQuery of analyses.codeQualityQueries) { + queries.push(resolveQuerySuiteAlias(language, qualityQuery)); } } @@ -707,8 +707,8 @@ export async function runQueries( ); qualityAnalysisSummary = await runInterpretResults( language, - config.augmentationProperties.qualityQueriesInput.map((i) => - resolveQuerySuiteAlias(language, i.uses), + analyses.codeQualityQueries.map((i) => + resolveQuerySuiteAlias(language, i), ), qualitySarifFile, config.debugMode,