From 469e2a2fc0fbc7afd857c92f48b0ef013681b742 Mon Sep 17 00:00:00 2001 From: Ryan Ahearn Date: Thu, 22 Dec 2022 08:51:15 -0500 Subject: [PATCH 1/2] Specify terraform module versions --- terraform/demo/main.tf | 8 ++++---- terraform/production/main.tf | 10 +++++----- terraform/sandbox/main.tf | 8 ++++---- terraform/staging/main.tf | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index cb703cf50..e609c8c34 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -7,7 +7,7 @@ locals { } module "database" { - source = "github.com/18f/terraform-cloudgov//database" + source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -20,7 +20,7 @@ module "database" { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -33,7 +33,7 @@ module "redis" { } module "csv_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -44,7 +44,7 @@ module "csv_upload_bucket" { } module "contact_list_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password diff --git a/terraform/production/main.tf b/terraform/production/main.tf index e32610a37..cd9fb7126 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -7,7 +7,7 @@ locals { } module "database" { - source = "github.com/18f/terraform-cloudgov//database" + source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -20,7 +20,7 @@ module "database" { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -33,7 +33,7 @@ module "redis" { } module "csv_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -44,7 +44,7 @@ module "csv_upload_bucket" { } module "contact_list_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -74,7 +74,7 @@ module "egress-space" { # `cf create-domain TKTK-org-name TKTK-production-domain-name` ########################################################################### # module "domain" { -# source = "github.com/18f/terraform-cloudgov//domain" +# source = "github.com/18f/terraform-cloudgov//domain?ref=v0.1.0" # # cf_user = var.cf_user # cf_password = var.cf_password diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 96e0338ab..1a692080a 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -7,7 +7,7 @@ locals { } module "database" { - source = "github.com/18f/terraform-cloudgov//database" + source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -20,7 +20,7 @@ module "database" { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -33,7 +33,7 @@ module "redis" { } module "csv_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -44,7 +44,7 @@ module "csv_upload_bucket" { } module "contact_list_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 911e9d8b9..5a2143090 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -7,7 +7,7 @@ locals { } module "database" { - source = "github.com/18f/terraform-cloudgov//database" + source = "github.com/18f/terraform-cloudgov//database?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -20,7 +20,7 @@ module "database" { } module "redis" { - source = "github.com/18f/terraform-cloudgov//redis" + source = "github.com/18f/terraform-cloudgov//redis?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -33,7 +33,7 @@ module "redis" { } module "csv_upload_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password @@ -44,7 +44,7 @@ module "csv_upload_bucket" { } module "contact_list_bucket" { - source = "github.com/18f/terraform-cloudgov//s3" + source = "github.com/18f/terraform-cloudgov//s3?ref=v0.1.0" cf_user = var.cf_user cf_password = var.cf_password From f967d2a4788da99a710275b08b9f54989f4d1483 Mon Sep 17 00:00:00 2001 From: Ryan Ahearn Date: Thu, 22 Dec 2022 08:57:16 -0500 Subject: [PATCH 2/2] Update terraform module to v0.2.0 --- terraform/demo/main.tf | 28 +++++------------ terraform/demo/providers.tf | 7 +++++ terraform/production/main.tf | 36 +++++++--------------- terraform/production/providers.tf | 7 +++++ terraform/sandbox/main.tf | 28 +++++------------ terraform/sandbox/providers.tf | 7 +++++ terraform/shared/egress_space/main.tf | 10 +++--- terraform/shared/egress_space/providers.tf | 9 +----- terraform/shared/egress_space/variables.tf | 5 --- terraform/staging/main.tf | 28 +++++------------ terraform/staging/providers.tf | 7 +++++ 11 files changed, 69 insertions(+), 103 deletions(-) diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index e609c8c34..86ce9ba53 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -7,58 +7,46 @@ locals { } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-rds-${local.env}" recursive_delete = local.recursive_delete rds_plan_name = "micro-psql" } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } 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_space_name = local.cf_space_name 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" { - 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_space_name = local.cf_space_name 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" { source = "../shared/egress_space" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf index 11d4c4457..180959761 100644 --- a/terraform/demo/providers.tf +++ b/terraform/demo/providers.tf @@ -15,3 +15,10 @@ terraform { 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 +} diff --git a/terraform/production/main.tf b/terraform/production/main.tf index cd9fb7126..2bcae487b 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -7,58 +7,46 @@ locals { } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-rds-${local.env}" recursive_delete = local.recursive_delete rds_plan_name = "TKTK-production-rds-plan" } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "TKTK-production-redis-plan" } 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_space_name = local.cf_space_name 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" { - 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_space_name = local.cf_space_name 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" { source = "../shared/egress_space" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ @@ -74,14 +62,12 @@ module "egress-space" { # `cf create-domain TKTK-org-name TKTK-production-domain-name` ########################################################################### # 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_space_name = local.cf_space_name -# env = local.env -# app_name = local.app_name +# app_name_or_id = "${local.app_name}-${local.env}" +# name = "${local.app_name}-domain-${local.env}" # recursive_delete = local.recursive_delete # cdn_plan_name = "domain" # domain_name = "TKTK-production-domain-name" diff --git a/terraform/production/providers.tf b/terraform/production/providers.tf index f4cfe869a..360f648f4 100644 --- a/terraform/production/providers.tf +++ b/terraform/production/providers.tf @@ -15,3 +15,10 @@ terraform { 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 +} diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf index 1a692080a..6e8bb11f2 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -7,58 +7,46 @@ locals { } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-rds-${local.env}" recursive_delete = local.recursive_delete rds_plan_name = "micro-psql" } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } 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_space_name = local.cf_space_name 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" { - 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_space_name = local.cf_space_name 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" { source = "../shared/egress_space" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf index 0cab42f6f..00ea2888d 100644 --- a/terraform/sandbox/providers.tf +++ b/terraform/sandbox/providers.tf @@ -15,3 +15,10 @@ terraform { 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 +} diff --git a/terraform/shared/egress_space/main.tf b/terraform/shared/egress_space/main.tf index 4a65b74e9..4b841ad14 100644 --- a/terraform/shared/egress_space/main.tf +++ b/terraform/shared/egress_space/main.tf @@ -12,7 +12,7 @@ data "cloudfoundry_org" "org" { resource "cloudfoundry_space" "public_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" { for_each = var.deployers - name = each.key - org_id = data.cloudfoundry_org.org.id + name = each.key + org_id = data.cloudfoundry_org.org.id } locals { @@ -30,7 +30,7 @@ locals { } resource "cloudfoundry_space_users" "deployers" { - space = cloudfoundry_space.public_egress.id - managers = local.user_ids + space = cloudfoundry_space.public_egress.id + managers = local.user_ids developers = local.user_ids } diff --git a/terraform/shared/egress_space/providers.tf b/terraform/shared/egress_space/providers.tf index ad8addecd..8db86ca90 100644 --- a/terraform/shared/egress_space/providers.tf +++ b/terraform/shared/egress_space/providers.tf @@ -2,15 +2,8 @@ terraform { required_version = "~> 1.0" required_providers { cloudfoundry = { - source = "cloudfoundry-community/cloudfoundry" + source = "cloudfoundry-community/cloudfoundry" version = "~> 0.15" } } } - -provider "cloudfoundry" { - api_url = "https://api.fr.cloud.gov" - user = var.cf_user - password = var.cf_password - app_logs_max = 30 -} diff --git a/terraform/shared/egress_space/variables.tf b/terraform/shared/egress_space/variables.tf index 1ab080dea..45bcc717d 100644 --- a/terraform/shared/egress_space/variables.tf +++ b/terraform/shared/egress_space/variables.tf @@ -1,8 +1,3 @@ -variable "cf_password" { - type = string - sensitive = true -} -variable "cf_user" {} variable "cf_org_name" {} variable "cf_restricted_space_name" {} variable "deployers" { diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 5a2143090..a2ea6d0d8 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -7,58 +7,46 @@ locals { } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-rds-${local.env}" recursive_delete = local.recursive_delete rds_plan_name = "micro-psql" } 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_space_name = local.cf_space_name - env = local.env - app_name = local.app_name + name = "${local.app_name}-redis-${local.env}" recursive_delete = local.recursive_delete redis_plan_name = "redis-dev" } 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_space_name = local.cf_space_name 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" { - 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_space_name = local.cf_space_name 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" { source = "../shared/egress_space" - cf_user = var.cf_user - cf_password = var.cf_password cf_org_name = local.cf_org_name cf_restricted_space_name = local.cf_space_name deployers = [ diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index 72a7c30f6..181b5fd69 100644 --- a/terraform/staging/providers.tf +++ b/terraform/staging/providers.tf @@ -15,3 +15,10 @@ terraform { 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 +}