From ea7d8e77bb4eb11ba8d12058ba150847e5235432 Mon Sep 17 00:00:00 2001 From: Elliott Shugerman Date: Sun, 25 Sep 2022 13:24:12 -0400 Subject: [PATCH] make access id/key optional (closes #21) --- src/backup.sh | 18 ++++++------------ src/restore.sh | 18 ++++++------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/backup.sh b/src/backup.sh index 48a99c0..70040c6 100644 --- a/src/backup.sh +++ b/src/backup.sh @@ -3,16 +3,6 @@ set -eu set -o pipefail -if [ -z "$S3_ACCESS_KEY_ID" ]; then - echo "You need to set the S3_ACCESS_KEY_ID environment variable." - exit 1 -fi - -if [ -z "$S3_SECRET_ACCESS_KEY" ]; then - echo "You need to set the S3_SECRET_ACCESS_KEY environment variable." - exit 1 -fi - if [ -z "$S3_BUCKET" ]; then echo "You need to set the S3_BUCKET environment variable." exit 1 @@ -50,8 +40,12 @@ else fi -export AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID -export AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY +if [ -n "$S3_ACCESS_KEY_ID" ]; then + export AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID +fi +if [ -n "$S3_SECRET_ACCESS_KEY" ]; then + export AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY +fi export AWS_DEFAULT_REGION=$S3_REGION export PGPASSWORD=$POSTGRES_PASSWORD diff --git a/src/restore.sh b/src/restore.sh index 634e136..9762afe 100644 --- a/src/restore.sh +++ b/src/restore.sh @@ -3,16 +3,6 @@ set -u set -o pipefail -if [ -z "$S3_ACCESS_KEY_ID" ]; then - echo "You need to set the S3_ACCESS_KEY_ID environment variable." - exit 1 -fi - -if [ -z "$S3_SECRET_ACCESS_KEY" ]; then - echo "You need to set the S3_SECRET_ACCESS_KEY environment variable." - exit 1 -fi - if [ -z "$S3_BUCKET" ]; then echo "You need to set the S3_BUCKET environment variable." exit 1 @@ -52,8 +42,12 @@ else fi -export AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID -export AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY +if [ -n "$S3_ACCESS_KEY_ID" ]; then + export AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID +fi +if [ -n "$S3_SECRET_ACCESS_KEY" ]; then + export AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY +fi export AWS_DEFAULT_REGION=$S3_REGION export PGPASSWORD=$POSTGRES_PASSWORD