Ensure queues are only suffixed once

Author: roberto-aguilar

src/Illuminate/Queue/SqsQueue.php

@@ -5,6 +5,7 @@
 use Aws\Sqs\SqsClient;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Jobs\SqsJob;
+use Illuminate\Support\Str;
 
 class SqsQueue extends Queue implements QueueContract
 {
@@ -149,7 +150,7 @@ public function getQueue($queue)
         $queue = $queue ?: $this->default;
 
         return filter_var($queue, FILTER_VALIDATE_URL) === false
-            ? rtrim($this->prefix, '/').'/'.$queue.$this->suffix
+            ? rtrim($this->prefix, '/').'/'.Str::finish($queue, $this->suffix)
             : $queue;
     }
 

tests/Queue/QueueSqsQueueTest.php

@@ -153,4 +153,12 @@ public function testGetQueueProperlyResolvesUrlWithSuffix()
         $queueUrl = $this->baseUrl.'/'.$this->account.'/test'.$suffix;
         $this->assertEquals($queueUrl, $queue->getQueue('test'));
     }
+
+    public function testGetQueueEnsuresTheQueueIsOnlySuffixedOnce()
+    {
+        $queue = new SqsQueue($this->sqs, "{$this->queueName}-staging", $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-staging'));
+    }
 }