aws-sdk-rails 3.6.2 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dcc9e1a5e3c78d6952327013a71e7e1b2516025c9191eafde4751154854b494
-  data.tar.gz: 51eb886b4149c80f585b2ee358a14def1f4c96ab08da36545330518b47442eb5
+  metadata.gz: 12ed1c705f5676b3a71f11c40d1cbc86e2f64b70f1a3183d7dff6ee0dec093d0
+  data.tar.gz: c5963b0723b65ccf6c0f098c878d9c024cb7c2bd0a3dee8773dc6a455c58eb8c
 SHA512:
-  metadata.gz: 6b2a91990771c25123f531e82dc4bc67d6c27c6866ccc219b765eefc38181321f5871f9b9f23189bf8a603a513756e25eb70a47f76858f59a8762798f44e301a
-  data.tar.gz: a336bdcd1e91d0b21df76f8fde5382d1792491e611be00804ac2f03a1a64eaa656295ab6e13675201d79aeb710f91bff955dcbd7b846faeb884dbbd2e64e15c4
+  metadata.gz: 77f501b49eae2b7716206ddf37e5eded053d3383d084225e583660e06a637324103d5f83ffc5f003518fb57d4c64472b352ad7b3aeafc908441598de1ad1e178
+  data.tar.gz: 50165f13f842c8d6d435905472666697253ea893d2edb18159f25645c2a50a299573d88a59b43c9e6513da61fd0af900a910a155fcb1f4573dfeff8fefc20d8a

data/VERSION

@@ -1 +1 @@
-3.6.2
+3.6.4

data/lib/active_job/queue_adapters/amazon_sqs_adapter.rb

@@ -11,16 +11,16 @@ module ActiveJob
         _enqueue(job)
       end
 
-      def enqueue_at(job, timestamp, opts={})
+      def enqueue_at(job, timestamp)
         delay = (timestamp - Time.now.to_f).floor
         raise ArgumentError, 'Unable to queue a job with a delay great than 15 minutes' if delay > 15.minutes
-        _enqueue(job, delay_seconds: delay)
+        _enqueue(job, nil, delay_seconds: delay)
       end
 
       private
 
-      def _enqueue(job, send_message_opts = {})
-        body = job.serialize
+      def _enqueue(job, body = nil, send_message_opts = {})
+        body ||= job.serialize
         queue_url = Aws::Rails::SqsActiveJob.config.queue_url_for(job.queue_name)
         send_message_opts[:queue_url] = queue_url
         send_message_opts[:message_body] = Aws::Json.dump(body)

data/lib/active_job/queue_adapters/amazon_sqs_async_adapter.rb

@@ -18,19 +18,22 @@ module ActiveJob
 
       private
 
-      def _enqueue(job, send_message_opts = {})
+      def _enqueue(job, body = nil, send_message_opts = {})
         # 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, send_message_opts)
+          super(job, body, send_message_opts)
         else
-          Concurrent::Promise
-          .execute { super(job, send_message_opts) }
-          .on_error do |e|
-            Rails.logger.error "Failed to queue job #{job}.  Reason: #{e}"
-            error_handler = Aws::Rails::SqsActiveJob.config.async_queue_error_handler
-            error_handler.call(e, job, send_message_opts) if error_handler
-          end
+          # 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) }
+            .rescue do |e|
+              Rails.logger.error "Failed to queue job #{job}. Reason: #{e}"
+              error_handler = Aws::Rails::SqsActiveJob.config.async_queue_error_handler
+              error_handler&.call(e, job, send_message_opts)
+            end
         end
       end
     end

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

@@ -24,7 +24,7 @@ module Aws
 
         # 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 #{request.remote_ip}; returning 403 forbidden.")
+          @logger.warn("SQSD request detected from untrusted address #{request.ip}; returning 403 forbidden.")
           return FORBIDDEN_RESPONSE
         end
 
@@ -81,7 +81,7 @@ module Aws
       end
 
       def sent_from_docker_host?(request)
-        app_runs_in_docker_container? && request.remote_ip == '172.17.0.1'
+        app_runs_in_docker_container? && request.ip == '172.17.0.1'
       end
 
       def app_runs_in_docker_container?

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

@@ -26,7 +26,6 @@ module Aws
         # @api private
         DEFAULTS = {
           max_messages:  10,
-          visibility_timeout: 120,
           shutdown_timeout: 15,
           queues: {},
           logger: ::Rails.logger,
@@ -50,6 +49,8 @@ module Aws
         #    The max number of messages to poll for in a batch.
         #
         # @option options [Integer] :visibility_timeout
+        #   If unset, the visibility timeout configured on the
+        #   SQS queue will be used.
         #   The visibility timeout is the number of seconds
         #   that a message will not be processable by any other consumers.
         #   You should set this value to be longer than your expected job runtime
@@ -99,7 +100,7 @@ module Aws
           job_queue = job_queue.to_sym
           raise ArgumentError, "No queue defined for #{job_queue}" unless queues.key? job_queue
 
-          queues[job_queue.to_sym]
+          queues[job_queue]
         end
 
         # @api private

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

@@ -17,7 +17,6 @@ module Aws
         DEFAULT_OPTS = {
           threads: 2*Concurrent.processor_count,
           max_messages: 10,
-          visibility_timeout: 60,
           shutdown_timeout: 15,
           backpressure: 10
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-rails
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.4
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-record