Merge remote-tracking branch 'origin/flexion/update-org-settings' int…

…o flexion/update-org-settings
CDCgov · Oct 23, 2024 · 3d8b977 · 3d8b977
2 parents 5c388cd + 3fc6cf2
commit 3d8b977
Show file tree

Hide file tree

Showing 84 changed files with 30,141 additions and 1,813 deletions.
diff --git a/.github/ISSUE_TEMPLATE/DevSecOps-issue.md b/.github/ISSUE_TEMPLATE/DevSecOps-issue.md
@@ -0,0 +1,69 @@
+---
+name: DevSecOps ticket
+about: For new DevSecOps tickets on the board.
+labels: ['DevSecOps', 'reportstream']
+---
+# DevSecOps Issue
+
+## Summary
+
+Context and description
+
+## Environment
+
+- [ ] Local
+- [ ] Dev
+- [ ] Stage
+- [ ] Prod
+
+## Priority
+
+- [ ] **Critical** - affecting prod systems
+- [ ] **Major** - blocking major functionality, deployment, etc
+- [ ] **Minor** - improvements, bug fixes
+- [ ] **Nice-to-have** - feature request
+
+### Blocks the following
+
+- List any blockers
+- Link any Github relevant issues
+
+### Blocked by the following
+
+- Link to any tickets that add context, etc
+
+## Contact
+
+**Team**:
+
+**Slack Team Channel**:
+
+**Slack Contact (Full Name):**
+
+**Technical Team Lead:**
+
+## How to Reproduce
+
+### Screenshots, links, etc. for context
+
+## How to Test
+
+## Definition of Done
+
+- [ ]
+
+## Context Links
+
+**Git Repo:**
+
+**Relevant Code Links:**
+
+**Azure**:
+
+**Site URL**:
+
+**Other**:
+
+## Notes
+
+-
diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   pre_job:
     name: Set Build Environment
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}-${{ needs.pre_job.outputs.env_name }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
@@ -28,7 +28,7 @@ jobs:
   confirm_changes:
     name: Check Terraform Stats - ${{ needs.pre_job.outputs.env_name }}
     if: ${{ needs.pre_job.outputs.tf_change == 'true' }}
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}-${{ needs.pre_job.outputs.env_name }}
       cancel-in-progress: true
     needs:
@@ -60,7 +60,7 @@ jobs:
 
   approve_deploy:
     name: Approve Deploy - ${{ needs.pre_job.outputs.env_name }}
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}-${{ needs.pre_job.outputs.env_name }}
       cancel-in-progress: true
     needs:
@@ -75,7 +75,7 @@ jobs:
 
   run_deploy:
     name: Run Deploy - ${{ needs.pre_job.outputs.env_name }}
-    concurrency: 
+    concurrency:
       group: ${{ github.workflow }}-${{ needs.pre_job.outputs.env_name }}
       cancel-in-progress: true
     needs:
@@ -108,4 +108,7 @@ jobs:
       - name: Run Terraform
         run: |
           terraform init -input=false
