aws-sdk-rails 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0487e57cf5abffd700526851a6ce35f6fb96c9a62e8c330de841870b528ac419'
-  data.tar.gz: 6e5cd63585548d8b169fc61b88a1607ca2fce692c74882de7ef3b13d19cb8ef9
+  metadata.gz: e58942a12378042b0c5bdfe304b6b90f79dbc2d69c6dcdd00f0750a1faac0e2d
+  data.tar.gz: 0fbb662869d4f5bb6c4fe1c9481fcdb842b6cfe8f7099568e9770364bed046d1
 SHA512:
-  metadata.gz: 657a57cd07e3614de0ca6707e35209cb3acdd5d69960762f345e179552a91eb78699429bd369b10a88817f631c7f61a1f30a6cfda2f68adf66d844eee8092878
-  data.tar.gz: 28322c2ad4dad967ba39ea6f58050725a7db23a6cb9898386058f111eba43cdff9be2acb9c899fa9613f703410755332938d9f0dbcce653176088d786ec9e49f
+  metadata.gz: 187ff26d189951811d49dad748c7722baf91cf1160e62cdfbb219ebb7684cd61b814cc024d85cd7694f0dffac48c85fd5e4ac1c87ce811b2d4bb1aa2dfb102b4
+  data.tar.gz: 9c3c281bc54ee18b98bde43c0f2832c08a131715af13e0f747544e2d78791e1579a00bb23486d72c74c7ad44784604fd9cf63befc9788c3cfe60c5637cb75e97

data/CHANGELOG.md

