Make anonymous objects into variables for readability

src/analyze-action.ts

@@ -64,6 +64,10 @@ async function run() {
         "Config file could not be found at expected location. Has the 'init' action been called?"
       );
     }
+    const apiDetails = {
+      auth: actionsUtil.getRequiredInput("token"),
+      url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
+    };
     stats = await runAnalyze(
       parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")),
       await actionsUtil.getCommitOid(),
@@ -73,10 +77,7 @@ async function run() {
       actionsUtil.getWorkflowRunID(),
       actionsUtil.getRequiredInput("checkout_path"),
       actionsUtil.getRequiredInput("matrix"),
-      {
-        auth: actionsUtil.getRequiredInput("token"),
-        url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
-      },
+      apiDetails,
       actionsUtil.getRequiredInput("upload") === "true",
       "actions",
       actionsUtil.getRequiredInput("output"),

src/api-client.ts

@@ -108,15 +108,12 @@ function getApiUrl(githubUrl: string): string {
 // Once all code has been converted this function should be removed or made canonical
 // and called only from the action entrypoints.
 export function getActionsApiClient(allowLocalRun = false) {
-  return getApiClient(
-    {
-      auth: getRequiredInput("token"),
-      url: getRequiredEnvParam("GITHUB_SERVER_URL"),
-    },
-    "actions",
-    getActionsLogger(),
-    allowLocalRun
-  );
+  const apiDetails = {
+    auth: getRequiredInput("token"),
+    url: getRequiredEnvParam("GITHUB_SERVER_URL"),
+  };
+
+  return getApiClient(apiDetails, "actions", getActionsLogger(), allowLocalRun);
 }
 
 export function apiVersionInRange(

src/init-action.ts

@@ -104,12 +104,14 @@ async function run() {
       return;
     }
 
+    const apiDetails = {
+      auth: actionsUtil.getRequiredInput("token"),
+      url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
+    };
+
     const initCodeQLResult = await initCodeQL(
       actionsUtil.getOptionalInput("tools"),
-      {
-        auth: actionsUtil.getRequiredInput("token"),
-        url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
-      },
+      apiDetails,
       actionsUtil.getRequiredEnvParam("RUNNER_TEMP"),
       actionsUtil.getRequiredEnvParam("RUNNER_TOOL_CACHE"),
       "actions",
@@ -127,10 +129,7 @@ async function run() {
       actionsUtil.getRequiredEnvParam("RUNNER_TOOL_CACHE"),
       codeql,
       actionsUtil.getRequiredEnvParam("GITHUB_WORKSPACE"),
-      {
-        auth: actionsUtil.getRequiredInput("token"),
-        url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
-      },
+      apiDetails,
       "actions",
       logger
     );

src/runner.ts

@@ -146,6 +146,11 @@ program
       fs.rmdirSync(tempDir, { recursive: true });
       fs.mkdirSync(tempDir, { recursive: true });
 
+      const apiDetails = {
+        auth: cmd.githubAuth,
+        url: parseGithubUrl(cmd.githubUrl),
+      };
+
       let codeql: CodeQL;
       if (cmd.codeqlPath !== undefined) {
         codeql = getCodeQL(cmd.codeqlPath);
@@ -153,10 +158,7 @@ program
         codeql = (
           await initCodeQL(
             undefined,
-            {
-              auth: cmd.githubAuth,
-              url: parseGithubUrl(cmd.githubUrl),
-            },
+            apiDetails,
             tempDir,
             toolsDir,
             "runner",
@@ -174,10 +176,7 @@ program
         toolsDir,
         codeql,
         cmd.checkoutPath || process.cwd(),
-        {
-          auth: cmd.githubAuth,
-          url: parseGithubUrl(cmd.githubUrl),
-        },
+        apiDetails,
         "runner",
         logger
       );
@@ -366,6 +365,12 @@ program
             "Was the 'init' command run with the same '--temp-dir' argument as this command."
         );
       }
+
+      const apiDetails = {
+        auth: cmd.githubAuth,
+        url: parseGithubUrl(cmd.githubUrl),
+      };
+
       await runAnalyze(
         parseRepositoryNwo(cmd.repository),
         cmd.commit,
@@ -375,10 +380,7 @@ program
         undefined,
         cmd.checkoutPath || process.cwd(),
         undefined,
-        {
-          auth: cmd.githubAuth,
-          url: parseGithubUrl(cmd.githubUrl),
-        },
+        apiDetails,
         cmd.upload,
         "runner",
         outputDir,
@@ -433,6 +435,10 @@ program
   .option("--debug", "Print more verbose output", false)
   .action(async (cmd: UploadArgs) => {
     const logger = getRunnerLogger(cmd.debug);
+    const apiDetails = {
+      auth: cmd.githubAuth,
+      url: parseGithubUrl(cmd.githubUrl),
+    };
     try {
       await upload_lib.upload(
         cmd.sarifFile,
@@ -444,10 +450,7 @@ program
         undefined,
         cmd.checkoutPath || process.cwd(),
         undefined,
-        {
-          auth: cmd.githubAuth,
-          url: parseGithubUrl(cmd.githubUrl),
-        },
+        apiDetails,
         "runner",
         logger
       );

src/upload-sarif-action.ts

@@ -40,6 +40,11 @@ async function run() {
   }
 
   try {
+    const apiDetails = {
+      auth: actionsUtil.getRequiredInput("token"),
+      url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
+    };
+
     const uploadStats = await upload_lib.upload(
       actionsUtil.getRequiredInput("sarif_file"),
       parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")),
@@ -50,10 +55,7 @@ async function run() {
       actionsUtil.getWorkflowRunID(),
       actionsUtil.getRequiredInput("checkout_path"),
       actionsUtil.getRequiredInput("matrix"),
-      {
-        auth: actionsUtil.getRequiredInput("token"),
-        url: actionsUtil.getRequiredEnvParam("GITHUB_SERVER_URL"),
-      },
+      apiDetails,
       "actions",
       getActionsLogger()
     );