Skip to content

[7.x] Added queue suffix for SQS driver #31784

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

Merged
merged 1 commit into from
Mar 6, 2020
Merged

[7.x] Added queue suffix for SQS driver #31784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/Illuminate/Queue/Connectors/SqsConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function connect(array $config)
}

return new SqsQueue(
new SqsClient($config), $config['queue'], $config['prefix'] ?? ''
new SqsClient($config), $config['queue'], $config['prefix'] ?? '', $config['suffix'] ?? ''
);
}

Expand Down
14 changes: 12 additions & 2 deletions src/Illuminate/Queue/SqsQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,28 @@ class SqsQueue extends Queue implements QueueContract
*/
protected $prefix;

/**
* The queue name suffix.
*
* @var string
*/
private $suffix;

/**
* Create a new Amazon SQS queue instance.
*
* @param \Aws\Sqs\SqsClient $sqs
* @param string $default
* @param string $prefix
* @param string $suffix
* @return void
*/
public function __construct(SqsClient $sqs, $default, $prefix = '')
public function __construct(SqsClient $sqs, $default, $prefix = '', $suffix = '')
{
$this->sqs = $sqs;
$this->prefix = $prefix;
$this->default = $default;
$this->suffix = $suffix;
}

/**
Expand Down Expand Up @@ -140,7 +149,8 @@ public function getQueue($queue)
$queue = $queue ?: $this->default;

return filter_var($queue, FILTER_VALIDATE_URL) === false
? rtrim($this->prefix, '/').'/'.$queue : $queue;
? rtrim($this->prefix, '/').'/'.$queue.$this->suffix
: $queue;
}

/**
Expand Down
8 changes: 8 additions & 0 deletions tests/Queue/QueueSqsQueueTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,12 @@ public function testGetQueueProperlyResolvesUrlWithoutPrefix()
$queueUrl = $this->baseUrl.'/'.$this->account.'/test';
$this->assertEquals($queueUrl, $queue->getQueue($queueUrl));
}

public function testGetQueueProperlyResolvesUrlWithSuffix()
{
$queue = new SqsQueue($this->sqs, $this->queueName, $this->prefix, $suffix = '-staging');
$this->assertEquals($this->queueUrl.$suffix, $queue->getQueue(null));
$queueUrl = $this->baseUrl.'/'.$this->account.'/test'.$suffix;
$this->assertEquals($queueUrl, $queue->getQueue('test'));
}
}