SCAN-5687 : Add better fallback logic when getting ref from event. (#8)

* SCAN-5687 : Fallback to high level ref. * [Auto] Image tag updated latest pushed version * SCAN-5687 : Add error handling around ref retrieval. * [Auto] Image tag updated latest pushed version * SCAN-5687 : Include ref in error message. * [Auto] Image tag updated latest pushed version --------- Co-authored-by: Github <[email protected]>
Contrast-Security-OSS · Sep 10, 2024 · 85af24a · 85af24a
1 parent cc47b19
commit 85af24a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/action.yml b/action.yml
@@ -71,4 +71,4 @@ inputs:
     default: ${{ github.token }}
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/contrast-security-oss/contrast-local-scan-action:sha-d2d24005fccf69c0f916bed5c97e720cc231b18b'
+  image: 'docker://ghcr.io/contrast-security-oss/contrast-local-scan-action:sha-9215789c436d9755e0f330b883793def98718018'
diff --git a/src/config.js b/src/config.js
@@ -18,18 +18,26 @@ const getRef = () => {
     }
     default: {
       core.warning(`Received unexpected github event ${github.context.eventName}`);
-      return github.context.payload?.ref;
+      return github.context.payload?.ref || github.context.ref;
     }
   }
 };
 
 const thisBranchName = () => {
 
   const ref = getRef();
+
+  try {
+
+    const refParts = ref.split('/');
 
-  const refParts = ref.split('/');
+    return refParts[refParts.length-1];
+  }
+  catch (error) {
+    core.error(`Unable to get current branch name from ref ${ref} : ${error.message}`);
+  }
 
-  return refParts[refParts.length-1];
+  return DEFAULT_BRANCH_NAME
 };
 
 const isDefaultBranch = () => {