Merge branch 'master' into mhv/add-interpretation-to-mobile-response

Author: liztownd

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   workflow_run:
     workflows: ["Code Checks"]
-    branches: [master, production-bypass]
+    branches: [master]
     types: [completed]
 permissions:
   id-token: write
@@ -75,27 +75,14 @@ jobs:
             ${{ steps.ecr-login.outputs.registry }}/${{ secrets.ECR_REPOSITORY }}:${{ github.event.workflow_run.head_commit.id }}
           cache-from: type=registry,ref=$ECR_REGISTRY/$ECR_REPOSITORY
           cache-to: type=inline
-  deploy_dev_staging:
+  deploy:
     needs: build_and_push
     if: ${{ github.event.workflow_run.head_branch == 'master' && github.event.workflow_run.conclusion == 'success' }}
     uses: department-of-veterans-affairs/vets-api/.github/workflows/deploy-template.yml@master
     with:
       ecr_repository: "vets-api"
       manifests_directory: "vets-api"
-      auto_deploy_envs: "dev staging"
-      commit_sha: ${{ github.event.workflow_run.head_commit.id }}
-    secrets:
-      aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-
-  deploy_prod_sandbox:
-    needs: build_and_push
-    if: ${{ github.event.workflow_run.head_branch == 'production-bypass' && github.event.workflow_run.conclusion == 'success' }}
-    uses: department-of-veterans-affairs/vets-api/.github/workflows/deploy-template.yml@master
-    with:
-      ecr_repository: "vets-api"
-      manifests_directory: "vets-api"
-      auto_deploy_envs: "prod sandbox"
+      auto_deploy_envs: "dev staging prod sandbox"
       commit_sha: ${{ github.event.workflow_run.head_commit.id }}
     secrets:
       aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/code_checks.yml

@@ -1,7 +1,7 @@
 name: Code Checks
 on:
   push:
-    branches: [master, production-bypass]
+    branches: [master]
   pull_request:
     types: [opened, reopened, synchronize]
 permissions:
@@ -73,7 +73,6 @@ jobs:
         if: |
           (
             github.ref == 'refs/heads/master' ||
-            github.ref == 'refs/heads/production-bypass' ||
             (github.event_name == 'pull_request' && steps.gemfile_changes.outputs.any_changed == 'true')
           )
         continue-on-error: true
@@ -119,7 +118,6 @@ jobs:
           steps.bundle_audit.outcome == 'failure' &&
           (
             github.ref == 'refs/heads/master' ||
-            github.ref == 'refs/heads/production-bypass' ||
             (github.event_name == 'pull_request' && steps.gemfile_changes.outputs.any_changed == 'true')
           )
         uses: ./.github/actions/vsp-github-actions/slack-socket
@@ -300,7 +298,7 @@ jobs:
         run: zstd -T0 /tmp/vets-api.tar -o /tmp/vets-api.tar.zst
 
       - name: Save Docker image to cache
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: /tmp/vets-api.tar.zst
           key: docker-image-${{ github.sha }}
@@ -356,7 +354,7 @@ jobs:
           mask-password: true
 
       - name: Restore Docker image from cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: /tmp/vets-api.tar.zst
           key: docker-image-${{ github.sha }}
@@ -378,7 +376,7 @@ jobs:
       # If no cache exists at all (e.g. first-ever run), parallel_test uses
       # filesize grouping automatically.
       - name: Restore runtime log from cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: tmp/parallel_runtime_rspec.log
           key: parallel-runtime-log-${{ github.ref }}-${{ github.run_id }}
@@ -541,7 +539,7 @@ jobs:
 
       - name: Save runtime log to cache
         if: always()
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           path: tmp/parallel_runtime_rspec.log
           key: parallel-runtime-log-${{ github.ref }}-${{ github.run_id }}

.github/workflows/deploy-template.yml

@@ -39,7 +39,7 @@ jobs:
           echo "environments=${{ env.environments }}" >> $GITHUB_OUTPUT
   release:
     needs: [prepare-values]
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/production-bypass'
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -76,24 +76,14 @@ jobs:
           path: vsp-infra-application-manifests
           ref: refs/heads/main
 
-      - name: Determine environments to update
-        id: determine-envs
-        run: |
-          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-            echo "environments=dev staging" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.ref }}" == "refs/heads/production-bypass" ]]; then
-            echo "environments=prod sandbox" >> $GITHUB_OUTPUT
-          fi
-
       - name: Update vets-api image and version name in Manifest repo
         env:
           ECR_REGISTRY: ${{ steps.ecr-login.outputs.registry }}
           ECR_REPOSITORY: dsva/${{inputs.ecr_repository}}
-          ENVIRONMENTS: ${{ steps.determine-envs.outputs.environments }}
         run: |
           cd vsp-infra-application-manifests/apps/${{inputs.manifests_directory}}
 
