MCLOUD-5939: Failed deploy with missed env.php (magento#728)

Author: NadiyaS

src/Step/Deploy/InstallUpdate/ConfigUpdate/DbConnection.php

@@ -382,9 +382,14 @@ private function slaveIsAvailable(): bool
      */
     private function getMageSplitConnectionsConfig(): array
     {
-        return array_intersect_key(
-            $this->getMageConfigData()[DbConfig::KEY_DB][DbConfig::KEY_CONNECTION],
-            array_flip(DbConfig::SPLIT_CONNECTIONS)
-        );
+        $existedSplitConnections = [];
+        $mageConfig = $this->getMageConfigData();
+        if (isset($mageConfig[DbConfig::KEY_DB][DbConfig::KEY_CONNECTION])) {
+            $existedSplitConnections = array_intersect_key(
+                $mageConfig[DbConfig::KEY_DB][DbConfig::KEY_CONNECTION],
+                array_flip(DbConfig::SPLIT_CONNECTIONS)
+            );
+        }
+        return $existedSplitConnections;
     }
 }

src/Test/Unit/Step/Deploy/InstallUpdate/ConfigUpdate/DbConnectionTest.php

@@ -178,31 +178,28 @@ public function testExecuteWithoutDbConfigInEnvironment()
 
     /**
      * Case when slave connections and split database are not used
+     *
+     * @param $mageConfig array
+     * @param $envConfig array
+     * @param $expectedResult array
+     * @dataProvider executeWithoutSplitAndSlaveConfigDataProvider
      */
-    public function testExecuteWithoutSplitAndSlaveConfig()
+    public function testExecuteWithoutSplitAndSlaveConfig(array $mageConfig, array $envConfig, array $expectedResult)
     {
         $resourceConfig = [
             'default_setup' => self::RESOURCE_DEFAULT_SETUP,
         ];
+        $expectedResult['resource'] = $resourceConfig;
 
-        $dbConfig = [
-            'connection' => [
-                'default' => self::DEFAULT_CONNECTION,
-                'indexer' => self::DEFAULT_CONNECTION,
-            ]
-        ];
         $this->dbConfigMock->expects($this->once())
             ->method('get')
-            ->willReturn($dbConfig);
+            ->willReturn($envConfig);
         $this->loggerMock->expects($this->once())
             ->method('info')
             ->with('Updating env.php DB connection configuration.');
         $this->configReaderMock->expects($this->once())
             ->method('read')
-            ->willReturn([
-                'db' => $dbConfig,
-                'resource' => $resourceConfig
-            ]);
+            ->willReturn($mageConfig);
         $this->resourceConfigMock->expects($this->once())
             ->method('get')
             ->willReturn($resourceConfig);
@@ -212,16 +209,51 @@ public function testExecuteWithoutSplitAndSlaveConfig()
             ->willReturnOnConsecutiveCalls(false, []);
         $this->configWriterMock->expects($this->once())
             ->method('create')
-            ->with([
-                'db' => $dbConfig,
-                'resource' => $resourceConfig
-            ]);
+            ->with($expectedResult);
         $this->flagManagerMock->expects($this->never())
             ->method('set');
 
         $this->step->execute();
     }
 
+    /**
+     * @return array
+     */
+    public function executeWithoutSplitAndSlaveConfigDataProvider()
+    {
+        $dbConfig = [
+            'connection' => [
+                'default' => self::DEFAULT_CONNECTION,
+                'indexer' => self::DEFAULT_CONNECTION,
+            ]
+        ];
+        $newConnection = array_merge(self::DEFAULT_CONNECTION, ['host' => 'host2']);
+        $newBbConfig = [
+            'connection' => [
+                'default' => $newConnection,
+                'indexer' => $newConnection,
+            ]
+        ];
+
+        return [
+            [
+                ['db' => $dbConfig],
+                $dbConfig,
+                ['db' => $dbConfig],
+            ],
+            'changed connection' => [
+                ['db' => $dbConfig],
+                $newBbConfig,
+                ['db' => $newBbConfig],
+            ],
+            'no data before' => [
+                [],
+                $dbConfig,
+                ['db' => $dbConfig],
+            ],
+        ];
+    }
+
     /**
      * Case with slave connections and without split config
      */