add redis to OSX getting started native doc

.github/CODEOWNERS

@@ -129,3 +129,6 @@ spec/lib/pdf_utilities/pdf_validator @department-of-veterans-affairs/va-api-engi
 
 # Decision Reviews (Appeals) API product
 modules/appeals_api @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/lighthouse-banana-peels
+
+# Disability Benefits Experience support
+lib/disability_compensation @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/bdex

.github/workflows/code_checks.yml

@@ -22,9 +22,8 @@ jobs:
       - name: Run Rubocop
         run: bundle exec rubocop --parallel --format github
 
-      # Remove no-exit-on-warn when we upgrade to Ruby 3
       - name: Run Brakeman
-        run:  bundle exec brakeman --ensure-latest --confidence-level=2 --format github --no-exit-on-warn
+        run:  bundle exec brakeman --ensure-latest --confidence-level=2 --format github
 
   tests:
     name: Test
@@ -33,6 +32,8 @@ jobs:
       CI: true
       RAILS_ENV: test
       TERM: xterm-256color
+      DOCKER_BUILDKIT: 1
+      COMPOSE_DOCKER_CLI_BUILD: 1
     runs-on: ubuntu-16-cores-latest
     steps:
       - uses: actions/checkout@v3
@@ -49,42 +50,30 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Setup Docker
-        run: |
-          docker volume create --name=test_bundle_v2_7_6-cache-v3
-
       - name: Build Docker Image
         uses: docker/build-push-action@v4
         with:
           build-args: |
             sidekiq_license=${{ env.BUNDLE_ENTERPRISE__CONTRIBSYS__COM }}
             userid=${{ env.VETS_API_USER_ID }}
           context: .
-          target: development
+          target: builder
           push: false
           load: true
           tags: vets-api
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: Install gems
-        run: |
-             docker-compose -f docker-compose.test.yml -f docker-compose.gha.yml \
-             run vets-api bash \
-             -c "CI=true RAILS_ENV=test DISABLE_BOOTSNAP=true rails --version"
-
       - name: Setup Database
         run: |
-             docker-compose -f docker-compose.test.yml -f docker-compose.gha.yml \
-             run vets-api bash \
-             -c "CI=true RAILS_ENV=test DISABLE_BOOTSNAP=true parallel_test -n 16 -e 'bin/rails db:reset'"
+             docker-compose -f docker-compose.test.yml run vets-api bash \
+             -c "CI=true RAILS_ENV=test DISABLE_BOOTSNAP=true parallel_test -n 13 -e 'bin/rails db:reset'"
 
       - name: Run Specs
         timeout-minutes: 20
         run: |
-             docker-compose -f docker-compose.test.yml -f docker-compose.gha.yml \
-             run vets-api bash \
-             -c "CI=true DISABLE_BOOTSNAP=true bundle exec parallel_rspec spec/ modules/ -n 16 -o '--color --tty'"
+             docker-compose -f docker-compose.test.yml run vets-api bash \
+             -c "CI=true DISABLE_BOOTSNAP=true bundle exec parallel_rspec spec/ modules/ -n 13 -o '--color --tty'"
 
       - name: Upload Coverage Report
         uses: actions/upload-artifact@v3

.github/workflows/preview-environment-cleanup.yml

@@ -25,6 +25,7 @@ jobs:
         run: |
           npm install fs
           npm install @actions/core
+          npm install js-yaml
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -60,5 +61,16 @@ jobs:
           author_email: devops@va.gov
           branch: main
           cwd: manifests/apps/preview-environment/dev/
-          add: 'environment-values'
+          add: 'pe-envs'
           message: 'Remove values file(s) in accordance with Preview Environment cleanup policies'
+
+      - name: Add and Commit change(s)
+        if: ${{ env.ENVS_TO_DELETE == 'true'}}
+        uses: EndBug/add-and-commit@v7
+        with:
+          author_name: va-vsp-bot
+          author_email: devops@va.gov
+          branch: main
+          cwd: manifests/apps/preview-environment/dev/
+          add: 'argocd-apps'
+          message: 'Remove envronment listing(s) in accordance with Preview Environment cleanup policies'

.github/workflows/preview-environment-update-main.yml

@@ -0,0 +1,42 @@
+name: Preview Environment - Update main image
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  update-preview-environment-main-image:
+    name: Update preview environment main image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Environment
+        run: echo "VETS_API_USER_ID=$(id -u)" >> $GITHUB_ENV
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-gov-west-1
+
+      # - name: Login to ECR # Update ECR credentials if necessary
+      #   id: login-ecr
+      #   uses: aws-actions/amazon-ecr-login@v1
+
+      # - name: Build Docker Image #use "file" input to designate alternate dockerfile path. Defaults to "Dockerfile": https://github.com/docker/build-push-action
+      #   uses: docker/build-push-action@v2
+      #   with:
+      #     build-args: |
+      #       userid=${{ env.VETS_API_USER_ID }}
+      #     context: .
+      #     # target: production
+      #     push: true
+      #     # Update tags and ECR Repository
+      #     tags: |
+      #       ${{ steps.login-ecr.outputs.registry }}/dsva/preview-environment/vets-api:latest
+      #     # cache-from: type=registry,ref=$ECR_REGISTRY/$ECR_REPOSITORY
+      #     # cache-to: type=inline

