preparing to merge

thunderbird · May 21, 2024 · cde3fe1 · cde3fe1
1 parent 48159c6
commit cde3fe1
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -55,45 +55,45 @@ jobs:
           sudo wget -q -O /bin/terragrunt "https://github.com/gruntwork-io/terragrunt/releases/download/v${{ vars.TG_VERSION }}/terragrunt_linux_amd64"
           sudo chmod +x /bin/terragrunt
           terragrunt -v
-#
-#      - name: vpc
-#        working-directory: ./tofu/environments/stage/network/vpc
-#        run: |
-#          terragrunt init -upgrade
-#          terragrunt validate
-#          terragrunt plan -out tfplan
+
+      - name: vpc
+        working-directory: ./tofu/environments/stage/network/vpc
+        run: |
+          terragrunt init -upgrade
+          terragrunt validate
+          terragrunt plan -out tfplan
 #          terragrunt apply tfplan
-#
-#      - name: backend-infra
-#        working-directory: ./tofu/environments/stage/services/backend-infra
-#        run: |
-#          terragrunt init -upgrade
-#          terragrunt validate
-#          terragrunt plan -out tfplan
+
+      - name: backend-infra
+        working-directory: ./tofu/environments/stage/services/backend-infra
+        run: |
+          terragrunt init -upgrade
+          terragrunt validate
+          terragrunt plan -out tfplan
 #          terragrunt apply tfplan
-#
-#      - name: cache
-#        working-directory: ./tofu/environments/stage/data-store/cache
-#        run: |
-#          terragrunt init -upgrade
-#          terragrunt validate
-#          terragrunt plan -out tfplan
+
+      - name: cache
+        working-directory: ./tofu/environments/stage/data-store/cache
+        run: |
+          terragrunt init -upgrade
+          terragrunt validate
+          terragrunt plan -out tfplan
 #          terragrunt apply tfplan
-#
-#      - name: database
-#        working-directory: ./tofu/environments/stage/data-store/database
-#        run: |
-#          terragrunt init -upgrade
-#          terragrunt validate
-#          terragrunt plan -out tfplan
+
+      - name: database
+        working-directory: ./tofu/environments/stage/data-store/database
+        run: |
+          terragrunt init -upgrade
+          terragrunt validate
+          terragrunt plan -out tfplan
 #          terragrunt apply tfplan
-#          
-#      - name: frontend-infra
-#        working-directory: ./tofu/environments/stage/services/frontend-infra
-#        run: |
-#          terragrunt init -upgrade
-#          terragrunt validate
-#          terragrunt plan -out tfplan
+
+      - name: frontend-infra
+        working-directory: ./tofu/environments/stage/services/frontend-infra
+        run: |
+          terragrunt init -upgrade
+          terragrunt validate
+          terragrunt plan -out tfplan
 #          terragrunt apply tfplan
 
       - name: output-bucket-name

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - main
-      - add-tf-iac
 
 permissions:
   id-token: write   # This is required for requesting the JWT

diff --git a/tofu/modules/services/backend-service/main.tf b/tofu/modules/services/backend-service/main.tf
@@ -105,7 +105,8 @@ resource "aws_ecs_task_definition" "backend" {
         {
           "name" : "JWT_EXPIRE_IN_MINS",
           "value" : "10000"
-        }#,
+        # Redis integration disabled pending application code updates
+        #},
         #{
         #  "name": "REDIS_URL",
         #  "value": "" #var.redis_endpoint
@@ -121,7 +122,7 @@ resource "aws_ecs_task_definition" "backend" {
         #{
         #  "name": "REDIS_USE_SSL",
         #  "value": "" #"True"
-        #}
+        }
       ],
       secrets = [
         {