Merge remote-tracking branch 'origin/fix-ami' into staging

Author: pmatsinopoulos

.github/workflows/continuos_deployment_production.yml

@@ -71,29 +71,12 @@ jobs:
           unset AWS_PROFILE
           terraform plan -out planfile
 
-      # ---------------------
-      - name: Terraform apply
-        run: |
-          cd terraform
-          cat .envrc | grep -vE '^(dotenv_if_exists|source_env)' > .envrc.good
-          . ./.envrc.good
-          cd ${{ env.ENVIRONMENT }}
-          cat .envrc | grep -vE '^(dotenv_if_exists|source_env)' > .envrc.good
-          . ./.envrc.good
-          unset AWS_PROFILE
-          terraform apply -input=false planfile
-
-      # --------------------------------------------------------------------------------------
-      # - name: Post Deploy - Test Service for Server has Correct Task Definition Deployed
-      #   run: |
-      #     cd terraform
-      #     cat .envrc | grep -vE '^(dotenv_if_exists|source_env)' > .envrc.good
-      #     . ./.envrc.good
-      #     cd ${{ env.ENVIRONMENT }}
-      #     cat .envrc | grep -vE '^(dotenv_if_exists|source_env)' > .envrc.good
-      #     . ./.envrc.good
-      #     unset AWS_PROFILE
-      #     export ECS_CLUSTER_NAME_SERVER=$(terraform output -raw error_logs_server_cluster_name)
-      #     export ECS_SERVICE_NAME_SERVER=$(terraform output -raw error_logs_server_service_name)
-      #     export ECS_TASK_DEFINITION_SERVER=$(terraform output -raw error_logs_server_task_definition_revision)
-      #     ../test_deployed_task_definitions.sh "${AWS_REGION}" "${ECS_CLUSTER_NAME_SERVER}" "${ECS_SERVICE_NAME_SERVER}" "${ECS_TASK_DEFINITION_SERVER}"
+      # Upload the plan as an artifact
+      - name: Upload Terraform plan
+        uses: actions/upload-artifact@v4
+        with:
+          name: terraform-${{ env.ENVIRONMENT }}-plan
+          path: terraform/${{ env.ENVIRONMENT }}/planfile
+          if-no-files-found: 'warn'
+          retention-days: 1
+          overwrite: true

.github/workflows/continuos_deployment_production_apply_changes.yml

@@ -0,0 +1,46 @@
+name: Continuos Deployment Action Production Apply Changes
+
+on:
+  workflow_dispatch:
+
+env:
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_PLAY_DEVOPS }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_PLAY_DEVOPS }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  terraform_apply:
+    runs-on: ubuntu-latest
+    environment: production
+
+    env:
+      ETHEREUM_PEM: ${{ secrets.ETHEREUM_PEM }}
+      ENVIRONMENT: production
+      GF_SECURITY_ADMIN_USER: "${{ secrets.GF_SECURITY_ADMIN_USER }}"
+      GF_SECURITY_ADMIN_PASSWORD: "${{ secrets.GF_SECURITY_ADMIN_PASSWORD }}"
+      PROMETHEUS_ADMIN_PASSWORD: "${{ secrets.PROMETHEUS_ADMIN_PASSWORD }}"
+      PROMETHEUS_ADMIN_PASSWORD_BCRYPTED: "${{ secrets.PROMETHEUS_ADMIN_PASSWORD_BCRYPTED }}"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Download Terraform plan
+        uses: actions/download-artifact@v4
+        with:
+          name: terraform-${{ env.ENVIRONMENT }}-plan
+          path: terraform/${{ env.ENVIRONMENT }}
+
+      - name: Terraform apply
+        run: |
+          cd terraform
+          cat .envrc | grep -vE '^(dotenv_if_exists|source_env)' > .envrc.good
+          . ./.envrc.good
+          cd ${{ env.ENVIRONMENT }}
+          cat .envrc | grep -vE '^(dotenv_if_exists|source_env)' > .envrc.good
+          . ./.envrc.good
+          unset AWS_PROFILE
+          terraform apply -input=false planfile