[elasticsearch/client] use bluebird for promises for better backward …

…compat

src/plugins/elasticsearch/lib/expose_client.js

@@ -1,5 +1,6 @@
 import elasticsearch from 'elasticsearch';
 import _ from 'lodash';
+import Bluebird from 'bluebird';
 const readFile = (file) => require('fs').readFileSync(file, 'utf8');
 import util from 'util';
 import url from 'url';
@@ -44,6 +45,9 @@ module.exports = function (server) {
       plugins: options.plugins,
       apiVersion: options.apiVersion,
       keepAlive: options.keepAlive,
+      defer: function () {
+        return Bluebird.defer();
+      },
       log: function () {
         this.error = function (err) {
           server.log(['error', 'elasticsearch'], err);

src/ui/public/utils/__tests__/scanner.js

@@ -1,10 +1,14 @@
 import Scanner from 'ui/utils/scanner';
 import expect from 'expect.js';
+import Bluebird from 'bluebird';
 import elasticsearch from 'elasticsearch-browser';
 import sinon from 'sinon';
 
 var es = new elasticsearch.Client({
   host: 'http://localhost:9210',
+  defer: function () {
+    return Bluebird.defer();
+  }
 });
 
 

test/fixtures/scenario_manager.js

@@ -9,7 +9,10 @@ function ScenarioManager(server) {
   // NOTE: some large sets of test data can take several minutes to load
   this.client = new elasticsearch.Client({
     host: server,
-    requestTimeout: 300000
+    requestTimeout: 300000,
+    defer: function () {
+      return Promise.defer();
+    }
   });
 }