Skip to content

Commit cbc57b2

Browse files
update gems
2 parents d9f0070 + bacb95e commit cbc57b2

5 files changed

Lines changed: 35 additions & 47 deletions

File tree

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ gem "image_processing", "~> 1.12"
4444

4545
gem 'active_model_serializers'
4646
gem 'acts-as-list'
47+
gem 'aws-actionmailer-ses'
4748
gem 'aws-sdk-rails', '>= 3.8.0'
4849
gem 'aws-sdk-s3'
4950
gem 'carrierwave', '>= 2.2.1'

Gemfile.lock

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -102,54 +102,35 @@ GEM
102102
public_suffix (>= 2.0.2, < 7.0)
103103
aes_key_wrap (1.1.0)
104104
ast (2.4.3)
105+
aws-actionmailer-ses (1.0.0)
106+
actionmailer (>= 7.1.0)
107+
aws-sdk-ses (~> 1, >= 1.50.0)
108+
aws-sdk-sesv2 (~> 1, >= 1.34.0)
105109
aws-eventstream (1.3.2)
106-
aws-partitions (1.1078.0)
107-
aws-record (2.13.2)
108-
aws-sdk-dynamodb (~> 1, >= 1.85.0)
110+
aws-partitions (1.1080.0)
109111
aws-sdk-core (3.222.1)
110112
aws-eventstream (~> 1, >= 1.3.0)
111113
aws-partitions (~> 1, >= 1.992.0)
112114
aws-sigv4 (~> 1.9)
113115
base64
114116
jmespath (~> 1, >= 1.6.1)
115117
logger
116-
aws-sdk-dynamodb (1.129.0)
117-
aws-sdk-core (~> 3, >= 3.210.0)
118-
aws-sigv4 (~> 1.5)
119118
aws-sdk-kms (1.99.0)
120119
aws-sdk-core (~> 3, >= 3.216.0)
121120
aws-sigv4 (~> 1.5)
122-
aws-sdk-rails (4.1.0)
123-
actionmailbox (>= 7.0.0)
124-
aws-record (~> 2)
125-
aws-sdk-s3 (~> 1, >= 1.123.0)
126-
aws-sdk-ses (~> 1, >= 1.50.0)
127-
aws-sdk-sesv2 (~> 1, >= 1.34.0)
128-
aws-sdk-sns (~> 1, >= 1.61.0)
129-
aws-sdk-sqs (~> 1, >= 1.56.0)
130-
aws-sessionstore-dynamodb (~> 2)
131-
concurrent-ruby (~> 1.3, >= 1.3.1)
132-
railties (>= 7.0.0)
121+
aws-sdk-rails (5.1.0)
122+
aws-sdk-core (~> 3)
123+
railties (>= 7.1.0)
133124
aws-sdk-s3 (1.183.0)
134125
aws-sdk-core (~> 3, >= 3.216.0)
135126
aws-sdk-kms (~> 1)
136127
aws-sigv4 (~> 1.5)
137-
aws-sdk-ses (1.76.0)
138-
aws-sdk-core (~> 3, >= 3.210.0)
139-
aws-sigv4 (~> 1.5)
140-
aws-sdk-sesv2 (1.66.0)
141-
aws-sdk-core (~> 3, >= 3.210.0)
142-
aws-sigv4 (~> 1.5)
143-
aws-sdk-sns (1.90.0)
144-
aws-sdk-core (~> 3, >= 3.210.0)
128+
aws-sdk-ses (1.82.0)
129+
aws-sdk-core (~> 3, >= 3.216.0)
145130
aws-sigv4 (~> 1.5)
146-
aws-sdk-sqs (1.88.0)
147-
aws-sdk-core (~> 3, >= 3.210.0)
131+
aws-sdk-sesv2 (1.73.0)
132+
aws-sdk-core (~> 3, >= 3.216.0)
148133
aws-sigv4 (~> 1.5)
149-
aws-sessionstore-dynamodb (2.2.0)
150-
aws-sdk-dynamodb (~> 1, >= 1.85.0)
151-
rack (>= 2, < 4)
152-
rack-session (>= 1, < 3)
153134
aws-sigv4 (1.11.0)
154135
aws-eventstream (~> 1, >= 1.0.2)
155136
axe-core-api (4.10.2)
@@ -176,7 +157,7 @@ GEM
176157
brakeman (7.0.0)
177158
racc
178159
builder (3.3.0)
179-
bullet (8.0.1)
160+
bullet (8.0.2)
180161
activesupport (>= 3.0.0)
181162
uniform_notifier (~> 1.11)
182163
bundler-audit (0.9.2)
@@ -287,7 +268,7 @@ GEM
287268
activesupport (>= 6.0.0)
288269
railties (>= 6.0.0)
289270
io-console (0.8.0)
290-
irb (1.15.1)
271+
irb (1.15.2)
291272
pp (>= 0.6.0)
292273
rdoc (>= 4.0.0)
293274
reline (>= 0.4.2)
@@ -346,7 +327,7 @@ GEM
346327
mime-types (3.6.2)
347328
logger
348329
mime-types-data (~> 3.2015)
349-
mime-types-data (3.2025.0325)
330+
mime-types-data (3.2025.0402)
350331
mini_magick (5.2.0)
351332
benchmark
352333
logger
@@ -368,7 +349,7 @@ GEM
368349
timeout
369350
net-smtp (0.5.1)
370351
net-protocol
371-
newrelic_rpm (9.17.0)
352+
newrelic_rpm (9.18.0)
372353
nio4r (2.7.4)
373354
nokogiri (1.18.7)
374355
mini_portile2 (~> 2.8.2)
@@ -529,18 +510,18 @@ GEM
529510
rspec-support (3.13.2)
530511
rspec_junit_formatter (0.6.0)
531512
rspec-core (>= 2, < 4, != 2.12.0)
532-
rubocop (1.75.1)
513+
rubocop (1.75.2)
533514
json (~> 2.3)
534515
language_server-protocol (~> 3.17.0.2)
535516
lint_roller (~> 1.1.0)
536517
parallel (~> 1.10)
537518
parser (>= 3.3.0.2)
538519
rainbow (>= 2.2.2, < 4.0)
539520
regexp_parser (>= 2.9.3, < 3.0)
540-
rubocop-ast (>= 1.43.0, < 2.0)
521+
rubocop-ast (>= 1.44.0, < 2.0)
541522
ruby-progressbar (~> 1.7)
542523
unicode-display_width (>= 2.4.0, < 4.0)
543-
rubocop-ast (1.43.0)
524+
rubocop-ast (1.44.0)
544525
parser (>= 3.3.7.2)
545526
prism (~> 1.4)
546527
rubocop-rails (2.31.0)
@@ -574,7 +555,7 @@ GEM
574555
rexml (~> 3.2, >= 3.2.5)
575556
rubyzip (>= 1.2.2, < 3.0)
576557
websocket (~> 1.0)
577-
sidekiq (8.0.1)
558+
sidekiq (8.0.2)
578559
connection_pool (>= 2.5.0)
579560
json (>= 2.9.0)
580561
logger (>= 1.6.2)
@@ -658,6 +639,7 @@ DEPENDENCIES
658639
active_model_serializers
659640
acts-as-list
660641
acts-as-taggable-on
642+
aws-actionmailer-ses
661643
aws-sdk-rails (>= 3.8.0)
662644
aws-sdk-s3
663645
axe-core-rspec

