MC-33297: ES validation fails during install on Cloud

Author: danielrenaud

app/code/Magento/Elasticsearch/Setup/ConnectionValidator.php

@@ -30,10 +30,10 @@ public function __construct(ClientResolver $clientResolver)
     /**
      * Checks Elasticsearch Connection
      *
-     * @param string $searchEngine
+     * @param string|null $searchEngine if empty, uses the currently configured engine
      * @return bool true if the connection succeeded, false otherwise
      */
-    public function validate(string $searchEngine): bool
+    public function validate(string $searchEngine = null): bool
     {
         try {
             $client = $this->clientResolver->create($searchEngine);

app/code/Magento/Elasticsearch/Setup/InstallConfig.php

@@ -63,7 +63,8 @@ public function configure(array $inputOptions)
             $configKey = $this->searchConfigMapping[$inputKey];
             $this->configWriter->save(self::CATALOG_SEARCH . $configKey, $inputValue);
         }
-        if (!$this->validator->validate($inputOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE])) {
+        $searchEngine = $inputOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE] ?? null;
+        if (!$this->validator->validate($searchEngine)) {
             throw new InputException(
                 __(
                     'Connection to Elasticsearch cannot be established. '

app/code/Magento/Search/Setup/CompositeInstallConfig.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Search\Setup;
 
+use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\InputException;
 
 /**
@@ -20,10 +22,17 @@ class CompositeInstallConfig implements InstallConfigInterface
     private $installConfigList;
 
     /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
      * @param InstallConfigInterface[] $installConfigList
      */
-    public function __construct(array $installConfigList)
+    public function __construct(ScopeConfigInterface $scopeConfig, array $installConfigList)
     {
+        $this->scopeConfig = $scopeConfig;
         $this->installConfigList = $installConfigList;
     }
 
@@ -32,7 +41,11 @@ public function __construct(array $installConfigList)
      */
     public function configure(array $inputOptions)
     {
-        $searchEngine = $inputOptions['search-engine'];
+        if (isset($inputOptions['search-engine'])) {
+            $searchEngine = $inputOptions['search-engine'];
+        } else {
+            $searchEngine = $this->scopeConfig->getValue(Custom::XML_PATH_CATALOG_SEARCH_ENGINE);
+        }
 
         if (!isset($this->installConfigList[$searchEngine])) {
             throw new InputException(__('Unable to configure search engine: %1', $searchEngine));

setup/src/Magento/Setup/Model/SearchConfig.php

@@ -50,12 +50,11 @@ public function saveConfiguration(array $inputOptions)
         $searchConfigOptions = $this->extractSearchOptions($inputOptions);
         if (!empty($searchConfigOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE])) {
             $this->validateSearchEngineSelection($searchConfigOptions);
-
-            try {
-                $this->installConfig->configure($searchConfigOptions);
-            } catch (InputException $e) {
-                throw new SetupException($e->getMessage());
-            }
+        }
+        try {
+            $this->installConfig->configure($searchConfigOptions);
+        } catch (InputException $e) {
+            throw new SetupException($e->getMessage());
         }
     }
 

setup/src/Magento/Setup/Model/SearchConfigOptionsList.php

@@ -8,7 +8,6 @@
 namespace Magento\Setup\Model;
 
 use Magento\Framework\Setup\Option\AbstractConfigOption;
-use Magento\Framework\Setup\Option\FlagConfigOption;
 use Magento\Framework\Setup\Option\SelectConfigOption;
 use Magento\Framework\Setup\Option\TextConfigOption;
 
@@ -51,28 +50,25 @@ public function getOptionsList(): array
                 SelectConfigOption::FRONTEND_WIZARD_SELECT,
                 array_keys($this->getAvailableSearchEngineList()),
                 '',
-                'Search engine. Values: ' . implode(', ', array_keys($this->getAvailableSearchEngineList())),
-                self::DEFAULT_SEARCH_ENGINE
+                'Search engine. Values: ' . implode(', ', array_keys($this->getAvailableSearchEngineList()))
             ),
             new TextConfigOption(
                 self::INPUT_KEY_ELASTICSEARCH_HOST,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 '',
-                'Elasticsearch server host.',
-                self::DEFAULT_ELASTICSEARCH_HOST
+                'Elasticsearch server host.'
             ),
             new TextConfigOption(
                 self::INPUT_KEY_ELASTICSEARCH_PORT,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 '',
-                'Elasticsearch server port.',
-                self::DEFAULT_ELASTICSEARCH_PORT
+                'Elasticsearch server port.'
             ),
-            new FlagConfigOption(
+            new TextConfigOption(
                 self::INPUT_KEY_ELASTICSEARCH_ENABLE_AUTH,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
                 '',
-                'Enable Elasticsearch HTTP authentication.',
-                null
+                'Set to 1 to enable authentication. (default is 0, disabled)'
             ),
             new TextConfigOption(
                 self::INPUT_KEY_ELASTICSEARCH_USERNAME,
@@ -90,15 +86,13 @@ public function getOptionsList(): array
                 self::INPUT_KEY_ELASTICSEARCH_INDEX_PREFIX,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 '',
-                'Elasticsearch index prefix.',
-                self::DEFAULT_ELASTICSEARCH_INDEX_PREFIX
+                'Elasticsearch index prefix.'
             ),
             new TextConfigOption(
                 self::INPUT_KEY_ELASTICSEARCH_TIMEOUT,
                 TextConfigOption::FRONTEND_WIZARD_TEXT,
                 '',
-                'Elasticsearch server timeout.',
-                self::DEFAULT_ELASTICSEARCH_TIMEOUT
+                'Elasticsearch server timeout.'
             )
         ];
     }