Merge branch 'master' into fix_1537

screwdriver-cd · Apr 25, 2019 · 3aea0a7 · 3aea0a7
2 parents 3ac219a + 8d28020
commit 3aea0a7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/bin/server b/bin/server
@@ -33,7 +33,7 @@ const multiBuildClusterEnabled = config.get('multiBuildCluster').enabled;
 const datastoreConfig = config.get('datastore');
 const DatastorePlugin = require(`screwdriver-datastore-${datastoreConfig.plugin}`);
 
-const datastorePluginConfig = datastoreConfig[datastoreConfig.plugin];
+const datastorePluginConfig = Object.assign({}, datastoreConfig[datastoreConfig.plugin]);
 
 // Readonly Datastore
 const datastoreROConfig = datastorePluginConfig.readOnly;
@@ -46,7 +46,7 @@ delete datastorePluginConfig.readOnly;
 
 // Default datastore
 const datastore = new DatastorePlugin(hoek.applyToDefaults({ ecosystem },
-    (datastoreConfig[datastoreConfig.plugin] || {})));
+    (datastorePluginConfig || {})));
 
 // Source Code Plugin
 const scmConfig = { scms: config.get('scms') };