.github/workflows/preview_environment_deployment.yml

@@ -12,6 +12,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup Environment
+        run: echo "VETS_API_USER_ID=$(id -u)" >> $GITHUB_ENV
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1-node16
         with:
@@ -33,6 +36,16 @@ jobs:
       - name: Install dependencies
         run: |
           npm install @actions/core
+
+      - name: Start Deployment
+        if: ${{ github.event_name == 'push' }}
+        uses: bobheadxi/deployments@v1
+        id: deployment
+        with:
+          step: start
+          token: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}
+          env: master/main/${{ github.ref_name }}
+          ref: ${{ github.ref_name }}
 
       - name: Get Source Repo and Source Ref
         run: node ./script/github-actions/pe-deploy-source.js
@@ -42,10 +55,28 @@ jobs:
           SOURCE_REPO: ${{ github.event.client_payload.source_repo }}
           WORKFLOW_BRANCH: ${{ github.ref_name }}
 
+      # - name: Login to ECR # Update ECR credentials if necessary
+      #   id: login-ecr
+      #   uses: aws-actions/amazon-ecr-login@v1
+
+      # - name: Build Docker Image #use "file" input to designate alternate dockerfile path. Defaults to "Dockerfile": https://github.com/docker/build-push-action
+      #   uses: docker/build-push-action@v2
+      #   with:
+      #     build-args: |
+      #       userid=${{ env.VETS_API_USER_ID }}
+      #     context: .
+      #     # target: production
+      #     push: true
+      #     # Update tags and ECR Repository
+      #     tags: |
+      #       ${{ steps.login-ecr.outputs.registry }}/dsva/preview-environment/vets-api:${{ env.SOURCE_REF_SANITIZED }}
+      #     # cache-from: type=registry,ref=$ECR_REGISTRY/$ECR_REPOSITORY
+      #     # cache-to: type=inline
+
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ env.VA_VSP_BOT_GITHUB_TOKEN }}
           event-type: deploy_review_instance
           repository: department-of-veterans-affairs/devops
-          client-payload: '{"source_repo": "${{ env.SOURCE_REPO }}", "source_ref": "${{ env.SOURCE_REF }}", "source_ref_sanitized": "${{ env.SOURCE_REF_SANITIZED }}"}'
+          client-payload: '{"source_repo": "${{ env.SOURCE_REPO }}", "source_ref": "${{ env.SOURCE_REF }}", "source_ref_sanitized": "${{ env.SOURCE_REF_SANITIZED }}", "deployment_id": "${{ steps.deployment.outputs.deployment_id }}"}'

.rubocop.yml

@@ -324,7 +324,6 @@ RSpec/SubjectStub:
     - 'spec/models/emis_redis/military_information_v2_spec.rb'
     - 'spec/models/session_spec.rb'
     - 'spec/services/evss_claim_service_spec.rb'
-    - 'spec/services/mhv_accounts_service_spec.rb'
     - 'spec/uploaders/evss_claim_document_uploader_spec.rb'
     - 'spec/services/form1010cg/service_spec.rb'
     - 'spec/services/form1010cg/auditor_spec.rb'

.ruby-version

@@ -1 +1 @@
-2.7.6
+3.1.3

Dangerfile

@@ -125,9 +125,9 @@ module VSPDanger
 
         OpenStruct.new(
           total_changes: insertions + deletions,
-          insertions: insertions,
-          deletions: deletions,
-          file_name: file_name
+          insertions:,
+          deletions:,
+          file_name:
         )
       end.compact
     end

Dockerfile

@@ -2,10 +2,19 @@
 #      stretch (or in alpine) and is switched automatically to pdftk-java in buster
 #      https://github.com/department-of-veterans-affairs/va.gov-team/issues/3032
 
+FROM ruby:3.1.3-slim-bullseye AS modules
+
+WORKDIR /tmp
+
+# Copy each module's Gemfile, gemspec, and version.rb files
+COPY modules/ modules/
+RUN find modules -type f ! \( -name Gemfile -o -name "*.gemspec" -o -path "*/lib/*/version.rb" \) -delete && \
+    find modules -type d -empty -delete
+
 ###
 # shared build/settings for all child images, reuse these layers yo
 ###
-FROM ruby:2.7.6-slim-bullseye AS base
+FROM ruby:3.1.3-slim-bullseye AS base
 
 ARG userid=993
 SHELL ["/bin/bash", "-c"]
