[Messenger] fix queue_name option amazon sqs connection

ck-developer · ck-developer · commit d2e551838349 · 2020-06-19T23:29:49.000+02:00
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php
@@ -106,6 +106,24 @@ public function testFromDsnWithOptions()
         );
     }
 
+    public function testFromDsnWithQueueNameOptions()
+    {
+        $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)
+        );
+    }
+
+    public function testFromDsnWithOverridingQueueNameByOptions()
+    {
+        $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
+        $this->assertEquals(
+            new Connection(['queue_name' => 'overrided_queue'], new SqsClient(['region' => 'eu-west-1', 'accessKeyId' => null, 'accessKeySecret' => null], null, $httpClient)),
+            Connection::fromDsn('sqs://default/queue', ['queue_name' => 'overrided_queue'], $httpClient)
+        );
+    }
+
     public function testFromDsnWithQueryOptions()
     {
         $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
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'] ?? ($query['poll_timeout'] ?? self::DEFAULT_OPTIONS['poll_timeout']),
             'visibility_timeout' => $options['visibility_timeout'] ?? ($query['visibility_timeout'] ?? self::DEFAULT_OPTIONS['visibility_timeout']),
             'auto_setup' => $options['auto_setup'] ?? (bool) ($query['auto_setup'] ?? self::DEFAULT_OPTIONS['auto_setup']),
+            'queue_name' => $options['queue_name'] ?? null,
         ];
 
         $clientConfiguration = [
@@ -119,7 +120,7 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
         }
 
         $parsedPath = explode('/', ltrim($parsedUrl['path'] ?? '/', '/'));
-        if (\count($parsedPath) > 0) {
+        if ($configuration['queue_name'] === null && \count($parsedPath) > 0) {
             $configuration['queue_name'] = end($parsedPath);
         }
         $configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : null;

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter`
`101`	`101`	`'poll_timeout' => $options['poll_timeout'] ?? ($query['poll_timeout'] ?? self::DEFAULT_OPTIONS['poll_timeout']),`
`102`	`102`	`'visibility_timeout' => $options['visibility_timeout'] ?? ($query['visibility_timeout'] ?? self::DEFAULT_OPTIONS['visibility_timeout']),`
`103`	`103`	`'auto_setup' => $options['auto_setup'] ?? (bool) ($query['auto_setup'] ?? self::DEFAULT_OPTIONS['auto_setup']),`
	`104`	`+ 'queue_name' => $options['queue_name'] ?? null,`
`104`	`105`	`];`
`105`	`106`
`106`	`107`	`$clientConfiguration = [`
`@@ -119,7 +120,7 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`$parsedPath = explode('/', ltrim($parsedUrl['path'] ?? '/', '/'));`
`122`		`- if (\count($parsedPath) > 0) {`
	`123`	`+ if ($configuration['queue_name'] === null && \count($parsedPath) > 0) {`
`123`	`124`	`$configuration['queue_name'] = end($parsedPath);`
`124`	`125`	`}`
`125`	`126`	`$configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : null;`