Merge branch 'master' into vaos-alternate-route

department-of-veterans-affairs · Oct 25, 2024 · ce2cbda · ce2cbda
2 parents e844deb + 5cb03e9
commit ce2cbda
Show file tree

Hide file tree

Showing 749 changed files with 43,694 additions and 18,939 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/.github/workflows/be_review_prs.yml b/.github/workflows/be_review_prs.yml
@@ -57,8 +57,16 @@ jobs:
         if: contains(github.event.pull_request.labels.*.name, 'require-backend-approval')
         id: verify_approval
         run: |
-          BACKEND_REVIEWERS=$(echo '${{ steps.get_team_members.outputs.data }}' | jq -r '.[].login' | tr '\n' '|' | sed 's/|$//')
-          APPROVALS=$(echo '${{ steps.check_backend_review_group_approval_status.outputs.data }}' | jq -r '.[] | select(.state == "APPROVED") | .user.login' | grep -iE "$BACKEND_REVIEWERS" | wc -l)
+          BACKEND_REVIEWERS=$(cat <<'EOF' | jq -r '.[].login' | tr '\n' '|' | sed 's/|$//'
+          ${{ steps.get_team_members.outputs.data }}
+          EOF
+          )
+
+          APPROVALS=$(cat <<'EOF' | jq -r '.[] | select(.state == "APPROVED") | .user.login' | grep -iE "$BACKEND_REVIEWERS" | wc -l
+          ${{ steps.check_backend_review_group_approval_status.outputs.data }}
+          EOF
+          )
+
           echo "Number of backend-review-group approvals: $APPROVALS"
           if [ "$APPROVALS" -eq 0 ]; then
             echo "approval_status=required" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/check_codeowners.yml b/.github/workflows/check_codeowners.yml
@@ -49,7 +49,7 @@ jobs:
 
     - name: Respond to PR if check CODEOWNERS exists for new files fails
       if: ${{ failure() }}
-      uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+      uses: thollander/actions-comment-pull-request@e2c37e53a7d2227b61585343765f73a9ca57eda9 # v3.0.0
       with:
         message: 'Error: A file (or its parent directories) does not have a CODEOWNERS entry. Please update the .github/CODEOWNERS file and add the entry for the Offending file: ${{ env.offending_file }}'
         GITHUB_TOKEN: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}
@@ -109,7 +109,7 @@ jobs:
 
     - name: Respond to PR if check CODEOWNERS exists for deleted files fails
       if: ${{ failure() }}
-      uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+      uses: thollander/actions-comment-pull-request@e2c37e53a7d2227b61585343765f73a9ca57eda9 # v3.0.0
       with:
         message: 'Error: A file (or its parent directories) was deleted but its reference still exists in CODEOWNERS. Please update the .github/CODEOWNERS file and delete the entry for the Offending file: ${{ env.offending_file }}'
         GITHUB_TOKEN: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}

diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -13,7 +13,7 @@ jobs:
     env:
       BUNDLE_ENTERPRISE__CONTRIBSYS__COM: ${{ secrets.BUNDLE_ENTERPRISE__CONTRIBSYS__COM }}
     permissions: write-all
-    runs-on: ubuntu-16-cores-latest
+    runs-on: ubuntu-32-cores-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -63,7 +63,7 @@ jobs:
       DOCKER_BUILDKIT: 1
       COMPOSE_DOCKER_CLI_BUILD: 1
     permissions: write-all
-    runs-on: ubuntu-16-cores-latest
+    runs-on: ubuntu-32-cores-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -131,13 +131,13 @@ jobs:
           max_attempts: 3
           command: |
             docker compose -f docker-compose.test.yml run web bash \
-              -c "CI=true RAILS_ENV=test DISABLE_BOOTSNAP=true bundle exec parallel_test -n 13 -e 'bin/rails db:reset'"
+              -c "CI=true RAILS_ENV=test DISABLE_BOOTSNAP=true bundle exec parallel_test -n 24  -e 'bin/rails db:reset'"
 
       - name: Run Specs
         timeout-minutes: 20
         run: |
           docker compose -f docker-compose.test.yml run web bash \
-          -c "CI=true DISABLE_BOOTSNAP=true bundle exec parallel_rspec spec/ modules/ -n 13 -o '--color --tty'"
+          -c "CI=true DISABLE_BOOTSNAP=true bundle exec parallel_rspec spec/ modules/ -n 24 -o '--color --tty'"
 
       - name: Upload Coverage Report
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/deploy_delay_notifications.yml b/.github/workflows/deploy_delay_notifications.yml
@@ -19,9 +19,11 @@ jobs:
           latest_commit_info=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             "https://api.github.com/repos/${{ github.repository }}/commits/master")
           latest_sha=$(echo "${latest_commit_info}" | jq -r '.sha')
