darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2025-12-11 07:33:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1738 from GSA/jskinne3-upgrade-terraform-cloudgov

Browse Source 
Upgrade terraform cloudgov
This commit is contained in:
Carlo Costino
2024-07-22 12:51:37 -04:00
committed by GitHub
parent 210ea7b54b b8a62852a6
commit 7e0fa90fb2
6 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
terraform/bootstrap/main.tf
View File

@@ -1,20 +1,20 @@
locals {
cf_api_url = "https://api.fr.cloud.gov"
s3_service_name = "notify-terraform-state"
}
module "s3" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0"
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
cf_api_url = local.cf_api_url
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-management"
s3_service_name = local.s3_service_name
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-management"
name = local.s3_service_name
}
resource "cloudfoundry_service_key" "bucket_creds" {
name = "${local.s3_service_name}-access"
service_instance = module.s3.bucket_id
lifecycle {
prevent_destroy = true
}
}

2
terraform/bootstrap/providers.tf
View File

@@ -9,7 +9,7 @@ terraform {
}
provider "cloudfoundry" {
api_url = local.cf_api_url
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30

25
terraform/demo/main.tf
View File

@@ -1,9 +1,15 @@
locals {
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-demo"
env = "demo"
app_name = "notify-admin"
recursive_delete = false
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-demo"
env = "demo"
app_name = "notify-admin"
}
resource "null_resource" "prevent_destroy" {
lifecycle {
prevent_destroy = true # never destroy demo
}
}
module "redis-v70" {
@@ -21,12 +27,11 @@ module "redis-v70" {
}
module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete
name = "${local.app_name}-logo-upload-bucket-${local.env}"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-logo-upload-bucket-${local.env}"
}
# ##########################################################################

27
terraform/production/main.tf
View File

@@ -1,9 +1,15 @@
locals {
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-production"
env = "production"
app_name = "notify-admin"
recursive_delete = false
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-production"
env = "production"
app_name = "notify-admin"
}
resource "null_resource" "prevent_destroy" {
lifecycle {
prevent_destroy = true # never destroy production
}
}
module "redis-v70" {
@@ -21,12 +27,11 @@ module "redis-v70" {
}
module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete
name = "${local.app_name}-logo-upload-bucket-${local.env}"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-logo-upload-bucket-${local.env}"
}
# ##########################################################################
@@ -54,7 +59,7 @@ module "api_network_route" {
# https://cloud.gov/docs/services/external-domain-service/#how-to-create-an-instance-of-this-service
###########################################################################
module "domain" {
source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.1"
source = "github.com/18f/terraform-cloudgov//domain?ref=v0.7.1" # TODO: upgrade this
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name

25
terraform/sandbox/main.tf
View File

@@ -1,9 +1,15 @@
locals {
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-sandbox"
env = "sandbox"
app_name = "notify-admin"
recursive_delete = true
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-sandbox"
env = "sandbox"
app_name = "notify-admin"
}
resource "null_resource" "prevent_destroy" {
lifecycle {
prevent_destroy = false # destroying sandbox is allowed
}
}
module "redis-v70" {
@@ -21,12 +27,11 @@ module "redis-v70" {
}
module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete
name = "${local.app_name}-logo-upload-bucket-${local.env}"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-logo-upload-bucket-${local.env}"
}
# ##########################################################################

19
terraform/staging/main.tf
View File

@@ -1,9 +1,8 @@
locals {
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-staging"
env = "staging"
app_name = "notify-admin"
recursive_delete = true
cf_org_name = "gsa-tts-benefits-studio"
cf_space_name = "notify-staging"
env = "staging"
app_name = "notify-admin"
}
resource "null_resource" "prevent_destroy" {
@@ -13,7 +12,6 @@ resource "null_resource" "prevent_destroy" {
}
}
module "redis-v70" {
source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
@@ -29,12 +27,11 @@ module "redis-v70" {
}
module "logo_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.7.1"
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
recursive_delete = local.recursive_delete
name = "${local.app_name}-logo-upload-bucket-${local.env}"
cf_org_name = local.cf_org_name
cf_space_name = local.cf_space_name
name = "${local.app_name}-logo-upload-bucket-${local.env}"
}
# ##########################################################################