MAGECLOUD-2736: Magento can't install with custom DB configuration on cloud

Author: oshmyheliuk

src/Config/Validator/Deploy/AdminEmail.php

@@ -30,17 +30,24 @@ class AdminEmail implements ValidatorInterface
      * @var State
      */
     private $state;
+    /**
+     * @var DatabaseConfiguration
+     */
+    private $databaseConfiguration;
 
     /**
+     * @param DatabaseConfiguration $databaseConfiguration
      * @param Environment $environment
      * @param ResultFactory $resultFactory
      * @param State $deploy
      */
     public function __construct(
+        DatabaseConfiguration $databaseConfiguration,
         Environment $environment,
         ResultFactory $resultFactory,
         State $deploy
     ) {
+        $this->databaseConfiguration = $databaseConfiguration;
         $this->environment = $environment;
         $this->resultFactory = $resultFactory;
         $this->state = $deploy;
@@ -53,7 +60,10 @@ public function __construct(
      */
     public function validate(): Validator\ResultInterface
     {
-        if (!$this->state->isInstalled() && !$this->environment->getAdminEmail()) {
+        if (!$this->environment->getAdminEmail()
+            && $this->databaseConfiguration->validate() instanceof Validator\Result\Success
+            && !$this->state->isInstalled()
+        ) {
             return $this->resultFactory->create(
                 Validator\ResultInterface::ERROR,
                 [

src/Test/Unit/Config/Validator/Deploy/AdminEmailTest.php

@@ -8,6 +8,7 @@
 use Magento\MagentoCloud\Config\State;
 use Magento\MagentoCloud\Config\Environment;
 use Magento\MagentoCloud\Config\Validator\Deploy\AdminEmail;
+use Magento\MagentoCloud\Config\Validator\Deploy\DatabaseConfiguration;
 use Magento\MagentoCloud\Config\Validator\Result\Error;
 use Magento\MagentoCloud\Config\Validator\Result\Success;
 use Magento\MagentoCloud\Config\Validator\ResultInterface;
@@ -35,6 +36,11 @@ class AdminEmailTest extends TestCase
      */
     private $resultFactoryMock;
 
+    /**
+     * @var DatabaseConfiguration|Mock
+     */
+    private $databaseConfigurationMock;
+
     /**
      * @var State|Mock
      */
@@ -45,11 +51,13 @@ class AdminEmailTest extends TestCase
      */
     protected function setUp()
     {
+        $this->databaseConfigurationMock = $this->createMock(DatabaseConfiguration::class);
         $this->environmentMock = $this->createMock(Environment::class);
         $this->resultFactoryMock = $this->createMock(ResultFactory::class);
         $this->stateMock = $this->createMock(State::class);
 
         $this->adminEmailValidator = new AdminEmail(
+            $this->databaseConfigurationMock,
             $this->environmentMock,
             $this->resultFactoryMock,
             $this->stateMock
@@ -58,9 +66,10 @@ protected function setUp()
 
     public function testValidate()
     {
-        $this->stateMock->expects($this->once())
-            ->method('isInstalled')
-            ->willReturn(false);
+        $this->stateMock->expects($this->never())
+            ->method('isInstalled');
+        $this->databaseConfigurationMock->expects($this->never())
+            ->method('validate');
         $this->environmentMock->expects($this->once())
             ->method('getAdminEmail')
             ->willReturn('admin@example.com');
@@ -76,11 +85,15 @@ public function testValidate()
 
     public function testValidateMagentoInstalled()
     {
+        $this->environmentMock->expects($this->once())
+            ->method('getAdminEmail')
+            ->willReturn('');
         $this->stateMock->expects($this->once())
             ->method('isInstalled')
             ->willReturn(true);
-        $this->environmentMock->expects($this->never())
-            ->method('getAdminEmail');
+        $this->databaseConfigurationMock->expects($this->once())
+            ->method('validate')
+            ->willReturn($this->createMock(Success::class));
         $this->resultFactoryMock->expects($this->once())
             ->method('create')
             ->with(ResultInterface::SUCCESS)
@@ -91,11 +104,35 @@ public function testValidateMagentoInstalled()
         $this->assertInstanceOf(Success::class, $result);
     }
 
+    public function testValidateWrongDatabaseConnection()
+    {
+        $this->environmentMock->expects($this->once())
+            ->method('getAdminEmail')
+            ->willReturn('');
+        $this->databaseConfigurationMock->expects($this->once())
+            ->method('validate')
+            ->willReturn($this->createMock(Error::class));
+        $this->stateMock->expects($this->never())
+            ->method('isInstalled');
+        $this->resultFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(ResultInterface::SUCCESS)
+            ->willReturn($this->createMock(Success::class));
+
+        $result = $this->adminEmailValidator->validate();
+
+        $this->assertInstanceOf(Success::class, $result);
+    }
+
+
     public function testValidateAdminEmailNotExist()
     {
         $this->stateMock->expects($this->once())
             ->method('isInstalled')
             ->willReturn(false);
+        $this->databaseConfigurationMock->expects($this->once())
+            ->method('validate')
+            ->willReturn($this->createMock(Success::class));
         $this->environmentMock->expects($this->once())
             ->method('getAdminEmail')
             ->willReturn('');