MC-20710: Add Elasticsearch configuration parameters to console

Author: danielrenaud

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

@@ -69,7 +69,8 @@ private function validateSearchEngineSelection(array $searchOptions)
     {
         if (isset($searchOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE])) {
             $selectedEngine = $searchOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE];
-            if (!in_array($selectedEngine, SearchConfigOptionsList::AVAILABLE_SEARCH_ENGINES)) {
+            $availableEngines = $this->searchConfigOptionsList->getAvailableSearchEngineList();
+            if (!isset($availableEngines[$selectedEngine])) {
                 throw new SetupException("Search engine '{$selectedEngine}' is not an available search engine.");
             }
         }

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

@@ -17,8 +17,6 @@
  */
 class SearchConfigOptionsList
 {
-    const AVAILABLE_SEARCH_ENGINES = ['elasticsearch5', 'elasticsearch6', 'elasticsearch7'];
-
     /**
      * Input key for the options
      */
@@ -51,9 +49,9 @@ public function getOptionsList(): array
             new SelectConfigOption(
                 self::INPUT_KEY_SEARCH_ENGINE,
                 SelectConfigOption::FRONTEND_WIZARD_SELECT,
-                self::AVAILABLE_SEARCH_ENGINES,
+                array_keys($this->getAvailableSearchEngineList()),
                 '',
-                'Search engine.',
+                'Search engine. Values: ' . implode(', ', array_keys($this->getAvailableSearchEngineList())),
                 self::DEFAULT_SEARCH_ENGINE
             ),
             new TextConfigOption(
@@ -104,4 +102,18 @@ public function getOptionsList(): array
             )
         ];
     }
+
+    /**
+     * Get UI friendly list of available search engines
+     *
+     * @return array
+     */
+    public function getAvailableSearchEngineList(): array
+    {
+        return [
+            'elasticsearch5' => 'Elasticsearch 5.x (deprecated)',
+            'elasticsearch6' => 'Elasticsearch 6.x',
+            'elasticsearch7' => 'Elasticsearch 7.x'
+        ];
+    }
 }