Merge pull request #3377 from GSA-TTS/main

GSA-TTS · Feb 8, 2024 · 84332d9 · 84332d9
2 parents c7b0441 + 39b702d
commit 84332d9
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 172 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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'

diff --git a/backend/dissemination/templates/search.html b/backend/dissemination/templates/search.html
@@ -212,7 +212,16 @@ <h2 class="font-sans-2xl">Search single audit reports</h2>
                                 {% for result in results %}
                                     <tr>
                                         <th scope="row" role="rowheader">{{ result.auditee_name }}</th>
-                                        <td>{{ result.auditee_uei }}</td>
+                                        {% comment %} Display UEI. If it's "GSA_MIGRATION", use the EIN instead. If no EIN, just show "GSA_MIGRATION". {% endcomment %}
+                                        <td>
+                                            {% if result.auditee_uei != "GSA_MIGRATION" %}
+                                                {{ result.auditee_uei }}
+                                            {% elif result.auditee_ein %}
+                                                {{ result.auditee_ein }}
+                                            {% else %}
+                                                {{ result.auditee_uei }}
+                                            {% endif %}
+                                        </td>
                                         {% comment %} Sorts ascending/descending by the numeric date string (i.e. 20231231) {% endcomment %}
                                         <td data-sort-value={{ result.fac_accepted_date|date:"Ymd" }}>{{ result.fac_accepted_date }}
                                         </td>

diff --git a/backend/dissemination/templates/summary.html b/backend/dissemination/templates/summary.html
diff --git 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