@@ -50,6 +59,7 @@ ARG rails_env=development
 
 ENV BUNDLE_ENTERPRISE__CONTRIBSYS__COM=$sidekiq_license
 ENV RAILS_ENV=$rails_env
+ENV BUNDLER_VERSION=2.4.9
 
 # only extra dev/build opts go here, common packages go in base 👆
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -60,6 +70,7 @@ USER vets-api
 RUN freshclam --config-file freshclam.conf
 RUN gem install vtk
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "./docker-entrypoint.sh"]
+RUN gem install bundler:${BUNDLER_VERSION} --no-document
 
 ###
 # build stage; use --target=builder to stop here
@@ -72,12 +83,18 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--", "./docker-entrypoint.sh"]
 FROM development AS builder
 # XXX: move modules/ to seperate repos so we can only copy Gemfile* and install a slim layer
 ARG bundler_opts
+
+COPY --chown=vets-api:vets-api Gemfile Gemfile.lock ./
+COPY --chown=vets-api:vets-api --from=modules /tmp/modules modules/
+
+RUN bundle install --binstubs="${BUNDLE_APP_CONFIG}/bin" $bundler_opts \
+  && rm -rf /usr/local/bundle/cache/*.gem \
+  && find /usr/local/bundle/gems/ -name "*.c" -delete \
+  && find /usr/local/bundle/gems/ -name "*.o" -delete \
+  && find /usr/local/bundle/gems/ -name ".git" -type d -prune -execdir rm -rf {} +
+
 COPY --chown=vets-api:vets-api . .
 USER vets-api
-# --no-cache doesn't do the right thing, so trim it during build
-# https://github.com/bundler/bundler/issues/6680
-RUN bundle install --binstubs="${BUNDLE_APP_CONFIG}/bin" $bundler_opts && \
-    find ${BUNDLE_APP_CONFIG}/cache -type f -name \*.gem -delete
 
 ###
 # prod stage; default if no target given

Dockerfile-k8s

@@ -8,7 +8,7 @@ ARG BUNDLE_ENTERPRISE__CONTRIBSYS__COM \
   USER_ID=1000
 ENV RAILS_ENV=$RAILS_ENV \
   BUNDLE_ENTERPRISE__CONTRIBSYS__COM=$BUNDLE_ENTERPRISE__CONTRIBSYS__COM \
-  BUNDLER_VERSION=2.1.4
+  BUNDLER_VERSION=2.4.9
 
 RUN groupadd --gid $USER_ID nonroot \
   && useradd --uid $USER_ID --gid nonroot --shell /bin/bash --create-home nonroot --home-dir /app

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '~> 2.7.6'
+ruby '~> 3.1.3'
 
 # Modules
 path 'modules' do
@@ -32,7 +32,7 @@ path 'modules' do
   gem 'veteran_verification'
 end
 
-gem 'rails', '~> 6.1.7'
+gem 'rails', github: 'rails/rails', branch: '6-1-stable'
 
 gem 'aasm'
 gem 'active_model_serializers', git: 'https://github.com/department-of-veterans-affairs/active_model_serializers', branch: 'master'
@@ -53,7 +53,7 @@ gem 'clam_scan'
 gem 'combine_pdf'
 gem 'config'
 gem 'connect_vbms', git: 'https://github.com/department-of-veterans-affairs/connect_vbms.git', branch: 'master', require: 'vbms'
-gem 'coverband'
+gem 'coverband', require: false
 gem 'date_validator'
 gem 'ddtrace'
 gem 'dogstatsd-ruby'
@@ -63,7 +63,6 @@ gem 'ethon', '>=0.13.0'
 gem 'faraday'
 gem 'faraday_middleware'
 gem 'fastimage'
-gem 'fast_jsonapi'
 gem 'fhir_client'
 gem 'fitbit_api'
 gem 'flipper'
@@ -84,12 +83,12 @@ gem 'ice_nine'
 gem 'iso_country_codes'
 gem 'json'
 gem 'jsonapi-parser'
+gem 'jsonapi-serializer'
 gem 'json-schema'
 gem 'json_schemer'
 gem 'jwe'
 gem 'jwt'
 gem 'kms_encrypted'
-gem 'levenshtein-ffi'
 gem 'liquid'
 gem 'lockbox'
 gem 'mail'
@@ -191,7 +190,7 @@ group :development, :test do
   gem 'guard-rspec'
   gem 'parallel_tests'
   gem 'pry-byebug'
-  gem 'rack-test', require: 'rack/test'
+  gem 'rack-test', '1.1.0', require: 'rack/test'
   gem 'rack-vcr'
   gem 'rainbow' # Used to colorize output for rake tasks
   gem 'rspec-instrumentation-matcher'