From 5a4c705a48c4da69665b56e56ade93c6e22a237b Mon Sep 17 00:00:00 2001
From: Pauline <4224001+paulineribeyre@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:49:47 -0500
Subject: [PATCH] ecr-access job: fix slack notification in case of failure

---
 kube/services/jobs/ecr-access-job.yaml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/kube/services/jobs/ecr-access-job.yaml b/kube/services/jobs/ecr-access-job.yaml
index 11979a123..46756aac2 100644
--- a/kube/services/jobs/ecr-access-job.yaml
+++ b/kube/services/jobs/ecr-access-job.yaml
@@ -65,21 +65,19 @@ spec:
           args:
             - "-c"
             - |
-              set -e
-
               cd cloud-automation/files/scripts/
               echo Installing requirements...
               pip3 install -r ecr-access-job-requirements.txt
-              python3 ecr-access-job.py
-              exitcode=$?
-
-              if [[ "${SLACK_WEBHOOK}" != 'None' ]]; then
-                if [[ $exitcode == 1 ]]; then
-                  curl -X POST --data-urlencode "payload={\"text\": \"JOBFAIL: ECR access job on ${HOSTNAME}\"}" "${SLACK_WEBHOOK}"
-                else
+              if python3 ecr-access-job.py; then
+                echo "Success - Exit code: $?"
+                if [[ "${SLACK_WEBHOOK}" != 'None' ]]; then
                   curl -X POST --data-urlencode "payload={\"text\": \"SUCCESS: ECR access job on ${HOSTNAME}\"}" "${SLACK_WEBHOOK}"
                 fi
+              else
+                exitcode=$?
+                echo "Failure - Exit code: $exitcode"
+                if [[ "${SLACK_WEBHOOK}" != 'None' ]]; then
+                  curl -X POST --data-urlencode "payload={\"text\": \"JOBFAIL: ECR access job on ${HOSTNAME}\"}" "${SLACK_WEBHOOK}"
+                fi
+                exit $exitcode
               fi
-
-              echo "Exit code: $exitcode"
-              exit "$exitcode"