aws-sdk-rails 3.6.0 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d723b9b6fd27217d47fec5d67a8e215eea7249b190dcd724d949539c4fccdc
-  data.tar.gz: 0d99a46f3109fa5ea2950045a4e24ea85f630c9458d510bffe208dca65fcce22
+  metadata.gz: 02dc930917c099420e224d5193b65a406ed2b8fa5f7a082515f692e99c06f421
+  data.tar.gz: b37670c127021772d0f2e76b4ac3a0ce4a0b35c112c1f9eed21b8c30ca981b00
 SHA512:
-  metadata.gz: 3411b20bf529a39dc0c3f45259f5b470cf74885a8c87937c5f874714ba0f840c33e6609f9904c673d0879bacddb30e1f8d9d2f8173ca229a7d4d264be6880e05
-  data.tar.gz: e2e4626edffb9ee1be443330ec975875ac97569034d985a551f24557d33c3c09cc6120f4f47a48bad15673f3481d52d5544349f8e2f109127a0714f0354d1b41
+  metadata.gz: 496f7fe7c27beebd9cd99e5eac7e785ba197cf8913bc28bc60511192fb32caf7b9fa6caa088a0ea75eae7824a468256688d3060f8176efd0c1fa2962611c06a9
+  data.tar.gz: 366e891aea46c737de15b2b58b5b593a980a277b0c2c20c87e28b8b9be446ce5a906e3f1f445bbcf0a63cc8332702d851d97d90c9db31c45fbc82e07d3186a67

data/VERSION

@@ -1 +1 @@
-3.6.0
+3.6.3

data/lib/action_dispatch/session/dynamodb_store.rb

@@ -1,4 +1,5 @@
 require 'aws-sessionstore-dynamodb'
+require 'action_dispatch/middleware/session/abstract_store'
 
 module ActionDispatch
   module Session
@@ -9,11 +10,14 @@ module ActionDispatch
     # This class will use the Rails secret_key_base unless otherwise provided.
     #
     # Configuration can also be provided in YAML files from Rails config, either
-    # in "config/session_store.yml" or "config/session_store/#{Rails.env}.yml".
+    # in "config/session_store.yml" or "config/session_store/#\\{Rails.env}.yml".
     # Configuration files that are environment-specific will take precedence.
     #
     # @see https://docs.aws.amazon.com/sdk-for-ruby/aws-sessionstore-dynamodb/api/Aws/SessionStore/DynamoDB/Configuration.html
     class DynamodbStore < Aws::SessionStore::DynamoDB::RackMiddleware
+      include StaleSessionCheck
+      include SessionObject
+
       def initialize(app, options = {})
         options[:config_file] ||= config_file if config_file.exist?
         options[:secret_key] ||= Rails.application.secret_key_base

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)
@@ -30,13 +30,15 @@ module ActiveJob
           # job_id is unique per initialization of job
           # Remove it from message dup id to ensure run-once behavior
           # with ActiveJob retries
-           send_message_opts[:message_deduplication_id] =
-             Digest::SHA256.hexdigest(
-               Aws::Json.dump(body.except('job_id'))
-             )
+          send_message_opts[:message_deduplication_id] =
+            Digest::SHA256.hexdigest(Aws::Json.dump(body.except('job_id')))
 
-           send_message_opts[:message_group_id] = Aws::Rails::SqsActiveJob.config.message_group_id
+          message_group_id = job.message_group_id if job.respond_to?(:message_group_id)
+          message_group_id ||= Aws::Rails::SqsActiveJob.config.message_group_id
+
+          send_message_opts[:message_group_id] = message_group_id
         end
+
         Aws::Rails::SqsActiveJob.config.client.send_message(send_message_opts)
       end
 

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

@@ -11,7 +11,7 @@ module Aws
 
       def initialize(app)
         @app = app
-        @logger = ActiveSupport::Logger.new(STDOUT)
+        @logger = ::Rails.logger
       end
 
       def call(env)
@@ -20,7 +20,7 @@ module Aws
         # Pass through unless user agent is the SQS Daemon
         return @app.call(env) unless from_sqs_daemon?(request)
 
-        @logger.debug('aws-rails-sdk middleware detected call from Elastic Beanstalk SQS Daemon.')
+        @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)

data/lib/aws/rails/railtie.rb

@@ -48,10 +48,7 @@ module Aws
       aws_credential_keys = %i[access_key_id secret_access_key session_token]
 
       Aws.config.merge!(
-        ::Rails.application
-          .try(:credentials)
-          .try(:aws)
-          .to_h.slice(*aws_credential_keys)
+        ::Rails.application.credentials[:aws].to_h.slice(*aws_credential_keys)
       )
     end
 

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
         }

data/lib/generators/aws_record/model/model_generator.rb

@@ -9,11 +9,11 @@ module AwsRecord
       end
 
       def create_model
-        template "model.rb", File.join("app/models", class_path, "#{file_name}.rb")
+        template "model.erb", File.join("app/models", class_path, "#{file_name}.rb")
       end
 
       def create_table_config
-        template "table_config.rb", File.join("db/table_config", class_path, "#{file_name}_config.rb") if options["table_config"]
+        template "table_config.erb", File.join("db/table_config", class_path, "#{file_name}_config.rb") if options["table_config"]
       end
 
     end

data/lib/generators/dynamo_db/session_store_migration/session_store_migration_generator.rb

@@ -18,7 +18,7 @@ module DynamoDb
       #   of a DynamoDB session table.
       def generate_migration_file
         migration_template(
-          'session_store_migration.rb',
+          'session_store_migration.erb',
           "db/migrate/#{name.underscore}.rb"
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-rails
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.3
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-record
@@ -136,13 +136,13 @@ files:
 - lib/generators/aws_record/generated_attribute.rb
 - lib/generators/aws_record/model/USAGE
 - lib/generators/aws_record/model/model_generator.rb
-- lib/generators/aws_record/model/templates/model.rb
-- lib/generators/aws_record/model/templates/table_config.rb
+- lib/generators/aws_record/model/templates/model.erb
+- lib/generators/aws_record/model/templates/table_config.erb
 - lib/generators/aws_record/secondary_index.rb
 - lib/generators/dynamo_db/session_store_migration/USAGE
 - lib/generators/dynamo_db/session_store_migration/session_store_migration_generator.rb
 - lib/generators/dynamo_db/session_store_migration/templates/dynamo_db_session_store.yml
-- lib/generators/dynamo_db/session_store_migration/templates/session_store_migration.rb
+- lib/generators/dynamo_db/session_store_migration/templates/session_store_migration.erb
 - lib/tasks/aws_record/migrate.rake
 - lib/tasks/dynamo_db/session_store.rake
 homepage: https://github.com/aws/aws-sdk-rails
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: AWS SDK for Ruby on Rails Plugin