config/environments/production.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,13 @@
9999
# Reference: https://github.com/ankane/secure_rails
100100
config.action_controller.asset_host = ENV.fetch('TOUCHPOINTS_WEB_DOMAIN')
101101

102-
config.action_mailer.delivery_method = :ses
102+
config.action_mailer.delivery_method = :ses_v2
103+
config.action_mailer.ses_v2_settings = {
104+
region: ENV.fetch("AWS_SES_REGION"),
105+
access_key_id: ENV.fetch("AWS_SES_ACCESS_KEY_ID", nil),
106+
secret_access_key: ENV.fetch("AWS_SES_SECRET_ACCESS_KEY", nil)
107+
}
108+
103109
config.action_mailer.perform_deliveries = true
104110

105111
config.active_record.encryption.primary_key = ENV.fetch("RAILS_ACTIVE_RECORD_PRIMARY_KEY")

config/environments/staging.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,12 @@
109109
# Reference: https://github.com/ankane/secure_rails
110110
config.action_controller.asset_host = ENV.fetch('TOUCHPOINTS_WEB_DOMAIN')
111111

112-
config.action_mailer.delivery_method = :ses
112+
config.action_mailer.delivery_method = :ses_v2
113+
config.action_mailer.ses_v2_settings = {
114+
region: ENV.fetch("AWS_SES_REGION"),
115+
access_key_id: ENV.fetch("AWS_SES_ACCESS_KEY_ID", nil),
116+
secret_access_key: ENV.fetch("AWS_SES_SECRET_ACCESS_KEY", nil)
117+
}
113118
config.action_mailer.perform_deliveries = true
114119

115120
config.active_record.encryption.primary_key = ENV.fetch("RAILS_ACTIVE_RECORD_PRIMARY_KEY")

config/initializers/amazon_ses.rb

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)