Always wait for processing when uploading a failed SARIF file

github · Nov 29, 2022 · 00a3c45 · 00a3c45
1 parent e628ee0
commit 00a3c45
Showing 7 changed files with 10 additions and 54 deletions.
diff --git a/analyze/action.yml b/analyze/action.yml
@@ -63,7 +63,6 @@ inputs:
   wait-for-processing:
     description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
     required: true
-    # If changing this, make sure to update workflow.ts accordingly.
     default: "true"
   token:
     default: ${{ github.token }}

diff --git a/lib/init-action-post-helper.js b/lib/init-action-post-helper.js
diff --git a/lib/init-action-post-helper.js.map b/lib/init-action-post-helper.js.map
diff --git a/lib/workflow.js b/lib/workflow.js
diff --git a/lib/workflow.js.map b/lib/workflow.js.map
diff --git a/src/init-action-post-helper.ts b/src/init-action-post-helper.ts
@@ -13,7 +13,6 @@ import {
   getCategoryInputOrThrow,
   getCheckoutPathInputOrThrow,
   getUploadInputOrThrow,
-  getWaitForProcessingInputOrThrow,
   getWorkflow,
 } from "./workflow";
 
@@ -53,8 +52,6 @@ async function uploadFailedSarif(
   }
   const category = getCategoryInputOrThrow(workflow, jobName, matrix);
   const checkoutPath = getCheckoutPathInputOrThrow(workflow, jobName, matrix);
-  const waitForProcessing =
-    getWaitForProcessingInputOrThrow(workflow, jobName, matrix) === "true";
 
   const sarifFile = "../codeql-failed-run.sarif";
   await codeql.diagnosticsExport(sarifFile, category);
@@ -66,14 +63,12 @@ async function uploadFailedSarif(
     category,
     logger
   );
-  if (waitForProcessing) {
-    await uploadLib.waitForProcessing(
-      repositoryNwo,
-      uploadResult.sarifID,
-      logger,
-      { isUnsuccessfulExecution: true }
-    );
-  }
+  await uploadLib.waitForProcessing(
+    repositoryNwo,
+    uploadResult.sarifID,
+    logger,
+    { isUnsuccessfulExecution: true }
+  );
 }
 
 export async function run(

diff --git a/src/workflow.ts b/src/workflow.ts
@@ -410,29 +410,6 @@ export function getUploadInputOrThrow(
   );
 }
 
-/**
- * Makes a best effort attempt to retrieve the wait-for-processing input for the
- * particular job, given a set of matrix variables.
- *
- * @returns the wait-for-processing input
- * @throws an error if the wait-for-processing input could not be determined
- */
-export function getWaitForProcessingInputOrThrow(
-  workflow: Workflow,
-  jobName: string,
-  matrixVars: { [key: string]: string } | undefined
-): string {
-  return (
-    getInputOrThrow(
-      workflow,
-      jobName,
-      "github/codeql-action/analyze",
-      "wait-for-processing",
-      matrixVars
-    ) || "true" // if unspecified, wait-for-processing defaults to true
-  );
-}
-
 /**
  * Makes a best effort attempt to retrieve the checkout_path input for the
  * particular job, given a set of matrix variables.