From c40169c6dffc479a11b0d1e394e5fafcb7312304 Mon Sep 17 00:00:00 2001
From: Patrick <patrick.huie@smartcontract.com>
Date: Wed, 6 Sep 2023 08:08:40 -0400
Subject: [PATCH] fix/gh-actions-setup-postgres: fixing script to be resilient
 to array or object docker compose output (#10512)

---
 .../setup-postgres/wait-for-healthy-postgres.sh  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/actions/setup-postgres/wait-for-healthy-postgres.sh b/.github/actions/setup-postgres/wait-for-healthy-postgres.sh
index 3f0efd66f3b..438cfbaff3d 100755
--- a/.github/actions/setup-postgres/wait-for-healthy-postgres.sh
+++ b/.github/actions/setup-postgres/wait-for-healthy-postgres.sh
@@ -2,10 +2,24 @@
 RETRIES=10
 
 until [ $RETRIES -eq 0 ]; do
-  if docker compose ps postgres --status running --format json | jq >/dev/null -e 'if (.[0].Health == "healthy") then true else false end'; then
+  DOCKER_OUTPUT=$(docker compose ps postgres --status running --format json)
+  JSON_TYPE=$(echo "$DOCKER_OUTPUT" | jq -r 'type')
+
+  if [ "$JSON_TYPE" == "array" ]; then
+    HEALTH_STATUS=$(echo "$DOCKER_OUTPUT" | jq -r '.[0].Health')
+  elif [ "$JSON_TYPE" == "object" ]; then
+    HEALTH_STATUS=$(echo "$DOCKER_OUTPUT" | jq -r '.Health')
+  else
+    HEALTH_STATUS="Unknown JSON type: $JSON_TYPE"
+  fi
+
+  echo "postgres health status: $HEALTH_STATUS"
+  if [ "$HEALTH_STATUS" == "healthy" ]; then
     exit 0
   fi
+
   echo "Waiting for postgres server, $((RETRIES--)) remaining attempts..."
   sleep 2
 done
+
 exit 1