feat: simplify branch name handling

Codex- · Oct 2, 2024 · 95105b0 · 95105b0
1 parent c228c4b
commit 95105b0
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 31 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -2,6 +2,7 @@ import * as core from "@actions/core";
 import { v4 as uuid } from "uuid";
 import { ActionOutputs, getConfig } from "./action.ts";
 import * as api from "./api.ts";
+import { getBranchName } from "./utils.ts";
 
 const DISTINCT_ID = uuid();
 const WORKFLOW_FETCH_TIMEOUT_MS = 60 * 1000;
@@ -103,6 +104,21 @@ async function run(): Promise<void> {
     // Dispatch the action
     await api.dispatchWorkflow(config.distinctId ?? DISTINCT_ID);
 
+    // Attempt to get the branch from config ref
+    core.info("Attempt to extract branch name from ref...");
+    const branch = getBranchName(config.ref);
+    if (branch.isTag) {
+      core.info(
+        `Tag found for '${config.ref}', branch filtering will not be used`,
+      );
+    } else if (branch.branchName) {
+      core.info(`Branch found for '${config.ref}': ${branch.branchName}`);
+    } else {
+      core.info(
+        `Branch not found for '${config.ref}', branch filtering will not be used`,
+      );
+    }
+
     const timeoutMs = config.workflowTimeoutSeconds * 1000;
     let attemptNo = 0;
     let elapsedTime = Date.now() - startTime;

diff --git a/src/utils.spec.ts b/src/utils.spec.ts
@@ -14,38 +14,59 @@ describe("utils", () => {
   });
 
   describe("getBranchNameFromRef", () => {
+    // We want to assert that the props are properly set in
+    // the union of the return type
+    interface BranchNameResultUnion {
+      branchName?: string;
+      isTag: boolean;
+      ref: string;
+    }
+
     it("should return the branch name for a valid branch ref", () => {
       const branchName = "cool_feature";
       const ref = `/refs/heads/${branchName}`;
-      const branch = getBranchName(ref);
+      const branch = getBranchName(ref) as BranchNameResultUnion;
 
-      expect(branch).toStrictEqual(branchName);
+      expect(branch.isTag).toStrictEqual(false);
+      expect(branch.branchName).toStrictEqual(branchName);
+      expect(branch.ref).toStrictEqual(ref);
     });
 
     it("should return the branch name for a valid branch ref without a leading slash", () => {
       const branchName = "cool_feature";
       const ref = `refs/heads/${branchName}`;
-      const branch = getBranchName(ref);
+      const branch = getBranchName(ref) as BranchNameResultUnion;
 
-      expect(branch).toStrictEqual(branchName);
+      expect(branch.isTag).toStrictEqual(false);
+      expect(branch.branchName).toStrictEqual(branchName);
+      expect(branch.ref).toStrictEqual(ref);
     });
 
     it("should return undefined for an invalid branch ref", () => {
-      const branch = getBranchName("refs/heads/");
+      const ref = "refs/heads/";
+      const branch = getBranchName(ref) as BranchNameResultUnion;
 
-      expect(branch).toBeUndefined();
+      expect(branch.isTag).toStrictEqual(false);
+      expect(branch.branchName).toBeUndefined();
+      expect(branch.ref).toStrictEqual(ref);
     });
 
-    it("should return undefined if the ref is for a tag", () => {
-      const branch = getBranchName("refs/tags/v1.0.1");
+    it("should return isTag true if the ref is for a tag", () => {
+      const ref = "refs/tags/v1.0.1";
+      const branch = getBranchName(ref) as BranchNameResultUnion;
 
-      expect(branch).toBeUndefined();
+      expect(branch.isTag).toStrictEqual(true);
+      expect(branch.branchName).toBeUndefined();
+      expect(branch.ref).toStrictEqual(ref);
     });
 
-    it("should return undefined if the ref is for an invalid tag", () => {
-      const branch = getBranchName("refs/tags/");
+    it("should return isTag true if the ref is for an invalid tag", () => {
+      const ref = "refs/tags/";
+      const branch = getBranchName(ref) as BranchNameResultUnion;
 
-      expect(branch).toBeUndefined();
+      expect(branch.isTag).toStrictEqual(true);
+      expect(branch.branchName).toBeUndefined();
+      expect(branch.ref).toStrictEqual(ref);
     });
   });
 });
diff --git a/src/utils.ts b/src/utils.ts
@@ -11,27 +11,37 @@ function isTagRef(ref: string): boolean {
   return new RegExp(/\/?refs\/tags\//).test(ref);
 }
 
-export function getBranchName(ref: string): string | undefined {
-  let branchName: string | undefined = undefined;
-  if (!isTagRef(ref)) {
-    /**
-     * The listRepoWorkflows request only accepts a branch name and not a ref (for some reason).
-     *
-     * Attempt to filter the branch name specifically and use that.
-     */
-    const branch = getBranchNameFromRef(ref);
-    if (branch) {
-      branchName = branch;
+interface RefBranch {
+  branchName?: string;
+  isTag: false;
+  ref: string;
+}
 
-      core.debug(`getWorkflowRunIds: Filtered branch name: ${ref}`);
-    } else {
-      core.debug(
-        `failed to get branch for ref: ${ref}, please raise an issue with this git ref.`,
-      );
-    }
-  } else {
+interface RefTag {
+  isTag: true;
+  ref: string;
+}
+
+export type BranchNameResult = RefBranch | RefTag;
+
+export function getBranchName(ref: string): BranchNameResult {
+  if (isTagRef(ref)) {
     core.debug(`Unable to filter branch, unsupported ref: ${ref}`);
+    return { isTag: true, ref };
   }
 
-  return branchName;
+  /**
+   * The listRepoWorkflows request only accepts a branch name and not a ref (for some reason).
+   *
+   * Attempt to filter the branch name specifically and use that.
+   */
+  const branch = getBranchNameFromRef(ref);
+  if (branch) {
+    core.debug(`getWorkflowRunIds: Filtered branch name: ${ref}`);
+  } else {
+    core.debug(
+      `failed to get branch for ref: ${ref}, please raise an issue with this git ref.`,
+    );
+  }
+  return { branchName: branch, isTag: false, ref };
 }