diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 97e6935cf..2f292f369 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,15 +38,15 @@ jobs: run: terraform init - - name: Terraform see if we can destroy a specific module - working-directory: terraform/staging - env: - AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} - TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }} - TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} - run: | - terraform plan -destroy -target=module.redis-v70 + # - name: Terraform see if we can destroy a specific module + # working-directory: terraform/staging + # env: + # AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} + # TF_VAR_cf_user: ${{ secrets.CLOUDGOV_USERNAME }} + # TF_VAR_cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} + # run: | + # terraform destroy -target=module.redis-v70 -auto-approve - name: Terraform apply diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 8420926db..744a07df3 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -12,22 +12,21 @@ resource "null_resource" "prevent_destroy" { } } -# module "redis-v70" { -# source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0" -# Right now the default is cfcommunity, remove this when default is cloudfoundry -# providers = { -# cloudfoundry = cloudfoundry.official -# } -# org = data.cloudfoundry_space.space.org -# cf_space_id = data.cloudfoundry_space.space.id -# name = "${local.app_name}-redis-v70-${local.env}" -# redis_plan_name = "redis-dev" -# json_params = jsonencode( -# { -# "engineVersion" : "7.0", -# } -# ) -# } +module "redis-v70" { + source = "github.com/GSA-TTS/terraform-cloudgov//redis?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}-redis-v70-${local.env}" + redis_plan_name = "redis-dev" + json_params = jsonencode( + { + "engineVersion" : "7.0", + } + ) +} data "cloudfoundry_space" "space" { provider = cloudfoundry.official