From fc90a3b7c6444e5f792ae2b2783550260f645383 Mon Sep 17 00:00:00 2001 From: Juraj Surman Date: Tue, 21 Jul 2020 17:20:50 +0200 Subject: [PATCH] [Messenger] fix ignore account & endpoint options amazon sqs connection --- .../AmazonSqs/Tests/Transport/ConnectionTest.php | 10 ++++++++++ .../Bridge/AmazonSqs/Transport/Connection.php | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/ConnectionTest.php index 128ff60a0d00..447988ec8b04 100644 --- 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 index ba7d2f98b9a4..29bb1006fef7 100644 --- 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)); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy