Skip to content

Commit

Permalink
Merge pull request #15649 from CDCgov/deployment/2024-08-20
Browse files Browse the repository at this point in the history
Deployment of 2024-08-20
  • Loading branch information
brick-green authored Aug 20, 2024
2 parents 4840836 + e1ac0e9 commit 9be6785
Show file tree
Hide file tree
Showing 259 changed files with 47,516 additions and 4,730 deletions.
1 change: 1 addition & 0 deletions .environment/gitleaks/gitleaks-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ title = "PRIME ReportStream Gitleaks Configuration"
'prime-router/build.gradle.kts',
'prime-router/docs/dependency-graph-full/dependency-graph-full.txt',
'prime-router/docs/schema_documentation/',
'prime-router/docs/design/design/auth/auth-design.md',
'prime-router/docs/getting_started.md',
'prime-router/frontend/src/assets/fonts',
'prime-router/frontend/src/assets/img',
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-backend/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:
distribution: "temurin"
cache: "gradle"

- uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70
- uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582

- name: Lint
if: inputs.run-integration-tests == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend_chromatic_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: yarn install --immutable

- name: Run Chromatic
uses: chromaui/action@fdbe7756d4dbf493e2fbb822df73be7accd07e1c
uses: chromaui/action@b984808b772126a9f44b2b7737b131b68a2ede32
with:
workingDir: frontend-react
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ jobs:

- name: Run Chromatic
id: chromatic
uses: chromaui/action@fdbe7756d4dbf493e2fbb822df73be7accd07e1c
uses: chromaui/action@b984808b772126a9f44b2b7737b131b68a2ede32
with:
workingDir: frontend-react
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
java-version: "17"
distribution: "temurin"
cache: "gradle"
- uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70
- uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
- name: Snyk Monitor
working-directory: ${{ matrix.folder }}
run: snyk monitor --org=prime-reportstream
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ jobs:
distribution: "temurin"
cache: "gradle"

- name: Gradle Validation
- name: Gradle setup
if: steps.changed-files-yaml.outputs.backend_any_changed == 'true' || steps.branch-name.outputs.is_default == 'true'
uses: gradle/actions/wrapper-validation@d9c87d481d55275bb5441eef3fe0e46805f9ef70
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582

