MC-33297: ES validation fails during install on Cloud

Author: danielrenaud

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Elasticsearch\Setup;
 
+use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Setup\Model\SearchConfigOptionsList;
@@ -36,18 +37,26 @@ class InstallConfig implements InstallConfigInterface
      */
     private $configWriter;
 
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitableConfig;
+
     /**
      * @param WriterInterface $configWriter
      * @param ConnectionValidator $validator
+     * @param ReinitableConfigInterface $reinitableConfig
      * @param array $searchConfigMapping
      */
     public function __construct(
         WriterInterface $configWriter,
         ConnectionValidator $validator,
+        ReinitableConfigInterface $reinitableConfig,
         array $searchConfigMapping = []
     ) {
         $this->configWriter = $configWriter;
         $this->validator = $validator;
+        $this->reinitableConfig = $reinitableConfig;
         $this->searchConfigMapping = array_merge($this->searchConfigMapping, $searchConfigMapping);
     }
 
@@ -63,6 +72,7 @@ public function configure(array $inputOptions)
             $configKey = $this->searchConfigMapping[$inputKey];
             $this->configWriter->save(self::CATALOG_SEARCH . $configKey, $inputValue);
         }
+        $this->reinitableConfig->reinit();
         $searchEngine = $inputOptions[SearchConfigOptionsList::INPUT_KEY_SEARCH_ENGINE] ?? null;
         if (!$this->validator->validate($searchEngine)) {
             throw new InputException(

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

@@ -112,4 +112,11 @@ public function testConfigureValidateFail()
 
         $this->installConfig->configure($inputOptions);
     }
+
+    public function testConfigureWithEmptyInput()
+    {
+        $this->configWriterMock->expects($this->never())->method('save');
+        $this->validatorMock->expects($this->once())->method('validate')->with(null)->willReturn(true);
+        $this->installConfig->configure([]);
+    }
 }

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

@@ -7,7 +7,6 @@
 
 namespace Magento\Setup\Test\Unit\Model;
 
-use Magento\Framework\Setup\Option\FlagConfigOption;
 use Magento\Framework\Setup\Option\SelectConfigOption;
 use Magento\Framework\Setup\Option\TextConfigOption;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -49,7 +48,7 @@ public function testGetOptionsList()
         $this->assertEquals('elasticsearch-port', $optionsList[2]->getName());
 
         $this->assertArrayHasKey(3, $optionsList);
-        $this->assertInstanceOf(FlagConfigOption::class, $optionsList[3]);
+        $this->assertInstanceOf(TextConfigOption::class, $optionsList[3]);
         $this->assertEquals('elasticsearch-enable-auth', $optionsList[3]->getName());
 
         $this->assertArrayHasKey(4, $optionsList);