Merge pull request #247 from magento/small-refactoring

Improved Builder logic

Author: shiftedreality

src/Compose/ProductionBuilder.php

@@ -217,37 +217,17 @@ public function build(Config $config): Manager
             $this->addDbService($manager, $config, self::SERVICE_DB_SALES, $dbVersion, $volumesMount);
         }
 
-        $esEnvVars = $config->get(SourceInterface::SERVICES_ES_VARS);
-
         foreach (self::$standaloneServices as $service) {
             if (!$config->hasServiceEnabled($service)) {
                 continue;
             }
 
-            switch ($service) {
-                case self::SERVICE_REDIS:
-                    $serviceConfig = [self::SERVICE_HEALTHCHECK => [
-                        'test'=> 'redis-cli ping || exit 1',
-                        'interval'=> '30s',
-                        'timeout'=> '30s',
-                        'retries'=> 3
-                    ]];
-                    break;
-
-                case self::SERVICE_ELASTICSEARCH:
-                    $serviceConfig = !empty($esEnvVars) ? ['environment' => $esEnvVars] : [];
-                    break;
-
-                default:
-                    $serviceConfig = [];
-            }
-
             $manager->addService(
                 $service,
                 $this->serviceFactory->create(
                     (string)$service,
                     (string)$config->getServiceVersion($service),
-                    $serviceConfig
+                    $this->getServiceConfig($service, $config)
                 ),
                 [self::NETWORK_MAGENTO],
                 []
@@ -586,6 +566,36 @@ private function addDbService(
         );
     }
 
+    /**
+     * @param string $service
+     * @param Config $config
+     * @return array
+     * @throws ConfigurationMismatchException
+     */
+    private function getServiceConfig(string $service, Config $config): array
+    {
+        switch ($service) {
+            case self::SERVICE_REDIS:
+                $serviceConfig = [self::SERVICE_HEALTHCHECK => [
+                    'test'=> 'redis-cli ping || exit 1',
+                    'interval'=> '30s',
+                    'timeout'=> '30s',
+                    'retries'=> 3
+                ]];
+                break;
+
+            case self::SERVICE_ELASTICSEARCH:
+                $esEnvVars = $config->get(SourceInterface::SERVICES_ES_VARS);
+                $serviceConfig = !empty($esEnvVars) ? ['environment' => $esEnvVars] : [];
+                break;
+
+            default:
+                $serviceConfig = [];
+        }
+
+        return $serviceConfig;
+    }
+
     /**
      * @param string $device
      * @return array