- name: Spin up build containers
if: steps.changed-files-yaml.outputs.backend_any_changed == 'true' || steps.branch-name.outputs.is_default == 'true'
Expand Down Expand Up @@ -142,4 +142,4 @@ jobs:
with:
scan-level: backend
github-token: ${{ secrets.GITHUB_TOKEN }}
sonar-token: ${{ secrets.SONAR_TOKEN }}
sonar-token: ${{ secrets.SONAR_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/validate_terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

- name: Run Checkov action
uses: bridgecrewio/checkov-action@b840feb5432f9df3c791c2c0e0aa3a077d75eeb1
uses: bridgecrewio/checkov-action@d69ef3767bfe92c3ac1416abfa48eb95378dd17f
with:
directory: operations/app/terraform
skip_check: CKV_AZURE_139,CKV_AZURE_137,CKV_AZURE_103,CKV_AZURE_104,CKV_AZURE_102,CKV_AZURE_130,CKV_AZURE_121,CKV_AZURE_67,CKV_AZURE_56,CKV_AZURE_17,CKV_AZURE_63,CKV_AZURE_18,CKV_AZURE_88,CKV_AZURE_65,CKV_AZURE_13,CKV_AZURE_66,CKV_AZURE_33,CKV_AZURE_35,CKV_AZURE_36,CKV_AZURE_98,CKV2_AZURE_1,CKV2_AZURE_15,CKV2_AZURE_21,CKV_AZURE_213,CKV_AZURE_59,CKV2_AZURE_33,CKV2_AZURE_32,CKV2_AZURE_28,CKV_AZURE_206,CKV_AZURE_42,CKV_AZURE_110,CKV_AZURE_109,CKV_AZURE_166,CKV2_AZURE_38,CKV2_AZURE_40,CKV2_AZURE_41,CKV_AZURE_235
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ test.describe("admin user - a group of tests", () => {
})
```

Currently, we test all happy path scenarios using the admin account.

---

## Troubleshooting E2E
Expand All @@ -40,10 +42,18 @@ If your e2e tests fail during the GitHub build. The following steps will help in

---

## Updating the TEST\_\*\_USERNAME OKTA accounts

1. Change the password in OKTA for the `TEST_*_USERNAME` user account(s).
2. Have DevOps update the [GitHub Action](https://github.com/CDCgov/prime-reportstream/settings/secrets/actions) `TEST_*_PASSWORD` secret(s) for the `TEST_*_USERNAME` user account(s).
3. Have DevOps update the [Dependabot](https://github.com/CDCgov/prime-reportstream/settings/secrets/dependabot) `TEST_*_PASSWORD` secret(s) for the `TEST_*_USERNAME` user account(s).

---

## Processes

Always run the e2e tests before committing to GitHub

```bash
CI=true yarn run test:e2e-ui # Runs a local instance of Playwright UI that mimics GitHub integration
```
```
5 changes: 4 additions & 1 deletion frontend-react/e2e/helpers/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { expect, Page } from "@playwright/test";
import fs from "node:fs";

export const TEST_ORG_IGNORE = "ignore";
export const TEST_ORG_UP_RECEIVER_FULL_ELR = "FULL_ELR";
export const TEST_ORG_AK = "ak-phd";
export const TEST_ORG_UP_RECEIVER_UP = "FULL_ELR";
export const TEST_ORG_CP_RECEIVER_CP = "CSV";
export const TEST_ORG_ELIMS_RECEIVER_ELIMS = "ELR_ELIMS";
export const TEST_ORG_AK_RECEIVER = "elr";
export async function scrollToFooter(page: Page) {
// Scrolling to the bottom of the page
Expand Down
86 changes: 57 additions & 29 deletions frontend-react/e2e/mocks/deliveries.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import { addDays } from "date-fns";

const expiresDate = addDays(new Date(), 7);

export const MOCK_GET_DELIVERIES_AK = {
data: [
{
Expand Down Expand Up @@ -118,12 +122,12 @@ export const MOCK_GET_DELIVERIES_AK = {
},
};

export const MOCK_GET_DELIVERIES_AK_ELR = {
export const MOCK_GET_DELIVERIES_AK_FULL_ELR = {
data: [
{
deliveryId: 0,
createdAt: "2024-04-11T21:40:10.194Z",
expiresAt: "2024-05-11T21:40:10.194Z",
expiresAt: addDays(new Date(), 8),
receiver: "ak-phd.elr",
receivingOrgSvcStatus: "active",
reportId: "14ae9a00-75af-4061-a12c-e04a66cce97d",
Expand Down Expand Up @@ -274,7 +278,31 @@ export const MOCK_GET_DELIVERIES_AK_ELR = {
},
};

export const MOCK_GET_DELIVERIES_AK_5 = {
export const MOCK_GET_DELIVERIES_AK_REPORT_ID = {
data: [
{
deliveryId: 5,
createdAt: "2024-04-23T21:44:01.210Z",
expiresAt: "2024-05-23T21:44:01.210Z",
receiver: "ak-phd.full-elr-test",
receivingOrgSvcStatus: "active",
reportId: "f4155156-1230-4f0a-8a50-0a0cdec5aa0e",
topic: "full-elr",
reportItemCount: 5,
fileName: "ak-receiver-transform.yml-f4155156-1230-4f0a-8a50-0a0cdec5aa0e-20240423214401.hl7",
fileType: "HL7_BATCH",
},
],
meta: {
type: "delivery_history",
totalCount: 104,
totalFilteredCount: 104,
totalPages: 11,
nextPage: 2,
},
};

export const MOCK_GET_DELIVERIES_AK_FILENAME = {
data: [
{
deliveryId: 5,
Expand Down Expand Up @@ -303,7 +331,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 0,
createdAt: "2024-04-26T20:42:35.817Z",
expiresAt: "2024-05-26T20:42:35.817Z",
expiresAt: addDays(new Date(), 8),
receiver: "ignore.FULL_ELR_FHIR_B_E2E",
receivingOrgSvcStatus: "active",
reportId: "729158ce-4125-46fa-bea0-3c0f910f472c",
Expand Down Expand Up @@ -375,7 +403,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 6,
createdAt: "2024-04-26T20:37:01.312Z",
expiresAt: "2024-05-26T20:37:01.312Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "c4e16135-45e9-4750-8230-d69549b9a792",
Expand All @@ -387,7 +415,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 7,
createdAt: "2024-04-26T20:37:01.312Z",
expiresAt: "2024-05-26T20:37:01.312Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_FHIR",
receivingOrgSvcStatus: "active",
reportId: "bbbe910a-e0b7-436d-a88c-d4adc241718b",
Expand Down Expand Up @@ -423,7 +451,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 10,
createdAt: "2024-04-26T20:31:14.103Z",
expiresAt: "2024-05-26T20:31:14.103Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "d9e6f1bf-2e6f-4c28-be65-e607e381e375",
Expand Down Expand Up @@ -471,7 +499,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 14,
createdAt: "2024-04-26T20:27:24.100Z",
expiresAt: "2024-05-26T20:27:24.100Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_FHIR",
receivingOrgSvcStatus: "active",
reportId: "0d33d692-9752-4128-93fa-18d98bd3dd36",
Expand All @@ -483,7 +511,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 15,
createdAt: "2024-04-26T20:27:24.100Z",
expiresAt: "2024-05-26T20:27:24.100Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "e6414fcd-917c-4783-a71c-f6da9b6eda0d",
Expand All @@ -495,7 +523,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 16,
createdAt: "2024-04-26T20:24:10.112Z",
expiresAt: "2024-05-26T20:24:10.112Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_E2E",
receivingOrgSvcStatus: "active",
reportId: "6f88d938-7ce0-4d66-8a16-63eee0e35785",
Expand All @@ -507,7 +535,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 17,
createdAt: "2024-04-26T20:24:10.112Z",
expiresAt: "2024-05-26T20:24:10.112Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "34bc0475-58ee-46ac-b52d-448bdbca20a0",
Expand All @@ -519,7 +547,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 18,
createdAt: "2024-04-26T20:24:10.112Z",
expiresAt: "2024-05-26T20:24:10.112Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_FHIR",
receivingOrgSvcStatus: "active",
reportId: "505444a7-3473-4337-98fc-7d46272cb1ed",
Expand All @@ -531,7 +559,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 19,
createdAt: "2024-04-26T20:24:10.112Z",
expiresAt: "2024-05-26T20:24:10.112Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_FHIR_B_E2E",
receivingOrgSvcStatus: "active",
reportId: "8aa9addd-8045-47a8-9f09-8db111106670",
Expand All @@ -543,7 +571,7 @@ export const MOCK_GET_DELIVERIES_IGNORE = {
{
deliveryId: 20,
createdAt: "2024-04-26T20:21:19.813Z",
expiresAt: "2024-05-26T20:21:19.813Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "e24571a0-03fe-4abe-850d-514afdf59ed1",
Expand All @@ -567,7 +595,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_REPORT_ID = {
{
deliveryId: 0,
createdAt: "2024-04-26T20:42:35.817Z",
expiresAt: "2024-05-26T20:42:35.817Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_FHIR_B_E2E",
receivingOrgSvcStatus: "active",
reportId: "729158ce-4125-46fa-bea0-3c0f910f472c",
Expand All @@ -591,7 +619,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FILENAME = {
{
deliveryId: 2,
createdAt: "2024-04-26T20:42:35.630Z",
expiresAt: "2024-05-26T20:42:35.630Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR_FHIR",
receivingOrgSvcStatus: "active",
reportId: "21c217a4-d098-494c-9364-f4dcf16b1d63",
Expand All @@ -615,19 +643,19 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 0,
createdAt: "2024-04-26T20:42:35.755Z",
expiresAt: "2024-05-26T20:42:35.755Z",
expiresAt: addDays(new Date(), 8),
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "0e3cb853-c17c-4cbb-9bc2-d352c60db925",
reportId: "73e3cbc8-9920-4ab7-871f-843a1db4c074",
topic: "full-elr",
reportItemCount: 1,
fileName: "co.yml-0e3cb853-c17c-4cbb-9bc2-d352c60db925-20240426204235.hl7",
fileName: "co.yml-73e3cbc8-9920-4ab7-871f-843a1db4c074-20240426204235.hl7",
fileType: "HL7",
},
{
deliveryId: 1,
createdAt: "2024-04-26T20:37:01.312Z",
expiresAt: "2024-05-26T20:37:01.312Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "c4e16135-45e9-4750-8230-d69549b9a792",
Expand All @@ -639,7 +667,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 2,
createdAt: "2024-04-26T20:31:14.103Z",
expiresAt: "2024-05-26T20:31:14.103Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "d9e6f1bf-2e6f-4c28-be65-e607e381e375",
Expand All @@ -651,7 +679,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 3,
createdAt: "2024-04-26T20:27:24.100Z",
expiresAt: "2024-05-26T20:27:24.100Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "e6414fcd-917c-4783-a71c-f6da9b6eda0d",
Expand All @@ -663,7 +691,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 4,
createdAt: "2024-04-26T20:24:10.112Z",
expiresAt: "2024-05-26T20:24:10.112Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "34bc0475-58ee-46ac-b52d-448bdbca20a0",
Expand All @@ -675,7 +703,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 5,
createdAt: "2024-04-26T20:21:19.813Z",
expiresAt: "2024-05-26T20:21:19.813Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "e24571a0-03fe-4abe-850d-514afdf59ed1",
Expand All @@ -699,7 +727,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 7,
createdAt: "2024-04-26T20:12:17.507Z",
expiresAt: "2024-05-26T20:12:17.507Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "bc7d85ff-7d5c-4a93-acf9-fae84ad71efa",
Expand All @@ -711,7 +739,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 8,
createdAt: "2024-04-26T20:02:10.654Z",
expiresAt: "2024-05-26T20:02:10.654Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "694a083b-28da-44e7-b873-0be70e875d6a",
Expand All @@ -723,7 +751,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 9,
createdAt: "2024-04-26T19:58:06.978Z",
expiresAt: "2024-05-26T19:58:06.978Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "c7c084cb-21e9-4e44-a713-c8049d2d469c",
Expand All @@ -735,7 +763,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 10,
createdAt: "2024-04-26T19:56:03.148Z",
expiresAt: "2024-05-26T19:56:03.148Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "012a9530-a900-47e2-86ab-c4f62cc5d8ba",
Expand All @@ -747,7 +775,7 @@ export const MOCK_GET_DELIVERIES_IGNORE_FULL_ELR = {
{
deliveryId: 11,
createdAt: "2024-04-26T18:06:07.513Z",
expiresAt: "2024-05-26T18:06:07.513Z",
expiresAt: expiresDate,
receiver: "ignore.FULL_ELR",
receivingOrgSvcStatus: "active",
reportId: "6f6448da-1527-412b-b3da-816aa64b7979",
Expand Down
Loading

0 comments on commit 9be6785

Please sign in to comment.