Remove parameters from uploadFromActions

Retrieve the relevant values in the method itself instead.

src/analyze-action.ts

@@ -11,7 +11,6 @@ import {
 } from "./analyze";
 import { Config, getConfig } from "./config-utils";
 import { getActionsLogger } from "./logging";
-import { parseRepositoryNwo } from "./repository";
 import * as upload_lib from "./upload-lib";
 import * as util from "./util";
 
@@ -90,16 +89,6 @@ async function run() {
     if (actionsUtil.getRequiredInput("upload") === "true") {
       const uploadStats = await upload_lib.uploadFromActions(
         outputDir,
-        parseRepositoryNwo(
-          actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")
-        ),
-        await actionsUtil.getCommitOid(),
-        await actionsUtil.getRef(),
-        await actionsUtil.getAnalysisKey(),
-        actionsUtil.getRequiredEnvParam("GITHUB_WORKFLOW"),
-        actionsUtil.getWorkflowRunID(),
-        actionsUtil.getRequiredInput("checkout_path"),
-        actionsUtil.getRequiredInput("matrix"),
         config.gitHubVersion,
         apiDetails,
         logger

src/upload-lib.ts

@@ -7,10 +7,11 @@ import fileUrl from "file-url";
 import * as jsonschema from "jsonschema";
 import * as semver from "semver";
 
+import * as actionsUtil from "./actions-util";
 import * as api from "./api-client";
 import * as fingerprints from "./fingerprints";
 import { Logger } from "./logging";
-import { RepositoryNwo } from "./repository";
+import { parseRepositoryNwo, RepositoryNwo } from "./repository";
 import * as sharedEnv from "./shared-environment";
 import * as util from "./util";
 
@@ -104,18 +105,21 @@ export function findSarifFilesInDir(sarifPath: string): string[] {
 // Returns true iff the upload occurred and succeeded
 export async function uploadFromActions(
   sarifPath: string,
-  repositoryNwo: RepositoryNwo,
-  commitOid: string,
-  ref: string,
-  analysisKey: string,
-  analysisName: string,
-  workflowRunID: number,
-  checkoutPath: string,
-  environment: string,
   gitHubVersion: util.GitHubVersion,
   apiDetails: api.GitHubApiDetails,
   logger: Logger
 ): Promise<UploadStatusReport> {
+  const repositoryNwo = parseRepositoryNwo(
+    actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")
+  );
+  const commitOid = await actionsUtil.getCommitOid();
+  const ref = await actionsUtil.getRef();
+  const analysisKey = await actionsUtil.getAnalysisKey();
+  const analysisName = actionsUtil.getRequiredEnvParam("GITHUB_WORKFLOW");
+  const workflowRunID = actionsUtil.getWorkflowRunID();
+  const checkoutPath = actionsUtil.getRequiredInput("checkout_path");
+  const environment = actionsUtil.getRequiredInput("matrix");
+
   return await uploadFiles(
     getSarifFilePaths(sarifPath),
     repositoryNwo,

src/upload-sarif-action.ts

@@ -2,7 +2,6 @@ import * as core from "@actions/core";
 
 import * as actionsUtil from "./actions-util";
 import { getActionsLogger } from "./logging";
-import { parseRepositoryNwo } from "./repository";
 import * as upload_lib from "./upload-lib";
 import { getGitHubVersion } from "./util";
 
@@ -50,14 +49,6 @@ async function run() {
 
     const uploadStats = await upload_lib.uploadFromActions(
       actionsUtil.getRequiredInput("sarif_file"),
-      parseRepositoryNwo(actionsUtil.getRequiredEnvParam("GITHUB_REPOSITORY")),
-      await actionsUtil.getCommitOid(),
-      await actionsUtil.getRef(),
-      await actionsUtil.getAnalysisKey(),
-      actionsUtil.getRequiredEnvParam("GITHUB_WORKFLOW"),
-      actionsUtil.getWorkflowRunID(),
-      actionsUtil.getRequiredInput("checkout_path"),
-      actionsUtil.getRequiredInput("matrix"),
       gitHubVersion,
       apiDetails,
       getActionsLogger()