Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Rails 7.1.3 -> 7.2.2 #19716

Merged
merged 7 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ path 'modules' do
gem 'vye'
end

gem 'rails', '~> 7.1.3'
gem 'rails', '~> 7.2.2'

gem 'aasm'
gem 'activerecord-import'
Expand Down
164 changes: 83 additions & 81 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -156,85 +156,82 @@ GEM
Ascii85 (1.1.0)
aasm (5.5.0)
concurrent-ruby (~> 1.0)
actioncable (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
actioncable (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.4.1)
actionpack (= 7.1.4.1)
activejob (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.4.1)
actionpack (= 7.1.4.1)
actionview (= 7.1.4.1)
activejob (= 7.1.4.1)
activesupport (= 7.1.4.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
actionmailbox (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
mail (>= 2.8.0)
actionmailer (7.2.2)
actionpack (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activesupport (= 7.2.2)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.1.4.1)
actionview (= 7.1.4.1)
activesupport (= 7.1.4.1)
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.4.1)
actionpack (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
useragent (~> 0.16)
actiontext (7.2.2)
actionpack (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.4.1)
activesupport (= 7.1.4.1)
actionview (7.2.2)
activesupport (= 7.2.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.4.1)
activesupport (= 7.1.4.1)
activejob (7.2.2)
activesupport (= 7.2.2)
globalid (>= 0.3.6)
activemodel (7.1.4.1)
activesupport (= 7.1.4.1)
activerecord (7.1.4.1)
activemodel (= 7.1.4.1)
activesupport (= 7.1.4.1)
activemodel (7.2.2)
activesupport (= 7.2.2)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
timeout (>= 0.4.0)
activerecord-import (1.8.1)
activerecord (>= 4.2)
activerecord-postgis-adapter (9.0.2)
activerecord (~> 7.1.0)
rgeo-activerecord (~> 7.0.0)
activestorage (7.1.4.1)
actionpack (= 7.1.4.1)
activejob (= 7.1.4.1)
activerecord (= 7.1.4.1)
activesupport (= 7.1.4.1)
activerecord-postgis-adapter (10.0.1)
activerecord (~> 7.2.0)
rgeo-activerecord (~> 8.0.0)
activestorage (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activesupport (= 7.2.2)
marcel (~> 1.0)
activesupport (7.1.4.1)
activesupport (7.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
adler32 (0.0.2)
Expand Down Expand Up @@ -272,6 +269,7 @@ GEM
base64 (0.2.0)
bcp47 (0.3.3)
i18n
benchmark (0.4.0)
bigdecimal (3.1.8)
bigdecimal (3.1.8-java)
bindex (0.8.1)
Expand Down Expand Up @@ -359,8 +357,8 @@ GEM
database_cleaner-core (2.0.1)
datadog-ci (0.8.3)
msgpack
date (3.3.4)
date (3.3.4-java)
date (3.4.1)
date (3.4.1-java)
date_time_precision (0.8.1)
date_validator (0.12.0)
activemodel (>= 3)
Expand Down Expand Up @@ -594,13 +592,13 @@ GEM
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.7.2)
io-console (0.7.2-java)
io-console (0.8.0)
io-console (0.8.0-java)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso_country_codes (0.7.8)
jar-dependencies (0.4.1)
jar-dependencies (0.5.0)
jmespath (1.6.2)
jruby-openssl (0.15.1-java)
json (2.9.0)
Expand Down Expand Up @@ -668,7 +666,7 @@ GEM
mini_magick (4.13.2)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.2)
minitest (5.25.4)
mock_redis (0.46.0)
msgpack (1.7.2)
msgpack (1.7.2-java)
Expand All @@ -680,7 +678,7 @@ GEM
nenv (0.3.0)
net-http (0.4.1)
uri
net-imap (0.4.14)
net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -699,6 +697,8 @@ GEM
nokogiri (1.16.8)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.8-java)
racc (~> 1.4)
nori (2.7.1)
bigdecimal
notiffany (0.1.3)
Expand Down Expand Up @@ -816,20 +816,20 @@ GEM
rackup (1.0.1)
rack (< 3)
webrick
rails (7.1.4.1)
actioncable (= 7.1.4.1)
actionmailbox (= 7.1.4.1)
actionmailer (= 7.1.4.1)
actionpack (= 7.1.4.1)
actiontext (= 7.1.4.1)
actionview (= 7.1.4.1)
activejob (= 7.1.4.1)
activemodel (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
rails (7.2.2)
actioncable (= 7.2.2)
actionmailbox (= 7.2.2)
actionmailer (= 7.2.2)
actionpack (= 7.2.2)
actiontext (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activemodel (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
bundler (>= 1.15.0)
railties (= 7.1.4.1)
railties (= 7.2.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -843,10 +843,10 @@ GEM
rack
railties (>= 5.1)
semantic_logger (~> 4.16)
railties (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
irb
railties (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand Down Expand Up @@ -885,9 +885,9 @@ GEM
retriable (3.1.2)
rexml (3.3.9)
rgeo (3.0.1)
rgeo-activerecord (7.0.1)
activerecord (>= 5.0)
rgeo (>= 1.0.0)
rgeo-activerecord (8.0.0)
activerecord (>= 7.0)
rgeo (>= 3.0)
rgeo-geojson (2.2.0)
multi_json (~> 1.15)
rgeo (>= 1.0.0)
Expand Down Expand Up @@ -995,6 +995,7 @@ GEM
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
script_utils (0.0.4)
securerandom (0.4.0)
seedbank (0.5.0)
rake (>= 10.0)
semantic_logger (4.16.0)
Expand Down Expand Up @@ -1068,6 +1069,7 @@ GEM
uber (0.1.0)
unicode-display_width (2.6.0)
uri (0.13.1)
useragent (0.16.11)
utf8-cleaner (1.0.0)
activesupport
vcr (6.3.1)
Expand Down Expand Up @@ -1096,7 +1098,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.9.0)
webrick (1.9.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-driver (0.7.6-java)
Expand Down Expand Up @@ -1263,7 +1265,7 @@ DEPENDENCIES
rack-test (= 2.1.0)
rack-timeout
rack-vcr
rails (~> 7.1.3)
rails (~> 7.2.2)
rails-session_cookie
rails_semantic_logger
rainbow
Expand Down
46 changes: 24 additions & 22 deletions config/initializers/flipper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,34 @@
end
end

# Make sure that each feature we reference in code is present in the UI, as long as we have a Database already
added_flippers = []
begin
FLIPPER_FEATURE_CONFIG['features'].each do |feature, feature_config|
unless Flipper.exist?(feature)
Flipper.add(feature)
added_flippers.push(feature)
Rails.application.config.after_initialize do
# Make sure that each feature we reference in code is present in the UI, as long as we have a Database already
added_flippers = []
begin
FLIPPER_FEATURE_CONFIG['features'].each do |feature, feature_config|
unless Flipper.exist?(feature)
Flipper.add(feature)
added_flippers.push(feature)

# Default features to enabled for test and those explicitly set for development
if Rails.env.test? || (Rails.env.development? && feature_config['enable_in_development'])
Flipper.enable(feature)
# Default features to enabled for test and those explicitly set for development
if Rails.env.test? || (Rails.env.development? && feature_config['enable_in_development'])
Flipper.enable(feature)
end
end
end

# Enable features on dev-api.va.gov if they are set to enable_in_development
Flipper.enable(feature) if Settings.vsp_environment == 'development' && feature_config['enable_in_development']
end
# Enable features on dev-api.va.gov if they are set to enable_in_development
Flipper.enable(feature) if Settings.vsp_environment == 'development' && feature_config['enable_in_development']
end

Rails.logger.info "The following feature flippers were added: #{added_flippers}" unless added_flippers.empty?
removed_features = Flipper.features.collect(&:name) - FLIPPER_FEATURE_CONFIG['features'].keys
unless removed_features.empty?
Rails.logger.warn "Consider removing features no longer in config/features.yml: #{removed_features.join(', ')}"
Rails.logger.info "The following feature flippers were added: #{added_flippers}" unless added_flippers.empty?
removed_features = Flipper.features.collect(&:name) - FLIPPER_FEATURE_CONFIG['features'].keys
unless removed_features.empty?
Rails.logger.warn "Consider removing features no longer in config/features.yml: #{removed_features.join(', ')}"
end
rescue => e
Rails.logger.error "Error processing Flipper features: #{e.message}"
# make sure we can still run rake tasks before table has been created
nil
end
rescue => e
Rails.logger.error "Error processing Flipper features: #{e.message}"
# make sure we can still run rake tasks before table has been created
nil
end
end
1 change: 1 addition & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
require 'statsd/instrument/matchers'
require 'rspec/rails'
require 'webmock/rspec'
require 'shoulda/matchers'
require 'sidekiq/semantic_logging'
require 'sidekiq/error_tag'
require 'support/stub_va_profile'
Expand Down
2 changes: 1 addition & 1 deletion spec/rakelib/piilog_repl/piilog_helpers_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'string/symbol args* narrow the error_class (*most string args)',
Q.call(:hlr, :nod),
'SELECT "personal_information_logs".* FROM "personal_information_logs"' \
" WHERE (error_class ILIKE ANY (array['%hlr%','%nod%']))"
" WHERE (error_class ILIKE ANY (array['%hlr%', '%nod%']))"
],
[
'a single date narrows the query to just that day',
Expand Down
Loading