Add an option to allow waiting until an analysis has been processed b…

…efore finishing the Action.

analyze/action.yml

@@ -52,6 +52,9 @@ inputs:
     description: Whether to upload the resulting CodeQL database
     required: false
     default: "true"
+  wait-for-processing:
+    description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
+    required: false
   token:
     default: ${{ github.token }}
   matrix:

src/upload-lib.ts

@@ -110,6 +110,8 @@ async function uploadPayload(
 
   logger.debug(`response status: ${response.status}`);
   logger.info("Successfully uploaded results");
+
+  return response.data.id;
 }
 
 export interface UploadStatusReport {
@@ -159,6 +161,7 @@ export async function uploadFromActions(
     actionsUtil.getWorkflowRunID(),
     actionsUtil.getRequiredInput("checkout_path"),
     actionsUtil.getRequiredInput("matrix"),
+    actionsUtil.getOptionalInput("wait-for-processing") === "true",
     gitHubVersion,
     apiDetails,
     logger
@@ -190,6 +193,7 @@ export async function uploadFromRunner(
     undefined,
     sourceRoot,
     undefined,
+    false,
     gitHubVersion,
     apiDetails,
     logger
@@ -323,6 +327,9 @@ export function buildPayload(
   }
 }
 
+const STATUS_CHECK_FREQUENCY_MILLISECONDS = 5 * 1000;
+const STATUS_CHECK_TIMEOUT_MILLISECONDS = 2 * 60 * 1000;
+
 // Uploads the given set of sarif files.
 // Returns true iff the upload occurred and succeeded
 async function uploadFiles(
@@ -336,6 +343,7 @@ async function uploadFiles(
   workflowRunID: number | undefined,
   sourceRoot: string,
   environment: string | undefined,
+  waitForProcessing: boolean,
   gitHubVersion: util.GitHubVersion,
   apiDetails: api.GitHubApiDetails,
   logger: Logger
@@ -390,10 +398,66 @@ async function uploadFiles(
   logger.debug(`Number of results in upload: ${numResultInSarif}`);
 
   // Make the upload
-  await uploadPayload(payload, repositoryNwo, apiDetails, logger);
+  const sarifID = await uploadPayload(
+    payload,
+    repositoryNwo,
+    apiDetails,
+    logger
+  );
 
   logger.endGroup();
 
+  if (waitForProcessing) {
+    logger.startGroup("Waiting for processing to finish");
+    const client = api.getApiClient(apiDetails);
+
+    const statusCheckingStarted = Date.now();
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      if (
+        Date.now() >
+        statusCheckingStarted + STATUS_CHECK_TIMEOUT_MILLISECONDS
+      ) {
+        // If the analysis hasn't finished processing in the allotted time, we continue anyway rather than failing.
+        // It's possible the analysis will eventually finish processing, but it's not worth spending more Actions time waiting.
+        logger.warning(
+          "Timed out waiting for analysis to finish processing. Continuing."
+        );
+        break;
+      }
+      // We put the delay at the start of the loop, since it's unlikely that the analysis will have succeeded immediately. We might as well wait preemptively.
+      await util.delay(STATUS_CHECK_FREQUENCY_MILLISECONDS);
+      try {
+        const response = await client.request(
+          "GET /repos/:owner/:repo/code-scanning/sarifs/:sarif_id",
+          {
+            owner: repositoryNwo.owner,
+            repo: repositoryNwo.repo,
+            sarif_id: sarifID,
+          }
+        );
+        const status = response.data.processing_status;
+        logger.info(`Status is ${status}.`);
+        if (status === "complete") {
+          break;
+        }
+      } catch (e) {
+        if (util.isHTTPError(e)) {
+          switch (e.status) {
+            case 404:
+              logger.info("Analysis is not found yet...");
+              break;
+            default:
+              throw e;
+          }
+        } else {
+          throw e;
+        }
+      }
+    }
+    logger.endGroup();
+  }
+
   return {
     raw_upload_size_bytes: rawUploadSizeBytes,
     zipped_upload_size_bytes: zippedUploadSizeBytes,

src/util.ts

@@ -564,3 +564,7 @@ export async function bundleDb(
   }
   return databaseBundlePath;
 }
+
+export async function delay(milliseconds: number) {
+  return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}

upload-sarif/action.yml

@@ -20,6 +20,9 @@ inputs:
   category:
     description: String used by Code Scanning for matching the analyses
     required: false
+  wait-for-processing:
+    description: If true, the Action will wait for the uploaded SARIF to be processed before completing.
+    required: false
 runs:
   using: 'node12'
   main: '../lib/upload-sarif-action.js'