Reuse getApiDetails code

src/analyze-action.ts

@@ -14,7 +14,7 @@ import {
   runFinalize,
   runQueries,
 } from "./analyze";
-import { getGitHubVersionActionsOnly } from "./api-client";
+import { getApiDetails, getGitHubVersionActionsOnly } from "./api-client";
 import { runAutobuild } from "./autobuild";
 import { getCodeQL } from "./codeql";
 import { Config, getConfig } from "./config-utils";
@@ -212,11 +212,7 @@ async function run() {
       await getCodeQL(config.codeQLCmd)
     );
 
-    const apiDetails = {
-      auth: actionsUtil.getRequiredInput("token"),
-      url: util.getRequiredEnvParam("GITHUB_SERVER_URL"),
-      apiURL: util.getRequiredEnvParam("GITHUB_API_URL"),
-    };
+    const apiDetails = getApiDetails();
     const outputDir = actionsUtil.getRequiredInput("output");
     const threads = util.getThreadsFlag(
       actionsUtil.getOptionalInput("threads") || process.env["CODEQL_THREADS"],

src/api-client.ts

@@ -63,7 +63,7 @@ function deriveApiUrl(githubUrl: string): string {
   return url.toString();
 }
 
-function getApiDetails() {
+export function getApiDetails() {
   return {
     auth: getRequiredInput("token"),
     url: getRequiredEnvParam("GITHUB_SERVER_URL"),

src/autobuild-action.ts

@@ -4,12 +4,11 @@ import {
   createStatusReportBase,
   getActionsStatus,
   getOptionalInput,
-  getRequiredInput,
   getTemporaryDirectory,
   sendStatusReport,
   StatusReportBase,
 } from "./actions-util";
-import { getGitHubVersionActionsOnly } from "./api-client";
+import { getApiDetails, getGitHubVersionActionsOnly } from "./api-client";
 import { determineAutobuildLanguage, runAutobuild } from "./autobuild";
 import * as configUtils from "./config-utils";
 import { GitHubFeatureFlags } from "./feature-flags";
@@ -72,23 +71,13 @@ async function run() {
       return;
     }
 
-    const apiDetails = {
-      auth: getRequiredInput("token"),
-      url: getRequiredEnvParam("GITHUB_SERVER_URL"),
-      apiURL: getRequiredEnvParam("GITHUB_API_URL"),
-    };
-
     const gitHubVersion = await getGitHubVersionActionsOnly();
     checkGitHubVersionInRange(gitHubVersion, logger, Mode.actions);
 
-    const repositoryNwo = parseRepositoryNwo(
-      getRequiredEnvParam("GITHUB_REPOSITORY")
-    );
-
     const featureFlags = new GitHubFeatureFlags(
       gitHubVersion,
-      apiDetails,
-      repositoryNwo,
+      getApiDetails(),
+      parseRepositoryNwo(getRequiredEnvParam("GITHUB_REPOSITORY")),
       logger
     );
 

src/upload-sarif-action.ts

@@ -1,7 +1,7 @@
 import * as core from "@actions/core";
 
 import * as actionsUtil from "./actions-util";
-import { getGitHubVersionActionsOnly } from "./api-client";
+import { getApiDetails, getGitHubVersionActionsOnly } from "./api-client";
 import { getActionsLogger } from "./logging";
 import { parseRepositoryNwo } from "./repository";
 import * as upload_lib from "./upload-lib";
@@ -53,12 +53,7 @@ async function run() {
   }
 
   try {
-    const apiDetails = {
-      auth: actionsUtil.getRequiredInput("token"),
-      url: getRequiredEnvParam("GITHUB_SERVER_URL"),
-      apiURL: getRequiredEnvParam("GITHUB_API_URL"),
-    };
-
+    const apiDetails = getApiDetails();
     const gitHubVersion = await getGitHubVersionActionsOnly();
 
     const uploadResult = await upload_lib.uploadFromActions(