Terraform Provider Upgrade (#4406)

* Bootstrap module update * Meta provider update * Bootstrap-env template update * Preview local file regeneration * Dev local file regeneration * Fix preview provider * Fix dev provider * Fix shared env provider * Upgrade dev terraform lock * Upgrade preview lock * Change template * Full provider upgrade * fix glob issue on basename * Fix init.sh to prevent basename issues * Terraform Lock * Terraform Lock - Meta
GSA-TTS · Nov 8, 2024 · ba40962 · ba40962
1 parent 2e85c7d
commit ba40962
Show file tree

Hide file tree

Showing 22 changed files with 449 additions and 258 deletions.
diff --git a/terraform/dev/.terraform.lock.hcl b/terraform/dev/.terraform.lock.hcl
diff --git a/terraform/dev/init.sh b/terraform/dev/init.sh
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/dev/providers-managed.tf b/terraform/dev/providers-managed.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
+}
diff --git a/terraform/meta/.terraform.lock.hcl b/terraform/meta/.terraform.lock.hcl
diff --git a/terraform/meta/bootstrap-env/providers.tf b/terraform/meta/bootstrap-env/providers.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
     github = {
       source  = "integrations/github"
       version = "~>5.12.0"
     }
   }
-}
+}
diff --git a/terraform/meta/bootstrap-env/space.tf b/terraform/meta/bootstrap-env/space.tf
@@ -10,9 +10,10 @@ data "cloudfoundry_asg" "asgs" {
 
 # Ensure the space exists and is configured as expected
 resource "cloudfoundry_space" "space" {
-  name      = var.name
-  org       = data.cloudfoundry_org.org.id
-  allow_ssh = var.allow_ssh
+  name                     = var.name
+  org                      = data.cloudfoundry_org.org.id
+  allow_ssh                = var.allow_ssh
+  delete_recursive_allowed = false
 }
 
 resource "cloudfoundry_space_asgs" "space_asgs" {

diff --git a/terraform/meta/bootstrap-env/templates/init.sh-template b/terraform/meta/bootstrap-env/templates/init.sh-template
@@ -6,5 +6,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
-
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"
diff --git a/terraform/meta/bootstrap-env/templates/providers.tf-template b/terraform/meta/bootstrap-env/templates/providers.tf-template
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.51.3"
+      version = "~>0.53.1"
     }
   }
 
@@ -26,4 +26,4 @@ provider "cloudfoundry" {
   api_url  = "https://api.fr.cloud.gov"
   user     = var.cf_user
   password = var.cf_password
-}
+}
diff --git a/terraform/meta/bootstrap/.terraform.lock.hcl b/terraform/meta/bootstrap/.terraform.lock.hcl
diff --git a/terraform/meta/bootstrap/providers.tf b/terraform/meta/bootstrap/providers.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     cloudfoundry = {
       source  = "cloudfoundry-community/cloudfoundry"
-      version = "~>0.50.2"
+      version = "~>0.53.1"
     }
   }
 }
@@ -13,4 +13,4 @@ provider "cloudfoundry" {
   user         = var.cf_user
   password     = var.cf_password
   app_logs_max = 30
-}
+}
diff --git a/terraform/meta/init.sh b/terraform/meta/init.sh
@@ -3,4 +3,4 @@
 set -e
 terraform init \
   --backend-config=../shared/config/backend.tfvars \
-  --backend-config=key=terraform.tfstate.$(basename $(pwd))
+  --backend-config=key=terraform.tfstate."$(basename "$(pwd)")"