Merge pull request #430 from magento-thunder/MAGECLOUD-2895

MAGECLOUD-3246: Add --use-rewrites option to install command, MAGECLOUD-2895: The var/log/install_upgrade.log is useless without dividers and timestamps

Author: arhiopterecs

src/Process/Deploy/InstallUpdate/Install/Setup.php

@@ -112,10 +112,13 @@ public function execute()
         }
 
         try {
+            $installUpgradeLog = $this->fileList->getInstallUpgradeLog();
+
+            $this->shell->execute('echo \'Installation time: \'$(date) | tee -a ' . $installUpgradeLog);
             $this->shell->execute(sprintf(
                 '/bin/bash -c "set -o pipefail; %s | tee -a %s"',
                 escapeshellcmd($command),
-                $this->fileList->getInstallUpgradeLog()
+                $installUpgradeLog
             ));
         } catch (ShellException $exception) {
             throw new ProcessException($exception->getMessage(), $exception->getCode(), $exception);
@@ -143,7 +146,7 @@ private function getBaseCommand(): string
             . ' --backend-frontname=' . escapeshellarg($this->environment->getAdminUrl()
                 ?: Environment::DEFAULT_ADMIN_URL)
             . ($this->environment->getAdminEmail() ? $this->getAdminCredentials() : '')
-            . ' --use-secure-admin=1 --ansi --no-interaction';
+            . ' --use-secure-admin=1 --use-rewrites=1 --ansi --no-interaction';
     }
 
     /**

src/Process/Deploy/InstallUpdate/Update/Setup.php

@@ -93,13 +93,15 @@ public function execute()
 
         try {
             $verbosityLevel = $this->stageConfig->get(DeployInterface::VAR_VERBOSE_COMMANDS);
+            $installUpgradeLog = $this->fileList->getInstallUpgradeLog();
 
             $this->logger->info('Running setup upgrade.');
 
+            $this->shell->execute('echo \'Updating time: \'$(date) | tee -a ' . $installUpgradeLog);
             $this->shell->execute(sprintf(
                 '/bin/bash -c "set -o pipefail; %s | tee -a %s"',
                 'php ./bin/magento setup:upgrade --keep-generated --ansi --no-interaction ' . $verbosityLevel,
-                $this->fileList->getInstallUpgradeLog()
+                $installUpgradeLog
             ));
         } catch (\RuntimeException $exception) {
             //Rollback required by database

src/Test/Unit/Process/Deploy/InstallUpdate/Install/SetupTest.php

@@ -184,18 +184,19 @@ public function testExecute(
                 . ' --admin-firstname=\'' . $adminFirstnameExpected . '\' --admin-lastname=\'' . $adminLastnameExpected
                 . '\' --admin-email=\'' . $adminEmail . '\' --admin-password=\'' . $adminPasswordExpected . '\''
             : '';
-        $this->shellMock->expects($this->once())
+        $this->shellMock->expects($this->exactly(2))
             ->method('execute')
-            ->with(
-                '/bin/bash -c "set -o pipefail;'
+            ->withConsecutive(
+                ['echo \'Installation time: \'$(date) | tee -a ' . $installUpgradeLog],
+                ['/bin/bash -c "set -o pipefail;'
                 . ' php ./bin/magento setup:install -n --session-save=db --cleanup-database --currency=\'USD\''
                 . ' --base-url=\'http://unsecure.url\' --base-url-secure=\'https://secure.url\' --language=\'fr_FR\''
                 . ' --timezone=America/Los_Angeles --db-host=\'localhost\' --db-name=\'magento\' --db-user=\'user\''
                 . ' --backend-frontname=\'' . $adminUrlExpected . '\''
                 . $adminCredential
-                . ' --use-secure-admin=1 --ansi --no-interaction'
+                . ' --use-secure-admin=1 --use-rewrites=1 --ansi --no-interaction'
                 . ' --db-password=\'password\' -v'
-                . ' | tee -a ' . $installUpgradeLog . '"'
+                . ' | tee -a ' . $installUpgradeLog . '"']
             );
 
         $this->process->execute();

src/Test/Unit/Process/Deploy/InstallUpdate/Update/SetupTest.php

@@ -105,12 +105,13 @@ public function testExecute()
         $this->flagManagerMock->expects($this->exactly(2))
             ->method('delete')
             ->with(FlagManager::FLAG_REGENERATE);
-        $this->shellMock->expects($this->once())
+        $this->shellMock->expects($this->exactly(2))
             ->method('execute')
-            ->with(
-                '/bin/bash -c "set -o pipefail; php ./bin/magento setup:upgrade '
+            ->withConsecutive(
+                ['echo \'Updating time: \'$(date) | tee -a ' . $installUpgradeLog],
+                ['/bin/bash -c "set -o pipefail; php ./bin/magento setup:upgrade '
                 . '--keep-generated --ansi --no-interaction -v | tee -a '
-                . $installUpgradeLog . '"'
+                . $installUpgradeLog . '"']
             );
         $this->loggerMock->expects($this->once())
             ->method('info')