Inline runInit()

This commit inlines runInit(), so that it is easier to repeat the
runDatabaseInitCluster() call when needed.

Author: cklin

src/init-action.ts

@@ -38,7 +38,7 @@ import {
   cleanupDatabaseClusterDirectory,
   initCodeQL,
   initConfig,
-  runInit,
+  runDatabaseInitCluster,
 } from "./init";
 import { Language } from "./languages";
 import { getActionsLogger, Logger } from "./logging";
@@ -59,6 +59,7 @@ import {
 import { ZstdAvailability } from "./tar";
 import { ToolsDownloadStatusReport } from "./tools-download";
 import { ToolsFeature } from "./tools-features";
+import { getCombinedTracerConfig } from "./tracer-config";
 import {
   checkDiskUsage,
   checkForTimeout,
@@ -711,15 +712,28 @@ async function run() {
       }
     }
 
-    const tracerConfig = await runInit(
+    const { registriesAuthTokens, qlconfigFile } =
+      await configUtils.generateRegistries(
+        getOptionalInput("registries"),
+        config.tempDir,
+        logger,
+      );
+    const databaseInitEnvironment = {
+      GITHUB_TOKEN: apiDetails.auth,
+      CODEQL_REGISTRIES_AUTH: registriesAuthTokens,
+    };
+
+    await runDatabaseInitCluster(
+      databaseInitEnvironment,
       codeql,
       config,
       sourceRoot,
       "Runner.Worker.exe",
-      getOptionalInput("registries"),
-      apiDetails,
+      qlconfigFile,
       logger,
     );
+
+    const tracerConfig = await getCombinedTracerConfig(codeql, config);
     if (tracerConfig !== undefined) {
       for (const [key, value] of Object.entries(tracerConfig.env)) {
         core.exportVariable(key, value);

src/init.ts

@@ -6,7 +6,7 @@ import * as io from "@actions/io";
 import * as yaml from "js-yaml";
 
 import { getOptionalInput, isSelfHostedRunner } from "./actions-util";
-import { GitHubApiCombinedDetails, GitHubApiDetails } from "./api-client";
+import { GitHubApiDetails } from "./api-client";
 import { CodeQL, setupCodeQL } from "./codeql";
 import * as configUtils from "./config-utils";
 import { CodeQLDefaultVersionInfo, FeatureEnablement } from "./feature-flags";
@@ -15,7 +15,6 @@ import { Logger, withGroupAsync } from "./logging";
 import { ToolsSource } from "./setup-codeql";
 import { ZstdAvailability } from "./tar";
 import { ToolsDownloadStatusReport } from "./tools-download";
-import { TracerConfig, getCombinedTracerConfig } from "./tracer-config";
 import * as util from "./util";
 
 export async function initCodeQL(
@@ -69,37 +68,6 @@ export async function initConfig(
   });
 }
 
-export async function runInit(
-  codeql: CodeQL,
-  config: configUtils.Config,
-  sourceRoot: string,
-  processName: string | undefined,
-  registriesInput: string | undefined,
-  apiDetails: GitHubApiCombinedDetails,
-  logger: Logger,
-): Promise<TracerConfig | undefined> {
-  const { registriesAuthTokens, qlconfigFile } =
-    await configUtils.generateRegistries(
-      registriesInput,
-      config.tempDir,
-      logger,
-    );
-  const databaseInitEnvironment = {
-    GITHUB_TOKEN: apiDetails.auth,
-    CODEQL_REGISTRIES_AUTH: registriesAuthTokens,
-  };
-  await runDatabaseInitCluster(
-    databaseInitEnvironment,
-    codeql,
-    config,
-    sourceRoot,
-    processName,
-    qlconfigFile,
-    logger,
-  );
-  return await getCombinedTracerConfig(codeql, config);
-}
-
 export async function runDatabaseInitCluster(
   databaseInitEnvironment: Record<string, string | undefined>,
   codeql: CodeQL,