MCP-826: Use RabbitMQ for all consumers if AMQP is set in deployment config

- Switch web API async to amqp connection;

Author: adifucan

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

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-    <consumer name="async.operations.all" queue="async.operations.all"
+    <consumer name="async.operations.all" queue="async.operations.all" connection="amqp"
               consumerInstance="Magento\AsynchronousOperations\Model\MassConsumer"/>
 </config>

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

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
-    <exchange name="magento" type="topic">
+    <exchange name="magento" type="topic" connection="amqp">
         <binding id="async.operations.all" topic="async.#" destination="async.operations.all"/>
     </exchange>
 </config>

dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue.xml

@@ -13,10 +13,10 @@
     <broker topic="deprecated.config.async.bool.topic" type="db" exchange="deprecatedExchange">
         <queue consumer="deprecatedConfigAsyncBoolConsumer" name="deprecated.config.queue.2" />
     </broker>
-    <broker topic="deprecated.config.sync.bool.topic" type="amqp" exchange="customExchange">
+    <broker topic="deprecated.config.sync.bool.topic" type="db" exchange="customExchange">
         <queue consumer="deprecatedConfigSyncBoolConsumer" name="deprecated.config.queue.4"/>
     </broker>
-    <broker topic="overlapping.topic.declaration" type="amqp" exchange="overlappingDeprecatedExchange">
+    <broker topic="overlapping.topic.declaration" type="db" exchange="overlappingDeprecatedExchange">
         <queue consumer="overlappingConsumerDeclaration" name="consumer.config.queue" consumerInstance="Magento\Framework\MessageQueue\BatchConsumer" maxMessages="222" handler="Magento\TestModuleMessageQueueConfiguration\AsyncHandler::methodWithMixedParam"/>
     </broker>
 </config>

dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/etc/queue_topology.xml

@@ -39,7 +39,7 @@
         <binding id="wildcard2" destination="topic-queue2" destinationType="queue" topic="*.*.*" />
     </exchange>
 
-    <exchange name="overlappingDeprecatedExchange" type="topic" connection="amqp">
+    <exchange name="overlappingDeprecatedExchange" type="topic" connection="db">
         <binding id="binding1" topic="overlapping.topic.declaration" destinationType="queue" destination="topology.config.queue" />
         <binding id="binding2" topic="deprecated.config.async.string.topic" destinationType="queue" destination="topology.config.queue" />
     </exchange>

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/ConfigTest.php

@@ -59,7 +59,7 @@ public function testGetConsumerWithDefaultValues()
 
         $this->assertEquals('consumer5', $consumer->getName());
         $this->assertEquals('queue5', $consumer->getQueue());
-        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals('db', $consumer->getConnection());
         $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
         $this->assertNull($consumer->getMaxMessages());
         $handlers = $consumer->getHandlers();

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Consumer/DeprecatedConfigTest.php

@@ -53,7 +53,7 @@ public function testGetConsumerCustomHandler()
 
         $this->assertEquals('deprecatedConfigAsyncMixedConsumer', $consumer->getName());
         $this->assertEquals('deprecated.config.queue.3', $consumer->getQueue());
-        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals('db', $consumer->getConnection());
         $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
         $this->assertNull($consumer->getMaxMessages());
 
@@ -72,7 +72,7 @@ public function testGetConsumerCustomConnectionSync()
 
         $this->assertEquals('deprecatedConfigSyncBoolConsumer', $consumer->getName());
         $this->assertEquals('deprecated.config.queue.4', $consumer->getQueue());
-        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals('db', $consumer->getConnection());
         $this->assertEquals(\Magento\Framework\MessageQueue\ConsumerInterface::class, $consumer->getConsumerInstance());
         $this->assertNull($consumer->getMaxMessages());
 
@@ -91,7 +91,7 @@ public function testGetConsumerCustomConsumerAndMaxMessages()
 
         $this->assertEquals('deprecatedConfigAsyncStringConsumer', $consumer->getName());
         $this->assertEquals('deprecated.config.queue.1', $consumer->getQueue());
-        $this->assertEquals('amqp', $consumer->getConnection());
+        $this->assertEquals('db', $consumer->getConnection());
         $this->assertEquals(\Magento\Framework\MessageQueue\BatchConsumer::class, $consumer->getConsumerInstance());
         $this->assertEquals(200, $consumer->getMaxMessages());
 

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/ConfigTest.php

@@ -70,7 +70,7 @@ public function testGetPublishersWithoutEnabledConnection()
 
         /** @var \Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface $connection */
         $connection = $publisher->getConnection();
-        $this->assertEquals('amqp', $connection->getName(), 'Incorrect default connection name');
+        $this->assertEquals('db', $connection->getName(), 'Incorrect default connection name');
         $this->assertEquals('magento', $connection->getExchange(), 'Incorrect default exchange name');
         $this->assertFalse($connection->isDisabled(), 'Incorrect connection status');
     }

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/Publisher/DeprecatedConfigTest.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\MessageQueue\Publisher;
 
-use Magento\Framework\MessageQueue\Publisher\Config\PublisherConnectionInterface;
-
 /**
  * Test access to publisher configuration declared in deprecated queue.xml configs using Publisher\ConfigInterface.
  *
@@ -33,7 +31,7 @@ public function testGetPublisher()
         $this->assertFalse($publisher->isDisabled());
 
         $connection = $publisher->getConnection();
-        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('db', $connection->getName());
         $this->assertEquals('magento', $connection->getExchange());
         $this->assertFalse($connection->isDisabled());
     }
@@ -47,7 +45,7 @@ public function testGetPublisherCustomConnection()
         $this->assertFalse($publisher->isDisabled());
 
         $connection = $publisher->getConnection();
-        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('db', $connection->getName());
         $this->assertEquals('customExchange', $connection->getExchange());
         $this->assertFalse($connection->isDisabled());
     }
@@ -61,7 +59,7 @@ public function testGetOverlapWithQueueConfig()
         $this->assertFalse($publisher->isDisabled());
 
         $connection = $publisher->getConnection();
-        $this->assertEquals('amqp', $connection->getName());
+        $this->assertEquals('db', $connection->getName());
         $this->assertEquals('magento', $connection->getExchange());
         $this->assertFalse($connection->isDisabled());
     }