@@ -0,0 +1,239 @@
+4.2.0 (2024-11-20)
+------------------
+
+* Feature - DynamoDB Session Storage features now live in the `aws-actiondispatch-dynamodb` gem. This gem depends on `aws-sessionstore-dynamodb ~> 3` which depends on `rack ~> 3`.
+
+* Feature - Add session store config generation with `rails generate dynamo_db:session_store_config`. Config generation is no longer tied to the DynamoDB SessionStore ActiveRecord migration generator.
+
+* Issue - `ActionDispatch::Session::DynamoDbStore` now inherits `ActionDispatch::Session::AbstractStore` by wrapping `Aws::SessionStore::DynamoDB::RackMiddleware`.
+
+* Issue - `DynamoDbStore` is now configured with the `:dynamo_db_store` configuration instead of `:dynamodb_store`.
+
+* Feature - Session Store configuration passed into `:dynamo_db_store` in an initializer will now be considered when using the ActiveRecord migrations or rake tasks that create, delete, or clean session tables.
+
+* Feature - `AWS_DYNAMO_DB_SESSION_CONFIG_FILE` is now searched and with precedence over the default Rails configuration YAML file locations.
+
+* Feature - Prepare modularization of `aws-record`.
+
+* Issue - Do not skip autoload modules for `Aws::Rails.instrument_sdk_operations`.
+
+* Feature - ActionMailer SES and SESV2 mailers now live in the `aws-actionmailer-ses` gem.
+
+* Feature - New namespace and class names for SES and SESV2 mailers. `Aws::Rails::SesMailer` has been moved to `Aws::ActionMailer::SES::Mailer` and `Aws::Rails::Sesv2Mailer` has been moved to `Aws::ActionMailer::SESV2::Mailer`. The classes have been symlinked for backwards compatibility in this major version.
+
+* Issue - Add deprecation warning to `Aws::Rails.add_action_mailer_delivery_method` to instead use `ActionMailer::Base.add_delivery_method`. This method will be removed in aws-sdk-rails ~> 5.
+
+* Feature - ActionMailbox SES ingress now lives in the `aws-actionmailbox-ses` gem.
+
+* Issue - The `Aws::Rails::ActionMailbox::RSpec` module has been moved to `Aws::ActionMailbox::SES::RSpec` and will be removed in aws-sdk-rails ~> 5.
+
+* Feature - ActiveJob SQS now lives in the `aws-activejob-sqs` gem.
+
+* Feature - New namespace and class names for SQS ActiveJob. Existing namespace has temporarily been kept for backward compatibility and will be removed in aws-sdk-rails ~> 5.
+
+* Issue - Correctly determine if SQSD is running in a Docker container.
+
+* Feature - Aws::Record scaffold generators now lives in the `aws-record-rails` gem.
+
+4.1.0 (2024-09-27)
+------------------
+
+* Feature - Add SDK eager loading to optimize load times.  See: https://github.com/aws/aws-sdk-ruby/pull/3105.
+
+4.0.3 (2024-07-31)
+------------------
+
+* Issue - Revert validating `:ses` or `:sesv2` as ActionMailer configuration. (#136)
+
+4.0.2 (2024-07-22)
+------------------
+
+* Issue - Do not require `action_mailbox/engine` in `Aws::Rails::ActionMailbox::Engine` and instead check for its existence.
+
+* Issue - Refactor the loading of the SQS ActiveJob adapter to be in `aws/rails/sqs_active_job`.
+
+4.0.1 (2024-07-18)
+------------------
+
+* Issue - Require `action_mailbox/engine` from `Aws::Rails::ActionMailbox::Engine`.
+
+4.0.0 (2024-07-18)
+------------------
+
+* Feature - Add support for Action Mailbox with SES (#127).
+
+* Issue - Ensure `:ses` or `:sesv2` as ActionMailer configuration.
+
+* Issue - Do not allow `:amazon`, `amazon_sqs`, or `amazon_sqs_async` for SQS active job configuration. Instead use `:sqs` and `:sqs_async`.
+
+3.13.0 (2024-06-06)
+------------------
+
+* Feature - Use `Concurrent.available_processor_count` to set default thread pool max threads (#125).
+
+* Issue - No longer rely on `caller_runs` for backpressure in sqs active job executor (#123).
+
+3.12.0 (2024-04-02)
+------------------
+* Feature - Drop support for Ruby 2.3 and Ruby 2.4 (#117).
+* Issue - Fix `EbsSqsActiveJobMiddleware` to detect Docker container with cgroup2. (#116).
+
+3.11.0 (2024-03-01)
+------------------
+
+* Feature - Add `retry_standard_errors` (default `true`) in SQS ActiveJob and improve retry logic (#114).
+
+3.10.0 (2024-01-19)
+------------------
+
+* Feature - Support `enqueue_all` in the SQS ActiveJob adapter. 
+
+* Issue - Improve `to_h` method's performance of `Aws::Rails::SqsActiveJob::Configuration`.
+
+3.9.1 (2023-12-19)
+------------------
+
+* Issue - Fix negative `delay_seconds` being passed to parameter in the SQS adapter.
+
+3.9.0 (2023-09-28)
+------------------
+
+* Feature - Add support for selectively choosing deduplication keys.
+
+* Feature - Set required Ruby version to >= 2.3 (#104)
+
+* Issue - Run `rubocop` on all files. (#104)
+
+3.8.0 (2023-06-02)
+------------------
+
+* Feature - Improve User-Agent tracking and bump minimum SQS and SES versions.
+
+3.7.1 (2023-02-15)
+------------------
+
+* Issue - Fix detecting docker host in `EbsSqsActiveJobMiddleware`.
+
+3.7.0 (2023-01-24)
+------------------
+
+* Feature - Add SES v2 Mailer.
+
+* Feature - Support smtp_envelope_from and _to in SES Mailer.
+
+* Issue - Fix Ruby 3.1 usage by handling Psych 4 BadAlias error.
+
+3.6.4 (2022-10-13)
+------------------
+
+* Issue - Use `request.ip` in `sent_from_docker_host?`.
+
+3.6.3 (2022-09-06)
+------------------
+
+* Issue - Remove defaults for `visibility_timeout`: fallback to value configured on queue.
+* Issue - Fix I18n localization bug in SQS adapters.
+
+3.6.2 (2022-06-16)
+------------------
+
+* Issue - Fix DynamoDB session store to work with Rails 7.
+* Issue - Allow for dynamic message group ids in FIFO Queues.
+
+3.6.1 (2021-06-08)
+------------------
+
+* Issue - Fix credential loading to work with Rails 7.
+
+3.6.0 (2021-01-20)
+------------------
+
+* Feature - Support for forwarding Elastic Beanstalk SQS Daemon requests to Active Job.
+
+3.5.0 (2021-01-06)
+------------------
+
+* Feature - Add support for FIFO Queues to AWS SQS ActiveJob.
+
+3.4.0 (2020-12-07)
+------------------
+
+* Feature - Add a non-blocking async ActiveJob adapter: `:amazon_sqs_async`.
+
+* Feature - Add a lambda handler for processing active jobs from an SQS trigger.
+
+* Issue - Fix bug in default for backpressure config.
+
+3.3.0 (2020-12-01)
+------------------
+
+* Feature - Add `aws-record` as a dependency, a rails generator for `aws-record` models, and a rake task for table migrations.
+
+* Feature - Add AWS SQS ActiveJob - A lightweight, SQS backend for ActiveJob.
+
+3.2.1 (2020-11-13)
+------------------
+
+* Issue - Include missing files into the gemspec.
+
+3.2.0 (2020-11-13)
+------------------
+
+* Feature - Add support for `ActiveSupport::Notifications` for instrumenting AWS SDK service calls.
+
+* Feature - Add support for DynamoDB as an `ActiveDispatch::Session`.
+
+3.1.0 (2020-04-06)
+------------------
+* Issue - Merge only credential related keys from Rails encrypted credentials into `Aws.config`.
+
+3.0.5 (2019-10-17)
+------------------
+
+* Upgrading - Adds support for Rails Encrypted Credentials, requiring Rails 5.2+
+and thus needed a new major version. Consequently drops support for Ruby < 2.3
+and for Rails < 5.2. Delivery method configuration changed from `:aws_sdk` to
+`:ses`, to allow for future delivery methods. Adds rubocop to the package and
+fixed many violations. This test framework now includes a dummy application for
+testing future features.
+
+2.1.0 (2019-02-14)
+------------------
+
+* Feature - Aws::Rails::Mailer - Adds the Amazon SES message ID as a header to
+raw emails after sending, for tracking purposes. See
+[related GitHub pull request #25](https://github.com/aws/aws-sdk-rails/pull/25).
+
+2.0.1 (2017-10-03)
+------------------
+
+* Issue - Ensure `aws-sdk-rails.initialize` executes before
+`load_config_initializers`
+
+2.0.0 (2017-08-29)
+------------------
+
+* Upgrading - Support version 3 of the AWS SDK for Ruby. This is being released
+as major version 2 of `aws-sdk-rails`, though the APIs remain the same. Do note,
+however, that we've changed our SDK dependency to only depend on `aws-sdk-ses`.
+This means that if you were depending on other service clients transitively via
+`aws-sdk-rails`, you will need to add dependencies on the appropriate service
+gems when upgrading. Logger integration will work for other service gems you
+depend on, since it is wired up against `aws-sdk-core` which is included in
+the `aws-sdk-ses` dependency.
+
+1.0.1 (2016-02-01)
+------------------
+
+* Feature - Gemfile - Replaced `rails` gem dependency with `railties`
+  dependency. With this change, applications that bring their own dependencies
+  in place of, for example, ActiveRecord, can do so with reduced bloat.
+
+  See [related GitHub pull request
+  #4](https://github.com/aws/aws-sdk-rails/pull/4).
+
+1.0.0 (2015-03-17)
+------------------
+
+* Initial Release: Support for Amazon Simple Email Service and Rails Logger
+  integration.

data/LICENSE.txt

@@ -0,0 +1,12 @@
+Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License"). You
+may not use this file except in compliance with the License. A copy of
+the License is located at
+
+    http://aws.amazon.com/apache2.0/
+
+or in the "license" file accompanying this file. This file is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ANY KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.

data/VERSION

@@ -1 +1 @@
-4.1.0
+4.2.0

data/lib/aws/rails/action_mailbox/rspec.rb

@@ -1,69 +1,10 @@
 # frozen_string_literal: true
 
-require 'aws/rails/action_mailbox/rspec/email'
-require 'aws/rails/action_mailbox/rspec/subscription_confirmation'
-require 'aws-sdk-sns'
-require 'aws/rails/action_mailbox/sns_message_verifier'
+# This can be deleted in aws-sdk-rails ~> 5
 
-module Aws
-  module Rails
-    module ActionMailbox
-      # Include the `Aws::Rails::ActionMailbox::RSpec` extension in your tests, like so:
-      # require 'aws/rails/action_mailbox/rspec'
-      # RSpec.configure do |config|
-      #   config.include Aws::Rails::ActionMailbox::RSpec
-      # end
-      # Then, in a request spec, use like so:
-      # RSpec.describe 'amazon emails', type: :request do
-      #   it 'delivers a subscription notification' do
-      #     action_mailbox_ses_deliver_subscription_confirmation
-      #     expect(response).to have_http_status :ok
-      #   end
+require 'aws/action_mailbox/ses/rspec'
+Aws::Rails::ActionMailbox::RSpec = Aws::ActionMailbox::SES::RSpec
 
-      #   it 'delivers an email notification' do
-      #     action_mailbox_ses_deliver_email(mail: Mail.new(to: 'user@example.com'))
-      #     expect(ActionMailbox::InboundEmail.last.mail.recipients).to eql ['user@example.com']
-      #   end
-      # end
-      module RSpec
-        def action_mailbox_ses_deliver_subscription_confirmation(options = {})
-          subscription_confirmation = SubscriptionConfirmation.new(**options)
-          stub_aws_sns_message_verifier(subscription_confirmation)
-          stub_aws_sns_subscription_request
-
-          post subscription_confirmation.url,
-               params: subscription_confirmation.params,
-               headers: subscription_confirmation.headers,
-               as: :json
-        end
-
-        def action_mailbox_ses_deliver_email(options = {})
-          email = Email.new(**options)
-          stub_aws_sns_message_verifier(email)
-
-          post email.url,
-               params: email.params,
-               headers: email.headers,
-               as: :json
-        end
-
-        private
-
-        def message_verifier(subscription_confirmation)
-          instance_double(Aws::SNS::MessageVerifier, authentic?: subscription_confirmation.authentic?)
-        end
-
-        def stub_aws_sns_message_verifier(notification)
-          allow(Aws::Rails::ActionMailbox::SnsMessageVerifier).to receive(:verifier) { message_verifier(notification) }
-        end
-
-        def stub_aws_sns_subscription_request
-          allow(Net::HTTP).to receive(:get_response).and_call_original
-          allow(Net::HTTP)
-            .to receive(:get_response)
-              .with(URI('http://example.com/subscribe')) { double(code: '200') }
-        end
-      end
-    end
-  end
-end
+Kernel.warn('Aws::Rails::ActionMailbox::RSpec is deprecated in aws-sdk-rails ~> 5. ' \
+            'Use Aws::ActionMailbox::SES::RSpec instead.')
+Kernel.warn('Please require "aws/action_mailbox/ses/rspec" instead of "aws/rails/action_mailbox/rspec"')

data/lib/aws/rails/middleware/elastic_beanstalk_sqsd.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+module Aws
+  module Rails
+    module Middleware
+      # Middleware to handle requests from the SQS Daemon present on Elastic Beanstalk worker environments.
+      class ElasticBeanstalkSQSD
+        def initialize(app)
+          @app = app
+          @logger = ::Rails.logger
+        end
+
+        def call(env)
+          request = ::ActionDispatch::Request.new(env)
+
+          # Pass through unless user agent is the SQS Daemon
+          return @app.call(env) unless from_sqs_daemon?(request)
+
+          @logger.debug('aws-sdk-rails middleware detected call from Elastic Beanstalk SQS Daemon.')
+
+          # Only accept requests from this user agent if it is from localhost or a docker host in case of forgery.
+          unless request.local? || sent_from_docker_host?(request)
+            @logger.warn('SQSD request detected from untrusted address; returning 403 forbidden.')
+            return forbidden_response
+          end
+
+          # Execute job or periodic task based on HTTP request context
+          periodic_task?(request) ? execute_periodic_task(request) : execute_job(request)
+        end
+
+        private
+
+        def execute_job(request)
+          # Jobs queued from the Active Job SQS adapter contain the JSON message in the request body.
+          job = Aws::Json.load(request.body.string)
+          job_name = job['job_class']
+          @logger.debug("Executing job: #{job_name}")
+
+          begin
+            ::ActiveJob::Base.execute(job)
+          rescue NameError => e
+            @logger.error("Job #{job_name} could not resolve to a class that inherits from Active Job.")
+            @logger.error("Error: #{e}")
+            return internal_error_response
+          end
+
+          [200, { 'Content-Type' => 'text/plain' }, ["Successfully ran job #{job_name}."]]
+        end
+
+        def execute_periodic_task(request)
+          # The beanstalk worker SQS Daemon will add the 'X-Aws-Sqsd-Taskname' for periodic tasks set in cron.yaml.
+          job_name = request.headers['X-Aws-Sqsd-Taskname']
+          @logger.debug("Creating and executing periodic task: #{job_name}")
+
+          begin
+            job = job_name.constantize.new
+            job.perform_now
+          rescue NameError => e
+            @logger.error("Periodic task #{job_name} could not resolve to an Active Job class - check the spelling in cron.yaml.")
+            @logger.error("Error: #{e}.")
+            return internal_error_response
+          end
+
+          [200, { 'Content-Type' => 'text/plain' }, ["Successfully ran periodic task #{job_name}."]]
+        end
+
+        def internal_error_response
+          message = 'Failed to execute job - see Rails log for more details.'
+          [500, { 'Content-Type' => 'text/plain' }, [message]]
+        end
+
+        def forbidden_response
+          message = 'Request with aws-sqsd user agent was made from untrusted address.'
+          [403, { 'Content-Type' => 'text/plain' }, [message]]
+        end
+
+        # The beanstalk worker SQS Daemon sets a specific User-Agent headers that begins with 'aws-sqsd'.
+        def from_sqs_daemon?(request)
+          current_user_agent = request.headers['User-Agent']
+
+          !current_user_agent.nil? && current_user_agent.start_with?('aws-sqsd')
+        end
+
+        # The beanstalk worker SQS Daemon will add the custom 'X-Aws-Sqsd-Taskname' header
+        # for periodic tasks set in cron.yaml.
+        def periodic_task?(request)
+          !request.headers['X-Aws-Sqsd-Taskname'].nil? && request.headers['X-Aws-Sqsd-Taskname'].present?
+        end
+
+        def sent_from_docker_host?(request)
+          app_runs_in_docker_container? && ip_originates_from_docker_host?(request)
+        end
+
+        def app_runs_in_docker_container?
+          @app_runs_in_docker_container ||= in_docker_container_with_cgroup1? || in_docker_container_with_cgroup2?
+        end
+
+        def in_docker_container_with_cgroup1?
+          File.exist?('/proc/1/cgroup') && File.read('/proc/1/cgroup') =~ %r{/docker/}
+        end
+
+        def in_docker_container_with_cgroup2?
+          File.exist?('/proc/self/mountinfo') && File.read('/proc/self/mountinfo') =~ %r{/docker/containers/}
+        end
+
+        def ip_originates_from_docker_host?(request)
+          default_docker_ips.include?(request.remote_ip) ||
+            default_docker_ips.include?(request.remote_addr)
+        end
+
+        def default_docker_ips
+          @default_docker_ips ||= build_default_docker_ips
+        end
+
+        def build_default_docker_ips
+          default_gw_ips = ['172.17.0.1']
+
+          if File.exist?('/proc/net/route')
+            File.open('/proc/net/route').each_line do |line|
+              fields = line.strip.split
+              next if fields.size != 11
+              # Destination == 0.0.0.0 and Flags & RTF_GATEWAY != 0
+              next unless fields[1] == '00000000' && fields[3].hex.anybits?(0x2)
+
+              default_gw_ips << IPAddr.new_ntoh([fields[2].hex].pack('L')).to_s
+            end
+          end
+
+          default_gw_ips
+        end
+      end
+    end
+  end
+end

data/lib/aws/rails/notifications.rb

@@ -5,18 +5,15 @@ require 'active_support/notifications'
 
 module Aws
   module Rails
-    # Instruments client operation calls for ActiveSupport::Notifications
-    # Each client operation will produce an event with name:
-    # <operation>.<service>.aws
     # @api private
     class Notifications < Seahorse::Client::Plugin
+      # This plugin needs to be first, which means it is called first in the stack,
+      # to start recording time, and returns last
       def add_handlers(handlers, _config)
-        # This plugin needs to be first
-        # which means it is called first in the stack, to start recording time,
-        # and returns last
         handlers.add(Handler, step: :initialize, priority: 99)
       end
 
+      # @api private
       class Handler < Seahorse::Client::Handler
         def call(context)
           event_name = "#{context.operation_name}.#{context.config.api.metadata['serviceId']}.aws"

data/lib/aws/rails/railtie.rb

@@ -8,21 +8,29 @@ module Aws
       initializer 'aws-sdk-rails.initialize',
                   before: :load_config_initializers do
         # Initialization Actions
+        Aws::Rails.log_to_rails_logger
         Aws::Rails.use_rails_encrypted_credentials
         Aws::Rails.add_action_mailer_delivery_method
         Aws::Rails.add_action_mailer_delivery_method(:sesv2)
-        Aws::Rails.log_to_rails_logger
+
+        if %i[ses sesv2].include?(::Rails.application.config.action_mailer.delivery_method)
+          ::Rails.logger.warn(<<~MSG)
+            ** Aws::Rails.add_action_mailer_delivery_method will be removed in aws-sdk-rails ~> 5.
+            In `aws-actionmailer-ses ~> 1`, configuration will be set using config settings:
+
+              config.action_mailer.delivery_method = :ses_v2
+              config.action_mailer.ses_v2_settings = { region: 'us-west-2' }
+
+            Existing Mailer classes have moved namespaces but will continue to work in this major version. **
+          MSG
+        end
       end
 
       initializer 'aws-sdk-rails.insert_middleware' do |app|
         Aws::Rails.add_sqsd_middleware(app)
       end
 
-      initializer 'aws-sdk-rails.sdk_eager_load' do
-        config.before_eager_load do
-          config.eager_load_namespaces << Aws
-        end
-
+      initializer 'aws-sdk-rails.eager_load' do
         Aws.define_singleton_method(:eager_load!) do
           Aws.constants.each do |c|
             m = Aws.const_get(c)
@@ -33,14 +41,27 @@ module Aws
             end
           end
         end
-      end
 
-      rake_tasks do
-        load 'tasks/dynamo_db/session_store.rake'
-        load 'tasks/aws_record/migrate.rake'
+        config.before_eager_load do
+          config.eager_load_namespaces << Aws
+        end
       end
     end
 
+    # Configures the AWS SDK for Ruby's logger to use the Rails logger.
+    def self.log_to_rails_logger
+      Aws.config[:logger] = ::Rails.logger
+      nil
+    end
+
+    # Configures the AWS SDK with credentials from Rails encrypted credentials.
+    def self.use_rails_encrypted_credentials
+      # limit the config keys we merge to credentials only
+      aws_credential_keys = %i[access_key_id secret_access_key session_token account_id]
+      creds = ::Rails.application.credentials[:aws].to_h.slice(*aws_credential_keys)
+      Aws.config.merge!(creds)
+    end
+
     # This is called automatically from the SDK's Railtie, but can be manually
     # called if you want to specify options for building the Aws::SES::Client or
     # Aws::SESV2::Client.
@@ -50,8 +71,7 @@ module Aws
     # @param [Hash] client_options The options you wish to pass on to the
     #   Aws::SES[V2]::Client initialization method.
     def self.add_action_mailer_delivery_method(name = :ses, client_options = {})
-      # TODO: on the next major version, add a "mailer" param to this method
-      # and use it to determine which mailer to use, keeping name free-form.
+      # TODO: remove this method in aws-sdk-rails ~> 5
       ActiveSupport.on_load(:action_mailer) do
         if name == :sesv2
           add_delivery_method(name, Aws::Rails::Sesv2Mailer, client_options)
@@ -61,33 +81,14 @@ module Aws
       end
     end
 
-    # Configures the AWS SDK for Ruby's logger to use the Rails logger.
-    def self.log_to_rails_logger
-      Aws.config[:logger] = ::Rails.logger
-      nil
-    end
-
-    # Configures the AWS SDK with credentials from Rails encrypted credentials.
-    def self.use_rails_encrypted_credentials
-      # limit the config keys we merge to credentials only
-      aws_credential_keys = %i[access_key_id secret_access_key session_token]
-
-      Aws.config.merge!(
-        ::Rails.application.credentials[:aws].to_h.slice(*aws_credential_keys)
-      )
-    end
-
-    # Adds ActiveSupport Notifications instrumentation to AWS SDK
-    # client operations.  Each operation will produce an event with a name:
-    # <operation>.<service>.aws.  For example, S3's put_object has an event
-    # name of: put_object.S3.aws
+    # Add ActiveSupport Notifications instrumentation to AWS SDK client operations.
+    # Each operation will produce an event with a name `<operation>.<service>.aws`.
+    # For example, S3's put_object has an event name of: put_object.S3.aws
     def self.instrument_sdk_operations
       Aws.constants.each do |c|
-        next if Aws.autoload?(c)
-
         m = Aws.const_get(c)
         if m.is_a?(Module) && m.const_defined?(:Client) &&
-           m.const_get(:Client).superclass == Seahorse::Client::Base
+           (client = m.const_get(:Client)) && client.superclass == Seahorse::Client::Base
           m.const_get(:Client).add_plugin(Aws::Rails::Notifications)
         end
       end
@@ -97,15 +98,13 @@ module Aws
     # This will only be added in the presence of the AWS_PROCESS_BEANSTALK_WORKER_REQUESTS environment variable.
     # The expectation is this variable should only be set on EB worker environments.
     def self.add_sqsd_middleware(app)
-      is_eb_worker_hosted = Aws::Util.str_2_bool(ENV['AWS_PROCESS_BEANSTALK_WORKER_REQUESTS'].to_s.downcase)
-
-      return unless is_eb_worker_hosted
+      return unless ENV['AWS_PROCESS_BEANSTALK_WORKER_REQUESTS']
 
       if app.config.force_ssl
         # SQS Daemon sends requests over HTTP - allow and process them before enforcing SSL.
-        app.config.middleware.insert_before(ActionDispatch::SSL, Aws::Rails::EbsSqsActiveJobMiddleware)
+        app.config.middleware.insert_before(::ActionDispatch::SSL, Aws::Rails::Middleware::ElasticBeanstalkSQSD)
       else
-        app.config.middleware.use(Aws::Rails::EbsSqsActiveJobMiddleware)
+        app.config.middleware.use(Aws::Rails::Middleware::ElasticBeanstalkSQSD)
       end
     end
   end

data/lib/aws-sdk-rails.rb

@@ -1,19 +1,27 @@
 # frozen_string_literal: true
 
-require_relative 'aws/rails/ses_mailer'
-require_relative 'aws/rails/sesv2_mailer'
+require_relative 'aws/rails/middleware/elastic_beanstalk_sqsd'
 require_relative 'aws/rails/railtie'
-require_relative 'aws/rails/action_mailbox/engine'
 require_relative 'aws/rails/notifications'
-require_relative 'aws/rails/sqs_active_job'
-require_relative 'aws/rails/middleware/ebs_sqs_active_job_middleware'
 
-require_relative 'action_dispatch/session/dynamodb_store'
-
-require_relative 'generators/aws_record/base'
+# remove these in aws-sdk-rails 5
+require 'aws-actiondispatch-dynamodb'
+require 'aws-actionmailbox-ses' if defined?(ActionMailbox::Engine)
+require 'aws-actionmailer-ses'
+require 'aws-activejob-sqs'
+require 'aws-record-rails'
 
 module Aws
   module Rails
     VERSION = File.read(File.expand_path('../VERSION', __dir__)).strip
   end
 end
+
+# remove these in aws-sdk-rails 5
+Aws::Rails::SqsActiveJob = Aws::ActiveJob::SQS
+Aws::Rails::EbsSqsActiveJobMiddleware = Aws::Rails::Middleware::ElasticBeanstalkSQSD
+Aws::Rails::SesMailer = Aws::ActionMailer::SES::Mailer
+Aws::Rails::Sesv2Mailer = Aws::ActionMailer::SESV2::Mailer
+# This is for backwards compatibility after introducing support for SESv2.
+# The old mailer is now replaced with the new SES (v1) mailer.
+Aws::Rails::Mailer = Aws::Rails::SesMailer