Merge branch 'release/3.0.14'

factorial-io · May 28, 2019 · a2c2f91 · a2c2f91
2 parents a0c6f32 + e1bd3af
commit a2c2f91
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/Configuration/BlueprintConfiguration.php b/src/Configuration/BlueprintConfiguration.php
@@ -86,7 +86,13 @@ public function expandVariants($blueprints)
         foreach ($blueprints as $data) {
             $template = $this->getTemplate($data['configName']);
             foreach ($data['variants'] as $variant) {
-                $this->configuration->addHost($template->expand($variant));
+                $host = $template->expand($variant);
+                if (!$this->configuration->hasHostConfig($host['configName'])) {
+                    $this->configuration->addHost($template->expand($variant));
+                }
+                else {
+                  $this->configuration->getLogger()->notice('There\'s an existing config with that name, skipping creating one from blueprint');
+                }
             }
         }
     }

diff --git a/src/Configuration/ConfigurationService.php b/src/Configuration/ConfigurationService.php
@@ -710,4 +710,8 @@ protected function inheritFromBlueprint(string $config_name, $data): array
 
         return $data;
     }
+
+  public function hasHostConfig($configName) {
+      return !empty($this->hosts[$configName]);
+  }
 }
diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php
@@ -5,7 +5,7 @@
 class Utilities
 {
 
-    const FALLBACK_VERSION = '3.0.11';
+    const FALLBACK_VERSION = '3.0.14';
 
     public static function mergeData(array $data, array $override_data): array
     {