From ff7f54662b9c60a5422c89b17c4dd88702bd81ac Mon Sep 17 00:00:00 2001 From: Max Landes <55766175+Vacoris@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:53:56 -0500 Subject: [PATCH 1/3] feat: added deploymentOverview check for provisioning wait --- deploy.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/deploy.sh b/deploy.sh index 825fc0c..c8b9e73 100755 --- a/deploy.sh +++ b/deploy.sh @@ -51,6 +51,7 @@ function pollForSpecificDeployment() { while true; do RESPONSE=$(getSpecificDeployment "$1") + OVERVIEW_CHECK=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview') FAILED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Failed') IN_PROGRESS_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.InProgress') SKIPPED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Skipped') @@ -59,12 +60,18 @@ function pollForSpecificDeployment() { STATUS=$(echo "$RESPONSE" | jq -r '.deploymentInfo.status') echo -e "${ORANGE}Deployment in progress. Sleeping 15 seconds. (Try $((++deadlockCounter)))"; - echo -e "Instance Overview: ${RED}Failed ($FAILED_COUNT), ${BLUE}In-Progress ($IN_PROGRESS_COUNT), ${RESET_TEXT}Skipped ($SKIPPED_COUNT), ${BLUE}Pending ($PENDING_COUNT), ${GREEN}Succeeded ($SUCCESS_COUNT)" - echo -e "Deployment Status: $STATUS" - if [ "$FAILED_COUNT" -gt 0 ]; then - echo -e "${RED}Failed instance detected (Failed count over zero)." - exit 1; + if [ "$OVERVIEW_CHECK" == "null" ]; then + echo -e "Instance Overview: ${ORANGE}Currently Provisioning..." + echo -e "Deployment Status: $STATUS" + else + echo -e "Instance Overview: ${RED}Failed ($FAILED_COUNT), ${BLUE}In-Progress ($IN_PROGRESS_COUNT), ${RESET_TEXT}Skipped ($SKIPPED_COUNT), ${BLUE}Pending ($PENDING_COUNT), ${GREEN}Succeeded ($SUCCESS_COUNT)" + echo -e "Deployment Status: $STATUS" + + if [ "$FAILED_COUNT" -gt 0 ]; then + echo -e "${RED}Failed instance detected (Failed count over zero)." + exit 1; + fi fi if [ "$STATUS" = "Failed" ]; then @@ -80,6 +87,7 @@ function pollForSpecificDeployment() { echo -e "${RED}Max polling iterations reached (max_polling_iterations)." exit 1; fi + sleep 15s; done; } From 065e096271927be27cd98ed3bdb49fedc3c18bf6 Mon Sep 17 00:00:00 2001 From: Max Landes <55766175+Vacoris@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:32:21 -0500 Subject: [PATCH 2/3] refactor: simplified as we will see null for all of them for the condition --- deploy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index c8b9e73..3aa6181 100755 --- a/deploy.sh +++ b/deploy.sh @@ -51,7 +51,6 @@ function pollForSpecificDeployment() { while true; do RESPONSE=$(getSpecificDeployment "$1") - OVERVIEW_CHECK=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview') FAILED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Failed') IN_PROGRESS_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.InProgress') SKIPPED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Skipped') @@ -61,7 +60,7 @@ function pollForSpecificDeployment() { echo -e "${ORANGE}Deployment in progress. Sleeping 15 seconds. (Try $((++deadlockCounter)))"; - if [ "$OVERVIEW_CHECK" == "null" ]; then + if [ "$FAILED_COUNT" == "null" ]; then echo -e "Instance Overview: ${ORANGE}Currently Provisioning..." echo -e "Deployment Status: $STATUS" else From 16f3c8c6a2de658603f61ac7f9d94287687099af Mon Sep 17 00:00:00 2001 From: Max Landes <55766175+Vacoris@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:38:25 -0500 Subject: [PATCH 3/3] feat: add default value when not found to use with conditional --- deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 3aa6181..5713f59 100755 --- a/deploy.sh +++ b/deploy.sh @@ -51,7 +51,7 @@ function pollForSpecificDeployment() { while true; do RESPONSE=$(getSpecificDeployment "$1") - FAILED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Failed') + FAILED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Failed // "?"') IN_PROGRESS_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.InProgress') SKIPPED_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Skipped') SUCCESS_COUNT=$(echo "$RESPONSE" | jq -r '.deploymentInfo.deploymentOverview.Succeeded') @@ -60,7 +60,7 @@ function pollForSpecificDeployment() { echo -e "${ORANGE}Deployment in progress. Sleeping 15 seconds. (Try $((++deadlockCounter)))"; - if [ "$FAILED_COUNT" == "null" ]; then + if [ "$FAILED_COUNT" == "?" ]; then echo -e "Instance Overview: ${ORANGE}Currently Provisioning..." echo -e "Deployment Status: $STATUS" else