MC-33297: ES validation fails during install on Cloud

Author: danielrenaud

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

@@ -7,9 +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;
+use Magento\Framework\Search\EngineResolverInterface;
 
 /**
  * Composite object uses the proper InstallConfigInterface implementation for the engine being configured
@@ -22,17 +21,19 @@ class CompositeInstallConfig implements InstallConfigInterface
     private $installConfigList;
 
     /**
-     * @var ScopeConfigInterface
+     * @var EngineResolverInterface
      */
-    private $scopeConfig;
+    private $engineResolver;
 
     /**
-     * @param ScopeConfigInterface $scopeConfig
+     * @param EngineResolverInterface $engineResolver
      * @param InstallConfigInterface[] $installConfigList
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, array $installConfigList)
-    {
-        $this->scopeConfig = $scopeConfig;
+    public function __construct(
+        EngineResolverInterface $engineResolver,
+        array $installConfigList
+    ) {
+        $this->engineResolver = $engineResolver;
         $this->installConfigList = $installConfigList;
     }
 
@@ -44,7 +45,7 @@ public function configure(array $inputOptions)
         if (isset($inputOptions['search-engine'])) {
             $searchEngine = $inputOptions['search-engine'];
         } else {
-            $searchEngine = $this->scopeConfig->getValue(Custom::XML_PATH_CATALOG_SEARCH_ENGINE);
+            $searchEngine = $this->engineResolver->getCurrentSearchEngine();
         }
 
         if (!isset($this->installConfigList[$searchEngine])) {

setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php

@@ -18,6 +18,7 @@
 use Magento\Framework\Config\ConfigOptionsListConstants as SetupConfigOptionsList;
 use Magento\Setup\Model\StoreConfigurationDataMapper;
 use Magento\Setup\Console\Command\AdminUserCreateCommand;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -30,42 +31,42 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
     private $input;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|InstallCommand
+     * @var MockObject|InstallCommand
      */
     private $command;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\InstallerFactory
+     * @var MockObject|\Magento\Setup\Model\InstallerFactory
      */
     private $installerFactory;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\Installer
+     * @var MockObject|\Magento\Setup\Model\Installer
      */
     private $installer;
 
     /**
-     * @var Application|\PHPUnit_Framework_MockObject_MockObject
+     * @var Application|MockObject
      */
     private $applicationMock;
 
     /**
-     * @var HelperSet|\PHPUnit_Framework_MockObject_MockObject
+     * @var HelperSet|MockObject
      */
     private $helperSetMock;
 
     /**
-     * @var InputDefinition|\PHPUnit_Framework_MockObject_MockObject
+     * @var InputDefinition|MockObject
      */
     private $definitionMock;
 
     /**
-     * @var ConfigImportCommand|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigImportCommand|MockObject
      */
     private $configImportMock;
 
     /**
-     * @var AdminUserCreateCommand|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdminUserCreateCommand|MockObject
      */
     private $adminUserMock;
 

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

@@ -8,10 +8,10 @@
 namespace Magento\Setup\Test\Unit\Controller;
 
 use Laminas\View\Model\JsonModel;
+use Laminas\View\Model\ViewModel;
 use Magento\Setup\Controller\ConfigureCatalogSearch;
 use Magento\Setup\Model\SearchConfigOptionsList;
 use PHPUnit\Framework\TestCase;
-use Zend\View\Model\ViewModel;
 
 class ConfigureCatalogSearchTest extends TestCase
 {