MAGECLOUD-1057: Add possibility to change SCD strategy

Author: oshmyheliuk

src/Magento/MagentoCloud/App/Container.php

@@ -161,7 +161,7 @@ public function __construct(string $root, array $config)
             ->give(function () {
                 return $this->makeWith(ProcessPool::class, [
                     'processes' => [
-                        $this->get(DeployProcess\DeployStaticContent\GenerateFresh::class),
+                        $this->get(DeployProcess\DeployStaticContent\Generate::class),
                     ],
                 ]);
             });
@@ -173,7 +173,7 @@ public function __construct(string $root, array $config)
             ->give(function () {
                 return $this->makeWith(ProcessPool::class, [
                     'processes' => [
-                        $this->get(BuildProcess\DeployStaticContent\GenerateFresh::class),
+                        $this->get(BuildProcess\DeployStaticContent\Generate::class),
                     ],
                 ]);
             });

src/Magento/MagentoCloud/Config/Build.php

@@ -38,8 +38,8 @@ public function __construct(ReaderInterface $reader)
 
     /**
      * @param string $key
-     * @param mixed $default
-     * @return mixed
+     * @param string|null $default
+     * @return string|null
      */
     public function get(string $key, $default = null)
     {
@@ -57,14 +57,4 @@ public function getVerbosityLevel(): string
     {
         return $this->get(static::OPT_VERBOSE_COMMANDS) === 'enabled' ? ' -vv ' : '';
     }
-
-    /**
-     * @return string
-     */
-    public function getScdStrategy(): string
-    {
-        $strategy = $this->get(static::OPT_SCD_STRATEGY);
-
-        return $strategy ? '-s ' . $strategy : '';
-    }
 }

src/Magento/MagentoCloud/Config/Environment.php

@@ -129,6 +129,18 @@ public function getVariables(): array
         return $this->data['variables'] = $this->get('MAGENTO_CLOUD_VARIABLES', []);
     }
 
+    /**
+     * Returns variable value if such variable exists otherwise return $default
+     *
+     * @param string $name
+     * @param mixed $default
+     * @return mixed
+     */
+    public function getVariable($name, $default = null)
+    {
+        return $this->getVariables()[$name] ?? $default;
+    }
+
     /**
      * Checks that static content symlink is on.
      *
@@ -294,7 +306,7 @@ public function doCleanStaticFiles(): bool
      */
     public function getStaticDeployExcludeThemes(): string
     {
-        return $this->getVariables()['STATIC_CONTENT_EXCLUDE_THEMES'] ?? '';
+        return $this->getVariable('STATIC_CONTENT_EXCLUDE_THEMES', '');
     }
 
     /**
@@ -403,14 +415,4 @@ public function isMasterBranch(): bool
         return isset($_ENV['MAGENTO_CLOUD_ENVIRONMENT'])
             && preg_match(self::GIT_MASTER_BRANCH_RE, $_ENV['MAGENTO_CLOUD_ENVIRONMENT']);
     }
-
-    /**
-     * @return string
-     */
-    public function getScdStrategy(): string
-    {
-        $var = $this->getVariables();
-
-        return !empty($var[static::VAR_SCD_STRATEGY]) ? '-s ' . $var[static::VAR_SCD_STRATEGY] : '';
-    }
 }

src/Magento/MagentoCloud/Process/Build/DeployStaticContent/Generate.php

@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MagentoCloud\Process\Build\DeployStaticContent;
+
+use Magento\MagentoCloud\Config\Environment;
+use Magento\MagentoCloud\Process\ProcessInterface;
+use Magento\MagentoCloud\Shell\ShellInterface;
+use Magento\MagentoCloud\StaticContent\Build\Option;
+use Magento\MagentoCloud\StaticContent\Command;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @inheritdoc
+ */
+class Generate implements ProcessInterface
+{
+    /**
+     * @var ShellInterface
+     */
+    private $shell;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+    /**
+     * @var Environment
+     */
+    private $environment;
+
+    /**
+     * @var Command
+     */
+    private $scdCommand;
+
+    /**
+     * @var Option
+     */
+    private $buildOption;
+
+    /**
+     * @param ShellInterface $shell
+     * @param LoggerInterface $logger
+     * @param Environment $environment
+     * @param Command $scdCommand
+     * @param Option $buildOption
+     */
+    public function __construct(
+        ShellInterface $shell,
+        LoggerInterface $logger,
+        Environment $environment,
+        Command $scdCommand,
+        Option $buildOption
+    ) {
+        $this->shell = $shell;
+        $this->logger = $logger;
+        $this->environment = $environment;
+        $this->scdCommand = $scdCommand;
+        $this->buildOption = $buildOption;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        try {
+            $locales = $this->buildOption->getLocales();
+            $excludeThemes = $this->buildOption->getExcludedThemes();
+            $threadCount= $this->buildOption->getTreadCount();
+
+            $logMessage = 'Generating static content for locales: ' . implode(' ', $locales);
+
+            if (count($excludeThemes)) {
+                $logMessage .= PHP_EOL . 'Excluding Themes: ' . implode(' ', $excludeThemes);
+            }
+
+            if ($threadCount) {
+                $logMessage .= PHP_EOL . 'Using ' . $threadCount . ' Threads';
+            }
+
+            $this->logger->info($logMessage);
+
+            $parallelCommands = $this->scdCommand->createParallel($this->buildOption);
+
+            $this->shell->execute(sprintf(
+                "printf '%s' | xargs -I CMD -P %d bash -c CMD",
+                $parallelCommands,
+                $threadCount
+            ));
+
+            $this->environment->setFlagStaticDeployInBuild();
+        } catch (\Exception $e) {
+            throw new \Exception($e->getMessage(), 5);
+        }
+    }
+}