merge fixes and comments for clarity

thunderbird · May 21, 2024 · 92fdaab · 92fdaab
1 parent ff71675
commit 92fdaab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -62,39 +62,39 @@ jobs:
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan
+#          terragrunt apply tfplan  # will be re-enabled once release workflow is tested
 
       - name: backend-infra
         working-directory: ./tofu/environments/stage/services/backend-infra
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan
+#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
 
       - name: cache
         working-directory: ./tofu/environments/stage/data-store/cache
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan
+#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
 
       - name: database
         working-directory: ./tofu/environments/stage/data-store/database
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan
+#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
 
       - name: frontend-infra
         working-directory: ./tofu/environments/stage/services/frontend-infra
         run: |
           terragrunt init -upgrade
           terragrunt validate
           terragrunt plan -out tfplan
-#          terragrunt apply tfplan
+#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
 
       - name: output-bucket-name
         id: output-bucket-name
@@ -156,8 +156,9 @@ jobs:
           terragrunt validate
           terragrunt plan -var "image=$(cat steps.get_ecr_tag.outputs.*)" -out tfplan
           cat tfplan
-#          terragrunt apply tfplan
+#          terragrunt apply tfplan # will be re-enabled once release workflow is tested
 
+# will be re-enabled once release workflow is tested
 #      - name: Deploy frontend to S3
 #        run: aws s3 sync ./frontend/frontend/dist "s3://${{ needs.deploy-iac.outputs.bucket }}"
 

diff --git a/tofu/environments/stage/environment.hcl b/tofu/environments/stage/environment.hcl
@@ -23,10 +23,6 @@ generate "versions" {
           source = "hashicorp/random"
           version = ">= 3.6.1"
         }
-        random = {
-          source = "hashicorp/random"
-          version = ">= 3.6.1"
-        }
       }
     }
 EOF

diff --git a/tofu/modules/services/backend-infra/main.tf b/tofu/modules/services/backend-infra/main.tf
@@ -27,15 +27,6 @@ resource "random_string" "x_allow_suffix" {
   special = false
   upper   = true
 }
-
-resource "random_string" "x_allow_suffix" {
-  length = 8
-  lower = true
-  numeric = false
-  special = false
-  upper = true
-}
-
 resource "aws_secretsmanager_secret" "x_allow_secret" {
   name = "${var.name_prefix}-x-allow-secret-${random_string.x_allow_suffix.result}"
 }