CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [0.10.10](https://github.com/php-enqueue/enqueue-dev/tree/0.10.10) (2021-03-24)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.9...0.10.10)
+
+**Merged pull requests:**
+
+- \[sns\] added possibility to define already existing topics \(prevent create topic call\) \#1022 [\#1147](https://github.com/php-enqueue/enqueue-dev/pull/1147) ([paramonov](https://github.com/paramonov))
+- \[gps\] Add support for consuming message from external publisher in non-standard format [\#1118](https://github.com/php-enqueue/enqueue-dev/pull/1118) ([maciejzgadzaj](https://github.com/maciejzgadzaj))
+
 ## [0.10.9](https://github.com/php-enqueue/enqueue-dev/tree/0.10.9) (2021-03-17)
 [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.8...0.10.9)
 

pkg/gps/GpsMessage.php

@@ -157,15 +157,11 @@ public function jsonSerialize(): array
     public static function jsonUnserialize(string $json): self
     {
         $data = json_decode($json, true);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException(sprintf(
-                'The malformed json given. Error %s and message %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+        if (\JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf('The malformed json given. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
-        return new self($data['body'], $data['properties'], $data['headers']);
+        return new self($data['body'] ?? $json, $data['properties'] ?? [], $data['headers'] ?? []);
     }
 
     public function getNativeMessage(): ?GoogleMessage

pkg/gps/Tests/GpsMessageTest.php

@@ -38,6 +38,31 @@ public function testCouldBeUnserializedFromJson()
         $this->assertEquals($message, $unserializedMessage);
     }
 
+    public function testMessageEntityCouldBeUnserializedFromJson()
+    {
+        $json = '{"body":"theBody","properties":{"thePropFoo":"thePropFooVal"},"headers":{"theHeaderFoo":"theHeaderFooVal"}}';
+
+        $unserializedMessage = GpsMessage::jsonUnserialize($json);
+
+        $this->assertInstanceOf(GpsMessage::class, $unserializedMessage);
+        $decoded = json_decode($json, true);
+        $this->assertEquals($decoded['body'], $unserializedMessage->getBody());
+        $this->assertEquals($decoded['properties'], $unserializedMessage->getProperties());
+        $this->assertEquals($decoded['headers'], $unserializedMessage->getHeaders());
+    }
+
+    public function testMessagePayloadCouldBeUnserializedFromJson()
+    {
+        $json = '{"theBodyPropFoo":"theBodyPropVal"}';
+
+        $unserializedMessage = GpsMessage::jsonUnserialize($json);
+
+        $this->assertInstanceOf(GpsMessage::class, $unserializedMessage);
+        $this->assertEquals($json, $unserializedMessage->getBody());
+        $this->assertEquals([], $unserializedMessage->getProperties());
+        $this->assertEquals([], $unserializedMessage->getHeaders());
+    }
+
     public function testThrowIfMalformedJsonGivenOnUnsterilizedFromJson()
     {
         $this->expectException(\InvalidArgumentException::class);

pkg/sns/SnsConnectionFactory.php

@@ -24,13 +24,14 @@ class SnsConnectionFactory implements ConnectionFactory
 
     /**
      * $config = [
-     *   'key' => null                AWS credentials. If no credentials are provided, the SDK will attempt to load them from the environment.
+     *   'key' => null,               AWS credentials. If no credentials are provided, the SDK will attempt to load them from the environment.
      *   'secret' => null,            AWS credentials. If no credentials are provided, the SDK will attempt to load them from the environment.
      *   'token' => null,             AWS credentials. If no credentials are provided, the SDK will attempt to load them from the environment.
      *   'region' => null,            (string, required) Region to connect to. See http://docs.aws.amazon.com/general/latest/gr/rande.html for a list of available regions.
      *   'version' => '2012-11-05',   (string, required) The version of the webservice to utilize
      *   'lazy' => true,              Enable lazy connection (boolean)
-     *   'endpoint' => null           (string, default=null) The full URI of the webservice. This is only required when connecting to a custom endpoint e.g. localstack
+     *   'endpoint' => null,          (string, default=null) The full URI of the webservice. This is only required when connecting to a custom endpoint e.g. localstack
+     *   'topic_arns' => [],          (array<string,string>) The list of existing topic arns: key - topic name; value - arn
      * ].
      *
      * or
@@ -132,6 +133,7 @@ private function parseDsn(string $dsn): array
             'version' => $dsn->getString('version'),
             'lazy' => $dsn->getBool('lazy'),
             'endpoint' => $dsn->getString('endpoint'),
+            'topic_arns' => $dsn->getArray('topic_arns', [])->toArray(),
         ]), function ($value) { return null !== $value; });
     }
 
@@ -145,6 +147,7 @@ private function defaultConfig(): array
             'version' => '2010-03-31',
             'lazy' => true,
             'endpoint' => null,
+            'topic_arns' => [],
         ];
     }
 }

pkg/sns/SnsContext.php

@@ -35,8 +35,7 @@ public function __construct(SnsClient $client, array $config)
     {
         $this->client = $client;
         $this->config = $config;
-
-        $this->topicArns = [];
+        $this->topicArns = $config['topic_arns'];
     }
 
     /**

pkg/sns/Tests/SnsConnectionFactoryConfigTest.php

@@ -64,6 +64,7 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => true,
                 'endpoint' => null,
+                'topic_arns' => [],
             ],
         ];
 
@@ -77,6 +78,7 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => true,
                 'endpoint' => null,
+                'topic_arns' => [],
             ],
         ];
 
@@ -90,6 +92,7 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => true,
                 'endpoint' => null,
+                'topic_arns' => [],
             ],
         ];
 
@@ -103,6 +106,7 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => false,
                 'endpoint' => null,
+                'topic_arns' => [],
             ],
         ];
 
@@ -116,6 +120,7 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => false,
                 'endpoint' => null,
+                'topic_arns' => [],
             ],
         ];
 
@@ -129,6 +134,7 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => false,
                 'endpoint' => null,
+                'topic_arns' => [],
             ],
         ];
 
@@ -148,6 +154,24 @@ public static function provideConfigs()
                 'version' => '2010-03-31',
                 'lazy' => false,
                 'endpoint' => 'http://localstack:1111',
+                'topic_arns' => [],
+            ],
+        ];
+
+        yield [
+            ['dsn' => 'sns:?topic_arns[topic1]=arn:aws:sns:us-east-1:123456789012:topic1&topic_arns[topic2]=arn:aws:sns:us-west-2:123456789012:topic2'],
+            [
+                'key' => null,
+                'secret' => null,
+                'token' => null,
+                'region' => null,
+                'version' => '2010-03-31',
+                'lazy' => true,
+                'endpoint' => null,
+                'topic_arns' => [
+                    'topic1' => 'arn:aws:sns:us-east-1:123456789012:topic1',
+                    'topic2' => 'arn:aws:sns:us-west-2:123456789012:topic2',
+                ],
             ],
         ];
     }

pkg/sns/Tests/SnsConnectionFactoryTest.php

@@ -33,6 +33,7 @@ public function testCouldBeConstructedWithEmptyConfiguration()
             'region' => null,
             'version' => '2010-03-31',
             'endpoint' => null,
+             'topic_arns' => [],
         ], 'config', $factory);
     }
 
@@ -48,6 +49,7 @@ public function testCouldBeConstructedWithCustomConfiguration()
             'region' => null,
             'version' => '2010-03-31',
             'endpoint' => null,
+             'topic_arns' => [],
         ], 'config', $factory);
     }
 

pkg/sns/Tests/Spec/SnsContextTest.php

@@ -20,6 +20,6 @@ protected function createContext()
     {
         $client = $this->createMock(SnsClient::class);
 
-        return new SnsContext($client, []);
+        return new SnsContext($client, ['topic_arns' => []]);
     }
 }