darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch terraform over to cloud.gov org

Browse Source
This commit is contained in:
Ryan Ahearn
2022-11-02 14:42:32 -04:00
parent 24cdadf3ee
commit 43201f37fa
15 changed files with 106 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
terraform/bootstrap/import.sh
View File

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

4
terraform/bootstrap/main.tf
View File

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

2
terraform/bootstrap/run.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ ! -f "secrets.auto.tfvars" ]]; then 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 fi
if [[ $# -gt 0 ]]; then if [[ $# -gt 0 ]]; then

2
terraform/bootstrap/teardown_creds.sh
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/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 rm secrets.auto.tfvars

4
terraform/bootstrap/variables.tf
View File

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

2
terraform/create_service_account.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
org="gsa-10x-prototyping" org="gsa-tts-benefits-studio-prototyping"
usage=" usage="
$0: Create a Service User Account for a given space $0: Create a Service User Account for a given space

48
terraform/demo/main.tf Normal file
View File

@@ -0,0 +1,48 @@
locals {
cf_org_name = "gsa-tts-benefits-studio-prototyping"
cf_space_name = "notify-demo"
env = "demo"
app_name = "notify-admin"
recursive_delete = false
}
module "redis" {
source = "github.com/18f/terraform-cloudgov//redis"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
env = local.env
app_name = local.app_name
recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev"
}
module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}"
}
# ##########################################################################
# The following lines need to be commented out for the initial `terraform apply`
# It can be re-enabled after:
# 1) the api app has first been deployed
# 2) the admin app has first been deployed
###########################################################################
# module "api_network_route" {
# source = "../shared/container_networking"
# cf_user = var.cf_user
# cf_password = var.cf_password
# cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name
# source_app_name = "${local.app_name}-${local.env}"
# destination_app_name = "notify-api-${local.env}"
# }

17
terraform/demo/providers.tf Normal file
View File

@@ -0,0 +1,17 @@
terraform {
required_version = "~> 1.0"
required_providers {
cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry"
version = "0.15.5"
}
}
backend "s3" {
bucket = "cg-6b759c13-6253-4a64-9bda-dd1f620185b0"
key = "admin.tfstate.demo"
encrypt = "true"
region = "us-gov-west-1"
profile = "notify-terraform-backend"
}
}

5
terraform/demo/variables.tf Normal file
View File

@@ -0,0 +1,5 @@
variable "cf_password" {
type = string
sensitive = true
}
variable "cf_user" {}

2
terraform/destroy_service_account.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
org="gsa-10x-prototyping" org="gsa-tts-benefits-studio-prototyping"
usage=" usage="
$0: Destroy a Service User Account in a given space $0: Destroy a Service User Account in a given space

8
terraform/production/main.tf
View File

@@ -1,8 +1,8 @@
locals { locals {
cf_org_name = "TKTK" cf_org_name = "gsa-tts-benefits-studio-prototyping"
cf_space_name = "TKTK" cf_space_name = "notify-prod"
env = "production" env = "production"
app_name = "notifications-admin" app_name = "notify-admin"
recursive_delete = false recursive_delete = false
} }
@@ -44,7 +44,7 @@ module "logo_upload_bucket" {
# cf_org_name = local.cf_org_name # cf_org_name = local.cf_org_name
# cf_space_name = local.cf_space_name # cf_space_name = local.cf_space_name
# source_app_name = "${local.app_name}-${local.env}" # source_app_name = "${local.app_name}-${local.env}"
# destination_app_name = "notifications-api-${local.env}" # destination_app_name = "notify-api-${local.env}"
# } # }
# ########################################################################## # ##########################################################################

2
terraform/production/providers.tf
View File

@@ -8,7 +8,7 @@ terraform {
} }
backend "s3" { backend "s3" {
bucket = "cg-31204bcc-aae3-4cd3-8b59-5055a338d44f" bucket = "cg-6b759c13-6253-4a64-9bda-dd1f620185b0"
key = "admin.tfstate.prod" key = "admin.tfstate.prod"
encrypt = "true" encrypt = "true"
region = "us-gov-west-1" region = "us-gov-west-1"

2
terraform/set_space_egress.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
org="gsa-10x-prototyping" org="gsa-tts-benefits-studio-prototyping"
usage=" usage="
$0: Set egress rules for given space $0: Set egress rules for given space

30
terraform/staging/main.tf
View File

@@ -1,8 +1,8 @@
locals { locals {
cf_org_name = "gsa-10x-prototyping" cf_org_name = "gsa-tts-benefits-studio-prototyping"
cf_space_name = "10x-notifications" cf_space_name = "notify-staging"
env = "staging" env = "staging"
app_name = "notifications-admin" app_name = "notify-admin"
recursive_delete = true recursive_delete = true
} }
@@ -30,13 +30,19 @@ module "logo_upload_bucket" {
s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}" s3_service_name = "${local.app_name}-logo-upload-bucket-${local.env}"
} }
module "api_network_route" { # ##########################################################################
source = "../shared/container_networking" # The following lines need to be commented out for the initial `terraform apply`
# It can be re-enabled after:
# 1) the api app has first been deployed
# 2) the admin app has first been deployed
###########################################################################
# module "api_network_route" {
# source = "../shared/container_networking"
cf_user = var.cf_user # cf_user = var.cf_user
cf_password = var.cf_password # cf_password = var.cf_password
cf_org_name = local.cf_org_name # cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name # cf_space_name = local.cf_space_name
source_app_name = "${local.app_name}-${local.env}" # source_app_name = "${local.app_name}-${local.env}"
destination_app_name = "notifications-api-${local.env}" # destination_app_name = "notify-api-${local.env}"
} # }

2
terraform/staging/providers.tf
View File

@@ -8,7 +8,7 @@ terraform {
} }
backend "s3" { backend "s3" {
bucket = "cg-31204bcc-aae3-4cd3-8b59-5055a338d44f" bucket = "cg-6b759c13-6253-4a64-9bda-dd1f620185b0"
key = "admin.tfstate.stage" key = "admin.tfstate.stage"
encrypt = "true" encrypt = "true"
region = "us-gov-west-1" region = "us-gov-west-1"