github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename bluebird imports to stop impersonating global.Promise (#47535)

Browse source 
* rename bluebird imports to stop impersonating global.Promise

* forgot to save a couple files

* found a missing instance

* one more
This commit is contained in:
Spencer 2019-10-07 16:15:34 -07:00 • committed by GitHub
parent 35a7de1708
commit 485e9b8c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/legacy/core_plugins/elasticsearch/lib/__tests__/ensure_es_version.js
View file

@ -18,7 +18,7 @@
*/
import _ from 'lodash';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import sinon from 'sinon';
import expect from '@kbn/expect';
@ -74,13 +74,13 @@ describe('plugins/elasticsearch', () => {
}
const cluster = server.plugins.elasticsearch.getCluster('admin');
cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(Promise.resolve({ nodes: nodes }));
cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(Bluebird.resolve({ nodes: nodes }));
}
function setNodeWithoutHTTP(version) {
const nodes = { 'node-without-http': { version, ip: 'ip' } };
const cluster = server.plugins.elasticsearch.getCluster('admin');
cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(Promise.resolve({ nodes: nodes }));
cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(Bluebird.resolve({ nodes: nodes }));
}
it('returns true with single a node that matches', async () => {

14
src/legacy/core_plugins/elasticsearch/lib/__tests__/health_check.js
View file

@ -17,7 +17,7 @@
* under the License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import sinon from 'sinon';
import expect from '@kbn/expect';
@ -58,11 +58,11 @@ describe('plugins/elasticsearch', () => {
};
cluster = { callWithInternalUser: sinon.stub(), errors: { NoConnections } };
cluster.callWithInternalUser.withArgs('index', sinon.match.any).returns(Promise.resolve());
cluster.callWithInternalUser.withArgs('mget', sinon.match.any).returns(Promise.resolve({ ok: true }));
cluster.callWithInternalUser.withArgs('get', sinon.match.any).returns(Promise.resolve({ found: false }));
cluster.callWithInternalUser.withArgs('search', sinon.match.any).returns(Promise.resolve({ hits: { hits: [] } }));
cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(Promise.resolve({
cluster.callWithInternalUser.withArgs('index', sinon.match.any).returns(Bluebird.resolve());
cluster.callWithInternalUser.withArgs('mget', sinon.match.any).returns(Bluebird.resolve({ ok: true }));
cluster.callWithInternalUser.withArgs('get', sinon.match.any).returns(Bluebird.resolve({ found: false }));
cluster.callWithInternalUser.withArgs('search', sinon.match.any).returns(Bluebird.resolve({ hits: { hits: [] } }));
cluster.callWithInternalUser.withArgs('nodes.info', sinon.match.any).returns(Bluebird.resolve({
nodes: {
'node-01': {
version: COMPATIBLE_VERSION_NUMBER,
@ -108,7 +108,7 @@ describe('plugins/elasticsearch', () => {
});
it('should set the cluster green if everything is ready', function () {
cluster.callWithInternalUser.withArgs('ping').returns(Promise.resolve());
cluster.callWithInternalUser.withArgs('ping').returns(Bluebird.resolve());
return health.run()
.then(function () {

4
src/legacy/core_plugins/elasticsearch/lib/health_check.js
View file

@ -17,7 +17,7 @@
* under the License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import kibanaVersion from './kibana_version';
import { ensureEsVersion } from './ensure_es_version';
@ -25,7 +25,7 @@ export default function (plugin, server, requestDelay) {
plugin.status.yellow('Waiting for Elasticsearch');
function waitUntilReady() {
return new Promise((resolve) => {
return new Bluebird((resolve) => {
plugin.status.once('green', resolve);
});
}

6
src/legacy/core_plugins/kibana/server/lib/manage_uuid.js
View file

@ -18,7 +18,7 @@
*/
import uuid from 'uuid';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { join as pathJoin } from 'path';
import { readFile as readFileCallback, writeFile as writeFileCallback } from 'fs';
@ -30,7 +30,7 @@ export default async function manageUuid(server) {
const uuidFile = pathJoin(config.get('path.data'), fileName);
async function detectUuid() {
const readFile = Promise.promisify(readFileCallback);
const readFile = Bluebird.promisify(readFileCallback);
try {
const result = await readFile(uuidFile);
return result.toString(FILE_ENCODING);
@ -46,7 +46,7 @@ export default async function manageUuid(server) {
}
async function writeUuid(uuid) {
const writeFile = Promise.promisify(writeFileCallback);
const writeFile = Bluebird.promisify(writeFileCallback);
try {
return await writeFile(uuidFile, uuid, { encoding: FILE_ENCODING });
} catch (err) {

12
src/legacy/core_plugins/timelion/server/handlers/chain_runner.js
View file

@ -19,7 +19,7 @@
import _ from 'lodash';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { i18n } from '@kbn/i18n';
import parseSheet from './lib/parse_sheet.js';
@ -46,7 +46,7 @@ export default function chainRunner(tlConfig) {
function resolveArgument(item) {
if (Array.isArray(item)) {
return Promise.all(_.map(item, resolveArgument));
return Bluebird.all(_.map(item, resolveArgument));
}
if (_.isObject(item)) {
@ -55,7 +55,7 @@ export default function chainRunner(tlConfig) {
const itemFunctionDef = tlConfig.server.plugins.timelion.getFunction(item.function);
if (itemFunctionDef.cacheKey && queryCache[itemFunctionDef.cacheKey(item)]) {
stats.queryCount++;
return Promise.resolve(_.cloneDeep(queryCache[itemFunctionDef.cacheKey(item)]));
return Bluebird.resolve(_.cloneDeep(queryCache[itemFunctionDef.cacheKey(item)]));
}
return invoke(item.function, item.arguments);
}
@ -98,7 +98,7 @@ export default function chainRunner(tlConfig) {
args = _.map(args, resolveArgument);
return Promise.all(args).then(function (args) {
return Bluebird.all(args).then(function (args) {
args.byName = indexArguments(functionDef, args);
return functionDef.fn(args, tlConfig);
});
@ -133,7 +133,7 @@ export default function chainRunner(tlConfig) {
return args;
});
});
return Promise.all(seriesList).then(function (args) {
return Bluebird.all(seriesList).then(function (args) {
const list = _.chain(args).pluck('list').flatten().value();
const seriesList = _.merge.apply(this, _.flatten([{}, args]));
seriesList.list = list;
@ -161,7 +161,7 @@ export default function chainRunner(tlConfig) {
return invoke(query.function, query.arguments);
}).value();
return Promise.settle(promises).then(function (resolvedDatasources) {
return Bluebird.settle(promises).then(function (resolvedDatasources) {
stats.queryTime = (new Date()).getTime();

4
src/legacy/core_plugins/timelion/server/lib/alter.js
View file

@ -17,7 +17,7 @@
* under the License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import _ from 'lodash';
/* @param {Array} args
@ -29,7 +29,7 @@ import _ from 'lodash';
export default function alter(args, fn) {
// In theory none of the args should ever be promises. This is probably a waste.
return Promise.all(args).then(function (args) {
return Bluebird.all(args).then(function (args) {
const seriesList = args.shift();

4
src/legacy/core_plugins/timelion/server/routes/run.js
View file

@ -17,7 +17,7 @@
* under the License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import _ from 'lodash';
import chainRunnerFn from '../handlers/chain_runner.js';
const timelionDefaults = require('../lib/get_namespaced_settings')();
@ -44,7 +44,7 @@ export function runRoute(server) {
});
const chainRunner = chainRunnerFn(tlConfig);
const sheet = await Promise.all(chainRunner.processRequest(request.payload || {
const sheet = await Bluebird.all(chainRunner.processRequest(request.payload || {
sheet: [request.query.expression],
time: {
from: request.query.from,

6
src/legacy/core_plugins/timelion/server/series_functions/__tests__/es.js
View file

@ -26,7 +26,7 @@ import buildRequest from '../es/lib/build_request';
import createDateAgg from '../es/lib/create_date_agg';
import esResponse from './fixtures/es_response';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import _ from 'lodash';
import { expect } from 'chai';
import sinon from 'sinon';
@ -39,7 +39,7 @@ function stubRequestAndServer(response, indexPatternSavedObjects = []) {
elasticsearch: {
getCluster: sinon.stub().withArgs('data').returns({
callWithRequest: function () {
return Promise.resolve(response);
return Bluebird.resolve(response);
}
})
}
@ -49,7 +49,7 @@ function stubRequestAndServer(response, indexPatternSavedObjects = []) {
getSavedObjectsClient: function () {
return {
find: function () {
return Promise.resolve({
return Bluebird.resolve({
saved_objects: indexPatternSavedObjects
});
}

4
src/legacy/core_plugins/timelion/server/series_functions/__tests__/graphite.js
View file

@ -18,11 +18,11 @@
*/
import proxyquire from 'proxyquire';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
const expect = require('chai').expect;
const graphiteResponse = function () {
return Promise.resolve({
return Bluebird.resolve({
json: function () {
return [{
target: '__beer__',

4
src/legacy/core_plugins/timelion/server/series_functions/__tests__/quandl.js
View file

@ -18,7 +18,7 @@
*/
import proxyquire from 'proxyquire';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import assert from 'chai';
const expect = assert.expect;
@ -41,7 +41,7 @@ describe(filename, function () {
params: parseQueryString(parseURL(url).query),
code: url.match(/datasets\/(.*).json/)[1]
};
return Promise.resolve({
return Bluebird.resolve({
json: function () {
return {
name: '__beer__',

12
src/legacy/core_plugins/timelion/server/series_functions/__tests__/yaxis.js
View file

@ -18,7 +18,7 @@
*/
const fn = require(`../yaxis`);
import Promise from 'bluebird';
import Bluebird from 'bluebird';
const expect = require('chai').expect;
import invoke from './helpers/invoke_series_fn.js';
@ -36,7 +36,7 @@ describe('yaxis.js', () => {
});
it('puts odd numbers of the left, even on the right, by default', () => {
return Promise.all([
return Bluebird.all([
invoke(fn, [seriesList, 1]).then((r) => {
expect(r.output.list[0]._global.yaxes[0].position).to.equal('left');
}),
@ -50,7 +50,7 @@ describe('yaxis.js', () => {
});
it('it lets you override default positions', () => {
return Promise.all([
return Bluebird.all([
invoke(fn, [seriesList, 1, null, null, 'right']).then((r) => {
expect(r.output.list[0]._global.yaxes[0].position).to.equal('right');
}),
@ -61,7 +61,7 @@ describe('yaxis.js', () => {
});
it('sets the minimum (default: no min)', () => {
return Promise.all([
return Bluebird.all([
invoke(fn, [seriesList, 1, null]).then((r) => {
expect(r.output.list[0]._global.yaxes[0].min).to.equal(null);
}),
@ -72,7 +72,7 @@ describe('yaxis.js', () => {
});
it('sets the max (default: no max)', () => {
return Promise.all([
return Bluebird.all([
invoke(fn, [seriesList, 1, null]).then((r) => {
expect(r.output.list[0]._global.yaxes[0].max).to.equal(undefined);
}),
@ -83,7 +83,7 @@ describe('yaxis.js', () => {
});
it('sets the units (default: no unit', () => {
return Promise.all([
return Bluebird.all([
invoke(fn, [seriesList, 1, null, null, null, null, null, null]).then((r) => {
expect(r.output.list[0]._global.yaxes[0].units).to.equal(undefined);
}),

4
src/legacy/core_plugins/timelion/server/series_functions/static.js
View file

@ -20,7 +20,7 @@
import { i18n } from '@kbn/i18n';
import _ from 'lodash';
import Datasource from '../lib/classes/datasource';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
export default new Datasource ('static', {
aliases: ['value'],
@ -63,7 +63,7 @@ export default new Datasource ('static', {
});
}
return Promise.resolve({
return Bluebird.resolve({
type: 'seriesList',
list: [
{

4
src/legacy/core_plugins/timelion/server/series_functions/worldbank_indicators.js
View file

@ -20,7 +20,7 @@
import { i18n } from '@kbn/i18n';
import _ from 'lodash';
import worldbank from './worldbank.js';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import Datasource from '../lib/classes/datasource';
export default new Datasource ('worldbank_indicators', {
@ -73,7 +73,7 @@ export default new Datasource ('worldbank_indicators', {
return worldbank.timelionFn(wbArgs, tlConfig);
});
return Promise.map(seriesLists, function (seriesList) {
return Bluebird.map(seriesLists, function (seriesList) {
return seriesList.list[0];
}).then(function (list) {
return {

4
src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
View file

@ -17,7 +17,7 @@
* under the License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import expect from '@kbn/expect';
import ngMock from 'ng_mock';
import $ from 'jquery';
@ -153,7 +153,7 @@ describe('VegaVisualizations', () => {
$el.find('canvas')[0].dispatchEvent(event);
await Promise.delay(10);
await Bluebird.delay(10);
let tooltip = document.getElementById('vega-kibana-tooltip');
expect(tooltip).to.be.ok();

6
src/legacy/server/pid/index.js
View file

@ -19,11 +19,11 @@
import _ from 'lodash';
import Boom from 'boom';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { unlinkSync as unlink } from 'fs';
const writeFile = Promise.promisify(require('fs').writeFile);
const writeFile = Bluebird.promisify(require('fs').writeFile);
export default Promise.method(function (kbnServer, server, config) {
export default Bluebird.method(function (kbnServer, server, config) {
const path = config.get('pid.file');
if (!path) return;

10
src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.js
View file

@ -18,7 +18,7 @@
*/
import { defaultSearchStrategy } from './default_search_strategy';
import { Promise } from 'bluebird';
import Bluebird from 'bluebird';
const { search } = defaultSearchStrategy;
@ -35,8 +35,8 @@ describe('defaultSearchStrategy', function () {
let searchArgs;
beforeEach(() => {
const msearchMock = jest.fn().mockReturnValue(Promise.resolve([]));
const searchMock = jest.fn().mockReturnValue(Promise.resolve([]));
const msearchMock = jest.fn().mockReturnValue(Bluebird.resolve([]));
const searchMock = jest.fn().mockReturnValue(Bluebird.resolve([]));
searchArgs = {
searchRequests: [],
@ -44,8 +44,8 @@ describe('defaultSearchStrategy', function () {
msearch: msearchMock,
search: searchMock,
},
Promise,
serializeFetchParams: () => Promise.resolve('pretend this is a valid request body'),
Promise: Bluebird,
serializeFetchParams: () => Bluebird.resolve('pretend this is a valid request body'),
};
});

42
src/legacy/ui/public/saved_objects/__tests__/saved_object.js
View file

@ -20,7 +20,7 @@
import ngMock from 'ng_mock';
import expect from '@kbn/expect';
import sinon from 'sinon';
import BluebirdPromise from 'bluebird';
import Bluebird from 'bluebird';
import { SavedObjectProvider } from '../saved_object';
import StubIndexPatternProv from 'test_utils/stub_index_pattern';
@ -61,11 +61,11 @@ describe('Saved Object', function () {
*/
function stubESResponse(mockDocResponse) {
// Stub out search for duplicate title:
sinon.stub(savedObjectsClientStub, 'get').returns(BluebirdPromise.resolve(mockDocResponse));
sinon.stub(savedObjectsClientStub, 'update').returns(BluebirdPromise.resolve(mockDocResponse));
sinon.stub(savedObjectsClientStub, 'get').returns(Bluebird.resolve(mockDocResponse));
sinon.stub(savedObjectsClientStub, 'update').returns(Bluebird.resolve(mockDocResponse));
sinon.stub(savedObjectsClientStub, 'find').returns(BluebirdPromise.resolve({ savedObjects: [], total: 0 }));
sinon.stub(savedObjectsClientStub, 'bulkGet').returns(BluebirdPromise.resolve({ savedObjects: [mockDocResponse] }));
sinon.stub(savedObjectsClientStub, 'find').returns(Bluebird.resolve({ savedObjects: [], total: 0 }));
sinon.stub(savedObjectsClientStub, 'bulkGet').returns(Bluebird.resolve({ savedObjects: [mockDocResponse] }));
}
/**
@ -108,7 +108,7 @@ describe('Saved Object', function () {
describe('with confirmOverwrite', function () {
function stubConfirmOverwrite() {
window.confirm = sinon.stub().returns(true);
sinon.stub(esDataStub, 'create').returns(BluebirdPromise.reject(mock409FetchError));
sinon.stub(esDataStub, 'create').returns(Bluebird.reject(mock409FetchError));
}
describe('when true', function () {
@ -116,8 +116,8 @@ describe('Saved Object', function () {
stubESResponse(getMockedDocResponse('myId'));
return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
const createStub = sinon.stub(savedObjectsClientStub, 'create');
createStub.onFirstCall().returns(BluebirdPromise.reject(mock409FetchError));
createStub.onSecondCall().returns(BluebirdPromise.resolve({ id: 'myId' }));
createStub.onFirstCall().returns(Bluebird.reject(mock409FetchError));
createStub.onSecondCall().returns(Bluebird.resolve({ id: 'myId' }));
stubConfirmOverwrite();
@ -139,7 +139,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', id: 'HI' }).then(savedObject => {
window.confirm = sinon.stub().returns(false);
sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.reject(mock409FetchError));
sinon.stub(savedObjectsClientStub, 'create').returns(Bluebird.reject(mock409FetchError));
savedObject.lastSavedTitle = 'original title';
savedObject.title = 'new title';
@ -158,7 +158,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
stubConfirmOverwrite();
sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.reject(mock409FetchError));
sinon.stub(savedObjectsClientStub, 'create').returns(Bluebird.reject(mock409FetchError));
return savedObject.save({ confirmOverwrite: true })
.then(() => {
@ -178,7 +178,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
stubConfirmOverwrite();
sinon.stub(savedObjectsClientStub, 'create').returns(BluebirdPromise.resolve({ id: 'myId' }));
sinon.stub(savedObjectsClientStub, 'create').returns(Bluebird.resolve({ id: 'myId' }));
return savedObject.save({ confirmOverwrite: false }).then(() => {
expect(window.confirm.called).to.be(false);
@ -193,7 +193,7 @@ describe('Saved Object', function () {
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: 'myId' }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({ type: 'dashboard', id: 'newUniqueId' });
return Bluebird.resolve({ type: 'dashboard', id: 'newUniqueId' });
});
savedObject.copyOnSave = true;
@ -209,7 +209,7 @@ describe('Saved Object', function () {
stubESResponse(mockDocResponse);
return createInitializedSavedObject({ type: 'dashboard', id: originalId }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.reject('simulated error');
return Bluebird.reject('simulated error');
});
savedObject.copyOnSave = true;
return savedObject.save().then(() => {
@ -228,7 +228,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.id).to.be(id);
return BluebirdPromise.resolve(id);
return Bluebird.resolve(id);
});
savedObject.copyOnSave = false;
return savedObject.save().then((id) => {
@ -242,7 +242,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
const mockDocResponse = getMockedDocResponse('myId');
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({
return Bluebird.resolve({
type: 'dashboard',
id: 'myId',
_version: 'foo'
@ -264,7 +264,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', id: id }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.isSaving).to.be(true);
return BluebirdPromise.resolve({
return Bluebird.resolve({
type: 'dashboard',
id,
version: 'foo'
@ -282,7 +282,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard' }).then(savedObject => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
expect(savedObject.isSaving).to.be(true);
return BluebirdPromise.reject();
return Bluebird.reject();
});
expect(savedObject.isSaving).to.be(false);
return savedObject.save().catch(() => {
@ -307,7 +307,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', extractReferences })
.then((savedObject) => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({
return Bluebird.resolve({
id,
version: 'foo',
type: 'dashboard',
@ -333,7 +333,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', searchSource: true })
.then((savedObject) => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({
return Bluebird.resolve({
id,
version: 2,
type: 'dashboard',
@ -369,7 +369,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', searchSource: true })
.then((savedObject) => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({
return Bluebird.resolve({
id,
version: 2,
type: 'dashboard',
@ -403,7 +403,7 @@ describe('Saved Object', function () {
return createInitializedSavedObject({ type: 'dashboard', searchSource: true })
.then((savedObject) => {
sinon.stub(savedObjectsClientStub, 'create').callsFake(() => {
return BluebirdPromise.resolve({
return Bluebird.resolve({
id,
version: 2,
type: 'dashboard',

12
src/test_utils/public/simulate_keys.js
View file

@ -19,7 +19,7 @@
import $ from 'jquery';
import _ from 'lodash';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { keyMap } from 'ui/utils/key_map';
const reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
@ -70,7 +70,7 @@ export default function ($el, sequence) {
}
function doList(list) {
return Promise.try(function () {
return Bluebird.try(function () {
if (!list || !list.length) return;
let event = list[0];
@ -80,20 +80,20 @@ export default function ($el, sequence) {
switch (event.type) {
case 'press':
return Promise.resolve()
return Bluebird.resolve()
.then(_.partial(fire, 'keydown', event.key))
.then(_.partial(fire, 'keypress', event.key))
.then(_.partial(doList, event.events))
.then(_.partial(fire, 'keyup', event.key));
case 'wait':
return Promise.delay(event.ms);
return Bluebird.delay(event.ms);
case 'repeat':
return (function again(remaining) {
if (!remaining) return Promise.resolve();
if (!remaining) return Bluebird.resolve();
remaining = remaining - 1;
return Promise.resolve()
return Bluebird.resolve()
.then(_.partial(fire, 'keydown', event.key, true))
.then(_.partial(fire, 'keypress', event.key, true))
.then(_.partial(again, remaining));

4
test/api_integration/apis/kql_telemetry/kql_telemetry.js
View file

@ -18,7 +18,7 @@
*/
import expect from '@kbn/expect';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { get } from 'lodash';
export default function ({ getService }) {
@ -89,7 +89,7 @@ export default function ({ getService }) {
});
it('should only accept literal boolean values for the opt_in POST body param', function () {
return Promise.all([
return Bluebird.all([
supertest
.post('/api/kibana/kql_opt_in_telemetry')
.set('content-type', 'application/json')

12
x-pack/legacy/plugins/monitoring/public/services/__tests__/executor_provider.js
View file

@ -8,7 +8,7 @@ import ngMock from 'ng_mock';
import expect from '@kbn/expect';
import sinon from 'sinon';
import { executorProvider } from '../executor_provider';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { timefilter } from 'ui/timefilter';
describe('$executor service', () => {
@ -32,7 +32,7 @@ describe('$executor service', () => {
value: 0
});
executor = executorProvider(Promise, $timeout);
executor = executorProvider(Bluebird, $timeout);
});
afterEach(() => executor.destroy());
@ -56,7 +56,7 @@ describe('$executor service', () => {
pause: false,
value: 1000
});
executor.register({ execute: () => Promise.resolve().then(() => done(), done) });
executor.register({ execute: () => Bluebird.resolve().then(() => done(), done) });
executor.start(scope);
});
@ -68,7 +68,7 @@ describe('$executor service', () => {
});
executor.register({ execute: () => {
if (calls++ > 1) { done(); }
return Promise.resolve();
return Bluebird.resolve();
} });
executor.start(scope);
});
@ -79,7 +79,7 @@ describe('$executor service', () => {
value: 10
});
executor.register({
execute: () => Promise.resolve(),
execute: () => Bluebird.resolve(),
handleResponse: () => done()
});
executor.start(scope);
@ -91,7 +91,7 @@ describe('$executor service', () => {
value: 10
});
executor.register({
execute: () => Promise.reject(new Error('reject test')),
execute: () => Bluebird.reject(new Error('reject test')),
handleError: () => done()
});
executor.start(scope);

6
x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js
View file

@ -6,7 +6,7 @@
import moment from 'moment';
import { isPlainObject } from 'lodash';
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { checkParam } from '../error_missing_required';
import { getSeries } from './get_series';
import { calculateTimeseriesInterval } from '../calculate_timeseries_interval';
@ -29,7 +29,7 @@ export async function getMetrics(req, indexPattern, metricSet = [], filters = []
min = max - (numOfBuckets * bucketSize * 1000);
}
return Promise.map(metricSet, metric => {
return Bluebird.map(metricSet, metric => {
// metric names match the literal metric name, but they can be supplied in groups or individually
let metricNames;
@ -39,7 +39,7 @@ export async function getMetrics(req, indexPattern, metricSet = [], filters = []
metricNames = [ metric ];
}
return Promise.map(metricNames, metricName => {
return Bluebird.map(metricNames, metricName => {
return getSeries(req, indexPattern, metricName, metricOptions, filters, { min, max, bucketSize, timezone });
});
})

4
x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { contains, get } from 'lodash';
import { checkParam } from '../error_missing_required';
import { createQuery } from '../create_query';
@ -88,5 +88,5 @@ export function getMlJobsForCluster(req, esIndexPattern, cluster) {
}
// ML is not supported
return Promise.resolve(null);
return Bluebird.resolve(null);
}

4
x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { chain, find, get } from 'lodash';
import { checkParam } from '../error_missing_required';
import { createQuery } from '../create_query.js';
@ -30,7 +30,7 @@ export function getKibanasForClusters(req, kbnIndexPattern, clusters) {
const start = req.payload.timeRange.min;
const end = req.payload.timeRange.max;
return Promise.map(clusters, cluster => {
return Bluebird.map(clusters, cluster => {
const clusterUuid = cluster.cluster_uuid;
const metric = KibanaClusterMetric.getMetricFields();
const params = {

4
x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import Promise from 'bluebird';
import Bluebird from 'bluebird';
import { get } from 'lodash';
import { checkParam } from '../error_missing_required';
import { createQuery } from '../create_query.js';
@ -45,7 +45,7 @@ export function getLogstashForClusters(req, lsIndexPattern, clusters) {
const end = req.payload.timeRange.max;
const config = req.server.config();
return Promise.map(clusters, cluster => {
return Bluebird.map(clusters, cluster => {
const clusterUuid = cluster.cluster_uuid;
const params = {
index: lsIndexPattern,