feat: Add support to specify additional args on retries (#97)

Author: Techassi

.scripts/actions/retry.sh

@@ -1,10 +1,18 @@
 #!/usr/bin/env bash
 
-# Retries any command passed to this script a maximum number of $CMD_RETRIES and
-# wait $CMD_TIMEOUT between each try. If the command failed $CMD_RETRIES, this
+# Initially, the retry args are empty. If the command fails, the retry args are
+# set to what the user provided via the RETRY_ARGS env var.
+retry_args=""
+
+# Retries any command passed to this script a maximum number of $RETRY_COUNT and
+# wait $RETRY_TIMEOUT between each try. If the command failed $RETRY_COUNT, this
 # script will return with exit code 1.
-for TRY in $(seq 1 "$CMD_RETRIES"); do
-  "$@"
+for TRY in $(seq 1 "$RETRY_COUNT"); do
+  if [ -z "$retry_args" ]; then
+    "$@"
+  else
+    "$@" "$retry_args"
+  fi
 
   EXIT_CODE=$?
   # If command ran successfully, exit the loop
@@ -15,11 +23,12 @@ for TRY in $(seq 1 "$CMD_RETRIES"); do
   echo "Command failed $TRY time(s)"
 
   # Exit if we reached the number if retries and the command didn't run successfully
-  if [ "$TRY" == "$CMD_RETRIES" ]; then
+  if [ "$TRY" == "$RETRY_COUNT" ]; then
     echo "Exiting"
     exit 1
   fi
 
-  echo "Waiting for $CMD_TIMEOUT to try again"
-  sleep "$CMD_TIMEOUT"
+  retry_args="${RETRY_ARGS:-}"
+  echo "Waiting for $RETRY_TIMEOUT to try again"
+  sleep "$RETRY_TIMEOUT"
 done

publish-helm-chart/action.yaml

@@ -27,6 +27,15 @@ inputs:
   app-version:
     description: The app version to set in the Helm Chart
     required: true
+  cosign-retries:
+    description: The number of times cosign operations should be retried
+    default: "3"
+  cosign-retry-timeout:
+    description: |
+      Duration to wait before a new cosign operation is retried, format: `NUMBER[SUFFIX]`.
+      SUFFIX may be 's' for seconds (the default), 'm' for minutes, 'h' for hours or 'd' for days.
+      See `sleep --help` for the full details.
+    default: "30s"
 runs:
   using: composite
   steps:
@@ -120,6 +129,9 @@ runs:
 
     - name: Sign Helm Chart
       env:
+        RETRY_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
+        RETRY_COUNT: ${{ inputs.cosign-retries }}
+        RETRY_ARGS: --verbose
         CHART_REGISTRY_URI: ${{ inputs.chart-registry-uri }}
         CHART_REPOSITORY: ${{ inputs.chart-repository }}
         GITHUB_DEBUG: ${{ runner.debug }}

publish-image-index-manifest/action.yaml

@@ -106,8 +106,9 @@ runs:
     - name: Sign Image Index Manifest
       shell: bash
       env:
-        CMD_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
-        CMD_RETRIES: ${{ inputs.cosign-retries }}
+        RETRY_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
+        RETRY_COUNT: ${{ inputs.cosign-retries }}
+        RETRY_ARGS: --verbose
         IMAGE_REPOSITORY: ${{ inputs.image-repository }}
         REGISTRY_URI: ${{ inputs.image-registry-uri }}
       run: |

publish-image/action.yaml

@@ -100,8 +100,9 @@ runs:
     - name: Sign the container image (${{ env.IMAGE_REPO_DIGEST }})
       shell: bash
       env:
-        CMD_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
-        CMD_RETRIES: ${{ inputs.cosign-retries }}
+        RETRY_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
+        RETRY_COUNT: ${{ inputs.cosign-retries }}
+        RETRY_ARGS: --verbose
       run: |
         set -euo pipefail
 
@@ -113,8 +114,9 @@ runs:
     - name: Generate SBOM for the container image (${{ env.IMAGE_REPO_DIGEST }})
       shell: bash
       env:
-        CMD_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
-        CMD_RETRIES: ${{ inputs.cosign-retries }}
+        RETRY_TIMEOUT: ${{ inputs.cosign-retry-timeout }}
+        RETRY_COUNT: ${{ inputs.cosign-retries }}
+        RETRY_ARGS: --verbose
         IMAGE_MANIFEST_TAG: ${{ inputs.image-manifest-tag }}
         IMAGE_REPOSITORY: ${{ inputs.image-repository }}
         REGISTRY_URI: ${{ inputs.image-registry-uri }}