Merge branch 'main' into fix/engagement/apham/16865

CDCgov · Jan 22, 2025 · 6f865cc · 6f865cc
2 parents fccf7f6 + 84ed184
commit 6f865cc
Show file tree

Hide file tree

Showing 19 changed files with 429 additions and 211 deletions.
diff --git a/.github/workflows/alert_MBUsers_Inactive.yml b/.github/workflows/alert_MBUsers_Inactive.yml
@@ -48,7 +48,8 @@ jobs:
           message: |
             ${{ steps.users_out.outputs.MESSAGE_RESPONSE }}
           icon-emoji: ':hourglass_flowing_sand:'
-          channel: temp-cdc-rs-notifications  # Updated channel
+          channel: cdc-reportstream-bot-notifications
+  # Updated channel in slack
           webhook-url: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK_URL }}  # Updated webhook secret
           color: warning
           slackify-markdown: true
diff --git a/.github/workflows/alert_PD_schedule_Slack.yml b/.github/workflows/alert_PD_schedule_Slack.yml
@@ -5,9 +5,8 @@ on:
     - cron: "7 13 * * Mon"  #UTC-5
 
 env:
-  channel: temp-cdc-rs-notifications
-  # prime-reportstream-engineering
-
+  channel: cdc-reportstream-bot-notifications
+  # Updated Slack Channel
 jobs:
   pre_job:
     name: Pre Job

diff --git a/.github/workflows/alert_cert_expire.yml b/.github/workflows/alert_cert_expire.yml
@@ -61,7 +61,7 @@ jobs:
           message: |
             ${{ steps.format_out.outputs.LIST }}
           icon-emoji: ':bell:'
-          channel: temp-cdc-rs-notifications  # Updated channel
+          channel: cdc-reportstream-bot-notifications
           webhook-url: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK_URL }}  # Updated webhook secret
           color: warning
 

