aws-sdk-rails 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ff9a7f26db95b0ae83526c594bb985b991da455979daf7d2a6ea92be0a5187
-  data.tar.gz: bbb91361034021720e0f43058777b530212d6c43d489f23999b636dd7e187edb
+  metadata.gz: 4db4f6778275cb1b836119e1d593fa7d9ebc2e629bbe4818685fdc36dffa286f
+  data.tar.gz: 567aed0fd65308e3e1ab9df0875d2d5d3dbbe2b2228d4756dbc55edbf84e481e
 SHA512:
-  metadata.gz: a28a3bf351332f237ef4ce23bbcdb6115ac41468d14dd3d2e1eb76c7a395c33697c9f8c55412fdad3a2b4fc63cbf7dca350243bdf5651743a7ccadfb9adebb0a
-  data.tar.gz: 80076e9047b439cdbd4fe8fe2da651b3cc9d23ed3346fb22c32724b9b3e00463dd77a52f99934bfe26c79ce6d9cc9a17d74fdf6683c9dc5b85e52c40a80f0d9d
+  metadata.gz: 56b130425e1fcd11fd2cbcb41a8bc0159c02cc2ae821a8c95cd8553cfb3bfb63492cffaed8205e2cbd142272eb5ee6351e31a143ec12259c2ac226f511f0aec4
+  data.tar.gz: e5db0e0c8a1e955a12ca48e57e6d2d64f4758a083cb2d9a28eec4b7c45ef6eed5084543f63b2f4714cd5ca797a16c160172fab0e61b201119205a3eef7e95a79

data/VERSION

@@ -1 +1 @@
-3.11.0
+3.12.0

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

@@ -24,26 +24,24 @@ module Aws
 
         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")
+            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
+            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

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.12.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-record
@@ -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.4.22
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby on Rails Plugin