Relocate ActiveJob and middleware (#160)

aws · Nov 15, 2024 · 6aed28d · 6aed28d
1 parent 122eb2a
commit 6aed28d
Show file tree

Hide file tree

Showing 54 changed files with 557 additions and 1,937 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ gemfiles/*.gemfile.lock
 sample-app/Gemfile.lock
 sample-app/log
 sample-app/tmp
+sample-app.zip
 
 test/dummy/db/migrate
 test/dummy/log/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,12 +21,16 @@ Unreleased Changes
 
 * Feature - New namespace and class names for SES and SESV2 mailers. `Aws::Rails::SesMailer` has been moved to `Aws::ActionMailer::SES::Mailer` and `Aws::Rails::Sesv2Mailer` has been moved to `Aws::ActionMailer::SESV2::Mailer`. The classes have been symlinked for backwards compatibility in this major version.
 
-* Issue - Add deprecation warning to `Aws::Rails.add_action_mailer_delivery_method` to instead use `ActionMailer::Base.add_delivery_method`. This method will be removed in the next major version.
+* Issue - Add deprecation warning to `Aws::Rails.add_action_mailer_delivery_method` to instead use `ActionMailer::Base.add_delivery_method`. This method will be removed in aws-sdk-rails ~> 5.
 
 * Feature - ActionMailbox SES ingress now lives in the `aws-actionmailbox-ses` gem.
 
 * Issue - The `Aws::Rails::ActionMailbox::RSpec` module has been moved to `Aws::ActionMailbox::SES::RSpec` and will be removed in aws-sdk-rails ~> 5.
 
+* Feature - ActiveJob SQS now lives in the `aws-activejob-sqs` gem.
+
+* Feature - New namespace and class names for SQS ActiveJob. Existing namespace has temporarily been kept for backward compatibility and will be removed in aws-sdk-rails ~> 5.
+
 4.1.0 (2024-09-27)
 ------------------
 

diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,7 @@ gemspec
 gem 'aws-actiondispatch-dynamodb', git: 'https://github.com/aws/aws-actiondispatch-dynamodb-ruby'
 gem 'aws-actionmailbox-ses', git: 'https://github.com/aws/aws-actionmailbox-ses-ruby'
 gem 'aws-actionmailer-ses', git: 'https://github.com/aws/aws-actionmailer-ses-ruby'
+gem 'aws-activejob-sqs', git: 'https://github.com/aws/aws-activejob-sqs-ruby'
 
 group :development, :test do
   gem 'pry'

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/aws-sdk-rails.svg)](https://badge.fury.io/rb/aws-sdk-rails)
 [![Build Status](https://github.com/aws/aws-sdk-rails/workflows/CI/badge.svg)](https://github.com/aws/aws-sdk-rails/actions)
- [![Github forks](https://img.shields.io/github/forks/aws/aws-sdk-rails.svg)](https://github.com/aws/aws-sdk-rails/network)
+[![Github forks](https://img.shields.io/github/forks/aws/aws-sdk-rails.svg)](https://github.com/aws/aws-sdk-rails/network)
 [![Github stars](https://img.shields.io/github/stars/aws/aws-sdk-rails.svg)](https://github.com/aws/aws-sdk-rails/stargazers)
 
 A Ruby on Rails plugin that integrates AWS services with your application using

diff --git a/aws-sdk-rails.gemspec b/aws-sdk-rails.gemspec
@@ -11,19 +11,16 @@ Gem::Specification.new do |spec|
   spec.description   = 'Integrates the AWS SDK for Ruby with Ruby on Rails'
   spec.homepage      = 'https://github.com/aws/aws-sdk-rails'
   spec.license       = 'Apache-2.0'
-  spec.files         = Dir['LICENSE.txt', 'CHANGELOG.md', 'VERSION', 'lib/**/*', 'bin/*']
-  spec.executables = ['aws_sqs_active_job']
+  spec.files         = Dir['LICENSE.txt', 'CHANGELOG.md', 'VERSION', 'lib/**/*']
 
   # These will be removed in aws-sdk-rails ~> 5
   spec.add_dependency('aws-actiondispatch-dynamodb', '~> 0')
   spec.add_dependency('aws-actionmailbox-ses', '~> 0')
   spec.add_dependency('aws-actionmailer-ses', '~> 0')
-  spec.add_dependency('aws-record', '~> 2') # for Aws::Record integration
+  spec.add_dependency('aws-activejob-sqs', '~> 0')
 
-  # Require these versions for user_agent_framework configs
-  spec.add_dependency('aws-sdk-sqs', '~> 1', '>= 1.56.0') # for ActiveJob
+  spec.add_dependency('aws-record', '~> 2') # for Aws::Record integration
 
-  spec.add_dependency('concurrent-ruby', '~> 1.3', '>= 1.3.1') # Utilities for concurrent processing
   spec.add_dependency('railties', '>= 7.1.0') # Minimum supported Rails version
 
   spec.required_ruby_version = '>= 2.7'

diff --git a/bin/aws_sqs_active_job b/bin/aws_sqs_active_job
diff --git a/lib/active_job/queue_adapters/sqs_adapter.rb b/lib/active_job/queue_adapters/sqs_adapter.rb
diff --git a/lib/active_job/queue_adapters/sqs_adapter/params.rb b/lib/active_job/queue_adapters/sqs_adapter/params.rb
diff --git a/lib/active_job/queue_adapters/sqs_async_adapter.rb b/lib/active_job/queue_adapters/sqs_async_adapter.rb
diff --git a/lib/aws-sdk-rails.rb b/lib/aws-sdk-rails.rb
@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
+require_relative 'aws/rails/middleware/elastic_beanstalk_sqsd'
 require_relative 'aws/rails/railtie'
 require_relative 'aws/rails/notifications'
-require_relative 'aws/rails/sqs_active_job'
-require_relative 'aws/rails/middleware/ebs_sqs_active_job_middleware'
 
-# remove this in aws-sdk-rails 5
+# remove these in aws-sdk-rails 5
 require 'aws-actiondispatch-dynamodb'
 require 'aws-actionmailbox-ses' if defined?(ActionMailbox::Engine)
 require 'aws-actionmailer-ses'
+require 'aws-activejob-sqs'
 
 module Aws
   module Rails
     VERSION = File.read(File.expand_path('../VERSION', __dir__)).strip
   end
 end
 
-# Remove these in aws-sdk-rails ~> 5
+# remove these in aws-sdk-rails 5
+Aws::Rails::SqsActiveJob = Aws::ActiveJob::SQS
+Aws::Rails::EbsSqsActiveJobMiddleware = Aws::Rails::Middleware::ElasticBeanstalkSQSD
 Aws::Rails::SesMailer = Aws::ActionMailer::SES::Mailer
 Aws::Rails::Sesv2Mailer = Aws::ActionMailer::SESV2::Mailer
 # This is for backwards compatibility after introducing support for SESv2.

diff --git a/lib/aws/rails/middleware/ebs_sqs_active_job_middleware.rb b/lib/aws/rails/middleware/ebs_sqs_active_job_middleware.rb