B2B-1785: Cannot enable remote storage with install command when modules are not enabled

- Address feedback

Author: danmooney2

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

@@ -55,7 +55,7 @@
 use Magento\Setup\Module\SetupFactory;
 use Magento\Setup\Validator\DbValidator;
 use Magento\Store\Model\Store;
-use Magento\RemoteStorage\Setup\ConfigOptionsList as FileStorageValidator;
+use Magento\RemoteStorage\Setup\ConfigOptionsList as RemoteFileStorageValidator;
 
 /**
  * Class Installer contains the logic to install Magento application.
@@ -357,7 +357,11 @@ public function install($request)
         }
         $script[] = ['Installing database schema:', 'installSchema', [$request]];
         $script[] = ['Installing search configuration...', 'installSearchConfiguration', [$request]];
-        $script[] = ['Validating file storage configuration...', 'validateFileStorageConfiguration', [$request]];
+        $script[] = [
+            'Validating remote file storage configuration...',
+            'validateRemoteFileStorageConfiguration',
+            [$request]
+        ];
         $script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
         $script[] = ['Enabling caches:', 'updateCaches', [true]];
         $script[] = ['Installing data...', 'installDataFixtures', [$request]];
@@ -1208,10 +1212,10 @@ public function installSearchConfiguration($data)
      * @throws ValidationException
      * @throws Exception
      */
-    public function validateFileStorageConfiguration(array $data)
+    public function validateRemoteFileStorageConfiguration(array $data)
     {
-        $fileStorageValidator = $this->objectManagerProvider->get()->get(FileStorageValidator::class);
-        $validationErrors = $fileStorageValidator->validate($data, $this->deploymentConfig);
+        $remoteFileStorageValidator = $this->objectManagerProvider->get()->get(RemoteFileStorageValidator::class);
+        $validationErrors = $remoteFileStorageValidator->validate($data, $this->deploymentConfig);
 
         if (!empty($validationErrors)) {
             throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));

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

@@ -53,7 +53,7 @@
     use PHPUnit\Framework\MockObject\MockObject;
     use PHPUnit\Framework\TestCase;
     use Magento\Setup\Model\SearchConfig;
-    use Magento\RemoteStorage\Setup\ConfigOptionsList as FileStorageValidator;
+    use Magento\RemoteStorage\Setup\ConfigOptionsList as RemoteFileStorageValidator;
 
     /**
      * @SuppressWarnings(PHPMD.TooManyFields)
@@ -353,7 +353,7 @@ public function testInstall(array $request, array $logMessages)
             $registry = $this->createMock(Registry::class);
             $searchConfigMock = $this->getMockBuilder(SearchConfig::class)->disableOriginalConstructor()->getMock();
 
-            $fileStorageValidatorMock = $this->getMockBuilder(FileStorageValidator::class)
+            $remoteFileStorageValidatorMock = $this->getMockBuilder(RemoteFileStorageValidator::class)
                 ->disableOriginalConstructor()
                 ->getMock();
 
@@ -390,7 +390,7 @@ public function testInstall(array $request, array $logMessages)
                     [DeclarationInstaller::class, $this->declarationInstallerMock],
                     [Registry::class, $registry],
                     [SearchConfig::class, $searchConfigMock],
-                    [FileStorageValidator::class, $fileStorageValidatorMock],
+                    [RemoteFileStorageValidator::class, $remoteFileStorageValidatorMock],
                 ]);
             $this->adminFactory->expects($this->any())->method('create')->willReturn(
                 $this->createMock(AdminAccount::class)
@@ -445,7 +445,7 @@ public function installDataProvider()
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         ['Installing search configuration...'],
-                        ['Validating file storage configuration...'],
+                        ['Validating remote file storage configuration...'],
                         ['Installing user configuration...'],
                         ['Enabling caches:'],
                         ['Current status:'],
@@ -497,7 +497,7 @@ public function installDataProvider()
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         ['Installing search configuration...'],
-                        ['Validating file storage configuration...'],
+                        ['Validating remote file storage configuration...'],
                         ['Installing user configuration...'],
                         ['Enabling caches:'],
                         ['Current status:'],