From 7b093a605fe81eb902b4f4634fdc4301acdfc0bb Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Thu, 28 Aug 2025 17:17:59 +0100
Subject: [PATCH] Use hard-coded list of quality queries, rather than
 `quality-queries` input

---
 lib/analyze-action.js           |  9 +++++----
 lib/upload-sarif-action-post.js | 16 ++++++++--------
 src/analyses.ts                 |  3 +++
 src/analyze.ts                  | 10 +++++-----
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index c3d0f7ab3..7252eb29b 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -92678,6 +92678,7 @@ var CodeQuality = {
   sarifPredicate: (name) => name.endsWith(".quality.sarif"),
   sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_"
 };
+var codeQualityQueries = ["code-quality"];
 
 // src/analyze.ts
 var fs12 = __toESM(require("fs"));
@@ -96184,8 +96185,8 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
       const queries = [];
       if (isCodeQualityEnabled(config) && isCodeScanningEnabled(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}`);
@@ -96223,8 +96224,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 9e9487afc..22038904f 100644
--- a/lib/upload-sarif-action-post.js
+++ b/lib/upload-sarif-action-post.js
@@ -125416,6 +125416,14 @@ var import_del3 = __toESM(require_del());
 var io5 = __toESM(require_io());
 var import_del2 = __toESM(require_del());
 
+// 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 core10 = __toESM(require_core());
 
@@ -125559,14 +125567,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 core5 = __toESM(require_core());
 
diff --git a/src/analyses.ts b/src/analyses.ts
index e1dd1caec..821496106 100644
--- a/src/analyses.ts
+++ b/src/analyses.ts
@@ -78,3 +78,6 @@ export const CodeQuality: AnalysisConfig = {
   sarifPredicate: (name) => name.endsWith(".quality.sarif"),
   sentinelPrefix: "CODEQL_UPLOAD_QUALITY_SARIF_",
 };
+
+/** 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 ed08c3f95..906ee4999 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";
@@ -679,9 +680,8 @@ export async function runQueries(
         configUtils.isCodeScanningEnabled(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));
         }
       }
 
@@ -747,8 +747,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,