-          commit_time=$(echo "${latest_commit_info}" | jq -r '.commit.committer.date')
           echo "latest_sha=${latest_sha}" >> $GITHUB_ENV
+          echo "latest_sha: ${latest_sha}"
+          commit_time=$(echo "${latest_commit_info}" | jq -r '.commit.committer.date')
           echo "commit_time=${commit_time}" >> $GITHUB_ENV
+          echo "commit_time: ${commit_time}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -50,10 +52,10 @@ jobs:
           if [ "${latest_sha:0:8}" == "${deployed_sha:0:8}" ]; then
             echo "${info_message} has been deployed."
             echo "dev_summary=${info_message} has been deployed." >> $GITHUB_OUTPUT
-          elif [ "$(date -d "${commit_time}" +%s)" -gt "$(date -d '45 minutes ago' +%s)" ]; then
+          elif [ "$(date -d "${commit_time}" +%s)" -lt "$(date -d '45 minutes ago' +%s)" ]; then
             echo "${info_message} has been delayed for more than 45 minutes. Skipping notification."
             echo "dev_summary=${info_message} has been delayed for more than 45 minutes. Skipping notification." >> $GITHUB_OUTPUT
-          elif [ "$(date -d "${commit_time}" +%s)" -gt "$(date -d '30 minutes ago' +%s)" ]; then
+          elif [ "$(date -d "${commit_time}" +%s)" -lt "$(date -d '30 minutes ago' +%s)" ]; then
             echo "${info_message} has been delayed for more than 30 minutes."
             echo "Current commit on development is ${deployed_sha:0:8}."
             echo "dev_summary=${info_message} has been delayed for more than 30 minutes. Current commit on development is ${deployed_sha:0:8}.\n\nCheck the following list of items for errors: ${action_items}" >> $GITHUB_OUTPUT
@@ -76,10 +78,10 @@ jobs:
           if [ "${latest_sha:0:8}" == "${deployed_sha:0:8}" ]; then
             echo "${info_message} has been deployed."
             echo "staging_summary=${info_message} has been deployed." >> $GITHUB_OUTPUT
-          elif [ "$(date -d "${commit_time}" +%s)" -gt "$(date -d '45 minutes ago' +%s)" ]; then
+          elif [ "$(date -d "${commit_time}" +%s)" -lt "$(date -d '45 minutes ago' +%s)" ]; then
             echo "${info_message} has been delayed for more than 45 minutes. Skipping notification."
             echo "staging_summary=${info_message} has been delayed for more than 45 minutes. Skipping notification." >> $GITHUB_OUTPUT
-          elif [ "$(date -d "${commit_time}" +%s)" -gt "$(date -d '30 minutes ago' +%s)" ]; then
+          elif [ "$(date -d "${commit_time}" +%s)" -lt "$(date -d '30 minutes ago' +%s)" ]; then
             echo "${info_message} has been delayed for more than 30 minutes."
             echo "Current commit on staging is ${deployed_sha:0:8}."
             echo "staging_summary=${info_message} has been delayed for more than 30 minutes. Current commit on staging is ${deployed_sha:0:8}.\n\nCheck the following list of items for errors: ${action_items}" >> $GITHUB_OUTPUT
@@ -125,11 +127,22 @@ jobs:
           ssm_parameter: /devops/github_actions_slack_bot_user_token
           env_variable_name: SLACK_BOT_TOKEN
 
-      - name: Slack notify
+      - name: Notify for deployment failure
+        if: ${{ env.latest_sha != '' }}
         uses: ./.github/actions/vsp-github-actions/slack-socket
         with:
           slack_app_token: ${{ env.SLACK_APP_TOKEN }}
           slack_bot_token: ${{ env.SLACK_BOT_TOKEN }}
           message: "Vets API Deployment Delay:"
           blocks: "[{\"type\": \"divider\"}, {\"type\": \"section\", \"text\": { \"type\": \"mrkdwn\", \"text\": \":scared_and_sweating_smiley: GitHub Action Runner Workflow failed! :scared_and_sweating_smiley:\n <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }} Run #${{ github.run_number }}>\n\n*Development Summary:*\n${{ needs.check-deployment.outputs.development_summary }}\n\n*Staging Summary:*\n${{ needs.check-deployment.outputs.staging_summary }}\"}}, {\"type\": \"divider\"}]"
           channel_id: "C039HRTHXDH"
