Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not apply prefix to queues configured as URL or ARN #667

Merged
merged 5 commits into from
Jun 23, 2021
Merged

Do not apply prefix to queues configured as URL or ARN #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe90c69
Move common test setup to before block
gondalez Jun 21, 2021
d28fb2a
Repro prefix being applied to queues configured by URL
gondalez Jun 21, 2021
5313cbd
Repro prefix being applied to queues configured by ARN
gondalez Jun 21, 2021
54809ea
Do not prefix queues configured by URL
gondalez Jun 21, 2021
205bdad
Do not prefix queues configured by ARN
gondalez Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/shoryuken/environment_loader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def load_rails
end

def prefix_active_job_queue_name(queue_name, weight)
return [queue_name, weight] if queue_name.start_with?('https://', 'arn:')

queue_name_prefix = ::ActiveJob::Base.queue_name_prefix
queue_name_delimiter = ::ActiveJob::Base.queue_name_delimiter

Expand Down
24 changes: 22 additions & 2 deletions spec/shoryuken/environment_loader_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
ActiveJob::Base.queue_name_delimiter = '_'

allow(Shoryuken).to receive(:active_job?).and_return(true)
end

specify do
Shoryuken.active_job_queue_name_prefixing = true
end

specify do
Shoryuken.options[:queues] = ['queue1', ['queue2', 2]]

Shoryuken.options[:groups] = {
Expand All @@ -73,6 +73,26 @@
expect(Shoryuken.groups['default'][:queues]).to eq(%w[test_queue1 test_queue2 test_queue2])
expect(Shoryuken.groups['group1'][:queues]).to eq(%w[test_group1_queue1 test_group1_queue2])
end

it 'does not prefix url-based queues' do
Shoryuken.options[:queues] = ['https://example.com/test_queue1']
Shoryuken.options[:groups] = {'group1' => {queues: ['https://example.com/test_group1_queue1']}}

subject.load

expect(Shoryuken.groups['default'][:queues]).to(eq(['https://example.com/test_queue1']))
expect(Shoryuken.groups['group1'][:queues]).to(eq(['https://example.com/test_group1_queue1']))
end

it 'does not prefix arn-based queues' do
Shoryuken.options[:queues] = ['arn:aws:sqs:fake-region-1:1234:test_queue1']
Shoryuken.options[:groups] = {'group1' => {queues: ['arn:aws:sqs:fake-region-1:1234:test_group1_queue1']}}

subject.load

expect(Shoryuken.groups['default'][:queues]).to(eq(['arn:aws:sqs:fake-region-1:1234:test_queue1']))
expect(Shoryuken.groups['group1'][:queues]).to(eq(['arn:aws:sqs:fake-region-1:1234:test_group1_queue1']))
end
end
describe "#setup_options" do
let (:cli_queues) { { "queue1"=> 10, "queue2" => 20 } }
Expand Down