openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

scripts/maintenance/clean-aws.sh: Skip $tag_file for unset --tag-file

Browse Source 
d541760f (scripts/maintenance/*-aws: Drop --workspace-dir,
2018-07-08, #34) cleaned up some related handling, but missed this.
Before this commit, an unset --tag-file would have resulted in a
useless $tag_file creation which was never written to, and the
"Deleting resources with the following tags:" line wouldn't actually
print the actual tag.json content.
This commit is contained in:
W. Trevor King
2018-07-26 10:05:58 -07:00
parent c6c6bf0647
commit 99dffe7070
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/maintenance/clean-aws.sh
View File

@@ -124,8 +124,6 @@ fi
if [ -n "$tag_file" ]; then
cat "$tag_file" >"$tmp_dir/tag.json"
else
tag_file="$(mktemp -p "$tmp_dir")"
date_string="$(date "+%Y-%m-%d" -d "-1 day")\",\"$(date "+%Y-%-m-%-d" -d "-1 day")\",
\"$(date "+%m-%-d-%-Y" -d "-1 day")\",\"$(date "+%-m-%-d-%-Y" -d "-1 day")\",\"$(date "+%d-%m-%-Y" -d "-1 day")\",
\"$(date "+%d-%-m-%-Y" -d "-1 day")\",\"$(date +%m-%d-%Y)\",\"$(date +%d-%m-%Y)\",
@@ -140,7 +138,7 @@ EOF
fi
echo "Deleting resources with the following tags:"
jq '.' "$tag_file"
jq '.' "$tmp_dir/tag.json"
if [ -n "$dry_run" ]; then
echo "Dry run flag set. Not deleting any resources."