Refactor check whether CQ is enabled

This will make it easier to replace in the future

Author: mbg

lib/analyze-action.js

@@ -18,7 +18,7 @@ import { getApiDetails, getGitHubVersion } from "./api-client";
 import { runAutobuild } from "./autobuild";
 import { getTotalCacheSize, shouldStoreCache } from "./caching-utils";
 import { getCodeQL } from "./codeql";
-import { Config, getConfig } from "./config-utils";
+import { Config, getConfig, isCodeQualityEnabled } from "./config-utils";
 import { uploadDatabases } from "./database-upload";
 import { uploadDependencyCaches } from "./dependency-caching";
 import { getDiffInformedAnalysisBranches } from "./diff-informed-analysis-utils";
@@ -336,7 +336,7 @@ async function run() {
       );
       core.setOutput("sarif-id", uploadResult.sarifID);
 
-      if (config.augmentationProperties.qualityQueriesInput !== undefined) {
+      if (isCodeQualityEnabled(config)) {
         const qualityUploadResult = await uploadLib.uploadFiles(
           outputDir,
           actionsUtil.getRequiredInput("checkout_path"),

lib/analyze-action.js.map

@@ -662,7 +662,7 @@ export async function runQueries(
       const sarifFile = path.join(sarifFolder, `${language}.sarif`);
 
       const queries: string[] = [];
-      if (config.augmentationProperties.qualityQueriesInput !== undefined) {
+      if (configUtils.isCodeQualityEnabled(config)) {
         queries.push(util.getGeneratedSuitePath(config, language));
         for (const qualityQuery of config.augmentationProperties
           .qualityQueriesInput) {
@@ -695,7 +695,7 @@ export async function runQueries(
       );
 
       let qualityAnalysisSummary: string | undefined;
-      if (config.augmentationProperties.qualityQueriesInput !== undefined) {
+      if (configUtils.isCodeQualityEnabled(config)) {
         logger.info(`Interpreting quality results for ${language}`);
         const qualityCategory = fixCodeQualityCategory(
           logger,

lib/analyze.js

@@ -1468,3 +1468,12 @@ export function generateCodeScanningConfig(
   }
   return augmentedConfig;
 }
+
+/**
+ * Returns `true` if Code Quality analysis is enabled, or `false` if not.
+ */
+export function isCodeQualityEnabled(config: Config): config is Config & {
+  augmentationProperties: { qualityQueriesInput: string };
+} {
+  return config.augmentationProperties.qualityQueriesInput !== undefined;
+}