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

- Delete default_connection as a new option for setup:config:set;

Author: adifucan

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

@@ -12,7 +12,6 @@
 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
@@ -23,19 +22,16 @@ 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 values in the deployment config
+     * Path to the value 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
@@ -58,13 +54,6 @@ 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
-            ),
         ];
     }
 
@@ -83,13 +72,6 @@ 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];
     }
 
@@ -105,16 +87,6 @@ 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/integration/etc/post-install-setup-command-config.php.dist

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