aws-sdk-rails 3.11.0 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ff9a7f26db95b0ae83526c594bb985b991da455979daf7d2a6ea92be0a5187
-  data.tar.gz: bbb91361034021720e0f43058777b530212d6c43d489f23999b636dd7e187edb
+  metadata.gz: 43528604142d01e2ddcddf37ae598a08c11744aa3a9ccc6757dbc7d1932d3546
+  data.tar.gz: 7977e087f6372fc8326193dad744f908cda1d2174fc6f817e9cfe48b286a5cfb
 SHA512:
-  metadata.gz: a28a3bf351332f237ef4ce23bbcdb6115ac41468d14dd3d2e1eb76c7a395c33697c9f8c55412fdad3a2b4fc63cbf7dca350243bdf5651743a7ccadfb9adebb0a
-  data.tar.gz: 80076e9047b439cdbd4fe8fe2da651b3cc9d23ed3346fb22c32724b9b3e00463dd77a52f99934bfe26c79ce6d9cc9a17d74fdf6683c9dc5b85e52c40a80f0d9d
+  metadata.gz: 2ceda136ba4f7077b6608787528f2ae97b9ceb3169d9c67f101105e7e512dc8000cdb3bf09e5f96b786544bdb427eb15cc0df6571ecc544f5b1603c51cc034b8
+  data.tar.gz: 1fdb53b5fdc4a752643deb9e360988983ad939cce6ada4a8ce3bc68122959c44c7ca6f98d55987172c4d559d9d010ec652b482576bf12b4e496193b183aa236e

data/VERSION

@@ -1 +1 @@
-3.11.0
+3.13.0

data/lib/active_job/queue_adapters/amazon_sqs_async_adapter.rb

@@ -20,13 +20,13 @@ module ActiveJob
         # FIFO jobs must be queued in order, so do not queue async
         queue_url = Aws::Rails::SqsActiveJob.config.queue_url_for(job.queue_name)
         if Aws::Rails::SqsActiveJob.fifo?(queue_url)
-          super(job, body, send_message_opts)
+          super
         else
           # Serialize is called here because the job’s locale needs to be
           # determined in this thread and not in some other thread.
           body = job.serialize
           Concurrent::Promises
-            .future { super(job, body, send_message_opts) }
+            .future { super }
             .rescue do |e|
               Rails.logger.error "Failed to queue job #{job}. Reason: #{e}"
               error_handler = Aws::Rails::SqsActiveJob.config.async_queue_error_handler

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

@@ -85,7 +85,15 @@ module Aws
       end
 
       def app_runs_in_docker_container?
-        @app_runs_in_docker_container ||= `[ -f /proc/1/cgroup ] && cat /proc/1/cgroup` =~ /docker/
+        @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 default_gw_ips

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

@@ -9,43 +9,26 @@ module Aws
       class Executor
         DEFAULTS = {
           min_threads: 0,
-          max_threads: Concurrent.processor_count,
+          max_threads: Integer(Concurrent.available_processor_count || Concurrent.processor_count),
           auto_terminate: true,
           idletime: 60, # 1 minute
-          fallback_policy: :caller_runs # slow down the producer thread
-          # TODO: Consider catching the exception and sleeping instead of using :caller_runs
+          fallback_policy: :abort # Concurrent::RejectedExecutionError must be handled
         }.freeze
 
         def initialize(options = {})
           @executor = Concurrent::ThreadPoolExecutor.new(DEFAULTS.merge(options))
           @retry_standard_errors = options[:retry_standard_errors]
           @logger = options[:logger] || ActiveSupport::Logger.new($stdout)
+          @task_complete = Concurrent::Event.new
         end
 
         def execute(message)
