Switch terraform over to cloud.gov org

terraform/bootstrap/import.sh

@@ -4,8 +4,8 @@ read -p "Are you sure you want to import terraform state (y/n)? " verify
 
 if [[ $verify == "y" ]]; then
   echo "Importing bootstrap state"
-  ./run.sh import module.s3.cloudfoundry_service_instance.bucket 31204bcc-aae3-4cd3-8b59-5055a338d44f
-  ./run.sh import cloudfoundry_service_key.bucket_creds 483a6ac5-4ba0-48ad-9850-ef87b51aaa08
+  ./run.sh import module.s3.cloudfoundry_service_instance.bucket 6b759c13-6253-4a64-9bda-dd1f620185b0
+  ./run.sh import cloudfoundry_service_key.bucket_creds a8e40295-68b7-42ba-8955-d82ba262e948
   ./run.sh plan
 else
   echo "Not importing bootstrap state"

terraform/bootstrap/main.tf

@@ -9,8 +9,8 @@ module "s3" {
   cf_api_url      = local.cf_api_url
   cf_user         = var.cf_user
   cf_password     = var.cf_password
-  cf_org_name     = "gsa-10x-prototyping"
-  cf_space_name   = "10x-notifications"
+  cf_org_name     = "gsa-tts-benefits-studio-prototyping"
+  cf_space_name   = "notify-management"
   s3_service_name = local.s3_service_name
 }
 

terraform/bootstrap/run.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [[ ! -f "secrets.auto.tfvars" ]]; then
-  ../create_service_account.sh -s 10x-notifications -u config-bootstrap-deployer > secrets.auto.tfvars
+  ../create_service_account.sh -s notify-management -u config-bootstrap-deployer > secrets.auto.tfvars
 fi
 
 if [[ $# -gt 0 ]]; then

terraform/bootstrap/teardown_creds.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-../destroy_service_account.sh -s 10x-notifications -u config-bootstrap-deployer
+../destroy_service_account.sh -s notify-management -u config-bootstrap-deployer
 
 rm secrets.auto.tfvars

terraform/bootstrap/variables.tf

@@ -1,2 +1,4 @@
-variable "cf_password" {}
+variable "cf_password" {
+  sensitive = true
+}
 variable "cf_user" {}