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

Update terraform module to v0.2.0

Browse Source
This commit is contained in:
Ryan Ahearn
2022-12-22 08:57:16 -05:00
parent 469e2a2fc0
commit f967d2a478
11 changed files with 69 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
terraform/demo/main.tf
View File

@@ -7,58 +7,46 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-rds-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
rds_plan_name = "micro-psql" rds_plan_name = "micro-psql"
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-csv-upload-bucket-${local.env}" name = "${local.app_name}-csv-upload-bucket-${local.env}"
} }
module "contact_list_bucket" { module "contact_list_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-contact-list-bucket-${local.env}" name = "${local.app_name}-contact-list-bucket-${local.env}"
} }
module "egress-space" { module "egress-space" {
source = "../shared/egress_space" source = "../shared/egress_space"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_restricted_space_name = local.cf_space_name cf_restricted_space_name = local.cf_space_name
deployers = [ deployers = [

7
terraform/demo/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" profile = "notify-terraform-backend"
} }
} }
provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}

36
terraform/production/main.tf
View File

@@ -7,58 +7,46 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-rds-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
rds_plan_name = "TKTK-production-rds-plan" rds_plan_name = "TKTK-production-rds-plan"
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "TKTK-production-redis-plan" redis_plan_name = "TKTK-production-redis-plan"
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-csv-upload-bucket-${local.env}" name = "${local.app_name}-csv-upload-bucket-${local.env}"
} }
module "contact_list_bucket" { module "contact_list_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-contact-list-bucket-${local.env}" name = "${local.app_name}-contact-list-bucket-${local.env}"
} }
module "egress-space" { module "egress-space" {
source = "../shared/egress_space" source = "../shared/egress_space"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_restricted_space_name = local.cf_space_name cf_restricted_space_name = local.cf_space_name
deployers = [ deployers = [
@@ -74,14 +62,12 @@ module "egress-space" {
# `cf create-domain TKTK-org-name TKTK-production-domain-name` # `cf create-domain TKTK-org-name TKTK-production-domain-name`
########################################################################### ###########################################################################
# module "domain" { # module "domain" {
# source = "github.com/18f/terraform-cloudgov//domain?ref=v0.1.0" # source = "github.com/18f/terraform-cloudgov//domain?ref=v0.2.0"
# #
# cf_user = var.cf_user
# 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
# env = local.env # app_name_or_id = "${local.app_name}-${local.env}"
# app_name = local.app_name # name = "${local.app_name}-domain-${local.env}"
# recursive_delete = local.recursive_delete # recursive_delete = local.recursive_delete
# cdn_plan_name = "domain" # cdn_plan_name = "domain"
# domain_name = "TKTK-production-domain-name" # domain_name = "TKTK-production-domain-name"

7
terraform/production/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" profile = "notify-terraform-backend"
} }
} }
provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}

28
terraform/sandbox/main.tf
View File

@@ -7,58 +7,46 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-rds-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
rds_plan_name = "micro-psql" rds_plan_name = "micro-psql"
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-csv-upload-bucket-${local.env}" name = "${local.app_name}-csv-upload-bucket-${local.env}"
} }
module "contact_list_bucket" { module "contact_list_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-contact-list-bucket-${local.env}" name = "${local.app_name}-contact-list-bucket-${local.env}"
} }
module "egress-space" { module "egress-space" {
source = "../shared/egress_space" source = "../shared/egress_space"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_restricted_space_name = local.cf_space_name cf_restricted_space_name = local.cf_space_name
deployers = [ deployers = [

7
terraform/sandbox/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" profile = "notify-terraform-backend"
} }
} }
provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}

10
terraform/shared/egress_space/main.tf
View File

@@ -12,7 +12,7 @@ data "cloudfoundry_org" "org" {
resource "cloudfoundry_space" "public_egress" { resource "cloudfoundry_space" "public_egress" {
name = "${var.cf_restricted_space_name}-egress" name = "${var.cf_restricted_space_name}-egress"
org = data.cloudfoundry_org.org.id org = data.cloudfoundry_org.org.id
} }
### ###
@@ -21,8 +21,8 @@ resource "cloudfoundry_space" "public_egress" {
data "cloudfoundry_user" "users" { data "cloudfoundry_user" "users" {
for_each = var.deployers for_each = var.deployers
name = each.key name = each.key
org_id = data.cloudfoundry_org.org.id org_id = data.cloudfoundry_org.org.id
} }
locals { locals {
@@ -30,7 +30,7 @@ locals {
} }
resource "cloudfoundry_space_users" "deployers" { resource "cloudfoundry_space_users" "deployers" {
space = cloudfoundry_space.public_egress.id space = cloudfoundry_space.public_egress.id
managers = local.user_ids managers = local.user_ids
developers = local.user_ids developers = local.user_ids
} }

9
terraform/shared/egress_space/providers.tf
View File

@@ -2,15 +2,8 @@ terraform {
required_version = "~> 1.0" required_version = "~> 1.0"
required_providers { required_providers {
cloudfoundry = { cloudfoundry = {
source = "cloudfoundry-community/cloudfoundry" source = "cloudfoundry-community/cloudfoundry"
version = "~> 0.15" version = "~> 0.15"
} }
} }
} }
provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}

5
terraform/shared/egress_space/variables.tf
View File

@@ -1,8 +1,3 @@
variable "cf_password" {
type = string
sensitive = true
}
variable "cf_user" {}
variable "cf_org_name" {} variable "cf_org_name" {}
variable "cf_restricted_space_name" {} variable "cf_restricted_space_name" {}
variable "deployers" { variable "deployers" {

28
terraform/staging/main.tf
View File

@@ -7,58 +7,46 @@ locals {
} }
module "database" { module "database" {
source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//database?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-rds-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
rds_plan_name = "micro-psql" rds_plan_name = "micro-psql"
} }
module "redis" { module "redis" {
source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//redis?ref=v0.2.0"
cf_user = var.cf_user
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
env = local.env name = "${local.app_name}-redis-${local.env}"
app_name = local.app_name
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
redis_plan_name = "redis-dev" redis_plan_name = "redis-dev"
} }
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-csv-upload-bucket-${local.env}" name = "${local.app_name}-csv-upload-bucket-${local.env}"
} }
module "contact_list_bucket" { module "contact_list_bucket" {
source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" source = "github.com/18f/terraform-cloudgov//s3?ref=v0.2.0"
cf_user = var.cf_user
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
recursive_delete = local.recursive_delete recursive_delete = local.recursive_delete
s3_service_name = "${local.app_name}-contact-list-bucket-${local.env}" name = "${local.app_name}-contact-list-bucket-${local.env}"
} }
module "egress-space" { module "egress-space" {
source = "../shared/egress_space" source = "../shared/egress_space"
cf_user = var.cf_user
cf_password = var.cf_password
cf_org_name = local.cf_org_name cf_org_name = local.cf_org_name
cf_restricted_space_name = local.cf_space_name cf_restricted_space_name = local.cf_space_name
deployers = [ deployers = [

7
terraform/staging/providers.tf
View File

@@ -15,3 +15,10 @@ terraform {
profile = "notify-terraform-backend" profile = "notify-terraform-backend"
} }
} }
provider "cloudfoundry" {
api_url = "https://api.fr.cloud.gov"
user = var.cf_user
password = var.cf_password
app_logs_max = 30
}