-          @executor.post(message) do |message|
-            begin
-              job = JobRunner.new(message)
-              @logger.info("Running job: #{job.id}[#{job.class_name}]")
-              job.run
-              message.delete
-            rescue Aws::Json::ParseError => e
-              @logger.error "Unable to parse message body: #{message.data.body}. Error: #{e}."
-            rescue StandardError => e
-              job_msg = job ? "#{job.id}[#{job.class_name}]" : 'unknown job'
-              @logger.info "Error processing job #{job_msg}: #{e}"
-              @logger.debug e.backtrace.join("\n")
-
-              if @retry_standard_errors && !job.exception_executions?
-                @logger.info(
-                  'retry_standard_errors is enabled and job has not ' \
-                  "been retried by Rails.  Leaving #{job_msg} in the queue."
-                )
-              else
-                message.delete
-              end
-            end
-          end
+          post_task(message)
+        rescue Concurrent::RejectedExecutionError
+          # no capacity, wait for a task to complete
+          @task_complete.reset
+          @task_complete.wait
+          retry
         end
 
         def shutdown(timeout = nil)
@@ -60,6 +43,34 @@ module Aws
                          'passes.'
           end
         end
+
+        private
+
+        def post_task(message)
+          @executor.post(message) do |message|
+            job = JobRunner.new(message)
+            @logger.info("Running job: #{job.id}[#{job.class_name}]")
+            job.run
+            message.delete
+          rescue Aws::Json::ParseError => e
+            @logger.error "Unable to parse message body: #{message.data.body}. Error: #{e}."
+          rescue StandardError => e
+            job_msg = job ? "#{job.id}[#{job.class_name}]" : 'unknown job'
+            @logger.info "Error processing job #{job_msg}: #{e}"
+            @logger.debug e.backtrace.join("\n")
+
+            if @retry_standard_errors && !job.exception_executions?
+              @logger.info(
+                'retry_standard_errors is enabled and job has not ' \
+                "been retried by Rails.  Leaving #{job_msg} in the queue."
+              )
+            else
+              message.delete
+            end
+          ensure
+            @task_complete.set
+          end
+        end
       end
     end
   end

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

@@ -39,8 +39,8 @@ module Aws
       end
 
       def self.to_message_attributes(record)
-        record['messageAttributes'].each_with_object({}) do |(key, value), acc|
-          acc[key] = {
+        record['messageAttributes'].transform_values do |value|
+          {
             string_value: value['stringValue'],
             binary_value: value['binaryValue'],
             string_list_values: ['stringListValues'],

data/lib/generators/aws_record/base.rb

@@ -53,12 +53,10 @@ module AwsRecord
 
       def parse_attributes!
         self.attributes = (attributes || []).map do |attr|
-          begin
-            GeneratedAttribute.parse(attr)
-          rescue ArgumentError => e
-            @parse_errors << e
-            next
-          end
+          GeneratedAttribute.parse(attr)
+        rescue ArgumentError => e
+          @parse_errors << e
+          next
         end
         self.attributes = attributes.compact
 
@@ -167,28 +165,26 @@ module AwsRecord
 
       def parse_gsis!
         @gsis = (options['gsi'] || []).map do |raw_idx|
-          begin
-            idx = SecondaryIndex.parse(raw_idx)
+          idx = SecondaryIndex.parse(raw_idx)
+
+          attributes = self.attributes.select { |attr| attr.name == idx.hash_key }
+          if attributes.empty?
+            @parse_errors << ArgumentError.new("Could not find attribute #{idx.hash_key} for gsi #{idx.name} hkey")
+            next
+          end
 
-            attributes = self.attributes.select { |attr| attr.name == idx.hash_key }
+          if idx.range_key
+            attributes = self.attributes.select { |attr| attr.name == idx.range_key }
             if attributes.empty?
-              @parse_errors << ArgumentError.new("Could not find attribute #{idx.hash_key} for gsi #{idx.name} hkey")
+              @parse_errors << ArgumentError.new("Could not find attribute #{idx.range_key} for gsi #{idx.name} rkey")
               next
             end
-
-            if idx.range_key
-              attributes = self.attributes.select { |attr| attr.name == idx.range_key }
-              if attributes.empty?
-                @parse_errors << ArgumentError.new("Could not find attribute #{idx.range_key} for gsi #{idx.name} rkey")
-                next
-              end
-            end
-
-            idx
-          rescue ArgumentError => e
-            @parse_errors << e
-            next
           end
+
+          idx
+        rescue ArgumentError => e
+          @parse_errors << e
+          next
         end
 
         @gsis = @gsis.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-rails
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.13.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-record
@@ -102,16 +102,16 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -191,14 +191,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby on Rails Plugin