From b3c2a8f95b33c0aae0d27b8023f81e78cb3e4570 Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Wed, 12 Aug 2015 10:57:54 -0700
Subject: [PATCH] [config/plugins] move plugin config setup to prevent invalid
 warning

---
 src/server/plugins/PluginCollection.js | 3 ++-
 src/server/plugins/initialize.js       | 1 -
 src/server/plugins/scan.js             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/server/plugins/PluginCollection.js b/src/server/plugins/PluginCollection.js
index 089a211a23af..d10fe3194f84 100644
--- a/src/server/plugins/PluginCollection.js
+++ b/src/server/plugins/PluginCollection.js
@@ -13,7 +13,7 @@ module.exports = class Plugins extends Collection {
     this.kbnServer = kbnServer;
   }
 
-  new(path) {
+  async new(path) {
     var api = new PluginApi(this.kbnServer, path);
     let output = [].concat(require(path)(api) || []);
 
@@ -21,6 +21,7 @@ module.exports = class Plugins extends Collection {
       if (product instanceof api.Plugin) {
         this[byIdCache] = null;
         this.add(product);
+        await product.setupConfig();
       } else {
         throw new TypeError('unexpected plugin export ' + inspect(product));
       }
diff --git a/src/server/plugins/initialize.js b/src/server/plugins/initialize.js
index 0d01ce94915c..916916a8a054 100644
--- a/src/server/plugins/initialize.js
+++ b/src/server/plugins/initialize.js
@@ -11,7 +11,6 @@ module.exports = async function (kbnServer, server, config) {
 
   // setup config and filter out disabled plugins
   for (let plugin of plugins) {
-    await plugin.setupConfig();
     if (config.get([plugin.id, 'enabled'])) {
       enabledPlugins[plugin.id] = plugin;
     }
diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js
index 90719e449f01..065cd60109b0 100644
--- a/src/server/plugins/scan.js
+++ b/src/server/plugins/scan.js
@@ -54,7 +54,7 @@ module.exports = async (kbnServer, server, config) => {
     }
 
     require(modulePath);
-    plugins.new(path);
+    await plugins.new(path);
     debug({ tmpl: 'Found plugin at <%= path %>', path: modulePath });
   }
 };