Merge pull request #3031 from SEED-platform/fix-backup-filename

Fix k8s backup filename
SEED-platform · Dec 13, 2021 · 519f2fc · 519f2fc
2 parents 0777831 + 51e371e
commit 519f2fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/docker/backup_k8s/Dockerfile b/docker/backup_k8s/Dockerfile
@@ -5,7 +5,9 @@
 # script that is copied into this container for use by helm/k8s batch/CronJob.
 
 # docker build -t seedplatform/seed-backup-k8s .
-# docker push seedplatform/seed-backup-k8s:latest
+# tag this as needed, latest is automaticallly pulled by helm at the moment.
+# docker tag seedplatform/seed-backup-k8s:latest seedplatform/seed-backup-k8s:{tag}
+# docker push seedplatform/seed-backup-k8s:{tag}
 
 FROM ubuntu:20.04
 

diff --git a/docker/backup_k8s/backup_database.sh b/docker/backup_k8s/backup_database.sh
@@ -90,10 +90,11 @@ do
   echo "Backing up $file to $S3_BUCKET/$RUN_DATE/"
   if [ ! -s $file ]; then
     # the file is empty, send an error
-    send_slack_notification "[ERROR-$ENVIRONMENT]-PostgreSQL-backup-file-was-empty"
+    send_slack_notification "[ERROR-$ENVIRONMENT]-PostgreSQL-backup-file-was-empty-or-missing"
   else
+    # can't pass spaces to slack notifications, for now
     aws s3 cp $file $S3_BUCKET/$RUN_DATE/
-    send_slack_notification "[$ENVIRONMENT]-PostgreSQL-uploaded-to-s3://$S3_BUCKET/$RUN_DATE/$file"
+    send_slack_notification "[$ENVIRONMENT]-PostgreSQL-uploaded-to-$S3_BUCKET/$RUN_DATE/$(basename $file)"
   fi
 done
 
@@ -103,10 +104,11 @@ do
 
   if [ ! -s $file ]; then
     # the file is empty, send an error
-    send_slack_notification "[ERROR-$ENVIRONMENT]-Mediadata-backup-file-was-empty"
+    send_slack_notification "[ERROR-$ENVIRONMENT]-Mediadata-backup-file-was-empty-or-missing"
   else
+    # can't pass spaces to slack notifications, for now
     aws s3 cp $file $S3_BUCKET/$RUN_DATE/
-    send_slack_notification "[$ENVIRONMENT]-Mediadata-uploaded-to-s3://$S3_BUCKET/$RUN_DATE/$file"
+    send_slack_notification "[$ENVIRONMENT]-Mediadata-uploaded-to-$S3_BUCKET/$RUN_DATE/$(basename $file)"
   fi
 done