Merge pull request #2056 from GSA/terraform_upgrade1

restore module redis-v70
This commit is contained in:
ccostino
2025-10-23 14:23:16 -04:00
committed by GitHub

View File

@@ -12,6 +12,13 @@ resource "null_resource" "prevent_destroy" {
} }
} }
data "cloudfoundry_space" "space" {
provider = cloudfoundry.official
org = "9e428562-a2d9-41b4-9c23-1ef5237fb44e"
name = local.cf_space_name
}
module "database" { module "database" {
source = "github.com/GSA-TTS/terraform-cloudgov//database?ref=v1.0.0" source = "github.com/GSA-TTS/terraform-cloudgov//database?ref=v1.0.0"
@@ -21,21 +28,22 @@ module "database" {
rds_plan_name = "small-psql" rds_plan_name = "small-psql"
} }
# module "redis-v70" {
# source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0" module "redis-v70" {
# Right now the default is cfcommunity, remove this when default is cloudfoundry source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
# providers = { # Right now the default is cfcommunity, remove this when default is cloudfoundry
# cloudfoundry = cloudfoundry.official providers = {
# } cloudfoundry = cloudfoundry.official
# cf_space_id = data.cloudfoundry_space.space.id }
# name = "${local.app_name}-redis-v70-${local.env}" cf_space_id = data.cloudfoundry_space.space.id
# redis_plan_name = "redis-dev" name = "${local.app_name}-redis-v70-${local.env}"
# json_params = jsonencode( redis_plan_name = "redis-dev"
# { json_params = jsonencode(
# "engineVersion" : "7.0", {
# } "engineVersion" : "7.0",
# ) }
# } )
}
module "csv_upload_bucket" { module "csv_upload_bucket" {
source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0" source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
@@ -45,6 +53,15 @@ module "csv_upload_bucket" {
name = "${local.app_name}-csv-upload-bucket-${local.env}" name = "${local.app_name}-csv-upload-bucket-${local.env}"
} }
# module "csv_upload_bucket_new" {
# source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
# providers = {
# cloudfoundry = cloudfoundry.official
# }
# cf_space_id = data.cloudfoundry_space.space.id
# name = "${local.app_name}-csv-upload-bucket-${local.env}"
# }
module "egress-space" { module "egress-space" {
source = "../shared/egress_space" source = "../shared/egress_space"