+
+      - name: Notify for other failure
+        if: ${{ env.latest_sha == '' }}
+        uses: ./.github/actions/vsp-github-actions/slack-socket
+        with:
+          slack_app_token: ${{ env.SLACK_APP_TOKEN }}
+          slack_bot_token: ${{ env.SLACK_BOT_TOKEN }}
+          message: "Vets API Deployment Delay:"
+          blocks: "[{\"type\": \"divider\"}, {\"type\": \"section\", \"text\": { \"type\": \"mrkdwn\", \"text\": \":scared_and_sweating_smiley: GitHub Action Runner Workflow failed! :scared_and_sweating_smiley:\n\n Unknown error occured. See logs:\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }} Run #${{ github.run_number }}>\"}}, {\"type\": \"divider\"}]"
+          channel_id: "C039HRTHXDH"
diff --git a/.github/workflows/ready_for_review.yml b/.github/workflows/ready_for_review.yml
@@ -25,6 +25,7 @@ jobs:
           ssm_parameter: /devops/VA_VSP_BOT_GITHUB_TOKEN
           env_variable_name: VA_VSP_BOT_GITHUB_TOKEN
 
+      # If no failures, no_failures=true
       - name: Audit PR Labels
         id: audit_pr_labels
         if: |
@@ -36,13 +37,15 @@ jobs:
         run: |
           echo "no_failures=true" >> $GITHUB_OUTPUT
 
+      # If test-passing label is present, ready_for_review=true
       - name: Audit Test Passing Label
         id: audit_passing_labels
         if: |
           contains(github.event.pull_request.labels.*.name, 'test-passing')
         run: |
           echo "ready_for_review=true" >> $GITHUB_OUTPUT
 
+      # If require-backend-approval label is present, get reviews
       - name: Check backend-review-group approval status
         if: contains(github.event.pull_request.labels.*.name, 'require-backend-approval')
         id: check_backend_review_group_approval_status
@@ -52,6 +55,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      #
       - name: Get backend-review-group members
         if: contains(github.event.pull_request.labels.*.name, 'require-backend-approval')
         id: get_team_members
@@ -65,8 +69,16 @@ jobs:
         if: contains(github.event.pull_request.labels.*.name, 'require-backend-approval')
         id: verify_approval
         run: |
-          BACKEND_REVIEWERS=$(echo '${{ steps.get_team_members.outputs.data }}' | jq -r '.[].login' | tr '\n' '|' | sed 's/|$//')
-          APPROVALS=$(echo '${{ steps.check_backend_review_group_approval_status.outputs.data }}' | jq -r '.[] | select(.state == "APPROVED") | .user.login' | grep -iE "$BACKEND_REVIEWERS" | wc -l)
+          BACKEND_REVIEWERS=$(cat <<'EOF' | jq -r '.[].login' | tr '\n' '|' | sed 's/|$//'
+          ${{ steps.get_team_members.outputs.data }}
+          EOF
+          )
+
+          APPROVALS=$(cat <<'EOF' | jq -r '.[] | select(.state == "APPROVED") | .user.login' | grep -iE "$BACKEND_REVIEWERS" | wc -l
+          ${{ steps.check_backend_review_group_approval_status.outputs.data }}
+          EOF
+          )
+
           echo "Number of backend-review-group approvals: $APPROVALS"
           if [ "$APPROVALS" -eq 0 ]; then
             echo "approval_status=required" >> $GITHUB_OUTPUT

diff --git a/Gemfile b/Gemfile
@@ -11,6 +11,7 @@ path 'modules' do
   gem 'apps_api'
   gem 'ask_va_api'
   gem 'avs'
+  gem 'burials'
   gem 'check_in'
   gem 'claims_api'
   gem 'covid_research'
@@ -137,6 +138,7 @@ gem 'rails-session_cookie'
 gem 'redis'
 gem 'redis-namespace'
 gem 'request_store'
+gem 'require_all'
 gem 'restforce'
 gem 'rgeo-geojson'
 gem 'roo'
@@ -180,6 +182,7 @@ end
 
 group :test do
   gem 'apivore', git: 'https://github.com/department-of-veterans-affairs/apivore', tag: 'v2.1.0.vsp'
+  gem 'committee-rails'
   gem 'mock_redis'
   gem 'pdf-inspector'
   gem 'rspec_junit_formatter'