From 43b058430bef71e44903e47ded57cb51e801654b Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 20 Oct 2025 12:51:55 -0700 Subject: [PATCH] fix provider name --- terraform/staging/main.tf | 38 +++++++++++++++++++++++++++------- terraform/staging/providers.tf | 2 +- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 4a2af8ba9..2bbca67bd 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -33,17 +33,39 @@ data "cloudfoundry_space" "space" { } +# IF we want to upgrade from cloudfoundry communit to official, +# we need to do something like what's commented out below +# +# We also need to run +# +# terraform state replace-provider \ +# -auto-approve \ +# -state=terraform.tfstate +# 'registry.terraform.io/cloudfoundry-community/cloudfoundry' \ +# 'registry.terraform.io/cloudfoundry/cloudfoundry' \ +# module.logo_upload_bucket (or something like that) +# module "logo_upload_bucket" { +# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0" +# Right now the default is cfcommunity, remove this when default is cloudfoundry +# providers = { +# cloudfoundry = cloudfoundry.official +# } +# cf_space_id = data.cloudfoundry_space.space.id +# name = "${local.app_name}-logo-upload-bucket-${local.env}" +# } + + + module "logo_upload_bucket" { - source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0" - # Right now the default is cfcommunity, remove this when default is cloudfoundry - providers = { - cloudfoundry = cloudfoundry.official - } - # org = data.cloudfoundry_organization.org.id - cf_space_id = data.cloudfoundry_space.space.id - name = "${local.app_name}-logo-upload-bucket-${local.env}" + source = "../shared/container_networking" + + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-logo-upload-bucket-${local.env}" + } + module "api_network_route" { source = "../shared/container_networking" diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf index a2b468c2e..e14251fdf 100644 --- a/terraform/staging/providers.tf +++ b/terraform/staging/providers.tf @@ -3,7 +3,7 @@ terraform { required_providers { cloudfoundry = { source = "cloudfoundry/cloudfoundry" - version = "1.11.0" + version = "1.9.0" } cfcommunity = { source = "cloudfoundry-community/cloudfoundry"