Deployment of 2024-09-26

.github/actions/build-auth/action.yml

@@ -0,0 +1,70 @@
+# action.yml
+name: "Build Auth"
+description: "Build Auth microservice"
+inputs:
+  version:
+    description: "Version tag"
+    required: true
+  upload-build:
+    default: true
+  run-integration-tests:
+    default: false
+  run-qc:
+    default: false
+  github-token:
+    default: false
+  sp-creds:
+    description: "Azure Service Principal creds"
+
+runs:
+  using: "composite"
+  steps:
+    # These are for CI and not credentials of any system
+    - name: Set Environment Variables
+      working-directory: prime-router
+      shell: bash
+      run: |
+        echo >> $GITHUB_ENV DB_USER='prime'
+        echo >> $GITHUB_ENV DB_PASSWORD='changeIT!'
+
+    - name: Remove unnecessary software
+      shell: bash
+      run: |
+        sudo rm -rf /usr/local/lib/android
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88
+      with:
+        java-version: "17"
+        distribution: "temurin"
+        cache: "gradle"
+
+    - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
+
+    - name: Lint
+      if: inputs.run-integration-tests == 'true'
+      run: ./gradlew :auth:ktlintCheck
+      shell: bash
+
+    - name: Spin up build containers
+      working-directory: prime-router
+      shell: bash
+      run: docker compose -f docker-compose.postgres.yml up -d
+
+    - name: Build auth Package
+      uses: ./.github/actions/retry
+      with:
+        timeout_minutes: 10
+        max_attempts: 2
+        retry_wait_seconds: 30
+        command: |
+          ./gradlew :auth:build -x test
+        shell: bash
+
+    - name: Cleanup Gradle Cache
+      if: inputs.run-integration-tests == 'true'
+      working-directory: prime-router
+      run: |
+        rm -f .gradle/caches/modules-2/modules-2.lock
+        rm -f .gradle/caches/modules-2/gc.properties
+      shell: bash

.github/actions/sonarcloud/action.yml

@@ -22,11 +22,11 @@ runs:
         args: >
           -Dsonar.coverage.exclusions=prime-router/src/test/**,prime-router/src/testIntegration/**,prime-router/src/main/kotlin/cli/tests/**,frontend-react/**/__mocks__/**,frontend-react/**/mocks/**,frontend-react/**/*.test.*,submissions/src/test/**
           -Dsonar.cpd.exclusions=frontend-react/**/*.test.*,prime-router/src/test/**,prime-router/src/testIntegration/**,prime-router/src/main/kotlin/cli/tests/**,submissions/src/test/**
-          -Dsonar.sources=frontend-react/src,prime-router/src,submissions/src,shared/src
+          -Dsonar.sources=frontend-react/src,prime-router/src,submissions/src,auth/src,shared/src
           -Dsonar.projectKey=CDCgov_prime-data-hub
           -Dsonar.organization=cdcgov
-          -Dsonar.java.binaries=prime-router/build/classes/java/main,prime-router/build/classes/kotlin/main,submissions/build/classes/kotlin/main,shared/build/classes/kotlin/main
-          -Dsonar.java.libraries=prime-router/build/libs/*.jar,prime-router/build/**/*.jar,submissions/build/**/*.jar,shared/build/**/*.jar
+          -Dsonar.java.binaries=prime-router/build/classes/java/main,prime-router/build/classes/kotlin/main,submissions/build/classes/kotlin/main,auth/build/classes/kotlin/main,shared/build/classes/kotlin/main
+          -Dsonar.java.libraries=prime-router/build/libs/*.jar,prime-router/build/**/*.jar,submissions/build/**/*.jar,auth/build/**/*.jar,shared/build/**/*.jar
           -Dsonar.coverage.jacoco.xmlReportPaths=prime-router/build/reports/jacoco/test/jacocoTestReport.xml
           -Dsonar.javascript.lcov.reportPaths=frontend-react/coverage/lcov.info
 

.github/workflows/scan_action_logs.yml

@@ -16,9 +16,9 @@ jobs:
         id: scan
         with:
           github-token: ${{ secrets.RUNLEAKS_TOKEN }}
-          run-limit: 500
+          run-limit: 300
           min-days-old: 0
-          max-days-old: 2
+          max-days-old: 1
           patterns-path: ".github/runleaks/patterns.txt"
           exclusions-path: ".github/runleaks/exclusions.txt"
           fail-on-leak: false

.github/workflows/snyk.yml

