MAGECLOUD-3866: Warm up functionality does not work if no store with 'default' code (#560)

Author: oshmyheliuk

src/Process/PostDeploy/WarmUp/UrlsPattern.php

@@ -59,9 +59,9 @@ public function get(string $warmUpPattern): array
             list($entity, $pattern, $storeId) = explode(':', $warmUpPattern);
 
             $command = 'config:show:urls';
-            $commandArguments = [sprintf('--entity-type="%s"', $entity)];
+            $commandArguments = [sprintf('--entity-type=%s', $entity)];
             if ($storeId && $storeId !== '*') {
-                $commandArguments [] = sprintf('--store-id="%s"', $storeId);
+                $commandArguments [] = sprintf('--store-id=%s', $storeId);
             }
 
             $process = $this->magentoShell->execute($command, $commandArguments);

src/Test/Unit/Process/PostDeploy/WarmUp/UrlsPatternTest.php

@@ -82,15 +82,15 @@ public function getDataProvider(): array
             [
                 'category:*:1',
                 [
-                    '--entity-type="category"',
-                    '--store-id="1"'
+                    '--entity-type=category',
+                    '--store-id=1'
                 ],
                 [],
                 [],
             ],
             [
                 'category:*:*',
-                ['--entity-type="category"'],
+                ['--entity-type=category'],
                 [
                     'http://site1.com/category1',
                     'http://site1.com/category2',
@@ -102,7 +102,7 @@ public function getDataProvider(): array
             ],
             [
                 'category:/category.*/:*',
-                ['--entity-type="category"'],
+                ['--entity-type=category'],
                 [
                     'http://site1.com/category1',
                     'http://site1.com/category2',
@@ -116,7 +116,7 @@ public function getDataProvider(): array
             ],
             [
                 'category:cat1:*',
-                ['--entity-type="category"'],
+                ['--entity-type=category'],
                 [
                     'http://site1.com/category1',
                     'http://site1.com/cat1',
@@ -152,7 +152,7 @@ public function testGetNotValidJsonReturned()
             ->willReturn('wrong_json');
         $this->magentoShellMock->expects($this->once())
             ->method('execute')
-            ->with('config:show:urls', ['--entity-type="category"'])
+            ->with('config:show:urls', ['--entity-type=category'])
             ->willReturn($processMock);
         $this->loggerMock->expects($this->once())
             ->method('error')

src/Test/Unit/Util/UrlManagerTest.php

@@ -376,7 +376,7 @@ public function testGetBaseUrl()
 
         $this->magentoShellMock->expects($this->once())
             ->method('execute')
-            ->with('config:show:store-url default')
+            ->with('config:show:default-url')
             ->willReturn($processMock);
 
         $this->environmentMock->expects($this->never())
@@ -397,7 +397,7 @@ public function testExpandUrl()
 
         $this->magentoShellMock->expects($this->once())
             ->method('execute')
-            ->with('config:show:store-url default')
+            ->with('config:show:default-url')
             ->willReturn($processMock);
 
         $this->assertSame('https://example.com/products/123', $this->manager->expandUrl('/products/123'));
@@ -461,12 +461,24 @@ public function testGetBaseUrlWithEmptyStoreUrls()
 
         $this->magentoShellMock->expects($this->once())
             ->method('execute')
-            ->with('config:show:store-url default')
+            ->with('config:show:default-url')
             ->willThrowException(new ShellException('some error'));
 
         $this->environmentMock->expects($this->once())
             ->method('getRoutes')
             ->willReturn(['http://example.com/' => ['original_url' => 'https://{default}', 'type' => 'upstream']]);
+        $this->loggerMock->expects($this->once())
+            ->method('error')
+            ->with(
+                'Cannot fetch base URL using the config:show:default-url command. ' .
+                'Instead, using the URL from the MAGENTO_CLOUD_ROUTES variable.'
+            );
+        $this->loggerMock->expects($this->exactly(2))
+            ->method('debug')
+            ->withConsecutive(
+                ['some error'],
+                [$this->anything()]
+            );
 
         $this->assertEquals(
             'https://example.com/',

src/Util/UrlManager.php

@@ -155,11 +155,15 @@ public function getBaseUrl(): string
     {
         if ($this->baseUrl === null) {
             try {
-                $process = $this->magentoShell->execute('config:show:store-url default');
+                $process = $this->magentoShell->execute('config:show:default-url');
 
                 $this->baseUrl = $process->getOutput();
             } catch (ShellException $e) {
-                $this->logger->error('Can\'t fetch base url. ' . $e->getMessage());
+                $this->logger->error(
+                    'Cannot fetch base URL using the config:show:default-url command. ' .
+                    'Instead, using the URL from the MAGENTO_CLOUD_ROUTES variable.'
+                );
+                $this->logger->debug($e->getMessage());
                 $this->baseUrl = $this->getSecureUrls()[''];
             }
         }