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

Author: danmooney2

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

@@ -391,8 +391,12 @@ public function install($request)
         foreach ($script as $item) {
             list($message, $method, $params) = $item;
             $this->log->log($message);
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            call_user_func_array([$this, $method], $params);
+            try {
+                $this->$method(...$params);
+            } catch (RuntimeException $e) {
+                $this->revertRemoteStorageConfiguration();
+                throw $e;
+            }
             $this->logProgress();
         }
         $this->log->logSuccess('Magento installation complete.');
@@ -1218,6 +1222,7 @@ public function validateRemoteStorageConfiguration(array $data)
         $validationErrors = $remoteStorageValidator->validate($data, $this->deploymentConfig);
 
         if (!empty($validationErrors)) {
+            $this->revertRemoteStorageConfiguration();
             throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));
         }
     }
@@ -1787,4 +1792,19 @@ private function getDisabledCacheTypes(array $cacheTypesToCheck): array
 
         return $disabledCaches;
     }
+
+    /**
+     * Revert remote storage configuration back to local file driver
+     */
+    private function revertRemoteStorageConfiguration()
+    {
+        if (!$this->deploymentConfigWriter->checkIfWritable()) {
+            return;
+        }
+
+        $remoteStorageData = new ConfigData(ConfigFilePool::APP_ENV);
+        $remoteStorageData->set('remote_storage', ['driver' => 'file']);
+        $configData = [$remoteStorageData->getFileKey() => $remoteStorageData->getData()];
+        $this->deploymentConfigWriter->saveConfig($configData, true);
+    }
 }