[sns] fixed topic arns parse

Igor Paramonov · Igor Paramonov · commit 9730b80b6cd0 · 2021-03-18T13:38:14.000+02:00
diff --git a/pkg/sns/SnsConnectionFactory.php b/pkg/sns/SnsConnectionFactory.php
@@ -60,6 +60,9 @@ public function __construct($config = 'sns:')
 
                 unset($config['dsn']);
             }
+            if (\array_key_exists('topic_arns', $config) && \is_string($config['topic_arns'])) {
+                $config['topic_arns'] = $this->extractTopicArns($config['topic_arns']);
+            }
         } else {
             throw new \LogicException(\sprintf('The config must be either an array of options, a DSN string, null or instance of %s', AwsSnsClient::class));
         }
@@ -133,12 +136,30 @@ private function parseDsn(string $dsn): array
             'version' => $dsn->getString('version'),
             'lazy' => $dsn->getBool('lazy'),
             'endpoint' => $dsn->getString('endpoint'),
-            'topic_arns' => ($topicArns = $dsn->getString('topic_arns'))
-                ? array_filter(explode(',', $topicArns))
-                : [],
+            'topic_arns' => $this->extractTopicArns($dsn->getString('topic_arns')),
         ]), function ($value) { return null !== $value; });
     }
 
+    private function extractTopicArns(?string $topicArns): array
+    {
+        if (!$topicArns) {
+            return [];
+        }
+
+        return array_column(
+            array_map(function ($topic) {
+                list ($name, $arn) = explode('|', $topic);
+
+                return [
+                    'name' => $name,
+                    'arn' => $arn,
+                ];
+            }, explode(';', $topicArns)),
+            'arn',
+            'name'
+        );
+    }
+
     private function defaultConfig(): array
     {
         return [
diff --git a/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php b/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php
@@ -159,7 +159,7 @@ public static function provideConfigs()
         ];
 
         yield [
-            ['dsn' => 'sns:?topic_arns=arn:aws:sns:us-east-1:123456789012:topic1,arn:aws:sns:us-west-2:123456789012:topic2'],
+            ['dsn' => 'sns:?topic_arns=topic1|arn:aws:sns:us-east-1:123456789012:topic1;topic2|arn:aws:sns:us-west-2:123456789012:topic2'],
             [
                 'key' => null,
                 'secret' => null,
@@ -169,8 +169,8 @@ public static function provideConfigs()
                 'lazy' => true,
                 'endpoint' => null,
                 'topic_arns' => [
-                    'arn:aws:sns:us-east-1:123456789012:topic1',
-                    'arn:aws:sns:us-west-2:123456789012:topic2',
+                    'topic1' => 'arn:aws:sns:us-east-1:123456789012:topic1',
+                    'topic2' => 'arn:aws:sns:us-west-2:123456789012:topic2',
                 ],
             ],
         ];
