update names

.github/workflows/terraform-apply.yml → .github/workflows/build-deploy.yml

@@ -1,17 +1,17 @@
-name: "Terraform Apply"
+name: "Build and Deploy"
 
 on:
   push:
     branches:
       - main
 
 env:
-  TF_CLOUD_ORGANIZATION: "zwell-test"
+  TF_CLOUD_ORGANIZATION: "${{secrets.ORGANIZATION_TF}}"
   TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}"
   AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
   AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
   BUILD_VERSION: "${{ github.sha }}"
-  TF_WORKSPACE: "static-hosting"
+  TF_WORKSPACE: "PROD-zwell-calculator"
   CONFIG_DIRECTORY: "./terraform/"
   AWS_DEFAULT_REGION: "us-west-2"
 
@@ -44,7 +44,8 @@ jobs:
         with:
           workspace: ${{ env.TF_WORKSPACE }}
           configuration_version: ${{ steps.apply-upload.outputs.configuration_version_id }}
-          is_destroy: true
+          # uncomment to tear down infra
+          # is_destroy: true
 
         # terraform apply the plan
       - name: Apply

.github/workflows/terraform-plan.yml → .github/workflows/check.yml

@@ -1,11 +1,11 @@
-name: "tf plan"
+name: "PR checks"
 on:
   pull_request:
 
 env:
-  TF_CLOUD_ORGANIZATION: "zwell-test"
+  TF_CLOUD_ORGANIZATION: "${{secrets.ORGANIZATION_TF}}"
   TF_API_TOKEN: "${{ secrets.TF_API_TOKEN }}"
-  TF_WORKSPACE: "static-hosting"
+  TF_WORKSPACE: "PROD-zwell-calculator"
   CONFIG_DIRECTORY: "./terraform/"
 
 jobs:
@@ -42,7 +42,8 @@ jobs:
           workspace: ${{ env.TF_WORKSPACE }}
           configuration_version: ${{ steps.plan-upload.outputs.configuration_version_id }}
           plan_only: true
-          is_destroy: true
+          # uncomment to tear down aws infra
+          # is_destroy: true
 
         # Gets the plan and logs it in pipeline for debugging
       - name: Get Plan Output