bug #37629 [Messenger] fix ignored account & endpoint options amazon sqs connection (surikman)

fabpot · fabpot · commit 6b92038e1c95 · 2020-07-23T08:50:17.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [Messenger] fix ignored account & endpoint options amazon sqs connection | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #37598  | License | MIT  Commits ------- fc90a3b [Messenger] fix ignore account & endpoint options 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
@@ -139,6 +139,16 @@ public function testFromDsnWithQueueNameOption()
         );
     }
 
+    public function testFromDsnWithAccountAndEndpointOption()
+    {
+        $httpClient = $this->getMockBuilder(HttpClientInterface::class)->getMock();
+
+        $this->assertEquals(
+            new Connection(['account' => 12345], new SqsClient(['endpoint' => 'https://custom-endpoint.tld', 'region' => 'eu-west-1', 'accessKeyId' => null, 'accessKeySecret' => null], null, $httpClient)),
+            Connection::fromDsn('sqs://default', ['endpoint' => 'https://custom-endpoint.tld', 'account' => 12345], $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
@@ -117,13 +117,15 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter
                 $clientConfiguration['region'] = $matches[1];
             }
             unset($query['sslmode']);
+        } elseif (self::DEFAULT_OPTIONS['endpoint'] !== $options['endpoint'] ?? self::DEFAULT_OPTIONS['endpoint']) {
+            $clientConfiguration['endpoint'] = $options['endpoint'];
         }
 
         $parsedPath = explode('/', ltrim($parsedUrl['path'] ?? '/', '/'));
         if (\count($parsedPath) > 0 && !empty($queueName = end($parsedPath))) {
             $configuration['queue_name'] = $queueName;
         }
-        $configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : null;
+        $configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : $options['account'] ?? self::DEFAULT_OPTIONS['account'];
 
         // check for extra keys in options
         $optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS));

Original file line number	Diff line number	Diff line change
`@@ -117,13 +117,15 @@ public static function fromDsn(string $dsn, array $options = [], HttpClientInter`
`117`	`117`	`$clientConfiguration['region'] = $matches[1];`
`118`	`118`	`}`
`119`	`119`	`unset($query['sslmode']);`
	`120`	`+ } elseif (self::DEFAULT_OPTIONS['endpoint'] !== $options['endpoint'] ?? self::DEFAULT_OPTIONS['endpoint']) {`
	`121`	`+ $clientConfiguration['endpoint'] = $options['endpoint'];`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`$parsedPath = explode('/', ltrim($parsedUrl['path'] ?? '/', '/'));`
`123`	`125`	`if (\count($parsedPath) > 0 && !empty($queueName = end($parsedPath))) {`
`124`	`126`	`$configuration['queue_name'] = $queueName;`
`125`	`127`	`}`
`126`		`- $configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : null;`
	`128`	`+ $configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : $options['account'] ?? self::DEFAULT_OPTIONS['account'];`
`127`	`129`
`128`	`130`	`// check for extra keys in options`
`129`	`131`	`$optionsExtraKeys = array_diff(array_keys($options), array_keys(self::DEFAULT_OPTIONS));`