Merge branch 'main' into henrymercer/controlled-switchover

src/actions-util.ts

@@ -88,9 +88,10 @@ export const getCommitOid = async function (
     return commitOid.trim();
   } catch (e) {
     core.info(
-      `Failed to call git to get current commit. Continuing with data from environment or input: ${e}`
+      "Could not determine current commit SHA using git. Continuing with data from user input or environment."
     );
-    core.info((e as Error).stack || "NO STACK");
+    core.debug(`Reason: ${(e as Error).message}`);
+    core.debug((e as Error).stack || "NO STACK");
     return getOptionalInput("sha") || getRequiredEnvParam("GITHUB_SHA");
   }
 };

src/analyze.ts

@@ -222,16 +222,6 @@ export async function runQueries(
     );
     const packsWithVersion = config.packs[language] || [];
 
-    const hasBuiltinQueries = queries?.builtin.length > 0;
-    const hasCustomQueries = queries?.custom.length > 0;
-    const hasPackWithCustomQueries = packsWithVersion.length > 0;
-
-    if (!hasBuiltinQueries && !hasCustomQueries && !hasPackWithCustomQueries) {
-      throw new Error(
-        `Unable to analyze ${language} as no queries were selected for this language`
-      );
-    }
-
     try {
       if (await util.useCodeScanningConfigInCli(codeql, featureEnablement)) {
         // If we are using the code scanning config in the CLI,
@@ -262,6 +252,21 @@ export async function runQueries(
         logger.info(analysisSummary);
       } else {
         // config was generated by the action, so must be interpreted by the action.
+
+        const hasBuiltinQueries = queries?.builtin.length > 0;
+        const hasCustomQueries = queries?.custom.length > 0;
+        const hasPackWithCustomQueries = packsWithVersion.length > 0;
+
+        if (
+          !hasBuiltinQueries &&
+          !hasCustomQueries &&
+          !hasPackWithCustomQueries
+        ) {
+          throw new Error(
+            `Unable to analyze ${language} as no queries were selected for this language`
+          );
+        }
+
         logger.startGroup(`Running queries for ${language}`);
         const querySuitePaths: string[] = [];
         if (queries["builtin"].length > 0) {

src/api-compatibility.json

@@ -1 +1 @@
-{"maximumVersion": "3.8", "minimumVersion": "3.3"}
+{"maximumVersion": "3.8", "minimumVersion": "3.4"}

src/codeql.ts

@@ -544,7 +544,8 @@ export async function getCodeQLForCmd(
       config: Config,
       sourceRoot: string,
       processName: string | undefined,
-      featureEnablement: FeatureEnablement
+      featureEnablement: FeatureEnablement,
+      logger: Logger
     ) {
       const extraArgs = config.languages.map(
         (language) => `--language=${language}`
@@ -577,7 +578,8 @@ export async function getCodeQLForCmd(
       const configLocation = await generateCodeScanningConfig(
         codeql,
         config,
-        featureEnablement
+        featureEnablement,
+        logger
       );
       // Only pass external repository token if a config file is going to be parsed by the CLI.
       let externalRepositoryToken: string | undefined;
@@ -1075,7 +1077,8 @@ async function runTool(
 async function generateCodeScanningConfig(
   codeql: CodeQL,
   config: Config,
-  featureEnablement: FeatureEnablement
+  featureEnablement: FeatureEnablement,
+  logger: Logger
 ): Promise<string | undefined> {
   if (!(await util.useCodeScanningConfigInCli(codeql, featureEnablement))) {
     return;
@@ -1137,6 +1140,10 @@ async function generateCodeScanningConfig(
       augmentedConfig.packs["javascript"].push(packString);
     }
   }
+  logger.info(`Writing augmented user configuration file to ${configLocation}`);
+  logger.startGroup("Augmented user configuration file contents");
+  logger.info(yaml.dump(augmentedConfig));
+  logger.endGroup();
 
   fs.writeFileSync(configLocation, yaml.dump(augmentedConfig));
   return configLocation;