Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix(Terraform): Change AWS AZ
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
terraform.sh
diff --git
a/resources/libraries/bash/function/terraform.sh
b/resources/libraries/bash/function/terraform.sh
index
c076f52
..
ed3bda3
100644
(file)
--- a/
resources/libraries/bash/function/terraform.sh
+++ b/
resources/libraries/bash/function/terraform.sh
@@
-34,7
+34,10
@@
function terraform_apply () {
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
export TF_LOG=INFO
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
export TF_LOG=INFO
- terraform apply -auto-approve || die "Failed to run terraform apply!"
+ trap 'terraform_destroy' ERR || {
+ die "Trap attempt failed, please cleanup manually. Aborting!"
+ }
+ terraform apply -no-color -auto-approve || die "Terraform apply failed!"
popd || die "Popd failed!"
popd || die "Popd failed!"
}
popd || die "Popd failed!"
popd || die "Popd failed!"
}
@@
-57,7
+60,7
@@
function terraform_destroy () {
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
export TF_LOG=INFO
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
export TF_LOG=INFO
- terraform destroy -auto-approve
|| die "Failed to run terraform destroy
!"
+ terraform destroy -auto-approve
-no-color || die "Terraform destroy failed
!"
popd || die "Popd failed!"
popd || die "Popd failed!"
}
popd || die "Popd failed!"
popd || die "Popd failed!"
}