@@ -9,6 +9,7 @@ on:
       -  "prime-router/**"
       -  "submissions/**"
       -  "shared/**"
+      -  "auth/**"
 
 jobs:
   pre_job:
@@ -30,7 +31,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-            folder: [prime-router, submissions, shared]
+            folder: [prime-router, submissions, auth, shared]
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       - uses: snyk/actions/setup@b98d498629f1c368650224d6d212bf7dfa89e4bf

.github/workflows/sonarcloud.yml

@@ -97,6 +97,10 @@ jobs:
         if: steps.changed-files-yaml.outputs.backend_any_changed == 'true' || steps.branch-name.outputs.is_default == 'true'
         uses: ./.github/actions/build-submissions
 
+      - name: Build Auth Package
+        if: steps.changed-files-yaml.outputs.backend_any_changed == 'true' || steps.branch-name.outputs.is_default == 'true'
+        uses: ./.github/actions/build-auth
+
       - name: Perform Java CodeQL Analysis
         if: steps.changed-files-yaml.outputs.backend_any_changed == 'true' || steps.branch-name.outputs.is_default == 'true'
         uses: github/codeql-action/analyze@v3

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "operations/slack-boltjs-app"]
 	path = operations/slack-boltjs-app
-	url = https://github.com/JosiahSiegel/slack-boltjs-app
+	url = https://github.com/focusconsulting/slack-boltjs-app

frontend-react/e2e/spec/chromium-only/authenticated/last-mile-failures-page-user-flow.spec.ts

@@ -83,7 +83,7 @@ test.describe("Last Mile Failure page",
             await expect(modal).toContainText(`Report ID:${reportIdCell}`);
         });
 
