Break teardown into separate scripts

docker/Dockerfile

@@ -16,6 +16,7 @@ COPY docker/deployment-one-time-setup.sh /build/
 COPY docker/prep-deployments.sh /build/
 COPY docker/deploy-cumulus.sh /build/
 COPY docker/teardown.sh /build/
+COPY docker/teardown-one-time-setup.sh /build/
 COPY docker/deploy-all.sh /build/
 COPY docker/print-connection-commands.sh /
 

docker/README.md

@@ -127,6 +127,10 @@ To save money and resources, when finished with your Cumulus deployment you can
 
 `sh build/teardown.sh`
 
+then, upon success:
+
+`sh build/teardown-one-time-setup.sh`
+
 Teardown output can be viewed in the console.
 
 # Scripts
@@ -149,7 +153,11 @@ Execute one-time setup steps for the deployment.
 
 ## teardown.sh
 
-Tears down all resources deployed by `deploy-all.sh` and `build/deployment-one-time-setup.sh`.
+Tears down all resources deployed by `deploy-all.sh`.
+
+## teardown-one-time-setup.sh
+
+Tears down all resources deployed by `build/deployment-one-time-setup.sh`. This is separate from `teardown.sh` to make sure the teardown function is complete before tearing down buckets, particularly the tf-state bucket.
 
 ## print-connection-commands.sh
 

docker/teardown-one-time-setup.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+### TEARDOWN TEA SECRET ###
+
+echo Cleaning up TEA secret for prefix $PREFIX
+
+aws secretsmanager delete-secret --secret-id $PREFIX"_jwt_secret_for_tea" --force-delete-without-recovery
+
+### TEARDOWN BUCKETS ###
+
+echo Cleaning up buckets for prefix $PREFIX
+
+aws s3 rb s3://$PREFIX-tf-state --force
+aws s3 rb s3://$PREFIX-internal --force
+aws s3 rb s3://$PREFIX-public --force
+aws s3 rb s3://$PREFIX-private --force
+aws s3 rb s3://$PREFIX-protected --force

docker/teardown.sh

@@ -10,10 +10,6 @@ cd deploy/cumulus-tf
 
 ../../terraform destroy -auto-approve -input=false
 
-### TEARDOWN TEA SECRET ###
-
-aws secretsmanager delete-secret --secret-id $PREFIX"_jwt_secret_for_tea" --force-delete-without-recovery
-
 ### TEARDOWN DATA MIGRATION ###
 
 echo Tearing down Data Migration
@@ -54,14 +50,6 @@ cd ../rds-cluster-tf
 
 ../../terraform destroy -auto-approve -input=false
 
-### TEARDOWN BUCKETS ###
-
-aws s3 rb s3://$PREFIX-tf-state --force
-aws s3 rb s3://$PREFIX-internal --force
-aws s3 rb s3://$PREFIX-public --force
-aws s3 rb s3://$PREFIX-private --force
-aws s3 rb s3://$PREFIX-protected --force
-
 ### TEARDOWN CLEANUP ###
 
 rm -rf ../data-persistence-delete