Remove intermediate variables

This commit is contained in:
Sam Partington 2021-01-28 15:40:42 +00:00
parent c2377b2e49
commit 19fe854945
3 changed files with 10 additions and 29 deletions

10
lib/upload-lib.js generated
View file

@ -88,15 +88,7 @@ exports.findSarifFilesInDir = findSarifFilesInDir;
// depending on what the path happens to refer to.
// Returns true iff the upload occurred and succeeded
async function uploadFromActions(sarifPath, gitHubVersion, apiDetails, logger) {
const repositoryNwo = repository_1.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, commitOid, ref, analysisKey, analysisName, workflowRunID, checkoutPath, environment, gitHubVersion, apiDetails, "actions", logger);
return await uploadFiles(getSarifFilePaths(sarifPath), repository_1.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, "actions", logger);
}
exports.uploadFromActions = uploadFromActions;
// Uploads a single sarif file or a directory of sarif files

File diff suppressed because one or more lines are too long

View file

@ -109,27 +109,16 @@ export async function uploadFromActions(
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,
commitOid,
ref,
analysisKey,
analysisName,
workflowRunID,
checkoutPath,
environment,
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,
"actions",