-        test("table column 'Receiver' will open receiver edit page", async ({ lastMileFailuresPage, isMockDisabled }) => {
+        test.skip("table column 'Receiver' will open receiver edit page", async ({ lastMileFailuresPage, isMockDisabled }) => {
             test.skip(!isMockDisabled, "Mocks are ENABLED, skipping test");
             const receiver = tableRows(lastMileFailuresPage.page).nth(0).locator("td").nth(2);
             const receiverCell = await receiver.getByRole("link").innerText();

frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-edit-page-user-flow.spec.ts

@@ -0,0 +1,100 @@
+import { expect } from "@playwright/test";
+import { OrganizationEditPage } from "../../../pages/authenticated/admin/organization-edit";
+import { test as baseTest } from "../../../test";
+
+export interface OrganizationEditPageFixtures {
+    organizationEditPage: OrganizationEditPage;
+}
+
+const test = baseTest.extend<OrganizationEditPageFixtures>({
+    organizationEditPage: async (
+        {
+            page: _page,
+            isMockDisabled,
+            adminLogin,
+            senderLogin,
+            receiverLogin,
+            storageState,
+            frontendWarningsLogPath,
+            isFrontendWarningsLog,
+        },
+        use,
+    ) => {
+        const page = new OrganizationEditPage({
+            page: _page,
+            isMockDisabled,
+            adminLogin,
+            senderLogin,
+            receiverLogin,
+            storageState,
+            frontendWarningsLogPath,
+            isFrontendWarningsLog,
+        });
+        await page.goto();
+        await use(page);
+    },
+});
+
+test.describe("Organization Edit Page", {
+    tag: "@smoke",
+}, () => {
+    test.describe("admin user", () => {
+        test.use({storageState: "e2e/.auth/admin.json"});
+
+        test("has correct title", async ({organizationEditPage}) => {
+            await organizationEditPage.testHeader(false);
+            await expect(organizationEditPage.page.getByText(/Org name: ignore/)).toBeVisible();
+        });
+
+        test.describe("edit section", () => {
+            test("has expected 'Meta'", async ({organizationEditPage}) => {
+                const meta = organizationEditPage.page.getByTestId("gridContainer").getByTestId("grid").nth(2);
+                 await expect(meta).not.toBeEmpty();
+            });
+
+            test("has expected 'Description'", async ({organizationEditPage}) => {
+                 await expect(organizationEditPage.page.getByTestId("description")).not.toBeEmpty();
+            });
+
+            test("has expected 'Jurisdiction'", async ({organizationEditPage}) => {
+                await expect(organizationEditPage.page.getByTestId("jurisdiction")).not.toBeEmpty();
+            });
+        });
+
+        test.describe("'Organization Sender Settings' section", () => {
+            test.beforeEach(async ({ organizationEditPage }) => {
+                await organizationEditPage.page.locator("#orgsendersettings .usa-table tbody").waitFor({ state: "visible" });
+            });
+
+            test("has at least one sender listed in the table", async ({organizationEditPage}) => {
+                const rowCount = await organizationEditPage.page.locator("#orgsendersettings .usa-table tbody tr").count();
+                expect(rowCount).toBeGreaterThanOrEqual(1);
+            });
+
+            test("can edit an organization sender", async ({ organizationEditPage }) => {
+                const firstOrgSender = await organizationEditPage.page.locator("#orgsendersettings").nth(0).locator("td").nth(0).innerText();
+                await organizationEditPage.page.locator('#orgsendersettings').getByRole('link', { name: 'Edit' }).nth(0).click();
+                await expect(organizationEditPage.page).toHaveURL(`/admin/orgsendersettings/org/ignore/sender/${firstOrgSender}/action/edit`);
+                await expect(organizationEditPage.page.getByText(`Org name: ignore`)).toBeVisible();
+                await expect(organizationEditPage.page.getByText(`Sender name: ${firstOrgSender}`)).toBeVisible();
+
+                await expect(organizationEditPage.page.getByTestId("name")).not.toBeEmpty();
+                await expect(organizationEditPage.page.getByTestId("format")).not.toBeEmpty();
+                await expect(organizationEditPage.page.getByTestId("topic")).not.toBeEmpty();
+                await expect(organizationEditPage.page.getByTestId("customerStatus")).not.toBeEmpty();
+                await expect(organizationEditPage.page.getByTestId("processingType")).not.toBeEmpty();
+            });
+        });
+
+        test.describe("'Organization Receiver Settings' section", () => {
+            test.beforeEach(async ({ organizationEditPage }) => {
+                await organizationEditPage.page.locator("#orgreceiversettings .usa-table tbody").waitFor({ state: "visible" });
+            });
+
+            test("has at least one sender listed in the table", async ({organizationEditPage}) => {
+                const rowCount = await organizationEditPage.page.locator("#orgreceiversettings .usa-table tbody tr").count();
+                expect(rowCount).toBeGreaterThanOrEqual(1);
+            });
+        });
+    });
+});

frontend-react/e2e/spec/chromium-only/authenticated/organization-settings-page-user-flow.spec.ts

@@ -1,6 +1,5 @@
 import { expect } from "@playwright/test";
 import { tableRows } from "../../../helpers/utils";
-import { MOCK_GET_ORGANIZATION_SETTINGS_LIST } from "../../../mocks/organizations";
 import { OrganizationPage } from "../../../pages/authenticated/admin/organization";
 import { test as baseTest } from "../../../test";
 
@@ -72,23 +71,24 @@ test.describe("Admin Organization Settings Page - user flow smoke tests", {
 
             test("filtering works as expected", async ({organizationPage}) => {
                 const table = organizationPage.page.getByRole("table");
-                const {description, name, jurisdiction, stateCode} = MOCK_GET_ORGANIZATION_SETTINGS_LIST[2];
+                const firstDataRow = organizationPage.page.getByRole("table").getByRole("row").nth(1);
+                const firstDataRowName = (await firstDataRow.getByRole("cell").nth(0).textContent()) ?? "INVALID";
                 const filterBox = organizationPage.page.getByRole("textbox", {
                     name: "Filter:",
                 });
 
                 await expect(filterBox).toBeVisible();
 
-                await filterBox.fill(name);
+                await filterBox.fill(firstDataRowName);
                 const rows = await table.getByRole("row").all();
                 expect(rows).toHaveLength(2);
                 const cols = rows[1].getByRole("cell").allTextContents();
                 const expectedColContents = [
-                    name,
-                    description ?? "",
-                    jurisdiction ?? "",
-                    stateCode ?? "",
-                    "",
+                    await firstDataRow.getByRole("cell").nth(0).textContent(),
+                    await firstDataRow.getByRole("cell").nth(1).textContent() ?? "",
+                    await firstDataRow.getByRole("cell").nth(2).textContent() ?? "",
+                    await firstDataRow.getByRole("cell").nth(3).textContent() ?? "",
+                    await firstDataRow.getByRole("cell").nth(4).textContent() ?? "",
                     "SetEdit",
                 ];
 

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Dfile.encoding=UTF8 -Xmx2048M
 # Set Kotlin version for all peices of the build environment
-systemProp.kotlinVersion=1.9.23
+systemProp.kotlinVersion=1.9.25