From 9a49a5c40a2c4aa92875e6e82681c1d3b580cc39 Mon Sep 17 00:00:00 2001
From: Alexandre Brandizzi <alex_brandizzi@hotmail.com>
Date: Thu, 10 Sep 2026 10:55:45 -0300
Subject: [PATCH] fix(deploy): apply the health-convergence fix to the dev
 Terraform rollback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dev Terraform rollback verify was the one gate the previous commit
missed, and it is the copy that actually ran on 34293894914. It still
decided on the first Ready poll: previous version correctly restored,
health not yet converged, reported as a failed rollback.

Split the version and health conditions the same way the other three
gates now do — a Ready poll on the wrong version fails immediately and
names the version that came up, while the correct version with unsettled
health keeps polling inside the unchanged 80 x 15s budget. Timeout now
reports the last observed status, version and health.
---
 .github/workflows/deploy.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e189d9e..1cdcf0b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -620,16 +620,22 @@ jobs:
             )
             echo "environment status: $status; version: $current; health: $health"
             if [ "$status" = "Ready" ]; then
-              if [ "$current" = "$prev" ] && { [ "$health" = "Green" ] || [ "$health" = "Yellow" ]; }; then
+              if [ "$current" != "$prev" ]; then
+                echo "Rollback reached Ready on version $current, not the previous $prev." >&2
+                exit 1
+              fi
+              if [ "$health" = "Green" ] || [ "$health" = "Yellow" ]; then
                 echo "Application version restore complete; previous code is Ready and healthy."
                 exit 0
               fi
-              echo "Rollback reached Ready in an unexpected version/health state." >&2
-              exit 1
+              # Same convergence gap as the release check above: the previous version
+              # is back, health has not settled yet, and reporting a failed rollback
+              # here hides the fact that the restore itself worked.
+              echo "Previous version is active; waiting for health to leave $health."
             fi
             sleep 15
           done
-          echo "Environment did not return to Ready within rollback window." >&2
+          echo "Environment did not return to Ready and healthy within the rollback window (last seen: status=$status version=$current health=$health)." >&2
           exit 1
 
   deploy-staging: