Merge branch 'master-codemonauts' into feature/sqs-fifo

# Conflicts:
#	CHANGELOG.md

Author: alexkart

CHANGELOG.md

@@ -19,6 +19,7 @@ Yii2 Queue Extension Change Log
 - Enh #318: Added check result call function flock (evaldemar)
 - Enh: Job execution result is now forwarded to the event handler (zhuravljov)
 - Enh: `ErrorEvent` was marked as deprecated (zhuravljov)
+- Enh: Add AWS SQS FIFO support (kringkaste)
 
 2.1.0 May 24, 2018
 ------------------

docs/guide/driver-sqs.md

@@ -5,7 +5,7 @@ The driver uses AWS SQS to store queue data.
 
 You have to add `aws/aws-sdk-php` extension to your application in order to use it.
 
-Configuration example:
+Configuration example for standard queues:
 
 ```php
 return [
@@ -24,6 +24,30 @@ return [
 ];
 ```
 
+Configuration example for FIFO queues:
+
+```php
+return [
+    'bootstrap' => [
+        'queue', // The component registers own console commands
+    ],
+    'components' => [
+        'queue' => [
+            'class' => \yii\queue\sqs\Queue::class,
+            'url' => '<sqs url>',
+            'key' => '<key>',
+            'secret' => '<secret>',
+            'region' => '<region>',
+            'messageGroupId' => '<Group ID>',
+        ],
+    ],
+];
+```
+
+The message group ID is required by SQS for FIFO queues. You can configure your own or use the "default" value.
+
+The deduplication ID is generated automatically, so no matter if you have activated content-based deduplication in the SQS queue or not, this ID will be used.
+
 Console
 -------
 

src/drivers/sqs/Queue.php

@@ -46,6 +46,11 @@ class Queue extends CliQueue
      * @var string
      */
     public $version = 'latest';
+    /**
+     * Message Group ID for FIFO queues.
+     * @var string
+     */
+    public $messageGroupId = 'default';
     /**
      * @var string command class name
      * @inheritdoc
@@ -172,7 +177,7 @@ protected function pushMessage($message, $ttr, $delay, $priority)
             throw new NotSupportedException('Priority is not supported in this driver');
         }
 
-        $response = $this->getClient()->sendMessage([
+        $request = [
             'QueueUrl' => $this->url,
             'MessageBody' => $message,
             'DelaySeconds' => $delay,
@@ -182,7 +187,14 @@ protected function pushMessage($message, $ttr, $delay, $priority)
                     'StringValue' => $ttr,
                 ],
             ],
-        ]);
+        ];
+
+        if (substr($this->url, -5) === '.fifo') {
+            $request['MessageGroupId'] = $this->messageGroupId;
+            $request['MessageDeduplicationId'] = hash('sha256', $message);
+        }
+
+        $response = $this->getClient()->sendMessage($request);
         return $response['MessageId'];
     }