TestingHeading
diff --git a/x-pack/plugins/uptime/public/pages/page_header.tsx b/x-pack/plugins/uptime/public/pages/page_header.tsx
index d2e1f9036a24a..3b228afe904f4 100644
--- a/x-pack/plugins/uptime/public/pages/page_header.tsx
+++ b/x-pack/plugins/uptime/public/pages/page_header.tsx
@@ -18,6 +18,7 @@ interface PageHeaderProps {
extraLinks?: boolean;
datePicker?: boolean;
}
+
const SETTINGS_LINK_TEXT = i18n.translate('xpack.uptime.page_header.settingsLink', {
defaultMessage: 'Settings',
});
@@ -38,6 +39,10 @@ const StyledPicker = styled(EuiFlexItem)`
}
`;
+const H1Text = styled.h1`
+ white-space: nowrap;
+`;
+
export const PageHeader = React.memo(
({ headingText, extraLinks = false, datePicker = true }: PageHeaderProps) => {
const DatePickerComponent = () =>
@@ -73,7 +78,7 @@ export const PageHeader = React.memo(
>
- {headingText}
+ {headingText}
{extraLinkComponents}
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
index c8d3ca043edc5..17d79002e6f7d 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_locations.ts
@@ -32,7 +32,7 @@ export const getMonitorLocations: UMElasticsearchQueryFn<
bool: {
filter: [
{
- match: {
+ term: {
'monitor.id': monitorId,
},
},
@@ -70,6 +70,18 @@ export const getMonitorLocations: UMElasticsearchQueryFn<
_source: ['monitor', 'summary', 'observer', '@timestamp'],
},
},
+ down_history: {
+ sum: {
+ field: 'summary.down',
+ missing: 0,
+ },
+ },
+ up_history: {
+ sum: {
+ field: 'summary.up',
+ missing: 0,
+ },
+ },
},
},
},
@@ -99,10 +111,17 @@ export const getMonitorLocations: UMElasticsearchQueryFn<
}
};
+ let totalUps = 0;
+ let totalDowns = 0;
+
const monLocs: MonitorLocation[] = [];
- locations.forEach((loc: any) => {
- const mostRecentLocation = loc.most_recent.hits.hits[0]._source;
+ locations.forEach(({ most_recent: mostRecent, up_history, down_history }: any) => {
+ const mostRecentLocation = mostRecent.hits.hits[0]._source;
+ totalUps += up_history.value;
+ totalDowns += down_history.value;
const location: MonitorLocation = {
+ up_history: up_history.value ?? 0,
+ down_history: down_history.value ?? 0,
summary: mostRecentLocation?.summary,
geo: getGeo(mostRecentLocation?.observer?.geo),
timestamp: mostRecentLocation['@timestamp'],
@@ -113,5 +132,7 @@ export const getMonitorLocations: UMElasticsearchQueryFn<
return {
monitorId,
locations: monLocs,
+ up_history: totalUps,
+ down_history: totalDowns,
};
};
diff --git a/x-pack/test/accessibility/apps/uptime.ts b/x-pack/test/accessibility/apps/uptime.ts
index dccce4ba1b0b1..ebd120fa0feea 100644
--- a/x-pack/test/accessibility/apps/uptime.ts
+++ b/x-pack/test/accessibility/apps/uptime.ts
@@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('detail page', async () => {
await uptimeService.navigation.goToMonitor(A11Y_TEST_MONITOR_ID);
- await uptimeService.monitor.locationMapIsRendered();
+ await uptimeService.monitor.displayOverallAvailability('0.00 %');
await a11y.testAppSnapshot();
});
diff --git a/x-pack/test/functional/apps/uptime/locations.ts b/x-pack/test/functional/apps/uptime/locations.ts
index 27c42a365ec74..8aefca6a70195 100644
--- a/x-pack/test/functional/apps/uptime/locations.ts
+++ b/x-pack/test/functional/apps/uptime/locations.ts
@@ -11,41 +11,58 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default ({ getPageObjects, getService }: FtrProviderContext) => {
const { uptime: uptimePage } = getPageObjects(['uptime']);
const uptime = getService('uptime');
+ const es = getService('legacyEs');
const monitor = () => uptime.monitor;
+ const MONITOR_ID = 'location-testing-id';
+
+ const LessAvailMonitor = 'less-availability-monitor';
+
+ const addMonitorWithNoLocation = async () => {
+ /**
+ * This mogrify function will strip the documents of their location
+ * data (but preserve their location name), which is necessary for
+ * this test to work as desired.
+ * @param d current document
+ */
+ const mogrifyNoLocation = (d: any) => {
+ if (d.observer?.geo?.location) {
+ d.observer.geo.location = undefined;
+ }
+ return d;
+ };
+ await makeChecksWithStatus(es, MONITOR_ID, 5, 2, 10000, {}, 'up', mogrifyNoLocation);
+ };
+
+ const addLessAvailMonitor = async () => {
+ await makeChecksWithStatus(es, LessAvailMonitor, 5, 2, 10000, {}, 'up');
+ await makeChecksWithStatus(es, LessAvailMonitor, 5, 2, 10000, {}, 'down');
+ };
describe('Observer location', () => {
const start = moment().subtract('15', 'm').toISOString();
const end = moment().toISOString();
- const MONITOR_ID = 'location-testing-id';
+ before(async () => {
+ await addMonitorWithNoLocation();
+ await addLessAvailMonitor();
+ await uptime.navigation.goToUptime();
+ await uptimePage.goToRoot(true);
+ });
beforeEach(async () => {
- /**
- * This mogrify function will strip the documents of their location
- * data (but preserve their location name), which is necessary for
- * this test to work as desired.
- * @param d current document
- */
- const mogrifyNoLocation = (d: any) => {
- if (d.observer?.geo?.location) {
- d.observer.geo.location = undefined;
- }
- return d;
- };
- await makeChecksWithStatus(
- getService('legacyEs'),
- MONITOR_ID,
- 5,
- 2,
- 10000,
- {},
- 'up',
- mogrifyNoLocation
- );
- await uptime.navigation.goToUptime();
+ await addMonitorWithNoLocation();
+ await addLessAvailMonitor();
+ if (!(await uptime.navigation.isOnDetailsPage()))
+ await uptimePage.loadDataAndGoToMonitorPage(start, end, MONITOR_ID);
+ });
+
+ it('displays the overall availability', async () => {
+ await monitor().displayOverallAvailability('100.00 %');
+ });
- await uptimePage.loadDataAndGoToMonitorPage(start, end, MONITOR_ID);
+ it('can change the view to map', async () => {
+ await monitor().toggleToMapView();
});
it('renders the location panel and canvas', async () => {
@@ -55,5 +72,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
it('renders the location missing popover when monitor has location name, but no geo data', async () => {
await monitor().locationMissingExists();
});
+
+ it('displays less monitor availability', async () => {
+ await uptime.navigation.goToHomeViaBreadCrumb();
+ await uptimePage.loadDataAndGoToMonitorPage(start, end, LessAvailMonitor);
+ await monitor().displayOverallAvailability('50.00 %');
+ });
});
};
diff --git a/x-pack/test/functional/services/uptime/common.ts b/x-pack/test/functional/services/uptime/common.ts
index b5be1e29a0e8c..5f544b5e46010 100644
--- a/x-pack/test/functional/services/uptime/common.ts
+++ b/x-pack/test/functional/services/uptime/common.ts
@@ -58,13 +58,13 @@ export function UptimeCommonProvider({ getService }: FtrProviderContext) {
'[data-test-subj="xpack.uptime.filterBar.filterStatusUp"]'
);
if (await upFilter.elementHasClass('euiFilterButton-hasActiveFilters')) {
- this.setStatusFilterUp();
+ await this.setStatusFilterUp();
}
const downFilter = await find.byCssSelector(
'[data-test-subj="xpack.uptime.filterBar.filterStatusDown"]'
);
if (await downFilter.elementHasClass('euiFilterButton-hasActiveFilters')) {
- this.setStatusFilterDown();
+ await this.setStatusFilterDown();
}
},
async selectFilterItem(filterType: string, option: string) {
diff --git a/x-pack/test/functional/services/uptime/monitor.ts b/x-pack/test/functional/services/uptime/monitor.ts
index 3137711698ba4..593950fbb7619 100644
--- a/x-pack/test/functional/services/uptime/monitor.ts
+++ b/x-pack/test/functional/services/uptime/monitor.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import expect from '@kbn/expect/expect.js';
import { FtrProviderContext } from '../../ftr_provider_context';
export function UptimeMonitorProvider({ getService }: FtrProviderContext) {
@@ -17,6 +18,13 @@ export function UptimeMonitorProvider({ getService }: FtrProviderContext) {
timeout: 3000,
});
},
+ async displayOverallAvailability(availabilityVal: string) {
+ return retry.tryForTime(60 * 1000, async () => {
+ await testSubjects.existOrFail('uptimeOverallAvailability');
+ const availability = await testSubjects.getVisibleText('uptimeOverallAvailability');
+ expect(availability).to.be(availabilityVal);
+ });
+ },
async locationMapIsRendered() {
return retry.tryForTime(15000, async () => {
await testSubjects.existOrFail('xpack.uptime.locationMap.embeddedPanel', {
@@ -45,5 +53,8 @@ export function UptimeMonitorProvider({ getService }: FtrProviderContext) {
);
});
},
+ async toggleToMapView() {
+ await testSubjects.click('uptimeMonitorToggleMapBtn');
+ },
};
}
diff --git a/x-pack/test/functional/services/uptime/navigation.ts b/x-pack/test/functional/services/uptime/navigation.ts
index 7c5a4632f8627..f8e0c0cff41f4 100644
--- a/x-pack/test/functional/services/uptime/navigation.ts
+++ b/x-pack/test/functional/services/uptime/navigation.ts
@@ -56,6 +56,7 @@ export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProv
},
goToMonitor: async (monitorId: string) => {
+ // only go to monitor page if not already there
if (!(await testSubjects.exists('uptimeMonitorPage', { timeout: 0 }))) {
await testSubjects.click(`monitor-page-link-${monitorId}`);
await testSubjects.existOrFail('uptimeMonitorPage', {
@@ -80,5 +81,13 @@ export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProv
await PageObjects.timePicker.setAbsoluteRange(dateStart, dateEnd);
await this.goToMonitor(monitorId);
},
+
+ async isOnDetailsPage() {
+ return await testSubjects.exists('uptimeMonitorPage', { timeout: 0 });
+ },
+
+ async goToHomeViaBreadCrumb() {
+ await testSubjects.click('breadcrumb first');
+ },
};
}
From 9c881447270926c5fb63153c392871cd22eb908a Mon Sep 17 00:00:00 2001
From: Lisa Cawley
Date: Tue, 16 Jun 2020 09:30:02 -0700
Subject: [PATCH 04/41] [DOCS] Adds classification to data frame analytics
overview (#69068)
---
docs/user/ml/index.asciidoc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index f82bb0a406511..1bc74ce87de08 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -87,12 +87,14 @@ and {ml-docs}/xpack-ml.html[{ml-cap} {anomaly-detect}].
[[xpack-ml-dfanalytics]]
== {dfanalytics-cap}
+experimental[]
+
The Elastic {ml} {dfanalytics} feature enables you to analyze your data using
-{oldetection} and {regression} algorithms and generate new indices that contain
-the results alongside your source data.
+{classification}, {oldetection}, and {regression} algorithms and generate new
+indices that contain the results alongside your source data.
If you have a license that includes the {ml-features}, you can create
-{oldetection} {dfanalytics-jobs} and view their results on the *Analytics* page
+{dfanalytics-jobs} and view their results on the *Analytics* page
in {kib}. For example:
[role="screenshot"]
From fb97d91789faf2c7fe9771a832876e4c38020492 Mon Sep 17 00:00:00 2001
From: patrykkopycinski
Date: Tue, 16 Jun 2020 18:44:34 +0200
Subject: [PATCH 05/41] Bump react-redux (#69182)
---
package.json | 4 ++--
x-pack/package.json | 4 ++--
yarn.lock | 17 ++++++++---------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/package.json b/package.json
index b886e6ae0f5d3..85eba40c6251a 100644
--- a/package.json
+++ b/package.json
@@ -243,7 +243,7 @@
"react-input-range": "^1.3.0",
"react-markdown": "^4.3.1",
"react-monaco-editor": "~0.27.0",
- "react-redux": "^7.1.3",
+ "react-redux": "^7.2.0",
"react-resize-detector": "^4.2.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
@@ -375,7 +375,7 @@
"@types/react": "^16.9.36",
"@types/react-dom": "^16.9.8",
"@types/react-grid-layout": "^0.16.7",
- "@types/react-redux": "^7.1.7",
+ "@types/react-redux": "^7.1.9",
"@types/react-resize-detector": "^4.0.1",
"@types/react-router": "^5.1.3",
"@types/react-router-dom": "^5.1.3",
diff --git a/x-pack/package.json b/x-pack/package.json
index c582cc8be9bbd..e24d75cc0d968 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -98,7 +98,7 @@
"@types/react": "^16.9.36",
"@types/react-beautiful-dnd": "^12.1.1",
"@types/react-dom": "^16.9.8",
- "@types/react-redux": "^7.1.7",
+ "@types/react-redux": "^7.1.9",
"@types/react-router-dom": "^5.1.3",
"@types/react-sticky": "^6.0.3",
"@types/react-test-renderer": "^16.9.1",
@@ -322,7 +322,7 @@
"react-markdown": "^4.3.1",
"react-moment-proptypes": "^1.7.0",
"react-portal": "^3.2.0",
- "react-redux": "^7.1.3",
+ "react-redux": "^7.2.0",
"react-reverse-portal": "^1.0.4",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
diff --git a/yarn.lock b/yarn.lock
index 0188957073965..e43cb2997e531 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5550,10 +5550,10 @@
"@types/prop-types" "*"
"@types/react" "*"
-"@types/react-redux@^7.1.7":
- version "7.1.7"
- resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.7.tgz#12a0c529aba660696947384a059c5c6e08185c7a"
- integrity sha512-U+WrzeFfI83+evZE2dkZ/oF/1vjIYgqrb5dGgedkqVV8HEfDFujNgWCwHL89TDuWKb47U0nTBT6PLGq4IIogWg==
+"@types/react-redux@^7.1.9":
+ version "7.1.9"
+ resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.9.tgz#280c13565c9f13ceb727ec21e767abe0e9b4aec3"
+ integrity sha512-mpC0jqxhP4mhmOl3P4ipRsgTgbNofMRXJb08Ms6gekViLj61v1hOZEKWDCyWsdONr6EjEA6ZHXC446wdywDe0w==
dependencies:
"@types/hoist-non-react-statics" "^3.3.0"
"@types/react" "*"
@@ -25452,14 +25452,13 @@ react-redux@^5.1.2:
react-is "^16.6.0"
react-lifecycles-compat "^3.0.0"
-react-redux@^7.1.0, react-redux@^7.1.1, react-redux@^7.1.3:
- version "7.1.3"
- resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.3.tgz#717a3d7bbe3a1b2d535c94885ce04cdc5a33fc79"
- integrity sha512-uI1wca+ECG9RoVkWQFF4jDMqmaw0/qnvaSvOoL/GA4dNxf6LoV8sUAcNDvE5NWKs4hFpn0t6wswNQnY3f7HT3w==
+react-redux@^7.1.0, react-redux@^7.1.1, react-redux@^7.2.0:
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
+ integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==
dependencies:
"@babel/runtime" "^7.5.5"
hoist-non-react-statics "^3.3.0"
- invariant "^2.2.4"
loose-envify "^1.4.0"
prop-types "^15.7.2"
react-is "^16.9.0"
From 62f25506d384fc0c430486fa97c9a5c98e597264 Mon Sep 17 00:00:00 2001
From: Spencer
Date: Tue, 16 Jun 2020 09:54:41 -0700
Subject: [PATCH 06/41] [kbn/es] only make one attempt in tests to avoid
timeout (#69197)
Co-authored-by: spalger
Co-authored-by: Elastic Machine
---
packages/kbn-es/src/utils/native_realm.js | 30 ++++++++++---------
.../kbn-es/src/utils/native_realm.test.js | 10 +++----
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/packages/kbn-es/src/utils/native_realm.js b/packages/kbn-es/src/utils/native_realm.js
index 573944a8cc6d0..5075cfb965c08 100644
--- a/packages/kbn-es/src/utils/native_realm.js
+++ b/packages/kbn-es/src/utils/native_realm.js
@@ -37,13 +37,8 @@ exports.NativeRealm = class NativeRealm {
this._log = log;
}
- async setPassword(username, password = this._elasticPassword, { attempt = 1 } = {}) {
- await this._autoRetry(async () => {
- this._log.info(
- (attempt > 1 ? `attempt ${attempt}: ` : '') +
- `setting ${chalk.bold(username)} password to ${chalk.bold(password)}`
- );
-
+ async setPassword(username, password = this._elasticPassword, retryOpts = {}) {
+ await this._autoRetry(retryOpts, async () => {
try {
await this._client.security.changePassword({
username,
@@ -83,8 +78,8 @@ exports.NativeRealm = class NativeRealm {
);
}
- async getReservedUsers() {
- return await this._autoRetry(async () => {
+ async getReservedUsers(retryOpts = {}) {
+ return await this._autoRetry(retryOpts, async () => {
const resp = await this._client.security.getUser();
const usernames = Object.keys(resp.body).filter(
(user) => resp.body[user].metadata._reserved === true
@@ -98,9 +93,9 @@ exports.NativeRealm = class NativeRealm {
});
}
- async isSecurityEnabled() {
+ async isSecurityEnabled(retryOpts = {}) {
try {
- return await this._autoRetry(async () => {
+ return await this._autoRetry(retryOpts, async () => {
const {
body: { features },
} = await this._client.xpack.info({ categories: 'features' });
@@ -115,18 +110,25 @@ exports.NativeRealm = class NativeRealm {
}
}
- async _autoRetry(fn, attempt = 1) {
+ async _autoRetry(opts, fn) {
+ const { attempt = 1, maxAttempts = 3 } = opts;
+
try {
return await fn(attempt);
} catch (error) {
- if (attempt >= 3) {
+ if (attempt >= maxAttempts) {
throw error;
}
const sec = 1.5 * attempt;
this._log.warning(`assuming ES isn't initialized completely, trying again in ${sec} seconds`);
await new Promise((resolve) => setTimeout(resolve, sec * 1000));
- return await this._autoRetry(fn, attempt + 1);
+
+ const nextOpts = {
+ ...opts,
+ attempt: attempt + 1,
+ };
+ return await this._autoRetry(nextOpts, fn);
}
}
};
diff --git a/packages/kbn-es/src/utils/native_realm.test.js b/packages/kbn-es/src/utils/native_realm.test.js
index 54732f7136fcc..cd124c97dfdd4 100644
--- a/packages/kbn-es/src/utils/native_realm.test.js
+++ b/packages/kbn-es/src/utils/native_realm.test.js
@@ -85,7 +85,7 @@ describe('isSecurityEnabled', () => {
throw error;
});
- expect(await nativeRealm.isSecurityEnabled()).toBe(false);
+ expect(await nativeRealm.isSecurityEnabled({ maxAttempts: 1 })).toBe(false);
});
test('rejects if unexpected error is thrown', async () => {
@@ -97,9 +97,9 @@ describe('isSecurityEnabled', () => {
throw error;
});
- await expect(nativeRealm.isSecurityEnabled()).rejects.toThrowErrorMatchingInlineSnapshot(
- `"ResponseError"`
- );
+ await expect(
+ nativeRealm.isSecurityEnabled({ maxAttempts: 1 })
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"ResponseError"`);
});
});
@@ -226,7 +226,7 @@ describe('setPassword', () => {
});
await expect(
- nativeRealm.setPassword('kibana_system', 'foo')
+ nativeRealm.setPassword('kibana_system', 'foo', { maxAttempts: 1 })
).rejects.toThrowErrorMatchingInlineSnapshot(`"SomeError"`);
});
});
From 3de93501c6df2007312e22dc872135e039f1ff0d Mon Sep 17 00:00:00 2001
From: Larry Gregory
Date: Tue, 16 Jun 2020 12:55:18 -0400
Subject: [PATCH 07/41] Resolve security cloud test failures (#68935)
Co-authored-by: Joe Portner <5295965+jportner@users.noreply.github.com>
Co-authored-by: Elastic Machine
---
.../functional/page_objects/security_page.ts | 173 ++++++++----------
1 file changed, 72 insertions(+), 101 deletions(-)
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index 57f62ab33e39a..395e41a91f53a 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -16,6 +16,7 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
const testSubjects = getService('testSubjects');
const esArchiver = getService('esArchiver');
const userMenu = getService('userMenu');
+ const comboBox = getService('comboBox');
const PageObjects = getPageObjects(['common', 'header', 'settings', 'home', 'error']);
interface LoginOptions {
@@ -273,11 +274,7 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
async addIndexToRole(index: string) {
log.debug(`Adding index ${index} to role`);
- const indexInput = await retry.try(() =>
- find.byCssSelector('[data-test-subj="indicesInput0"] input')
- );
- await indexInput.type(index);
- await indexInput.type('\n');
+ await comboBox.setCustom('indicesInput0', index);
}
async addPrivilegeToRole(privilege: string) {
@@ -400,104 +397,78 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
}
}
- addRole(roleName: string, roleObj: Role) {
+ async addRole(roleName: string, roleObj: Role) {
const self = this;
- return (
- this.clickNewRole()
- .then(function () {
- // We have to use non-test-subject selectors because this markup is generated by ui-select.
- log.debug('roleObj.indices[0].names = ' + roleObj.elasticsearch.indices[0].names);
- return testSubjects.append('roleFormNameInput', roleName);
- })
- .then(function () {
- return find.setValue(
- '[data-test-subj="indicesInput0"] input',
- roleObj.elasticsearch.indices[0].names + '\n'
- );
- })
- .then(function () {
- return testSubjects.click('restrictDocumentsQuery0');
- })
- .then(function () {
- if (roleObj.elasticsearch.indices[0].query) {
- return testSubjects.setValue('queryInput0', roleObj.elasticsearch.indices[0].query);
- }
- })
-
- // KibanaPrivilege
- .then(async () => {
- const globalPrivileges = (roleObj.kibana as any).global;
- if (globalPrivileges) {
- for (const privilegeName of globalPrivileges) {
- const button = await testSubjects.find('addSpacePrivilegeButton');
- await button.click();
-
- const spaceSelector = await testSubjects.find('spaceSelectorComboBox');
- await spaceSelector.click();
-
- const globalSpaceOption = await find.byCssSelector(`#spaceOption_\\*`);
- await globalSpaceOption.click();
-
- const basePrivilegeSelector = await testSubjects.find('basePrivilegeComboBox');
- await basePrivilegeSelector.click();
-
- const privilegeOption = await find.byCssSelector(`#basePrivilege_${privilegeName}`);
- await privilegeOption.click();
-
- const createPrivilegeButton = await testSubjects.find('createSpacePrivilegeButton');
- await createPrivilegeButton.click();
- }
- }
- })
-
- .then(function () {
- function addPrivilege(privileges: string[]) {
- return privileges.reduce(function (promise: Promise, privilegeName: string) {
- // We have to use non-test-subject selectors because this markup is generated by ui-select.
- return promise
- .then(() => self.addPrivilegeToRole(privilegeName))
- .then(() => PageObjects.common.sleep(250));
- }, Promise.resolve());
- }
- return addPrivilege(roleObj.elasticsearch.indices[0].privileges);
- })
- // clicking the Granted fields and removing the asterix
- .then(async function () {
- function addGrantedField(field: string[]) {
- return field.reduce(function (promise: Promise, fieldName: string) {
- return promise
- .then(function () {
- return find.setValue('[data-test-subj="fieldInput0"] input', fieldName + '\n');
- })
- .then(function () {
- return PageObjects.common.sleep(1000);
- });
- }, Promise.resolve());
- }
-
- if (roleObj.elasticsearch.indices[0].field_security) {
- // Toggle FLS switch
- await testSubjects.click('restrictFieldsQuery0');
-
- // have to remove the '*'
- return find
- .clickByCssSelector(
- 'div[data-test-subj="fieldInput0"] [title="Remove * from selection in this group"] svg.euiIcon'
- )
- .then(function () {
- return addGrantedField(roleObj.elasticsearch.indices[0].field_security!.grant!);
- });
- }
- }) // clicking save button
- .then(async () => {
- log.debug('click save button');
- await testSubjects.click('roleFormSaveButton');
- })
- .then(function () {
- return PageObjects.common.sleep(5000);
- })
- );
+ await this.clickNewRole();
+
+ // We have to use non-test-subject selectors because this markup is generated by ui-select.
+ log.debug('roleObj.indices[0].names = ' + roleObj.elasticsearch.indices[0].names);
+ await testSubjects.append('roleFormNameInput', roleName);
+
+ for (const indexName of roleObj.elasticsearch.indices[0].names) {
+ await comboBox.setCustom('indicesInput0', indexName);
+ }
+
+ if (roleObj.elasticsearch.indices[0].query) {
+ await testSubjects.click('restrictDocumentsQuery0');
+ await testSubjects.setValue('queryInput0', roleObj.elasticsearch.indices[0].query);
+ }
+
+ const globalPrivileges = (roleObj.kibana as any).global;
+ if (globalPrivileges) {
+ for (const privilegeName of globalPrivileges) {
+ await testSubjects.click('addSpacePrivilegeButton');
+
+ await testSubjects.click('spaceSelectorComboBox');
+
+ const globalSpaceOption = await find.byCssSelector(`#spaceOption_\\*`);
+ await globalSpaceOption.click();
+
+ await testSubjects.click('basePrivilegeComboBox');
+
+ const privilegeOption = await find.byCssSelector(`#basePrivilege_${privilegeName}`);
+ await privilegeOption.click();
+
+ await testSubjects.click('createSpacePrivilegeButton');
+ }
+ }
+
+ function addPrivilege(privileges: string[]) {
+ return privileges.reduce(function (promise: Promise, privilegeName: string) {
+ return promise
+ .then(() => self.addPrivilegeToRole(privilegeName))
+ .then(() => PageObjects.common.sleep(250));
+ }, Promise.resolve());
+ }
+
+ await addPrivilege(roleObj.elasticsearch.indices[0].privileges);
+
+ async function addGrantedField(fields: string[]) {
+ for (const entry of fields) {
+ await comboBox.setCustom('fieldInput0', entry);
+ }
+ }
+
+ // clicking the Granted fields and removing the asterix
+ if (roleObj.elasticsearch.indices[0].field_security) {
+ // Toggle FLS switch
+ await testSubjects.click('restrictFieldsQuery0');
+
+ // have to remove the '*'
+ await find.clickByCssSelector(
+ 'div[data-test-subj="fieldInput0"] [title="Remove * from selection in this group"] svg.euiIcon'
+ );
+
+ await addGrantedField(roleObj.elasticsearch.indices[0].field_security!.grant!);
+ }
+
+ log.debug('click save button');
+ await testSubjects.click('roleFormSaveButton');
+
+ // Signifies that the role management page redirected back to the role grid page,
+ // and successfully refreshed the grid
+ await testSubjects.existOrFail('roleRow');
}
async selectRole(role: string) {
From d5785a0d6d91f6dd110ea2d2cb69e6c3bfded427 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad
Date: Tue, 16 Jun 2020 12:02:40 -0600
Subject: [PATCH 08/41] SIEM] Moves validation up to the common section
## Summary
Moves validation up to the common section so it can be used by others in common for API boundary validation.
---
.../update_exception_list_item_schema.test.ts | 2 +-
.../exception_list_item_schema.test.ts | 2 +-
.../plugins/lists/common/siem_common_deps.ts | 2 ++
.../create_exception_list_item_route.ts | 8 ++---
.../routes/create_exception_list_route.ts | 8 ++---
.../server/routes/create_list_index_route.ts | 3 +-
.../server/routes/create_list_item_route.ts | 8 ++---
.../lists/server/routes/create_list_route.ts | 8 ++---
.../delete_exception_list_item_route.ts | 8 ++---
.../routes/delete_exception_list_route.ts | 8 ++---
.../server/routes/delete_list_index_route.ts | 3 +-
.../server/routes/delete_list_item_route.ts | 8 ++---
.../lists/server/routes/delete_list_route.ts | 8 ++---
.../routes/find_exception_list_item_route.ts | 8 ++---
.../routes/find_exception_list_route.ts | 8 ++---
.../server/routes/find_list_item_route.ts | 8 ++---
.../lists/server/routes/find_list_route.ts | 8 ++---
.../server/routes/import_list_item_route.ts | 8 ++---
.../server/routes/patch_list_item_route.ts | 8 ++---
.../lists/server/routes/patch_list_route.ts | 8 ++---
.../routes/read_exception_list_item_route.ts | 8 ++---
.../routes/read_exception_list_route.ts | 8 ++---
.../server/routes/read_list_index_route.ts | 3 +-
.../server/routes/read_list_item_route.ts | 8 ++---
.../lists/server/routes/read_list_route.ts | 8 ++---
.../update_exception_list_item_route.ts | 8 ++---
.../routes/update_exception_list_route.ts | 8 ++---
.../server/routes/update_list_item_route.ts | 8 ++---
.../lists/server/routes/update_list_route.ts | 8 ++---
.../plugins/lists/server/siem_server_deps.ts | 1 -
.../security_solution/common/validate.test.ts | 34 +++++++++++++++++++
.../security_solution/common/validate.ts | 25 ++++++++++++++
.../plugins/security_solution/server/index.ts | 1 -
.../rules/add_prepackaged_rules_route.ts | 2 +-
.../routes/rules/create_rules_bulk_route.ts | 3 +-
.../routes/rules/delete_rules_bulk_route.ts | 3 +-
.../get_prepackaged_rules_status_route.ts | 2 +-
.../routes/rules/import_rules_route.ts | 2 +-
.../routes/rules/patch_rules_bulk_route.ts | 3 +-
.../routes/rules/update_rules_bulk_route.ts | 3 +-
.../routes/rules/validate.test.ts | 23 -------------
.../detection_engine/routes/rules/validate.ts | 15 +-------
.../timeline/routes/import_timelines_route.ts | 2 +-
43 files changed, 128 insertions(+), 190 deletions(-)
create mode 100644 x-pack/plugins/security_solution/common/validate.test.ts
create mode 100644 x-pack/plugins/security_solution/common/validate.ts
diff --git a/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts
index 38541e205598b..69702a5e8a4f9 100644
--- a/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts
@@ -147,7 +147,7 @@ describe('update_exception_list_item_schema', () => {
// TODO: Is it expected behavior for it not to auto-generate a uui or throw
// error if item_id is not passed in?
- xtest('it should accept an undefined for "item_id" and auto generate a uuid', () => {
+ test.skip('it should accept an undefined for "item_id" and auto generate a uuid', () => {
const inputPayload = getUpdateExceptionListItemSchemaMock();
delete inputPayload.item_id;
const decoded = updateExceptionListItemSchema.decode(inputPayload);
diff --git a/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts
index b9d142fbccbee..ff900104251b7 100644
--- a/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts
@@ -101,7 +101,7 @@ describe('exception_list_item_schema', () => {
// TODO: Should this throw an error? "namespace_type" gets auto-populated
// with default "single", is that desired behavior?
- xtest('it should NOT accept an undefined for "namespace_type"', () => {
+ test.skip('it should NOT accept an undefined for "namespace_type"', () => {
const payload = getExceptionListItemSchemaMock();
delete payload.namespace_type;
const decoded = exceptionListItemSchema.decode(payload);
diff --git a/x-pack/plugins/lists/common/siem_common_deps.ts b/x-pack/plugins/lists/common/siem_common_deps.ts
index 3759305987f79..b1bb7d8aace36 100644
--- a/x-pack/plugins/lists/common/siem_common_deps.ts
+++ b/x-pack/plugins/lists/common/siem_common_deps.ts
@@ -9,3 +9,5 @@ export { DefaultUuid } from '../../security_solution/common/detection_engine/sch
export { DefaultStringArray } from '../../security_solution/common/detection_engine/schemas/types/default_string_array';
export { exactCheck } from '../../security_solution/common/exact_check';
export { getPaths, foldLeftRight } from '../../security_solution/common/test_utils';
+export { validate } from '../../security_solution/common/validate';
+export { formatErrors } from '../../security_solution/common/format_errors';
diff --git a/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts
index 2cafd435e0853..375d25c6fa5f8 100644
--- a/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_exception_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
CreateExceptionListItemSchemaDecoded,
createExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/routes/create_exception_list_route.ts b/x-pack/plugins/lists/server/routes/create_exception_list_route.ts
index 9be6b72dcd255..bd29a65c9450a 100644
--- a/x-pack/plugins/lists/server/routes/create_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_exception_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
CreateExceptionListSchemaDecoded,
createExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/routes/create_list_index_route.ts b/x-pack/plugins/lists/server/routes/create_list_index_route.ts
index 1c893fb757c5d..5ec2b36da61b0 100644
--- a/x-pack/plugins/lists/server/routes/create_list_index_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_list_index_route.ts
@@ -6,7 +6,8 @@
import { IRouter } from 'kibana/server';
-import { buildSiemResponse, transformError, validate } from '../siem_server_deps';
+import { buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { LIST_INDEX } from '../../common/constants';
import { acknowledgeSchema } from '../../common/schemas';
diff --git a/x-pack/plugins/lists/server/routes/create_list_item_route.ts b/x-pack/plugins/lists/server/routes/create_list_item_route.ts
index 68622e98cbc52..2e1b7fa07221f 100644
--- a/x-pack/plugins/lists/server/routes/create_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_list_item_route.ts
@@ -7,13 +7,9 @@
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
import { createListItemSchema, listItemSchema } from '../../common/schemas';
+import { validate } from '../../common/siem_common_deps';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/create_list_route.ts b/x-pack/plugins/lists/server/routes/create_list_route.ts
index 0f3c404c53cfd..9872bbfa09e23 100644
--- a/x-pack/plugins/lists/server/routes/create_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/create_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { createListSchema, listSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts
index 2c91fe3c28681..f363252dada50 100644
--- a/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_exception_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
DeleteExceptionListItemSchemaDecoded,
deleteExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts b/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts
index b4c67c0ab1418..b1bf705dcc5f6 100644
--- a/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_exception_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
DeleteExceptionListSchemaDecoded,
deleteExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/routes/delete_list_index_route.ts b/x-pack/plugins/lists/server/routes/delete_list_index_route.ts
index 424c3f45aac40..cb2e16b3602a7 100644
--- a/x-pack/plugins/lists/server/routes/delete_list_index_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_list_index_route.ts
@@ -7,7 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_INDEX } from '../../common/constants';
-import { buildSiemResponse, transformError, validate } from '../siem_server_deps';
+import { buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { acknowledgeSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/delete_list_item_route.ts b/x-pack/plugins/lists/server/routes/delete_list_item_route.ts
index 82dfe8a4f29d0..510be764cefba 100644
--- a/x-pack/plugins/lists/server/routes/delete_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { deleteListItemSchema, listItemArraySchema, listItemSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/delete_list_route.ts b/x-pack/plugins/lists/server/routes/delete_list_route.ts
index e89355b7689c5..600e4b00c29ca 100644
--- a/x-pack/plugins/lists/server/routes/delete_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/delete_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { deleteListSchema, listSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts
index 1820ffdeadb88..a6c2a18bb8c8a 100644
--- a/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_exception_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
FindExceptionListItemSchemaDecoded,
findExceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/routes/find_exception_list_route.ts b/x-pack/plugins/lists/server/routes/find_exception_list_route.ts
index 3181deda8b91d..97e1de834cd37 100644
--- a/x-pack/plugins/lists/server/routes/find_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_exception_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
FindExceptionListSchemaDecoded,
findExceptionListSchema,
diff --git a/x-pack/plugins/lists/server/routes/find_list_item_route.ts b/x-pack/plugins/lists/server/routes/find_list_item_route.ts
index 37b5fe44b919c..1ccb948d0ad21 100644
--- a/x-pack/plugins/lists/server/routes/find_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { findListItemSchema, foundListItemSchema } from '../../common/schemas';
import { decodeCursor } from '../services/utils';
diff --git a/x-pack/plugins/lists/server/routes/find_list_route.ts b/x-pack/plugins/lists/server/routes/find_list_route.ts
index 04b33e3d67075..2fa43c6368b5c 100644
--- a/x-pack/plugins/lists/server/routes/find_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/find_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { findListSchema, foundListSchema } from '../../common/schemas';
import { decodeCursor } from '../services/utils';
diff --git a/x-pack/plugins/lists/server/routes/import_list_item_route.ts b/x-pack/plugins/lists/server/routes/import_list_item_route.ts
index c951c9b337131..67f345c2c6c1d 100644
--- a/x-pack/plugins/lists/server/routes/import_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/import_list_item_route.ts
@@ -9,12 +9,8 @@ import { Readable } from 'stream';
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { importListItemQuerySchema, importListItemSchema, listSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/patch_list_item_route.ts b/x-pack/plugins/lists/server/routes/patch_list_item_route.ts
index e18fd0618b133..f706559dffdbd 100644
--- a/x-pack/plugins/lists/server/routes/patch_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/patch_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { listItemSchema, patchListItemSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/patch_list_route.ts b/x-pack/plugins/lists/server/routes/patch_list_route.ts
index 9d3fa4db8ccd0..3a0d8714a14cd 100644
--- a/x-pack/plugins/lists/server/routes/patch_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/patch_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { listSchema, patchListSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts
index 083d4d7a0d479..c4e969b27fcf4 100644
--- a/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_exception_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
ReadExceptionListItemSchemaDecoded,
exceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/routes/read_exception_list_route.ts b/x-pack/plugins/lists/server/routes/read_exception_list_route.ts
index c295f045b38c2..6cb91c10aea55 100644
--- a/x-pack/plugins/lists/server/routes/read_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_exception_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
ReadExceptionListSchemaDecoded,
exceptionListSchema,
diff --git a/x-pack/plugins/lists/server/routes/read_list_index_route.ts b/x-pack/plugins/lists/server/routes/read_list_index_route.ts
index 21f539d97fc74..4664bed3e7a8b 100644
--- a/x-pack/plugins/lists/server/routes/read_list_index_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_list_index_route.ts
@@ -7,7 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_INDEX } from '../../common/constants';
-import { buildSiemResponse, transformError, validate } from '../siem_server_deps';
+import { buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { listItemIndexExistSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/read_list_item_route.ts b/x-pack/plugins/lists/server/routes/read_list_item_route.ts
index 10c7f781f554c..24011d3b50d27 100644
--- a/x-pack/plugins/lists/server/routes/read_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_list_item_route.ts
@@ -7,13 +7,9 @@
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
import { listItemArraySchema, listItemSchema, readListItemSchema } from '../../common/schemas';
+import { validate } from '../../common/siem_common_deps';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/read_list_route.ts b/x-pack/plugins/lists/server/routes/read_list_route.ts
index c30eadfca0b65..34924b70fd4df 100644
--- a/x-pack/plugins/lists/server/routes/read_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/read_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { listSchema, readListSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts b/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts
index 73392c326056e..0ec33b7651982 100644
--- a/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_exception_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
UpdateExceptionListItemSchemaDecoded,
exceptionListItemSchema,
diff --git a/x-pack/plugins/lists/server/routes/update_exception_list_route.ts b/x-pack/plugins/lists/server/routes/update_exception_list_route.ts
index fe45d403c040f..cff78614d05ba 100644
--- a/x-pack/plugins/lists/server/routes/update_exception_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_exception_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { EXCEPTION_LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import {
UpdateExceptionListSchemaDecoded,
exceptionListSchema,
diff --git a/x-pack/plugins/lists/server/routes/update_list_item_route.ts b/x-pack/plugins/lists/server/routes/update_list_item_route.ts
index 494d57b93b8e4..3e231e319104b 100644
--- a/x-pack/plugins/lists/server/routes/update_list_item_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_list_item_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_ITEM_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { listItemSchema, updateListItemSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/routes/update_list_route.ts b/x-pack/plugins/lists/server/routes/update_list_route.ts
index 6ace61e46a780..a6d9f8329c7c8 100644
--- a/x-pack/plugins/lists/server/routes/update_list_route.ts
+++ b/x-pack/plugins/lists/server/routes/update_list_route.ts
@@ -7,12 +7,8 @@
import { IRouter } from 'kibana/server';
import { LIST_URL } from '../../common/constants';
-import {
- buildRouteValidation,
- buildSiemResponse,
- transformError,
- validate,
-} from '../siem_server_deps';
+import { buildRouteValidation, buildSiemResponse, transformError } from '../siem_server_deps';
+import { validate } from '../../common/siem_common_deps';
import { listSchema, updateListSchema } from '../../common/schemas';
import { getListClient } from '.';
diff --git a/x-pack/plugins/lists/server/siem_server_deps.ts b/x-pack/plugins/lists/server/siem_server_deps.ts
index df4b07fc46322..87a623c7a1892 100644
--- a/x-pack/plugins/lists/server/siem_server_deps.ts
+++ b/x-pack/plugins/lists/server/siem_server_deps.ts
@@ -17,5 +17,4 @@ export {
createBootstrapIndex,
getIndexExists,
buildRouteValidation,
- validate,
} from '../../security_solution/server';
diff --git a/x-pack/plugins/security_solution/common/validate.test.ts b/x-pack/plugins/security_solution/common/validate.test.ts
new file mode 100644
index 0000000000000..032f6d9590168
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/validate.test.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+
+import { validate } from './validate';
+
+describe('validate', () => {
+ test('it should do a validation correctly', () => {
+ const schema = t.exact(t.type({ a: t.number }));
+ const payload = { a: 1 };
+ const [validated, errors] = validate(payload, schema);
+
+ expect(validated).toEqual(payload);
+ expect(errors).toEqual(null);
+ });
+
+ test('it should do an in-validation correctly', () => {
+ const schema = t.exact(t.type({ a: t.number }));
+ const payload = { a: 'some other value' };
+ const [validated, errors] = validate(payload, schema);
+
+ expect(validated).toEqual(null);
+ expect(errors).toEqual('Invalid value "some other value" supplied to "a"');
+ });
+});
diff --git a/x-pack/plugins/security_solution/common/validate.ts b/x-pack/plugins/security_solution/common/validate.ts
new file mode 100644
index 0000000000000..db9e286e2ebc2
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/validate.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { fold } from 'fp-ts/lib/Either';
+import { pipe } from 'fp-ts/lib/pipeable';
+import * as t from 'io-ts';
+import { exactCheck } from './exact_check';
+import { formatErrors } from './format_errors';
+
+export const validate = (
+ obj: object,
+ schema: T
+): [t.TypeOf | null, string | null] => {
+ const decoded = schema.decode(obj);
+ const checked = exactCheck(obj, decoded);
+ const left = (errors: t.Errors): [T | null, string | null] => [
+ null,
+ formatErrors(errors).join(','),
+ ];
+ const right = (output: T): [T | null, string | null] => [output, null];
+ return pipe(checked, fold(left, right));
+};
diff --git a/x-pack/plugins/security_solution/server/index.ts b/x-pack/plugins/security_solution/server/index.ts
index 586b9dec2f4ab..8a77137c20c11 100644
--- a/x-pack/plugins/security_solution/server/index.ts
+++ b/x-pack/plugins/security_solution/server/index.ts
@@ -27,5 +27,4 @@ export { getPolicyExists } from './lib/detection_engine/index/get_policy_exists'
export { createBootstrapIndex } from './lib/detection_engine/index/create_bootstrap_index';
export { getIndexExists } from './lib/detection_engine/index/get_index_exists';
export { buildRouteValidation } from './utils/build_validation/route_validation';
-export { validate } from './lib/detection_engine/routes/rules/validate';
export { transformError, buildSiemResponse } from './lib/detection_engine/routes/utils';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
index 39eea16c6290a..9878521c49322 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { validate } from '../../../../../common/validate';
import {
PrePackagedRulesSchema,
prePackagedRulesSchema,
@@ -18,7 +19,6 @@ import { updatePrepackagedRules } from '../../rules/update_prepacked_rules';
import { getRulesToInstall } from '../../rules/get_rules_to_install';
import { getRulesToUpdate } from '../../rules/get_rules_to_update';
import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackaged_rules';
-import { validate } from './validate';
export const addPrepackedRulesRoute = (router: IRouter) => {
router.put(
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
index 7af58adca7529..92a7ea17e7eaf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { validate } from '../../../../../common/validate';
import { createRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/create_rules_type_dependents';
import { RuleAlertAction } from '../../../../../common/detection_engine/types';
import {
@@ -19,7 +20,7 @@ import { throwHttpError } from '../../../machine_learning/validation';
import { createRules } from '../../rules/create_rules';
import { readRules } from '../../rules/read_rules';
import { getDuplicates } from './utils';
-import { transformValidateBulkError, validate } from './validate';
+import { transformValidateBulkError } from './validate';
import { getIndexExists } from '../../index/get_index_exists';
import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
index 12f908ce7e8b5..99bf16aadc815 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { validate } from '../../../../../common/validate';
import { queryRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/query_rules_type_dependents';
import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
import {
@@ -14,7 +15,7 @@ import { rulesBulkSchema } from '../../../../../common/detection_engine/schemas/
import { IRouter, RouteConfig, RequestHandler } from '../../../../../../../../src/core/server';
import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
import { getIdBulkError } from './utils';
-import { transformValidateBulkError, validate } from './validate';
+import { transformValidateBulkError } from './validate';
import { transformBulkError, buildSiemResponse, createBulkErrorObject } from '../utils';
import { deleteRules } from '../../rules/delete_rules';
import { deleteNotifications } from '../../notifications/delete_notifications';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
index c3f4695a20461..bc199ee132e96 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { validate } from '../../../../../common/validate';
import {
PrePackagedRulesStatusSchema,
prePackagedRulesStatusSchema,
@@ -16,7 +17,6 @@ import { getRulesToInstall } from '../../rules/get_rules_to_install';
import { getRulesToUpdate } from '../../rules/get_rules_to_update';
import { findRules } from '../../rules/find_rules';
import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackaged_rules';
-import { validate } from './validate';
export const getPrepackagedRulesStatusRoute = (router: IRouter) => {
router.get(
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
index c8b61414608a9..a277f97ccf9f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -7,6 +7,7 @@
import { chunk } from 'lodash/fp';
import { extname } from 'path';
+import { validate } from '../../../../../common/validate';
import {
importRulesQuerySchema,
ImportRulesQuerySchemaDecoded,
@@ -39,7 +40,6 @@ import {
} from '../utils';
import { patchRules } from '../../rules/patch_rules';
import { getTupleDuplicateErrorsAndUniqueRules } from './utils';
-import { validate } from './validate';
import { createRulesStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
import { HapiReadableStream } from '../../rules/types';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
index 16f491547a9e6..b2a9fdd103a68 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { validate } from '../../../../../common/validate';
import { RuleAlertAction } from '../../../../../common/detection_engine/types';
import {
patchRulesBulkSchema,
@@ -18,7 +19,7 @@ import { buildMlAuthz } from '../../../machine_learning/authz';
import { throwHttpError } from '../../../machine_learning/validation';
import { transformBulkError, buildSiemResponse } from '../utils';
import { getIdBulkError } from './utils';
-import { transformValidateBulkError, validate } from './validate';
+import { transformValidateBulkError } from './validate';
import { patchRules } from '../../rules/patch_rules';
import { updateRulesNotifications } from '../../rules/update_rules_notifications';
import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
index 3ca4a28dd93ee..1e6815a357154 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import { validate } from '../../../../../common/validate';
import { updateRuleValidateTypeDependents } from '../../../../../common/detection_engine/schemas/request/update_rules_type_dependents';
import { RuleAlertAction } from '../../../../../common/detection_engine/types';
import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
@@ -18,7 +19,7 @@ import { SetupPlugins } from '../../../../plugin';
import { buildMlAuthz } from '../../../machine_learning/authz';
import { throwHttpError } from '../../../machine_learning/validation';
import { getIdBulkError } from './utils';
-import { transformValidateBulkError, validate } from './validate';
+import { transformValidateBulkError } from './validate';
import { transformBulkError, buildSiemResponse, createBulkErrorObject } from '../utils';
import { updateRules } from '../../rules/update_rules';
import { updateRulesNotifications } from '../../rules/update_rules_notifications';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts
index 07b891e2bf021..1f5442e23d884 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts
@@ -4,10 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import * as t from 'io-ts';
-
import {
- validate,
transformValidate,
transformValidateFindAlerts,
transformValidateBulkError,
@@ -121,26 +118,6 @@ describe('validate', () => {
unSetFeatureFlagsForTestsOnly();
});
- describe('validate', () => {
- test('it should do a validation correctly', () => {
- const schema = t.exact(t.type({ a: t.number }));
- const payload = { a: 1 };
- const [validated, errors] = validate(payload, schema);
-
- expect(validated).toEqual(payload);
- expect(errors).toEqual(null);
- });
-
- test('it should do an in-validation correctly', () => {
- const schema = t.exact(t.type({ a: t.number }));
- const payload = { a: 'some other value' };
- const [validated, errors] = validate(payload, schema);
-
- expect(validated).toEqual(null);
- expect(errors).toEqual('Invalid value "some other value" supplied to "a"');
- });
- });
-
describe('transformValidate', () => {
test('it should do a validation correctly of a partial alert', () => {
const ruleAlert = getResult();
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
index 7b0bf5997d12f..983382b28ab38 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.ts
@@ -9,6 +9,7 @@ import { fold } from 'fp-ts/lib/Either';
import { pipe } from 'fp-ts/lib/pipeable';
import * as t from 'io-ts';
+import { validate } from '../../../../../common/validate';
import { findRulesSchema } from '../../../../../common/detection_engine/schemas/response/find_rules_schema';
import {
RulesSchema,
@@ -113,17 +114,3 @@ export const transformValidateBulkError = (
});
}
};
-
-export const validate = (
- obj: object,
- schema: T
-): [t.TypeOf | null, string | null] => {
- const decoded = schema.decode(obj);
- const checked = exactCheck(obj, decoded);
- const left = (errors: t.Errors): [T | null, string | null] => [
- null,
- formatErrors(errors).join(','),
- ];
- const right = (output: T): [T | null, string | null] => [output, null];
- return pipe(checked, fold(left, right));
-};
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
index 0f9e97cfc2106..5080142f22b15 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
@@ -7,6 +7,7 @@
import { extname } from 'path';
import { chunk, omit } from 'lodash/fp';
+import { validate } from '../../../../common/validate';
import { importRulesSchema } from '../../../../common/detection_engine/schemas/response/import_rules_schema';
import { createPromiseFromStreams } from '../../../../../../../src/legacy/utils';
import { IRouter } from '../../../../../../../src/core/server';
@@ -17,7 +18,6 @@ import { SetupPlugins } from '../../../plugin';
import { ConfigType } from '../../../config';
import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
-import { validate } from '../../detection_engine/routes/rules/validate';
import {
buildSiemResponse,
createBulkErrorObject,
From 9f7620b84dd0707666b6c2d20e3c98b1d0d8eb03 Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko
Date: Tue, 16 Jun 2020 20:15:01 +0200
Subject: [PATCH 09/41] [QA] Code coverage: fix flaky tests (#69272)
* skip test
* [page_objects/common_page] update closing toast
---
test/functional/apps/dashboard/dashboard_filter_bar.js | 2 ++
test/functional/page_objects/common_page.ts | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
index c931e6763f483..f9b0d0a370c06 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.js
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.js
@@ -170,6 +170,8 @@ export default function ({ getService, getPageObjects }) {
});
describe('saved search filtering', function () {
+ // https://github.com/elastic/kibana/issues/47286#issuecomment-644687577
+ this.tags('skipCoverage');
before(async () => {
await filterBar.ensureFieldEditorModalIsClosed();
await PageObjects.dashboard.gotoDashboardLandingPage();
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index fe5694efc35da..d08e88ecf47ea 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -409,7 +409,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
async closeToastIfExists() {
const toastShown = await find.existsByCssSelector('.euiToast');
if (toastShown) {
- await this.closeToast();
+ await find.clickByCssSelector('.euiToast__closeButton');
}
}
From efbb4ccc31f314f51b2f10663a5635cbed78e148 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez
Date: Tue, 16 Jun 2020 14:29:11 -0400
Subject: [PATCH 10/41] use navigateToUrl instead of window location (#69167)
---
.../back_to_list_panel/back_to_list_panel.tsx | 57 +++++++++++--------
.../analytics_list/action_clone.tsx | 18 ++++--
.../source_selection/source_selection.tsx | 18 ++++--
3 files changed, 59 insertions(+), 34 deletions(-)
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
index e437d27372a3e..b6b335afa53f5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
@@ -7,29 +7,38 @@
import React, { FC, Fragment } from 'react';
import { EuiCard, EuiHorizontalRule, EuiIcon } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
+import { useMlKibana } from '../../../../../contexts/kibana';
-function redirectToAnalyticsManagementPage() {
- window.location.href = '#/data_frame_analytics?';
-}
+export const BackToListPanel: FC = () => {
+ const {
+ services: {
+ application: { navigateToUrl },
+ },
+ } = useMlKibana();
-export const BackToListPanel: FC = () => (
-
-
- }
- title={i18n.translate('xpack.ml.dataframe.analytics.create.analyticsListCardTitle', {
- defaultMessage: 'Data Frame Analytics',
- })}
- description={i18n.translate(
- 'xpack.ml.dataframe.analytics.create.analyticsListCardDescription',
- {
- defaultMessage: 'Return to the analytics management page.',
- }
- )}
- onClick={redirectToAnalyticsManagementPage}
- data-test-subj="analyticsWizardCardManagement"
- />
-
-);
+ const redirectToAnalyticsManagementPage = async () => {
+ await navigateToUrl('#/data_frame_analytics?');
+ };
+
+ return (
+
+
+ }
+ title={i18n.translate('xpack.ml.dataframe.analytics.create.analyticsListCardTitle', {
+ defaultMessage: 'Data Frame Analytics',
+ })}
+ description={i18n.translate(
+ 'xpack.ml.dataframe.analytics.create.analyticsListCardDescription',
+ {
+ defaultMessage: 'Return to the analytics management page.',
+ }
+ )}
+ onClick={redirectToAnalyticsManagementPage}
+ data-test-subj="analyticsWizardCardManagement"
+ />
+
+ );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/action_clone.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/action_clone.tsx
index e8b1cd1a5696a..df7dce7217fd4 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/action_clone.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/action_clone.tsx
@@ -360,7 +360,14 @@ export const CloneAction: FC = ({ createAnalyticsForm, item })
defaultMessage: 'Clone job',
});
- const { notifications, savedObjects } = useMlKibana().services;
+ const {
+ services: {
+ application: { navigateToUrl },
+ notifications: { toasts },
+ savedObjects,
+ },
+ } = useMlKibana();
+
const savedObjectsClient = savedObjects.client;
const onClick = async () => {
@@ -385,7 +392,6 @@ export const CloneAction: FC = ({ createAnalyticsForm, item })
sourceIndexId = ip.id;
}
} catch (e) {
- const { toasts } = notifications;
const error = extractErrorMessage(e);
toasts.addDanger(
@@ -401,9 +407,11 @@ export const CloneAction: FC = ({ createAnalyticsForm, item })
}
if (sourceIndexId) {
- window.location.href = `ml#/data_frame_analytics/new_job?index=${encodeURIComponent(
- sourceIndexId
- )}&jobId=${item.config.id}`;
+ await navigateToUrl(
+ `ml#/data_frame_analytics/new_job?index=${encodeURIComponent(sourceIndexId)}&jobId=${
+ item.config.id
+ }`
+ );
}
};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
index d20afe93d2b9d..b03a58a02309d 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
@@ -26,12 +26,20 @@ interface Props {
}
export const SourceSelection: FC = ({ onClose }) => {
- const { uiSettings, savedObjects } = useMlKibana().services;
+ const {
+ services: {
+ application: { navigateToUrl },
+ savedObjects,
+ uiSettings,
+ },
+ } = useMlKibana();
- const onSearchSelected = (id: string, type: string) => {
- window.location.href = `ml#/data_frame_analytics/new_job?${
- type === 'index-pattern' ? 'index' : 'savedSearchId'
- }=${encodeURIComponent(id)}`;
+ const onSearchSelected = async (id: string, type: string) => {
+ await navigateToUrl(
+ `ml#/data_frame_analytics/new_job?${
+ type === 'index-pattern' ? 'index' : 'savedSearchId'
+ }=${encodeURIComponent(id)}`
+ );
};
return (
From db1df7bed03f624dca78630830b9bb0395666b20 Mon Sep 17 00:00:00 2001
From: Spencer
Date: Tue, 16 Jun 2020 12:57:34 -0700
Subject: [PATCH 11/41] [kbn/optimizer] fix windows compatibility (#69304)
Co-authored-by: spalger
---
.../src/optimizer/observe_worker.ts | 66 +++++++++++++++----
.../src/worker/entry_point_creator.ts | 10 ++-
.../kbn-optimizer/src/worker/run_worker.ts | 38 +++++++++--
.../src/worker/webpack.config.ts | 14 ++--
4 files changed, 102 insertions(+), 26 deletions(-)
diff --git a/packages/kbn-optimizer/src/optimizer/observe_worker.ts b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
index 4527052fa821a..fef3efc13a516 100644
--- a/packages/kbn-optimizer/src/optimizer/observe_worker.ts
+++ b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
@@ -22,7 +22,7 @@ import { inspect } from 'util';
import execa from 'execa';
import * as Rx from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil, first, ignoreElements } from 'rxjs/operators';
import { isWorkerMsg, WorkerConfig, WorkerMsg, Bundle, BundleRefs } from '../common';
@@ -68,19 +68,11 @@ if (inspectFlagIndex !== -1) {
function usingWorkerProc(
config: OptimizerConfig,
- workerConfig: WorkerConfig,
- bundles: Bundle[],
fn: (proc: execa.ExecaChildProcess) => Rx.Observable
) {
return Rx.using(
(): ProcResource => {
- const args = [
- JSON.stringify(workerConfig),
- JSON.stringify(bundles.map((b) => b.toSpec())),
- BundleRefs.fromBundles(config.bundles).toSpecJson(),
- ];
-
- const proc = execa.node(require.resolve('../worker/run_worker'), args, {
+ const proc = execa.node(require.resolve('../worker/run_worker'), [], {
nodeOptions: [
...(inspectFlag && config.inspectWorkers
? [`${inspectFlag}=${inspectPortCounter++}`]
@@ -129,6 +121,51 @@ function observeStdio$(stream: Readable, name: WorkerStdio['stream']) {
);
}
+/**
+ * We used to pass configuration to the worker as JSON encoded arguments, but they
+ * grew too large for argv, especially on Windows, so we had to move to an async init
+ * where we send the args over IPC. To keep the logic simple we basically mock the
+ * argv behavior and don't use complicated messages or anything so that state can
+ * be initialized in the worker before most of the code is run.
+ */
+function initWorker(
+ proc: execa.ExecaChildProcess,
+ config: OptimizerConfig,
+ workerConfig: WorkerConfig,
+ bundles: Bundle[]
+) {
+ const msg$ = Rx.fromEvent<[unknown]>(proc, 'message').pipe(
+ // validate the initialization messages from the process
+ map(([msg]) => {
+ if (typeof msg === 'string') {
+ switch (msg) {
+ case 'init':
+ return 'init' as const;
+ case 'ready':
+ return 'ready' as const;
+ }
+ }
+
+ throw new Error(`unexpected message from worker while initializing: [${inspect(msg)}]`);
+ })
+ );
+
+ return Rx.concat(
+ msg$.pipe(first((msg) => msg === 'init')),
+ Rx.defer(() => {
+ proc.send({
+ args: [
+ JSON.stringify(workerConfig),
+ JSON.stringify(bundles.map((b) => b.toSpec())),
+ BundleRefs.fromBundles(config.bundles).toSpecJson(),
+ ],
+ });
+ return [];
+ }),
+ msg$.pipe(first((msg) => msg === 'ready'))
+ ).pipe(ignoreElements());
+}
+
/**
* Start a worker process with the specified `workerConfig` and
* `bundles` and return an observable of the events related to
@@ -140,10 +177,11 @@ export function observeWorker(
workerConfig: WorkerConfig,
bundles: Bundle[]
): Rx.Observable {
- return usingWorkerProc(config, workerConfig, bundles, (proc) => {
- let lastMsg: WorkerMsg;
+ return usingWorkerProc(config, (proc) => {
+ const init$ = initWorker(proc, config, workerConfig, bundles);
- return Rx.merge(
+ let lastMsg: WorkerMsg;
+ const worker$: Rx.Observable = Rx.merge(
Rx.of({
type: 'worker started',
bundles,
@@ -201,5 +239,7 @@ export function observeWorker(
)
)
);
+
+ return Rx.concat(init$, worker$);
});
}
diff --git a/packages/kbn-optimizer/src/worker/entry_point_creator.ts b/packages/kbn-optimizer/src/worker/entry_point_creator.ts
index a613e3e8925a4..f8f41b2e13422 100644
--- a/packages/kbn-optimizer/src/worker/entry_point_creator.ts
+++ b/packages/kbn-optimizer/src/worker/entry_point_creator.ts
@@ -17,9 +17,13 @@
* under the License.
*/
-module.exports = function ({ entries }: { entries: Array<{ importId: string; relPath: string }> }) {
- const lines = entries.map(({ importId, relPath }) => [
- `__kbnBundles__.define('${importId}', __webpack_require__, require.resolve('./${relPath}'))`,
+module.exports = function ({
+ entries,
+}: {
+ entries: Array<{ importId: string; requirePath: string }>;
+}) {
+ const lines = entries.map(({ importId, requirePath }) => [
+ `__kbnBundles__.define('${importId}', __webpack_require__, require.resolve('${requirePath}'))`,
]);
return {
diff --git a/packages/kbn-optimizer/src/worker/run_worker.ts b/packages/kbn-optimizer/src/worker/run_worker.ts
index 178637d39ab00..781cf83624a1e 100644
--- a/packages/kbn-optimizer/src/worker/run_worker.ts
+++ b/packages/kbn-optimizer/src/worker/run_worker.ts
@@ -17,7 +17,10 @@
* under the License.
*/
+import { inspect } from 'util';
+
import * as Rx from 'rxjs';
+import { take, mergeMap } from 'rxjs/operators';
import {
parseBundles,
@@ -80,15 +83,38 @@ setInterval(() => {
}
}, 1000).unref();
+function assertInitMsg(msg: unknown): asserts msg is { args: string[] } {
+ if (typeof msg !== 'object' || !msg) {
+ throw new Error(`expected init message to be an object: ${inspect(msg)}`);
+ }
+
+ const { args } = msg as Record;
+ if (!args || !Array.isArray(args) || !args.every((a) => typeof a === 'string')) {
+ throw new Error(
+ `expected init message to have an 'args' property that's an array of strings: ${inspect(msg)}`
+ );
+ }
+}
+
Rx.defer(() => {
- const workerConfig = parseWorkerConfig(process.argv[2]);
- const bundles = parseBundles(process.argv[3]);
- const bundleRefs = BundleRefs.parseSpec(process.argv[4]);
+ process.send!('init');
+
+ return Rx.fromEvent<[unknown]>(process as any, 'message').pipe(
+ take(1),
+ mergeMap(([msg]) => {
+ assertInitMsg(msg);
+ process.send!('ready');
+
+ const workerConfig = parseWorkerConfig(msg.args[0]);
+ const bundles = parseBundles(msg.args[1]);
+ const bundleRefs = BundleRefs.parseSpec(msg.args[2]);
- // set BROWSERSLIST_ENV so that style/babel loaders see it before running compilers
- process.env.BROWSERSLIST_ENV = workerConfig.browserslistEnv;
+ // set BROWSERSLIST_ENV so that style/babel loaders see it before running compilers
+ process.env.BROWSERSLIST_ENV = workerConfig.browserslistEnv;
- return runCompilers(workerConfig, bundles, bundleRefs);
+ return runCompilers(workerConfig, bundles, bundleRefs);
+ })
+ );
}).subscribe(
(msg) => {
send(msg);
diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
index e361b186c30e0..11f5544cd9274 100644
--- a/packages/kbn-optimizer/src/worker/webpack.config.ts
+++ b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -100,10 +100,16 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
entries: bundle.publicDirNames.map((name) => {
const absolute = Path.resolve(bundle.contextDir, name);
const newContext = Path.dirname(ENTRY_CREATOR);
- return {
- importId: `${bundle.type}/${bundle.id}/${name}`,
- relPath: Path.relative(newContext, absolute),
- };
+ const importId = `${bundle.type}/${bundle.id}/${name}`;
+
+ // relative path from context of the ENTRY_CREATOR, with linux path separators
+ let requirePath = Path.relative(newContext, absolute).split('\\').join('/');
+ if (!requirePath.startsWith('.')) {
+ // ensure requirePath is identified by node as relative
+ requirePath = `./${requirePath}`;
+ }
+
+ return { importId, requirePath };
}),
},
},
From ade4c8dded247e4d29b9eb5b9baa934e214aa676 Mon Sep 17 00:00:00 2001
From: Lukas Olson
Date: Tue, 16 Jun 2020 13:20:52 -0700
Subject: [PATCH 12/41] [Search service] Refactor the way server-side search
strategies are registered (#68452)
* [search] Refactor the way search strategies are registered/retrieved on the server
* Fix types and tests and update docs
* Fix failing test
* Fix build of example plugin
* Fix functional test
* Make server strategies sync
Co-authored-by: Liza K
---
...in-plugins-data-server.irequesttypesmap.md | 2 +
...n-plugins-data-server.iresponsetypesmap.md | 2 +
...bana-plugin-plugins-data-server.isearch.md | 2 +-
...lugin-plugins-data-server.isearchcancel.md | 2 +-
...gins-data-server.isearchcontext.config_.md | 11 --
...plugins-data-server.isearchcontext.core.md | 11 --
...ugin-plugins-data-server.isearchcontext.md | 19 ---
...ugin-plugins-data-server.isearchoptions.md | 2 +-
...ugins-data-server.isearchoptions.signal.md | 2 +
...plugin-plugins-data-server.isearchsetup.md | 18 +++
...ver.isearchsetup.registersearchstrategy.md | 13 ++
...a-server.isearchstart.getsearchstrategy.md | 13 ++
...plugin-plugins-data-server.isearchstart.md | 18 +++
...gins-data-server.isearchstrategy.cancel.md | 11 ++
...gin-plugins-data-server.isearchstrategy.md | 21 ++++
...gins-data-server.isearchstrategy.search.md | 11 ++
.../kibana-plugin-plugins-data-server.md | 10 +-
...plugin-plugins-data-server.plugin.setup.md | 8 +-
...plugin-plugins-data-server.plugin.start.md | 6 +-
...-plugin-plugins-data-server.pluginstart.md | 1 +
...-plugins-data-server.pluginstart.search.md | 11 ++
...ins-data-server.tsearchstrategyprovider.md | 13 --
...ugin-plugins-data-server.tstrategytypes.md | 19 +++
.../server/async_demo_search_strategy.ts | 50 ++++----
.../server/demo_search_strategy.ts | 8 +-
examples/demo_search/server/index.ts | 5 +-
examples/demo_search/server/plugin.ts | 15 +--
.../search_explorer/public/search_api.tsx | 13 --
.../mocks.ts} | 13 +-
src/plugins/data/server/index.ts | 6 +-
.../{search/i_search_context.ts => mocks.ts} | 24 +++-
src/plugins/data/server/plugin.ts | 11 +-
.../data/server/search/create_api.test.ts | 71 -----------
src/plugins/data/server/search/create_api.ts | 58 ---------
.../es_search/es_search_strategy.test.ts | 55 +++------
.../search/es_search/es_search_strategy.ts | 22 ++--
src/plugins/data/server/search/i_search.ts | 55 ---------
.../data/server/search/i_search_setup.ts | 40 -------
.../data/server/search/i_search_strategy.ts | 67 -----------
src/plugins/data/server/search/index.ts | 14 +--
src/plugins/data/server/search/mocks.ts | 18 +--
src/plugins/data/server/search/routes.test.ts | 67 ++++-------
src/plugins/data/server/search/routes.ts | 19 ++-
.../data/server/search/search_service.test.ts | 19 +--
.../data/server/search/search_service.ts | 92 +++++----------
.../data/server/search/strategy_types.ts | 39 ------
src/plugins/data/server/search/types.ts | 111 ++++++++++++++++++
src/plugins/data/server/server.api.md | 75 +++++++-----
.../core_plugins/legacy_plugins.ts | 2 +-
x-pack/plugins/data_enhanced/server/plugin.ts | 5 +-
.../server/search/es_search_strategy.test.ts | 69 +++--------
.../server/search/es_search_strategy.ts | 24 ++--
52 files changed, 552 insertions(+), 741 deletions(-)
delete mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.config_.md
delete mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.core.md
delete mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.registersearchstrategy.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.cancel.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.search.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.search.md
delete mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tsearchstrategyprovider.md
create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tstrategytypes.md
rename src/plugins/data/server/{search/i_route_handler_search_context.ts => field_formats/mocks.ts} (80%)
rename src/plugins/data/server/{search/i_search_context.ts => mocks.ts} (60%)
delete mode 100644 src/plugins/data/server/search/create_api.test.ts
delete mode 100644 src/plugins/data/server/search/create_api.ts
delete mode 100644 src/plugins/data/server/search/i_search.ts
delete mode 100644 src/plugins/data/server/search/i_search_setup.ts
delete mode 100644 src/plugins/data/server/search/i_search_strategy.ts
delete mode 100644 src/plugins/data/server/search/strategy_types.ts
create mode 100644 src/plugins/data/server/search/types.ts
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.irequesttypesmap.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.irequesttypesmap.md
index a9bb8f1eb9d6d..3f5e4ba0f7799 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.irequesttypesmap.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.irequesttypesmap.md
@@ -4,6 +4,8 @@
## IRequestTypesMap interface
+The map of search strategy IDs to the corresponding request type definitions.
+
Signature:
```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iresponsetypesmap.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iresponsetypesmap.md
index fe5fa0a5d3a33..629ab4347eda8 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iresponsetypesmap.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iresponsetypesmap.md
@@ -4,6 +4,8 @@
## IResponseTypesMap interface
+The map of search strategy IDs to the corresponding response type definitions.
+
Signature:
```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearch.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearch.md
index 6e037f5161b53..96991579c1716 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearch.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearch.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-export declare type ISearch = (request: IRequestTypesMap[T], options?: ISearchOptions) => Promise;
+export declare type ISearch = (context: RequestHandlerContext, request: IRequestTypesMap[T], options?: ISearchOptions) => Promise;
```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcancel.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcancel.md
index 99c30515e8da6..b5a687d1b19d8 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcancel.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcancel.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-export declare type ISearchCancel = (id: string) => Promise;
+export declare type ISearchCancel = (context: RequestHandlerContext, id: string) => Promise;
```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.config_.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.config_.md
deleted file mode 100644
index 364d44dba758a..0000000000000
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.config_.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchContext](./kibana-plugin-plugins-data-server.isearchcontext.md) > [config$](./kibana-plugin-plugins-data-server.isearchcontext.config_.md)
-
-## ISearchContext.config$ property
-
-Signature:
-
-```typescript
-config$: Observable;
-```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.core.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.core.md
deleted file mode 100644
index 9d571c25d94bd..0000000000000
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.core.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchContext](./kibana-plugin-plugins-data-server.isearchcontext.md) > [core](./kibana-plugin-plugins-data-server.isearchcontext.core.md)
-
-## ISearchContext.core property
-
-Signature:
-
-```typescript
-core: CoreSetup;
-```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.md
deleted file mode 100644
index 1c3c5ec78f894..0000000000000
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchcontext.md
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchContext](./kibana-plugin-plugins-data-server.isearchcontext.md)
-
-## ISearchContext interface
-
-Signature:
-
-```typescript
-export interface ISearchContext
-```
-
-## Properties
-
-| Property | Type | Description |
-| --- | --- | --- |
-| [config$](./kibana-plugin-plugins-data-server.isearchcontext.config_.md) | Observable<SharedGlobalConfig> | |
-| [core](./kibana-plugin-plugins-data-server.isearchcontext.core.md) | CoreSetup | |
-
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md
index 0319048f4418b..49412fc42d3b5 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md
@@ -14,5 +14,5 @@ export interface ISearchOptions
| Property | Type | Description |
| --- | --- | --- |
-| [signal](./kibana-plugin-plugins-data-server.isearchoptions.signal.md) | AbortSignal | |
+| [signal](./kibana-plugin-plugins-data-server.isearchoptions.signal.md) | AbortSignal | An AbortSignal that allows the caller of search to abort a search request. |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md
index 7da5c182b2e0f..948dfd66da7a0 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md
@@ -4,6 +4,8 @@
## ISearchOptions.signal property
+An `AbortSignal` that allows the caller of `search` to abort a search request.
+
Signature:
```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.md
new file mode 100644
index 0000000000000..93e253b2e98a3
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.md
@@ -0,0 +1,18 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchSetup](./kibana-plugin-plugins-data-server.isearchsetup.md)
+
+## ISearchSetup interface
+
+Signature:
+
+```typescript
+export interface ISearchSetup
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [registerSearchStrategy](./kibana-plugin-plugins-data-server.isearchsetup.registersearchstrategy.md) | TRegisterSearchStrategy | Extension point exposed for other plugins to register their own search strategies. |
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.registersearchstrategy.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.registersearchstrategy.md
new file mode 100644
index 0000000000000..c06b8b00806bf
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchsetup.registersearchstrategy.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchSetup](./kibana-plugin-plugins-data-server.isearchsetup.md) > [registerSearchStrategy](./kibana-plugin-plugins-data-server.isearchsetup.registersearchstrategy.md)
+
+## ISearchSetup.registerSearchStrategy property
+
+Extension point exposed for other plugins to register their own search strategies.
+
+Signature:
+
+```typescript
+registerSearchStrategy: TRegisterSearchStrategy;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md
new file mode 100644
index 0000000000000..0ba4bf578d6cc
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchStart](./kibana-plugin-plugins-data-server.isearchstart.md) > [getSearchStrategy](./kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md)
+
+## ISearchStart.getSearchStrategy property
+
+Get other registered search strategies. For example, if a new strategy needs to use the already-registered ES search strategy, it can use this function to accomplish that.
+
+Signature:
+
+```typescript
+getSearchStrategy: TGetSearchStrategy;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.md
new file mode 100644
index 0000000000000..abe72396f61e1
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstart.md
@@ -0,0 +1,18 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchStart](./kibana-plugin-plugins-data-server.isearchstart.md)
+
+## ISearchStart interface
+
+Signature:
+
+```typescript
+export interface ISearchStart
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [getSearchStrategy](./kibana-plugin-plugins-data-server.isearchstart.getsearchstrategy.md) | TGetSearchStrategy | Get other registered search strategies. For example, if a new strategy needs to use the already-registered ES search strategy, it can use this function to accomplish that. |
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.cancel.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.cancel.md
new file mode 100644
index 0000000000000..c1e0c3d9f2330
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.cancel.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchStrategy](./kibana-plugin-plugins-data-server.isearchstrategy.md) > [cancel](./kibana-plugin-plugins-data-server.isearchstrategy.cancel.md)
+
+## ISearchStrategy.cancel property
+
+Signature:
+
+```typescript
+cancel?: ISearchCancel;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.md
new file mode 100644
index 0000000000000..167c6ab6e5a16
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.md
@@ -0,0 +1,21 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchStrategy](./kibana-plugin-plugins-data-server.isearchstrategy.md)
+
+## ISearchStrategy interface
+
+Search strategy interface contains a search method that takes in a request and returns a promise that resolves to a response.
+
+Signature:
+
+```typescript
+export interface ISearchStrategy
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [cancel](./kibana-plugin-plugins-data-server.isearchstrategy.cancel.md) | ISearchCancel<T> | |
+| [search](./kibana-plugin-plugins-data-server.isearchstrategy.search.md) | ISearch<T> | |
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.search.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.search.md
new file mode 100644
index 0000000000000..34a17ca87807a
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchstrategy.search.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [ISearchStrategy](./kibana-plugin-plugins-data-server.isearchstrategy.md) > [search](./kibana-plugin-plugins-data-server.isearchstrategy.search.md)
+
+## ISearchStrategy.search property
+
+Signature:
+
+```typescript
+search: ISearch;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
index 0efbe8ed4ed64..f492ba2843a69 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md
@@ -39,10 +39,12 @@
| [IIndexPattern](./kibana-plugin-plugins-data-server.iindexpattern.md) | |
| [IndexPatternAttributes](./kibana-plugin-plugins-data-server.indexpatternattributes.md) | Use data plugin interface instead |
| [IndexPatternFieldDescriptor](./kibana-plugin-plugins-data-server.indexpatternfielddescriptor.md) | |
-| [IRequestTypesMap](./kibana-plugin-plugins-data-server.irequesttypesmap.md) | |
-| [IResponseTypesMap](./kibana-plugin-plugins-data-server.iresponsetypesmap.md) | |
-| [ISearchContext](./kibana-plugin-plugins-data-server.isearchcontext.md) | |
+| [IRequestTypesMap](./kibana-plugin-plugins-data-server.irequesttypesmap.md) | The map of search strategy IDs to the corresponding request type definitions. |
+| [IResponseTypesMap](./kibana-plugin-plugins-data-server.iresponsetypesmap.md) | The map of search strategy IDs to the corresponding response type definitions. |
| [ISearchOptions](./kibana-plugin-plugins-data-server.isearchoptions.md) | |
+| [ISearchSetup](./kibana-plugin-plugins-data-server.isearchsetup.md) | |
+| [ISearchStart](./kibana-plugin-plugins-data-server.isearchstart.md) | |
+| [ISearchStrategy](./kibana-plugin-plugins-data-server.isearchstrategy.md) | Search strategy interface contains a search method that takes in a request and returns a promise that resolves to a response. |
| [KueryNode](./kibana-plugin-plugins-data-server.kuerynode.md) | |
| [PluginSetup](./kibana-plugin-plugins-data-server.pluginsetup.md) | |
| [PluginStart](./kibana-plugin-plugins-data-server.pluginstart.md) | |
@@ -73,5 +75,5 @@
| [ISearch](./kibana-plugin-plugins-data-server.isearch.md) | |
| [ISearchCancel](./kibana-plugin-plugins-data-server.isearchcancel.md) | |
| [ParsedInterval](./kibana-plugin-plugins-data-server.parsedinterval.md) | |
-| [TSearchStrategyProvider](./kibana-plugin-plugins-data-server.tsearchstrategyprovider.md) | Search strategy provider creates an instance of a search strategy with the request handler context bound to it. This way every search strategy can use whatever information they require from the request context. |
+| [TStrategyTypes](./kibana-plugin-plugins-data-server.tstrategytypes.md) | Contains all known strategy type identifiers that will be used to map to request and response shapes. Plugins that wish to add their own custom search strategies should extend this type via:const MY\_STRATEGY = 'MY\_STRATEGY';declare module 'src/plugins/search/server' { export interface IRequestTypesMap { \[MY\_STRATEGY\]: IMySearchRequest; }export interface IResponseTypesMap { \[MY\_STRATEGY\]: IMySearchResponse } } |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
index bd617990a00a2..13c69d6bf7548 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
@@ -7,11 +7,11 @@
Signature:
```typescript
-setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
+setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
+ search: ISearchSetup;
fieldFormats: {
register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
};
- search: ISearchSetup;
};
```
@@ -19,15 +19,15 @@ setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
| Parameter | Type | Description |
| --- | --- | --- |
-| core | CoreSetup | |
+| core | CoreSetup<object, DataPluginStart> | |
| { usageCollection } | DataPluginSetupDependencies | |
Returns:
`{
+ search: ISearchSetup;
fieldFormats: {
register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
};
- search: ISearchSetup;
}`
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md
index 2a30cd3e68158..2c7a833ab641b 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.start.md
@@ -8,8 +8,9 @@
```typescript
start(core: CoreStart): {
+ search: ISearchStart;
fieldFormats: {
- fieldFormatServiceFactory: (uiSettings: import("kibana/server").IUiSettingsClient) => Promise;
+ fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise;
};
};
```
@@ -23,8 +24,9 @@ start(core: CoreStart): {
Returns:
`{
+ search: ISearchStart;
fieldFormats: {
- fieldFormatServiceFactory: (uiSettings: import("kibana/server").IUiSettingsClient) => Promise;
+ fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise;
};
}`
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.md
index b7d6a7e8a83fd..1377d82123d41 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.md
@@ -15,4 +15,5 @@ export interface DataPluginStart
| Property | Type | Description |
| --- | --- | --- |
| [fieldFormats](./kibana-plugin-plugins-data-server.pluginstart.fieldformats.md) | FieldFormatsStart | |
+| [search](./kibana-plugin-plugins-data-server.pluginstart.search.md) | ISearchStart | |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.search.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.search.md
new file mode 100644
index 0000000000000..3144d8c40b780
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.pluginstart.search.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [PluginStart](./kibana-plugin-plugins-data-server.pluginstart.md) > [search](./kibana-plugin-plugins-data-server.pluginstart.search.md)
+
+## PluginStart.search property
+
+Signature:
+
+```typescript
+search: ISearchStart;
+```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tsearchstrategyprovider.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tsearchstrategyprovider.md
deleted file mode 100644
index f528f48a68f72..0000000000000
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tsearchstrategyprovider.md
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [TSearchStrategyProvider](./kibana-plugin-plugins-data-server.tsearchstrategyprovider.md)
-
-## TSearchStrategyProvider type
-
-Search strategy provider creates an instance of a search strategy with the request handler context bound to it. This way every search strategy can use whatever information they require from the request context.
-
-Signature:
-
-```typescript
-export declare type TSearchStrategyProvider = (context: ISearchContext, caller: APICaller, search: ISearchGeneric) => ISearchStrategy;
-```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tstrategytypes.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tstrategytypes.md
new file mode 100644
index 0000000000000..443d8d1b424d0
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.tstrategytypes.md
@@ -0,0 +1,19 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [TStrategyTypes](./kibana-plugin-plugins-data-server.tstrategytypes.md)
+
+## TStrategyTypes type
+
+Contains all known strategy type identifiers that will be used to map to request and response shapes. Plugins that wish to add their own custom search strategies should extend this type via:
+
+const MY\_STRATEGY = 'MY\_STRATEGY';
+
+declare module 'src/plugins/search/server' { export interface IRequestTypesMap { \[MY\_STRATEGY\]: IMySearchRequest; }
+
+export interface IResponseTypesMap { \[MY\_STRATEGY\]: IMySearchResponse } }
+
+Signature:
+
+```typescript
+export declare type TStrategyTypes = typeof ES_SEARCH_STRATEGY | string;
+```
diff --git a/examples/demo_search/server/async_demo_search_strategy.ts b/examples/demo_search/server/async_demo_search_strategy.ts
index 7ed5062acba48..2eda0f4d09e11 100644
--- a/examples/demo_search/server/async_demo_search_strategy.ts
+++ b/examples/demo_search/server/async_demo_search_strategy.ts
@@ -17,30 +17,32 @@
* under the License.
*/
-import { TSearchStrategyProvider } from '../../../src/plugins/data/server';
-import { ASYNC_DEMO_SEARCH_STRATEGY } from '../common';
-
-function getFibonacciSequence(n = 0) {
- const beginning = [0, 1].slice(0, n);
- return Array(Math.max(0, n))
- .fill(null)
- .reduce((sequence, value, i) => {
- if (i < 2) return sequence;
- return [...sequence, sequence[i - 1] + sequence[i - 2]];
- }, beginning);
-}
-
-const generateId = (() => {
- let id = 0;
- return () => `${id++}`;
-})();
-
-const loadedMap = new Map();
-const totalMap = new Map();
-
-export const asyncDemoSearchStrategyProvider: TSearchStrategyProvider = () => {
+import { ISearchStrategy } from '../../../src/plugins/data/server';
+import { ASYNC_DEMO_SEARCH_STRATEGY, IAsyncDemoRequest } from '../common';
+
+export const asyncDemoSearchStrategyProvider = (): ISearchStrategy<
+ typeof ASYNC_DEMO_SEARCH_STRATEGY
+> => {
+ function getFibonacciSequence(n = 0) {
+ const beginning = [0, 1].slice(0, n);
+ return Array(Math.max(0, n))
+ .fill(null)
+ .reduce((sequence, value, i) => {
+ if (i < 2) return sequence;
+ return [...sequence, sequence[i - 1] + sequence[i - 2]];
+ }, beginning);
+ }
+
+ const generateId = (() => {
+ let id = 0;
+ return () => `${id++}`;
+ })();
+
+ const loadedMap = new Map();
+ const totalMap = new Map();
+
return {
- search: async (request) => {
+ search: async (context, request: IAsyncDemoRequest) => {
const id = request.id ?? generateId();
const loaded = (loadedMap.get(id) ?? 0) + 1;
@@ -52,7 +54,7 @@ export const asyncDemoSearchStrategyProvider: TSearchStrategyProvider {
+ cancel: async (context, id) => {
loadedMap.delete(id);
totalMap.delete(id);
},
diff --git a/examples/demo_search/server/demo_search_strategy.ts b/examples/demo_search/server/demo_search_strategy.ts
index a1fd0e45dbc8e..36280ad22e83c 100644
--- a/examples/demo_search/server/demo_search_strategy.ts
+++ b/examples/demo_search/server/demo_search_strategy.ts
@@ -17,12 +17,12 @@
* under the License.
*/
-import { TSearchStrategyProvider } from '../../../src/plugins/data/server';
-import { DEMO_SEARCH_STRATEGY } from '../common';
+import { ISearchStrategy } from '../../../src/plugins/data/server';
+import { DEMO_SEARCH_STRATEGY, IDemoRequest } from '../common';
-export const demoSearchStrategyProvider: TSearchStrategyProvider = () => {
+export const demoSearchStrategyProvider = (): ISearchStrategy => {
return {
- search: (request) => {
+ search: (context, request: IDemoRequest) => {
return Promise.resolve({
greeting:
request.mood === 'happy'
diff --git a/examples/demo_search/server/index.ts b/examples/demo_search/server/index.ts
index 6289b684b2b1e..368575b705c90 100644
--- a/examples/demo_search/server/index.ts
+++ b/examples/demo_search/server/index.ts
@@ -17,9 +17,6 @@
* under the License.
*/
-import { PluginInitializerContext, PluginInitializer } from 'kibana/server';
import { DemoDataPlugin } from './plugin';
-export const plugin: PluginInitializer = (
- initializerContext: PluginInitializerContext
-) => new DemoDataPlugin(initializerContext);
+export const plugin = () => new DemoDataPlugin();
diff --git a/examples/demo_search/server/plugin.ts b/examples/demo_search/server/plugin.ts
index 49fbae43e3aa2..8a72b5007f988 100644
--- a/examples/demo_search/server/plugin.ts
+++ b/examples/demo_search/server/plugin.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { Plugin, CoreSetup, PluginInitializerContext } from 'kibana/server';
+import { Plugin, CoreSetup } from 'kibana/server';
import { PluginSetup as DataPluginSetup } from 'src/plugins/data/server';
import { demoSearchStrategyProvider } from './demo_search_strategy';
import {
@@ -56,18 +56,13 @@ declare module '../../../src/plugins/data/server' {
}
export class DemoDataPlugin implements Plugin {
- constructor(private initializerContext: PluginInitializerContext) {}
+ constructor() {}
public setup(core: CoreSetup, deps: IDemoSearchExplorerDeps) {
- deps.data.search.registerSearchStrategyProvider(
- this.initializerContext.opaqueId,
- DEMO_SEARCH_STRATEGY,
- demoSearchStrategyProvider
- );
- deps.data.search.registerSearchStrategyProvider(
- this.initializerContext.opaqueId,
+ deps.data.search.registerSearchStrategy(DEMO_SEARCH_STRATEGY, demoSearchStrategyProvider());
+ deps.data.search.registerSearchStrategy(
ASYNC_DEMO_SEARCH_STRATEGY,
- asyncDemoSearchStrategyProvider
+ asyncDemoSearchStrategyProvider()
);
}
diff --git a/examples/search_explorer/public/search_api.tsx b/examples/search_explorer/public/search_api.tsx
index c77ec725c6890..4a0e9afd20c85 100644
--- a/examples/search_explorer/public/search_api.tsx
+++ b/examples/search_explorer/public/search_api.tsx
@@ -23,11 +23,6 @@ import { GuideSection } from './guide_section';
import publicSearch from '!!raw-loader!./../../../src/plugins/data/public/search/i_search';
// @ts-ignore
import publicPlugin from '!!raw-loader!./../../../src/plugins/data/public/search/search_service';
-
-// @ts-ignore
-import serverSetupContract from '!!raw-loader!./../../../src/plugins/data/server/search/i_search_setup';
-// @ts-ignore
-import serverSearch from '!!raw-loader!./../../../src/plugins/data/server/search/i_search';
// @ts-ignore
import serverPlugin from '!!raw-loader!./../../../src/plugins/data/server/search/search_service';
@@ -54,14 +49,6 @@ export const SearchApiPage = () => (
description: 'search_service.ts',
snippet: serverPlugin,
},
- {
- description: `i_search_setup.ts`,
- snippet: serverSetupContract,
- },
- {
- description: 'i_search',
- snippet: serverSearch,
- },
],
},
]}
diff --git a/src/plugins/data/server/search/i_route_handler_search_context.ts b/src/plugins/data/server/field_formats/mocks.ts
similarity index 80%
rename from src/plugins/data/server/search/i_route_handler_search_context.ts
rename to src/plugins/data/server/field_formats/mocks.ts
index 9888c774ea104..ecfa33c86cf16 100644
--- a/src/plugins/data/server/search/i_route_handler_search_context.ts
+++ b/src/plugins/data/server/field_formats/mocks.ts
@@ -17,9 +17,14 @@
* under the License.
*/
-import { ISearchGeneric, ISearchCancelGeneric } from './i_search';
+export function createFieldFormatsSetupMock() {
+ return {
+ register: jest.fn(),
+ };
+}
-export interface IRouteHandlerSearchContext {
- search: ISearchGeneric;
- cancel: ISearchCancelGeneric;
+export function createFieldFormatsStartMock() {
+ return {
+ fieldFormatServiceFactory: jest.fn(),
+ };
}
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 831d23864d228..16ac59e300237 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -172,8 +172,10 @@ export {
ISearchOptions,
IRequestTypesMap,
IResponseTypesMap,
- ISearchContext,
- TSearchStrategyProvider,
+ ISearchSetup,
+ ISearchStart,
+ TStrategyTypes,
+ ISearchStrategy,
getDefaultSearchParams,
getTotalLoaded,
} from './search';
diff --git a/src/plugins/data/server/search/i_search_context.ts b/src/plugins/data/server/mocks.ts
similarity index 60%
rename from src/plugins/data/server/search/i_search_context.ts
rename to src/plugins/data/server/mocks.ts
index 9d9de055d994f..e2f2298234054 100644
--- a/src/plugins/data/server/search/i_search_context.ts
+++ b/src/plugins/data/server/mocks.ts
@@ -17,10 +17,24 @@
* under the License.
*/
-import { Observable } from 'rxjs';
-import { CoreSetup, SharedGlobalConfig } from '../../../../core/server';
+import { createSearchSetupMock, createSearchStartMock } from './search/mocks';
+import { createFieldFormatsSetupMock, createFieldFormatsStartMock } from './field_formats/mocks';
-export interface ISearchContext {
- core: CoreSetup;
- config$: Observable;
+function createSetupContract() {
+ return {
+ search: createSearchSetupMock(),
+ fieldFormats: createFieldFormatsSetupMock(),
+ };
}
+
+function createStartContract() {
+ return {
+ search: createSearchStartMock(),
+ fieldFormats: createFieldFormatsStartMock(),
+ };
+}
+
+export const dataPluginMock = {
+ createSetupContract,
+ createStartContract,
+};
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 8c9d0df2ed894..0edce458f1c6b 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -20,7 +20,7 @@
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/server';
import { ConfigSchema } from '../config';
import { IndexPatternsService } from './index_patterns';
-import { ISearchSetup } from './search';
+import { ISearchSetup, ISearchStart } from './search';
import { SearchService } from './search/search_service';
import { QueryService } from './query/query_service';
import { ScriptsService } from './scripts';
@@ -36,6 +36,7 @@ export interface DataPluginSetup {
}
export interface DataPluginStart {
+ search: ISearchStart;
fieldFormats: FieldFormatsStart;
}
@@ -59,7 +60,10 @@ export class DataServerPlugin implements Plugin,
+ { usageCollection }: DataPluginSetupDependencies
+ ) {
this.indexPatterns.setup(core);
this.scriptsService.setup(core);
this.queryService.setup(core);
@@ -69,13 +73,14 @@ export class DataServerPlugin implements Plugin Promise.resolve({ total: 100, loaded: 0 }));
-const mockDefaultSearchStrategyProvider = jest.fn(() =>
- Promise.resolve({
- search: mockDefaultSearch,
- })
-);
-const mockStrategies: TSearchStrategiesMap = {
- [DEFAULT_SEARCH_STRATEGY]: mockDefaultSearchStrategyProvider,
-};
-
-describe('createApi', () => {
- let api: IRouteHandlerSearchContext;
-
- beforeEach(() => {
- api = createApi({
- caller: jest.fn(),
- searchStrategies: mockStrategies,
- });
- mockDefaultSearchStrategyProvider.mockClear();
- });
-
- it('should default to DEFAULT_SEARCH_STRATEGY if none is provided', async () => {
- await api.search({
- params: {},
- });
- expect(mockDefaultSearchStrategyProvider).toBeCalled();
- expect(mockDefaultSearch).toBeCalled();
- });
-
- it('should throw if no provider is found for the given name', () => {
- expect(api.search({}, {}, 'noneByThisName')).rejects.toThrowErrorMatchingInlineSnapshot(
- `"No strategy found for noneByThisName"`
- );
- });
-
- it('logs the response if `debug` is set to `true`', async () => {
- const spy = jest.spyOn(console, 'log');
- await api.search({ params: {} });
-
- expect(spy).not.toBeCalled();
-
- await api.search({ debug: true, params: {} });
-
- expect(spy).toBeCalled();
- });
-});
diff --git a/src/plugins/data/server/search/create_api.ts b/src/plugins/data/server/search/create_api.ts
deleted file mode 100644
index 00665b21f2ba7..0000000000000
--- a/src/plugins/data/server/search/create_api.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { APICaller } from 'kibana/server';
-import { IRouteHandlerSearchContext } from './i_route_handler_search_context';
-import { DEFAULT_SEARCH_STRATEGY } from '../../common/search';
-import { TSearchStrategiesMap } from './i_search_strategy';
-
-export function createApi({
- caller,
- searchStrategies,
-}: {
- searchStrategies: TSearchStrategiesMap;
- caller: APICaller;
-}) {
- const api: IRouteHandlerSearchContext = {
- search: async (request, options, strategyName) => {
- if (request.debug) {
- // eslint-disable-next-line
- console.log(JSON.stringify(request, null, 2));
- }
- const name = strategyName ?? DEFAULT_SEARCH_STRATEGY;
- const strategyProvider = searchStrategies[name];
- if (!strategyProvider) {
- throw new Error(`No strategy found for ${strategyName}`);
- }
- // Give providers access to other search strategies by injecting this function
- const strategy = await strategyProvider(caller, api.search);
- return strategy.search(request, options);
- },
- cancel: async (id, strategyName) => {
- const name = strategyName ?? DEFAULT_SEARCH_STRATEGY;
- const strategyProvider = searchStrategies[name];
- if (!strategyProvider) {
- throw new Error(`No strategy found for ${strategyName}`);
- }
- const strategy = await strategyProvider(caller, api.search);
- return strategy.cancel && strategy.cancel(id);
- },
- };
- return api;
-}
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.test.ts b/src/plugins/data/server/search/es_search/es_search_strategy.test.ts
index c4b8119f9e095..1155a5491e8f3 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.test.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.test.ts
@@ -17,11 +17,11 @@
* under the License.
*/
-import { coreMock, pluginInitializerContextConfigMock } from '../../../../../core/server/mocks';
+import { RequestHandlerContext } from '../../../../../core/server';
+import { pluginInitializerContextConfigMock } from '../../../../../core/server/mocks';
import { esSearchStrategyProvider } from './es_search_strategy';
describe('ES search strategy', () => {
- const mockCoreSetup = coreMock.createSetup();
const mockApiCaller = jest.fn().mockResolvedValue({
_shards: {
total: 10,
@@ -30,39 +30,26 @@ describe('ES search strategy', () => {
successful: 7,
},
});
- const mockSearch = jest.fn();
+ const mockContext = {
+ core: { elasticsearch: { legacy: { client: { callAsCurrentUser: mockApiCaller } } } },
+ };
const mockConfig$ = pluginInitializerContextConfigMock({}).legacy.globalConfig$;
beforeEach(() => {
mockApiCaller.mockClear();
- mockSearch.mockClear();
});
- it('returns a strategy with `search`', () => {
- const esSearch = esSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ it('returns a strategy with `search`', async () => {
+ const esSearch = await esSearchStrategyProvider(mockConfig$);
expect(typeof esSearch.search).toBe('function');
});
it('calls the API caller with the params with defaults', async () => {
const params = { index: 'logstash-*' };
- const esSearch = esSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ const esSearch = await esSearchStrategyProvider(mockConfig$);
- await esSearch.search({ params });
+ await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
expect(mockApiCaller).toBeCalled();
expect(mockApiCaller.mock.calls[0][0]).toBe('search');
@@ -76,16 +63,9 @@ describe('ES search strategy', () => {
it('calls the API caller with overridden defaults', async () => {
const params = { index: 'logstash-*', ignoreUnavailable: false, timeout: '1000ms' };
- const esSearch = esSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ const esSearch = await esSearchStrategyProvider(mockConfig$);
- await esSearch.search({ params });
+ await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
expect(mockApiCaller).toBeCalled();
expect(mockApiCaller.mock.calls[0][0]).toBe('search');
@@ -97,16 +77,11 @@ describe('ES search strategy', () => {
it('returns total, loaded, and raw response', async () => {
const params = { index: 'logstash-*' };
- const esSearch = esSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ const esSearch = await esSearchStrategyProvider(mockConfig$);
- const response = await esSearch.search({ params });
+ const response = await esSearch.search((mockContext as unknown) as RequestHandlerContext, {
+ params,
+ });
expect(response).toHaveProperty('total');
expect(response).toHaveProperty('loaded');
diff --git a/src/plugins/data/server/search/es_search/es_search_strategy.ts b/src/plugins/data/server/search/es_search/es_search_strategy.ts
index 47cad7aa6b4d7..db08ddf920818 100644
--- a/src/plugins/data/server/search/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/es_search/es_search_strategy.ts
@@ -17,19 +17,18 @@
* under the License.
*/
import { first } from 'rxjs/operators';
-import { APICaller } from 'kibana/server';
+import { RequestHandlerContext, SharedGlobalConfig } from 'kibana/server';
import { SearchResponse } from 'elasticsearch';
+import { Observable } from 'rxjs';
import { ES_SEARCH_STRATEGY } from '../../../common/search';
-import { ISearchStrategy, TSearchStrategyProvider } from '../i_search_strategy';
-import { getDefaultSearchParams, getTotalLoaded, ISearchContext } from '..';
+import { ISearchStrategy, getDefaultSearchParams, getTotalLoaded } from '..';
-export const esSearchStrategyProvider: TSearchStrategyProvider = (
- context: ISearchContext,
- caller: APICaller
+export const esSearchStrategyProvider = (
+ config$: Observable
): ISearchStrategy => {
return {
- search: async (request, options) => {
- const config = await context.config$.pipe(first()).toPromise();
+ search: async (context: RequestHandlerContext, request, options) => {
+ const config = await config$.pipe(first()).toPromise();
const defaultParams = getDefaultSearchParams(config);
// Only default index pattern type is supported here.
@@ -42,7 +41,12 @@ export const esSearchStrategyProvider: TSearchStrategyProvider;
+
+ const rawResponse = (await context.core.elasticsearch.legacy.client.callAsCurrentUser(
+ 'search',
+ params,
+ options
+ )) as SearchResponse;
// The above query will either complete or timeout and throw an error.
// There is no progress indication on this api.
diff --git a/src/plugins/data/server/search/i_search.ts b/src/plugins/data/server/search/i_search.ts
deleted file mode 100644
index fa4aa72ac7287..0000000000000
--- a/src/plugins/data/server/search/i_search.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search';
-import { TStrategyTypes } from './strategy_types';
-import { ES_SEARCH_STRATEGY, IEsSearchResponse } from '../../common/search/es_search';
-import { IEsSearchRequest } from './es_search';
-
-export interface ISearchOptions {
- signal?: AbortSignal;
-}
-
-export interface IRequestTypesMap {
- [ES_SEARCH_STRATEGY]: IEsSearchRequest;
- [key: string]: IKibanaSearchRequest;
-}
-
-export interface IResponseTypesMap {
- [ES_SEARCH_STRATEGY]: IEsSearchResponse;
- [key: string]: IKibanaSearchResponse;
-}
-
-export type ISearchGeneric = (
- request: IRequestTypesMap[T],
- options?: ISearchOptions,
- strategy?: T
-) => Promise;
-
-export type ISearchCancelGeneric = (
- id: string,
- strategy?: T
-) => Promise;
-
-export type ISearch = (
- request: IRequestTypesMap[T],
- options?: ISearchOptions
-) => Promise;
-
-export type ISearchCancel = (id: string) => Promise;
diff --git a/src/plugins/data/server/search/i_search_setup.ts b/src/plugins/data/server/search/i_search_setup.ts
deleted file mode 100644
index e4a4d50141201..0000000000000
--- a/src/plugins/data/server/search/i_search_setup.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IContextProvider } from 'kibana/server';
-import { ISearchContext } from './i_search_context';
-import { TRegisterSearchStrategyProvider, TSearchStrategyProvider } from './i_search_strategy';
-
-/**
- * The setup contract exposed by the Search plugin exposes the search strategy extension
- * point.
- */
-export interface ISearchSetup {
- registerSearchStrategyContext: (
- pluginId: symbol,
- strategyName: TContextName,
- provider: IContextProvider, TContextName>
- ) => void;
-
- /**
- * Extension point exposed for other plugins to register their own search
- * strategies.
- */
- registerSearchStrategyProvider: TRegisterSearchStrategyProvider;
-}
diff --git a/src/plugins/data/server/search/i_search_strategy.ts b/src/plugins/data/server/search/i_search_strategy.ts
deleted file mode 100644
index 9b405034f883f..0000000000000
--- a/src/plugins/data/server/search/i_search_strategy.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { APICaller } from 'kibana/server';
-import { ISearch, ISearchCancel, ISearchGeneric } from './i_search';
-import { TStrategyTypes } from './strategy_types';
-import { ISearchContext } from './i_search_context';
-
-/**
- * Search strategy interface contains a search method that takes in
- * a request and returns a promise that resolves to a response.
- */
-export interface ISearchStrategy {
- search: ISearch;
- cancel?: ISearchCancel;
-}
-
-/**
- * Search strategy provider creates an instance of a search strategy with the request
- * handler context bound to it. This way every search strategy can use
- * whatever information they require from the request context.
- */
-export type TSearchStrategyProviderEnhanced = (
- caller: APICaller,
- search: ISearchGeneric
-) => Promise>;
-
-/**
- * Search strategy provider creates an instance of a search strategy with the request
- * handler context bound to it. This way every search strategy can use
- * whatever information they require from the request context.
- */
-export type TSearchStrategyProvider = (
- context: ISearchContext,
- caller: APICaller,
- search: ISearchGeneric
-) => ISearchStrategy;
-
-/**
- * Extension point exposed for other plugins to register their own search
- * strategies.
- */
-export type TRegisterSearchStrategyProvider = (
- opaqueId: symbol,
- name: T,
- searchStrategyProvider: TSearchStrategyProvider
-) => void;
-
-export type TSearchStrategiesMap = {
- [K in TStrategyTypes]?: TSearchStrategyProviderEnhanced;
-};
diff --git a/src/plugins/data/server/search/index.ts b/src/plugins/data/server/search/index.ts
index e08eba1cad831..882f56e83d4ca 100644
--- a/src/plugins/data/server/search/index.ts
+++ b/src/plugins/data/server/search/index.ts
@@ -17,20 +17,16 @@
* under the License.
*/
-export { ISearchSetup } from './i_search_setup';
-
-export { ISearchContext } from './i_search_context';
-
export {
ISearch,
ISearchCancel,
ISearchOptions,
IRequestTypesMap,
IResponseTypesMap,
-} from './i_search';
-
-export { TStrategyTypes } from './strategy_types';
-
-export { TSearchStrategyProvider } from './i_search_strategy';
+ ISearchSetup,
+ ISearchStart,
+ TStrategyTypes,
+ ISearchStrategy,
+} from './types';
export { getDefaultSearchParams, getTotalLoaded } from './es_search';
diff --git a/src/plugins/data/server/search/mocks.ts b/src/plugins/data/server/search/mocks.ts
index 136e7a1d580c9..0aab466a9a0d9 100644
--- a/src/plugins/data/server/search/mocks.ts
+++ b/src/plugins/data/server/search/mocks.ts
@@ -17,10 +17,14 @@
* under the License.
*/
-export const searchSetupMock = {
- registerSearchStrategyContext: jest.fn(),
- registerSearchStrategyProvider: jest.fn(),
- __LEGACY: {
- search: jest.fn(),
- },
-};
+export function createSearchSetupMock() {
+ return {
+ registerSearchStrategy: jest.fn(),
+ };
+}
+
+export function createSearchStartMock() {
+ return {
+ getSearchStrategy: jest.fn(),
+ };
+}
diff --git a/src/plugins/data/server/search/routes.test.ts b/src/plugins/data/server/search/routes.test.ts
index f5e6507d977cd..4ef67de93e454 100644
--- a/src/plugins/data/server/search/routes.test.ts
+++ b/src/plugins/data/server/search/routes.test.ts
@@ -17,36 +17,26 @@
* under the License.
*/
-import { httpServiceMock, httpServerMock } from '../../../../../src/core/server/mocks';
+import { CoreSetup, RequestHandlerContext } from '../../../../../src/core/server';
+import { coreMock, httpServerMock } from '../../../../../src/core/server/mocks';
import { registerSearchRoute } from './routes';
-import { IRouter, ScopedClusterClient, RequestHandlerContext } from 'kibana/server';
+import { DataPluginStart } from '../plugin';
+import { dataPluginMock } from '../mocks';
describe('Search service', () => {
- let routerMock: jest.Mocked;
+ let mockDataStart: MockedKeys;
+ let mockCoreSetup: MockedKeys>;
beforeEach(() => {
- routerMock = httpServiceMock.createRouter();
- });
-
- it('registers a post route', async () => {
- registerSearchRoute(routerMock);
- expect(routerMock.post).toBeCalled();
+ mockDataStart = dataPluginMock.createStartContract();
+ mockCoreSetup = coreMock.createSetup({ pluginStartContract: mockDataStart });
});
it('handler calls context.search.search with the given request and strategy', async () => {
const mockSearch = jest.fn().mockResolvedValue('yay');
- const mockContext = {
- core: {
- elasticsearch: {
- legacy: {
- client: {} as ScopedClusterClient,
- },
- },
- },
- search: {
- search: mockSearch,
- },
- };
+ mockDataStart.search.getSearchStrategy.mockReturnValueOnce({ search: mockSearch });
+
+ const mockContext = {};
const mockBody = { params: {} };
const mockParams = { strategy: 'foo' };
const mockRequest = httpServerMock.createKibanaRequest({
@@ -55,13 +45,15 @@ describe('Search service', () => {
});
const mockResponse = httpServerMock.createResponseFactory();
- registerSearchRoute(routerMock);
- const handler = routerMock.post.mock.calls[0][1];
+ registerSearchRoute(mockCoreSetup);
+
+ const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
+ const handler = mockRouter.post.mock.calls[0][1];
await handler((mockContext as unknown) as RequestHandlerContext, mockRequest, mockResponse);
+ expect(mockDataStart.search.getSearchStrategy.mock.calls[0][0]).toBe(mockParams.strategy);
expect(mockSearch).toBeCalled();
- expect(mockSearch.mock.calls[0][0]).toStrictEqual(mockBody);
- expect(mockSearch.mock.calls[0][2]).toBe(mockParams.strategy);
+ expect(mockSearch.mock.calls[0][1]).toStrictEqual(mockBody);
expect(mockResponse.ok).toBeCalled();
expect(mockResponse.ok.mock.calls[0][0]).toEqual({ body: 'yay' });
});
@@ -73,18 +65,9 @@ describe('Search service', () => {
error: 'oops',
},
});
- const mockContext = {
- core: {
- elasticsearch: {
- legacy: {
- client: {} as ScopedClusterClient,
- },
- },
- },
- search: {
- search: mockSearch,
- },
- };
+ mockDataStart.search.getSearchStrategy.mockReturnValueOnce({ search: mockSearch });
+
+ const mockContext = {};
const mockBody = { params: {} };
const mockParams = { strategy: 'foo' };
const mockRequest = httpServerMock.createKibanaRequest({
@@ -93,13 +76,15 @@ describe('Search service', () => {
});
const mockResponse = httpServerMock.createResponseFactory();
- registerSearchRoute(routerMock);
- const handler = routerMock.post.mock.calls[0][1];
+ registerSearchRoute(mockCoreSetup);
+
+ const mockRouter = mockCoreSetup.http.createRouter.mock.results[0].value;
+ const handler = mockRouter.post.mock.calls[0][1];
await handler((mockContext as unknown) as RequestHandlerContext, mockRequest, mockResponse);
+ expect(mockDataStart.search.getSearchStrategy.mock.calls[0][0]).toBe(mockParams.strategy);
expect(mockSearch).toBeCalled();
- expect(mockSearch.mock.calls[0][0]).toStrictEqual(mockBody);
- expect(mockSearch.mock.calls[0][2]).toBe(mockParams.strategy);
+ expect(mockSearch.mock.calls[0][1]).toStrictEqual(mockBody);
expect(mockResponse.customError).toBeCalled();
const error: any = mockResponse.customError.mock.calls[0][0];
expect(error.body.message).toBe('oh no');
diff --git a/src/plugins/data/server/search/routes.ts b/src/plugins/data/server/search/routes.ts
index b90d7d4ff80ce..7b6c045b0908c 100644
--- a/src/plugins/data/server/search/routes.ts
+++ b/src/plugins/data/server/search/routes.ts
@@ -18,10 +18,13 @@
*/
import { schema } from '@kbn/config-schema';
-import { IRouter } from '../../../../core/server';
+import { CoreSetup } from '../../../../core/server';
import { getRequestAbortedSignal } from '../lib';
+import { DataPluginStart } from '../plugin';
+
+export function registerSearchRoute(core: CoreSetup): void {
+ const router = core.http.createRouter();
-export function registerSearchRoute(router: IRouter): void {
router.post(
{
path: '/internal/search/{strategy}',
@@ -38,8 +41,11 @@ export function registerSearchRoute(router: IRouter): void {
const { strategy } = request.params;
const signal = getRequestAbortedSignal(request.events.aborted$);
+ const [, , selfStart] = await core.getStartServices();
+ const searchStrategy = selfStart.search.getSearchStrategy(strategy);
+
try {
- const response = await context.search!.search(searchRequest, { signal }, strategy);
+ const response = await searchStrategy.search(context, searchRequest, { signal });
return res.ok({ body: response });
} catch (err) {
return res.customError({
@@ -69,8 +75,13 @@ export function registerSearchRoute(router: IRouter): void {
},
async (context, request, res) => {
const { strategy, id } = request.params;
+
+ const [, , selfStart] = await core.getStartServices();
+ const searchStrategy = selfStart.search.getSearchStrategy(strategy);
+ if (!searchStrategy.cancel) return res.ok();
+
try {
- await context.search!.cancel(id, strategy);
+ await searchStrategy.cancel(context, id);
return res.ok();
} catch (err) {
return res.customError({
diff --git a/src/plugins/data/server/search/search_service.test.ts b/src/plugins/data/server/search/search_service.test.ts
index fa659756c1273..25143fa09e6bf 100644
--- a/src/plugins/data/server/search/search_service.test.ts
+++ b/src/plugins/data/server/search/search_service.test.ts
@@ -21,27 +21,28 @@ import { coreMock } from '../../../../core/server/mocks';
import { SearchService } from './search_service';
import { CoreSetup } from '../../../../core/server';
-
-const mockSearchApi = { search: jest.fn() };
-jest.mock('./create_api', () => ({
- createApi: () => mockSearchApi,
-}));
+import { DataPluginStart } from '../plugin';
describe('Search service', () => {
let plugin: SearchService;
- let mockCoreSetup: MockedKeys;
+ let mockCoreSetup: MockedKeys>;
beforeEach(() => {
plugin = new SearchService(coreMock.createPluginInitializerContext({}));
mockCoreSetup = coreMock.createSetup();
- mockSearchApi.search.mockClear();
});
describe('setup()', () => {
it('exposes proper contract', async () => {
const setup = plugin.setup(mockCoreSetup);
- expect(setup).toHaveProperty('registerSearchStrategyContext');
- expect(setup).toHaveProperty('registerSearchStrategyProvider');
+ expect(setup).toHaveProperty('registerSearchStrategy');
+ });
+ });
+
+ describe('start()', () => {
+ it('exposes proper contract', async () => {
+ const setup = plugin.start();
+ expect(setup).toHaveProperty('getSearchStrategy');
});
});
});
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 1c267c32ebc37..df809b425eb9e 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -17,82 +17,52 @@
* under the License.
*/
+import { Plugin, PluginInitializerContext, CoreSetup } from '../../../../core/server';
import {
- PluginInitializerContext,
- Plugin,
- CoreSetup,
- IContextContainer,
-} from '../../../../core/server';
-import { registerSearchRoute } from './routes';
-import { ISearchSetup } from './i_search_setup';
-import { createApi } from './create_api';
-import {
+ ISearchSetup,
+ ISearchStart,
TSearchStrategiesMap,
- TSearchStrategyProvider,
- TRegisterSearchStrategyProvider,
-} from './i_search_strategy';
-import { IRouteHandlerSearchContext } from './i_route_handler_search_context';
+ TRegisterSearchStrategy,
+ TGetSearchStrategy,
+} from './types';
+import { registerSearchRoute } from './routes';
import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './es_search';
-
import { searchSavedObjectType } from '../saved_objects';
+import { DataPluginStart } from '../plugin';
-declare module 'kibana/server' {
- interface RequestHandlerContext {
- search?: IRouteHandlerSearchContext;
- }
-}
-
-export class SearchService implements Plugin {
+export class SearchService implements Plugin {
private searchStrategies: TSearchStrategiesMap = {};
- private contextContainer?: IContextContainer>;
-
constructor(private initializerContext: PluginInitializerContext) {}
- public setup(core: CoreSetup): ISearchSetup {
- const router = core.http.createRouter();
- registerSearchRoute(router);
-
- this.contextContainer = core.context.createContextContainer();
-
+ public setup(core: CoreSetup): ISearchSetup {
core.savedObjects.registerType(searchSavedObjectType);
- core.http.registerRouteHandlerContext<'search'>('search', (context) => {
- return createApi({
- caller: context.core.elasticsearch.legacy.client.callAsCurrentUser,
- searchStrategies: this.searchStrategies,
- });
- });
-
- const registerSearchStrategyProvider: TRegisterSearchStrategyProvider = (
- plugin,
- name,
- strategyProvider
- ) => {
- this.searchStrategies[name] = this.contextContainer!.createHandler(plugin, strategyProvider);
- };
-
- const api: ISearchSetup = {
- registerSearchStrategyContext: this.contextContainer!.registerContext,
- registerSearchStrategyProvider,
- };
-
- api.registerSearchStrategyContext(this.initializerContext.opaqueId, 'core', () => core);
- api.registerSearchStrategyContext(
- this.initializerContext.opaqueId,
- 'config$',
- () => this.initializerContext.config.legacy.globalConfig$
- );
-
- api.registerSearchStrategyProvider(
- this.initializerContext.opaqueId,
+ this.registerSearchStrategy(
ES_SEARCH_STRATEGY,
- esSearchStrategyProvider
+ esSearchStrategyProvider(this.initializerContext.config.legacy.globalConfig$)
);
- return api;
+ registerSearchRoute(core);
+
+ return { registerSearchStrategy: this.registerSearchStrategy };
+ }
+
+ public start(): ISearchStart {
+ return { getSearchStrategy: this.getSearchStrategy };
}
- public start() {}
public stop() {}
+
+ private registerSearchStrategy: TRegisterSearchStrategy = (name, strategy) => {
+ this.searchStrategies[name] = strategy;
+ };
+
+ private getSearchStrategy: TGetSearchStrategy = (name) => {
+ const strategy = this.searchStrategies[name];
+ if (!strategy) {
+ throw new Error(`Search strategy ${name} not found`);
+ }
+ return strategy;
+ };
}
diff --git a/src/plugins/data/server/search/strategy_types.ts b/src/plugins/data/server/search/strategy_types.ts
deleted file mode 100644
index 252e0c8f9e6c9..0000000000000
--- a/src/plugins/data/server/search/strategy_types.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { ES_SEARCH_STRATEGY } from '../../common/search/es_search';
-
-/**
- * Contains all known strategy type identifiers that will be used to map to
- * request and response shapes. Plugins that wish to add their own custom search
- * strategies should extend this type via:
- *
- * const MY_STRATEGY = 'MY_STRATEGY';
- *
- * declare module 'src/plugins/search/server' {
- * export interface IRequestTypesMap {
- * [MY_STRATEGY]: IMySearchRequest;
- * }
- *
- * export interface IResponseTypesMap {
- * [MY_STRATEGY]: IMySearchResponse
- * }
- * }
- */
-export type TStrategyTypes = typeof ES_SEARCH_STRATEGY | string;
diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts
new file mode 100644
index 0000000000000..dea325cc063bb
--- /dev/null
+++ b/src/plugins/data/server/search/types.ts
@@ -0,0 +1,111 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RequestHandlerContext } from '../../../../core/server';
+import { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search';
+import { ES_SEARCH_STRATEGY, IEsSearchRequest, IEsSearchResponse } from './es_search';
+
+export interface ISearchSetup {
+ /**
+ * Extension point exposed for other plugins to register their own search
+ * strategies.
+ */
+ registerSearchStrategy: TRegisterSearchStrategy;
+}
+
+export interface ISearchStart {
+ /**
+ * Get other registered search strategies. For example, if a new strategy needs to use the
+ * already-registered ES search strategy, it can use this function to accomplish that.
+ */
+ getSearchStrategy: TGetSearchStrategy;
+}
+
+export interface ISearchOptions {
+ /**
+ * An `AbortSignal` that allows the caller of `search` to abort a search request.
+ */
+ signal?: AbortSignal;
+}
+
+/**
+ * Contains all known strategy type identifiers that will be used to map to
+ * request and response shapes. Plugins that wish to add their own custom search
+ * strategies should extend this type via:
+ *
+ * const MY_STRATEGY = 'MY_STRATEGY';
+ *
+ * declare module 'src/plugins/search/server' {
+ * export interface IRequestTypesMap {
+ * [MY_STRATEGY]: IMySearchRequest;
+ * }
+ *
+ * export interface IResponseTypesMap {
+ * [MY_STRATEGY]: IMySearchResponse
+ * }
+ * }
+ */
+export type TStrategyTypes = typeof ES_SEARCH_STRATEGY | string;
+
+/**
+ * The map of search strategy IDs to the corresponding request type definitions.
+ */
+export interface IRequestTypesMap {
+ [ES_SEARCH_STRATEGY]: IEsSearchRequest;
+ [key: string]: IKibanaSearchRequest;
+}
+
+/**
+ * The map of search strategy IDs to the corresponding response type definitions.
+ */
+export interface IResponseTypesMap {
+ [ES_SEARCH_STRATEGY]: IEsSearchResponse;
+ [key: string]: IKibanaSearchResponse;
+}
+
+export type ISearch = (
+ context: RequestHandlerContext,
+ request: IRequestTypesMap[T],
+ options?: ISearchOptions
+) => Promise;
+
+export type ISearchCancel = (
+ context: RequestHandlerContext,
+ id: string
+) => Promise;
+
+/**
+ * Search strategy interface contains a search method that takes in a request and returns a promise
+ * that resolves to a response.
+ */
+export interface ISearchStrategy {
+ search: ISearch;
+ cancel?: ISearchCancel;
+}
+
+export type TRegisterSearchStrategy = (
+ name: T,
+ searchStrategy: ISearchStrategy
+) => void;
+
+export type TGetSearchStrategy = (name: T) => ISearchStrategy;
+
+export type TSearchStrategiesMap = {
+ [K in TStrategyTypes]?: ISearchStrategy;
+};
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 2d4185415b9d5..d825153a7aa12 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -48,7 +48,6 @@ import { GetResponse } from 'elasticsearch';
import { GetScriptParams } from 'elasticsearch';
import { GetSourceParams } from 'elasticsearch';
import { GetTemplateParams } from 'elasticsearch';
-import { IContextProvider as IContextProvider_2 } from 'kibana/server';
import { IncomingHttpHeaders } from 'http';
import { IndexDocumentParams } from 'elasticsearch';
import { IndicesAnalyzeParams } from 'elasticsearch';
@@ -490,7 +489,7 @@ export class IndexPatternsFetcher {
// Warning: (ae-missing-release-tag) "IRequestTypesMap" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
-// @public (undocumented)
+// @public
export interface IRequestTypesMap {
// Warning: (ae-forgotten-export) The symbol "IKibanaSearchRequest" needs to be exported by the entry point index.d.ts
//
@@ -505,7 +504,7 @@ export interface IRequestTypesMap {
// Warning: (ae-missing-release-tag) "IResponseTypesMap" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
-// @public (undocumented)
+// @public
export interface IResponseTypesMap {
// Warning: (ae-forgotten-export) The symbol "IKibanaSearchResponse" needs to be exported by the entry point index.d.ts
//
@@ -517,35 +516,48 @@ export interface IResponseTypesMap {
[ES_SEARCH_STRATEGY]: IEsSearchResponse;
}
-// Warning: (ae-forgotten-export) The symbol "TStrategyTypes" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "RequestHandlerContext" needs to be exported by the entry point index.d.ts
// Warning: (ae-missing-release-tag) "ISearch" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export type ISearch = (request: IRequestTypesMap[T], options?: ISearchOptions) => Promise;
+export type ISearch = (context: RequestHandlerContext, request: IRequestTypesMap[T], options?: ISearchOptions) => Promise;
// Warning: (ae-missing-release-tag) "ISearchCancel" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export type ISearchCancel = (id: string) => Promise;
+export type ISearchCancel = (context: RequestHandlerContext, id: string) => Promise;
-// Warning: (ae-missing-release-tag) "ISearchContext" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ISearchOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export interface ISearchContext {
- // (undocumented)
- config$: Observable;
- // Warning: (ae-forgotten-export) The symbol "CoreSetup" needs to be exported by the entry point index.d.ts
- //
- // (undocumented)
- core: CoreSetup;
+export interface ISearchOptions {
+ signal?: AbortSignal;
}
-// Warning: (ae-missing-release-tag) "ISearchOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "ISearchSetup" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export interface ISearchOptions {
+export interface ISearchSetup {
+ // Warning: (ae-forgotten-export) The symbol "TRegisterSearchStrategy" needs to be exported by the entry point index.d.ts
+ registerSearchStrategy: TRegisterSearchStrategy;
+}
+
+// Warning: (ae-missing-release-tag) "ISearchStart" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface ISearchStart {
+ // Warning: (ae-forgotten-export) The symbol "TGetSearchStrategy" needs to be exported by the entry point index.d.ts
+ getSearchStrategy: TGetSearchStrategy;
+}
+
+// Warning: (ae-missing-release-tag) "ISearchStrategy" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export interface ISearchStrategy {
// (undocumented)
- signal?: AbortSignal;
+ cancel?: ISearchCancel;
+ // (undocumented)
+ search: ISearch;
}
// @public (undocumented)
@@ -612,21 +624,23 @@ export function parseInterval(interval: string): moment.Duration | null;
export class Plugin implements Plugin_2 {
// Warning: (ae-forgotten-export) The symbol "PluginInitializerContext" needs to be exported by the entry point index.d.ts
constructor(initializerContext: PluginInitializerContext);
+ // Warning: (ae-forgotten-export) The symbol "CoreSetup" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "DataPluginSetupDependencies" needs to be exported by the entry point index.d.ts
//
// (undocumented)
- setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
+ setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies): {
+ search: ISearchSetup;
fieldFormats: {
register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
};
- search: ISearchSetup;
};
// Warning: (ae-forgotten-export) The symbol "CoreStart" needs to be exported by the entry point index.d.ts
//
// (undocumented)
start(core: CoreStart): {
+ search: ISearchStart;
fieldFormats: {
- fieldFormatServiceFactory: (uiSettings: import("kibana/server").IUiSettingsClient) => Promise;
+ fieldFormatServiceFactory: (uiSettings: import("../../../core/server").IUiSettingsClient) => Promise;
};
};
// (undocumented)
@@ -656,6 +670,8 @@ export interface PluginStart {
//
// (undocumented)
fieldFormats: FieldFormatsStart;
+ // (undocumented)
+ search: ISearchStart;
}
// Warning: (ae-missing-release-tag) "Query" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -713,12 +729,10 @@ export interface TimeRange {
to: string;
}
-// Warning: (ae-forgotten-export) The symbol "ISearchGeneric" needs to be exported by the entry point index.d.ts
-// Warning: (ae-forgotten-export) The symbol "ISearchStrategy" needs to be exported by the entry point index.d.ts
-// Warning: (ae-missing-release-tag) "TSearchStrategyProvider" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-missing-release-tag) "TStrategyTypes" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public
-export type TSearchStrategyProvider = (context: ISearchContext, caller: APICaller_2, search: ISearchGeneric) => ISearchStrategy;
+export type TStrategyTypes = typeof ES_SEARCH_STRATEGY | string;
// Warning: (ae-missing-release-tag) "UI_SETTINGS" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -778,13 +792,12 @@ export const UI_SETTINGS: {
// src/plugins/data/server/index.ts:103:26 - (ae-forgotten-export) The symbol "TruncateFormat" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:131:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts
// src/plugins/data/server/index.ts:131:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:184:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:185:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:186:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:187:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:188:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:191:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/plugin.ts:66:14 - (ae-forgotten-export) The symbol "ISearchSetup" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:186:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:187:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:188:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:189:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:190:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:193:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
// (No @packageDocumentation comment for this package)
diff --git a/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts b/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts
index cb3a24375607e..c9274c867df83 100644
--- a/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/legacy_plugins.ts
@@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
await supertest
.get('/api/np-context-in-legacy')
.expect(200)
- .expect(JSON.stringify({ contexts: ['core', 'search', 'pluginA'] }));
+ .expect(JSON.stringify({ contexts: ['core', 'pluginA'] }));
});
});
diff --git a/x-pack/plugins/data_enhanced/server/plugin.ts b/x-pack/plugins/data_enhanced/server/plugin.ts
index a27a73431574b..4f6756231912c 100644
--- a/x-pack/plugins/data_enhanced/server/plugin.ts
+++ b/x-pack/plugins/data_enhanced/server/plugin.ts
@@ -22,10 +22,9 @@ export class EnhancedDataServerPlugin implements Plugin {
- const mockCoreSetup = coreMock.createSetup();
const mockApiCaller = jest.fn();
- const mockSearch = jest.fn();
+ const mockContext = {
+ core: { elasticsearch: { legacy: { client: { callAsCurrentUser: mockApiCaller } } } },
+ };
const mockConfig$ = pluginInitializerContextConfigMock({}).legacy.globalConfig$;
beforeEach(() => {
mockApiCaller.mockClear();
- mockSearch.mockClear();
});
- it('returns a strategy with `search`', () => {
- const esSearch = enhancedEsSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ it('returns a strategy with `search`', async () => {
+ const esSearch = await enhancedEsSearchStrategyProvider(mockConfig$);
expect(typeof esSearch.search).toBe('function');
});
@@ -56,16 +50,9 @@ describe('ES search strategy', () => {
mockApiCaller.mockResolvedValueOnce(mockAsyncResponse);
const params = { index: 'logstash-*', body: { query: {} } };
- const esSearch = enhancedEsSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ const esSearch = await enhancedEsSearchStrategyProvider(mockConfig$);
- await esSearch.search({ params });
+ await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
expect(mockApiCaller).toBeCalled();
expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
@@ -79,16 +66,9 @@ describe('ES search strategy', () => {
mockApiCaller.mockResolvedValueOnce(mockAsyncResponse);
const params = { index: 'logstash-*', body: { query: {} } };
- const esSearch = enhancedEsSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ const esSearch = await enhancedEsSearchStrategyProvider(mockConfig$);
- await esSearch.search({ id: 'foo', params });
+ await esSearch.search((mockContext as unknown) as RequestHandlerContext, { id: 'foo', params });
expect(mockApiCaller).toBeCalled();
expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
@@ -102,16 +82,9 @@ describe('ES search strategy', () => {
mockApiCaller.mockResolvedValueOnce(mockAsyncResponse);
const params = { index: 'foo-程', body: {} };
- const esSearch = enhancedEsSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
+ const esSearch = await enhancedEsSearchStrategyProvider(mockConfig$);
- await esSearch.search({ params });
+ await esSearch.search((mockContext as unknown) as RequestHandlerContext, { params });
expect(mockApiCaller).toBeCalled();
expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
@@ -124,16 +97,12 @@ describe('ES search strategy', () => {
mockApiCaller.mockResolvedValueOnce(mockRollupResponse);
const params = { index: 'foo-程', body: {} };
- const esSearch = enhancedEsSearchStrategyProvider(
- {
- core: mockCoreSetup,
- config$: mockConfig$,
- },
- mockApiCaller,
- mockSearch
- );
-
- await esSearch.search({ indexType: 'rollup', params });
+ const esSearch = await enhancedEsSearchStrategyProvider(mockConfig$);
+
+ await esSearch.search((mockContext as unknown) as RequestHandlerContext, {
+ indexType: 'rollup',
+ params,
+ });
expect(mockApiCaller).toBeCalled();
expect(mockApiCaller.mock.calls[0][0]).toBe('transport.request');
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index 15f2ca10af7f7..9083ab24a4521 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -7,16 +7,16 @@
import { first } from 'rxjs/operators';
import { mapKeys, snakeCase } from 'lodash';
import { SearchResponse } from 'elasticsearch';
-import { APICaller } from '../../../../../src/core/server';
+import { Observable } from 'rxjs';
+import { APICaller, SharedGlobalConfig } from '../../../../../src/core/server';
import { ES_SEARCH_STRATEGY } from '../../../../../src/plugins/data/common';
import {
- ISearchContext,
- TSearchStrategyProvider,
ISearch,
ISearchOptions,
ISearchCancel,
getDefaultSearchParams,
getTotalLoaded,
+ ISearchStrategy,
} from '../../../../../src/plugins/data/server';
import { IEnhancedEsSearchRequest } from '../../common';
import { shimHitsTotal } from './shim_hits_total';
@@ -28,15 +28,16 @@ export interface AsyncSearchResponse {
response: SearchResponse;
}
-export const enhancedEsSearchStrategyProvider: TSearchStrategyProvider = (
- context: ISearchContext,
- caller: APICaller
-) => {
+export const enhancedEsSearchStrategyProvider = (
+ config$: Observable
+): ISearchStrategy => {
const search: ISearch = async (
+ context,
request: IEnhancedEsSearchRequest,
options
) => {
- const config = await context.config$.pipe(first()).toPromise();
+ const config = await config$.pipe(first()).toPromise();
+ const caller = context.core.elasticsearch.legacy.client.callAsCurrentUser;
const defaultParams = getDefaultSearchParams(config);
const params = { ...defaultParams, ...request.params };
@@ -45,10 +46,13 @@ export const enhancedEsSearchStrategyProvider: TSearchStrategyProvider = async (id) => {
+ const cancel: ISearchCancel = async (context, id) => {
const method = 'DELETE';
const path = encodeURI(`/_async_search/${id}`);
- await caller('transport.request', { method, path });
+ await context.core.elasticsearch.legacy.client.callAsCurrentUser('transport.request', {
+ method,
+ path,
+ });
};
return { search, cancel };
From 5c327a12ddce4d902a583e21fc1d40f411e64641 Mon Sep 17 00:00:00 2001
From: Spencer
Date: Tue, 16 Jun 2020 13:45:20 -0700
Subject: [PATCH 13/41] [ci/getCheckoutInfo] retry fetching upstream changes to
calculate mergeBase (#69320)
Co-authored-by: spalger
---
vars/getCheckoutInfo.groovy | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/vars/getCheckoutInfo.groovy b/vars/getCheckoutInfo.groovy
index 7a3a7a9d2eccc..32a7b054bfd15 100644
--- a/vars/getCheckoutInfo.groovy
+++ b/vars/getCheckoutInfo.groovy
@@ -22,10 +22,14 @@ def call(branchOverride) {
).trim()
if (repoInfo.targetBranch) {
- sh(
- script: "git fetch origin ${repoInfo.targetBranch}",
- label: "fetch latest from '${repoInfo.targetBranch}' at origin"
- )
+ // Try to clone fetch from Github up to 8 times, waiting 15 secs between attempts
+ retryWithDelay(8, 15) {
+ sh(
+ script: "git fetch origin ${repoInfo.targetBranch}",
+ label: "fetch latest from '${repoInfo.targetBranch}' at origin"
+ )
+ }
+
repoInfo.mergeBase = sh(
script: "git merge-base HEAD FETCH_HEAD",
label: "determining merge point with '${repoInfo.targetBranch}' at origin",
From 885a42ca15f0ac954d2d5fef749892939c5894e6 Mon Sep 17 00:00:00 2001
From: Tre
Date: Tue, 16 Jun 2020 14:59:26 -0600
Subject: [PATCH 14/41] [QA] [Code Coverage] Doc update (#69204)
Co-authored-by: Elastic Machine
---
.../kibana_code_coverage_index_mapping.md} | 10 +-
.../ingest_code_coverage_readme.md | 15 +-
...qa_research_code_coverage_with_mapping.png | Bin 0 -> 829938 bytes
.../qa_research_index_mapping.md | 193 ++++++++++++++++++
.../teams_scripted_field.painless | 0
5 files changed, 213 insertions(+), 5 deletions(-)
rename src/dev/code_coverage/{ingest_coverage/index_mapping.md => docs/code_coverage_job/kibana_code_coverage_index_mapping.md} (97%)
rename src/dev/code_coverage/{ingest_coverage => docs}/ingest_code_coverage_readme.md (52%)
create mode 100644 src/dev/code_coverage/docs/qa_research_job/put_qa_research_code_coverage_with_mapping.png
create mode 100644 src/dev/code_coverage/docs/qa_research_job/qa_research_index_mapping.md
rename src/dev/code_coverage/{ingest_coverage => docs}/teams_scripted_field.painless (100%)
diff --git a/src/dev/code_coverage/ingest_coverage/index_mapping.md b/src/dev/code_coverage/docs/code_coverage_job/kibana_code_coverage_index_mapping.md
similarity index 97%
rename from src/dev/code_coverage/ingest_coverage/index_mapping.md
rename to src/dev/code_coverage/docs/code_coverage_job/kibana_code_coverage_index_mapping.md
index c3b934eb35c5e..66654dd730518 100644
--- a/src/dev/code_coverage/ingest_coverage/index_mapping.md
+++ b/src/dev/code_coverage/docs/code_coverage_job/kibana_code_coverage_index_mapping.md
@@ -1,9 +1,12 @@
-# Create index mapping
+# Index Mapping
+
+Execute the following in Kibana Dev Tools.
-This is usually done in Kibana's dev tools ui.
```
- "mappings" : {
+PUT /kibana_code_coverage
+{
+ "mappings" : {
"properties" : {
"@timestamp" : {
"type" : "date"
@@ -189,6 +192,7 @@ This is usually done in Kibana's dev tools ui.
}
}
}
+}
```
_The main portion of the above mapping, is the timestamp-date mapping._
\ No newline at end of file
diff --git a/src/dev/code_coverage/ingest_coverage/ingest_code_coverage_readme.md b/src/dev/code_coverage/docs/ingest_code_coverage_readme.md
similarity index 52%
rename from src/dev/code_coverage/ingest_coverage/ingest_code_coverage_readme.md
rename to src/dev/code_coverage/docs/ingest_code_coverage_readme.md
index 0670780a7c03a..174f729180b77 100644
--- a/src/dev/code_coverage/ingest_coverage/ingest_code_coverage_readme.md
+++ b/src/dev/code_coverage/docs/ingest_code_coverage_readme.md
@@ -1,7 +1,18 @@
-# Convert Code Coverage Json Summary and Send to ES
+# Massage and Ingest Code Coverage Json Summary and Send to ES
+## Currently, we have 4 indexes
+### 2 for the Code Coverage Job
+https://kibana-ci.elastic.co/job/elastic+kibana+code-coverage/
+1. kibana_code_coverage
+2. kibana_total_code_coverage
+
+### 2 for the R & D Job
+https://kibana-ci.elastic.co/job/elastic+kibana+qa-research/
+1. qa_research_code_coverage
+2. qa_research_total_code_coverage
+
## How it works
It starts with this jenkins pipeline file:
@@ -19,6 +30,6 @@ From there, an event stream is created, that massages the data to an output form
## Configuration
There is really only one config step.
-The index [mapping](src/dev/code_coverage/ingest_coverage/index_mapping.md) for one of
+The index [mapping](./code_coverage_job/kibana_code_coverage_index_mapping.md) for one of
of the indexes has to be manually created.
Currently, we just add it using Kibana's Dev Tools.
\ No newline at end of file
diff --git a/src/dev/code_coverage/docs/qa_research_job/put_qa_research_code_coverage_with_mapping.png b/src/dev/code_coverage/docs/qa_research_job/put_qa_research_code_coverage_with_mapping.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e4ee4546dfcf08159c5a4a4ae3576e942d3ed1
GIT binary patch
literal 829938
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