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

- Make db as a default connection for integration and web api tests;

Author: adifucan

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

@@ -12,6 +12,7 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\Option\TextConfigOption;
 
 /**
  * Deployment configuration consumers options needed for Setup application
@@ -22,16 +23,19 @@ class ConfigOptionsList implements ConfigOptionsListInterface
      * Input key for the option
      */
     const INPUT_KEY_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES ='consumers-wait-for-messages';
+    const INPUT_KEY_QUEUE_DEFAULT_CONNECTION ='default-connection';
 
     /**
-     * Path to the value in the deployment config
+     * Path to the values in the deployment config
      */
     const CONFIG_PATH_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES = 'queue/consumers_wait_for_messages';
+    const CONFIG_PATH_QUEUE_DEFAULT_CONNECTION = 'queue/default_connection';
 
     /**
      * Default value
      */
     const DEFAULT_CONSUMERS_WAIT_FOR_MESSAGES = 1;
+    const DEFAULT_CONNECTION = 'db';
 
     /**
      * The available configuration values
@@ -54,6 +58,13 @@ public function getOptions()
                 'Should consumers wait for a message from the queue? 1 - Yes, 0 - No',
                 self::DEFAULT_CONSUMERS_WAIT_FOR_MESSAGES
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_QUEUE_DEFAULT_CONNECTION,
+                'Default queue connection. Can be db, amqp or a custom one.',
+                self::DEFAULT_CONNECTION
+            ),
         ];
     }
 
@@ -72,6 +83,13 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig)
             );
         }
 
+        if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION)) {
+            $configData->set(
+                self::CONFIG_PATH_QUEUE_DEFAULT_CONNECTION,
+                $data[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION]
+            );
+        }
+
         return [$configData];
     }
 
@@ -87,6 +105,16 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
             $errors[] = 'You can use only 1 or 0 for ' . self::INPUT_KEY_QUEUE_CONSUMERS_WAIT_FOR_MESSAGES . ' option';
         }
 
+        if ($this->isDataEmpty($options, self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION)) {
+            $errors[] = self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION . ' option cannot be empty';
+        }
+
+        if (!$this->isDataEmpty($options, self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION)
+            && !is_string($options[self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION])) {
+            $errors[] = 'You can use only string type variable for '
+                . self::INPUT_KEY_QUEUE_DEFAULT_CONNECTION . ' option';
+        }
+
         return $errors;
     }
 

dev/tests/api-functional/config/post-install-setup-command-config.php.dist

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

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

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

dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/ConsumerTest.php

@@ -8,7 +8,6 @@
 namespace Magento\ImportExport\Model\Export;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -46,11 +45,6 @@ class ConsumerTest extends TestCase
     /** @var string */
     private $filePath;
 
-    /**
-     * @var DeploymentConfig|null
-     */
-    private $deploymentConfig;
-
     /**
      * @inheritdoc
      */
@@ -64,7 +58,6 @@ protected function setUp(): void
         $this->consumer = $this->objectManager->get(Consumer::class);
         $filesystem = $this->objectManager->get(Filesystem::class);
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_IMPORT_EXPORT);
-        $this->deploymentConfig =  $this->objectManager->get(DeploymentConfig::class);
     }
 
     /**
@@ -89,7 +82,6 @@ protected function tearDown(): void
      */
     public function testProcess(): void
     {
-        echo "Deployment config for queue is: " . json_encode($this->deploymentConfig->get('queue'));
         $envelope = $this->queue->dequeue();
         $decodedMessage = $this->messageEncoder->decode('import_export.export', $envelope->getBody());
         $this->consumer->process($decodedMessage);

lib/internal/Magento/Framework/MessageQueue/DefaultValueProvider.php

@@ -59,10 +59,10 @@ public function getConnection()
         // get amqp or default_connection if it is set in deployment configuration
         // otherwise use db as a default connection
         if (isset($this->config)) {
-            if ($this->config->get('queue/amqp') && count($this->config->get('queue/amqp')) > 0) {
-                $this->connection = 'amqp';
-            } elseif ($this->config->get('queue/default_connection')) {
+            if ($this->config->get('queue/default_connection')) {
                 $this->connection = $this->config->get('queue/default_connection');
+            } elseif ($this->config->get('queue/amqp') && count($this->config->get('queue/amqp')) > 0) {
+                $this->connection = 'amqp';
             }
         }
         return $this->connection;