bug #37364 [Messenger] fixed queue_name option on amazon sqs connection (ck-developer)

chalasr · chalasr · commit 009186483708 · 2020-06-20T14:04:17.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [Messenger] fixed queue_name option on amazon sqs connection | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #37293 | License | MIT Commits ------- a6cb24d [Messenger] fixed queue_name option amazon sqs connection
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
@@ -124,6 +124,21 @@ public function testFromDsnWithQueryOptions()
         );
     }
 
+    public function testFromDsnWithQueueNameOption()
+    {
+        $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
+
+        $this->assertEquals(
+            new Connection(['queue_name' => 'queue'], new SqsClient(['region' => 'eu-west-1', 'accessKeyId' => null, 'accessKeySecret' => null], null, $httpClient)),
+            Connection::fromDsn('sqs://default', ['queue_name' => 'queue'], $httpClient)
+        );
+
+        $this->assertEquals(
+            new Connection(['queue_name' => 'queue'], new SqsClient(['region' => 'eu-west-1', 'accessKeyId' => null, 'accessKeySecret' => null], null, $httpClient)),
+            Connection::fromDsn('sqs://default/queue', ['queue_name' => 'queue_ignored'], $httpClient)
+        );
+    }
+
     public function testKeepGettingPendingMessages()
     {
         $client = $this->createMock(SqsClient::class);
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -101,6 +101,7 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
             'poll_timeout' => $options['poll_timeout'],
             'visibility_timeout' => $options['visibility_timeout'],
             'auto_setup' => (bool) $options['auto_setup'],
+            'queue_name' => (string) $options['queue_name'],
         ];
 
         $clientConfiguration = [
@@ -119,8 +120,8 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
         }
 
         $parsedPath = explode('/', ltrim($parsedUrl['path'] ?? '/', '/'));
-        if (\count($parsedPath) > 0) {
-            $configuration['queue_name'] = end($parsedPath);
+        if (\count($parsedPath) > 0 && !empty($queueName = end($parsedPath))) {
+            $configuration['queue_name'] = $queueName;
         }
         $configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : null;
 
