MCLOUD-7122: Error in mysqladmin ping command (#4)

Author: oshmyheliuk

src/Compose/ProductionBuilder/Service/Database/Db.php

@@ -8,6 +8,7 @@
 namespace Magento\CloudDocker\Compose\ProductionBuilder\Service\Database;
 
 use Magento\CloudDocker\Compose\BuilderInterface;
+use Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\Db\HealthCheck;
 use Magento\CloudDocker\Compose\ProductionBuilder\ServiceBuilderInterface;
 use Magento\CloudDocker\Compose\ProductionBuilder\Volume;
 use Magento\CloudDocker\Config\Config;
@@ -28,15 +29,21 @@ class Db implements ServiceBuilderInterface
      * @var Volume
      */
     private $volume;
+    /**
+     * @var HealthCheck
+     */
+    private $healthCheck;
 
     /**
      * @param ServiceFactory $serviceFactory
      * @param Volume $volume
+     * @param HealthCheck $healthCheck
      */
-    public function __construct(ServiceFactory $serviceFactory, Volume $volume)
+    public function __construct(ServiceFactory $serviceFactory, Volume $volume, HealthCheck $healthCheck)
     {
         $this->serviceFactory = $serviceFactory;
         $this->volume = $volume;
+        $this->healthCheck = $healthCheck;
     }
 
     /**
@@ -64,12 +71,7 @@ public function getConfig(Config $config): array
         $dbConfig = [
             'ports' => [$port ? "$port:3306" : '3306'],
             'volumes' => $this->getMounts($config),
-            BuilderInterface::SERVICE_HEALTHCHECK => [
-                'test' => 'mysqladmin ping -h localhost',
-                'interval' => '30s',
-                'timeout' => '30s',
-                'retries' => 3
-            ],
+            BuilderInterface::SERVICE_HEALTHCHECK => $this->healthCheck->getConfig(),
         ];
 
         if ($commands = $this->getCommands($config)) {

src/Compose/ProductionBuilder/Service/Database/Db/HealthCheck.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\Db;
+
+/**
+ * Returns health check configuration of database containers
+ */
+class HealthCheck
+{
+    /**
+     * Returns health check configuration of database containers
+     *
+     * @return array
+     */
+    public function getConfig(): array
+    {
+        return [
+            'test' => 'mysqladmin ping -h localhost -pmagento2',
+            'interval' => '30s',
+            'timeout' => '30s',
+            'retries' => 3
+        ];
+    }
+}

src/Compose/ProductionBuilder/Service/Database/DbQuote.php

@@ -8,6 +8,7 @@
 namespace Magento\CloudDocker\Compose\ProductionBuilder\Service\Database;
 
 use Magento\CloudDocker\Compose\BuilderInterface;
+use Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\Db\HealthCheck;
 use Magento\CloudDocker\Compose\ProductionBuilder\ServiceBuilderInterface;
 use Magento\CloudDocker\Compose\ProductionBuilder\Volume;
 use Magento\CloudDocker\Config\Config;
@@ -29,14 +30,21 @@ class DbQuote implements ServiceBuilderInterface
      */
     private $volume;
 
+    /**
+     * @var HealthCheck
+     */
+    private $healthCheck;
+
     /**
      * @param ServiceFactory $serviceFactory
      * @param Volume $volume
+     * @param HealthCheck $healthCheck
      */
-    public function __construct(ServiceFactory $serviceFactory, Volume $volume)
+    public function __construct(ServiceFactory $serviceFactory, Volume $volume, HealthCheck $healthCheck)
     {
         $this->serviceFactory = $serviceFactory;
         $this->volume = $volume;
+        $this->healthCheck = $healthCheck;
     }
 
     /**
@@ -64,12 +72,7 @@ public function getConfig(Config $config): array
         $dbConfig = [
             'ports' => [$port ? "$port:3306" : '3306'],
             'volumes' => $this->getMounts($config),
-            BuilderInterface::SERVICE_HEALTHCHECK => [
-                'test' => 'mysqladmin ping -h localhost',
-                'interval' => '30s',
-                'timeout' => '30s',
-                'retries' => 3
-            ],
+            BuilderInterface::SERVICE_HEALTHCHECK => $this->healthCheck->getConfig(),
         ];
 
         return $this->serviceFactory->create(

src/Compose/ProductionBuilder/Service/Database/DbSales.php

@@ -8,6 +8,7 @@
 namespace Magento\CloudDocker\Compose\ProductionBuilder\Service\Database;
 
 use Magento\CloudDocker\Compose\BuilderInterface;
+use Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\Db\HealthCheck;
 use Magento\CloudDocker\Compose\ProductionBuilder\ServiceBuilderInterface;
 use Magento\CloudDocker\Compose\ProductionBuilder\Volume;
 use Magento\CloudDocker\Config\Config;
@@ -29,14 +30,21 @@ class DbSales implements ServiceBuilderInterface
      */
     private $volume;
 
+    /**
+     * @var HealthCheck
+     */
+    private $healthCheck;
+
     /**
      * @param ServiceFactory $serviceFactory
      * @param Volume $volume
+     * @param HealthCheck $healthCheck
      */
-    public function __construct(ServiceFactory $serviceFactory, Volume $volume)
+    public function __construct(ServiceFactory $serviceFactory, Volume $volume, HealthCheck $healthCheck)
     {
         $this->serviceFactory = $serviceFactory;
         $this->volume = $volume;
+        $this->healthCheck = $healthCheck;
     }
 
     /**
@@ -64,12 +72,7 @@ public function getConfig(Config $config): array
         $dbConfig = [
             'ports' => [$port ? "$port:3306" : '3306'],
             'volumes' => $this->getMounts($config),
-            BuilderInterface::SERVICE_HEALTHCHECK => [
-                'test' => 'mysqladmin ping -h localhost',
-                'interval' => '30s',
-                'timeout' => '30s',
-                'retries' => 3
-            ],
+            BuilderInterface::SERVICE_HEALTHCHECK => $this->healthCheck->getConfig(),
         ];
 
         return $this->serviceFactory->create(

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

@@ -16,7 +16,7 @@ services:
       - 'mymagento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost'
+      test: 'mysqladmin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

@@ -16,7 +16,7 @@ services:
       - 'mymagento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost'
+      test: 'mysqladmin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3

src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml

@@ -16,7 +16,7 @@ services:
       - 'mymagento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost'
+      test: 'mysqladmin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3

src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml

@@ -14,7 +14,7 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost'
+      test: 'mysqladmin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3