-          for env in $ENVIRONMENTS; do
+          for env in dev staging prod sandbox; do
             has_parent=$(yq e 'has("vets-api-parent")' "$env/values.yaml")
             has_vets=$(yq e 'has("vets-api")' "$env/values.yaml")
 

app/controllers/v0/claim_letters_controller.rb

@@ -19,6 +19,7 @@ class ClaimLettersController < ApplicationController
     def index
       docs = service.get_letters
       log_metadata_to_datadog(docs)
+      log_letter_count(docs)
       log_stale_or_empty_letters(docs)
 
       render json: docs
@@ -82,6 +83,14 @@ def log_metadata_to_datadog(docs)
                             message_type: 'ddl.doctypes_metadata', document_type_metadata: docs_metadata)
     end
 
+    def log_letter_count(docs)
+      ::Rails.logger.info('Claim letters count', {
+                            message_type: 'cst.claim_letters.count',
+                            letter_count: docs.size,
+                            api_provider: @api_provider
+                          })
+    end
+
     def log_stale_or_empty_letters(docs)
       return unless Flipper.enabled?(:cst_claim_letters_log_stale_or_empty, @current_user)
 

app/controllers/v0/dependents_applications_controller.rb

@@ -48,18 +48,28 @@ def create # rubocop:disable Metrics/MethodLength
             claim.add_veteran_info(JSON.parse(user_data.get_user_json))
 
             submission = submit_via_forms_api(claim, claim_info[:claim_label], claim_info[:participant_id])
+            upload_evidence_documents(claim, claim_info[:participant_id])
 
+            # retain standard workflow functions
             log_submitted(in_progress_form, claim)
             claim.send_submitted_email(current_user)
 
+            # serialize and add FDF submission information
             response = SavedClaimSerializer.new(claim).serializable_hash
             response[:data][:digital_forms_api] = { submission: }
 
             clear_saved_form(claim.form_id)
             return render json: response
           end
         rescue => e
-          @monitor.track_event(:error, e.message, 'dependents_controller.forms_api_submission', { error: e })
+          context = {
+            form_id: claim.form_id,
+            saved_claim_id: claim.id,
+            confirmation_number: claim.guid,
+            error: e.message,
+            tags: ['status:error']
+          }
+          @monitor.track_request(:error, e.message, 'dependents_controller.forms_api_submission', **context)
         end
       end
 
@@ -84,7 +94,7 @@ def create # rubocop:disable Metrics/MethodLength
     private
 
     # submit claim to forms api - temp for FDF pilot
-    def submit_via_forms_api(claim, claim_label, participant_id)
+    def submit_via_forms_api(claim, claim_label, participant_id) # rubocop:disable Metrics/MethodLength
       digital_forms_api_submission_service ||= DigitalFormsApi::Service::Submissions.new
 
       payload = claim.fdf_submission_payload
@@ -100,11 +110,19 @@ def submit_via_forms_api(claim, claim_label, participant_id)
       response = digital_forms_api_submission_service.submit(payload, metadata)
       raise response.to_s unless response.success?
 
-      @monitor.track_event(:info, 'success', 'dependents_controller.forms_api_submission', { claim:, response: })
-
-      upload_evidence_documents(claim, participant_id)
+      submission = response.body['submission'].presence || {}
+      context = {
+        form_id: claim.form_id,
+        saved_claim_id: claim.id,
+        confirmation_number: claim.guid,
+        submission_id: submission['submissionId'],
+        claim_id: submission.dig('claim', 'claimId'),
+        claim_label: submission.dig('claim', 'claimLabel'),
+        tags: ['status:success']
+      }
+      @monitor.track_request(:info, 'success', 'dependents_controller.forms_api_submission', **context)
 
-      response.body['submission'] || {}
+      submission
     end
 
     # upload evidence documents - temp for FDF pilot

app/controllers/v1/sessions_controller.rb

@@ -13,7 +13,7 @@ class SessionsController < ApplicationController
     service_tag 'identity'
     skip_before_action :verify_authenticity_token
 
