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

- Remove topic type from exchange in topology because topic is a default value of exchange type;

Author: adifucan

app/code/Magento/Catalog/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">
         <binding id="updateBinding" topic="product_action_attribute.update" destination="product_action_attribute.update"/>
         <binding id="updateBindingWebsite" topic="product_action_attribute.website.update" destination="product_action_attribute.website.update"/>
     </exchange>

app/code/Magento/ImportExport/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">
         <binding id="exportBinding" topic="import_export.export" destination="export"/>
     </exchange>
 </config>

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

@@ -7,7 +7,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">
         <binding id="MediaContentSynchronization" topic="media.content.synchronization" destination="media.content.synchronization"/>
     </exchange>
 </config>

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

@@ -7,7 +7,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">
         <binding id="MediaGalleryRenditions" topic="media.gallery.renditions.update" destination="media.gallery.renditions.update"/>
     </exchange>
 </config>

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

@@ -7,7 +7,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">
         <binding id="MediaGallerySynchronization" topic="media.gallery.synchronization" destination="media.gallery.synchronization"/>
     </exchange>
 </config>

app/code/Magento/MediaStorage/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">
         <binding id="imageResizeBinding" topic="media.storage.catalog.image.resize" destination="media.storage.catalog.image.resize"/>
     </exchange>
 </config>

app/code/Magento/MessageQueue/Setup/ConfigOptionsList.php

@@ -23,7 +23,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
      * Input key for the option
      */
     public const INPUT_KEY_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES ='consumers-wait-for-messages';
-    public const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='default-connection';
+    public const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='queue-default-connection';
 
     /**
      * Path to the values in the deployment config

app/code/Magento/SalesRule/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">
         <binding id="codegeneratorBinding" topic="sales_rule.codegenerator" destination="codegenerator"/>
         <binding id="couponUsageBinding" topic="sales.rule.update.coupon.usage" destination="sales.rule.update.coupon.usage"/>
     </exchange>

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" connection="amqp">
+    <exchange name="magento" connection="amqp">
         <binding id="async.operations.all" topic="async.#" destination="async.operations.all"/>
     </exchange>
 </config>

dev/tests/integration/etc/post-install-setup-command-config.php.dist

@@ -13,7 +13,7 @@ return [
             '--remote-storage-driver' => 'aws-s3',
             '--remote-storage-bucket' => 'myBucket',
             '--remote-storage-region' => 'us-east-1',
-            '--default-connection' => 'db'
+            '--queue-default-connection' => 'db'
         ]
     ]
     */