diff --git a/.github/workflows/alert_resource_costs.yml b/.github/workflows/alert_resource_costs.yml
@@ -65,7 +65,8 @@ jobs:
             * **Provisioned by: \`${{ steps.last-pusher.outputs.username }}\`**
             * **Last Change Date: \`${{ steps.last-pusher.outputs.last_change_date }}\`**
           icon-emoji: ':money_with_wings:'
-          channel: temp-cdc-rs-notifications  # Updated channel
+          channel: cdc-reportstream-bot-notifications
+  # Updated channel
           webhook-url: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK_URL }}  # Updated webhook secret
           color: failure
           slackify-markdown: true
diff --git a/.github/workflows/alert_terraform_changes.yml b/.github/workflows/alert_terraform_changes.yml
@@ -65,6 +65,7 @@ jobs:
             "resource-drifts": "${{ env.resource-drifts }}"
 
           icon-emoji: ':bell:'
-          channel: temp-cdc-rs-notifications  # Updated channel
+          channel: cdc-reportstream-bot-notifications
+  # Updated Slack channel
           webhook-url: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK_URL }}  # Updated webhook secret
           color: warning
diff --git a/.github/workflows/cleanup_acr_images.yml b/.github/workflows/cleanup_acr_images.yml
diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
@@ -54,30 +54,48 @@ jobs:
           sp-creds: ${{ env.AZURE_CREDENTIALS }}
           tf-auth: true
       - name: Collect Terraform stats
-
-        uses: josiahsiegel/terraform-stats@68b8cbe42c494333fbf6f8d90ac86da1fb69dcc2
-        ## DevSecOps - Aquia (Replace) - uses: ./.github/actions/terraform-stats
-
+        uses: ./.github/actions/terraform-stats
         id: stats1
         with:
           terraform-directory: operations/app/terraform/vars/${{ needs.pre_job.outputs.env_name }}
           terraform-version: 1.7.4
           add-args: "-refresh=false"
 
-  approve_deploy:
-    name: Approve Deploy - ${{ needs.pre_job.outputs.env_name }}
-    concurrency:
-      group: ${{ github.workflow }}-${{ needs.pre_job.outputs.env_name }}
-      cancel-in-progress: true
-    needs:
-      - pre_job
-      - confirm_changes
-    if: needs.confirm_changes.outputs.change_count > '0'
-    runs-on: ubuntu-latest
-    environment: ${{ needs.pre_job.outputs.env_name }}_terraform
-    steps:
-      - name: Echo change count
-        run: echo ${{ needs.confirm_changes.outputs.change_count }}
+      - name: Terraform Format 
+        # fails on formatting issues, fix locally with `tf fmt -recursive` and push again if this step fails
+        run: terraform fmt -check -recursive
+
+      - name: "Terraform init"
+        run: terraform init -input=false
+
+      - name: "Terraform validate"
+        run: terraform validate
+
+      - name: Terraform Plan
+        run: |
+          terraform plan -out=tf.plan -input=false -no-color -lock-timeout=600s
+      
+      - name: Comment Plan on PR
+        uses: blinqas/tf-plan-pr-comment@v1
+        with:
+          output_file: ${{ github.workspace }}/plan_output.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      approve_deploy:
+        name: Approve Deploy - ${{ needs.pre_job.outputs.env_name }}
+        concurrency:
+          group: ${{ github.workflow }}-${{ needs.pre_job.outputs.env_name }}
+          cancel-in-progress: true
+        needs:
+          - pre_job
+          - confirm_changes
+        if: needs.confirm_changes.outputs.change_count > '0'
+        runs-on: ubuntu-latest
+        environment: ${{ needs.pre_job.outputs.env_name }}_terraform
+        steps:
+          - name: Echo change count
+            run: echo ${{ needs.confirm_changes.outputs.change_count }}
 
   run_deploy:
     name: Run Deploy - ${{ needs.pre_job.outputs.env_name }}

diff --git a/frontend-react/package.json b/frontend-react/package.json
@@ -42,7 +42,7 @@
     "sanitize-html": "^2.14.0",
     "tsx": "^4.19.2",
     "use-deep-compare-effect": "^1.8.1",
-    "uuid": "^11.0.4",
+    "uuid": "^11.0.5",
     "web-vitals": "^3.4.0"
   },
   "scripts": {
@@ -109,8 +109,8 @@
     ]
   },
   "devDependencies": {
-    "@eslint/compat": "^1.2.4",
-    "@eslint/js": "^9.17.0",
+    "@eslint/compat": "^1.2.5",
+    "@eslint/js": "^9.18.0",
     "@mdx-js/react": "^3.1.0",
     "@mdx-js/rollup": "^3.1.0",
     "@playwright/test": "^1.49.1",
@@ -149,12 +149,12 @@
     "@vitest/coverage-istanbul": "^2.1.8",
     "@vitest/ui": "^2.1.8",
     "autoprefixer": "^10.4.20",
-    "browserslist": "^4.24.3",
+    "browserslist": "^4.24.4",
     "browserslist-useragent-regexp": "^4.1.3",
     "chromatic": "^11.22.2",
     "cross-env": "^7.0.3",
     "dotenv-flow": "^4.1.0",
-    "eslint": "^9.17.0",
+    "eslint": "^9.18.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-import": "^2.31.0",
@@ -163,7 +163,7 @@
     "eslint-plugin-playwright": "^2.1.0",
     "eslint-plugin-react": "^7.37.3",
     "eslint-plugin-react-hooks": "^5.1.0",
-    "eslint-plugin-react-refresh": "^0.4.16",
+    "eslint-plugin-react-refresh": "^0.4.18",
     "eslint-plugin-storybook": "^0.11.2",
     "eslint-plugin-testing-library": "^7.1.1",
     "eslint-plugin-vitest": "^0.5.4",
@@ -184,10 +184,10 @@
     "remark-mdx-toc": "^0.3.1",
     "sass": "^1.83.1",
     "storybook": "^8.4.7",
-    "storybook-addon-remix-react-router": "^3.0.2",
+    "storybook-addon-remix-react-router": "^4.0.1",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "typescript-eslint": "^8.19.0",
     "undici": "^6.20.1",
     "vite": "^6.0.7",