From cafebc0338ca3fb5be60fd6ba9478c887257119e Mon Sep 17 00:00:00 2001 From: James Person Date: Thu, 8 Feb 2024 06:30:19 -0500 Subject: [PATCH 1/3] Frontend Edits for Historical Migration Support (#3363) * Summary page - Remove the single workbook DL links * Show EIN if UEI is default. Otherwise, UEI anyway. --- backend/dissemination/templates/search.html | 11 +- backend/dissemination/templates/summary.html | 173 +------------------ 2 files changed, 18 insertions(+), 166 deletions(-) diff --git a/backend/dissemination/templates/search.html b/backend/dissemination/templates/search.html index d07bb58620..84159808c8 100644 --- a/backend/dissemination/templates/search.html +++ b/backend/dissemination/templates/search.html @@ -212,7 +212,16 @@

Search single audit reports

{% for result in results %} {{ result.auditee_name }} - {{ result.auditee_uei }} + {% comment %} Display UEI. If it's "GSA_MIGRATION", use the EIN instead. If no EIN, just show "GSA_MIGRATION". {% endcomment %} + + {% if result.auditee_uei != "GSA_MIGRATION" %} + {{ result.auditee_uei }} + {% elif result.auditee_ein %} + {{ result.auditee_ein }} + {% else %} + {{ result.auditee_uei }} + {% endif %} + {% comment %} Sorts ascending/descending by the numeric date string (i.e. 20231231) {% endcomment %} {{ result.fac_accepted_date }} diff --git a/backend/dissemination/templates/summary.html b/backend/dissemination/templates/summary.html index d8225c4752..ff3772bedb 100644 --- a/backend/dissemination/templates/summary.html +++ b/backend/dissemination/templates/summary.html @@ -109,7 +109,7 @@

Auditee

-

+

Additional UEIs?  {% if data|getkey:"Additional UEIs" %} Y @@ -117,27 +117,6 @@

Auditee

- {% if not data|getkey:"Additional UEIs" %} - - - Download workbook 6 - - {% else %} - - - Download workbook 6 - - {% endif %}

@@ -148,7 +127,7 @@

Auditee

-

+

Additional EINs?  {% if data|getkey:"Additional EINs" %} @@ -157,27 +136,6 @@

Auditee

- {% if not data|getkey:"Additional EINs" %} - - - Download workbook 8 - - {% else %} - - - Download workbook 8 - - {% endif %}

@@ -243,7 +201,7 @@

Auditor

-

+

Secondary Auditors?  {% if data|getkey:"Secondary Auditors" %} Y @@ -251,27 +209,6 @@

Auditor

- {% if not data|getkey:"Secondary Auditors" %} - - - Download workbook 7 - - {% else %} - - - Download workbook 7 - - {% endif %}

@@ -284,138 +221,44 @@

Summary

-

+

Federal awards:  {{ data|getkey:"Awards"|length }} - - - Download workbook 1 -

-

+

Notes to SEFA:  {{ data|getkey:"Notes to SEFA"|length }} - {% if not data|getkey:"Notes to SEFA" %} - - - Download workbook 2 - - {% else %} - - - Download workbook 2 - - {% endif%}

-

+

Findings:  {{ data|getkey:"Audit Findings"|length }} - {% if not data|getkey:"Audit Findings" %} - - - Download workbook 3 - - {% else %} - - - Download workbook 3 - - {% endif %}

{% comment %} Findings text - If none, show the gray box with no link. {% endcomment %} -

+

Findings text:  {{ data|getkey:"Audit Findings Text"|length }} - {% if not data|getkey:"Audit Findings Text" %} - - - Download workbook 4 - - {% else %} - - - Download workbook 4 - - {% endif %}

{% comment %} CAP - If none, show the gray box with no link. {% endcomment %} -

+

CAP:  {{ data|getkey:"Corrective Action Plan"|length }} - {% if not data|getkey:"Corrective Action Plan" %} - - - Download workbook 5 - - {% else %} - - - Download workbook 5 - - {% endif %}

From d842e415c66440f6080052619cacf8a7ca08ca24 Mon Sep 17 00:00:00 2001 From: Alex Steel <130377221+asteel-gsa@users.noreply.github.com> Date: Thu, 8 Feb 2024 09:58:43 -0500 Subject: [PATCH 2/3] Github Action Version Updates (#3310) * Bump create-or-update-comment * Bump Zap * Bump repository-dispatch * Bump create-pull-request * Bump auto-approve-action --- .github/workflows/add-bpmn-renders.yml | 4 ++-- .github/workflows/create-pull-request-to-staging.yml | 2 +- .github/workflows/pull-request-checks.yml | 2 +- .github/workflows/zap-scan.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/add-bpmn-renders.yml b/.github/workflows/add-bpmn-renders.yml index ad278dfdc7..0a8c014d9a 100644 --- a/.github/workflows/add-bpmn-renders.yml +++ b/.github/workflows/add-bpmn-renders.yml @@ -50,7 +50,7 @@ jobs: - name: Create Pull Request with Changes if: steps.vars.outputs.imagesupdated != 0 - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: commit-message: Update BPMN images for ${{ env.BRANCH_NAME }} title: Update BPMN images for ${{ env.BRANCH_NAME }} @@ -61,7 +61,7 @@ jobs: - name: Update Changes if: steps.vars.outputs.imagesupdated != 0 - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 with: issue-number: ${{ github.event.pull_request.number }} body: | diff --git a/.github/workflows/create-pull-request-to-staging.yml b/.github/workflows/create-pull-request-to-staging.yml index 9d9705490f..81c8d09457 100644 --- a/.github/workflows/create-pull-request-to-staging.yml +++ b/.github/workflows/create-pull-request-to-staging.yml @@ -73,7 +73,7 @@ jobs: permissions: pull-requests: write steps: - - uses: hmarr/auto-approve-action@v3 + - uses: hmarr/auto-approve-action@v4 with: pull-request-number: ${{ needs.pull-request.outputs.pr_number }} github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pull-request-checks.yml b/.github/workflows/pull-request-checks.yml index 7242f8e95f..167d72f622 100644 --- a/.github/workflows/pull-request-checks.yml +++ b/.github/workflows/pull-request-checks.yml @@ -99,7 +99,7 @@ jobs: needs: [terraform-plan-staging, testing-from-ghcr, testing-from-build] steps: - name: Repository Dispatch - uses: peter-evans/repository-dispatch@v2 + uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.GITHUB_TOKEN }} event-type: ready-to-merge diff --git a/.github/workflows/zap-scan.yml b/.github/workflows/zap-scan.yml index 1367b7be33..9e9068c00f 100644 --- a/.github/workflows/zap-scan.yml +++ b/.github/workflows/zap-scan.yml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v4 - name: ZAP Scan of ${{ env.url }} - uses: zaproxy/action-baseline@v0.10.0 + uses: zaproxy/action-baseline@v0.11.0 with: token: ${{ secrets.GITHUB_TOKEN }} docker_name: 'owasp/zap2docker-stable' From 39b702df6c507e537c68f93ed6aeca88fc6bebce Mon Sep 17 00:00:00 2001 From: Tadhg O'Higgins <2626258+tadhg-ohiggins@users.noreply.github.com> Date: Thu, 8 Feb 2024 10:39:14 -0800 Subject: [PATCH 3/3] Increase production RAM to 6G. (#3376) --- backend/manifests/vars/vars-production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/manifests/vars/vars-production.yml b/backend/manifests/vars/vars-production.yml index dc8ba3903b..6a35359189 100644 --- a/backend/manifests/vars/vars-production.yml +++ b/backend/manifests/vars/vars-production.yml @@ -1,5 +1,5 @@ app_name: gsa-fac -mem_amount: 2G +mem_amount: 6G cf_env_name: PRODUCTION env_name: prod service_name: production