snsqs client driver

ASKozienko · ASKozienko · commit d9fa5f4de2e3 · 2019-02-19T18:15:00.000+02:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,6 +32,7 @@ services:
       - GPS_DSN=gps:?projectId=mqdev&emulatorHost=http://google-pubsub:8085
       - SQS_DSN=sqs:?key=key&secret=secret&region=us-east-1&endpoint=http://localstack:4576&version=latest
       - SNS_DSN=sns:?key=key&secret=secret&region=us-east-1&endpoint=http://localstack:4575&version=latest
+      - SNSQS_DSN=snsqs:?key=key&secret=secret&region=us-east-1&sns_endpoint=http://localstack:4575&sqs_endpoint=http://localstack:4576&version=latest
       - WAMP_DSN=wamp://thruway:9090
       - REDIS_HOST=redis
       - REDIS_PORT=6379
diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
@@ -136,6 +136,15 @@ public function provideEnqueueConfigs()
                 'transport' => getenv('MONGO_DSN'),
             ],
         ]];
+
+        yield 'snsqs' => [[
+            'default' => [
+                'transport' => [
+                    'dsn' => getenv('SNSQS_DSN'),
+                ],
+            ],
+        ]];
+
 //
 //        yield 'gps' => [[
 //            'transport' => [
diff --git a/pkg/enqueue/Resources.php b/pkg/enqueue/Resources.php
@@ -14,6 +14,7 @@
 use Enqueue\Pheanstalk\PheanstalkConnectionFactory;
 use Enqueue\RdKafka\RdKafkaConnectionFactory;
 use Enqueue\Redis\RedisConnectionFactory;
+use Enqueue\SnsQs\SnsQsConnectionFactory;
 use Enqueue\Sqs\SqsConnectionFactory;
 use Enqueue\Stomp\StompConnectionFactory;
 use Enqueue\Wamp\WampConnectionFactory;
@@ -155,7 +156,7 @@ public static function getKnownConnections(): array
                 'schemes' => ['sqs'],
                 'supportedSchemeExtensions' => [],
                 'package' => 'enqueue/sqs', ];
-            $map[SqsConnectionFactory::class] = [
+            $map[SnsQsConnectionFactory::class] = [
                 'schemes' => ['snsqs'],
                 'supportedSchemeExtensions' => [],
                 'package' => 'enqueue/snsqs', ];
diff --git a/pkg/snsqs/SnsQsConnectionFactory.php b/pkg/snsqs/SnsQsConnectionFactory.php
@@ -35,8 +35,16 @@ class SnsQsConnectionFactory implements ConnectionFactory
      *
      * or
      *
+     * $config = [
+     *   'sns_key' => null,           SNS option
+     *   'sqs_secret' => null,        SQS option
+     *   'token'                      Option for both SNS and SQS
+     * ].
+     *
+     * or
+     *
      * snsqs:
-     * snsqs:?key=aKey&secret=aSecret&token=aToken
+     * snsqs:?key=aKey&secret=aSecret&sns_token=aSnsToken&sqs_token=aSqsToken
      *
      * @param array|string|null $config
      */
@@ -51,17 +59,7 @@ public function __construct($config = 'snsqs:')
             if (array_key_exists('dsn', $config)) {
                 $this->parseDsn($config['dsn']);
             } else {
-                if (array_key_exists('sns', $config)) {
-                    $this->snsConfig = $config['sns'];
-                } else {
-                    $this->snsConfig = $config;
-                }
-
-                if (array_key_exists('sqs', $config)) {
-                    $this->sqsConfig = $config['sqs'];
-                } else {
-                    $this->sqsConfig = $config;
-                }
+                $this->parseOptions($config);
             }
         } else {
             throw new \LogicException(sprintf('The config must be either an array of options, a DSN string, null or instance of %s', AwsSnsClient::class));
@@ -91,7 +89,29 @@ private function parseDsn(string $dsn): void
             ));
         }
 
-        $this->snsConfig = 'sns:?'.$dsn->getQueryString();
-        $this->sqsConfig = 'sqs:?'.$dsn->getQueryString();
+        $this->parseOptions($dsn->getQuery());
+    }
+
+    private function parseOptions(array $options): void
+    {
+        // set default options
+        foreach ($options as $key => $value) {
+            if (false === in_array(substr($key, 0, 4), ['sns_', 'sqs_'])) {
+                $this->snsConfig[$key] = $value;
+                $this->sqsConfig[$key] = $value;
+            }
+        }
+
+        // set transport specific options
+        foreach ($options as $key => $value) {
+            switch (substr($key, 0, 4)) {
+                case 'sns_':
+                    $this->snsConfig[substr($key, 4)] = $value;
+                    break;
+                case 'sqs_':
+                    $this->sqsConfig[substr($key, 4)] = $value;
+                    break;
+            }
+        }
     }
 }
diff --git a/pkg/test/SnsQsExtension.php b/pkg/test/SnsQsExtension.php
@@ -9,13 +9,10 @@ trait SnsQsExtension
 {
     private function buildSnsQsContext(): SnsQsContext
     {
-        $snsDsn = getenv('SNS_DSN');
-        $sqsDsn = getenv('SQS_DSN');
-
-        if (false == $snsDsn || false == $sqsDsn) {
+        if (false == $dsn = getenv('SNSQS_DSN')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
-        return (new SnsQsConnectionFactory(['sns' => $snsDsn, 'sqs' => $sqsDsn]))->createContext();
+        return (new SnsQsConnectionFactory($dsn))->createContext();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,10 @@ trait SnsQsExtension`
`9`	`9`	`{`
`10`	`10`	`private function buildSnsQsContext(): SnsQsContext`
`11`	`11`	`{`
`12`		`- $snsDsn = getenv('SNS_DSN');`
`13`		`- $sqsDsn = getenv('SQS_DSN');`
`14`		`-`
`15`		`- if (false == $snsDsn \|\| false == $sqsDsn) {`
	`12`	`+ if (false == $dsn = getenv('SNSQS_DSN')) {`
`16`	`13`	`throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');`
`17`	`14`	`}`
`18`	`15`
`19`		`- return (new SnsQsConnectionFactory(['sns' => $snsDsn, 'sqs' => $sqsDsn]))->createContext();`
	`16`	`+ return (new SnsQsConnectionFactory($dsn))->createContext();`
`20`	`17`	`}`
`21`	`18`	`}`