-          terraform apply -input=false -no-color -lock-timeout=600s -auto-approve
+          terraform validate
+          terraform fmt -recursive
+          terraform plan -out ${{ needs.pre_job.outputs.env_name }}-tf.plan
+          # terraform apply -input=false -no-color -lock-timeout=600s -auto-approve ${{ needs.pre_job.outputs.env_name }}-tf.plan
diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
@@ -1,7 +1,7 @@
 apply(from = rootProject.file("buildSrc/shared.gradle.kts"))
 
 plugins {
-    id("org.springframework.boot") version "3.3.2"
+    id("org.springframework.boot") version "3.3.4"
     id("io.spring.dependency-management") version "1.1.6"
     id("reportstream.project-conventions")
     kotlin("plugin.spring") version "2.0.0"
@@ -14,8 +14,8 @@ dependencies {
     implementation(project(":shared"))
 
     implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.8.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.9.0")
 
     /**
      * Spring WebFlux was chosen for this project to be able to better handle periods of high traffic
@@ -24,7 +24,7 @@ dependencies {
     implementation("org.springframework.cloud:spring-cloud-gateway-webflux")
     implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
 
-    runtimeOnly("com.nimbusds:oauth2-oidc-sdk:11.18")
+    runtimeOnly("com.nimbusds:oauth2-oidc-sdk:11.19.1")
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.security:spring-security-test")
@@ -45,7 +45,7 @@ configurations.all {
 
 dependencyManagement {
     imports {
-        mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.14.0")
+        mavenBom("com.azure.spring:spring-cloud-azure-dependencies:5.16.0")
         mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.3")
     }
 }

diff --git a/frontend-react/e2e/spec/chromium-only/authenticated/daily-data-page-user-flow.spec.ts b/frontend-react/e2e/spec/chromium-only/authenticated/daily-data-page-user-flow.spec.ts
@@ -206,7 +206,7 @@ test.describe(
                             );
                         });
 
-                        test.skip("clears 'Report ID'", async ({ dailyDataPage }) => {
+                        test("clears 'Report ID'", async ({ dailyDataPage }) => {
                             // Search by Report ID
                             const reportId = await tableDataCellValue(dailyDataPage.page, 0, 0);
                             await searchInput(dailyDataPage.page).fill(reportId);
@@ -289,7 +289,7 @@ test.describe(
                         expect(await tableDataCellValue(dailyDataPage.page, 0, 0)).toEqual(reportId);
                     });
 
-                    test.skip("returns match for Filename", async ({ dailyDataPage }) => {
+                    test("returns match for Filename", async ({ dailyDataPage }) => {
                         // Filename search is currently broken and being tracked
                         // in ticket #15644
                         const fileName = await tableDataCellValue(dailyDataPage.page, 0, 4);
@@ -302,7 +302,8 @@ test.describe(
 
                         // Check filter status lists receiver value
                         const filterStatusText = filterStatus([fileName]);
-                        await expect(dailyDataPage.page.getByTestId("filter-status")).toContainText(filterStatusText);
+                        const actualText = await dailyDataPage.page.getByTestId("filter-status").textContent();
+                        expect(filterStatusText).toContain(actualText);
 
                         //Check table data matches search
                         expect(await tableDataCellValue(dailyDataPage.page, 0, 4)).toEqual(fileName);

diff --git a/frontend-react/package.json b/frontend-react/package.json
@@ -8,20 +8,20 @@
     "@microsoft/applicationinsights-react-js": "^17.3.2",
     "@microsoft/applicationinsights-web": "^3.3.2",
     "@okta/okta-react": "^6.9.0",
-    "@okta/okta-signin-widget": "^7.23.0",
+    "@okta/okta-signin-widget": "^7.24.2",
     "@rest-hooks/rest": "^3.0.3",
-    "@tanstack/react-query": "^5.55.4",
-    "@tanstack/react-query-devtools": "^5.55.4",
+    "@tanstack/react-query": "^5.59.15",
+    "@tanstack/react-query-devtools": "^5.59.15",
     "@trussworks/react-uswds": "^9.1.0",
     "@uswds/uswds": "3.7.1",
     "axios": "^1.7.7",
     "classnames": "^2.5.1",
     "date-fns": "^3.6.0",
-    "date-fns-tz": "^3.1.3",
+    "date-fns-tz": "^3.2.0",
     "dompurify": "^3.1.6",
     "downloadjs": "^1.4.7",
     "export-to-csv-fix-source-map": "^0.2.1",
-    "focus-trap-react": "^10.2.3",
+    "focus-trap-react": "^10.3.0",
     "history": "^5.3.0",
     "html-to-text": "^9.0.5",
     "lodash": "^4.17.21",
@@ -33,15 +33,15 @@
     "react-loader-spinner": "^6.1.6",
     "react-markdown": "^9.0.1",
     "react-query-kit": "^3.3.0",
-    "react-router": "^6.26.1",
-    "react-router-dom": "^6.26.1",
+    "react-router": "^6.27.0",
+    "react-router-dom": "^6.27.0",
     "react-scroll-sync": "^0.11.2",
-    "react-toastify": "^10.0.5",
+    "react-toastify": "^10.0.6",
     "rehype-raw": "^7.0.0",
     "rehype-slug": "^5.1.0",
     "rest-hooks": "^6.1.7",
     "sanitize-html": "^2.13.0",
-    "tsx": "^4.19.0",
+    "tsx": "^4.19.1",
     "use-deep-compare-effect": "^1.8.1",
     "uuid": "^10.0.0",
     "web-vitals": "^3.4.0"
@@ -110,8 +110,8 @@
     ]
   },
   "devDependencies": {
-    "@mdx-js/react": "^3.0.1",
-    "@mdx-js/rollup": "^3.0.1",
+    "@mdx-js/react": "^3.1.0",
+    "@mdx-js/rollup": "^3.1.0",
     "@playwright/test": "^1.47.0",
     "@rest-hooks/test": "^7.3.1",
     "@storybook/addon-a11y": "^8.2.9",
@@ -128,7 +128,7 @@
     "@storybook/testing-library": "^0.2.2",
     "@storybook/theming": "^8.2.9",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/jest-dom": "^6.6.2",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
     "@types/dompurify": "^3.0.5",
@@ -140,19 +140,19 @@
     "@types/mdx": "^2.0.13",
     "@types/node": "^20.12.5",
     "@types/react": "18.3.5",
-    "@types/react-dom": "^18.3.0",
+    "@types/react-dom": "^18.3.1",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-scroll-sync": "^0.9.0",
     "@types/sanitize-html": "^2.13.0",
     "@typescript-eslint/eslint-plugin": "^7.17.0",
     "@typescript-eslint/parser": "^7.17.0",
-    "@vitejs/plugin-react": "^4.3.1",
-    "@vitest/coverage-istanbul": "^2.0.5",
-    "@vitest/ui": "^2.0.5",
+    "@vitejs/plugin-react": "^4.3.3",
+    "@vitest/coverage-istanbul": "^2.1.3",
+    "@vitest/ui": "^2.1.3",
     "autoprefixer": "^10.4.20",
     "browserslist": "^4.23.3",
     "browserslist-useragent-regexp": "^4.1.3",
-    "chromatic": "^11.7.1",
+    "chromatic": "^11.12.6",
     "cross-env": "^7.0.3",
     "dotenv-flow": "^4.1.0",
     "eslint": "8.57",
@@ -166,20 +166,20 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.7",
     "eslint-plugin-storybook": "^0.8.0",
-    "eslint-plugin-testing-library": "^6.3.0",
+    "eslint-plugin-testing-library": "^6.4.0",
     "eslint-plugin-vitest": "^0.5.4",
     "husky": "^9.1.5",
-    "jsdom": "^25.0.0",
+    "jsdom": "^25.0.1",
     "lint-staged": "^15.2.10",
     "mockdate": "^3.0.5",
-    "msw": "^2.3.5",
+    "msw": "^2.4.11",
     "msw-storybook-addon": "beta",
     "npm-run-all": "^4.1.5",
     "otpauth": "^9.3.2",
     "patch-package": "^8.0.0",
     "postcss": "^8.4.45",
     "prettier": "^3.3.3",
-    "react-error-boundary": "^4.0.13",
+    "react-error-boundary": "^4.1.2",
     "remark-frontmatter": "^5.0.0",
     "remark-mdx-frontmatter": "^5.0.0",
     "remark-mdx-toc": "^0.3.1",
@@ -189,14 +189,15 @@
     "ts-node": "^10.9.2",
     "tslib": "^2.6.3",
     "typescript": "^5.5.4",
-    "undici": "^6.19.8",
-    "vite": "^5.4.3",
+    "undici": "^6.20.1",
+    "vite": "^5.4.9",
     "vite-plugin-checker": "^0.8.0",
     "vite-plugin-svgr": "^4.2.0",
-    "vitest": "^2.0.5"
+    "vitest": "^2.1.3"
   },
   "resolutions": {
-    "@types/react": "18.3.5"
+    "@types/react": "18.3.5",
+    "@okta/okta-auth-js": ">=7.8.1"
   },
   "engines": {
     "node": "^20.15"