From 103d9f34b707cdaf944ddb81fb6cd6e69584e6bd Mon Sep 17 00:00:00 2001 From: miampf Date: Wed, 6 Mar 2024 14:49:06 +0100 Subject: [PATCH] cleaned up shell script to be more compliant with shellcheck --- .../actions/e2e_cleanup_timeframe/e2e-cleanup.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh b/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh index 26aecbc8d..d1f9c9536 100755 --- a/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh +++ b/.github/actions/e2e_cleanup_timeframe/e2e-cleanup.sh @@ -34,6 +34,7 @@ function delete_iam_config { # check if the password for artifact decryption was given if [[ -z $ENCRYPTION_SECRET ]]; then echo "ENCRYPTION_SECRET is not set. Please set an environment variable with that secret." + exit 1 fi artifact_pwd=$ENCRYPTION_SECRET @@ -54,13 +55,19 @@ echo "[*] retrieving run IDs for cleanup" database_ids=() for d in "${dates_to_clean[@]}"; do echo " retrieving run IDs from $d" - database_ids+=($(get_e2e_test_ids_on_date "$d")) + mapfile -td " " tmp < <(get_e2e_test_ids_on_date "$d") + database_ids+="${tmp[@]}" done +# cleanup database_ids +mapfile -t database_ids <<<"$database_ids" + echo "[*] downloading terraform state artifacts" for id in "${database_ids[@]}"; do - echo " downloading from workflow $id" - download_tfstate_artifact "$id" + if [[ -n "$id" ]]; then + echo " downloading from workflow $id" + download_tfstate_artifact "$id" + fi done echo "[*] extracting artifacts"