diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap
index 823346db3518a..316188eebf65b 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/availability_reporting.test.tsx.snap
@@ -27,6 +27,8 @@ Array [
-
+
+
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx
index b5fe5d17312c6..7a8ba3fd32cd9 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/availability_reporting.test.tsx
@@ -9,6 +9,12 @@ import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { AvailabilityReporting } from '../availability_reporting';
import { StatusTag } from '../location_status_tags';
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
+
describe('AvailabilityReporting component', () => {
let allLocations: StatusTag[];
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx
index bfeaa6085e998..d4aae6b022d9c 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/location_status_tags.test.tsx
@@ -10,6 +10,12 @@ import { renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
import { MonitorLocation } from '../../../../../../common/runtime_types/monitor';
import { LocationStatusTags } from '../index';
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
+
describe('LocationStatusTags component', () => {
let monitorLocations: MonitorLocation[];
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index 6667da401d6a9..b711b464418a2 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -288,7 +288,9 @@ exports[`EmptyState component does not render empty state with appropriate base
-
+
-
+
-
+
-
+
{
+ return {
+ htmlIdGenerator: () => () => `generated-id`,
+ };
+});
+
const testFooPings: Ping[] = [
makePing({
docId: 'foo1',
diff --git a/x-pack/plugins/watcher/kibana.json b/x-pack/plugins/watcher/kibana.json
index a0482ad00797c..ba6a9bfa5e194 100644
--- a/x-pack/plugins/watcher/kibana.json
+++ b/x-pack/plugins/watcher/kibana.json
@@ -10,5 +10,9 @@
"data"
],
"server": true,
- "ui": true
+ "ui": true,
+ "requiredBundles": [
+ "esUiShared",
+ "kibanaReact"
+ ]
}
diff --git a/x-pack/tasks/build.ts b/x-pack/tasks/build.ts
index 8dbf6d212d5d2..ce1c9d7c269b7 100644
--- a/x-pack/tasks/build.ts
+++ b/x-pack/tasks/build.ts
@@ -16,7 +16,6 @@ import fancyLog from 'fancy-log';
import chalk from 'chalk';
import { generateNoticeFromSource } from '../../src/dev/notice';
-import { prepareTask } from './prepare';
import { gitInfo } from './helpers/git_info';
import { PKG_NAME } from './helpers/pkg';
import { BUILD_VERSION } from './helpers/build_version';
@@ -78,7 +77,6 @@ async function generateNoticeText() {
export const buildTask = gulp.series(
cleanBuildTask,
reportTask,
- prepareTask,
buildCanvasShareableRuntime,
pluginHelpersBuild,
generateNoticeText
diff --git a/x-pack/tasks/dev.ts b/x-pack/tasks/dev.ts
index f43b67e288561..c454817158700 100644
--- a/x-pack/tasks/dev.ts
+++ b/x-pack/tasks/dev.ts
@@ -7,9 +7,7 @@
import * as pluginHelpers from '@kbn/plugin-helpers';
import gulp from 'gulp';
-import { prepareTask } from './prepare';
-
-export const devTask = gulp.series(prepareTask, async function startKibanaServer() {
+export const devTask = gulp.series(async function startKibanaServer() {
await pluginHelpers.run('start', {
flags: process.argv.slice(3),
});
diff --git a/x-pack/tasks/prepare.ts b/x-pack/tasks/prepare.ts
deleted file mode 100644
index 5c71675d44189..0000000000000
--- a/x-pack/tasks/prepare.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 { ensureAllBrowsersDownloaded } from '../plugins/reporting/server/browsers';
-import { LevelLogger } from '../plugins/reporting/server/lib';
-
-export const prepareTask = async () => {
- // eslint-disable-next-line no-console
- const consoleLogger = (tag: string) => (message: unknown) => console.log(tag, message);
- const innerLogger = {
- get: () => innerLogger,
- debug: consoleLogger('debug'),
- info: consoleLogger('info'),
- warn: consoleLogger('warn'),
- trace: consoleLogger('trace'),
- error: consoleLogger('error'),
- fatal: consoleLogger('fatal'),
- log: consoleLogger('log'),
- };
- const levelLogger = new LevelLogger(innerLogger);
- await ensureAllBrowsersDownloaded(levelLogger);
-};
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 0877fdc949dc4..e3281cfdfa9a3 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -25,6 +25,7 @@ const enabledActionTypes = [
'.server-log',
'.servicenow',
'.jira',
+ '.resilient',
'.slack',
'.webhook',
'test.authorization',
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
index f1ac3f91c68db..b8b2cbdc03f39 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin.ts
@@ -12,6 +12,7 @@ import { ActionType } from '../../../../../../../plugins/actions/server';
import { initPlugin as initPagerduty } from './pagerduty_simulation';
import { initPlugin as initServiceNow } from './servicenow_simulation';
import { initPlugin as initJira } from './jira_simulation';
+import { initPlugin as initResilient } from './resilient_simulation';
export const NAME = 'actions-FTS-external-service-simulators';
@@ -20,6 +21,7 @@ export enum ExternalServiceSimulator {
SERVICENOW = 'servicenow',
SLACK = 'slack',
JIRA = 'jira',
+ RESILIENT = 'resilient',
WEBHOOK = 'webhook',
}
@@ -33,6 +35,7 @@ export function getAllExternalServiceSimulatorPaths(): string[] {
);
allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.SERVICENOW}/api/now/v2/table/incident`);
allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.JIRA}/rest/api/2/issue`);
+ allPaths.push(`/api/_${NAME}/${ExternalServiceSimulator.RESILIENT}/rest/orgs/201/incidents`);
return allPaths;
}
@@ -88,6 +91,7 @@ export class FixturePlugin implements Plugin,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ id: '123',
+ create_date: 1589391874472,
+ });
+ }
+ );
+
+ router.patch(
+ {
+ path: `${path}/rest/orgs/201/incidents/{id}`,
+ options: {
+ authRequired: false,
+ },
+ validate: {},
+ },
+ async function (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ success: true,
+ });
+ }
+ );
+
+ router.get(
+ {
+ path: `${path}/rest/orgs/201/incidents/{id}`,
+ options: {
+ authRequired: false,
+ },
+ validate: {},
+ },
+ async function (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ id: '123',
+ create_date: 1589391874472,
+ inc_last_modified_date: 1589391874472,
+ name: 'title',
+ description: 'description',
+ });
+ }
+ );
+
+ router.post(
+ {
+ path: `${path}/rest/api/2/issue/{id}/comment`,
+ options: {
+ authRequired: false,
+ },
+ validate: {},
+ },
+ async function (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ): Promise> {
+ return jsonResponse(res, 200, {
+ id: '123',
+ created: '2020-04-27T14:17:45.490Z',
+ });
+ }
+ );
+}
+
+function jsonResponse(
+ res: KibanaResponseFactory,
+ code: number,
+ object: Record = {}
+) {
+ return res.custom>({ body: object, statusCode: code });
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
new file mode 100644
index 0000000000000..a77e0414a19d4
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
@@ -0,0 +1,549 @@
+/*
+ * 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 expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+ getExternalServiceSimulatorPath,
+ ExternalServiceSimulator,
+} from '../../../../common/fixtures/plugins/actions_simulators/server/plugin';
+
+const mapping = [
+ {
+ source: 'title',
+ target: 'name',
+ actionType: 'overwrite',
+ },
+ {
+ source: 'description',
+ target: 'description',
+ actionType: 'overwrite',
+ },
+ {
+ source: 'comments',
+ target: 'comments',
+ actionType: 'append',
+ },
+];
+
+// eslint-disable-next-line import/no-default-export
+export default function resilientTest({ getService }: FtrProviderContext) {
+ const supertest = getService('supertest');
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+
+ const mockResilient = {
+ config: {
+ apiUrl: 'www.jiraisinkibanaactions.com',
+ orgId: '201',
+ casesConfiguration: { mapping },
+ },
+ secrets: {
+ apiKeyId: 'key',
+ apiKeySecret: 'secret',
+ },
+ params: {
+ subAction: 'pushToService',
+ subActionParams: {
+ savedObjectId: '123',
+ title: 'a title',
+ description: 'a description',
+ createdAt: '2020-03-13T08:34:53.450Z',
+ createdBy: { fullName: 'Elastic User', username: 'elastic' },
+ updatedAt: null,
+ updatedBy: null,
+ externalId: null,
+ comments: [
+ {
+ commentId: '456',
+ version: 'WzU3LDFd',
+ comment: 'first comment',
+ createdAt: '2020-03-13T08:34:53.450Z',
+ createdBy: { fullName: 'Elastic User', username: 'elastic' },
+ updatedAt: null,
+ updatedBy: null,
+ },
+ ],
+ },
+ },
+ };
+
+ let resilientSimulatorURL: string = '';
+
+ describe('IBM Resilient', () => {
+ before(() => {
+ resilientSimulatorURL = kibanaServer.resolveUrl(
+ getExternalServiceSimulatorPath(ExternalServiceSimulator.RESILIENT)
+ );
+ });
+
+ after(() => esArchiver.unload('empty_kibana'));
+
+ describe('IBM Resilient - Action Creation', () => {
+ it('should return 200 when creating a ibm resilient action successfully', async () => {
+ const { body: createdAction } = await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient action',
+ actionTypeId: '.resilient',
+ config: {
+ ...mockResilient.config,
+ apiUrl: resilientSimulatorURL,
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(200);
+
+ expect(createdAction).to.eql({
+ id: createdAction.id,
+ isPreconfigured: false,
+ name: 'An IBM Resilient action',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ });
+
+ const { body: fetchedAction } = await supertest
+ .get(`/api/actions/action/${createdAction.id}`)
+ .expect(200);
+
+ expect(fetchedAction).to.eql({
+ id: fetchedAction.id,
+ isPreconfigured: false,
+ name: 'An IBM Resilient action',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with no apiUrl', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: { orgId: '201' },
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [apiUrl]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with no orgId', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: { apiUrl: resilientSimulatorURL },
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [orgId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with a non whitelisted apiUrl', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: 'http://resilient.mynonexistent.com',
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: error configuring connector action: target url "http://resilient.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action without secrets', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type secrets: [apiKeyId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action without casesConfiguration', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [casesConfiguration.mapping]: expected value of type [array] but got [undefined]',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with empty mapping', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: { mapping: [] },
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400)
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ statusCode: 400,
+ error: 'Bad Request',
+ message:
+ 'error validating action type config: [casesConfiguration.mapping]: expected non-empty but got empty',
+ });
+ });
+ });
+
+ it('should respond with a 400 Bad Request when creating a ibm resilient action with wrong actionType', async () => {
+ await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'An IBM Resilient',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: {
+ mapping: [
+ {
+ source: 'title',
+ target: 'description',
+ actionType: 'non-supported',
+ },
+ ],
+ },
+ },
+ secrets: mockResilient.secrets,
+ })
+ .expect(400);
+ });
+ });
+
+ describe('IBM Resilient - Executor', () => {
+ let simulatedActionId: string;
+ before(async () => {
+ const { body } = await supertest
+ .post('/api/actions/action')
+ .set('kbn-xsrf', 'foo')
+ .send({
+ name: 'A ibm resilient simulator',
+ actionTypeId: '.resilient',
+ config: {
+ apiUrl: resilientSimulatorURL,
+ orgId: mockResilient.config.orgId,
+ casesConfiguration: mockResilient.config.casesConfiguration,
+ },
+ secrets: mockResilient.secrets,
+ });
+ simulatedActionId = body.id;
+ });
+
+ describe('Validation', () => {
+ it('should handle failing with a simulated success without action', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {},
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message: `error validating action params: Cannot read property 'Symbol(Symbol.iterator)' of undefined`,
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without unsupported action', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: { subAction: 'non-supported' },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subAction]: expected value to equal [pushToService]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without subActionParams', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: { subAction: 'pushToService' },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.savedObjectId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without savedObjectId', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: { subAction: 'pushToService', subActionParams: {} },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.savedObjectId]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without title', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ savedObjectId: 'success',
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.title]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without createdAt', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ savedObjectId: 'success',
+ title: 'success',
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.createdAt]: expected value of type [string] but got [undefined]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without commentId', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ savedObjectId: 'success',
+ title: 'success',
+ createdAt: 'success',
+ createdBy: { username: 'elastic' },
+ comments: [{}],
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.comments]: types that failed validation:\n - [subActionParams.comments.0.0.commentId]: expected value of type [string] but got [undefined]\n - [subActionParams.comments.1]: expected value to equal [null]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without comment message', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ savedObjectId: 'success',
+ title: 'success',
+ createdAt: 'success',
+ createdBy: { username: 'elastic' },
+ comments: [{ commentId: 'success' }],
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.comments]: types that failed validation:\n - [subActionParams.comments.0.0.comment]: expected value of type [string] but got [undefined]\n - [subActionParams.comments.1]: expected value to equal [null]',
+ });
+ });
+ });
+
+ it('should handle failing with a simulated success without comment.createdAt', async () => {
+ await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ savedObjectId: 'success',
+ title: 'success',
+ createdAt: 'success',
+ createdBy: { username: 'elastic' },
+ comments: [{ commentId: 'success', comment: 'success' }],
+ },
+ },
+ })
+ .then((resp: any) => {
+ expect(resp.body).to.eql({
+ actionId: simulatedActionId,
+ status: 'error',
+ retry: false,
+ message:
+ 'error validating action params: types that failed validation:\n- [0.subAction]: expected value to equal [getIncident]\n- [1.subAction]: expected value to equal [handshake]\n- [2.subActionParams.comments]: types that failed validation:\n - [subActionParams.comments.0.0.createdAt]: expected value of type [string] but got [undefined]\n - [subActionParams.comments.1]: expected value to equal [null]',
+ });
+ });
+ });
+ });
+
+ describe('Execution', () => {
+ it('should handle creating an incident without comments', async () => {
+ const { body } = await supertest
+ .post(`/api/actions/action/${simulatedActionId}/_execute`)
+ .set('kbn-xsrf', 'foo')
+ .send({
+ params: {
+ ...mockResilient.params,
+ subActionParams: {
+ ...mockResilient.params.subActionParams,
+ comments: [],
+ },
+ },
+ })
+ .expect(200);
+
+ expect(body).to.eql({
+ status: 'ok',
+ actionId: simulatedActionId,
+ data: {
+ id: '123',
+ title: '123',
+ pushedDate: '2020-05-13T17:44:34.472Z',
+ url: `${resilientSimulatorURL}/#incidents/123`,
+ },
+ });
+ });
+ });
+ });
+ });
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
index 18b1714582d13..9cdc0c9fa663e 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
@@ -16,6 +16,7 @@ export default function actionsTests({ loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./builtin_action_types/server_log'));
loadTestFile(require.resolve('./builtin_action_types/servicenow'));
loadTestFile(require.resolve('./builtin_action_types/jira'));
+ loadTestFile(require.resolve('./builtin_action_types/resilient'));
loadTestFile(require.resolve('./builtin_action_types/slack'));
loadTestFile(require.resolve('./builtin_action_types/webhook'));
loadTestFile(require.resolve('./create'));
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
index 823c8159a136d..4e6da9d50dc2a 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_entry_highlights.ts
@@ -122,9 +122,7 @@ export default function ({ getService }: FtrProviderContext) {
});
});
- // Skipped since it behaves differently in master and in the 7.X branch
- // See https://github.com/elastic/kibana/issues/49959
- it.skip('highlights field columns', async () => {
+ it('highlights field columns', async () => {
const { body } = await supertest
.post(LOG_ENTRIES_HIGHLIGHTS_PATH)
.set(COMMON_HEADERS)
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
index c88b094879ac8..cc6fa53939f60 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
@@ -22,8 +22,7 @@ export default ({ getService }: FtrProviderContext): void => {
const supertest = getService('supertest');
const es = getService('es');
- // FLAKY: https://github.com/elastic/kibana/issues/69632
- describe.skip('find_statuses', () => {
+ describe('find_statuses', () => {
beforeEach(async () => {
await createSignalsIndex(supertest);
});
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
index 6ad9cf4cd5baf..4b980536d2cd1 100644
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -235,40 +235,83 @@ export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial =
/**
* Remove all alerts from the .kibana index
+ * This will retry 20 times before giving up and hopefully still not interfere with other tests
* @param es The ElasticSearch handle
*/
-export const deleteAllAlerts = async (es: Client): Promise => {
- await es.deleteByQuery({
- index: '.kibana',
- q: 'type:alert',
- wait_for_completion: true,
- refresh: true,
- body: {},
- });
+export const deleteAllAlerts = async (es: Client, retryCount = 20): Promise => {
+ if (retryCount > 0) {
+ try {
+ await es.deleteByQuery({
+ index: '.kibana',
+ q: 'type:alert',
+ wait_for_completion: true,
+ refresh: true,
+ body: {},
+ });
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(`Failure trying to deleteAllAlerts, retries left are: ${retryCount - 1}`, err);
+ await deleteAllAlerts(es, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not deleteAllAlerts, no retries are left');
+ }
};
/**
* Remove all rules statuses from the .kibana index
+ * This will retry 20 times before giving up and hopefully still not interfere with other tests
* @param es The ElasticSearch handle
*/
-export const deleteAllRulesStatuses = async (es: Client): Promise => {
- await es.deleteByQuery({
- index: '.kibana',
- q: 'type:siem-detection-engine-rule-status',
- wait_for_completion: true,
- refresh: true,
- body: {},
- });
+export const deleteAllRulesStatuses = async (es: Client, retryCount = 20): Promise => {
+ if (retryCount > 0) {
+ try {
+ await es.deleteByQuery({
+ index: '.kibana',
+ q: 'type:siem-detection-engine-rule-status',
+ wait_for_completion: true,
+ refresh: true,
+ body: {},
+ });
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(
+ `Failure trying to deleteAllRulesStatuses, retries left are: ${retryCount - 1}`,
+ err
+ );
+ await deleteAllRulesStatuses(es, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not deleteAllRulesStatuses, no retries are left');
+ }
};
/**
* Creates the signals index for use inside of beforeEach blocks of tests
+ * This will retry 20 times before giving up and hopefully still not interfere with other tests
* @param supertest The supertest client library
*/
export const createSignalsIndex = async (
- supertest: SuperTest
+ supertest: SuperTest,
+ retryCount = 20
): Promise => {
- await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send().expect(200);
+ if (retryCount > 0) {
+ try {
+ await supertest.post(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(
+ `Failure trying to create the signals index, retries left are: ${retryCount - 1}`,
+ err
+ );
+ await createSignalsIndex(supertest, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not createSignalsIndex, no retries are left');
+ }
};
/**
@@ -276,9 +319,21 @@ export const createSignalsIndex = async (
* @param supertest The supertest client library
*/
export const deleteSignalsIndex = async (
- supertest: SuperTest
+ supertest: SuperTest,
+ retryCount = 20
): Promise => {
- await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send().expect(200);
+ if (retryCount > 0) {
+ try {
+ await supertest.delete(DETECTION_ENGINE_INDEX_URL).set('kbn-xsrf', 'true').send();
+ } catch (err) {
+ // eslint-disable-next-line no-console
+ console.log(`Failure trying to deleteSignalsIndex, retries left are: ${retryCount - 1}`, err);
+ await deleteSignalsIndex(supertest, retryCount - 1);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.log('Could not deleteSignalsIndex, no retries are left');
+ }
};
/**
diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts
index 28279d5e5b812..04f289b69bb71 100644
--- a/x-pack/test/functional/apps/infra/home_page.ts
+++ b/x-pack/test/functional/apps/infra/home_page.ts
@@ -4,15 +4,22 @@
* you may not use this file except in compliance with the Elastic License.
*/
+import moment from 'moment';
+import expect from '@kbn/expect/expect.js';
import { FtrProviderContext } from '../../ftr_provider_context';
import { DATES } from './constants';
const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData;
const DATE_WITHOUT_DATA = DATES.metricsAndLogs.hosts.withoutData;
+const COMMON_REQUEST_HEADERS = {
+ 'kbn-xsrf': 'some-xsrf-token',
+};
+
export default ({ getPageObjects, getService }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
const pageObjects = getPageObjects(['common', 'infraHome']);
+ const supertest = getService('supertest');
describe('Home page', function () {
this.tags('includeFirefox');
@@ -46,6 +53,53 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
await pageObjects.infraHome.goToTime(DATE_WITHOUT_DATA);
await pageObjects.infraHome.getNoMetricsDataPrompt();
});
+
+ it('records telemetry for hosts', async () => {
+ await pageObjects.infraHome.goToTime(DATE_WITH_DATA);
+ await pageObjects.infraHome.getWaffleMap();
+
+ const resp = await supertest
+ .post(`/api/telemetry/v2/clusters/_stats`)
+ .set(COMMON_REQUEST_HEADERS)
+ .set('Accept', 'application/json')
+ .send({
+ timeRange: {
+ min: moment().subtract(1, 'hour').toISOString(),
+ max: moment().toISOString(),
+ },
+ unencrypted: true,
+ })
+ .expect(200)
+ .then((res: any) => res.body);
+
+ expect(
+ resp[0].stack_stats.kibana.plugins.infraops.last_24_hours.hits.infraops_hosts
+ ).to.be.greaterThan(0);
+ });
+
+ it('records telemetry for docker', async () => {
+ await pageObjects.infraHome.goToTime(DATE_WITH_DATA);
+ await pageObjects.infraHome.getWaffleMap();
+ await pageObjects.infraHome.goToDocker();
+
+ const resp = await supertest
+ .post(`/api/telemetry/v2/clusters/_stats`)
+ .set(COMMON_REQUEST_HEADERS)
+ .set('Accept', 'application/json')
+ .send({
+ timeRange: {
+ min: moment().subtract(1, 'hour').toISOString(),
+ max: moment().toISOString(),
+ },
+ unencrypted: true,
+ })
+ .expect(200)
+ .then((res: any) => res.body);
+
+ expect(
+ resp[0].stack_stats.kibana.plugins.infraops.last_24_hours.hits.infraops_docker
+ ).to.be.greaterThan(0);
+ });
});
});
};
diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
index 7ec06e74289c9..04ffcc4847d54 100644
--- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
@@ -5,16 +5,22 @@
*/
import expect from '@kbn/expect';
+import moment from 'moment';
import { DATES } from './constants';
import { FtrProviderContext } from '../../ftr_provider_context';
+const COMMON_REQUEST_HEADERS = {
+ 'kbn-xsrf': 'some-xsrf-token',
+};
+
export default ({ getPageObjects, getService }: FtrProviderContext) => {
const esArchiver = getService('esArchiver');
const logsUi = getService('logsUi');
const infraSourceConfigurationForm = getService('infraSourceConfigurationForm');
const pageObjects = getPageObjects(['common', 'infraLogs']);
const retry = getService('retry');
+ const supertest = getService('supertest');
describe('Logs Source Configuration', function () {
before(async () => {
@@ -97,6 +103,35 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
expect(logStreamEntryColumns).to.have.length(3);
});
+ it('records telemetry for logs', async () => {
+ await logsUi.logStreamPage.navigateTo({
+ logPosition: {
+ start: DATES.metricsAndLogs.stream.startWithData,
+ end: DATES.metricsAndLogs.stream.endWithData,
+ },
+ });
+
+ await logsUi.logStreamPage.getStreamEntries();
+
+ const resp = await supertest
+ .post(`/api/telemetry/v2/clusters/_stats`)
+ .set(COMMON_REQUEST_HEADERS)
+ .set('Accept', 'application/json')
+ .send({
+ timeRange: {
+ min: moment().subtract(1, 'hour').toISOString(),
+ max: moment().toISOString(),
+ },
+ unencrypted: true,
+ })
+ .expect(200)
+ .then((res: any) => res.body);
+
+ expect(
+ resp[0].stack_stats.kibana.plugins.infraops.last_24_hours.hits.logs
+ ).to.be.greaterThan(0);
+ });
+
it('can change the log columns', async () => {
await pageObjects.infraLogs.navigateToTab('settings');
diff --git a/x-pack/test/functional/page_objects/infra_home_page.ts b/x-pack/test/functional/page_objects/infra_home_page.ts
index 51dad594f21f5..ef6d2dc02eb80 100644
--- a/x-pack/test/functional/page_objects/infra_home_page.ts
+++ b/x-pack/test/functional/page_objects/infra_home_page.ts
@@ -33,6 +33,29 @@ export function InfraHomePageProvider({ getService }: FtrProviderContext) {
return await testSubjects.find('waffleMap');
},
+ async openInvenotrySwitcher() {
+ await testSubjects.click('openInventorySwitcher');
+ return await testSubjects.find('goToHost');
+ },
+
+ async goToHost() {
+ await testSubjects.click('openInventorySwitcher');
+ await testSubjects.find('goToHost');
+ return await testSubjects.click('goToHost');
+ },
+
+ async goToPods() {
+ await testSubjects.click('openInventorySwitcher');
+ await testSubjects.find('goToHost');
+ return await testSubjects.click('goToPods');
+ },
+
+ async goToDocker() {
+ await testSubjects.click('openInventorySwitcher');
+ await testSubjects.find('goToHost');
+ return await testSubjects.click('goToDocker');
+ },
+
async goToMetricExplorer() {
return await testSubjects.click('infrastructureNavLink_/infrastructure/metrics-explorer');
},
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index db33775abeb0a..7207bb3fc37b3 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -116,6 +116,48 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
version: policyInfo.packageInfo.version,
},
},
+ artifact_manifest: {
+ artifacts: {
+ 'endpoint-exceptionlist-linux-v1': {
+ compression_algorithm: 'zlib',
+ decoded_sha256:
+ 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ decoded_size: 14,
+ encoded_sha256:
+ 'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+ encoded_size: 22,
+ encryption_algorithm: 'none',
+ relative_url:
+ '/api/endpoint/artifacts/download/endpoint-exceptionlist-linux-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ },
+ 'endpoint-exceptionlist-macos-v1': {
+ compression_algorithm: 'zlib',
+ decoded_sha256:
+ 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ decoded_size: 14,
+ encoded_sha256:
+ 'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+ encoded_size: 22,
+ encryption_algorithm: 'none',
+ relative_url:
+ '/api/endpoint/artifacts/download/endpoint-exceptionlist-macos-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ },
+ 'endpoint-exceptionlist-windows-v1': {
+ compression_algorithm: 'zlib',
+ decoded_sha256:
+ 'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ decoded_size: 14,
+ encoded_sha256:
+ 'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+ encoded_size: 22,
+ encryption_algorithm: 'none',
+ relative_url:
+ '/api/endpoint/artifacts/download/endpoint-exceptionlist-windows-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+ },
+ },
+ manifest_version: 'WzEwNSwxXQ==',
+ schema_version: 'v1',
+ },
policy: {
linux: {
events: { file: false, network: true, process: true },
diff --git a/x-pack/test_utils/testbed/testbed.ts b/x-pack/test_utils/testbed/testbed.ts
index febd2a63cf5b8..e981d0b6918a3 100644
--- a/x-pack/test_utils/testbed/testbed.ts
+++ b/x-pack/test_utils/testbed/testbed.ts
@@ -244,8 +244,7 @@ export const registerTestBed = (
const formInput = findTestSubject(comboBox, 'comboBoxSearchInput');
setInputValue(formInput, value);
- // keyCode 13 === ENTER
- comboBox.simulate('keydown', { keyCode: 13 });
+ comboBox.simulate('keydown', { key: 'Enter' });
component.update();
};
diff --git a/yarn.lock b/yarn.lock
index 2d575634686a3..290713d32d333 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2230,10 +2230,10 @@
tabbable "^1.1.0"
uuid "^3.1.0"
-"@elastic/eui@24.1.0":
- version "24.1.0"
- resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-24.1.0.tgz#40593cc474237e8c464d182faa50c748b3f66822"
- integrity sha512-Y7s327h0Z8dsO6MY7Sn1k5pOrf9ZjWH/ZE2gVtfBn2He5aFahS/+A434EBqFG0YV5W1VZtYiXtSj0AE1gjtrrw==
+"@elastic/eui@26.3.1":
+ version "26.3.1"
+ resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-26.3.1.tgz#c05cac2d0b246adb2aab7df54f34ecc6ad4f48e1"
+ integrity sha512-bNCMJIqdx7TrhXtbnYN6nxR4fjfTmdpB1ptVDThpt8+1rMSL7ZvxcVL4xg9Fjf6sKLcEQyXfDhr3u4+N3Sa4FA==
dependencies:
"@types/chroma-js" "^2.0.0"
"@types/enzyme" "^3.1.13"
@@ -2258,6 +2258,7 @@
react-virtualized "^9.21.2"
resize-observer-polyfill "^1.5.0"
tabbable "^3.0.0"
+ text-diff "^1.0.1"
uuid "^3.1.0"
"@elastic/filesaver@1.1.2":
@@ -8511,16 +8512,16 @@ backo2@1.0.2:
resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-backport@5.4.6:
- version "5.4.6"
- resolved "https://registry.yarnpkg.com/backport/-/backport-5.4.6.tgz#8d8d8cb7c0df4079a40c6f4892f393daa92c1ef8"
- integrity sha512-O3fFmQXKZN5sP6R6GwXeobsEgoFzvnuTGj8/TTTjxt1xA07pfhTY67M16rr0eiDDtuSxAqWMX9Zo+5Q3DuxfpQ==
+backport@5.5.1:
+ version "5.5.1"
+ resolved "https://registry.yarnpkg.com/backport/-/backport-5.5.1.tgz#2eeddbdc4cfc0530119bdb2b0c3c30bc7ef574dd"
+ integrity sha512-vQuGrxxMx9H64ywqsIYUHL8+/xvPeP0nnBa0YQt5S+XqW7etaqOoa5dFW0c77ADdqjfLlGUIvtc2i6UrmqeFUQ==
dependencies:
axios "^0.19.2"
dedent "^0.7.0"
del "^5.1.0"
find-up "^4.1.0"
- inquirer "^7.2.0"
+ inquirer "^7.3.1"
lodash.flatmap "^4.5.0"
lodash.isempty "^4.4.0"
lodash.isstring "^4.0.1"
@@ -8530,7 +8531,7 @@ backport@5.4.6:
safe-json-stringify "^1.2.0"
strip-json-comments "^3.1.0"
winston "^3.3.3"
- yargs "^15.3.1"
+ yargs "^15.4.0"
bail@^1.0.0:
version "1.0.2"
@@ -9709,6 +9710,14 @@ chalk@^3.0.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
+chalk@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+ integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
chalk@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -10162,6 +10171,11 @@ cli-width@^2.0.0:
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+cli-width@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+ integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
clipboard@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d"
@@ -17869,21 +17883,21 @@ inquirer@^7.0.0:
strip-ansi "^5.1.0"
through "^2.3.6"
-inquirer@^7.2.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.2.0.tgz#63ce99d823090de7eb420e4bb05e6f3449aa389a"
- integrity sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==
+inquirer@^7.3.1:
+ version "7.3.1"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.1.tgz#ac6aba1abdfdd5ad34e7069370411edba17f6439"
+ integrity sha512-/+vOpHQHhoh90Znev8BXiuw1TDQ7IDxWsQnFafUEoK5+4uN5Eoz1p+3GqOj/NtzEi9VzWKQcV9Bm+i8moxedsA==
dependencies:
ansi-escapes "^4.2.1"
- chalk "^3.0.0"
+ chalk "^4.1.0"
cli-cursor "^3.1.0"
- cli-width "^2.0.0"
+ cli-width "^3.0.0"
external-editor "^3.0.3"
figures "^3.0.0"
- lodash "^4.17.15"
+ lodash "^4.17.16"
mute-stream "0.0.8"
run-async "^2.4.0"
- rxjs "^6.5.3"
+ rxjs "^6.6.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"
through "^2.3.6"
@@ -20902,10 +20916,10 @@ lodash.uniq@^4.5.0:
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-lodash@4.17.11, lodash@4.17.15, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
- version "4.17.15"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
- integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+lodash@4.17.11, lodash@4.17.15, lodash@>4.17.4, lodash@^4, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.10.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.15.19, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5:
+ version "4.17.19"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+ integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
lodash@^3.10.1:
version "3.10.1"
@@ -26722,11 +26736,6 @@ regjsparser@^0.6.4:
dependencies:
jsesc "~0.5.0"
-regression@2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/regression/-/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87"
- integrity sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc=
-
rehype-parse@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-6.0.0.tgz#f681555f2598165bee2c778b39f9073d17b16bca"
@@ -27538,7 +27547,7 @@ rxjs-marbles@^5.0.6:
dependencies:
fast-equals "^2.0.0"
-rxjs@6.5.5, rxjs@^6.5.3, rxjs@^6.5.5:
+rxjs@6.5.5, rxjs@^6.5.5:
version "6.5.5"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
@@ -27559,6 +27568,13 @@ rxjs@^6.1.0, rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.1:
dependencies:
tslib "^1.9.0"
+rxjs@^6.6.0:
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz#af2901eedf02e3a83ffa7f886240ff9018bbec84"
+ integrity sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==
+ dependencies:
+ tslib "^1.9.0"
+
safe-buffer@5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -29949,6 +29965,11 @@ test-exclude@^6.0.0:
glob "^7.1.4"
minimatch "^3.0.4"
+text-diff@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/text-diff/-/text-diff-1.0.1.tgz#6c105905435e337857375c9d2f6ca63e453ff565"
+ integrity sha1-bBBZBUNeM3hXN1ydL2ymPkU/9WU=
+
text-hex@1.0.x:
version "1.0.0"
resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
@@ -33410,7 +33431,7 @@ yargs-parser@^11.1.1:
camelcase "^5.0.0"
decamelize "^1.2.0"
-yargs-parser@^18.1.1:
+yargs-parser@^18.1.1, yargs-parser@^18.1.2:
version "18.1.3"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -33523,6 +33544,23 @@ yargs@^15.0.2, yargs@^15.1.0, yargs@^15.3.1, yargs@~15.3.1:
y18n "^4.0.0"
yargs-parser "^18.1.1"
+yargs@^15.4.0:
+ version "15.4.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+ integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+ dependencies:
+ cliui "^6.0.0"
+ decamelize "^1.2.0"
+ find-up "^4.1.0"
+ get-caller-file "^2.0.1"
+ require-directory "^2.1.1"
+ require-main-filename "^2.0.0"
+ set-blocking "^2.0.0"
+ string-width "^4.2.0"
+ which-module "^2.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^18.1.2"
+
yargs@^3.15.0:
version "3.32.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"