Skip to content

Commit 103430f

Browse files
authored
Fix bad substitution error in hourly resource cleaner. (#806)
1 parent 0f20eb9 commit 103430f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

tools/workflow/clean-terraform-resources.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ set -ex
1717

1818
bucket_name="soaking-terraform-state"
1919
# ensure we are using gnudate
20-
yesterday=$(docker run ubuntu date -d 'yesterday' '+%Y-%m-%d')
20+
yesterday=$(docker run ubuntu date -d "yesterday" "+%Y-%m-%d")
2121

2222
terraform_destroy() {
23-
key_name=${1}
23+
key_name=$(echo "${1}" | tr -d '"')
2424
echo "destroy the terraform resource"
2525
echo "download s3 object: ${bucket_name}/${key_name}"
2626
aws s3 cp "s3://${bucket_name}/${key_name}" "downloaded_terraform/${key_name}"
@@ -30,17 +30,16 @@ terraform_destroy() {
3030
terraform init
3131
terraform destroy -auto-approve
3232
cd -
33-
fi
33+
fi
3434
echo "remove s3 key: ${key_name}"
3535
# use hard code bucket name here in case we mistakenly delete false bucket
36-
aws s3 rm s3://soaking-terraform-state/"${key_name}"
36+
aws s3 rm "s3://soaking-terraform-state/${key_name}"
3737
rm -rf testing-framework
3838
}
3939

40-
s3_keys=$(aws s3api list-objects-v2 --bucket ${bucket_name} --query "Contents[?LastModified < '${yesterday}'].Key")
40+
s3_keys=$(aws s3api list-objects-v2 --bucket "${bucket_name}" --query "Contents[?LastModified < '${yesterday}'].Key")
4141

42-
echo "${s3_keys}" | docker run --rm -i stedolan/jq -c '.[]' | while read -r i; do
43-
key_name=${i:1:$((${#i}-2))}
42+
echo "${s3_keys}" | docker run --rm -i stedolan/jq -c '.[]' | while read -r key_name; do
4443
terraform_destroy "${key_name}"
4544
done
4645

0 commit comments

Comments
 (0)