B2B-2171: Enable WebapiAsync work with redis connection

Author: joanhe

app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Consumer.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\AsynchronousOperations\Model\ConfigInterface as WebApiAsyncConfig;
+
+/**
+ * Remote service reader with auto generated configuration for queue_consumer.xml
+ */
+class Consumer implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * Generate consumer configuration based on remote services declarations
+     *
+     * @param string|null $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $result = [];
+        $topicName = 'async.operations.all';
+        $result[$topicName] =
+            [
+                'name'             => $topicName,
+                'queue'            => $topicName,
+                'consumerInstance' => WebApiAsyncConfig::DEFAULT_CONSUMER_INSTANCE,
+                'connection'       => WebApiAsyncConfig::DEFAULT_CONSUMER_CONNECTION,
+                'maxMessages'      => WebApiAsyncConfig::DEFAULT_CONSUMER_MAX_MESSAGE,
+                'handlers'         => [],
+                'maxIdleTime'      => null,
+                'sleep'            => null,
+                'onlySpawnWhenMessageAvailable' => null
+            ];
+
+        return $result;
+    }
+}

app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Publisher.php

@@ -60,8 +60,8 @@ public function read($scope = null)
                     'topic'       => $topicName,
                     'disabled'    => false,
                     'connections' => [
-                        $this->defaultValueProvider->getConnection() => [
-                            'name'     => $this->defaultValueProvider->getConnection(),
+                        $this->getConnection() => [
+                            'name'     => $this->getConnection(),
                             'exchange' => 'magento',
                             'disabled' => false,
                         ],
@@ -71,4 +71,16 @@ public function read($scope = null)
 
         return $result;
     }
+
+    /**
+     * Get connection
+     *
+     * @return string
+     */
+    private function getConnection()
+    {
+        $connection = $this->defaultValueProvider->getConnection();
+        // if db connection, return amqp instead.
+        return $connection === 'db' ? WebApiAsyncConfig::DEFAULT_CONSUMER_CONNECTION : $connection;
+    }
 }

app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Topology.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\AsynchronousOperations\Model\ConfigInterface as WebApiAsyncConfig;
+use Magento\Framework\MessageQueue\DefaultValueProvider;
+
+/**
+ * Remote service reader with auto generated configuration for queue_topology.xml
+ */
+class Topology implements \Magento\Framework\Config\ReaderInterface
+{
+    /**
+     * @var DefaultValueProvider
+     */
+    private $defaultValueProvider;
+
+    /**
+     * @param DefaultValueProvider $defaultValueProvider
+     */
+    public function __construct(
+        DefaultValueProvider $defaultValueProvider
+    ) {
+        $this->defaultValueProvider = $defaultValueProvider;
+    }
+
+    /**
+     * Generate topology configuration based on remote services declarations
+     *
+     * @param string|null $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $bindings = [];
+        $destinationType = 'queue';
+        $topic = 'async.#';
+        $destination = 'async.operations.all';
+        $bindingId = $destinationType . '--' . $destination . '--' . $topic;
+        $bindings[$bindingId] = [
+            'id'              => $bindingId,
+            'topic'           => $topic,
+            'destinationType' => $destinationType,
+            'destination'     => $destination,
+            'disabled'        => false,
+            'arguments'       => [],
+        ];
+
+        $name = 'magento';
+        $connection = $this->getConnection();
+        $result[$name . '--' . $connection] = [
+            'name'       => $name,
+            'type'       => 'topic',
+            'connection' => $connection,
+            'durable'    => true,
+            'autoDelete' => false,
+            'arguments'  => [],
+            'internal'   => false,
+            'bindings'   => $bindings,
+        ];
+
+        return $result;
+    }
+
+    /**
+     * Get connection
+     *
+     * @return string
+     */
+    private function getConnection()
+    {
+        $connection = $this->defaultValueProvider->getConnection();
+        // if db connection, return amqp instead.
+        return $connection === 'db' ? WebApiAsyncConfig::DEFAULT_CONSUMER_CONNECTION : $connection;
+    }
+}

app/code/Magento/WebapiAsync/etc/queue_consumer.xml

@@ -1682,6 +1682,7 @@
     <type name="Magento\Framework\MessageQueue\Consumer\Config\CompositeReader">
         <arguments>
             <argument name="readers" xsi:type="array">
+                <item name="asyncServiceReader" xsi:type="object" sortOrder="0">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Consumer</item>
                 <item name="xmlReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Consumer\Config\Xml\Reader</item>
                 <item name="envReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Consumer\Config\Env\Reader</item>
             </argument>
@@ -1727,6 +1728,7 @@
     <type name="Magento\Framework\MessageQueue\Topology\Config\CompositeReader">
         <arguments>
             <argument name="readers" xsi:type="array">
+                <item name="asyncServiceReader" xsi:type="object" sortOrder="0">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Topology</item>
                 <item name="remoteServiceReader" xsi:type="object" sortOrder="10">Magento\Framework\MessageQueue\Topology\Config\RemoteService\Reader</item>
                 <item name="xmlReader" xsi:type="object" sortOrder="20">Magento\Framework\MessageQueue\Topology\Config\Xml\Reader</item>
             </argument>

app/code/Magento/WebapiAsync/etc/queue_topology.xml

@@ -16,5 +16,9 @@ return [
             '--remote-storage-region' => 'us-east-1'
             */
         ]
+    ],
+    [
+        'command' => 'setup:upgrade',
+        'config' => []
     ]
 ];