MC-38424: Support for Remote Storage

Author: shiftedreality

src/Step/Deploy/RemoteStorage.php

@@ -77,56 +77,63 @@ public function execute(): void
             throw new StepException($exception->getMessage(), $exception->getCode(), $exception);
         }
 
-        $driver = $this->config->getDriver();
-
-        if ($driver) {
-            $config = $this->config->getConfig();
+        if ($driver = $this->config->getDriver()) {
+            $this->updateConfig($driver);
+        } else {
+            $this->magentoShell->execute('setup:config:set --remote-storage-driver=file -n');
+        }
+    }
 
-            if (empty($config['bucket']) || empty($config['region'])) {
-                throw new StepException('Bucket and region are required configurations');
-            }
+    /**
+     * Update configuration.
+     *
+     * @param string $driver
+     * @throws StepException
+     */
+    private function updateConfig(string $driver): void
+    {
+        $config = $this->config->getConfig();
 
-            $options = [
-                '--remote-storage-driver=' . $driver,
-                '--remote-storage-bucket=' . $config['bucket'],
-                '--remote-storage-region=' . $config['region']
-            ];
+        if (empty($config['bucket']) || empty($config['region'])) {
+            throw new StepException('Bucket and region are required configurations');
+        }
 
-            if ($prefix = $this->config->getPrefix()) {
-                $options[] = '--remote-storage-prefix=' . $prefix;
-            }
+        $options = [
+            '--remote-storage-driver=' . $driver,
+            '--remote-storage-bucket=' . $config['bucket'],
+            '--remote-storage-region=' . $config['region']
+        ];
 
-            if (isset($config['key'], $config['secret'])) {
-                $options[] = '--remote-storage-key=' . $config['key'];
-                $options[] = '--remote-storage-secret=' . $config['secret'];
-            }
+        if ($prefix = $this->config->getPrefix()) {
+            $options[] = '--remote-storage-prefix=' . $prefix;
+        }
 
-            try {
-                $this->magentoShell->execute(sprintf(
-                    'setup:config:set %s -n',
-                    implode(' ', $options)
-                ));
-            } catch (ShellException $exception) {
-                $this->logger->critical(
-                    $exception->getMessage(),
-                    ['errorCode' => Error::WARN_REMOTE_STORAGE_CANNOT_BE_ENABLED]
-                );
-
-                throw new StepException(
-                    $exception->getMessage(),
-                    Error::WARN_REMOTE_STORAGE_CANNOT_BE_ENABLED,
-                    $exception
-                );
-            }
+        if (isset($config['key'], $config['secret'])) {
+            $options[] = '--remote-storage-key=' . $config['key'];
+            $options[] = '--remote-storage-secret=' . $config['secret'];
+        }
 
-            $this->logger->info(sprintf(
-                'Remote storage with driver "%s" was enabled',
-                $driver
+        try {
+            $this->magentoShell->execute(sprintf(
+                'setup:config:set %s -n',
+                implode(' ', $options)
             ));
-
-            return;
+        } catch (ShellException $exception) {
+            $this->logger->critical(
+                $exception->getMessage(),
+                ['errorCode' => Error::WARN_REMOTE_STORAGE_CANNOT_BE_ENABLED]
+            );
+
+            throw new StepException(
+                $exception->getMessage(),
+                Error::WARN_REMOTE_STORAGE_CANNOT_BE_ENABLED,
+                $exception
+            );
         }
 
-        $this->magentoShell->execute('setup:config:set --remote-storage-driver=file -n');
+        $this->logger->info(sprintf(
+            'Remote storage with driver "%s" was enabled',
+            $driver
+        ));
     }
 }