Extract directly to toolcache when feature enabled

src/setup-codeql.ts

@@ -6,6 +6,7 @@ import { performance } from "perf_hooks";
 import * as toolcache from "@actions/tool-cache";
 import { default as deepEqual } from "fast-deep-equal";
 import * as semver from "semver";
+import { v4 as uuidV4 } from "uuid";
 
 import { isRunningLocalAction } from "./actions-util";
 import * as api from "./api-client";
@@ -13,12 +14,14 @@ import * as defaults from "./defaults.json";
 import {
   CODEQL_VERSION_ZSTD_BUNDLE,
   CodeQLDefaultVersionInfo,
+  Feature,
   FeatureEnablement,
 } from "./feature-flags";
 import { formatDuration, Logger } from "./logging";
 import * as tar from "./tar";
 import {
   downloadAndExtract,
+  getToolcacheDirectory,
   ToolsDownloadStatusReport,
 } from "./tools-download";
 import * as util from "./util";
@@ -534,20 +537,29 @@ export const downloadCodeQL = async function (
     logger.debug("Downloading CodeQL tools without an authorization token.");
   }
 
-  const { extractedBundlePath, statusReport } = await downloadAndExtract(
+  const toolcacheInfo = getToolcacheDestinationInfo(
+    maybeBundleVersion,
+    maybeCliVersion,
+    logger,
+  );
+  const extractToToolcache =
+    !!toolcacheInfo && !!(await features.getValue(Feature.ExtractToToolcache));
+
+  const extractedBundlePath = extractToToolcache
+    ? toolcacheInfo.path
+    : getTempExtractionDir(tempDir);
+
+  const statusReport = await downloadAndExtract(
     codeqlURL,
+    extractedBundlePath,
     authorization,
     { "User-Agent": "CodeQL Action", ...headers },
     tarVersion,
-    tempDir,
     features,
     logger,
   );
 
-  const bundleVersion =
-    maybeBundleVersion ?? tryGetBundleVersionFromUrl(codeqlURL, logger);
-
-  if (bundleVersion === undefined) {
+  if (!toolcacheInfo) {
     logger.debug(
       "Could not cache CodeQL tools because we could not determine the bundle version from the " +
         `URL ${codeqlURL}.`,
@@ -560,16 +572,11 @@ export const downloadCodeQL = async function (
   }
 
   logger.debug("Caching CodeQL bundle.");
-  const toolcacheVersion = getCanonicalToolcacheVersion(
-    maybeCliVersion,
-    bundleVersion,
-    logger,
-  );
   const toolcacheStart = performance.now();
   const toolcachedBundlePath = await toolcache.cacheDir(
     extractedBundlePath,
     "CodeQL",
-    toolcacheVersion,
+    toolcacheInfo.version,
   );
 
   logger.info(
@@ -590,10 +597,31 @@ export const downloadCodeQL = async function (
   return {
     codeqlFolder: toolcachedBundlePath,
     statusReport,
-    toolsVersion: maybeCliVersion ?? toolcacheVersion,
+    toolsVersion: maybeCliVersion ?? toolcacheInfo.version,
   };
 };
 
+function getToolcacheDestinationInfo(
+  maybeBundleVersion: string | undefined,
+  maybeCliVersion: string | undefined,
+  logger: Logger,
+): { path: string; version: string } | undefined {
+  if (maybeBundleVersion) {
+    const version = getCanonicalToolcacheVersion(
+      maybeCliVersion,
+      maybeBundleVersion,
+      logger,
+    );
+
+    return {
+      path: getToolcacheDirectory(version),
+      version,
+    };
+  }
+
+  return undefined;
+}
+
 export function getCodeQLURLVersion(url: string): string {
   const match = url.match(/\/codeql-bundle-(.*)\//);
   if (match === null || match.length < 2) {
@@ -617,7 +645,7 @@ function getCanonicalToolcacheVersion(
   cliVersion: string | undefined,
   bundleVersion: string,
   logger: Logger,
-) {
+): string {
   // If the CLI version is a pre-release or contains build metadata, then cache the
   // bundle as `0.0.0-<bundleVersion>` to avoid the bundle being interpreted as containing a stable
   // CLI release. In principle, it should be enough to just check that the CLI version isn't a
@@ -680,6 +708,7 @@ export async function setupCodeQLBundle(
       );
       codeqlFolder = await tar.extract(
         source.codeqlTarPath,
+        getTempExtractionDir(tempDir),
         compressionMethod,
         zstdAvailability.version,
         logger,
@@ -732,3 +761,7 @@ async function useZstdBundle(
     semver.gte(cliVersion, CODEQL_VERSION_ZSTD_BUNDLE)
   );
 }
+
+function getTempExtractionDir(tempDir: string) {
+  return path.join(tempDir, uuidV4());
+}