-    REDIRECT_URLS = %w[signup mhv mhv_verified dslogon dslogon_verified idme idme_verified idme_signup
+    REDIRECT_URLS = %w[signup mhv mhv_verified idme idme_verified idme_signup
                        idme_signup_verified logingov logingov_verified logingov_signup
                        logingov_signup_verified custom mfa verify slo].freeze
     STATSD_SSO_NEW_KEY = 'api.auth.new'
@@ -238,8 +238,6 @@ def login_params(type)
         url_service.login_url('mhv', 'myhealthevet', AuthnContext::MHV)
       when 'mhv_verified'
         url_service.login_url('mhv_verified', 'myhealthevet', AuthnContext::MHV)
-      when 'dslogon', 'dslogon_verified'
-        url_service.login_url('dslogon', 'dslogon', AuthnContext::DSLOGON)
       when 'idme'
         url_service.login_url('idme', LOA::IDME_LOA1_VETS, AuthnContext::ID_ME, AuthnContext::MINIMUM)
       when 'idme_verified'

app/serializers/submission_status_serializer.rb

@@ -3,5 +3,5 @@
 class SubmissionStatusSerializer
   include JSONAPI::Serializer
 
-  attributes :id, :detail, :form_type, :message, :status, :created_at, :updated_at, :pdf_support, :presigned_url
+  attributes :id, :detail, :form_type, :message, :status, :created_at, :updated_at, :pdf_support
 end

app/services/sign_in/acr_translator.rb

@@ -22,8 +22,6 @@ def translate_acr
         translate_idme_values
       when Constants::Auth::LOGINGOV
         translate_logingov_values
-      when Constants::Auth::DSLOGON
-        translate_dslogon_values
       when Constants::Auth::MHV
         translate_mhv_values
       else
@@ -62,15 +60,6 @@ def translate_idme_values
       end
     end
 
-    def translate_dslogon_values
-      case acr
-      when 'loa1', 'loa3', 'min'
-        Constants::Auth::IDME_DSLOGON_LOA1
-      else
-        raise Errors::InvalidAcrError.new message: 'Invalid ACR for dslogon'
-      end
-    end
-
     def translate_mhv_values
       case acr
       when 'loa1', 'loa3', 'min'

app/services/sign_in/constants/auth.rb

@@ -37,7 +37,8 @@ module Auth
       BROKER_CODE = 'sis'
       CLIENT_STATE_MINIMUM_LENGTH = 22
       CODE_CHALLENGE_METHOD = 'S256'
-      CSP_TYPES = [IDME = 'idme', LOGINGOV = 'logingov', DSLOGON = 'dslogon', MHV = 'mhv'].freeze
+      CSP_TYPES = [IDME = 'idme', LOGINGOV = 'logingov', MHV = 'mhv'].freeze
+      DSLOGON = 'dslogon'
       OPERATION_TYPES = [SIGN_UP = 'sign_up',
                          AUTHORIZE = 'authorize',
                          AUTHORIZE_SSO = 'authorize_sso',

app/services/sign_in/credential_level_creator.rb

@@ -7,7 +7,6 @@ class CredentialLevelCreator
                 :logingov_acr,
                 :verified_at,
                 :mhv_assurance,
-                :dslogon_assurance,
                 :level_of_assurance,
                 :credential_ial,
                 :credential_uuid
@@ -18,7 +17,6 @@ def initialize(requested_acr:, type:, logingov_acr:, user_info:)
       @logingov_acr = logingov_acr
       @verified_at = user_info.verified_at
       @mhv_assurance = user_info.mhv_assurance
-      @dslogon_assurance = user_info.dslogon_assurance
       @level_of_assurance = user_info.level_of_assurance
       @credential_ial = user_info.credential_ial
       @credential_uuid = user_info.sub
@@ -69,8 +67,6 @@ def max_ial
         logingov_max_ial
       when Constants::Auth::MHV
         mhv_max_ial
-      when Constants::Auth::DSLOGON
-        dslogon_max_ial
       else
         idme_max_ial
       end
@@ -82,8 +78,6 @@ def current_ial
         logingov_current_ial
       when Constants::Auth::MHV
         mhv_current_ial
-      when Constants::Auth::DSLOGON
-        dslogon_current_ial
       else
         idme_current_ial
       end
@@ -97,15 +91,6 @@ def mhv_max_ial
       verified_ial_level(mhv_premium_verified?)
     end
 
-    def dslogon_max_ial
-      Rails.logger.info(
-        "[CredentialLevelCreator] DSLogon level of assurance: #{dslogon_assurance}, " \
-        "credential_uuid: #{credential_uuid}"
-      )
-
-      verified_ial_level(dslogon_premium_verified?)
-    end
-
     def idme_max_ial
       verified_ial_level(idme_loa3_or_previously_verified?)
     end
@@ -121,10 +106,6 @@ def mhv_current_ial
       verified_ial_level(requested_verified_account? && mhv_premium_verified?)
     end
 
-    def dslogon_current_ial
-      verified_ial_level(requested_verified_account? && dslogon_premium_verified?)
-    end
-
     def idme_current_ial
       verified_ial_level(idme_classic_loa3_or_ial2?)
     end
@@ -133,10 +114,6 @@ def mhv_premium_verified?
       Constants::Auth::MHV_PREMIUM_VERIFIED.include?(mhv_assurance)
     end
 
-    def dslogon_premium_verified?
-      Constants::Auth::DSLOGON_PREMIUM_VERIFIED.include?(dslogon_assurance)
-    end
-
     def logingov_ial2?
       logingov_ial2_levels.include?(logingov_acr)
     end