From e7a8e3afe80c30917290f101acbfca3fe457bb89 Mon Sep 17 00:00:00 2001 From: Ryan Ahearn Date: Thu, 22 Dec 2022 08:19:40 -0500 Subject: [PATCH 1/2] Specify terraform module versions --- terraform/demo/main.tf | 4 ++-- terraform/production/main.tf | 6 +++--- terraform/sandbox/main.tf | 4 ++-- terraform/staging/main.tf | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index fd351bc49..3a8653fcf 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -7,7 +7,7 @@ locals { } 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 @@ -20,7 +20,7 @@ module "redis" { } module "logo_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 diff --git a/terraform/production/main.tf b/terraform/production/main.tf index 88ccb5ae5..f40c3bba6 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -7,7 +7,7 @@ locals { } 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 @@ -20,7 +20,7 @@ module "redis" { } module "logo_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 @@ -55,7 +55,7 @@ module "logo_upload_bucket" { # `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 766aa2f29..390dfc5a6 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -7,7 +7,7 @@ locals { } 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 @@ -20,7 +20,7 @@ module "redis" { } module "logo_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 diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 4df6471e5..70f41fbd7 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -7,7 +7,7 @@ locals { } 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 @@ -20,7 +20,7 @@ module "redis" { } module "logo_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 From dc639feedf604c772daae2ac4fe87b08c451fb3e Mon Sep 17 00:00:00 2001 From: Ryan Ahearn Date: Thu, 22 Dec 2022 08:38:06 -0500 Subject: [PATCH 2/2] Update terraform module to v0.2.0 --- terraform/demo/main.tf | 15 ++++-------- terraform/demo/providers.tf | 7 ++++++ terraform/production/main.tf | 23 ++++++------------- terraform/production/providers.tf | 7 ++++++ terraform/sandbox/main.tf | 15 ++++-------- terraform/sandbox/providers.tf | 7 ++++++ .../shared/container_networking/providers.tf | 7 ------ .../shared/container_networking/variables.tf | 7 +----- terraform/staging/main.tf | 15 ++++-------- terraform/staging/providers.tf | 7 ++++++ 10 files changed, 48 insertions(+), 62 deletions(-) diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf index 3a8653fcf..8a6137797 100644 --- a/terraform/demo/main.tf +++ b/terraform/demo/main.tf @@ -7,27 +7,22 @@ locals { } 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 "logo_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}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { 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}" diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf index 5a7691ff0..eba9e9490 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 f40c3bba6..e479d61c1 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -7,27 +7,22 @@ locals { } 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 "logo_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}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { # 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}" @@ -55,14 +48,12 @@ module "logo_upload_bucket" { # `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 276ad5105..e0daee8b0 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 390dfc5a6..ab67c5ac7 100644 --- a/terraform/sandbox/main.tf +++ b/terraform/sandbox/main.tf @@ -7,27 +7,22 @@ locals { } 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 "logo_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}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { # 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}" diff --git a/terraform/sandbox/providers.tf b/terraform/sandbox/providers.tf index f21cfe326..5fe15f874 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/container_networking/providers.tf b/terraform/shared/container_networking/providers.tf index 6fe315c0b..8db86ca90 100644 --- a/terraform/shared/container_networking/providers.tf +++ b/terraform/shared/container_networking/providers.tf @@ -7,10 +7,3 @@ terraform { } } } - -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/container_networking/variables.tf b/terraform/shared/container_networking/variables.tf index 76f699fc4..960ee72f0 100644 --- a/terraform/shared/container_networking/variables.tf +++ b/terraform/shared/container_networking/variables.tf @@ -1,14 +1,9 @@ -variable "cf_password" { - type = string - sensitive = true -} -variable "cf_user" {} variable "cf_org_name" {} variable "cf_space_name" {} variable "source_app_name" {} variable "destination_app_name" {} variable "destination_port" { - type = string + type = string # 61443 is the port to use to enable automatic TLS termination as specified at # https://cloud.gov/docs/management/container-to-container/#configuring-secure-container-to-container-networking default = "61443" diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 70f41fbd7..dfa327cbe 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -7,27 +7,22 @@ locals { } 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 "logo_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}-logo-upload-bucket-${local.env}" + name = "${local.app_name}-logo-upload-bucket-${local.env}" } # ########################################################################## @@ -39,8 +34,6 @@ module "logo_upload_bucket" { 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}" diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index ab8e8ced0..7648e192f 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 +}