aws-sdk-rails 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a36f06cb28402d5c089672aa4e88a7ec087d61496c5d2f2855a61c11b3ca4b
-  data.tar.gz: 19f617df06780135dd75d1f6e76911c2104f8b3f2201b0654b97d29a2fd61bbc
+  metadata.gz: 5157818d7cbed8369158102676415247809f388f88f255890c513705075193eb
+  data.tar.gz: 792018ac311693ce6afa82b8ae1c7547bf858a90959558f2547dcfc173cefdbe
 SHA512:
-  metadata.gz: 4d0fb987757cb4b86b660e3180355a8d9870df3f85798f4ab1d085cd03fb448cba686438f0ee7bc96687daeac5faeeee44e8bdf0e88097c243d70bf1531dd0c5
-  data.tar.gz: ad77218a0c85cf43fe3eb8123dedd52d7914bdbfa6323a46299b743c97340edf5fe59774efae0fece141b9ae4e02949e2d17ad2cb00bb119e514e6367442c929
+  metadata.gz: 7c0821bb9dffd184a6f21c51bc6ed5a000dd1a1f5d0a435ccd5d36668f41d95f2be3e834482f20216b83edfac47d763c25d100386efcb87b9e8a64185b2644e9
+  data.tar.gz: be49eeaf3fa701769204a924dcfef6982360dc15387266a5d0e8ae8f8c1c44afb0b383669531799f8daabe2af65372ac37a7dbdf671ee9ba522ecd141a0f0ab8

data/VERSION

@@ -1 +1 @@
-3.7.0
+3.8.0

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

@@ -81,12 +81,30 @@ module Aws
       end
 
       def sent_from_docker_host?(request)
-        app_runs_in_docker_container? && request.ip == '172.17.0.1'
+        app_runs_in_docker_container? && default_gw_ips.include?(request.ip)
       end
 
       def app_runs_in_docker_container?
         @app_runs_in_docker_container ||= `[ -f /proc/1/cgroup ] && cat /proc/1/cgroup` =~ /docker/
       end
+
+      def default_gw_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
+            if fields[1] == '00000000' && (fields[3].hex & 0x2) != 0
+              default_gw_ips << IPAddr.new_ntoh([fields[2].hex].pack('L')).to_s
+            end
+          end
+        end
+
+        default_gw_ips
+      end
     end
   end
 end

data/lib/aws/rails/ses_mailer.rb

@@ -20,6 +20,7 @@ module Aws
       #   [Aws::SES::Client.new](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SES/Client.html#initialize-instance_method).
       def initialize(options = {})
         @client = SES::Client.new(options)
+        @client.config.user_agent_frameworks << 'aws-sdk-rails'
       end
 
       # Rails expects this method to exist, and to handle a Mail::Message object

data/lib/aws/rails/sesv2_mailer.rb

@@ -20,17 +20,23 @@ module Aws
       #   [Aws::SESV2::Client.new](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/SESV2/Client.html#initialize-instance_method).
       def initialize(options = {})
         @client = SESV2::Client.new(options)
+        @client.config.user_agent_frameworks << 'aws-sdk-rails'
       end
 
       # Rails expects this method to exist, and to handle a Mail::Message object
       # correctly. Called during mail delivery.
       def deliver!(message)
-        params = {
-          content: { raw: { data: message.to_s } },
-          from_email_address: message.smtp_envelope_from, # defaults to From header
-          # defaults to destinations (To,Cc,Bcc) - stick all on bcc to be delivered anyway
-          destination: { bcc_addresses: message.smtp_envelope_to }
+        params = { content: { raw: { data: message.to_s } } }
+        # smtp_envelope_from will default to the From address *without* sender names.
+        # By omitting this param, SESv2 will correctly use sender names from the mail headers.
+        # We should only use smtp_envelope_from when it was explicitly set (instance variable set)
+        params[:from_email_address] = message.smtp_envelope_from if message.instance_variable_get(:@smtp_envelope_from)
+        params[:destination] = {
+          to_addresses: to_addresses(message),
+          cc_addresses: message.cc,
+          bcc_addresses: message.bcc
         }
+
         @client.send_email(params).tap do |response|
           message.header[:ses_message_id] = response.message_id
         end
@@ -40,6 +46,15 @@ module Aws
       def settings
         {}
       end
+
+      private
+
+      # smtp_envelope_to will default to the full destinations (To, Cc, Bcc)
+      # SES v2 API prefers each component split out into a destination hash.
+      # When smtp_envelope_to was set, use it explicitly for to_address only.
+      def to_addresses(message)
+        message.instance_variable_get(:@smtp_envelope_to) ? message.smtp_envelope_to : message.to
+      end
     end
   end
 end

data/lib/aws/rails/sqs_active_job/configuration.rb

@@ -92,7 +92,11 @@ module Aws
         end
 
         def client
-          @client ||= Aws::SQS::Client.new(user_agent_suffix: user_agent)
+          @client ||= begin
+            client = Aws::SQS::Client.new
+            client.config.user_agent_frameworks << 'aws-sdk-rails'
+            client
+          end
         end
 
         # Return the queue_url for a given job_queue name
@@ -125,6 +129,7 @@ module Aws
         def set_attributes(options)
           options.keys.each do |opt_name|
             instance_variable_set("@#{opt_name}", options[opt_name])
+            client.config.user_agent_frameworks << 'aws-sdk-rails' if opt_name == :client
           end
         end
 
@@ -154,10 +159,6 @@ module Aws
           options[:config_file] || ENV["AWS_SQS_ACTIVE_JOB_CONFIG_FILE"]
         end
 
-        def user_agent
-          "ft/aws-sdk-rails-activejob/#{Aws::Rails::VERSION}"
-        end
-
         def load_yaml(file_path)
           require "erb"
           source = ERB.new(File.read(file_path)).result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-rails
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-record
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.50.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.50.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sesv2
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.34.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +71,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.56.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +81,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.56.0
 - !ruby/object:Gem::Dependency
   name: aws-sessionstore-dynamodb
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby on Rails Plugin