chore: Refactor internal/run-script action

internal/fod-login/action.yml

@@ -10,7 +10,7 @@ runs:
     - uses: fortify/github-action/internal/[email protected]
       if: ${{ !env._FOD_LOGGED_IN }}
       with:
-        cwd: ${{ github.action_path }}
+        dir: ${{ github.action_path }}
         script: ./fod-login.sh
         post: ./fod-logout.sh
 

internal/fod-login/fod-login.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-### Start common code
-if [ -n "$RUNNER_DEBUG" ]; then
-  set -v -x
-fi
-if [ -z "$FCLI_CMD" ]; then
-  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
-  exit 1;
-fi
-### End common code
+. $(UTIL_DIR}/common.sh
 
 if [ -z "$FOD_URL" ]; then
   echo "ERROR: FOD_URL environment variable must be set"; exit 1;

internal/fod-login/fod-logout.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-### Start common code
-if [ -n "$RUNNER_DEBUG" ]; then
-  set -v -x
-fi
-if [ -z "$FCLI_CMD" ]; then
-  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
-  exit 1;
-fi
-### End common code
+. $(UTIL_DIR}/common.sh
 
 if [[ "${_FOD_LOGGED_IN}" == "true" ]]; then
   echo '_FOD_LOGGED_IN=false' >> $GITHUB_ENV

internal/run-script-js/action.yml

@@ -0,0 +1,26 @@
+name: Run a script with optional post-job cleanup
+
+description: 'Action to execute a bash script, optionally executing another script on job completion. This action should not be used directly, but through internal/run-script.'
+
+inputs:
+  script:
+    description: 'Script to run'
+    required: true
+  post:
+    description: 'Script to run on job completion'
+    required: false
+  dir:
+    description: 'Directory where scripts are located, should usually be set to ${{ github.action_path }}'
+    required: true
+  util_dir:
+    description: 'Directory where utility scripts are located, set automatically by internal/run-script action'
+    required: true
+  key:
+    description: 'Name of the state variable used to detect the post step.'
+    required: false
+    default: POST
+
+runs:
+  using: 'node20'
+  main: 'main.js'
+  post: 'main.js'

internal/run-script/main.js → internal/run-script-js/main.js

@@ -4,8 +4,10 @@ const { EOL } = require("os");
 
 function run(script) {
   if ( script ) {
-      const cwd = process.env.INPUT_CWD || process.cwd;
-      const subprocess = spawn(`bash -c -o pipefail -v ${script}`, { stdio: "inherit", shell: true,  cwd: cwd });
+      const dir = process.env.INPUT_DIR;
+      const utilDir = process.env.INPUT_UTIL_DIR
+      const subprocess = spawn(`bash -c -o pipefail -v UTIL_DIR=${utilDir} ${dir}/${script}`, 
+        { stdio: "inherit", shell: true,  cwd: cwd });
       subprocess.on("exit", (exitCode) => {
         process.exitCode = exitCode;
       });

internal/run-script/action.yml

@@ -9,15 +9,16 @@ inputs:
   post:
     description: 'Script to run on job completion'
     required: false
-  cwd:
-    description: 'Script working directory'
-    required: false
-  key:
-    description: 'Name of the state variable used to detect the post step.'
-    required: false
-    default: POST
+  dir:
+    description: 'Directory where scripts are located, should usually be set to ${{ github.action_path }}'
+    required: true
 
 runs:
-  using: 'node20'
-  main: 'main.js'
-  post: 'main.js'
+  using: composite
+  steps:
+    - uses: fortify/github-action/internal/[email protected]
+      with:
+        dir: ${{ inputs['dir'] }}
+        util_dir: ${{ github.action_path }}/util 
+        script: ${{ inputs['script'] }}
+        post: ${{ inputs['post'] }}

internal/run-script/util/common.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+if [ -n "$RUNNER_DEBUG" ]; then
+  set -v -x
+fi
+if [ -z "$FCLI_CMD" ]; then
+  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
+  exit 1;
+fi

internal/sc-sast-login/action.yml

@@ -14,7 +14,7 @@ runs:
     - uses: fortify/github-action/internal/[email protected]
       if: ${{ !env._SC_SAST_LOGGED_IN }}
       with:
-        cwd: ${{ github.action_path }}
+        dir: ${{ github.action_path }}
         script: ./sc-sast-login.sh
         post: ./sc-sast-logout.sh
 

internal/sc-sast-login/sc-sast-login.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-### Start common code
-if [ -n "$RUNNER_DEBUG" ]; then
-  set -v -x
-fi
-if [ -z "$FCLI_CMD" ]; then
-  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
-  exit 1;
-fi
-### End common code
+. $(UTIL_DIR}/common.sh
 
 if [ -z "$SSC_URL" ]; then
   echo "ERROR: SSC_URL environment variable must be set"; exit 1;

internal/sc-sast-login/sc-sast-logout.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-### Start common code
-if [ -n "$RUNNER_DEBUG" ]; then
-  set -v -x
-fi
-if [ -z "$FCLI_CMD" ]; then
-  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
-  exit 1;
-fi
-### End common code
+. $(UTIL_DIR}/common.sh
 
 if [[ "${_SC_SAST_LOGGED_IN}" == "true" ]]; then
   echo '_SC_SAST_LOGGED_IN=false' >> $GITHUB_ENV

internal/ssc-login/action.yml

@@ -10,7 +10,7 @@ runs:
     - uses: fortify/github-action/internal/[email protected]
       if: ${{ !env._SSC_LOGGED_IN }}
       with:
-        cwd: ${{ github.action_path }}
+        dir: ${{ github.action_path }}
         script: ./ssc-login.sh
         post: ./ssc-logout.sh
 branding:

internal/ssc-login/ssc-login.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-### Start common code
-if [ -n "$RUNNER_DEBUG" ]; then
-  set -v -x
-fi
-if [ -z "$FCLI_CMD" ]; then
-  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
-  exit 1;
-fi
-### End common code
+. $(UTIL_DIR}/common.sh
 
 if [ -z "$SSC_URL" ]; then
   echo "ERROR: SSC_URL environment variable must be set"; exit 1;

internal/ssc-login/ssc-logout.sh

@@ -1,14 +1,5 @@
 #!/bin/bash
-
-### Start common code
-if [ -n "$RUNNER_DEBUG" ]; then
-  set -v -x
-fi
-if [ -z "$FCLI_CMD" ]; then
-  echo "ERROR: fortify/github-action/setup must be run to set up fcli before running this action"
-  exit 1;
-fi
-### End common code
+. $(UTIL_DIR}/common.sh
 
 if [[ "${_SSC_LOGGED_IN}" == "true" ]]; then
   echo '_SSC_LOGGED_IN=false' >> $GITHUB_ENV