MC-33297: ES validation fails during install on Cloud

Author: danielrenaud

setup/src/Magento/Setup/Controller/ConfigureCatalogSearch.php

@@ -22,6 +22,22 @@ class ConfigureCatalogSearch extends AbstractActionController
      */
     private $searchConfigOptionsList;
 
+    /**
+     * Default values to prefill form
+     *
+     * @var array
+     */
+    private $prefillConfigValues = [
+        'engine' => 'elasticsearch7',
+        'elasticsearch' => [
+            'hostname' => 'localhost',
+            'port' => '9200',
+            'timeout' => '15',
+            'indexPrefix' => 'magento2',
+            'enableAuth' => false
+        ]
+    ];
+
     /**
      * @param SearchConfigOptionsList $searchConfigOptionsList
      */
@@ -51,17 +67,6 @@ public function indexAction(): ViewModel
      */
     public function defaultParametersAction(): JsonModel
     {
-        $defaults = [
-            'engine' => SearchConfigOptionsList::DEFAULT_SEARCH_ENGINE,
-            'elasticsearch' => [
-                'hostname' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_HOST,
-                'port' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_PORT,
-                'timeout' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_TIMEOUT,
-                'indexPrefix' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_INDEX_PREFIX,
-                'enableAuth' => false
-            ]
-        ];
-
-        return new JsonModel($defaults);
+        return new JsonModel($this->prefillConfigValues);
     }
 }

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

@@ -28,15 +28,6 @@ class SearchConfigOptionsList
     const INPUT_KEY_ELASTICSEARCH_INDEX_PREFIX = 'elasticsearch-index-prefix';
     const INPUT_KEY_ELASTICSEARCH_TIMEOUT = 'elasticsearch-timeout';
 
-    /**
-     * Default values
-     */
-    const DEFAULT_SEARCH_ENGINE = 'elasticsearch7';
-    const DEFAULT_ELASTICSEARCH_HOST = 'localhost';
-    const DEFAULT_ELASTICSEARCH_PORT = '9200';
-    const DEFAULT_ELASTICSEARCH_INDEX_PREFIX = 'magento2';
-    const DEFAULT_ELASTICSEARCH_TIMEOUT = 15;
-
     /**
      * Get options list for search engine configuration
      *

setup/src/Magento/Setup/Test/Unit/Controller/ConfigureCatalogSearchTest.php

@@ -50,12 +50,12 @@ public function testDefaultParametersAction()
         $this->assertInstanceOf(JsonModel::class, $jsonModel);
 
         $expectedDefaultParameters = [
-            'engine' => SearchConfigOptionsList::DEFAULT_SEARCH_ENGINE,
+            'engine' => 'elasticsearch7',
             'elasticsearch' => [
-                'hostname' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_HOST,
-                'port' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_PORT,
-                'timeout' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_TIMEOUT,
-                'indexPrefix' => SearchConfigOptionsList::DEFAULT_ELASTICSEARCH_INDEX_PREFIX,
+                'hostname' => 'localhost',
+                'port' => '9200',
+                'timeout' => '15',
+                'indexPrefix' => 'magento2',
                 'enableAuth' => false
             ]
         ];