Merge remote-tracking branch 'origin/MC-20710' into MC-19282-web-setup

Author: danielrenaud

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

@@ -63,30 +63,13 @@ public function configure(array $inputOptions)
             $configKey = $this->searchConfigMapping[$inputKey];
             $this->configWriter->save(self::CATALOG_SEARCH . $configKey, $inputValue);
         }
-
-        if ($this->doValidation($inputOptions)) {
-            if (!$this->validator->validate($inputOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE])) {
-                throw new InputException(
-                    __(
-                        'Connection to Elasticsearch cannot be established. '
-                        . 'Please check the configuration and try again.'
-                    )
-                );
-            }
-        }
-    }
-
-    /**
-     * Check if elasticsearch validation should be performed
-     *
-     * @param array $inputOptions
-     * @return bool
-     */
-    private function doValidation(array $inputOptions): bool
-    {
-        if (isset($inputOptions[SearchConfigOptionsList::INPUT_KEY_ELASTICSEARCH_SKIP_VALIDATION])) {
-            return !$inputOptions[SearchConfigOptionsList::INPUT_KEY_ELASTICSEARCH_SKIP_VALIDATION];
+        if (!$this->validator->validate($inputOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE])) {
+            throw new InputException(
+                __(
+                    'Connection to Elasticsearch cannot be established. '
+                    . 'Please check the configuration and try again.'
+                )
+            );
         }
-        return true;
     }
 }

app/code/Magento/Elasticsearch/Test/Unit/Setup/InstallConfigTest.php

@@ -112,30 +112,4 @@ public function testConfigureValidateFail()
 
         $this->installConfig->configure($inputOptions);
     }
-
-    public function testConfigureWithSkipValidation()
-    {
-        $inputOptions = [
-            'search-engine' => 'elasticsearch5',
-            'elasticsearch-host' => 'localhost',
-            'elasticsearch-port' => '9200',
-            'skip-elasticsearch-validation' => true
-        ];
-
-        $this->configWriterMock
-            ->expects($this->at(0))
-            ->method('save')
-            ->with('catalog/search/engine', 'elasticsearch5');
-        $this->configWriterMock
-            ->expects($this->at(1))
-            ->method('save')
-            ->with('catalog/search/elasticsearch5_server_hostname', 'localhost');
-        $this->configWriterMock
-            ->expects($this->at(2))
-            ->method('save')
-            ->with('catalog/search/elasticsearch5_server_port', '9200');
-        $this->validatorMock->expects($this->never())->method('validate');
-
-        $this->installConfig->configure($inputOptions);
-    }
 }

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

@@ -35,7 +35,7 @@ public function configure(array $inputOptions)
         $searchEngine = $inputOptions['search-engine'];
 
         if (!isset($this->installConfigList[$searchEngine])) {
-            throw new InputException(__('Unable to configure search engine: ' . $searchEngine));
+            throw new InputException(__('Unable to configure search engine: %1', $searchEngine));
         }
         $installConfig = $this->installConfigList[$searchEngine];
 

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
      */
@@ -30,7 +28,6 @@ class SearchConfigOptionsList
     const INPUT_KEY_ELASTICSEARCH_PASSWORD = 'elasticsearch-password';
     const INPUT_KEY_ELASTICSEARCH_INDEX_PREFIX = 'elasticsearch-index-prefix';
     const INPUT_KEY_ELASTICSEARCH_TIMEOUT = 'elasticsearch-timeout';
-    const INPUT_KEY_ELASTICSEARCH_SKIP_VALIDATION = 'skip-elasticsearch-validation';
 
     /**
      * Default values
@@ -52,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(
@@ -102,12 +99,6 @@ public function getOptionsList(): array
                 '',
                 'Elasticsearch server timeout.',
                 self::DEFAULT_ELASTICSEARCH_TIMEOUT
-            ),
-            new FlagConfigOption(
-                self::INPUT_KEY_ELASTICSEARCH_SKIP_VALIDATION,
-                '',
-                'Skip Elasticsearch connection validation.',
-                null
             )
         ];
     }

setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php

@@ -30,7 +30,7 @@ protected function setup()
     public function testGetOptionsList()
     {
         $optionsList = $this->searchConfigOptionsList->getOptionsList();
-        $this->assertCount(9, $optionsList);
+        $this->assertCount(8, $optionsList);
 
         $this->assertArrayHasKey(0, $optionsList);
         $this->assertInstanceOf(SelectConfigOption::class, $optionsList[0]);
@@ -67,9 +67,5 @@ public function testGetOptionsList()
         $this->assertArrayHasKey(7, $optionsList);
         $this->assertInstanceOf(TextConfigOption::class, $optionsList[7]);
         $this->assertEquals('elasticsearch-timeout', $optionsList[7]->getName());
-
-        $this->assertArrayHasKey(8, $optionsList);
-        $this->assertInstanceOf(FlagConfigOption::class, $optionsList[8]);
-        $this->assertEquals('skip-elasticsearch-validation', $optionsList[8]->getName());
     }
 }

setup/src/Magento/Setup/Test/Unit/Model/SearchConfigTest.php

@@ -112,7 +112,6 @@ public function installInputDataProvider()
                     'elasticsearch-enable-auth' => false,
                     'elasticsearch-index-prefix' => 'magento2',
                     'elasticsearch-timeout' => 15,
-                    'skip-elasticsearch-validation' => false,
                     'no-interaction' => false,
                 ],
                 'search' => [
@@ -122,7 +121,6 @@ public function installInputDataProvider()
                     'elasticsearch-enable-auth' => false,
                     'elasticsearch-index-prefix' => 'magento2',
                     'elasticsearch-timeout' => 15,
-                    'skip-elasticsearch-validation' => false,
                 ]
             ]
         ];