Merge pull request #4447 from GSA-TTS/main

GSA-TTS · Nov 9, 2024 · ba301ae · ba301ae
2 parents 7453a44 + 24a933e
commit ba301ae
Show file tree

Hide file tree

Showing 32 changed files with 605 additions and 435 deletions.
diff --git a/terraform/dev/.terraform.lock.hcl b/terraform/dev/.terraform.lock.hcl
diff --git a/terraform/dev/dev.tf b/terraform/dev/dev.tf
@@ -15,7 +15,6 @@ module "dev" {
   clamav_instances      = 1
   clamav_memory         = 2048
   clamav_fs_instances   = 1
-  recursive_delete      = true
   json_params = jsonencode(
     {
       "storage" : 50,
@@ -24,7 +23,7 @@ module "dev" {
 }
 
 module "dev-backups-bucket" {
-  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v0.9.1"
+  source = "github.com/gsa-tts/terraform-cloudgov//s3?ref=v1.1.0"
 
   cf_org_name   = var.cf_org_name
   cf_space_name = "dev"

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