Allow getJobUUID to retrieve the UUID from the environment

Author: mbg

lib/entry-points.js

@@ -31,9 +31,21 @@ setupTests(test);
 test("getJobUUID - generates valid UUIDs", async (t) => {
   await callee(getJobUUID)
     .withArgs()
+    .logs(t, "Job run UUID is ")
     .passes((val) => t.true(uuid.validate(val)));
 });
 
+test("getJobUUID - retrieves existing job UUIDs", async (t) => {
+  const existingJobUuid = uuid.v4();
+  await callee(getJobUUID)
+    .withArgs()
+    .withEnv((env) => {
+      env.set(EnvVar.JOB_RUN_UUID, existingJobUuid);
+    })
+    .logs(t, `Existing job run UUID is ${existingJobUuid}.`)
+    .passes(t.deepEqual, existingJobUuid);
+});
+
 function setupEnvironmentAndStub(tmpDir: string) {
   setupActionsVars(tmpDir, tmpDir, {
     GITHUB_EVENT_NAME: "dynamic",

src/status-report.test.ts

@@ -1,7 +1,7 @@
 import * as os from "os";
 
 import * as core from "@actions/core";
-import { v4 as uuidV4 } from "uuid";
+import * as uuid from "uuid";
 
 import type { ActionState } from "./action-common";
 import {
@@ -62,11 +62,21 @@ export function getDisplayActionName(actionName: ActionName): string {
 }
 
 /**
- * Creates a UUIDv4 for the analysis and returns it.
- * The generated UUID is also exported as an environment variable.
+ * Either creates a UUIDv4 for the analysis or retrieves an existing one from the
+ * environment and returns it.
+ * If a new UUID is generated, it is also exported as an environment variable.
  */
 export function getJobUUID(action: ActionState<["Logger", "ReadOnlyEnv"]>) {
-  const jobRunUuid = uuidV4();
+  // Check if we already have a UUID for the analysis and return it if so.
+  const existingJobRunUuid = action.env.getOptional(EnvVar.JOB_RUN_UUID);
+
+  if (existingJobRunUuid !== undefined && uuid.validate(existingJobRunUuid)) {
+    action.logger.info(`Existing job run UUID is ${existingJobRunUuid}.`);
+    return existingJobRunUuid;
+  }
+
+  // Otherwise generate a new UUID.
+  const jobRunUuid = uuid.v4();
   action.logger.info(`Job run UUID is ${jobRunUuid}.`);
 
   core.exportVariable(EnvVar.JOB_RUN_UUID, jobRunUuid);