MAGECLOUD-1485: Deploy static content in compact strategy shouldn't use process-per-locale for pre-start hook (#139)

Author: Bohdan Korablov

src/Process/Prestart/DeployStaticContent/Generate.php

@@ -11,7 +11,7 @@
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Shell\ShellInterface;
 use Magento\MagentoCloud\StaticContent\CommandFactory;
-use Magento\MagentoCloud\StaticContent\Prestart\Option;
+use Magento\MagentoCloud\StaticContent\Deploy\Option;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -52,7 +52,7 @@ class Generate implements ProcessInterface
     /**
      * @var Option
      */
-    private $prestartOption;
+    private $deployOption;
 
     /**
      * @param ShellInterface $shell
@@ -61,7 +61,7 @@ class Generate implements ProcessInterface
      * @param File $file
      * @param DirectoryList $directoryList
      * @param CommandFactory $commandFactory
-     * @param Option $prestartOption
+     * @param Option $deployOption
      */
     public function __construct(
         ShellInterface $shell,
@@ -70,15 +70,15 @@ public function __construct(
         File $file,
         DirectoryList $directoryList,
         CommandFactory $commandFactory,
-        Option $prestartOption
+        Option $deployOption
     ) {
         $this->shell = $shell;
         $this->logger = $logger;
         $this->environment = $environment;
         $this->file = $file;
         $this->directoryList = $directoryList;
         $this->commandFactory = $commandFactory;
-        $this->prestartOption = $prestartOption;
+        $this->deployOption = $deployOption;
     }
 
     /**
@@ -89,20 +89,14 @@ public function execute()
         $this->file->touch($this->directoryList->getMagentoRoot() . '/pub/static/deployed_version.txt');
         $this->logger->info('Extracting locales');
 
-        $locales = $this->prestartOption->getLocales();
+        $locales = $this->deployOption->getLocales();
         $logMessage = count($locales) ?
             'Generating static content for locales: ' . implode(' ', $locales) :
             'Generating static content';
 
         $this->logger->info($logMessage);
 
-        $threadCount= $this->prestartOption->getThreadCount();
-        $parallelCommands = $this->commandFactory->createParallel($this->prestartOption);
-
-        $this->shell->execute(sprintf(
-            "printf '%s' | xargs -I CMD -P %d bash -c CMD",
-            $parallelCommands,
-            $threadCount
-        ));
+        $command = $this->commandFactory->create($this->deployOption);
+        $this->shell->execute($command);
     }
 }

src/StaticContent/CommandFactory.php

@@ -17,46 +17,6 @@ class CommandFactory
      * @return string
      */
     public function create(OptionInterface $option): string
-    {
-        $command = $this->createBaseCommand($option);
-
-        $locales = $option->getLocales();
-        if (count($locales)) {
-            $command .= ' ' . implode(' ', $locales);
-        }
-
-        $treadCount = $option->getThreadCount();
-        if ($treadCount) {
-            $command .= ' --jobs=' . $treadCount;
-        }
-
-        return $command;
-    }
-
-    /**
-     * Creates static deploy command for running in parallel for xargs command
-     *
-     * @param OptionInterface $option
-     * @return string
-     * @deprecated This method should be removed after replacing xargs with --jobs parameter in build phase
-     */
-    public function createParallel(OptionInterface $option): string
-    {
-        $command = $this->createBaseCommand($option);
-
-        $parallelCommands = '';
-        foreach ($option->getLocales() as $locale) {
-            $parallelCommands .= $command . ' ' . $locale . PHP_EOL;
-        }
-
-        return $parallelCommands;
-    }
-
-    /**
-     * @param OptionInterface $option
-     * @return string
-     */
-    private function createBaseCommand(OptionInterface $option): string
     {
         $command = 'php ./bin/magento setup:static-content:deploy';
 
@@ -81,6 +41,16 @@ private function createBaseCommand(OptionInterface $option): string
             $command .= ' ' . $verbosityLevel;
         }
 
+        $locales = $option->getLocales();
+        if (count($locales)) {
+            $command .= ' ' . implode(' ', $locales);
+        }
+
+        $treadCount = $option->getThreadCount();
+        if ($treadCount) {
+            $command .= ' --jobs=' . $treadCount;
+        }
+
         return $command;
     }
 }

src/StaticContent/Prestart/Option.php

@@ -10,7 +10,7 @@
 use Magento\MagentoCloud\Filesystem\Driver\File;
 use Magento\MagentoCloud\Process\Prestart\DeployStaticContent\Generate;
 use Magento\MagentoCloud\Shell\ShellInterface;
-use Magento\MagentoCloud\StaticContent\Prestart\Option;
+use Magento\MagentoCloud\StaticContent\Deploy\Option;
 use Magento\MagentoCloud\StaticContent\CommandFactory;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
@@ -59,7 +59,7 @@ class GenerateTest extends TestCase
     /**
      * @var Option|Mock
      */
-    private $prestartOptionMock;
+    private $deployOptionMock;
 
     /**
      * @inheritdoc
@@ -74,7 +74,7 @@ protected function setUp()
         $this->directoryListMock = $this->createMock(DirectoryList::class);
         $this->environmentMock = $this->createMock(Environment::class);
         $this->commandFactoryMock = $this->createMock(CommandFactory::class);
-        $this->prestartOptionMock = $this->createMock(Option::class);
+        $this->deployOptionMock = $this->createMock(Option::class);
 
         $this->process = new Generate(
             $this->shellMock,
@@ -83,18 +83,15 @@ protected function setUp()
             $this->fileMock,
             $this->directoryListMock,
             $this->commandFactoryMock,
-            $this->prestartOptionMock
+            $this->deployOptionMock
         );
     }
 
     public function testExecute()
     {
-        $this->prestartOptionMock->expects($this->once())
+        $this->deployOptionMock->expects($this->once())
             ->method('getLocales')
             ->willReturn(['ua_UA', 'fr_FR', 'es_ES', 'en_US']);
-        $this->prestartOptionMock->expects($this->once())
-            ->method('getThreadCount')
-            ->willReturn(3);
         $this->directoryListMock->method('getMagentoRoot')
             ->willReturn('magento_root');
         $this->fileMock->expects($this->once())
@@ -106,12 +103,12 @@ public function testExecute()
                 ['Generating static content for locales: en_GB fr_FR']
             );
         $this->commandFactoryMock->expects($this->once())
-            ->method('createParallel')
-            ->with($this->prestartOptionMock)
-            ->willReturn('some parallel command');
+            ->method('create')
+            ->with($this->deployOptionMock)
+            ->willReturn('some command');
         $this->shellMock->expects($this->once())
             ->method('execute')
-            ->with("printf 'some parallel command' | xargs -I CMD -P 3 bash -c CMD");
+            ->with('some command');
 
         $this->process->execute();
     }