From 79dc348f95f14d53f015eb3045bb333ba1d94cd8 Mon Sep 17 00:00:00 2001
From: Himanshu Garg <garg_himanshu@outlook.com>
Date: Wed, 11 Jun 2025 18:13:09 +0530
Subject: [PATCH] feat(rollback): enhance rollback workflow to support multiple
 revisions and error handling

---
 .github/workflows/rollback.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rollback.yml b/.github/workflows/rollback.yml
index 7e5ee1fa397..e4c4b42aed4 100644
--- a/.github/workflows/rollback.yml
+++ b/.github/workflows/rollback.yml
@@ -9,7 +9,9 @@ run-name: >
     github.event.inputs.rollback_ws == 'true' && 'ws, ' || ''
   }}${{
     github.event.inputs.rollback_webhook == 'true' && 'webhook ' || ''
-  }}on ${{ github.event.inputs.environment }}
+  }}on ${{ github.event.inputs.environment }} (${{
+    github.event.inputs.revisions_to_rollback
+  }} revisions)
 description: Rollback deployment to the previous task definition for selected services in the specified environment.
 concurrency:
   group: "rollback-${{ github.event.inputs.environment }}"
@@ -51,6 +53,12 @@ on:
         required: true
         type: boolean
         default: true
+
+      revisions_to_rollback:
+        description: 'Number of revisions to rollback (default: 1)'
+        required: true
+        type: number
+        default: 1
       
       rollback_signoff:
         description: "This will rollback the selected services to the previous task definition. This won't rollback any database migration or environment changes. Do you agree?"
@@ -212,8 +220,13 @@ jobs:
               index=$(echo "$task_definition_list" | grep -n "$current_task_definition_arn" | cut -d ':' -f 1)
               if [ -n "$index" ]; then
                 if [ "$index" -ge 1 ]; then  # Greater than or equal to 1
-                  previous_index=$((index + 1))
+                  revisions_to_rollback=${{ github.event.inputs.revisions_to_rollback }}
+                  previous_index=$((index + revisions_to_rollback))
                   previous_task_definition_arn=$(echo "$task_definition_list" | sed -n "${previous_index}p")
+                  if [ -z "$previous_task_definition_arn" ]; then
+                    echo "Error: Cannot rollback $revisions_to_rollback revisions. Not enough previous versions available."
+                    exit 1
+                  fi
                   echo "previous_task_definition_arn=$previous_task_definition_arn" >> $GITHUB_ENV
                 else
                   echo "Invalid index value: $index"