Merge branch 'master' into HunJerBAH/APPEALS-41361

.github/workflows/workflow.yml

@@ -81,6 +81,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: install node version
+        uses: actions/setup-node@v4
+        with:
+          node-version: '14.20.0'
+
       # If we don't explicitly set this, the runner doesn't find the path when trying to save the cache
       - name: Set yarn cache directory
         id: set-yarn-cache-dir
@@ -278,6 +283,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y python2
 
+      - name: install node version
+        uses: actions/setup-node@v4
+        with:
+          node-version: '14.20.0'
+
+      - name: validate node version
+        run: ./ci-bin/capture-log "node -v"
+
       - name: install_node_dependencies
         run: ./ci-bin/capture-log "cd client && yarn install --frozen-lockfile"
 
@@ -322,6 +335,12 @@ jobs:
           echo $BUNDLER_V
           gem install bundler:$BUNDLER_V
           bundle install --path vendor/bundle
+
+      - name: install node version
+        uses: actions/setup-node@v4
+        with:
+          node-version: '14.20.0'
+
       - name: Install Node Dependencies
         run: ./ci-bin/capture-log "cd client && yarn install --frozen-lockfile"
 

.nvmrc

@@ -1 +1 @@
-12.13.0
+14.20.0

.reek.yml

@@ -74,7 +74,6 @@ detectors:
       - Api::ApplicationController#upstream_known_error
       - AppealAvailableHearingLocations#suggested_hearing_location
       - AppealTaskHistory#build_events
-      - ApplicationRecord#as_hash
       - AssignHearingDispositionTask#reschedule_or_schedule_later
       - AsyncableJobsReporter
       - CachedAppealService#cache_ama_appeals

.rubocop.yml

@@ -4,6 +4,7 @@ require:
 
 AllCops:
   Exclude:
+    - 'bin/**/*'
     - 'db/**/*'
     - 'config/**/*'
     - 'script/**/*'

Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER Development and Operations team @ Department of Veterans Affairs
 
 # Build variables
 ENV BUILD build-essential postgresql-client libaio1 libpq-dev libsqlite3-dev curl software-properties-common apt-transport-https pdftk
-ENV CASEFLOW git nodejs yarn
+ENV CASEFLOW git yarn
 
 # Environment (system) variables
 ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_2:$LD_LIBRARY_PATH" \
@@ -33,16 +33,31 @@ COPY docker-bin/ca-certs/*.crt /usr/local/share/ca-certificates/va/
 RUN update-ca-certificates
 COPY docker-bin/ca-certs/cacert.pem /etc/ssl/certs/cacert.pem
 
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+
 RUN apt -y update && \
     apt -y upgrade && \
     mkdir -p /usr/share/man/man1 && \
     mkdir /usr/share/man/man7 && \
     apt install -y ${BUILD} && \
     curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
-    apt -y update && \
-    curl -sL https://deb.nodesource.com/setup_$(cat .nvmrc | cut -d "." -f 1).x | bash - && \
-    apt install -y ${CASEFLOW} &&  \
+    apt -y update
+
+#install node
+RUN mkdir /usr/local/nvm
+ENV NVM_DIR /usr/local/nvm
+ENV NODE_VERSION 14.20.0
+ENV NVM_INSTALL_PATH $NVM_DIR/versions/node/v$NODE_VERSION
+RUN curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
+RUN source $NVM_DIR/nvm.sh \
+   && nvm install $NODE_VERSION \
+   && nvm alias default $NODE_VERSION \
+   && nvm use default
+ENV NODE_PATH $NVM_INSTALL_PATH/lib/node_modules
+ENV PATH $NVM_INSTALL_PATH/bin:$PATH
+
+RUN apt install -y ${CASEFLOW} &&  \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get clean && apt-get autoclean && apt-get autoremove
@@ -70,4 +85,4 @@ RUN bundle install && \
 # Run the app
 ENTRYPOINT ["/bin/bash", "-c", "/caseflow/docker-bin/startup.sh"]
 
- 
+

Gemfile

@@ -56,7 +56,7 @@ gem "pg", platforms: :ruby
 # Discussion: https://github.com/18F/college-choice/issues/597#issuecomment-139034834
 gem "puma", "5.6.4"
 gem "rack", "~> 2.2.6.2"
-gem "rails", "5.2.8.1"
+gem "rails", "6.0.6.1"
 # Used to colorize output for rake tasks
 gem "rainbow"
 # React
@@ -71,6 +71,7 @@ gem "sass-rails", "~> 5.0"
 # Error reporting to Sentry
 gem "sentry-raven"
 gem "shoryuken", "3.1.11"
+gem "statsd-instrument"
 gem "stringex", require: false
 # catch problematic migrations at development/test time
 gem "strong_migrations"
@@ -86,7 +87,7 @@ gem "ziptz"
 
 group :production, :staging, :ssh_forwarding, :development, :test do
   # Oracle DB
-  gem "activerecord-oracle_enhanced-adapter", "~> 5.2.0"
+  gem "activerecord-oracle_enhanced-adapter", "~> 6.0.0"
   gem "ruby-oci8", "~> 2.2"
 end
 
@@ -99,7 +100,7 @@ group :test, :development, :demo do
   gem "capybara"
   gem "capybara-screenshot"
   gem "danger", "~> 6.2.2"
-  gem "database_cleaner"
+  gem "database_cleaner-active_record", "2.0.0"
   gem "factory_bot_rails", "~> 5.2"
   gem "faker"
   gem "guard-rspec"