Merge branch 'main' into aeisenberg/fix-config-files

src/codeql.ts

@@ -10,15 +10,19 @@ import { default as queryString } from "query-string";
 import * as semver from "semver";
 import { v4 as uuidV4 } from "uuid";
 
-import { isRunningLocalAction, getRelativeScriptPath } from "./actions-util";
+import { getRelativeScriptPath, isRunningLocalAction } from "./actions-util";
 import * as api from "./api-client";
 import { Config } from "./config-utils";
 import * as defaults from "./defaults.json"; // Referenced from codeql-action-sync-tool!
 import { errorMatchers } from "./error-matcher";
-import { FeatureFlags, FeatureFlag } from "./feature-flags";
+import { FeatureFlag, FeatureFlags } from "./feature-flags";
 import { isTracedLanguage, Language } from "./languages";
 import { Logger } from "./logging";
 import { toolrunnerErrorCatcher } from "./toolrunner-error-catcher";
+import {
+  getTrapCachingExtractorConfigArgs,
+  getTrapCachingExtractorConfigArgsForLang,
+} from "./trap-caching";
 import * as util from "./util";
 import { isGoodVersion } from "./util";
 
@@ -98,7 +102,7 @@ export interface CodeQL {
    * and running the language extractor.
    */
   extractScannedLanguage(
-    database: string,
+    config: Config,
     language: Language,
     featureFlags: FeatureFlags
   ): Promise<void>;
@@ -114,6 +118,10 @@ export interface CodeQL {
    * Run 'codeql resolve languages'.
    */
   resolveLanguages(): Promise<ResolveLanguagesOutput>;
+  /**
+   * Run 'codeql resolve languages' with '--format=betterjson'.
+   */
+  betterResolveLanguages(): Promise<BetterResolveLanguagesOutput>;
   /**
    * Run 'codeql resolve queries'.
    */
@@ -171,6 +179,17 @@ export interface ResolveLanguagesOutput {
   [language: string]: [string];
 }
 
+export interface BetterResolveLanguagesOutput {
+  extractors: {
+    [language: string]: [
+      {
+        extractor_root: string;
+        extractor_options?: any;
+      }
+    ];
+  };
+}
+
 export interface ResolveQueriesOutput {
   byLanguage: {
     [language: string]: {
@@ -250,6 +269,12 @@ export const CODEQL_VERSION_NEW_TRACING = "2.7.0";
  */
 export const CODEQL_VERSION_ML_POWERED_QUERIES_WINDOWS = "2.9.0";
 
+/**
+ * Previous versions had the option already, but were missing the
+ * --extractor-options-verbosity that we need.
+ */
+export const CODEQL_VERSION_BETTER_RESOLVE_LANGUAGES = "2.10.3";
+
 function getCodeQLBundleName(): string {
   let platform: string;
   if (process.platform === "win32") {
@@ -587,6 +612,10 @@ export function setCodeQL(partialCodeql: Partial<CodeQL>): CodeQL {
     ),
     finalizeDatabase: resolveFunction(partialCodeql, "finalizeDatabase"),
     resolveLanguages: resolveFunction(partialCodeql, "resolveLanguages"),
+    betterResolveLanguages: resolveFunction(
+      partialCodeql,
+      "betterResolveLanguages"
+    ),
     resolveQueries: resolveFunction(partialCodeql, "resolveQueries"),
     packDownload: resolveFunction(partialCodeql, "packDownload"),
     databaseCleanup: resolveFunction(partialCodeql, "databaseCleanup"),
@@ -732,6 +761,7 @@ async function getCodeQLForCmd(
       );
       if (config.languages.filter(isTracedLanguage).length > 0) {
         extraArgs.push("--begin-tracing");
+        extraArgs.push(...(await getTrapCachingExtractorConfigArgs(config)));
         if (processName !== undefined) {
           extraArgs.push(`--trace-process-name=${processName}`);
         } else {
@@ -805,10 +835,11 @@ async function getCodeQLForCmd(
       await runTool(autobuildCmd);
     },
     async extractScannedLanguage(
-      databasePath: string,
+      config: Config,
       language: Language,
       featureFlags: FeatureFlags
     ) {
+      const databasePath = util.getCodeQLDatabasePath(config, language);
       // Get extractor location
       let extractorPath = "";
       await new toolrunner.ToolRunner(
@@ -858,6 +889,7 @@ async function getCodeQLForCmd(
           "database",
           "trace-command",
           ...extraArgs,
+          ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
           ...getExtraOptionsFromEnv(["database", "trace-command"]),
           databasePath,
           "--",
@@ -900,6 +932,24 @@ async function getCodeQLForCmd(
         );
       }
     },
+    async betterResolveLanguages() {
+      const codeqlArgs = [
+        "resolve",
+        "languages",
+        "--format=betterjson",
+        "--extractor-options-verbosity=4",
+        ...getExtraOptionsFromEnv(["resolve", "languages"]),
+      ];
+      const output = await runTool(cmd, codeqlArgs);
+
+      try {
+        return JSON.parse(output);
+      } catch (e) {
+        throw new Error(
+          `Unexpected output from codeql resolve languages with --format=betterjson: ${e}`
+        );
+      }
+    },
     async resolveQueries(
       queries: string[],
       extraSearchPath: string | undefined