Rails 6.1 changes (#7260)

* Revert "Revert "Rails 6.1 upgrade (#6979)" (#7259)" This reverts commit 765e2ed. * move bootsnap gem out of dev/test group * remove bootsnap from dev/test group
department-of-veterans-affairs · Jun 21, 2021 · db3a9d0 · db3a9d0
1 parent 8999082
commit db3a9d0
Show file tree

Hide file tree

Showing 57 changed files with 365 additions and 433 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
diff --git a/.gitignore b/.gitignore
@@ -8,21 +8,32 @@
 /.bundle
 .envrc
 
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
 # Ignore all logfiles and tempfiles.
 /log/*
+/tmp/*
 !/log/.keep
-/logfile
-/tmp
+!/tmp/.keep
 /coverage
 /reports
 
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore uploaded files in development.
+/storage/*
+!/storage/.keep
+
+# And byebug's history file
+.byebug_history
+
 # Ignore precompiled assets
 public/assets/**
 
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
 # *Uploader.store_dir for local development and test
 public/disability_compensation_supporting_form/**
 public/hca_attachments/**
@@ -32,20 +43,6 @@ spec/support/uploads/
 # Ignore local config
 config/application.yml
 
-# Ignore rvm stuff
-# Ignore rbenv
-.ruby-gemset
-.rbenv-gemsets
-
-.idea/
-.vscode/
-
-# And byebug's history file
-.byebug_history
-
-# Ignore .DS_Store
-.DS_Store
-
 # Ignore the docker runtime folders
 tmp/
 data/
@@ -55,29 +52,17 @@ log/*
 .env
 .local
 
+# Ignore local setttings changes
 config/settings.local.yml
 config/settings/*.local.yml
 config/environments/*.local.yml
 
-rspec.xml
-
 # Ignore certificates directory
 config/certs
 config/ca-trust
 !config/ca-trust/README.md
 
-dump.rdb
-/.project
-.generators
-.rakeTasks
-
-# Ignore IDE files
-*.iml
-
-#ignore storage files
-/storage/*
-
-#ignore docker_debugging and .env
+# Ignore docker_debugging and .env
 docker_debugging
 .env
 

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -18,7 +18,6 @@ AllCops:
     - '**/*.rake'
     - '**/*.rb'
   Exclude:
-    - 'bin/*'
     - db/schema.rb
     - db/seeds.rb
     - db/migrate/*.rb

diff --git a/Gemfile b/Gemfile
@@ -37,22 +37,23 @@ gem 'sass-rails', '>= 6'
 # Anchored versions, do not change
 gem 'puma', '~> 5.3.2'
 gem 'puma-plugin-statsd', '~> 1.2.1'
-gem 'rails', '~> 6.0.3'
+gem 'rails', '~> 6.1.3'
 
 # Gems with special version/repo needs
 gem 'active_model_serializers', git: 'https://github.com/department-of-veterans-affairs/active_model_serializers', branch: 'master'
 gem 'sidekiq-scheduler', '~> 3.1' # TODO: explanation
 
 gem 'aasm'
 gem 'activerecord-import'
-gem 'activerecord-postgis-adapter', '~> 6.0.0'
+gem 'activerecord-postgis-adapter'
 gem 'addressable'
 gem 'attr_encrypted', '3.1.0'
 gem 'aws-sdk-s3', '~> 1'
 gem 'aws-sdk-sns', '~> 1'
 gem 'betamocks', git: 'https://github.com/department-of-veterans-affairs/betamocks', branch: 'master'
 gem 'bgs_ext', git: 'https://github.com/department-of-veterans-affairs/bgs-ext.git', require: 'bgs'
 gem 'breakers'
+gem 'bootsnap', require: false
 gem 'carrierwave'
 gem 'carrierwave-aws'
 gem 'clam_scan'
@@ -173,7 +174,6 @@ end
 # rubocop:disable Metrics/BlockLength
 group :development, :test do
   gem 'awesome_print', '~> 1.9' # Pretty print your Ruby objects in full color and with proper indentation
-  gem 'bootsnap', require: false
   gem 'brakeman', '~> 5.0'
   gem 'bundler-audit'
   gem 'byebug', platforms: :ruby # Call 'byebug' anywhere in the code to stop execution and get a debugger console

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -83,7 +83,7 @@ PATH
     check_in (0.1.0)
     claims_api (0.0.1)
     covid_research (0.1.0)
-      rails (~> 6.0.3, >= 6.0.3.2)
+      rails (~> 6.1.3.2)
       sidekiq
     covid_vaccine (0.1.0)
       sidekiq
@@ -94,7 +94,7 @@ PATH
       dry-validation
     openid_auth (0.0.1)
     test_user_dashboard (0.1.0)
-      rails (~> 6.0.3, >= 6.0.3.2)
+      rails (~> 6.1.3.2)
     va_forms (0.0.1)
       faraday
       nokogiri
@@ -116,66 +116,70 @@ GEM
     Ascii85 (1.1.0)
     aasm (5.2.0)
       concurrent-ruby (~> 1.0)
-    actioncable (6.0.3.7)
-      actionpack (= 6.0.3.7)
+    actioncable (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionmailbox (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actiontext (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord-import (1.1.0)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord-import (1.0.8)
       activerecord (>= 3.2)
-    activerecord-postgis-adapter (6.0.2)
-      activerecord (~> 6.0.0)
-      rgeo-activerecord (~> 6.0)
-    activestorage (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
+    activerecord-postgis-adapter (7.1.0)
+      activerecord (~> 6.1)
+      rgeo-activerecord (~> 7.0.0)
+    activestorage (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       marcel (~> 1.0.0)
-    activesupport (6.0.3.7)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     adler32 (0.0.2)
@@ -539,7 +543,7 @@ GEM
       nokogiri (~> 1)
       rake
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.3)
     minitest (5.14.4)
     msgpack (1.3.3)
@@ -670,20 +674,20 @@ GEM
       rack (>= 1.0, < 3)
     rack-vcr (0.1.6)
       vcr (>= 2.9)
-    rails (6.0.3.7)
-      actioncable (= 6.0.3.7)
-      actionmailbox (= 6.0.3.7)
-      actionmailer (= 6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actiontext (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.7)
+    rails (6.1.3.2)
+      actioncable (= 6.1.3.2)
+      actionmailbox (= 6.1.3.2)
+      actionmailer (= 6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actiontext (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -696,12 +700,12 @@ GEM
       rack
       railties (>= 3.2)
       semantic_logger (~> 4.8)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.3)
     randexp (0.1.7)
@@ -732,7 +736,7 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rgeo (2.0.1)
-    rgeo-activerecord (6.2.2)
+    rgeo-activerecord (7.0.1)
       activerecord (>= 5.0)
       rgeo (>= 1.0.0)
     rgeo-geojson (2.1.1)
@@ -915,8 +919,8 @@ GEM
     ttfunk (1.7.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
@@ -944,7 +948,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
@@ -969,7 +973,7 @@ DEPENDENCIES
   aasm
   active_model_serializers!
   activerecord-import
-  activerecord-postgis-adapter (~> 6.0.0)
+  activerecord-postgis-adapter
   addressable
   apivore!
   appeals_api!
@@ -1078,7 +1082,7 @@ DEPENDENCIES
   rack-cors
   rack-test
   rack-vcr
-  rails (~> 6.0.3)
+  rails (~> 6.1.3)
   rails-session_cookie
   rails_semantic_logger (~> 4.6)
   rainbow

diff --git a/app/controllers/concerns/exception_handling.rb b/app/controllers/concerns/exception_handling.rb
@@ -80,7 +80,7 @@ def report_original_exception(exception)
   end
 
   def report_mapped_exception(exception, va_exception)
-    extra = exception.respond_to?(:errors) ? { errors: exception.errors.map(&:to_hash) } : {}
+    extra = exception.respond_to?(:errors) ? { errors: exception.errors.map(&:to_h) } : {}
     # Add additional user specific context to the logs
     if exception.is_a?(Common::Exceptions::BackendServiceException) && current_user.present?
       extra[:icn] = current_user.icn