Merge pull request #781 from hmcts/ieuanb74-patch-3

DTSPO-19297 Reverting changes
hmcts · Oct 9, 2024 · 5b3deaf · 5b3deaf
2 parents 8fd3b57 + 9ab0c9b
commit 5b3deaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/appgateway-auto-start.yaml b/.github/workflows/appgateway-auto-start.yaml
@@ -4,7 +4,7 @@ on:
   schedule:
     - cron: "30 5 * * 1-5" # Every weekday at 6:30am BST
 env:
-  DEV_ENV: "true"
+  DEV_ENV: ${{ secrets.DEV_ENV }}
 permissions:
   id-token: write
 jobs:
@@ -62,5 +62,5 @@ jobs:
         run: sleep 300
 
       - name: App Gateway Auto start status check
-        # if: env.DEV_ENV != 'true'
+        if: env.DEV_ENV != 'true'
         run: ./scripts/appgateway/appgw_status.sh start ${{ secrets.SHUTDOWN_NOTIFICATIONS_WEBHOOK }}
diff --git a/scripts/common/common-functions.sh b/scripts/common/common-functions.sh
@@ -55,17 +55,10 @@ function auto_shutdown_notification() {
 
     # This silences the slack response message in logs.
     # Comment this line out if you are having issues with slack delivery and want to see responses in your terminal
-    # local silentResponse="-s -o /dev/null"
+    local silentResponse="-s -o /dev/null"
 
-    response=$(curl $silentResponse -X POST --data-urlencode "payload={\"username\": \"Auto Shutdown Notifications\", \"text\": \"$message\", \"icon_emoji\": \":tim-webster:\"}" ${notificationSlackWebhook} 2>&1)
-    exit_code=$?
-
-    if [ $exit_code -ne 0 ]; then
-        echo "Error: $response"
-        exit $exit_code
-    else
-        echo "Success: $response"
-    fi
+    curl $silentResponse -X POST --data-urlencode "payload={\"username\": \"Auto Shutdown Notifications\", \"text\": \"$message\", \"icon_emoji\": \":tim-webster:\"}" \
+      ${notificationSlackWebhook}
 }
 
 function get_current_date() {