From 0a7462dc4acb79bc28873b4ce82a510aa624397c Mon Sep 17 00:00:00 2001 From: Lee Drengenberg Date: Thu, 1 Oct 2020 15:35:36 -0500 Subject: [PATCH 01/73] move apps lower in tree, add metricbeat dashboard screenshot test (#79001) --- .../services/common/failure_debugging.ts | 2 +- .../functional/services/common/screenshots.ts | 2 +- test/functional/services/common/snapshots.ts | 2 +- .../{test/functional => }/apps/ccs/ccs.js | 0 .../{test/functional => }/apps/ccs/index.js | 0 .../functional => }/apps/filebeat/filebeat.js | 0 .../functional => }/apps/filebeat/index.js | 0 .../apps/heartbeat/_heartbeat.js | 0 .../functional => }/apps/heartbeat/index.js | 0 .../apps/management/_index_pattern_create.js | 0 .../functional => }/apps/management/index.js | 0 .../apps/metricbeat/_metricbeat.js | 0 .../apps/metricbeat/_metricbeat_dashboard.js | 59 +++++++++++++++++++ .../functional => }/apps/metricbeat/index.js | 1 + .../apps/monitoring/_monitoring.js | 0 .../apps/monitoring/_monitoring_metricbeat.js | 0 .../functional => }/apps/monitoring/index.js | 0 .../apps/packetbeat/_packetbeat.js | 0 .../functional => }/apps/packetbeat/index.js | 0 .../functional => }/apps/reporting/index.js | 0 .../apps/reporting/reporting_watcher.js | 0 .../apps/reporting/reporting_watcher_png.js | 0 .../functional => }/apps/reporting/util.js | 0 .../apps/sample_data/e_commerce.js | 0 .../functional => }/apps/sample_data/index.js | 0 .../apps/telemetry/_telemetry.js | 0 .../functional => }/apps/telemetry/index.js | 0 .../apps/winlogbeat/_winlogbeat.js | 0 .../functional => }/apps/winlogbeat/index.js | 0 ...onfig.stack_functional_integration_base.js | 17 ++++-- .../configs/tests_list.js | 6 +- 31 files changed, 81 insertions(+), 8 deletions(-) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/ccs/ccs.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/ccs/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/filebeat/filebeat.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/filebeat/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/heartbeat/_heartbeat.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/heartbeat/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/management/_index_pattern_create.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/management/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/metricbeat/_metricbeat.js (100%) create mode 100644 x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js rename x-pack/test/stack_functional_integration/{test/functional => }/apps/metricbeat/index.js (86%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/monitoring/_monitoring.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/monitoring/_monitoring_metricbeat.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/monitoring/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/packetbeat/_packetbeat.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/packetbeat/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/reporting/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/reporting/reporting_watcher.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/reporting/reporting_watcher_png.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/reporting/util.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/sample_data/e_commerce.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/sample_data/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/telemetry/_telemetry.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/telemetry/index.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/winlogbeat/_winlogbeat.js (100%) rename x-pack/test/stack_functional_integration/{test/functional => }/apps/winlogbeat/index.js (100%) diff --git a/test/functional/services/common/failure_debugging.ts b/test/functional/services/common/failure_debugging.ts index aa67c455e010..8b0e095b71ff 100644 --- a/test/functional/services/common/failure_debugging.ts +++ b/test/functional/services/common/failure_debugging.ts @@ -38,7 +38,7 @@ export async function FailureDebuggingProvider({ getService }: FtrProviderContex const log = getService('log'); const browser = getService('browser'); - if (process.env.CI !== 'true') { + if (process.env.CI !== 'true' && !process.env.stack_functional_integration) { await del(config.get('failureDebugging.htmlDirectory')); } diff --git a/test/functional/services/common/screenshots.ts b/test/functional/services/common/screenshots.ts index daa55240f3eb..5bce0d4cf6c8 100644 --- a/test/functional/services/common/screenshots.ts +++ b/test/functional/services/common/screenshots.ts @@ -40,7 +40,7 @@ export async function ScreenshotsProvider({ getService }: FtrProviderContext) { const FAILURE_DIRECTORY = resolve(config.get('screenshots.directory'), 'failure'); const BASELINE_DIRECTORY = resolve(config.get('screenshots.directory'), 'baseline'); - if (process.env.CI !== 'true') { + if (process.env.CI !== 'true' && !process.env.stack_functional_integration) { await del([SESSION_DIRECTORY, FAILURE_DIRECTORY]); } diff --git a/test/functional/services/common/snapshots.ts b/test/functional/services/common/snapshots.ts index 2e0b360e594e..03eadff82e31 100644 --- a/test/functional/services/common/snapshots.ts +++ b/test/functional/services/common/snapshots.ts @@ -35,7 +35,7 @@ export async function SnapshotsProvider({ getService }: FtrProviderContext) { const SESSION_DIRECTORY = resolve(config.get('snapshots.directory'), 'session'); const BASELINE_DIRECTORY = resolve(config.get('snapshots.directory'), 'baseline'); - if (process.env.CI !== 'true') { + if (process.env.CI !== 'true' && !process.env.stack_functional_integration) { await del([SESSION_DIRECTORY]); } diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/ccs/ccs.js b/x-pack/test/stack_functional_integration/apps/ccs/ccs.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/ccs/ccs.js rename to x-pack/test/stack_functional_integration/apps/ccs/ccs.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/ccs/index.js b/x-pack/test/stack_functional_integration/apps/ccs/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/ccs/index.js rename to x-pack/test/stack_functional_integration/apps/ccs/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/filebeat/filebeat.js b/x-pack/test/stack_functional_integration/apps/filebeat/filebeat.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/filebeat/filebeat.js rename to x-pack/test/stack_functional_integration/apps/filebeat/filebeat.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/filebeat/index.js b/x-pack/test/stack_functional_integration/apps/filebeat/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/filebeat/index.js rename to x-pack/test/stack_functional_integration/apps/filebeat/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/heartbeat/_heartbeat.js b/x-pack/test/stack_functional_integration/apps/heartbeat/_heartbeat.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/heartbeat/_heartbeat.js rename to x-pack/test/stack_functional_integration/apps/heartbeat/_heartbeat.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/heartbeat/index.js b/x-pack/test/stack_functional_integration/apps/heartbeat/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/heartbeat/index.js rename to x-pack/test/stack_functional_integration/apps/heartbeat/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/management/_index_pattern_create.js b/x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/management/_index_pattern_create.js rename to x-pack/test/stack_functional_integration/apps/management/_index_pattern_create.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/management/index.js b/x-pack/test/stack_functional_integration/apps/management/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/management/index.js rename to x-pack/test/stack_functional_integration/apps/management/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/metricbeat/_metricbeat.js b/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/metricbeat/_metricbeat.js rename to x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat.js diff --git a/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js b/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js new file mode 100644 index 000000000000..42f707fb7785 --- /dev/null +++ b/x-pack/test/stack_functional_integration/apps/metricbeat/_metricbeat_dashboard.js @@ -0,0 +1,59 @@ +/* + * 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 { REPO_ROOT } from '@kbn/dev-utils'; + +export default function ({ getService, getPageObjects, updateBaselines }) { + const screenshot = getService('screenshots'); + const browser = getService('browser'); + const esArchiver = getService('esArchiver'); + const PageObjects = getPageObjects(['common', 'dashboard', 'timePicker']); + + describe('check metricbeat Dashboard', function () { + before(async function () { + await esArchiver.load(`${REPO_ROOT}/../integration-test/test/es_archives/metricbeat`); + + // this navigateToActualURL takes the place of navigating to the dashboard landing page, + // filtering on the dashboard name, selecting it, setting the timepicker, and going to full screen + await PageObjects.common.navigateToActualUrl( + 'dashboard', + 'view/Metricbeat-system-overview-ecs?_g=(filters:!(),refreshInterval:(pause:!t,value:0),' + + 'time:(from:%272020-09-29T19:02:37.902Z%27,to:%272020-09-29T19:06:43.218Z%27))&_a=' + + '(description:%27Overview%20of%20system%20metrics%27,filters:!(),fullScreenMode:!t,' + + 'options:(darkTheme:!f),query:(language:kuery,query:%27%27),timeRestore:!f,' + + 'title:%27%5BMetricbeat%20System%5D%20Overview%20ECS%27,viewMode:view)', + { + ensureCurrentUrl: false, + shouldLoginIfPrompted: true, + } + ); + // await PageObjects.common.navigateToApp('dashboard', { insertTimestamp: false }); + // await PageObjects.dashboard.loadSavedDashboard('[Metricbeat System] Overview ECS'); + // await PageObjects.timePicker.setAbsoluteRange( + // 'Sep 29, 2020 @ 14:02:37.902', + // 'Sep 29, 2020 @ 14:06:43.218' + // ); + // await PageObjects.dashboard.clickFullScreenMode(); + + await PageObjects.common.sleep(2000); + await PageObjects.dashboard.waitForRenderComplete(); + await browser.setScreenshotSize(1000, 1000); + }); + + it('[Metricbeat System] Overview ECS should match snapshot', async function () { + try { + const percentDifference = await screenshot.compareAgainstBaseline( + 'metricbeat_dashboard', + updateBaselines + ); + expect(percentDifference).to.be.lessThan(0.01); + } finally { + await PageObjects.dashboard.clickExitFullScreenLogoButton(); + } + }); + }); +} diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/metricbeat/index.js b/x-pack/test/stack_functional_integration/apps/metricbeat/index.js similarity index 86% rename from x-pack/test/stack_functional_integration/test/functional/apps/metricbeat/index.js rename to x-pack/test/stack_functional_integration/apps/metricbeat/index.js index d45d6c835a31..148762c6a8b7 100644 --- a/x-pack/test/stack_functional_integration/test/functional/apps/metricbeat/index.js +++ b/x-pack/test/stack_functional_integration/apps/metricbeat/index.js @@ -7,5 +7,6 @@ export default function ({ loadTestFile }) { describe('metricbeat app', function () { loadTestFile(require.resolve('./_metricbeat')); + loadTestFile(require.resolve('./_metricbeat_dashboard')); }); } diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/monitoring/_monitoring.js b/x-pack/test/stack_functional_integration/apps/monitoring/_monitoring.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/monitoring/_monitoring.js rename to x-pack/test/stack_functional_integration/apps/monitoring/_monitoring.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/monitoring/_monitoring_metricbeat.js b/x-pack/test/stack_functional_integration/apps/monitoring/_monitoring_metricbeat.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/monitoring/_monitoring_metricbeat.js rename to x-pack/test/stack_functional_integration/apps/monitoring/_monitoring_metricbeat.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/monitoring/index.js b/x-pack/test/stack_functional_integration/apps/monitoring/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/monitoring/index.js rename to x-pack/test/stack_functional_integration/apps/monitoring/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/packetbeat/_packetbeat.js b/x-pack/test/stack_functional_integration/apps/packetbeat/_packetbeat.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/packetbeat/_packetbeat.js rename to x-pack/test/stack_functional_integration/apps/packetbeat/_packetbeat.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/packetbeat/index.js b/x-pack/test/stack_functional_integration/apps/packetbeat/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/packetbeat/index.js rename to x-pack/test/stack_functional_integration/apps/packetbeat/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/reporting/index.js b/x-pack/test/stack_functional_integration/apps/reporting/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/reporting/index.js rename to x-pack/test/stack_functional_integration/apps/reporting/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/reporting/reporting_watcher.js b/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/reporting/reporting_watcher.js rename to x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/reporting/reporting_watcher_png.js b/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher_png.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/reporting/reporting_watcher_png.js rename to x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher_png.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/reporting/util.js b/x-pack/test/stack_functional_integration/apps/reporting/util.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/reporting/util.js rename to x-pack/test/stack_functional_integration/apps/reporting/util.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/sample_data/e_commerce.js b/x-pack/test/stack_functional_integration/apps/sample_data/e_commerce.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/sample_data/e_commerce.js rename to x-pack/test/stack_functional_integration/apps/sample_data/e_commerce.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/sample_data/index.js b/x-pack/test/stack_functional_integration/apps/sample_data/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/sample_data/index.js rename to x-pack/test/stack_functional_integration/apps/sample_data/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/telemetry/_telemetry.js b/x-pack/test/stack_functional_integration/apps/telemetry/_telemetry.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/telemetry/_telemetry.js rename to x-pack/test/stack_functional_integration/apps/telemetry/_telemetry.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/telemetry/index.js b/x-pack/test/stack_functional_integration/apps/telemetry/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/telemetry/index.js rename to x-pack/test/stack_functional_integration/apps/telemetry/index.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/winlogbeat/_winlogbeat.js b/x-pack/test/stack_functional_integration/apps/winlogbeat/_winlogbeat.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/winlogbeat/_winlogbeat.js rename to x-pack/test/stack_functional_integration/apps/winlogbeat/_winlogbeat.js diff --git a/x-pack/test/stack_functional_integration/test/functional/apps/winlogbeat/index.js b/x-pack/test/stack_functional_integration/apps/winlogbeat/index.js similarity index 100% rename from x-pack/test/stack_functional_integration/test/functional/apps/winlogbeat/index.js rename to x-pack/test/stack_functional_integration/apps/winlogbeat/index.js diff --git a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js index 96d338a04b01..a838b129242a 100644 --- a/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js +++ b/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @@ -6,12 +6,12 @@ import { resolve } from 'path'; import buildState from './build_state'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils'; import chalk from 'chalk'; import { esTestConfig, kbnTestConfig } from '@kbn/test'; const reportName = 'Stack Functional Integration Tests'; -const testsFolder = '../test/functional/apps'; +const testsFolder = '../apps'; const log = new ToolingLog({ level: 'info', writeTo: process.stdout, @@ -19,13 +19,14 @@ const log = new ToolingLog({ log.info(`WORKSPACE in config file ${process.env.WORKSPACE}`); const stateFilePath = process.env.WORKSPACE ? `${process.env.WORKSPACE}/qa/envvars.sh` - : '../../../../../integration-test/qa/envvars.sh'; + : `${REPO_ROOT}/../integration-test/qa/envvars.sh`; const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`); export default async ({ readConfigFile }) => { const defaultConfigs = await readConfigFile(require.resolve('../../functional/config')); const { tests, ...provisionedConfigs } = buildState(resolve(__dirname, stateFilePath)); + process.env.stack_functional_integration = true; const servers = { kibana: kbnTestConfig.getUrlParts(), @@ -43,6 +44,14 @@ export default async ({ readConfigFile }) => { // If we need to do things like disable animations, we can do it in configure_start_kibana.sh, in the provisioner...which lives in the integration-test private repo uiSettings: {}, security: { disableTestUser: true }, + // choose where screenshots should be saved + screenshots: { + directory: resolve(`${REPO_ROOT}/../integration-test`, 'test/screenshots'), + }, + // choose where esArchiver should load archives from + esArchiver: { + directory: resolve(`${REPO_ROOT}/../integration-test`, 'test/es_archives'), + }, }; return settings; }; @@ -55,7 +64,7 @@ function truncate(testPath) { return dropKibanaPath(testPath); } function highLight(testPath) { - const dropTestsPath = splitRight(/^.+test[\\/]functional[\\/]apps[\\/](.*)[\\/]/gm); + const dropTestsPath = splitRight(/^.+apps[\\/](.*)[\\/]/gm); const cleaned = dropTestsPath(testPath); const colored = chalk.greenBright.bold(cleaned); return testPath.replace(cleaned, colored); diff --git a/x-pack/test/stack_functional_integration/configs/tests_list.js b/x-pack/test/stack_functional_integration/configs/tests_list.js index 0d91a078b73f..44b622a8bc9c 100644 --- a/x-pack/test/stack_functional_integration/configs/tests_list.js +++ b/x-pack/test/stack_functional_integration/configs/tests_list.js @@ -20,7 +20,11 @@ export default (envObj) => { } if (envObj.BEATS.includes('metricbeat')) { - xs.push('metricbeat'); + xs.push('metricbeat/_metricbeat'); + if (envObj.XPACK === 'YES') { + // the esArchive and dashboard png are specific to the default distribution (with XPACK) + xs.push('metricbeat/_metricbeat_dashboard'); + } } if (envObj.BEATS.includes('filebeat')) { xs.push('filebeat'); From 3078908093a32f4538e436ba227c650f745c5d33 Mon Sep 17 00:00:00 2001 From: Angela Chuang <6295984+angorayc@users.noreply.github.com> Date: Thu, 1 Oct 2020 21:46:13 +0100 Subject: [PATCH 02/73] [Security Solution] Searchstrategy integration (#78147) * init tests * add integration test for topNflow search strategy * add integration tests * add more tests * more tests * fix types * fix types * fix integration test * fix types * rm grapgql * fix type * fixup * fix test error * fix integration test * skip failing test * fix integration * skip failing test * skip failing test * fix integration tests for kpi network * fix integration test * fix integration test * fix import * remove additional data Co-authored-by: Elastic Machine --- .../factory/hosts/details/helpers.ts | 9 +- .../hosts/last_first_seen/__mocks__/index.ts | 3 - .../factory/hosts/last_first_seen/index.ts | 1 - .../apis/security_solution/authentications.ts | 107 +++--- .../apis/security_solution/host_details.ts | 237 ++++++++++++ .../apis/security_solution/hosts.ts | 212 +++++------ .../apis/security_solution/index.js | 26 +- .../security_solution/kpi_host_details.ts | 185 ---------- .../apis/security_solution/kpi_hosts.ts | 265 ++++++++------ .../apis/security_solution/kpi_network.ts | 345 ++++++++++++------ .../apis/security_solution/network_details.ts | 80 ++-- .../apis/security_solution/network_dns.ts | 143 ++++---- .../security_solution/network_top_n_flow.ts | 301 ++++++++------- .../apis/security_solution/overview_host.ts | 55 +-- .../security_solution/overview_network.ts | 131 ++++--- .../apis/security_solution/sources.ts | 4 +- .../apis/security_solution/timeline.ts | 8 +- .../security_solution/timeline_details.ts | 223 +++++------ .../apis/security_solution/tls.ts | 243 ++++++------ .../security_solution/uncommon_processes.ts | 81 ++-- .../apis/security_solution/users.ts | 78 ++-- .../es_archives/filebeat/default/data.json.gz | Bin 711714 -> 711718 bytes .../packetbeat/default/data.json.gz | Bin 78494 -> 78491 bytes 23 files changed, 1438 insertions(+), 1299 deletions(-) create mode 100644 x-pack/test/api_integration/apis/security_solution/host_details.ts delete mode 100644 x-pack/test/api_integration/apis/security_solution/kpi_host_details.ts diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts index ed705e7f6ad5..644278963742 100644 --- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts +++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts @@ -7,6 +7,7 @@ import { set } from '@elastic/safer-lodash-set/fp'; import { get, has, head } from 'lodash/fp'; import { hostFieldsMap } from '../../../../../../common/ecs/ecs_fields'; import { HostItem } from '../../../../../../common/search_strategy/security_solution/hosts'; +import { toArray } from '../../../../helpers/to_array'; import { HostAggEsItem, HostBuckets, HostValue } from '../../../../../lib/hosts/types'; @@ -36,7 +37,10 @@ export const formatHostItem = (bucket: HostAggEsItem): HostItem => HOST_FIELDS.reduce((flattenedFields, fieldName) => { const fieldValue = getHostFieldValue(fieldName, bucket); if (fieldValue != null) { - return set(fieldName, fieldValue, flattenedFields); + if (fieldName === '_id') { + return set('_id', fieldValue, flattenedFields); + } + return set(fieldName, toArray(fieldValue), flattenedFields); } return flattenedFields; }, {}); @@ -72,6 +76,9 @@ const getHostFieldValue = (fieldName: string, bucket: HostAggEsItem): string | s case 'host.os.version': return get('os.hits.hits[0]._source.host.os.version', bucket) || null; } + } else if (aggField === '_id') { + const hostName = get(`host_name`, bucket); + return hostName ? getFirstItem(hostName) : null; } return null; }; diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/__mocks__/index.ts index 224dcd1f8de2..00427863c5f4 100644 --- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/__mocks__/index.ts +++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/__mocks__/index.ts @@ -57,9 +57,6 @@ export const formattedSearchStrategyResponse = { dsl: [ '{\n "allowNoIndices": true,\n "index": [\n "apm-*-transaction*",\n "auditbeat-*",\n "endgame-*",\n "filebeat-*",\n "logs-*",\n "packetbeat-*",\n "winlogbeat-*"\n ],\n "ignoreUnavailable": true,\n "body": {\n "docvalue_fields": [],\n "aggregations": {\n "firstSeen": {\n "min": {\n "field": "@timestamp"\n }\n },\n "lastSeen": {\n "max": {\n "field": "@timestamp"\n }\n }\n },\n "query": {\n "bool": {\n "filter": [\n {\n "term": {\n "host.name": "siem-kibana"\n }\n }\n ]\n }\n },\n "size": 0,\n "track_total_hits": false\n }\n}', ], - response: [ - '{\n "isPartial": false,\n "isRunning": false,\n "rawResponse": {\n "took": 230,\n "timed_out": false,\n "_shards": {\n "total": 21,\n "successful": 21,\n "skipped": 0,\n "failed": 0\n },\n "hits": {\n "total": -1,\n "max_score": 0,\n "hits": []\n },\n "aggregations": {\n "lastSeen": {\n "value": 1599554931759,\n "value_as_string": "2020-09-08T08:48:51.759Z"\n },\n "firstSeen": {\n "value": 1591611722000,\n "value_as_string": "2020-06-08T10:22:02.000Z"\n }\n }\n },\n "total": 21,\n "loaded": 21\n}', - ], }, firstSeen: '2020-06-08T10:22:02.000Z', lastSeen: '2020-09-08T08:48:51.759Z', diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts index 56895583c2ae..ee97436d2653 100644 --- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts +++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts @@ -28,7 +28,6 @@ export const firstLastSeenHost: SecuritySolutionFactory { before(() => esArchiver.load('auditbeat/hosts')); after(() => esArchiver.unload('auditbeat/hosts')); - it('Make sure that we get Authentication data', () => { - return client - .query({ - query: authenticationsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 3, - querySize: 1, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get Authentication data', async () => { + const { body: authentications } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.authentications, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 3, + querySize: 1, + }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const authentications = resp.data.source.Authentications; - expect(authentications.edges.length).to.be(EDGE_LENGTH); - expect(authentications.totalCount).to.be(TOTAL_COUNT); - expect(authentications.pageInfo.fakeTotalCount).to.equal(3); - }); + .expect(200); + + expect(authentications.edges.length).to.be(EDGE_LENGTH); + expect(authentications.totalCount).to.be(TOTAL_COUNT); + expect(authentications.pageInfo.fakeTotalCount).to.equal(3); }); - it('Make sure that pagination is working in Authentications query', () => { - return client - .query({ - query: authenticationsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - pagination: { - activePage: 2, - cursorStart: 1, - fakePossibleCount: 5, - querySize: 2, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that pagination is working in Authentications query', async () => { + const { body: authentications } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.authentications, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + pagination: { + activePage: 2, + cursorStart: 1, + fakePossibleCount: 5, + querySize: 2, + }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const authentications = resp.data.source.Authentications; - expect(authentications.edges.length).to.be(EDGE_LENGTH); - expect(authentications.totalCount).to.be(TOTAL_COUNT); - expect(authentications.edges[0]!.node.lastSuccess!.host!.name).to.eql([HOST_NAME]); - }); + .expect(200); + + expect(authentications.edges.length).to.be(EDGE_LENGTH); + expect(authentications.totalCount).to.be(TOTAL_COUNT); + expect(authentications.edges[0]!.node.lastSuccess!.host!.name).to.eql([HOST_NAME]); }); }); } diff --git a/x-pack/test/api_integration/apis/security_solution/host_details.ts b/x-pack/test/api_integration/apis/security_solution/host_details.ts new file mode 100644 index 000000000000..9fe9df1fae50 --- /dev/null +++ b/x-pack/test/api_integration/apis/security_solution/host_details.ts @@ -0,0 +1,237 @@ +/* + * 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 '../../ftr_provider_context'; +import { HostsQueries } from '../../../../plugins/security_solution/common/search_strategy'; + +export default function ({ getService }: FtrProviderContext) { + const esArchiver = getService('esArchiver'); + const supertest = getService('supertest'); + + describe('Host Details', () => { + describe('With filebeat', () => { + before(() => esArchiver.load('filebeat/default')); + after(() => esArchiver.unload('filebeat/default')); + + const FROM = '2000-01-01T00:00:00.000Z'; + const TO = '3000-01-01T00:00:00.000Z'; + const expectedResult = { + isPartial: false, + isRunning: false, + rawResponse: { + took: 12, + timed_out: false, + _shards: { + total: 1, + successful: 1, + skipped: 0, + failed: 0, + }, + hits: { + total: 6157, + max_score: null, + hits: [], + }, + aggregations: { + cloud_instance_id: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [], + }, + host_mac: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [], + }, + host_ip: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: '151.205.0.17', + doc_count: 1, + timestamp: { + value: 1549766627000, + value_as_string: '2019-02-10T02:43:47.000Z', + }, + }, + ], + }, + cloud_machine_type: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [], + }, + cloud_region: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [], + }, + host_os_version: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: '9 (stretch)', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + host_architecture: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'armv7l', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + cloud_provider: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [], + }, + host_os_platform: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'raspbian', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + host_os_name: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'Raspbian GNU/Linux', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + host_os_family: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: '', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + host_name: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'raspberrypi', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + host_id: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: 'b19a781f683541a7a25ee345133aa399', + doc_count: 6157, + timestamp: { + value: 1549767613001, + value_as_string: '2019-02-10T03:00:13.001Z', + }, + }, + ], + }, + }, + }, + total: 1, + loaded: 1, + inspect: { + dsl: [ + '{\n "allowNoIndices": true,\n "index": [\n "filebeat-*"\n ],\n "ignoreUnavailable": true,\n "body": {\n "aggregations": {\n "host_architecture": {\n "terms": {\n "field": "host.architecture",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_id": {\n "terms": {\n "field": "host.id",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_ip": {\n "terms": {\n "field": "host.ip",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_mac": {\n "terms": {\n "field": "host.mac",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_name": {\n "terms": {\n "field": "host.name",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_os_family": {\n "terms": {\n "field": "host.os.family",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_os_name": {\n "terms": {\n "field": "host.os.name",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_os_platform": {\n "terms": {\n "field": "host.os.platform",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "host_os_version": {\n "terms": {\n "field": "host.os.version",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "cloud_instance_id": {\n "terms": {\n "field": "cloud.instance.id",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "cloud_machine_type": {\n "terms": {\n "field": "cloud.machine.type",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "cloud_provider": {\n "terms": {\n "field": "cloud.provider",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n },\n "cloud_region": {\n "terms": {\n "field": "cloud.region",\n "size": 10,\n "order": {\n "timestamp": "desc"\n }\n },\n "aggs": {\n "timestamp": {\n "max": {\n "field": "@timestamp"\n }\n }\n }\n }\n },\n "query": {\n "bool": {\n "filter": [\n {\n "term": {\n "host.name": "raspberrypi"\n }\n },\n {\n "range": {\n "@timestamp": {\n "format": "strict_date_optional_time",\n "gte": "2000-01-01T00:00:00.000Z",\n "lte": "3000-01-01T00:00:00.000Z"\n }\n }\n }\n ]\n }\n },\n "size": 0,\n "track_total_hits": false\n }\n}', + ], + }, + hostDetails: { + _id: 'raspberrypi', + host: { + architecture: ['armv7l'], + id: ['b19a781f683541a7a25ee345133aa399'], + ip: ['151.205.0.17'], + mac: [], + name: ['raspberrypi'], + os: { + family: [''], + name: ['Raspbian GNU/Linux'], + platform: ['raspbian'], + version: ['9 (stretch)'], + }, + }, + cloud: { + instance: { + id: [], + }, + machine: { + type: [], + }, + provider: [], + region: [], + }, + }, + }; + + it('Make sure that we get HostDetails data', async () => { + const { + body: { hostDetails }, + } = await supertest + .post('/internal/search/securitySolutionSearchStrategy') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.details, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + hostName: 'raspberrypi', + inspect: false, + }) + .expect(200); + expect(hostDetails).to.eql(expectedResult.hostDetails); + }); + }); + }); +} diff --git a/x-pack/test/api_integration/apis/security_solution/hosts.ts b/x-pack/test/api_integration/apis/security_solution/hosts.ts index 621718013db7..d48a021b02db 100644 --- a/x-pack/test/api_integration/apis/security_solution/hosts.ts +++ b/x-pack/test/api_integration/apis/security_solution/hosts.ts @@ -5,17 +5,12 @@ */ import expect from '@kbn/expect'; - import { + HostsQueries, Direction, - GetHostOverviewQuery, - GetHostFirstLastSeenQuery, - GetHostsTableQuery, HostsFields, -} from '../../../../plugins/security_solution/public/graphql/types'; -import { HostOverviewQuery } from '../../../../plugins/security_solution/public/hosts/containers/hosts/details/host_overview.gql_query'; -import { HostFirstLastSeenGqlQuery } from '../../../../plugins/security_solution/public/hosts/containers/hosts/first_last_seen/first_last_seen.gql_query'; -import { HostsTableQuery } from '../../../../plugins/security_solution/public/hosts/containers/hosts/hosts_table.gql_query'; +} from '../../../../plugins/security_solution/common/search_strategy'; + import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = '2000-01-01T00:00:00.000Z'; @@ -29,85 +24,77 @@ const CURSOR_ID = '2ab45fc1c41e4c84bbd02202a7e5761f'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); describe('hosts', () => { before(() => esArchiver.load('auditbeat/hosts')); after(() => esArchiver.unload('auditbeat/hosts')); - it('Make sure that we get Hosts Table data', () => { - return client - .query({ - query: HostsTableQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - sort: { - field: HostsFields.lastSeen, - direction: Direction.asc, - }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 3, - querySize: 1, - }, - inspect: false, + it('Make sure that we get Hosts Table data', async () => { + const { body: hosts } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.hosts, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + sort: { + field: HostsFields.lastSeen, + direction: Direction.asc, }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 3, + querySize: 1, + }, + inspect: false, }) - .then((resp) => { - const hosts = resp.data.source.Hosts; - expect(hosts.edges.length).to.be(EDGE_LENGTH); - expect(hosts.totalCount).to.be(TOTAL_COUNT); - expect(hosts.pageInfo.fakeTotalCount).to.equal(3); - }); + .expect(200); + expect(hosts.edges.length).to.be(EDGE_LENGTH); + expect(hosts.totalCount).to.be(TOTAL_COUNT); + expect(hosts.pageInfo.fakeTotalCount).to.equal(3); }); - it('Make sure that pagination is working in Hosts Table query', () => { - return client - .query({ - query: HostsTableQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - sort: { - field: HostsFields.lastSeen, - direction: Direction.asc, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - pagination: { - activePage: 2, - cursorStart: 1, - fakePossibleCount: 5, - querySize: 2, - }, - inspect: false, + it('Make sure that pagination is working in Hosts Table query', async () => { + const { body: hosts } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.hosts, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + sort: { + field: HostsFields.lastSeen, + direction: Direction.asc, + }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + pagination: { + activePage: 2, + cursorStart: 1, + fakePossibleCount: 5, + querySize: 2, }, + inspect: false, }) - .then((resp) => { - const hosts = resp.data.source.Hosts; - - expect(hosts.edges.length).to.be(EDGE_LENGTH); - expect(hosts.totalCount).to.be(TOTAL_COUNT); - expect(hosts.edges[0]!.node.host!.os!.name).to.eql([HOST_NAME]); - }); + .expect(200); + expect(hosts.edges.length).to.be(EDGE_LENGTH); + expect(hosts.totalCount).to.be(TOTAL_COUNT); + expect(hosts.edges[0]!.node.host!.os!.name).to.eql([HOST_NAME]); }); - it('Make sure that we get Host Overview data', () => { - const expectedHost: Omit = { + it('Make sure that we get Host details data', async () => { + const expectedHostDetails = { _id: 'zeek-sensor-san-francisco', - endpoint: null, host: { architecture: ['x86_64'], id: [CURSOR_ID], @@ -119,68 +106,59 @@ export default function ({ getService }: FtrProviderContext) { name: [HOST_NAME], platform: ['ubuntu'], version: ['18.04.2 LTS (Bionic Beaver)'], - __typename: 'OsEcsFields', }, - type: null, - __typename: 'HostEcsFields', }, cloud: { instance: { id: ['132972452'], - __typename: 'CloudInstance', }, machine: { type: [], - __typename: 'CloudMachine', }, provider: ['digitalocean'], region: ['sfo2'], - __typename: 'CloudFields', }, - __typename: 'HostItem', }; - - return client - .query({ - query: HostOverviewQuery, - variables: { - sourceId: 'default', - hostName: 'zeek-sensor-san-francisco', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + const { + body: { hostDetails }, + } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.details, + hostName: 'zeek-sensor-san-francisco', + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const hosts = resp.data.source.HostOverview; - expect(hosts).to.eql(expectedHost); - }); + .expect(200); + + expect(hostDetails).to.eql(expectedHostDetails); }); - it('Make sure that we get Last First Seen for a Host', () => { - return client - .query({ - query: HostFirstLastSeenGqlQuery, - variables: { - sourceId: 'default', - hostName: 'zeek-sensor-san-francisco', - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - }, + it('Make sure that we get Last First Seen for a Host', async () => { + const { body: firstLastSeenHost } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.firstLastSeen, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + hostName: 'zeek-sensor-san-francisco', }) - .then((resp) => { - const firstLastSeenHost = resp.data.source.HostFirstLastSeen; - expect(firstLastSeenHost).to.eql({ - __typename: 'FirstLastSeenHost', - firstSeen: '2019-02-19T19:36:23.561Z', - lastSeen: '2019-02-19T20:42:33.561Z', - }); - }); + .expect(200); + const expected = { + firstSeen: '2019-02-19T19:36:23.561Z', + lastSeen: '2019-02-19T20:42:33.561Z', + }; + + expect(firstLastSeenHost.firstSeen).to.eql(expected.firstSeen); + expect(firstLastSeenHost.lastSeen).to.eql(expected.lastSeen); }); }); } diff --git a/x-pack/test/api_integration/apis/security_solution/index.js b/x-pack/test/api_integration/apis/security_solution/index.js index 3d24af441380..b28ddf7efd57 100644 --- a/x-pack/test/api_integration/apis/security_solution/index.js +++ b/x-pack/test/api_integration/apis/security_solution/index.js @@ -5,24 +5,26 @@ */ export default function ({ loadTestFile }) { - describe('Siem GraphQL Endpoints', () => { - // loadTestFile(require.resolve('./authentications')); + describe('SecuritySolution Endpoints', () => { + loadTestFile(require.resolve('./authentications')); loadTestFile(require.resolve('./hosts')); - // loadTestFile(require.resolve('./kpi_network')); - // loadTestFile(require.resolve('./kpi_hosts')); - // loadTestFile(require.resolve('./network_dns')); - // loadTestFile(require.resolve('./network_top_n_flow')); - // loadTestFile(require.resolve('./overview_host')); + loadTestFile(require.resolve('./host_details')); + loadTestFile(require.resolve('./kpi_network')); + loadTestFile(require.resolve('./kpi_hosts')); + loadTestFile(require.resolve('./network_details')); + loadTestFile(require.resolve('./network_dns')); + loadTestFile(require.resolve('./network_top_n_flow')); + loadTestFile(require.resolve('./overview_host')); + loadTestFile(require.resolve('./overview_network')); loadTestFile(require.resolve('./saved_objects/notes')); loadTestFile(require.resolve('./saved_objects/pinned_events')); loadTestFile(require.resolve('./saved_objects/timeline')); loadTestFile(require.resolve('./sources')); - // loadTestFile(require.resolve('./overview_network')); // loadTestFile(require.resolve('./timeline')); - // loadTestFile(require.resolve('./timeline_details')); - // loadTestFile(require.resolve('./uncommon_processes')); - // loadTestFile(require.resolve('./users')); - // loadTestFile(require.resolve('./tls')); + loadTestFile(require.resolve('./timeline_details')); + loadTestFile(require.resolve('./uncommon_processes')); + loadTestFile(require.resolve('./users')); + loadTestFile(require.resolve('./tls')); loadTestFile(require.resolve('./feature_controls')); }); } diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_host_details.ts b/x-pack/test/api_integration/apis/security_solution/kpi_host_details.ts deleted file mode 100644 index 27e4e02ee7d0..000000000000 --- a/x-pack/test/api_integration/apis/security_solution/kpi_host_details.ts +++ /dev/null @@ -1,185 +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 expect from '@kbn/expect'; -// @ts-expect-error -import { kpiHostDetailsQuery } from '../../../../plugins/security_solution/public/hosts/containers/kpi_host_details/index.gql_query'; -// @ts-expect-error -import { GetKpiHostDetailsQuery } from '../../../../plugins/security_solution/public/graphql/types'; -import { FtrProviderContext } from '../../ftr_provider_context'; - -export default function ({ getService }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); - describe('Kpi Host Details', () => { - describe('With filebeat', () => { - before(() => esArchiver.load('filebeat/default')); - after(() => esArchiver.unload('filebeat/default')); - - const FROM = '2000-01-01T00:00:00.000Z'; - const TO = '3000-01-01T00:00:00.000Z'; - const expectedResult = { - __typename: 'KpiHostDetailsData', - authSuccess: 0, - authSuccessHistogram: null, - authFailure: 0, - authFailureHistogram: null, - uniqueSourceIps: 121, - uniqueSourceIpsHistogram: [ - { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 52, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 31, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 88, - __typename: 'KpiHostHistogramData', - }, - ], - uniqueDestinationIps: 154, - uniqueDestinationIpsHistogram: [ - { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 61, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 45, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 114, - __typename: 'KpiHostHistogramData', - }, - ], - }; - - it('Make sure that we get KpiHostDetails data', () => { - return client - .query({ - query: kpiHostDetailsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - hostName: 'zeek-sensor-san-francisco', - docValueFields: [], - inspect: false, - }, - }) - .then((resp) => { - const kpiHosts = resp.data.source.KpiHostDetails; - expect(kpiHosts!).to.eql(expectedResult); - }); - }); - }); - - describe('With auditbeat', () => { - before(() => esArchiver.load('auditbeat/default')); - after(() => esArchiver.unload('auditbeat/default')); - - const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); - const TO = new Date('3000-01-01T00:00:00.000Z').valueOf(); - const expectedResult = { - __typename: 'KpiHostDetailsData', - authSuccess: 0, - authSuccessHistogram: null, - authFailure: 0, - authFailureHistogram: null, - uniqueSourceIps: 121, - uniqueSourceIpsHistogram: [ - { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 52, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 31, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 88, - __typename: 'KpiHostHistogramData', - }, - ], - uniqueDestinationIps: 154, - uniqueDestinationIpsHistogram: [ - { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 61, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 45, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 114, - __typename: 'KpiHostHistogramData', - }, - ], - }; - it('Make sure that we get KpiHostDetails data', () => { - return client - .query({ - query: kpiHostDetailsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - hostName: 'zeek-sensor-san-francisco', - inspect: false, - }, - }) - .then((resp) => { - const kpiHosts = resp.data.source.KpiHostDetails; - expect(kpiHosts!).to.eql(expectedResult); - }); - }); - }); - }); -} diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts index 64109bd4d932..b141087c4e3b 100644 --- a/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts +++ b/x-pack/test/api_integration/apis/security_solution/kpi_hosts.ts @@ -5,15 +5,13 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { kpiHostsQuery } from '../../../../plugins/security_solution/public/hosts/containers/kpi_hosts/index.gql_query'; -// @ts-expect-error -import { GetKpiHostsQuery } from '../../../../plugins/security_solution/public/graphql/types'; +import { HostsKpiQueries } from '../../../../plugins/security_solution/common/search_strategy'; import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Kpi Hosts', () => { describe('With filebeat', () => { before(() => esArchiver.load('filebeat/default')); @@ -22,28 +20,23 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; const expectedResult = { - __typename: 'KpiHostsData', hosts: 1, hostsHistogram: [ { x: new Date('2019-02-09T16:00:00.000Z').valueOf(), y: 1, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-09T19:00:00.000Z').valueOf(), y: 0, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-09T22:00:00.000Z').valueOf(), y: 1, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-10T01:00:00.000Z').valueOf(), y: 1, - __typename: 'KpiHostHistogramData', }, ], authSuccess: 0, @@ -55,22 +48,18 @@ export default function ({ getService }: FtrProviderContext) { { x: new Date('2019-02-09T16:00:00.000Z').valueOf(), y: 52, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-09T19:00:00.000Z').valueOf(), y: 0, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-09T22:00:00.000Z').valueOf(), y: 31, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-10T01:00:00.000Z').valueOf(), y: 88, - __typename: 'KpiHostHistogramData', }, ], uniqueDestinationIps: 154, @@ -78,46 +67,87 @@ export default function ({ getService }: FtrProviderContext) { { x: new Date('2019-02-09T16:00:00.000Z').valueOf(), y: 61, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-09T19:00:00.000Z').valueOf(), y: 0, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-09T22:00:00.000Z').valueOf(), y: 45, - __typename: 'KpiHostHistogramData', }, { x: new Date('2019-02-10T01:00:00.000Z').valueOf(), y: 114, - __typename: 'KpiHostHistogramData', }, ], }; - it('Make sure that we get KpiHosts data', () => { - return client - .query({ - query: kpiHostsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get KpiHosts data', async () => { + const { body: kpiHosts } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/hostsKpiHostsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsKpiQueries.kpiHosts, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiHosts.hostsHistogram!).to.eql(expectedResult.hostsHistogram); + expect(kpiHosts.hosts!).to.eql(expectedResult.hosts); + }); + + it('Make sure that we get KpiAuthentications data', async () => { + const { body } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/hostsKpiAuthenticationsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsKpiQueries.kpiAuthentications, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + expect(body.authenticationsSuccess!).to.eql(expectedResult.authSuccess); + expect(body.authenticationsSuccessHistogram!).to.eql(expectedResult.authSuccessHistogram); + expect(body.authenticationsFailure!).to.eql(expectedResult.authSuccess); + expect(body.authenticationsFailureHistogram!).to.eql(expectedResult.authFailureHistogram); + }); + + it('Make sure that we get KpiUniqueIps data', async () => { + const { body } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/hostsKpiUniqueIpsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsKpiQueries.kpiUniqueIps, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const kpiHosts = resp.data.source.KpiHosts; - expect(kpiHosts!).to.eql(expectedResult); - }); + .expect(200); + expect(body.uniqueDestinationIps!).to.eql(expectedResult.uniqueDestinationIps); + expect(body.uniqueDestinationIpsHistogram!).to.eql( + expectedResult.uniqueDestinationIpsHistogram + ); + expect(body.uniqueSourceIps!).to.eql(expectedResult.uniqueSourceIps); + expect(body.uniqueSourceIpsHistogram!).to.eql(expectedResult.uniqueSourceIpsHistogram); }); }); @@ -128,101 +158,108 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; const expectedResult = { - __typename: 'KpiHostsData', - hosts: 1, + hosts: 6, hostsHistogram: [ { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 1, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 1, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 1, - __typename: 'KpiHostHistogramData', - }, - ], - authSuccess: 0, - authSuccessHistogram: null, - authFailure: 0, - authFailureHistogram: null, - uniqueSourceIps: 121, - uniqueSourceIpsHistogram: [ - { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 52, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', + x: new Date('2018-11-27T00:00:00.000Z').valueOf(), + y: 6, }, { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 31, - __typename: 'KpiHostHistogramData', + x: new Date('2018-11-27T00:30:00.000Z').valueOf(), + y: 6, }, { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 88, - __typename: 'KpiHostHistogramData', + x: new Date('2018-11-27T01:00:00.000Z').valueOf(), + y: 6, }, - ], - uniqueDestinationIps: 154, - uniqueDestinationIpsHistogram: [ { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 61, - __typename: 'KpiHostHistogramData', + x: new Date('2018-11-27T01:30:00.000Z').valueOf(), + y: 6, }, { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiHostHistogramData', + x: new Date('2018-11-27T02:00:00.000Z').valueOf(), + y: 6, }, { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 45, - __typename: 'KpiHostHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 114, - __typename: 'KpiHostHistogramData', + x: new Date('2018-11-27T02:30:00.000Z').valueOf(), + y: 6, }, ], + authSuccess: null, + authSuccessHistogram: null, + authFailure: 0, + authFailureHistogram: null, + uniqueSourceIps: null, + uniqueSourceIpsHistogram: null, + uniqueDestinationIps: null, + uniqueDestinationIpsHistogram: null, }; - it('Make sure that we get KpiHosts data', () => { - return client - .query({ - query: kpiHostsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + + it('Make sure that we get KpiHosts data', async () => { + const { body: kpiHosts } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/hostsKpiHostsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsKpiQueries.kpiHosts, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['auditbeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiHosts.hostsHistogram!).to.eql(expectedResult.hostsHistogram); + expect(kpiHosts.hosts!).to.eql(expectedResult.hosts); + }); + + it('Make sure that we get KpiAuthentications data', async () => { + const { body } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/hostsKpiAuthenticationsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsKpiQueries.kpiAuthentications, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + expect(body.authenticationsSuccess!).to.eql(expectedResult.authSuccess); + expect(body.authenticationsSuccessHistogram!).to.eql(expectedResult.authSuccessHistogram); + expect(body.authenticationsFailure!).to.eql(expectedResult.authSuccess); + expect(body.authenticationsFailureHistogram!).to.eql(expectedResult.authFailureHistogram); + }); + + it('Make sure that we get KpiUniqueIps data', async () => { + const { body } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/hostsKpiUniqueIpsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsKpiQueries.kpiUniqueIps, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const kpiHosts = resp.data.source.KpiHosts; - expect(kpiHosts!).to.eql(expectedResult); - }); + .expect(200); + expect(body.uniqueDestinationIps!).to.eql(expectedResult.uniqueDestinationIps); + expect(body.uniqueDestinationIpsHistogram!).to.eql( + expectedResult.uniqueDestinationIpsHistogram + ); + expect(body.uniqueSourceIps!).to.eql(expectedResult.uniqueSourceIps); + expect(body.uniqueSourceIpsHistogram!).to.eql(expectedResult.uniqueSourceIpsHistogram); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts index 14b061d67889..641e6658d28c 100644 --- a/x-pack/test/api_integration/apis/security_solution/kpi_network.ts +++ b/x-pack/test/api_integration/apis/security_solution/kpi_network.ts @@ -5,15 +5,13 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { kpiNetworkQuery } from '../../../../plugins/security_solution/public/network/containers/kpi_network/index.gql_query'; -// @ts-expect-error -import { GetKpiNetworkQuery } from '../../../../plugins/security_solution/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; +import { NetworkKpiQueries } from '../../../../plugins/security_solution/common/search_strategy'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Kpi Network', () => { describe('With filebeat', () => { before(() => esArchiver.load('filebeat/default')); @@ -22,51 +20,42 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; const expectedResult = { - __typename: 'KpiNetworkData', - networkEvents: 6158, + networkEvents: 6157, uniqueFlowId: 712, uniqueSourcePrivateIps: 8, uniqueSourcePrivateIpsHistogram: [ { x: new Date('2019-02-09T16:00:00.000Z').valueOf(), y: 8, - __typename: 'KpiNetworkHistogramData', }, { x: new Date('2019-02-09T19:00:00.000Z').valueOf(), y: 0, - __typename: 'KpiNetworkHistogramData', }, { x: new Date('2019-02-09T22:00:00.000Z').valueOf(), y: 8, - __typename: 'KpiNetworkHistogramData', }, { x: new Date('2019-02-10T01:00:00.000Z').valueOf(), y: 7, - __typename: 'KpiNetworkHistogramData', }, ], uniqueDestinationPrivateIps: 9, uniqueDestinationPrivateIpsHistogram: [ { - __typename: 'KpiNetworkHistogramData', x: new Date('2019-02-09T16:00:00.000Z').valueOf(), y: 8, }, { - __typename: 'KpiNetworkHistogramData', x: new Date('2019-02-09T19:00:00.000Z').valueOf(), y: 0, }, { - __typename: 'KpiNetworkHistogramData', x: new Date('2019-02-09T22:00:00.000Z').valueOf(), y: 8, }, { - __typename: 'KpiNetworkHistogramData', x: new Date('2019-02-10T01:00:00.000Z').valueOf(), y: 8, }, @@ -75,26 +64,133 @@ export default function ({ getService }: FtrProviderContext) { tlsHandshakes: 62, }; - it('Make sure that we get KpiNetwork data', () => { - return client - .query({ - query: kpiNetworkQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get KpiNetwork uniqueFlows data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiUniqueFlowsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.uniqueFlows, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.uniqueFlowId).to.eql(expectedResult.uniqueFlowId); + }); + + it('Make sure that we get KpiNetwork networkEvents data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiNetworkEventsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.networkEvents, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const kpiNetwork = resp.data.source.KpiNetwork; - expect(kpiNetwork).to.eql(expectedResult); - }); + .expect(200); + + expect(kpiNetwork.networkEvents).to.eql(expectedResult.networkEvents); + }); + + it('Make sure that we get KpiNetwork DNS data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiDnsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.dns, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.dnsQueries).to.eql(expectedResult.dnsQueries); + }); + + it('Make sure that we get KpiNetwork networkEvents data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiNetworkEventsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.networkEvents, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.networkEvents).to.eql(expectedResult.networkEvents); + }); + + it('Make sure that we get KpiNetwork tlsHandshakes data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiTlsHandshakesQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.tlsHandshakes, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.tlsHandshakes).to.eql(expectedResult.tlsHandshakes); + }); + + it('Make sure that we get KpiNetwork uniquePrivateIps data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiUniquePrivateIpsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.uniquePrivateIps, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.uniqueDestinationPrivateIps).to.eql( + expectedResult.uniqueDestinationPrivateIps + ); + expect(kpiNetwork.uniqueDestinationPrivateIpsHistogram).to.eql( + expectedResult.uniqueDestinationPrivateIpsHistogram + ); + expect(kpiNetwork.uniqueSourcePrivateIps).to.eql(expectedResult.uniqueSourcePrivateIps); + expect(kpiNetwork.uniqueSourcePrivateIpsHistogram).to.eql( + expectedResult.uniqueSourcePrivateIpsHistogram + ); }); }); @@ -105,78 +201,123 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; const expectedResult = { - __typename: 'KpiNetworkData', - networkEvents: 6158, - uniqueFlowId: 712, - uniqueSourcePrivateIps: 8, - uniqueSourcePrivateIpsHistogram: [ - { - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 8, - __typename: 'KpiNetworkHistogramData', - }, - { - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - __typename: 'KpiNetworkHistogramData', - }, - { - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 8, - __typename: 'KpiNetworkHistogramData', - }, - { - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 7, - __typename: 'KpiNetworkHistogramData', - }, - ], - uniqueDestinationPrivateIps: 9, - uniqueDestinationPrivateIpsHistogram: [ - { - __typename: 'KpiNetworkHistogramData', - x: new Date('2019-02-09T16:00:00.000Z').valueOf(), - y: 8, - }, - { - __typename: 'KpiNetworkHistogramData', - x: new Date('2019-02-09T19:00:00.000Z').valueOf(), - y: 0, - }, - { - __typename: 'KpiNetworkHistogramData', - x: new Date('2019-02-09T22:00:00.000Z').valueOf(), - y: 8, - }, - { - __typename: 'KpiNetworkHistogramData', - x: new Date('2019-02-10T01:00:00.000Z').valueOf(), - y: 8, - }, - ], - dnsQueries: 169, - tlsHandshakes: 62, + networkEvents: 665, + uniqueFlowId: 124, + uniqueSourcePrivateIps: null, + uniqueSourcePrivateIpsHistogram: null, + uniqueDestinationPrivateIps: null, + uniqueDestinationPrivateIpsHistogram: null, + dnsQueries: 0, + tlsHandshakes: 1, }; - it('Make sure that we get KpiNetwork data', () => { - return client - .query({ - query: kpiNetworkQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + + it('Make sure that we get KpiNetwork uniqueFlows data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiUniqueFlowsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.uniqueFlows, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['packetbeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.uniqueFlowId).to.eql(expectedResult.uniqueFlowId); + }); + + it('Make sure that we get KpiNetwork DNS data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiDnsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.dns, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['packetbeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.dnsQueries).to.eql(expectedResult.dnsQueries); + }); + + it('Make sure that we get KpiNetwork networkEvents data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiNetworkEventsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.networkEvents, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + defaultIndex: ['packetbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const kpiNetwork = resp.data.source.KpiNetwork; - expect(kpiNetwork).to.eql(expectedResult); - }); + .expect(200); + + expect(kpiNetwork.networkEvents).to.eql(expectedResult.networkEvents); + }); + + it('Make sure that we get KpiNetwork tlsHandshakes data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiTlsHandshakesQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.tlsHandshakes, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['packetbeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.tlsHandshakes).to.eql(expectedResult.tlsHandshakes); + }); + + it('Make sure that we get KpiNetwork uniquePrivateIps data', async () => { + const { body: kpiNetwork } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/networkKpiUniquePrivateIpsQuery') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkKpiQueries.uniquePrivateIps, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['filebeat-*'], + docValueFields: [], + inspect: false, + }) + .expect(200); + + expect(kpiNetwork.uniqueDestinationPrivateIps).to.eql( + expectedResult.uniqueDestinationPrivateIps + ); + expect(kpiNetwork.uniqueDestinationPrivateIpsHistogram).to.eql( + expectedResult.uniqueDestinationPrivateIpsHistogram + ); + expect(kpiNetwork.uniqueSourcePrivateIps).to.eql(expectedResult.uniqueSourcePrivateIps); + expect(kpiNetwork.uniqueSourcePrivateIpsHistogram).to.eql( + expectedResult.uniqueSourcePrivateIpsHistogram + ); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/network_details.ts b/x-pack/test/api_integration/apis/security_solution/network_details.ts index 7b851e875454..2b602760be34 100644 --- a/x-pack/test/api_integration/apis/security_solution/network_details.ts +++ b/x-pack/test/api_integration/apis/security_solution/network_details.ts @@ -5,41 +5,37 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { ipOverviewQuery } from '../../../../plugins/security_solution/public/network/containers/details/index.gql_query'; -// @ts-expect-error -import { GetIpOverviewQuery } from '../../../../plugins/security_solution/public/graphql/types'; +import { NetworkQueries } from '../../../../plugins/security_solution/common/search_strategy'; + import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); - describe('IP Overview', () => { + const supertest = getService('supertest'); + describe('Network details', () => { describe('With filebeat', () => { before(() => esArchiver.load('filebeat/default')); after(() => esArchiver.unload('filebeat/default')); - it('Make sure that we get KpiNetwork data', () => { - return client - .query({ - query: ipOverviewQuery, - variables: { - sourceId: 'default', - ip: '151.205.0.17', - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, - }, + it('Make sure that we get Network details data', async () => { + const { body } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + ip: '151.205.0.17', + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + factoryQueryType: NetworkQueries.details, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const ipOverview = resp.data.source.IpOverview; - expect(ipOverview!.source!.geo!.continent_name).to.be('North America'); - expect(ipOverview!.source!.geo!.location!.lat!).to.be(37.751); - expect(ipOverview!.host.os!.platform!).to.be('raspbian'); - expect(ipOverview!.destination!.geo!.continent_name).to.be('North America'); - expect(ipOverview!.destination!.geo!.location!.lat!).to.be(37.751); - expect(ipOverview!.host.os!.platform!).to.be('raspbian'); - }); + .expect(200); + + expect(body.networkDetails!.source!.geo!.continent_name).to.be('North America'); + expect(body.networkDetails!.source!.geo!.location!.lat!).to.be(37.751); + expect(body.networkDetails!.host.os!.platform!).to.be('raspbian'); + expect(body.networkDetails!.destination!.geo!.continent_name).to.be('North America'); + expect(body.networkDetails!.destination!.geo!.location!.lat!).to.be(37.751); + expect(body.networkDetails!.host.os!.platform!).to.be('raspbian'); }); }); @@ -47,24 +43,22 @@ export default function ({ getService }: FtrProviderContext) { before(() => esArchiver.load('packetbeat/default')); after(() => esArchiver.unload('packetbeat/default')); - it('Make sure that we get KpiNetwork data', () => { - return client - .query({ - query: ipOverviewQuery, - variables: { - sourceId: 'default', - ip: '185.53.91.88', - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, - }, + it('Make sure that we get Network details data', async () => { + const { body } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + ip: '185.53.91.88', + defaultIndex: ['packetbeat-*'], + factoryQueryType: NetworkQueries.details, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const ipOverview = resp.data.source.IpOverview; - expect(ipOverview!.host.id!).to.be('2ce8b1e7d69e4a1d9c6bcddc473da9d9'); - expect(ipOverview!.host.name!).to.be('zeek-sensor-amsterdam'); - expect(ipOverview!.host.os!.platform!).to.be('ubuntu'); - }); + .expect(200); + + expect(body.networkDetails!.host.id!).to.be('2ce8b1e7d69e4a1d9c6bcddc473da9d9'); + expect(body.networkDetails!.host.name!).to.be('zeek-sensor-amsterdam'); + expect(body.networkDetails!.host.os!.platform!).to.be('ubuntu'); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/network_dns.ts b/x-pack/test/api_integration/apis/security_solution/network_dns.ts index b53e2cc72853..806e0e60a69b 100644 --- a/x-pack/test/api_integration/apis/security_solution/network_dns.ts +++ b/x-pack/test/api_integration/apis/security_solution/network_dns.ts @@ -5,20 +5,19 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { networkDnsQuery } from '../../../../plugins/security_solution/public/network/containers/network_dns/index.gql_query'; import { + NetworkQueries, + NetworkDnsEdges, Direction, - // @ts-expect-error - GetNetworkDnsQuery, - // @ts-expect-error NetworkDnsFields, -} from '../../../../plugins/security_solution/public/graphql/types'; +} from '../../../../plugins/security_solution/common/search_strategy'; + import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Network DNS', () => { describe('With packetbeat', () => { before(() => esArchiver.load('packetbeat/dns')); @@ -27,79 +26,75 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; - it('Make sure that we get Dns data and sorting by uniqueDomains ascending', () => { - return client - .query({ - query: networkDnsQuery, - variables: { - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, - isPtrIncluded: false, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - sort: { field: NetworkDnsFields.uniqueDomains, direction: Direction.asc }, - sourceId: 'default', - stackByField: 'dns.question.registered_domain', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, + it('Make sure that we get Dns data and sorting by uniqueDomains ascending', async () => { + const { body: networkDns } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: [ + 'apm-*-transaction*', + 'auditbeat-*', + 'endgame-*', + 'filebeat-*', + 'logs-*', + 'packetbeat-*', + 'winlogbeat-*', + ], + docValueFields: [], + factoryQueryType: NetworkQueries.dns, + filterQuery: + '{"bool":{"must":[],"filter":[{"match_all":{}}],"should":[],"must_not":[]}}', + isPtrIncluded: false, + pagination: { activePage: 0, cursorStart: 0, fakePossibleCount: 30, querySize: 10 }, + sort: { field: NetworkDnsFields.uniqueDomains, direction: Direction.asc }, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, }) - .then((resp) => { - const networkDns = resp.data.source.NetworkDns; - expect(networkDns.edges.length).to.be(10); - expect(networkDns.totalCount).to.be(44); - // @ts-expect-error - expect(networkDns.edges.map((i) => i.node.dnsName).join(',')).to.be( - 'aaplimg.com,adgrx.com,akadns.net,akamaiedge.net,amazonaws.com,cbsistatic.com,cdn-apple.com,connman.net,crowbird.com,d1oxlq5h9kq8q5.cloudfront.net' - ); - expect(networkDns.pageInfo.fakeTotalCount).to.equal(30); - }); + .expect(200); + + expect(networkDns.edges.length).to.be(10); + expect(networkDns.totalCount).to.be(44); + expect(networkDns.edges.map((i: NetworkDnsEdges) => i.node.dnsName).join(',')).to.be( + 'aaplimg.com,adgrx.com,akadns.net,akamaiedge.net,amazonaws.com,cbsistatic.com,cdn-apple.com,connman.net,crowbird.com,d1oxlq5h9kq8q5.cloudfront.net' + ); + expect(networkDns.pageInfo.fakeTotalCount).to.equal(30); }); - it('Make sure that we get Dns data and sorting by uniqueDomains descending', () => { - return client - .query({ - query: networkDnsQuery, - variables: { - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - isDnsHistogram: false, - inspect: false, - isPtrIncluded: false, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - sourceId: 'default', - sort: { field: NetworkDnsFields.uniqueDomains, direction: Direction.desc }, - stackByField: 'dns.question.registered_domain', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, + it('Make sure that we get Dns data and sorting by uniqueDomains descending', async () => { + const { body: networkDns } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + ip: '151.205.0.17', + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + factoryQueryType: NetworkQueries.dns, + docValueFields: [], + inspect: false, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 30, + querySize: 10, + }, + sort: { field: NetworkDnsFields.uniqueDomains, direction: Direction.desc }, + stackByField: 'dns.question.registered_domain', + timerange: { + interval: '12h', + to: TO, + from: FROM, }, }) - .then((resp) => { - const networkDns = resp.data.source.NetworkDns; - expect(networkDns.edges.length).to.be(10); - expect(networkDns.totalCount).to.be(44); - // @ts-expect-error - expect(networkDns.edges.map((i) => i.node.dnsName).join(',')).to.be( - 'nflxvideo.net,apple.com,netflix.com,samsungcloudsolution.com,samsungqbe.com,samsungelectronics.com,internetat.tv,samsungcloudsolution.net,samsungosp.com,cbsnews.com' - ); - expect(networkDns.pageInfo.fakeTotalCount).to.equal(30); - }); + .expect(200); + + expect(networkDns.edges.length).to.be(10); + expect(networkDns.totalCount).to.be(44); + expect(networkDns.edges.map((i: NetworkDnsEdges) => i.node.dnsName).join(',')).to.be( + 'nflxvideo.net,apple.com,netflix.com,samsungcloudsolution.com,samsungqbe.com,samsungelectronics.com,internetat.tv,samsungcloudsolution.net,samsungosp.com,cbsnews.com' + ); + expect(networkDns.pageInfo.fakeTotalCount).to.equal(30); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts index 81a1924019a5..abca6e036109 100644 --- a/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts +++ b/x-pack/test/api_integration/apis/security_solution/network_top_n_flow.ts @@ -5,23 +5,22 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { networkTopNFlowQuery } from '../../../../plugins/security_solution/public/network/containers/network_top_n_flow/index.gql_query'; import { + NetworkQueries, + NetworkTopNFlowEdges, Direction, FlowTargetSourceDest, - // @ts-expect-error - GetNetworkTopNFlowQuery, - // @ts-expect-error NetworkTopTablesFields, -} from '../../../../plugins/security_solution/public/graphql/types'; +} from '../../../../plugins/security_solution/common/search_strategy'; + import { FtrProviderContext } from '../../ftr_provider_context'; const EDGE_LENGTH = 10; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Network Top N Flow', () => { describe('With filebeat', () => { before(() => esArchiver.load('filebeat/default')); @@ -30,150 +29,180 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2019-02-09T01:57:24.870Z'; const TO = '2019-02-12T01:57:24.870Z'; - it('Make sure that we get Source NetworkTopNFlow data with bytes_in descending sort', () => { - return client - .query({ - query: networkTopNFlowQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - flowTarget: FlowTargetSourceDest.source, - sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.desc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 50, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get Source NetworkTopNFlow data with bytes_in descending sort', async () => { + const { body: networkTopNFlow } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: [ + 'apm-*-transaction*', + 'auditbeat-*', + 'endgame-*', + 'filebeat-*', + 'logs-*', + 'packetbeat-*', + 'winlogbeat-*', + ], + factoryQueryType: NetworkQueries.topNFlow, + flowTarget: FlowTargetSourceDest.source, + sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.desc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 50, + querySize: 10, }, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const networkTopNFlow = resp.data.source.NetworkTopNFlow; - expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); - expect(networkTopNFlow.totalCount).to.be(121); - // @ts-expect-error - expect(networkTopNFlow.edges.map((i) => i.node.source!.ip).join(',')).to.be( - '10.100.7.196,10.100.7.199,10.100.7.197,10.100.7.198,3.82.33.170,17.249.172.100,10.100.4.1,8.248.209.244,8.248.211.247,8.248.213.244' - ); - expect(networkTopNFlow.edges[0].node.destination).to.be(null); - expect(networkTopNFlow.edges[0].node.source!.flows).to.be(498); - expect(networkTopNFlow.edges[0].node.source!.destination_ips).to.be(132); - expect(networkTopNFlow.pageInfo.fakeTotalCount).to.equal(50); - }); + .expect(200); + + expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); + expect(networkTopNFlow.totalCount).to.be(121); + expect( + networkTopNFlow.edges.map((i: NetworkTopNFlowEdges) => i.node.source!.ip).join(',') + ).to.be( + '10.100.7.196,10.100.7.199,10.100.7.197,10.100.7.198,3.82.33.170,17.249.172.100,10.100.4.1,8.248.209.244,8.248.211.247,8.248.213.244' + ); + expect(networkTopNFlow.edges[0].node.destination).to.be(undefined); + expect(networkTopNFlow.edges[0].node.source!.flows).to.be(498); + expect(networkTopNFlow.edges[0].node.source!.destination_ips).to.be(132); + expect(networkTopNFlow.pageInfo.fakeTotalCount).to.equal(50); }); - it('Make sure that we get Source NetworkTopNFlow data with bytes_in ascending sort ', () => { - return client - .query({ - query: networkTopNFlowQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - flowTarget: FlowTargetSourceDest.source, - sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.asc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 50, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get Source NetworkTopNFlow data with bytes_in ascending sort ', async () => { + const { body: networkTopNFlow } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: [ + 'apm-*-transaction*', + 'auditbeat-*', + 'endgame-*', + 'filebeat-*', + 'logs-*', + 'packetbeat-*', + 'winlogbeat-*', + ], + factoryQueryType: 'topNFlow', + filterQuery: + '{"bool":{"must":[],"filter":[{"match_all":{}}],"should":[],"must_not":[]}}', + flowTarget: FlowTargetSourceDest.source, + sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.asc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 50, + querySize: 10, }, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const networkTopNFlow = resp.data.source.NetworkTopNFlow; - expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); - expect(networkTopNFlow.totalCount).to.be(121); - // @ts-expect-error - expect(networkTopNFlow.edges.map((i) => i.node.source!.ip).join(',')).to.be( - '8.248.209.244,8.248.211.247,8.248.213.244,8.248.223.246,8.250.107.245,8.250.121.236,8.250.125.244,8.253.38.231,8.253.157.112,8.253.157.240' - ); - expect(networkTopNFlow.edges[0].node.destination).to.be(null); - expect(networkTopNFlow.edges[0].node.source!.flows).to.be(12); - expect(networkTopNFlow.edges[0].node.source!.destination_ips).to.be(1); - expect(networkTopNFlow.pageInfo.fakeTotalCount).to.equal(50); - }); + .expect(200); + + expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); + expect(networkTopNFlow.totalCount).to.be(121); + expect( + networkTopNFlow.edges.map((i: NetworkTopNFlowEdges) => i.node.source!.ip).join(',') + ).to.be( + '8.248.209.244,8.248.211.247,8.248.213.244,8.248.223.246,8.250.107.245,8.250.121.236,8.250.125.244,8.253.38.231,8.253.157.112,8.253.157.240' + ); + expect(networkTopNFlow.edges[0].node.destination).to.be(undefined); + expect(networkTopNFlow.edges[0].node.source!.flows).to.be(12); + expect(networkTopNFlow.edges[0].node.source!.destination_ips).to.be(1); + expect(networkTopNFlow.pageInfo.fakeTotalCount).to.equal(50); }); - it('Make sure that we get Destination NetworkTopNFlow data', () => { - return client - .query({ - query: networkTopNFlowQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.desc }, - flowTarget: FlowTargetSourceDest.destination, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 50, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get Destination NetworkTopNFlow data', async () => { + const { body: networkTopNFlow } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: [ + 'apm-*-transaction*', + 'auditbeat-*', + 'endgame-*', + 'filebeat-*', + 'logs-*', + 'packetbeat-*', + 'winlogbeat-*', + ], + factoryQueryType: 'topNFlow', + filterQuery: + '{"bool":{"must":[],"filter":[{"match_all":{}}],"should":[],"must_not":[]}}', + sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.desc }, + flowTarget: FlowTargetSourceDest.destination, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 50, + querySize: 10, }, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const networkTopNFlow = resp.data.source.NetworkTopNFlow; - expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); - expect(networkTopNFlow.totalCount).to.be(154); - expect(networkTopNFlow.edges[0].node.destination!.flows).to.be(19); - expect(networkTopNFlow.edges[0].node.destination!.source_ips).to.be(1); - expect(networkTopNFlow.edges[0].node.source).to.be(null); - expect(networkTopNFlow.pageInfo.fakeTotalCount).to.equal(50); - }); + .expect(200); + expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); + expect(networkTopNFlow.totalCount).to.be(154); + expect(networkTopNFlow.edges[0].node.destination!.flows).to.be(19); + expect(networkTopNFlow.edges[0].node.destination!.source_ips).to.be(1); + expect(networkTopNFlow.edges[0].node.source).to.be(undefined); + expect(networkTopNFlow.pageInfo.fakeTotalCount).to.equal(50); }); - it('Make sure that pagination is working in NetworkTopNFlow query', () => { - return client - .query({ - query: networkTopNFlowQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.desc }, - flowTarget: FlowTargetSourceDest.source, - pagination: { - activePage: 1, - cursorStart: 10, - fakePossibleCount: 50, - querySize: 20, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that pagination is working in NetworkTopNFlow query', async () => { + const { body: networkTopNFlow } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: [ + 'apm-*-transaction*', + 'auditbeat-*', + 'endgame-*', + 'filebeat-*', + 'logs-*', + 'packetbeat-*', + 'winlogbeat-*', + ], + factoryQueryType: 'topNFlow', + filterQuery: + '{"bool":{"must":[],"filter":[{"match_all":{}}],"should":[],"must_not":[]}}', + sort: { field: NetworkTopTablesFields.bytes_in, direction: Direction.desc }, + flowTarget: FlowTargetSourceDest.source, + pagination: { + activePage: 1, + cursorStart: 10, + fakePossibleCount: 50, + querySize: 20, + }, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const networkTopNFlow = resp.data.source.NetworkTopNFlow; + .expect(200); - expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); - expect(networkTopNFlow.totalCount).to.be(121); - expect(networkTopNFlow.edges[0].node.source!.ip).to.be('8.248.223.246'); - }); + expect(networkTopNFlow.edges.length).to.be(EDGE_LENGTH); + expect(networkTopNFlow.totalCount).to.be(121); + expect(networkTopNFlow.edges[0].node.source!.ip).to.be('8.248.223.246'); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/overview_host.ts b/x-pack/test/api_integration/apis/security_solution/overview_host.ts index 0d648e665a9a..f3de9a6481b8 100644 --- a/x-pack/test/api_integration/apis/security_solution/overview_host.ts +++ b/x-pack/test/api_integration/apis/security_solution/overview_host.ts @@ -6,16 +6,13 @@ import expect from '@kbn/expect'; -import { DEFAULT_INDEX_PATTERN } from '../../../../plugins/security_solution/common/constants'; -// @ts-expect-error -import { overviewHostQuery } from '../../../../plugins/security_solution/public/overview/containers//overview_host/index.gql_query'; -// @ts-expect-error -import { GetOverviewHostQuery } from '../../../../plugins/security_solution/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; +import { HostsQueries } from '../../../../plugins/security_solution/common/search_strategy'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Overview Host', () => { describe('With auditbeat', () => { before(() => esArchiver.load('auditbeat/overview')); @@ -39,30 +36,36 @@ export default function ({ getService }: FtrProviderContext) { endgameSecurity: 4, filebeatSystemModule: 0, winlogbeatSecurity: 0, - winlogbeatMWSysmonOperational: 0, - __typename: 'OverviewHostData', + winlogbeatMWSysmonOperational: null, }; - it('Make sure that we get OverviewHost data', () => { - return client - .query({ - query: overviewHostQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: DEFAULT_INDEX_PATTERN, - docValueFields: [], - inspect: false, + it('Make sure that we get OverviewHost data', async () => { + const { + body: { overviewHost }, + } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: [ + 'apm-*-transaction*', + 'auditbeat-*', + 'endgame-*', + 'filebeat-*', + 'logs-*', + 'packetbeat-*', + 'winlogbeat-*', + ], + factoryQueryType: HostsQueries.overview, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const overviewHost = resp.data.source.OverviewHost; - expect(overviewHost).to.eql(expectedResult); - }); + .expect(200); + expect(overviewHost).to.eql(expectedResult); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/overview_network.ts b/x-pack/test/api_integration/apis/security_solution/overview_network.ts index 60d300e168e4..f0b5c635c878 100644 --- a/x-pack/test/api_integration/apis/security_solution/overview_network.ts +++ b/x-pack/test/api_integration/apis/security_solution/overview_network.ts @@ -5,15 +5,13 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { overviewNetworkQuery } from '../../../../plugins/security_solution/public/overview/containers/overview_network/index.gql_query'; -// @ts-expect-error -import { GetOverviewNetworkQuery } from '../../../../plugins/security_solution/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; +import { NetworkQueries } from '../../../../plugins/security_solution/common/search_strategy'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Overview Network', () => { describe('With filebeat', () => { before(() => esArchiver.load('filebeat/default')); @@ -32,29 +30,27 @@ export default function ({ getService }: FtrProviderContext) { packetbeatDNS: 0, packetbeatFlow: 0, packetbeatTLS: 0, - __typename: 'OverviewNetworkData', }; - it('Make sure that we get OverviewNetwork data', () => { - return client - .query({ - query: overviewNetworkQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get OverviewNetwork data', async () => { + const { + body: { overviewNetwork }, + } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: ['filebeat-*'], + factoryQueryType: NetworkQueries.overview, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const overviewNetwork = resp.data.source.OverviewNetwork; - expect(overviewNetwork).to.eql(expectedResult); - }); + .expect(200); + expect(overviewNetwork).to.eql(expectedResult); }); }); @@ -67,36 +63,35 @@ export default function ({ getService }: FtrProviderContext) { const expectedResult = { auditbeatSocket: 0, filebeatCisco: 0, - filebeatNetflow: 1273, + filebeatNetflow: 0, filebeatPanw: 0, - filebeatSuricata: 4547, + filebeatSuricata: 0, filebeatZeek: 0, - packetbeatDNS: 0, - packetbeatFlow: 0, + packetbeatDNS: 44, + packetbeatFlow: 588, packetbeatTLS: 0, - __typename: 'OverviewNetworkData', }; - it('Make sure that we get OverviewNetwork data', () => { - return client - .query({ - query: overviewNetworkQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get OverviewNetwork data', async () => { + const { + body: { overviewNetwork }, + } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: ['packetbeat-*'], + factoryQueryType: NetworkQueries.overview, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const overviewNetwork = resp.data.source.OverviewNetwork; - expect(overviewNetwork).to.eql(expectedResult); - }); + .expect(200); + + expect(overviewNetwork).to.eql(expectedResult); }); }); @@ -107,38 +102,36 @@ export default function ({ getService }: FtrProviderContext) { const FROM = '2000-01-01T00:00:00.000Z'; const TO = '3000-01-01T00:00:00.000Z'; const expectedResult = { - auditbeatSocket: 0, + auditbeatSocket: 45, filebeatCisco: 0, - filebeatNetflow: 1273, + filebeatNetflow: 0, filebeatPanw: 0, - filebeatSuricata: 4547, + filebeatSuricata: 0, filebeatZeek: 0, packetbeatDNS: 0, packetbeatFlow: 0, packetbeatTLS: 0, - __typename: 'OverviewNetworkData', }; - it('Make sure that we get OverviewNetwork data', () => { - return client - .query({ - query: overviewNetworkQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Make sure that we get OverviewNetwork data', async () => { + const { + body: { overviewNetwork }, + } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + defaultIndex: ['auditbeat-*'], + factoryQueryType: NetworkQueries.overview, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + docValueFields: [], + inspect: false, }) - .then((resp) => { - const overviewNetwork = resp.data.source.OverviewNetwork; - expect(overviewNetwork).to.eql(expectedResult); - }); + .expect(200); + expect(overviewNetwork).to.eql(expectedResult); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/sources.ts b/x-pack/test/api_integration/apis/security_solution/sources.ts index 1ec4bfda8492..228d0736f26d 100644 --- a/x-pack/test/api_integration/apis/security_solution/sources.ts +++ b/x-pack/test/api_integration/apis/security_solution/sources.ts @@ -35,12 +35,12 @@ export default function ({ getService }: FtrProviderContext) { .post('/internal/search/securitySolutionIndexFields/') .set('kbn-xsrf', 'true') .send({ - indices: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + indices: ['auditbeat-*', 'filebeat-*'], onlyCheckIfIndicesExist: false, }) .expect(200); - expect(sourceStatus.indicesExist).to.eql(['auditbeat-*', 'winlogbeat-*']); + expect(sourceStatus.indicesExist).to.eql(['auditbeat-*']); }); it('should not find indexes as existing when there is an empty array of them', async () => { diff --git a/x-pack/test/api_integration/apis/security_solution/timeline.ts b/x-pack/test/api_integration/apis/security_solution/timeline.ts index 8ae562a96143..41b557ce3fd3 100644 --- a/x-pack/test/api_integration/apis/security_solution/timeline.ts +++ b/x-pack/test/api_integration/apis/security_solution/timeline.ts @@ -6,13 +6,11 @@ import expect from '@kbn/expect'; +import { Direction } from '../../../../plugins/security_solution/common/search_strategy'; // @ts-expect-error import { timelineQuery } from '../../../../plugins/security_solution/public/timelines/containers/index.gql_query'; -import { - Direction, - // @ts-expect-error - GetTimelineQuery, -} from '../../../../plugins/security_solution/public/graphql/types'; +// @ts-expect-error +import { GetTimelineQuery } from '../../../../plugins/security_solution/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; const TO = '3000-01-01T00:00:00.000Z'; diff --git a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts index 559cdc8c29c0..d3f40188aa6d 100644 --- a/x-pack/test/api_integration/apis/security_solution/timeline_details.ts +++ b/x-pack/test/api_integration/apis/security_solution/timeline_details.ts @@ -6,92 +6,72 @@ import expect from '@kbn/expect'; import { sortBy } from 'lodash'; +import { TimelineEventsQueries } from '../../../../plugins/security_solution/common/search_strategy'; -// @ts-expect-error -import { timelineDetailsQuery } from '../../../../plugins/security_solution/public/timelines/containers/details/index.gql_query'; -import { - // @ts-expect-error - DetailItem, - // @ts-expect-error - GetTimelineDetailsQuery, -} from '../../../../plugins/security_solution/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; -type DetailsData = Array< - Pick & { - __typename: string; - } ->; - // typical values that have to change after an update from "scripts/es_archiver" const INDEX_NAME = 'filebeat-7.0.0-iot-2019.06'; const ID = 'QRhG1WgBqd-n62SwZYDT'; -const EXPECTED_DATA: DetailItem[] = [ +const EXPECTED_DATA = [ { + category: 'base', field: '@timestamp', values: ['2019-02-10T02:39:44.107Z'], originalValue: '2019-02-10T02:39:44.107Z', }, - { field: '@version', values: ['1'], originalValue: '1' }, + { category: '@version', field: '@version', values: ['1'], originalValue: '1' }, { + category: 'agent', field: 'agent.ephemeral_id', values: ['909cd6a1-527d-41a5-9585-a7fb5386f851'], originalValue: '909cd6a1-527d-41a5-9585-a7fb5386f851', }, { + category: 'agent', field: 'agent.hostname', values: ['raspberrypi'], originalValue: 'raspberrypi', }, { + category: 'agent', field: 'agent.id', values: ['4d3ea604-27e5-4ec7-ab64-44f82285d776'], originalValue: '4d3ea604-27e5-4ec7-ab64-44f82285d776', }, + { category: 'agent', field: 'agent.type', values: ['filebeat'], originalValue: 'filebeat' }, + { category: 'agent', field: 'agent.version', values: ['7.0.0'], originalValue: '7.0.0' }, { - field: 'agent.type', - values: ['filebeat'], - originalValue: 'filebeat', - }, - { field: 'agent.version', values: ['7.0.0'], originalValue: '7.0.0' }, - { + category: 'destination', field: 'destination.domain', values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], originalValue: 's3-iad-2.cf.dash.row.aiv-cdn.net', }, { + category: 'destination', field: 'destination.ip', values: ['10.100.7.196'], originalValue: '10.100.7.196', }, - { field: 'destination.port', values: ['40684'], originalValue: 40684 }, - { - field: 'ecs.version', - values: ['1.0.0-beta2'], - originalValue: '1.0.0-beta2', - }, + { category: 'destination', field: 'destination.port', values: [40684], originalValue: 40684 }, + { category: 'ecs', field: 'ecs.version', values: ['1.0.0-beta2'], originalValue: '1.0.0-beta2' }, { + category: 'event', field: 'event.dataset', values: ['suricata.eve'], originalValue: 'suricata.eve', }, { + category: 'event', field: 'event.end', values: ['2019-02-10T02:39:44.107Z'], originalValue: '2019-02-10T02:39:44.107Z', }, - { field: 'event.kind', values: ['event'], originalValue: 'event' }, - { - field: 'event.module', - values: ['suricata'], - originalValue: 'suricata', - }, - { - field: 'event.type', - values: ['fileinfo'], - originalValue: 'fileinfo', - }, + { category: 'event', field: 'event.kind', values: ['event'], originalValue: 'event' }, + { category: 'event', field: 'event.module', values: ['suricata'], originalValue: 'suricata' }, + { category: 'event', field: 'event.type', values: ['fileinfo'], originalValue: 'fileinfo' }, { + category: 'file', field: 'file.path', values: [ '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', @@ -99,179 +79,157 @@ const EXPECTED_DATA: DetailItem[] = [ originalValue: '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', }, - { field: 'file.size', values: ['48277'], originalValue: 48277 }, - { field: 'fileset.name', values: ['eve'], originalValue: 'eve' }, - { field: 'flow.locality', values: ['public'], originalValue: 'public' }, - { - field: 'host.architecture', - values: ['armv7l'], - originalValue: 'armv7l', - }, + { category: 'file', field: 'file.size', values: [48277], originalValue: 48277 }, + { category: 'fileset', field: 'fileset.name', values: ['eve'], originalValue: 'eve' }, + { category: 'flow', field: 'flow.locality', values: ['public'], originalValue: 'public' }, + { category: 'host', field: 'host.architecture', values: ['armv7l'], originalValue: 'armv7l' }, { + category: 'host', field: 'host.hostname', values: ['raspberrypi'], originalValue: 'raspberrypi', }, { + category: 'host', field: 'host.id', values: ['b19a781f683541a7a25ee345133aa399'], originalValue: 'b19a781f683541a7a25ee345133aa399', }, + { category: 'host', field: 'host.name', values: ['raspberrypi'], originalValue: 'raspberrypi' }, + { category: 'host', field: 'host.os.codename', values: ['stretch'], originalValue: 'stretch' }, + { category: 'host', field: 'host.os.family', values: [''], originalValue: '' }, { - field: 'host.name', - values: ['raspberrypi'], - originalValue: 'raspberrypi', - }, - { - field: 'host.os.codename', - values: ['stretch'], - originalValue: 'stretch', - }, - { field: 'host.os.family', values: [''], originalValue: '' }, - { + category: 'host', field: 'host.os.kernel', values: ['4.14.50-v7+'], originalValue: '4.14.50-v7+', }, { + category: 'host', field: 'host.os.name', values: ['Raspbian GNU/Linux'], originalValue: 'Raspbian GNU/Linux', }, + { category: 'host', field: 'host.os.platform', values: ['raspbian'], originalValue: 'raspbian' }, { - field: 'host.os.platform', - values: ['raspbian'], - originalValue: 'raspbian', - }, - { + category: 'host', field: 'host.os.version', values: ['9 (stretch)'], originalValue: '9 (stretch)', }, - { field: 'http.request.method', values: ['get'], originalValue: 'get' }, - { - field: 'http.response.body.bytes', - values: ['48277'], - originalValue: 48277, - }, - { - field: 'http.response.status_code', - values: ['206'], - originalValue: 206, - }, - { field: 'input.type', values: ['log'], originalValue: 'log' }, + { category: 'http', field: 'http.request.method', values: ['get'], originalValue: 'get' }, + { category: 'http', field: 'http.response.body.bytes', values: [48277], originalValue: 48277 }, + { category: 'http', field: 'http.response.status_code', values: [206], originalValue: 206 }, + { category: 'input', field: 'input.type', values: ['log'], originalValue: 'log' }, { + category: 'base', field: 'labels.pipeline', values: ['filebeat-7.0.0-suricata-eve-pipeline'], originalValue: 'filebeat-7.0.0-suricata-eve-pipeline', }, { + category: 'log', field: 'log.file.path', values: ['/var/log/suricata/eve.json'], originalValue: '/var/log/suricata/eve.json', }, + { category: 'log', field: 'log.offset', values: [1856288115], originalValue: 1856288115 }, + { category: 'network', field: 'network.name', values: ['iot'], originalValue: 'iot' }, + { category: 'network', field: 'network.protocol', values: ['http'], originalValue: 'http' }, + { category: 'network', field: 'network.transport', values: ['tcp'], originalValue: 'tcp' }, + { category: 'service', field: 'service.type', values: ['suricata'], originalValue: 'suricata' }, + { category: 'source', field: 'source.as.num', values: [16509], originalValue: 16509 }, { - field: 'log.offset', - values: ['1856288115'], - originalValue: 1856288115, - }, - { field: 'network.name', values: ['iot'], originalValue: 'iot' }, - { field: 'network.protocol', values: ['http'], originalValue: 'http' }, - { field: 'network.transport', values: ['tcp'], originalValue: 'tcp' }, - { - field: 'service.type', - values: ['suricata'], - originalValue: 'suricata', - }, - { field: 'source.as.num', values: ['16509'], originalValue: 16509 }, - { + category: 'source', field: 'source.as.org', values: ['Amazon.com, Inc.'], originalValue: 'Amazon.com, Inc.', }, { + category: 'source', field: 'source.domain', values: ['server-54-239-219-210.jfk51.r.cloudfront.net'], originalValue: 'server-54-239-219-210.jfk51.r.cloudfront.net', }, { + category: 'source', field: 'source.geo.city_name', values: ['Seattle'], originalValue: 'Seattle', }, { + category: 'source', field: 'source.geo.continent_name', values: ['North America'], originalValue: 'North America', }, + { category: 'source', field: 'source.geo.country_iso_code', values: ['US'], originalValue: 'US' }, { - field: 'source.geo.country_iso_code', - values: ['US'], - originalValue: 'US', - }, - { + category: 'source', field: 'source.geo.location.lat', - values: ['47.6103'], + values: [47.6103], originalValue: 47.6103, }, { + category: 'source', field: 'source.geo.location.lon', - values: ['-122.3341'], + values: [-122.3341], originalValue: -122.3341, }, { + category: 'source', field: 'source.geo.region_iso_code', values: ['US-WA'], originalValue: 'US-WA', }, { + category: 'source', field: 'source.geo.region_name', values: ['Washington'], originalValue: 'Washington', }, { + category: 'source', field: 'source.ip', values: ['54.239.219.210'], originalValue: '54.239.219.210', }, - { field: 'source.port', values: ['80'], originalValue: 80 }, + { category: 'source', field: 'source.port', values: [80], originalValue: 80 }, { + category: 'suricata', field: 'suricata.eve.fileinfo.state', values: ['CLOSED'], originalValue: 'CLOSED', }, + { category: 'suricata', field: 'suricata.eve.fileinfo.tx_id', values: [301], originalValue: 301 }, { - field: 'suricata.eve.fileinfo.tx_id', - values: ['301'], - originalValue: 301, - }, - { + category: 'suricata', field: 'suricata.eve.flow_id', - values: ['196625917175466'], + values: [196625917175466], originalValue: 196625917175466, }, { + category: 'suricata', field: 'suricata.eve.http.http_content_type', values: ['video/mp4'], originalValue: 'video/mp4', }, { + category: 'suricata', field: 'suricata.eve.http.protocol', values: ['HTTP/1.1'], originalValue: 'HTTP/1.1', }, + { category: 'suricata', field: 'suricata.eve.in_iface', values: ['eth0'], originalValue: 'eth0' }, + { category: 'base', field: 'tags', values: ['suricata'], originalValue: ['suricata'] }, { - field: 'suricata.eve.in_iface', - values: ['eth0'], - originalValue: 'eth0', - }, - { field: 'tags', values: ['suricata'], originalValue: ['suricata'] }, - { + category: 'url', field: 'url.domain', values: ['s3-iad-2.cf.dash.row.aiv-cdn.net'], originalValue: 's3-iad-2.cf.dash.row.aiv-cdn.net', }, { + category: 'url', field: 'url.original', values: [ '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', @@ -280,6 +238,7 @@ const EXPECTED_DATA: DetailItem[] = [ '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', }, { + category: 'url', field: 'url.path', values: [ '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', @@ -288,48 +247,48 @@ const EXPECTED_DATA: DetailItem[] = [ '/dm/2$XTMWANo0Q2RZKlH-95UoAahZrOg~/0a9a/bf72/e1da/4c20-919e-0cbabcf7bfe8/75f50c57-d25f-4e97-9e37-01b9f5caa293_audio_13.mp4', }, { + category: '_index', field: '_index', values: ['filebeat-7.0.0-iot-2019.06'], originalValue: 'filebeat-7.0.0-iot-2019.06', }, { + category: '_id', field: '_id', values: ['QRhG1WgBqd-n62SwZYDT'], originalValue: 'QRhG1WgBqd-n62SwZYDT', }, - { field: '_score', values: ['1'], originalValue: 1 }, + { category: '_score', field: '_score', values: [1], originalValue: 1 }, ]; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); describe('Timeline Details', () => { before(() => esArchiver.load('filebeat/default')); after(() => esArchiver.unload('filebeat/default')); - it('Make sure that we get Event Details data', () => { - return client - .query({ - query: timelineDetailsQuery, - variables: { - sourceId: 'default', - indexName: INDEX_NAME, - eventId: ID, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - }, + it('Make sure that we get Event Details data', async () => { + const { + body: { data: detailsData }, + } = await supertest + .post('/internal/search/securitySolutionTimelineSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: TimelineEventsQueries.details, + docValueFields: [], + indexName: INDEX_NAME, + inspect: false, + eventId: ID, + }) + .expect(200); + expect( + sortBy(detailsData, 'name').map((item) => { + const { __typename, ...rest } = item; + return rest; }) - .then((resp) => { - const detailsData: DetailsData = (resp.data.source.TimelineDetails.data || - []) as DetailsData; - expect( - sortBy(detailsData, 'name').map((item) => { - const { __typename, ...rest } = item; - return rest; - }) - ).to.eql(sortBy(EXPECTED_DATA, 'name')); - }); + ).to.eql(sortBy(EXPECTED_DATA, 'name')); }); }); } diff --git a/x-pack/test/api_integration/apis/security_solution/tls.ts b/x-pack/test/api_integration/apis/security_solution/tls.ts index ebaec7783427..164de4d095b9 100644 --- a/x-pack/test/api_integration/apis/security_solution/tls.ts +++ b/x-pack/test/api_integration/apis/security_solution/tls.ts @@ -5,16 +5,13 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { tlsQuery } from '../../../../plugins/security_solution/public/network/containers/tls/index.gql_query'; import { + NetworkQueries, Direction, - // @ts-expect-error - TlsFields, + NetworkTlsFields, FlowTarget, - // @ts-expect-error - GetTlsQuery, -} from '../../../../plugins/security_solution/public/graphql/types'; +} from '../../../../plugins/security_solution/common/search_strategy'; + import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = '2000-01-01T00:00:00.000Z'; @@ -23,7 +20,6 @@ const SOURCE_IP = '10.128.0.35'; const DESTINATION_IP = '74.125.129.95'; const expectedResult = { - __typename: 'TlsNode', _id: '16989191B1A93ECECD5FE9E63EBD4B5C3B606D26', subjects: ['CN=edgecert.googleapis.com,O=Google LLC,L=Mountain View,ST=California,C=US'], issuers: ['CN=GTS CA 1O1,O=Google Trust Services,C=US'], @@ -32,16 +28,13 @@ const expectedResult = { }; const expectedOverviewDestinationResult = { - __typename: 'TlsData', edges: [ { - __typename: 'TlsEdges', cursor: { - __typename: 'CursorType', + tiebreaker: null, value: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F', }, node: { - __typename: 'TlsNode', _id: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F', subjects: [ 'CN=*.cdn.mozilla.net,OU=Cloud Services,O=Mozilla Corporation,L=Mountain View,ST=California,C=US', @@ -53,7 +46,6 @@ const expectedOverviewDestinationResult = { }, ], pageInfo: { - __typename: 'PageInfoPaginated', activePage: 0, fakeTotalCount: 3, showMorePagesIndicator: false, @@ -62,16 +54,13 @@ const expectedOverviewDestinationResult = { }; const expectedOverviewSourceResult = { - __typename: 'TlsData', edges: [ { - __typename: 'TlsEdges', cursor: { - __typename: 'CursorType', + tiebreaker: null, value: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F', }, node: { - __typename: 'TlsNode', _id: 'EB4E81DD7C55BA9715652ECF5647FB8877E55A8F', subjects: [ 'CN=*.cdn.mozilla.net,OU=Cloud Services,O=Mozilla Corporation,L=Mountain View,ST=California,C=US', @@ -83,7 +72,6 @@ const expectedOverviewSourceResult = { }, ], pageInfo: { - __typename: 'PageInfoPaginated', activePage: 0, fakeTotalCount: 3, showMorePagesIndicator: false, @@ -93,76 +81,71 @@ const expectedOverviewSourceResult = { export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); + describe('Tls Test with Packetbeat', () => { describe('Tls Test', () => { before(() => esArchiver.load('packetbeat/tls')); after(() => esArchiver.unload('packetbeat/tls')); - it('Ensure data is returned for FlowTarget.Source', () => { - return client - .query({ - query: tlsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - ip: SOURCE_IP, - flowTarget: FlowTarget.source, - sort: { field: TlsFields._id, direction: Direction.desc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Ensure data is returned for FlowTarget.Source', async () => { + const { body: tls } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkQueries.tls, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + ip: SOURCE_IP, + flowTarget: FlowTarget.source, + sort: { field: NetworkTlsFields._id, direction: Direction.desc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 30, + querySize: 10, }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const tls = resp.data.source.Tls; - expect(tls.edges.length).to.be(1); - expect(tls.totalCount).to.be(1); - expect(tls.edges[0].node).to.eql(expectedResult); - }); + .expect(200); + expect(tls.edges.length).to.be(1); + expect(tls.totalCount).to.be(1); + expect(tls.edges[0].node).to.eql(expectedResult); }); - it('Ensure data is returned for FlowTarget.Destination', () => { - return client - .query({ - query: tlsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - ip: DESTINATION_IP, - flowTarget: FlowTarget.destination, - sort: { field: TlsFields._id, direction: Direction.desc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Ensure data is returned for FlowTarget.Destination', async () => { + const { body: tls } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkQueries.tls, + timerange: { + interval: '12h', + to: TO, + from: FROM, }, + ip: DESTINATION_IP, + flowTarget: FlowTarget.destination, + sort: { field: NetworkTlsFields._id, direction: Direction.desc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 30, + querySize: 10, + }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const tls = resp.data.source.Tls; - expect(tls.edges.length).to.be(1); - expect(tls.totalCount).to.be(1); - expect(tls.edges[0].node).to.eql(expectedResult); - }); + .expect(200); + expect(tls.edges.length).to.be(1); + expect(tls.totalCount).to.be(1); + expect(tls.edges[0].node).to.eql(expectedResult); }); }); @@ -170,68 +153,62 @@ export default function ({ getService }: FtrProviderContext) { before(() => esArchiver.load('packetbeat/tls')); after(() => esArchiver.unload('packetbeat/tls')); - it('Ensure data is returned for FlowTarget.Source', () => { - return client - .query({ - query: tlsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - ip: '', - flowTarget: FlowTarget.source, - sort: { field: TlsFields._id, direction: Direction.desc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Ensure data is returned for FlowTarget.Source', async () => { + const { body: tls } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkQueries.tls, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + ip: '', + flowTarget: FlowTarget.source, + sort: { field: NetworkTlsFields._id, direction: Direction.desc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 30, + querySize: 10, }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const tls = resp.data.source.Tls; - expect(tls.pageInfo).to.eql(expectedOverviewSourceResult.pageInfo); - expect(tls.edges[0]).to.eql(expectedOverviewSourceResult.edges[0]); - }); + .expect(200); + expect(tls.pageInfo).to.eql(expectedOverviewSourceResult.pageInfo); + expect(tls.edges[0]).to.eql(expectedOverviewSourceResult.edges[0]); }); - it('Ensure data is returned for FlowTarget.Destination', () => { - return client - .query({ - query: tlsQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - ip: '', - flowTarget: FlowTarget.destination, - sort: { field: TlsFields._id, direction: Direction.desc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - inspect: false, + it('Ensure data is returned for FlowTarget.Destination', async () => { + const { body: tls } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkQueries.tls, + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + ip: '', + flowTarget: FlowTarget.destination, + sort: { field: NetworkTlsFields._id, direction: Direction.desc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 30, + querySize: 10, }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + inspect: false, }) - .then((resp) => { - const tls = resp.data.source.Tls; - expect(tls.pageInfo).to.eql(expectedOverviewDestinationResult.pageInfo); - expect(tls.edges[0]).to.eql(expectedOverviewDestinationResult.edges[0]); - }); + .expect(200); + expect(tls.pageInfo).to.eql(expectedOverviewDestinationResult.pageInfo); + expect(tls.edges[0]).to.eql(expectedOverviewDestinationResult.edges[0]); }); }); }); diff --git a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts index 1ed9a03ecf87..3eb1ada8da45 100644 --- a/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts +++ b/x-pack/test/api_integration/apis/security_solution/uncommon_processes.ts @@ -6,10 +6,7 @@ import expect from '@kbn/expect'; -// @ts-expect-error -import { uncommonProcessesQuery } from '../../../../plugins/security_solution/public/hosts/containers/uncommon_processes/index.gql_query'; -// @ts-expect-error -import { GetUncommonProcessesQuery } from '../../../../plugins/security_solution/public/graphql/types'; +import { HostsQueries } from '../../../../plugins/security_solution/common/search_strategy'; import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = '2000-01-01T00:00:00.000Z'; @@ -20,20 +17,18 @@ const TOTAL_COUNT = 3; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); describe('uncommon_processes', () => { before(() => esArchiver.load('auditbeat/hosts')); after(() => esArchiver.unload('auditbeat/hosts')); it('should return an edge of length 1 when given a pagination of length 1', async () => { - const { - data: { - source: { UncommonProcesses }, - }, - } = await client.query({ - query: uncommonProcessesQuery, - variables: { + const { body: UncommonProcesses } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.uncommonProcesses, sourceId: 'default', timerange: { interval: '12h', @@ -49,19 +44,17 @@ export default function ({ getService }: FtrProviderContext) { defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], docValueFields: [], inspect: false, - }, - }); + }) + .expect(200); expect(UncommonProcesses.edges.length).to.be(1); }); it('should return an edge of length 2 when given a pagination of length 2', async () => { - const { - data: { - source: { UncommonProcesses }, - }, - } = await client.query({ - query: uncommonProcessesQuery, - variables: { + const { body: UncommonProcesses } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.uncommonProcesses, sourceId: 'default', timerange: { interval: '12h', @@ -77,19 +70,18 @@ export default function ({ getService }: FtrProviderContext) { defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], docValueFields: [], inspect: false, - }, - }); + }) + .expect(200); + expect(UncommonProcesses.edges.length).to.be(2); }); it('should return a total count of elements', async () => { - const { - data: { - source: { UncommonProcesses }, - }, - } = await client.query({ - query: uncommonProcessesQuery, - variables: { + const { body: UncommonProcesses } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.uncommonProcesses, sourceId: 'default', timerange: { interval: '12h', @@ -105,19 +97,18 @@ export default function ({ getService }: FtrProviderContext) { defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], docValueFields: [], inspect: false, - }, - }); + }) + .expect(200); + expect(UncommonProcesses.totalCount).to.be(TOTAL_COUNT); }); it('should return a single data set with pagination of 1', async () => { - const { - data: { - source: { UncommonProcesses }, - }, - } = await client.query({ - query: uncommonProcessesQuery, - variables: { + const { body: UncommonProcesses } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: HostsQueries.uncommonProcesses, sourceId: 'default', timerange: { interval: '12h', @@ -133,28 +124,26 @@ export default function ({ getService }: FtrProviderContext) { defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], docValueFields: [], inspect: false, - }, - }); - const expected: GetUncommonProcessesQuery.Node = { + }) + .expect(200); + + const expected = { _id: 'HCFxB2kBR346wHgnL4ik', instances: 1, process: { args: [], name: ['kworker/u2:0'], - __typename: 'ProcessEcsFields', }, user: { id: ['0'], name: ['root'], - __typename: 'UserEcsFields', }, hosts: [ { + id: ['zeek-sensor-san-francisco'], name: ['zeek-sensor-san-francisco'], - __typename: 'HostEcsFields', }, ], - __typename: 'UncommonProcessItem', }; expect(UncommonProcesses.edges[0].node).to.eql(expected); }); diff --git a/x-pack/test/api_integration/apis/security_solution/users.ts b/x-pack/test/api_integration/apis/security_solution/users.ts index 9d42fc0b9788..1b5b3604cb34 100644 --- a/x-pack/test/api_integration/apis/security_solution/users.ts +++ b/x-pack/test/api_integration/apis/security_solution/users.ts @@ -5,16 +5,13 @@ */ import expect from '@kbn/expect'; -// @ts-expect-error -import { usersQuery } from '../../../../plugins/security_solution/public/network/containers/users/index.gql_query'; import { + NetworkQueries, Direction, - // @ts-expect-error - UsersFields, + NetworkUsersFields, FlowTarget, - // @ts-expect-error - GetUsersQuery, -} from '../../../../plugins/security_solution/public/graphql/types'; +} from '../../../../plugins/security_solution/common/search_strategy'; + import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = '2000-01-01T00:00:00.000Z'; @@ -23,47 +20,46 @@ const IP = '0.0.0.0'; export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); - const client = getService('securitySolutionGraphQLClient'); + const supertest = getService('supertest'); describe('Users', () => { describe('With auditbeat', () => { before(() => esArchiver.load('auditbeat/default')); after(() => esArchiver.unload('auditbeat/default')); - it('Ensure data is returned from auditbeat', () => { - return client - .query({ - query: usersQuery, - variables: { - sourceId: 'default', - timerange: { - interval: '12h', - to: TO, - from: FROM, - }, - defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], - docValueFields: [], - ip: IP, - flowTarget: FlowTarget.destination, - sort: { field: UsersFields.name, direction: Direction.asc }, - pagination: { - activePage: 0, - cursorStart: 0, - fakePossibleCount: 30, - querySize: 10, - }, - inspect: false, + it('Ensure data is returned from auditbeat', async () => { + const { body: users } = await supertest + .post('/internal/search/securitySolutionSearchStrategy/') + .set('kbn-xsrf', 'true') + .send({ + factoryQueryType: NetworkQueries.users, + sourceId: 'default', + timerange: { + interval: '12h', + to: TO, + from: FROM, + }, + defaultIndex: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'], + docValueFields: [], + ip: IP, + flowTarget: FlowTarget.destination, + sort: { field: NetworkUsersFields.name, direction: Direction.asc }, + pagination: { + activePage: 0, + cursorStart: 0, + fakePossibleCount: 30, + querySize: 10, }, + inspect: false, }) - .then((resp) => { - const users = resp.data.source.Users; - expect(users.edges.length).to.be(1); - expect(users.totalCount).to.be(1); - expect(users.edges[0].node.user!.id).to.eql(['0']); - expect(users.edges[0].node.user!.name).to.be('root'); - expect(users.edges[0].node.user!.groupId).to.eql(['0']); - expect(users.edges[0].node.user!.groupName).to.eql(['root']); - expect(users.edges[0].node.user!.count).to.be(1); - }); + .expect(200); + + expect(users.edges.length).to.be(1); + expect(users.totalCount).to.be(1); + expect(users.edges[0].node.user!.id).to.eql(['0']); + expect(users.edges[0].node.user!.name).to.be('root'); + expect(users.edges[0].node.user!.groupId).to.eql(['0']); + expect(users.edges[0].node.user!.groupName).to.eql(['root']); + expect(users.edges[0].node.user!.count).to.be(1); }); }); }); diff --git a/x-pack/test/functional/es_archives/filebeat/default/data.json.gz b/x-pack/test/functional/es_archives/filebeat/default/data.json.gz index bd73f4946575ba6170d1e890ebc3b22a49743a0d..1886818971deed4699a429d6496ff3e7dfa8bace 100644 GIT binary patch delta 142078 zcmZUa1yoz>^0z7O#hv2r?ozzCyGwA_VgZU2mtp~myB2pZP$am!yA*f$=sD-!|GoEH zzpSjiGI{q*R+2rlpP4teiJ`EGAt3l&Fk~=PFmy0XFl;bf9lVblP@r%$0cq(6-N$7{ zD#k4AcBHId?MOz(Aq_c5StH9Kv9#TD(;=}k$!~@(G29NMEY4~0uE)k!d>&kiBMq8i z36;$vR=9I>h>U2R@J zclC}x2^W+lC&PNkJXA;3`Wbz&zx)98o*~JgJr8A&*~A$Ifunfp%iU(f^g*8{Mo#wK&0KW+LtgR1Jl8m*6R9TXAwSj!f zbEM<_Foh=D7!Y!MB4(!N9-X@5M2w7&D^KjBb&WDz#^_?RW13<%b}6I8Pe}fa-!l`q z)2+a{XD>+pcWyl~*sU;t!ry%k)*j|*KeK~ms|!teWa&of*{}e}@wvFIDm^8cG;I5_ zvMYsq({tL#IQX5*5i6TYTqVff+e<=^zh5q%kX}NM7lE;Joo!n4kI&aDRjVyFD^};S zE5>?;H#PVpfFyAC2;8V}J!#>7k}JC=-)*=N=N$RuSLgllbU|~3L;I@LNZW*#GmL0~ z_sH*)tFMMM$iF$vEqz9O?8XXx=TC^JOqZ)*puEc!NFnx&-19y(oklwkcF^V`SoH(#dkE2i0#h%9I& z5mU^b-rHWqveDw@$sQD_F_@?mq>FFyCKjhC$HEf=wQ-)iv68mORPVD?z3gAm%YTYw zr8rp!a}7G$GS*o#+9_Aom%i7jr0Rk4R6rR>V^PmfD_VEn-b{FJW@+`-vV~Y(!USThAuf+f{V(W0J+k$`jMC5je*Bs}a!n9A6C$Qm zal|bq883O*(uvx7!cud-Gxyx7T=njnpjESKV+mwmJeLhR;__uQl4}o5jBrY8r_7kz za|)_#Tc#e1Fz3km)D;2 zzi(Y?zCM^6xD!_AtUM2)#ALgeaU~H>VC!EEMQ_daPfEzrjoYRRQBn%YXk@fWm`8Mx zkvYl0TQye*Q2uN(MF|ULOwnc=`_e;3Hq6R&(~P4dk~ZfgBQtUMA;MJ#9{lI<(h(SE zy)-7j^r^h-4C(d8gJ~%GW1)R5jDM_^g?|JkL7UD8ChI)sjFO!0p2XXb#sET3Nse8t zZ%E#szY7U$ea)4w6fAF^4#tqtjjPLsl%|iPE5TK$b)u)+i_8~fEtJ7h;TPs6>L*Vq z7;23>bH=Tj=C}PkB!=z(365`3T6`1OF>%U!YFwJ(OuR%`K}NFT-TP4$IeI5yqC4|* zI&zJ)oI<^GC^R}?+JIBRKnY!F*BaDG)YN;|c;r)Yg}dB!RoI61+H#(9)_QPzZw&@m zQhH~a>@C!#lzkyR2|B^ol3%50_t{}rwJo@MJQe z$eA<{MQ>x^UXupjxy>ub6rQ~XL;WPoKrgg)FDgmJ1$VL(2%KjIIgTXFVPmt~R=?)ZlEHqkRwgy8s&@9O& z?5S7RMFZJe?ATlhzU@SaEJ2M!w^I^*Y#EchxPtxX!*nK^jE?RGjJFtX(M}ewbj8Ke zD&19ZKqi{NJSHS=2aQA;8OU2cTUDl_hz5Eu@nA%V4E~!eZaYn|IU*9m=iOp1(d8qdMPZISX_+`wS}2{W5V0Y(W0do zp}GmRV~@fJbj-mY_py^{n1wkM&~CxB5}79s;zQA*nH6}%WR$=?cvpl`yYDDun`~>4 z+`;1#X?yAQgTB5(dlP7o*00@S;_%9K<7lSN=*6@Ktb^nTyAh1DkOB!L^!ftujBFIX zm?xw%`OPoKLy1XsU$U*XPDq28GiA_9>r@#t@Pqx)B=_OYpRHVvS*U)z?$&ab{?JLE z#|kWu&Z;-TtKkNAH7!jKq%*+kr0)a}b0GV*k=a7&q$>dIdAYfx(3qkxEo4P!VQaW0 ze=YKQ{t!TX5SKrDe?I=AuFMhocC8gd6D;^xVUA27#h7}JE`~T#Q{-<_ z0xNYVm|Z&`9Y<$#$iLP=hcUYnmOtw%u8B9PlZ1%sQ(1P?4~9pQ*?kf-WmeOqNx34;o?=e!u>LSPRl4W7^2Hk3 zFiVeu?W)%VohK>|8T%p?0`7+b){&=fc)-K|rZ=otdH*G42RjQONsYeyv{{T3fyG;D zqtr+KAkEB--xrfk`rIfoyPc4eL7GnCD`Vz#<11zPqZ!k8vN{dNs)+3RHY;M}9*}mc zDPBrHEvVST4RVB~3<$nVhV|jx(Pd6{!g0&-3pJN5Y@WEzWZDI5WmzTLVCw905>~N} zTDy|bOGV%_e4+$S$973{|HD=J&wIA->7RIe!zwRkT!r z0=u_4=>!|P1U_dskoISOvj4SVU|fV9YRT6CTI|HKkIjq8iDi9SjEQCMvQG_~3CvOj zIlTg1>ieAZ0H?_fMmsjP42hQ9Z!*z! zvr9k>Ygt%fET4XPwM@RNsH8r&&x@b(>w=2=p8cIcO61SZuNQt(0^Y8+9K7LfvAul) z-WVm0mJREallf#I4-7ihsP*d%iPGrj+_!fp>Dp>seUm9!#~2d`OT5s?5+gt%tT@L~ zjhJ&r1X@3pP>+#58v`GYw(vWe_vY@VcH}PZuWhdnCYw9&42o$3x9pMt^rK>=n&?9@kOLg=9|tq~Ypp+JB^&p?w9?Ar$oy!hEaGXruIXql77s$fuoFl& zMnVSTP|hbLo9hNelVfADex{lqkskb2om-1(hldavnQ1%~zdBiRz}22`Oi-Q5iU^~p z4%|!BGm9EktVC~!+19-Zr&hBaZH#%ozZ$+*a`(v|1N!m4e%>?a^xJ4}erc+lPFt-X zS!~1W$(bufSvd_ggO@6#C@jn%Aus5oRMD9-HCn8U|7`CAureM>)6Ok2}J1 zB6rFheT@!TagWSqN1Ul%i0OBnWDvcGS$t9f^uDPohcG__Mtb{(agq%OyU;8H50HoO zRVnhMN}c9=BX|C{;(~nG@6gdyH#O6ck2^S4Wdw3RwHP^*AwJfHMN{SH6Va2U@I@xk zCDq3+y>KS4i*ZyZxW>UJ1e@3^$GgzaYjP%wD&OJIaczar`)=K1cNo}}{s!}MD}3~@ z^B7ibnP5QN>wo)=*z0Wmut1RUlLpEVV}kJl9@w)-5lo317@2A<5FVG3KT+BoPwE%OptmC>Kvu#59iSvGW4L&En8|GsNPE zNd+1{d6eJG%lvgH=aC&1^o1NUh=P(AUh$LbmvtGsCA~s11^k_V@<)xg+4?dHs_vI` zMe26+)_!-X3Mm>uyNgo*-%Vq0D%~e1$(%18XFjNCj=!ma7HMQ*hp?t_m+NMi&My{R z*l-H9RZUNJ!)AN)zfB8=R8YFL!lrf`>hV7$4qle77Cj;(yX}q1wQC97HOG zwmTeH?c--1eZEZ8nwJ_?)3Fsn5!X#n;zJgf%Yz|bxWP}eT#OwNKW}ninKj|B6R5FH z|1?c|Px$c+AzGaQe_+=Ue466!4NnKGn;q5r(x=I5#X4^MSlA7Xqb|N_Nk=SIPoCYI z`x1tpGb4*3LO`fc6g;V}BG2aL^Bsi`{bP;aA*;eKyNZ5;YKWHkY=|J;hCUB61-(oq z)=bGk?XMbV9_HJF1gea(Jw+>@9oOfVXnCqT_bMBNJL<%Q^#d-T8y`%2tzg2kX| zy3otp#J-<)YeJ+WVy=X`1^+=BD9n7%e3+o|`n<%|$Hy1QyEl1F>vryq70AZygvP{9 z%xxH3!=%bs;mVAiD0+w1WZ|QWLk5O-W7K61wHo0Mi@++D0jb7|dDf7JSQk)E43Uy- zYM;4FB7&9UYeINy`;?O-RUe(|*b1nVpbHw3^okBRoSc8Sdw1N$lsgpzjo%@(IASCk zcNah)v}8cf#7@e2PB4I|+ldv6p#AC+A8_5}4*&Jh+ye_B0;> zBMB7&Yjcr9EfSd;pVk|HPRDicOJyo`ZxhNc*~FR98o+h0EoFOwZ_=XanN}KphdQ@S z@wRv@?J2KyHta|7g?|U|c$cNrJcJF2Z2y-YvPzPm3f|d#cuy)AL;LF(ruJ|ac9e=6 ziDb~t9CP{cLw?h8l;wIllm^Bu>P=VkVe{>lt?yL{LAf<|o>Ajz+B**d&}^f~M(C+| zHdb$H_WGDUpXF+#u5Ou~%cyn+`scn?N%aw9TB;7q3G=+2*DV;}>x;kB%?FYaK5_UU z`xH;dD6PR-PK~$>0hA(+A78LFP|8!@Yi&sWw%RE>d0{GBj1E1bxwcG;{%!F7A@{+U zxyN>Y2-s+|^t(o&Ul_yxezbGYd8?P;0mqEVSgM2^O_H&pn!)MHEG;&7TkOSOBGT`* zuoT4lz2S8s(Kv(`xD~93ukhW*?Ms-D>BEEt?@MkqqsG~48S10PD`qcAQWN(N(!sKV zGwLgd>K2 z>&T^f2s|KLsV=&N`D2XMubaQ9`hTeRavb+ph80nnVwcmS09CAWBYKi_?I<#vKMT@r z-u`z+S&CU9K8j5YQooE~J3Rpiq*jvKZ4Z27ZSXHFnLpnN57{C?#`HgwDut3x zg%b#d_Ys~URWH&FF)v@wndajbyjFRR4J?d5=}#Ia@pRbR-(T7}&++q9rGRV9tpF;G z0sWtxo;`n32Jg0ZB30ugMg-HOtkjoS2+pYf@=b^un}=XR zX2}fg()e?j{F33uU;aWN<|A*0->5y ztZI_xtOK#74G2WvqqO9{WiDjHn*wSp%;C|JMCXKTD^20imi4oeNV3}^TVTxzMt|h4 zU<>Z&%}rO8gjMsxRu(b9Dk_U9EafeqEZ3+rus%fG(n%DR5M!Z&>e)Xpw!y)K3*T!Y zcOO5kR3(xaaBts)5ZidfKqN8yJu;I4pHih>@?GCfz68DSW68%x`h86pasY6xMZ+26 zKogtRyJx&+r8IStXlJE@{wVDDQ)B60)JMszkN!&*%ek&TdwrehdIGL{@QADcTF8{? zY&6Zl{ek;dbY){`jkD9R&w8?F&8n_SIGvF}yL$`6a*MZZE|o#Y>LL$+IDA*r3qkdr zCdHhew#)*9+kmIyhs}*zp!JIHCQzhfV{hE~EX%_B`U_XTylEdVS;Dy>;aT}j{#+hP zHDYZXc^7?T#k7*P1m-LH5(pZ$T65u(FPN z;}yaD%NkXy7L~_3)5RMCAcBdi{m|bG)&K4vEim<)$iCacN_B>(>Eg9D$!JuL{pX}n zwPsOy#nAn9j9aN^6}*4W33uom@Q*wqojElj@rr&$QIKf?>#6$#y@`zfRtB*dQO9?} z?prG(Y}V1V|5_F0tS;N@Z=3?WEHj58*!eQcZt&GrVEN1 zczu$41u1fnFc+;O$NP+MDEmMO{;gUw!CshmnLs*%G0p%>mtFkg+IN|MYk@6Oh2Q}f zH^#Cu@Gncrzb#Ce-NB+&n?2|9#9q`!nV;WZb9DV9fqssRk4Aq?a9-4wnSl@Z>wgPG zyoFDd1LwTqRfr(?jblvo8Tt3$8gV%1M<#=RKzVcJ4>7j=7N5v}#z%LB!%Q@$|88u1 zn1dwSAJ*${0S3IJ5cVljNDbj}fa2AmncX2Mg<57gEBZI?ThBD=O=log}KX1Lh7DbZq$#MK7qO-I<3`deQ;h);hDO zNfyDjErUl53Y--Q{i8t$kUNcNZ#T){mCj(F9;L3iX;xAx$ps%wJVPisc4B)o>}_y`tOrAS;KOj)l= z%|4LIKqQ9dByJUPeLih%|5&w(L~X^2TlnrMJCo(dVmQ?t@dF1jQVjV(pvY0PR`RbU&BSC91&mS?=ti-S|0+q>tA-0Y(g)qf_yu0fDej*ie=DQz+%J0<<#B7n zYF`=yLE-yVP>Swr&iF;{X15VdW`rYmkmLQq=4IGcuM!Q*rrjBew?kSlK6s-QT_D%a zDweY-^bCD2O?pB&1=|E(7#&y5!QgSE=7z$Dp!L;X-^F(Pg5?%#YMzuD>xkQ-@NeP`Va)9%c5z_kaQr7eP zDLrH$kz&@US4&{YlM-DU_ba^SX4aTo({$s}Tx`(s`4R!r2|f~`RhEX|FBe3LCLU$) zNSIzrsd}NuenNt~HYTG+u)1?g^8Gx_mt{3I;LFypKB~NVz|WU4T$VWuc`nCbw5IL8 zppwt>)tru4sA`MX#+g45HIqV%IaMS#WTOj00M8VeF7Cj74?j~Ju=o2b#dU*T=5gQW zvP>V5j{ZgjjoO-Yu!oQf$hLpL+B_}o1r2#+uuG;gU!pq;`JG7~NBt-s8h50Hxv%LN zIsMN&f$~mElgNn?KOfKKR-255jt)K$|1=uwir*<-Rf47UyXNg>Yu@jH#O1{{Xb=~9 zD1YjoY+&g>1(2=p1LGD($AEUiZzc{V*}D$70ezGu(C^LGi?!OtQ&b{PBFpTJl(VNt zA|7Fq1fw-%#}Kw?4f$c{QF|i)@V1)NSV9=4hZhA6jwxhl7!4t9GG_QqwZcF}6bqQV zX{*-JpX9lBk^Ph!D4v>O&!w;78?im-wm_(l``Dfda^>*4BJ{54Tp2>@eeB$bnVckOg>=Ja=AGG1siG70hAJ${g( zJ(gz{y1jAi#E5ADJUo5+CriFgePE0Sm1Mv|Io7+)OI7G$nAdN^JTNf{c!I86G?Q=) z8aCVTiMriM1gT&A*x;r(LRx7&(U$_2XP~#4f34&WtsDT%3Z0^j+d1?;F%{~<d|d*tXOQf)ldw5njY&ousZZR6wbs-Cein z2xXY`VO#8lax`@lN@pV(@k%iXB_v#hsowLiW2y;WZ0Ce;T}A7)Ri_`a=Y-!$j<7q^ z!E*UKM4F|I5{w+X9YRmlIPD=!PzKqJI85k+Z6AwiePB$tkOim%^GycKEBg*4><$nb zSEI>R0!hYx4^^1hf4VK5dIA>pCvI1VC76!>nvRYI8||2^;VFe_=d9s8!c>Ff!o~`d zB$O7A?p^nrZgm>O=u5xe+)kM)(5mRwVyf10htfv$D*h_q7ce&p?%PQGWeimW@uuxz zIt)49W)FMyg!)>j>r0FtUrTF*D@Mx({Oix-N)DGl>g`#@t&}#Q%<~`d^(Mlm(Gh@` zA;8`vLLCQun_>Fr{^;s$_$5Cq~|9gY>Oo4*>!H$Ri4n8f@4Vk_Vz5m(S!> z3vI#A{#zj8Jp7UzAgzq} za(?@~f`edA8G!tzkwww|k+1g9pz)1~o!K7%kYhdRjQo^$hE;^?N5VczgOl$0T_s5M zQ>jW+h3>>G@qzX+F}gJPk9cP4cmfsMH_Ah>MsA+U1ZfLjH}?xG)OJn#{r-&LGpA_mQ`8U4kH*KMWo}lm zKSw6-`g%{h+N&Dc4c*CQg{AAo0${_l1aEL&n$$RkQ+uj+77!e0<*eC0O;7I}@N4Z> zm}LQtUNGt*-;%A!zT8r~jpvfbgBl^eq|Mvksh?F=F1rpMkAagr6nAy1+Id_DjvLkX zy9aSGda*N7iOK~wj_&(I0nzA0*=j*9VN={9NZX%yyO1hEaINH3sQh%>3!I%Z&e0Mm z$fq0!>IBm~X}?OG3?>v|xai$g<2@t~5iwJYG~wWY_pe$r47oZbJoJn6I_PlVhCTd5 zJLs|NyR)&BF}aki7yq?W58^7GA6Y4*FCAA|H%05#>94o0SFa*3zi)SnwxBya!0q6` ztr$k34GW3r>Q@P;kl%=AbSZO0wVB_mE%6M-iVV+CY(=8T{DwUJ@2@X5<(~Y+rM9M8 zhcOy}GSJmX!2^nnRG)wy{>`X@yFbO?-+i#`+FE?>I^TotrL>hrzYx>uIpd<6Ng!a0vwByWp-KBgJ;`XDL`ygPWz{g(rnXghW*Q_)#%_1Wz<0 zl`CfcvN_<+YNChx$Jq^RyLS~w_=zJuD&IXFkpF2%EY*6=tM_zfy}@^do1_1L86l0l zHCiiZuxP_FfjF8$5rJ}%cz`$`l#gF+h4u!a>9fYBF`KJs=&~X z%K~+JYb&*7ubu&R_9WA32}Hb2CL}-jKUzfBt4Up_8IMwK;emqN|k1K1xHjwP8D-aO8n~x0AtF;S+(!^XR2YVlw_iD5TYnh z^aDyuQuv{x#>{r~F??M1)V!0!MPRWGHrfn^l^_P#1};vi00Q|I4g^xH)1>lE+$cSNY`>` z>KbBVmlSQjA5thFx=#%cJa&z06&-jGTgI{uDVGWl9PC z=QT-X2XGz=9gm5o;ISk!Q?2(>*{$hmr6JH$uxim7F8>-?4&Q&6R}9)$$5H9`U3&H}dJfRcOVTY&$V1jA@vwO9C3rSNM%*n|^*)%6DyNGElQqJ>i%+T6fF}Zm znZFoI*j`xvcNNT8`uUT;o>@-2iu+J)(q9#DJuQtm)8sMxwfTd_#Kn z5p;6B=2upwA96r2fVmo~dY`Owzi>c;5fd`d2OGYPe=+Vb?njn$?TPRQtwJ>#i=m-@ z=Ct#8i@+znXeGCy`I;}cHNZZ-gJYG(xTLFhpElO7JrSypzG){{HwF$M1_(vX{2L^a z786*m*-3Reu5e8)S)1!FOrVq_TCBDW{h%rs0#dsc+AE=~N?KhqGo-DvNC( zZwsw_@+@mW5omsg_3xTl~lzw7I7S z{^(w+klJA;z|9Mr?+|K`l_V8Ps1q@GiVL~&tKu#NrA>)=UZR9fsD)W}v z++DV_rbP_Ubn-aSn5LdYm9~8!9BoNsnnKtTF7tCGY?bg4p$FAiXFKq*0=U|to4y(W zj*F(N6jUw6=SmUbahcHPENt%R1Wwpa=m!Vw>iQa8zyh+_@~i507|ozn2Y9k9)dP$efb}c+#I`10a1HaEY9nr;}d6moX1fP!ME@&Txz! zSZ_jYfiB#adM=iEPn0YkK?klGCd<4X3>@LLGZXHkRziigfPsT^uy_ww5>D>&k@=@~ zafocdtQ!r%v1z~l8s9^Z+Ue;%JJE=tbo7N`J=RP@}&s;_! zJFDAVTVcm?-?ZK?+ZZ5$sCvDcwGQnRxlrJ*Whn|*<=!{~oy*IeP@Hhd)YU0^Shk{w zK#CTbdBwpZtzFm1AxZknSof2gzTbPdtv6iiY@*n`1f_U|3(*F}W@w-zykNAWQZuxS z@MCx6{%Bl(8kYF9lFt^%8^4!6Xt6mlE_j#WZRUMrH1(R}+sSHWSzBJFzeR3;@$&<| zT<9H%Wx8D*EJomwPnnU};ys1O$Errmuul7b$O=#m5^9q>*+3baB-TWfFO^J$q_KgK z?cT>!M$E=Ce(#7#gYEI&5fI)DkK-leihT>e~ z7oJhI(=@5oFFyerG_#M*s!p@(s+K6^5}X-acvZM_58>CFTXp2zL_bUV@tiC8!fIhR z%DXo+x!!us;x*#pvX&c(igWs^sEP$vSKg-y{YpEDV=9naCu4g*_bfQGDB{FS7nbH& zEvzdty@S7e#%&u%N0sh8Y#|Hr^mss@{2uFBs-3Ql_r%*BYtyE{qGl240`{fWuB&cI`t>GxJOQdSc`=s z&4y6>zMlKODGkJG`~r97R6|6*h344ZmY2-G*5V<$Eg>3BVY7;sqKW4{Ns!hW5DYVV&-1HWF@D;5k*h&32THSg3_^uNPip-^$<^jgiZhrugHFSOlEZ?1 zLNmI)$+HOnxyz% zTxtO+JX1!TLs*NEyiE<_BzP<6_n*(L54;k62z1b^-1uabyz|&|RJXD{j8i)99CGKF zh*5;L*acbIS1l5jH{mH14>E?bQS9pCd}SA6lauiau3V$O9mSeOk~&C*uG1xjV@+i& z>Ay{$CR-zcMhfi#8hP73VUHfSrPH21!d1ZQW!2u3>oRb|l(iQyj5?l+U13aaqto^_ zD@Dq7=E=6e?PNKnrTt?GzB!)Ov=>L)o)~SAOoLc9R^AU^+fi!^vEra+DlE@o?UvV>LTADFTCHHj(%e?1XJ;k<*A@{nxKq{_;`DBrg0}Hn-2)auUu##} z>y(ubaX-gevMw_HXH;rAY#<(x=Q0(5KF$2aW9@HAD9oglxc1gH#xT*x9$kdwaCRrtGiK+k%KcEaEy}?m#95tM1HY!eH(U?o?1&N^ zGsk|4WVpTASr|;Iz5UXt#Zn(j9u|hG^6Ia0WaAy~dBRzXwg6*PKccfB-@vYB(NjSJ zwsmOMY@Z_J4pIQ?`Ql*!YEi|-K&^-7!n?HYV4RMv0$epS7T}A^Y;M1C>n(G!M@avf^F%zf_Obfd;J%f5ubwl8h6p$#5ElkDrE}1YPm4 z9Z1gEzbvZbp*wgDw4s_MmSK$3Cao4Vtxz&8QIKJ5j{Dite4=TjruF=IkNdar#=vxN zQ;xCcTrj*()HK>Stz64gGK`w88g+Ek(CGDLt}kp2?pJ#;rf;O9Vdty2_t#nKYCM^8 zUquq$c3VGWImVmIm~wGb6H^mZKWtp)z2AHGvdJ7qK-RJGW=neVf&S0;9fI#Kn~y4T zrckj`M9aQ2+1K|XmnPW3v-X_tk1Af8r*38~zb&TPLqfL01&1mS@@(Yp?tsoeVkQU}mR7SEnZ{7X?`&_I>9wOe; zAngR5h8;=DZ$vX;wcjEmYa^ipIi<4hN4T$cmQnhDCZIA5_khpCdT(hEy71kCK6JYw zuBWoS>@*1|@ZyT{{!6WryvS^%8Ngh0R2m#ioWf;QJN_l}jqHPu=>gU^saCq8oc~g* zBxiyPX<9BiILV!BpK~ZL4VOg|iFhjwM0&Zw{@wg*Lc$3Pc=;U|;vXGjfm!RmyR)|{ zaM)*q1g&?Orl+R(Jhbu?TvW)|02Ny!=w0FAxd+gj>}haLb?A#twlNBxHTmDJ|9qx zH|_r2|3KcD3FIBTKYUsZ>VNq38wZzx`NP4R-w^pXz^eFvlHn)`_`k@o?jJIY{9i#R zBen-1z4e6t_ftgy0nlN8L1@B1CV;CuN3csa2$|E2##hmEKi!*=cQQVF*0m}qPlF`J z$j^}fWVXWX$aCikqhqA${BV1M$h%^3Jo+AejfPNsg;-GkrdvBk^I#nLE2!W+GHfN# z$H?BN{m{G_7*p93@Bu^Q^Re=ia}gk!EyV1o7IPV>oIGioP+T%RTD^bxKl`39-M(_4W* zJ1I)eZVq>6GWBel+WqSnJor)0&c>H(q++%{(>-~fyj)INA*2H<5-Yzysy6b_a)BYZ zX9IvO=yJc^ritBV16z7^iwxiA7jY=(Fa{-|qPn4)QOUshZLuk?p*p9%I% zF|B$I`yHVwnMVjWJ&I<0sj96y@X$kYmcB^`oi?V^evFXcfx@e10Qgon8uC9rN1zV_M?g2$yRL3)77mOaLE=lz`Kv% zczb##SIZ4YJn-7=tcvJ=@uYSv&b|8vq4kK+;bDRvYqg6LB8^1mAa6&=RUwu|Vtm_A zW_;KfiyyN!PwJoyy+R9+J1v%pp-<~qGsg#Z2A!upy!xq|w{ZIy9aFfhWOct#zkkLPHpv69K zJ2cv#E{YzgOown^tNv1iWta|xW;h?)qtZWIy0(S#3#uZpOyH&l;pPNoh zMt2+k=6%7;^eS^1oXMM&oTuun2X^X($rbjaQb03*c0F$x03A((yJ*GRnxd%akxWtA zYs`EAiO)Q2nqd6iqUYhrv9-@8ty_kcUTTEi>9I@J-PYdAiYiFxLwkKE)JE6kGpFE) zeiI9jCD0o5)_=nYDVAuXJ~KAJusVMDS&x^F|LbRfau1$Kz;@~0YHZc{iOr1m0D$Ac z@2C>ArARS#akIBH{yhpUjWCo0a#CBoq$Xq|3WN_jDLG3B9FnqqIeIiZZohxN?saq= z{q?T;guOa?uD`bKhq}utXU1q3>Z}SEt7bLd2O#^&jK^!T#)(uf7boYGcCe$j@wdag zc=)OuhS!zSlhZEefeoU+2K|Qr4Env`yw{nJcpKkNO+{*Z{I#-a_0@`uhGd!j_>o5g z9L$EbuLlUiR!Kz{w%~LxEkXI&uNWc9Sz6=V)< zZdp+feyjPOZQ9M!k-Wi&W+Uj5RbEf_j2ZI#o>5OX*n$5vx1DPKYs^o(7<#pznG9We z>z+kKv5K(uLuSHPjUT0)5(VM(h*~ym8}@IQ?&}{+2i~cVu+#iX@+9{crpvR&@+bFe zcSJRT9WMd;NfQ=g{qkY~8K3JrPAmyYVe$ zD^{$B|8$`8XRgK63Rz$UxmEZ>bUAlrTc>4M?_(>A(BtFphuuACKdnydh)zXC7Nyr1 z?Jwii(&W^1f8jQ@P~9v;|Y-ZFXg`^ z^@$rdHzR_Y=#!fkkC8cHIl=2SpKIO5LITmuVR}ftaM55%krC;U3sVzex}q)SFxl8$ z0BWbE5kY_GmSo_C3Rcg^T@f8(qJ|25ZDtKa#QcnPM39}Xij|;}@_G`)6X$t4Gi%xq zkcHK1mVU94(>>%|etax5>d9o8duK8nL{_%l|ss#c#i-?N2Q*M{`0Bqm*kk)dz z_STA*MO2wIh)j5xwLr?vXLLYP!Hm$8#x; z8A&IeogR^3+8je`{kGwuHy_T@vZ@OBdbHVl2DNQCjnL7@Q?&*Z5|TJV{02-|LHQQb zVFRkI0XbL{4h8GI?V?=%*E|sijVTk$Zm9IY(h@fjvBf0&Lr8(NG#eRC0j;aomGkTB zh{C;^ru~LlzToW1^X=G2d*UGEPiW>yNHvPBd`;CtTiC-9#iQT^@2H);0b1FGg?4ur zMq#!*7kTpBiG8Ke8z6>^w)PMW0!JZ3hMw#oOfY_uXJeMt(Xm`sAS;wfgQiKp3of7o zv;b+4Tt_kG2FjL+yWVI22tT9ajz0_Fb)Rs@r?SdqRx2B~2-4Gr|Kj;`#O3=pb~Rb> zH-IVeB;$kfx5+5J@BL$u!`p&B^)e7!Xg}< zko%`sd$d9VMItgnX9~0P8!ZAWn5vnpJu9>TG?TwPfTXJSnCXhAH^B-)p!mpDv1+va z=dtee`e0F*{feSPreCtgJJ~?0>xh1)WAN>iaXse>)|mY z5r;;aj2`Om5=UVX6VxK2wdmay%}NR!9VOkF1QJ1#Sez(cHybQ@ zSM^@+_0m}~gr4I(COX;mlt3?BR^>xv(L(j^8`LD9Zv!*l^dm-29Wn zvVmU=^Wf9-Ac3N15-P3?d~!uBZc5tHQl_+AIzTYCFyuQ2Fp`>Rv~&`KrR)RN$49rm zX(F9Ek(Z|AL&KG|#j`j`ahwYC=Qc4GwL8Bp9S3u%3k4Uk+~_pTCP#f*J)1P1d+Njj zXqJZ#XE~Rb<7T+wPoCDT^idw%4Pr^{)!*LFPEIkLt51PAJXUWGqMuvw{Humn)4S(x zd#l`UhCd&T01cNG;LOcHwFY$MY4#T(j$hqBf1n}c)5ctoi32~GyP73un~Z1KJ2`Qc zvi#!mmV6Gcx39)!rdMt?45D(eOU7PCA+z+9RW_6R%?pzy*Im`fEA9o-b|dB3h!!>q6vh zRyRr_uooq{6)unC^6fY ziEwp9i|ymZw-VztY`udj{hTiQ%6PJkf6HE3|R;O_2Du;A|QVS-C=cXxLQ?(Xgcm*5Z_&LVHNeEVGWgT7Wx&+48T zYIWChcaH@U2DAmdA4|8fQJ0(e}fzMPQbdag8nLLf? zlPdIuV){yQbk@S@4#}Tx+Ed+tC45oxbsQJIv1NR1;NHW^RR#LTQipY1p-QP=#Zv!9 ziO(gvxq~+uY7!yP%k5EDYb;f0O0v?YO3LEQcBwbVAU zc;1iBUT?mB<1G=(NYdUq&_0FOsL|CB4N?2`WOg>$<5j;X{C0|QMs++JF(&kl*9g4q9wQPJ^ssx-oHW0Aaw}x$^lXvejNU&p0_QGwq;NeVE#K76u#c=23F`^xDFB_JA3xf{08J4{^V3_5Q#)*GYldlBLO#aJ*vy*dwP*$k|QGRB#-+PTCA6i+=9b z3$Q^Xo4>_ia!-J~;k1#{lUI@`q^wO?2)bLliAuoivt5I)aNokKUkj~y6BcxI^8=jz zZqB{JEyGy~kvu@rin7-@ekOUxmK|IA=_9c@1LVjmUeo%C2cAI$mc^~(CSD??!hom(#tq-gDqGS-h6M3I}$77*Mi;S4cH}fuwk}l7tBl&&u zzTQU?!8ahDT61~?tGG%^b>`XdeZ6-T$9HmeSK_UOw~^6x8Xu8Bxp~vw?7AFMs?O+0 z51#V!LgX5U+57VHb17;)iN){kTCUdYR_`+MXP_zpJut?CVX0iMgu0}>P3!yu{Fd8G5~hL?k<+4V^?S_rZ`J!7ZI zK(}*ng!1ECa;jYUR4SQ9BMAj*TQH&>B@%x{$r6FwW_Y4#Fd{3=DAg9ZoxGsjZ{mwV zhD^g?L~o<&p`rjH3|Qf0#Hd??Xy_maVX99=lyTruvGPkqil)mn_k!M${Nf^Hxkp>0 zX-YCImJKml?B1)r zEtS?a@`b7~hX)nks7iuUPr|$w2~6Ip4Z>4v*mXz(=^%<)*NB>tBB?Z+rt-a-Q5V%` z90PRgoP-WhsqtzyDvZ1<8a;w$6?fLfcyg22bcL>1w2AYHbIqJB$~-OIlqY?`wL-?Q#6enR7jWWA z=S!6!Z`(uYnp~uK&Ejhu@*;F=A51tk@zk}QFe_o|OW@I1Pr0_YT5$axa$sUOoFI~E)>Qmt z?oiC*Zpxv|<$P(t_QHC)D<^IGYd0`R>?=+*o11sfZhVjRGk4u0*PMGOVedDzZV1&A zRw!x=MYwP19g=Rky+okD@2N)LP{VcrA!Mw&q;hdr)^#6iI;nKy&Wl|gS{PInC<4Js zEHwi^R1R6HDnOKisV?fNMoF8QgR5frpwmJiI7z5J7_&lsA*rcGFKc5oduQ?^^X-D6 z`eV9ysoH78YF$Ujmz_{>)sN)bIXtFUC>Mpu6muE{cyx^(Ga;0R+ma|lp`sqeKo^~M zMvuu$M;7 z?N&hvqfLY|s)CWC$KjDBa3`cXz_I{kgAZnqjS^9KUhoqceLAsD9vkeDE}=)VJ$FoW#3?Imcl_a_le7FyE!_`-$>G;RdD2ZFIEY7FO4D5M|UH6|jiI1FCOJLO+Y#xEhq| z?~K&;gKd>xJoK>R< zlg6?9jgBen^5F3@FeXP1cGuA~Ja$Z#82~5E8eR5_W^E7(Tm*%fPy|NKyutk*GG<0j z0s-aUZy_#yGD)pMfKUYI{oKQS2;Fy-Y3J1o3o{6K%|li=l|D?zw)uEh7DoMJwOibF z`Dp??*3%;6wOc+DaT#U_H&V{q(#>aoCJ5nX1ue!JRd<1kFG0722xUSnLO!A`!r#s= zl;`Hr2$Yq5MOnXGepwMZLV@&2K2;lKLw#Q`Cs1S)rAV%&1e4VkDPJ&>U3e!tdZRky z8H3BRE~q3ElxHc~lxJ&;M^Q8pdqpcCas1=H9zil&)E0Hdb6iY8Jd%8C3xwf}6tWR29`%WNnZ<#41a2)s!_75n|`?kihfeWiLZOY%U5}t8py)i*Y?P zVt&LZxf3b$@t}i(5DW_caj?^UH_O6m&wz(Xy-$+#oRWyWM@}OE(}901muq*%SKjyAkPbCt5~+v!doC+3nF=PyZY&j87K2Q{H9KZwQebxJNmIcgMMg;4w;)yO zil;9|c>N+*EV%7dpm#poi;VM*&Ud`DF3jhGoH0;Lrww*(?@q!)e7y}zTMYB93Hjl8 zSFaV(+bzAlrn$x{<3lK$Vl1hnTHn*%k#9&<5PM7`{3gW*wz0`p>nZNS(Vmlyxl0>f z@;KLkMJJnRdk9$t{1>^tSwUMtb;o4q>2c2AKNPC*=Cvj)WFS5&C^{1saIJb)mPJa$b#Yb<@l-<+TBIza9imLdeeeyM#}mBSsw{Zd zetF|7$%wckZ~Gqova}haetZ_Nm=*`X zybf4bjVR)3$-dfK=WW6a_vUlyqE?!jEs(h0RRt#%@glNP)PDRd&wV~HX z*@BePNDSwxZjNAi*!pyFJZf~jJ)QQ3^=-;fpbSQ(8G|LtN<1SUtAZ5L7gtODdR<}e zahcRO$kZ8)4$5oY>21fg$MXY&qs{A`s_WspRn8x7H`h)tzn8DkkIEua^#O2LM=;JZ z@HEane)7!e=!sxP?R!BUsRf6~m~sujHuj%A#i2tS0|(DrE_V-c9yibZh>@rRMV8xW zjaZS>`r9OEJ49?8NwZ1|BIM+KBwL${f;?2g8e|-k#SGnwF-rHH`GW_mdwn*3UbvCV zI&G5;-7n8ifv$j^P(7E>*9S~Xh9oD)4gwX)aDWO<6P^n80;OT^|!c09hM zN81<8ImIDFmLWs|Uy-~{&~!_p^t+k%so7X!!~xn*;SpobAK3W@G#ZNy(9@GGB7VCi z3%Jr^`Vfh|j-Ff6VokN_#GGS>mXlZzAGQ(LNpiE@99TP$^+i{U<^jBtoll$4@$Nbh zmGN&AYkVkcbQ#pYHOmKYrWz(sB3z8zx`RVlJ@1WvFySO!R~p zfoFK*>nka`-cI`L7D52ZXtzufP{Rf1dQ4HONB#@$3z5NwYZ5Zy(YrMRXQPnpK9PMOm-{zk0^=JLo zNbo8E$YqP#I9uY_Mmrbz4$pp_*8P<0;&(;^uFTI&l$HZ9&!BF7Hyc=fB6{Q-HSvg@ z1aI~tB~fIsv|rKoG;&>2k!LaV}(Uj)ZfaW@XDQQ(vWG7JVtB?@@PI9n@!05 zFni$)Sx4!v$$j1dhUvV%FZNqwwDWw#snNP!oEgKvq-lh|T_ky=u}51h&!}x+zq$3I z{~0;*h>7`tAk)XfI$a7OwzQh!)S^F^8sJv9_c__CLWjvhwt&MGogwPb_3StGWJcY? zL)^JE^NS?OIrcG^`Snv~m16e`xsv*t*D*H3T4-n$tLu0|uT+9a8SDYdjN z2sfezjS${dDk7*!NSnS67WQ;|Hd=*zln{37e^dH(gD{Gs}wCmr<(p=)C-<}jM zvZ7{?<4tu8Z0H_TB^kXA32ef`BQ$7~A5*E;R3AmCc#8>zlon#UbS(TG?}jo>`X?^7 zh8>ZmpHMn+;egYa>6-8J?W7!rpMKq`r*lDK0E*+On-MFyep47xg3HE}AKvYdAt~|- zC{kqAVhb*5rm6bC z?skc|4nax{9*c3(0WR5F>ThwNdv~G+;8MNQeb?-ej?}IIF2D)Z?2x&YwdEq;zZ{wa zyq)4$uH+KacR@fZvJ9$iTIJ}1BqGf4^^`Tc;HZKL^F&}rGWz;wNC%@gu&3)HTOEL4 zviD6TzqA^3aC8nHi`u(VMQqhz8B@^I@*M|trKGiLl-4&Dd5`!ZBudaD02sBf8DmTGasL^mup(jU#c0*Qr8zf#v+y0VD;nnd;E>-BLNW% zjYx6F5!*r{tX{~wTy|K)A(yFbe7#t3IgT$I&P%KDEk5TNwD4192xG`N)+{!|Y8oad zJCiYL3Ju8(3+P}1Zw7Es;}u)s**l9ljeC51`xiRPDB7Lrg#A{CJMt`I%SLID$7 ziykZNARj%UjH*wWqG(OY{AHO;a`RnYuF7t7IjgWlizM`tqD}3Y6_qY#O`~q{uN|w} zAy-_C)xJ75IMP&-_f9r$ne`kO1v&Y(WRP9Hd~Sto3_m{J z8G#&F8w8aoYDuWnE)hM2*&O4HU)9*yQFqfG#+jCUb6BLp=!jZm08-+<*t+&Mu!cY= z19k44v#@0JBO`yCgITARZM9(k*<;sdTe3HI>0Fp{8T_-?qTS5AGH*&I58zvNwGrgA zg(b&m2(3tI$<$hYl>t$2B|*3|KEjj2#qWFHl3yPlCytF7N7?af>2w3Ow2 zsz8k)B|(StlX1mVPGzX~DCYJ8v_(XBMoVG32D%BOWY;JIB@>{}rA#HLnjDu@-Par; zMowNqPbWL>^@2G~pObYyZm@Op=D3THv4m-fcyriS`Gul{B#tn5Xqbk8cb6Cg0RGVSd?K5%iI7;AdKuGNuLQh<3 zm^pYMDg)JJsgj8=oco z4H@$fLL#;uaHdr{8=H|l1nrPj-iS(R{eFBHWbu|N#p<6k?>%kM+qVcc9v>fZ^$TYt zB1is_O30bkFg{jFfQ!g0qPDAKZ(4FbQug$e@si4Vt?6~s&*Tfes$#s#l0@dAE>Ku| z%-lLQ0bc+p(>i|Hoh=L#!*wiMZAWKmSiB0$cN?-2UcV&xWFB!s#OY7xi&#?EEHs{B zsH%Ro)4cH|Jp*@kKt@{F4~s+$SytF*po`QUg(6r?bXTLO-)zb2EI+yG1Mv8e$g0u?0!Y2!zR|lc^?}f)H5#b2dg6i)@KJzX!KT)D9>l{ zQS-fdShxk%B)3qz0VZeUb>}g2xdq<1X;(>)?r&@%8#SEe<(Zkp zGEAwWnQalG`a?LMd3@SmeOAI@(a?cQvPvAZn+r2V_R!vF3jqk4v(C1=6L$|> zbc_e4RRODfIai`jX_$D#<<_FB{PbZwY))g(ym#Z*e9tMs?Zfg7{@S%Q{Yh&lA;(?b z^_I#AsqhF-(8rl>EsdG_m2yocl!|nB&+&est5<9CM4PAb#7{05HQ1E~Y>@)ms8^a1 z0@H&gK$DIaY-4yRu!LmY5EIF14d z#0|?|)wr_buxr$B!4#;t)E?E=5*yM%2TfiILL<%MMF=zDW0IsFL^o!xej&r?>2qvV z`?lfq({~f9MymDx?fWtA1s-%82A_}oAQ$Y|fhv1Jb8b*=bHBt&h7Cd#=DXJ%D+E0w zkqA6Q5SmEtfOiK!2?0uYB^?uyonDR%6_Ob&lEjW#^bhpF0AJ8AHmcx~Rxg0_8#T^~ z4>?OQL62C8$cvlHC$$&2^x9p{bgD=ME4*MavGNaJ)As9@o z2L2&f`Q%AB6vjg4AsADI=EjR?bn}Z4Y*R+i^0^m;`a^JOo+UXWWVX5r1YAwkv9LYf zaxh8+b8FiEenLae_j`$#CwjnSE#r6KgJTw6GJHQ_(Gwe~BeCSi!dAA7mIzELuDF`chLwQ&Xtu@LWqb!({{4+^!bO<}j`n zix_7Zu9^#N?o2D9SoeoJ0m}LeS#vX=$FsTla+ffEw(NhsHXO+^W-Jy~YIU?VftR`7 z6sjSa`(iJ})3k+mo!#W0$A}^EX>J`ub6Ag{XF!vzLya8{BG8+k`?K@$C!~0GIKK(1 z0`s5U{Ivund~hUt3BQH_J%Y|HwZUi_6r%?nTIZ^GQjS6?p#@Z{#1OZ9`lU~!&7(vd zS(5=U_ZIWN$sk%Q>gubw^t@MLM(T^oCITp{YQh=I6D9+KHA0vqgUd(^QjY}DhI6K; zrt!jr1-NK~XVC}0myDhV8E+t;LA&NMbEBk9fQkcS=g>JT)#!k$A;ZTiXz++!H(@$| zu@NZs6~!e+1pkFnd2W4gu?}L?(XR~*9|iX2-@Sk5qnHBMpt5ixJZR_DByHskWg%Zg zp}F8)?H~P~YqYSHTQA`YRi#tc7|Q*-r)Thj7!=E&x!cj=>GDQxd|xY@j3&0fPK&wL zvgO#pNj!UAK!R%n&rjOvZ7DvIr0g(tMZKzvD@H|vA|GvJ3)L|EhUlQ<_SuCB`9W5y zRyYvIlt!TZ(Jw@1mdYY~x+*h%4MCW6IS}z7wN(nnUgrJdk*@sIcA-fq# z%gQX(OpvLTs#=oOE0o=~PEK6z#gaFjTd5GnnpF)20yXn{dnS97@1}5pJ*KX_rNVmm z)~s``qCPSy6n=92@U?c?;7q+wc4g|=1Bso8D3Bq4D&E@czK7rr_16lt+{LJ1-3x-;$&WV3_tRJo@BpV4fmQ>d zQyRHbL!*@Mxh|IbcpyuwJHQ*Y+)s0gTPGN-8;#?AAIA%QPp}V;41ugnhb+uNiX_kr zcfTNTi5ZqS4!J#suFo5EN3aXt1m2`X*OWsukk-}fDXBDFQ}+{Z=8B-j_YC0*;YzmY z3V}FP@Dz=j?+1!bMoFWGA!P;Dv2ei;d+yK#puSc_w+L z9Yv;8=&NZ;(<|c#sjvoCSKlcd2pgmp?-lPA%A^%!Q+&0S4Pcbihpj}JiB%Hh5jcZ1 zhcwSOH1FHQHP1KgOqp{oOtK0aU7#oxu!O9_D#R*GvM<6CK&$uuK*y>iW@(&f4(ZPl zG)lnwuZCLTuE;kojKJ$NQL8W&ru@5FbP?9~&0ptTy~gE8De8I2lYf1{-*ZYpV4tDW zu{wk;j7ZMH9U3FOR{f_j0o2SJ)LNGL{{O#A)C`72sdiz6t;hJa?`*ycaQdL0|LJ?k zC&*V{XyC#K)$GXI|9eVU+^?W!O5;=kNpZzkGoTKDs?Na8NDt10R!_h-+Eyiz{cjgQ zJ^zk$1xBZ3x%(@!cJ2Cy&RmmX%;mLHYTZF7NiY&fAuzEn< z^G^0orc6o(CRzXZF5&<8lua|Cqm+Mqe=qd^Jtg}emxJ%0-YFDYixR$e;h)}XmKoOy z(riFj-a)_?}$0sprE12m2$E)>EO$5-x`;RHnvE;lW+OngK z^8Y*-uibw&0CWu|;XvP4V9Y7c1bPtL3l5D-*(?;9mN4X*IA%t+qzmjjO463cDwiCg zI^P=e6&Jb=k`<*I31Grlg*!zIIRjcc2BYFLuWID=Gq2GMKSNE5l zeW8fQ&aw9AhRZp%`MtF$kLy{!=EwE!wsnh-^{d7}7#{192EO}B4I(A+Nmgap!2(7d zqQ;U+7-WH8bD2<|20UfmR{}~>C_&8=Z)2IS9oRnNo0IW{%XQ1n(?_!uC2LnAS1wqX zv}iPHewv{b+GAmdY0lv0)(^8Qv$hKn5s9Z?@!f*;;PRu@Gu?kWv@r+7Ql@y02c@16 zkiIztT6e!{yq!4>)ILirIv0o@(~=mKWWa?tM^)(v@?riOn;#2(WJJ2!Ck5{jrfr&; zMLQB**4<}rRFaZxzp9{nkSc}F6qJt7z1FI9naYW-eYbz#cX0YyR!*)uV<%MmV(w zI0u)*G@h2_GI&2K3h^+VS`RWly-N9RO_@h`$5J^6Tq0 z8%e=Qt&*d~^(ZOz2r_dqNg1+e?3(%0V^cm;C~#xKg)12B?G8KV+c!z^qt zx!;a457wd4%0{-WUvAm3OdIHqaMfbYCra0#us?y;l2z-sNOZR>T~f=m&sWqfX}@N` zsv-{;rcXX+^I6>7P;UjBJ|8HTw?0TVu$9)1=rSkt){aK;;ju`W>tS-=#sE<6sHk3c z`z*3XH2Wy)op@QHQX#(A-KlV$M?{4u5mr(<3q3emcp9y7j?P2dkKy-dHY5Y7@zdd0ENn%s66$Hr!3ZSX zON#Q}x5<;tsWxogbtge@djKc8+`eFX^EmL+Z&(CMLBqSVb_c`0E*HE7q>2I^PMqLTrnn6-=^WrJfjf#a+Uu3OVYpXi_d_dUQ`xVU^oj}3Z#n&HQuqQ-tfDI;DDxl`DKlOepiJb zyy>hen&lhTH#j51kfJ-NtoS$!iWJCBljAksqv}o%jQ|KgUccwL*mwrQJO#c&T1^N|OU)`$))P$@lTvK*kJLFj;_wD> zB+RpZYD4+4nv&?*6J{C(y$Tz#>f$8tH8x08KX1&mEF*>QQ;}n{S08*Ks4i^gkA|#{ zY39HE^@Tw3b?1u1X~iGigz?_3bx(PIA!1B0dO@lmD>E|uYo zri_oO(^E#WGV4pSBd*Wv-Hsl~MR;4LJAd!`MV(I?#6i#ZQ9ujN~-ik1DXI#ieIC@VWohcU9p zy|EkPG3)=YJmvelR4am9b)Q^$K{FOV$2tzdsr{omGeO1T0l!=hXv&mG<|uYTNWWSU zKeQ?}q$y9oo+J?gae~}URFr8q$+f~rLAzq+pFljR9WNYG(L~V9Ixf*7SP+OUq1F5@ zf5D1l_6IQ800AZ)-goTsNTPoHoto)X5%1ow)f3sosGsJefwFsy+UV^z;VQLAy6B)3 zUmi^7lF>h|8Ld?9=o`8-T2hW=#Vz>4rPeFq{)X8$iGJ$}Drjcz5*gPu?}+a4zr2CvRo|9{@afZv?M8!* z?=_fX<+bCPU*<;;abR&cppW|zbbn^RttFy`xWy7003{hO76gC0<)W7J!vH)gR2T7* zREvTOdL|3R8G)JVG|5jd)W#Q|K|3F|8Usc%zdmOpM`oZYOx^!4a*(l^(6%hDYGey9;N zQP4XG2pmNHM;w0DhObLe%moT(sKao7gqgwhvqw#!2TC#*e;7U1`IC|Al>E$8qE<3% z-9vXddh0r>m5&A2Igo(>H>iX!Q@m?(=hvJ>w6){3Td*y^Zr~ADd!50yXHre4Gmfh( zet7`|ijq4R&`aItSrr^O1z593nCp=c>TMx6C|lgvh>TjXhQ;D@?IXn;dk(@-!~9nu+C$;^w};_;SWOF1I9f|9kX|6O{cRpQ8O4&3b^1pP=AS zW@(T&gSe*56hCJMwLY4purHcs!PyPxnBN8kZB@%m0h_y{?a9lzncs^Q|OBnRKIS>!JbT7Uzt1W2=g zYs5f_pr})`i%g;rHhC8s@h73lA9VbA%?W3AFS~b3lP7Ys19REC5;3vV%i_y$v5u9a zdyeri8%7klEiT;Rm4G&87$^}jXnLM3G~888B`M-;nZ&5NlR9#ecI1)JY5u8oo*t4c zj17D2{kPCSm$}qYP}s_Q*hT}qQmd%5st|*-ZNTD7YG={#hlGaCu+LhaV z`)Dt=oWRA&wT4+HKg3VX{!zdF9+XN74=mhpg@$&kU0M{ts^AC@>^MgPmTkEqI?s{z z^_8pXL_e4b7ni|AVb1cCkT_1**U`YFfiMn1C|qa+2&mm{ekm${N7-`BUF$k6qXk$9 zwWO}0yIo!X9J|i^OAait9W?R`R3@ZthwQu5fh_e`N{)TEY=l#r!6%?(V9!#3SF9NK zF13tZ4bcxmFd1oT77~DgSyfdy|4l+jiG)J6#xFkL_=}a$%;+^ir73?ds&M`X*LjLF z)jR8_JSc~Wq6rDGFLV{^)ik48)BgwAd5zE<922{JGYaRg44`+&Uj|SD76fi#RfGT_ zbx0)}J=t&aQ9KrubPqM^W#J!>ypPyiORq_5ogJ3JcKxknslqwDAGmzBNF+^0Et=;$z zCeI{~hUX7k22-+P6{=DwT2VI|pRN#(JVFK9?nfOYua;a{&gp5#Ofg9&62WnPcEU6eSGbz7NIy8k1*1$jr?%N4P;m2+6{-*bMe%emv7oG`)HmzF< zTQF+F!mUUerUQKU_&~}~_Q(o4$zx35m7$6S7ydy~65||Yu-wmG-(rp63O6JZ%ldvk z>>p-Dor}$U#t1C81tgD`5RB5sgWBFXqn^N$k5OA=ZZp`y&Mj-wg#R537%HD*;Z|ecD%2_Galhj>?{%^ z8T=3?RSbUuRj1I7;c0MHVtTPOac%fzG69(9Wz(Vh}S z$NV&w31Dnm+H!>*Y4jgy2P{$FziaKAz?tid=VVcoM4u$eU&Nj-DoMPH5ePF@3&Xc= z00~Qlg?#C79$hnT@+4NzLmR-I_B}idm(5~0d8+E_Wcl<|cqEpML{cM?0xatW_LR4c zb;H_6Nc`cR=aGYS4Kz?3bQDB9Jps5di1ve*&h`ep6ti*pNi3Ua8M%!ssV*z7FM?C@DDvBM3jnzUqVskp!= zKx5kEmNyY@cZ(XRZ^a)Z=)5O>AK;+uEbh&yN*YgU0#ZMvSp|LQtjY*eGeD}!h@B@3RJ@0M3X>O%sqpJd4CNm;sLg`|qa2k{C#Lr}j5Kw(J$Anq6ftJF7pE#^R!P+aN1E0Ivlg9O_jP%fgG0>YY`>+C+iCOGS@ zw&;ed>^_?o!&Jq}P&S~2&v&=23Z5?K?Y&NpS7D$?33F<`d`D*FtSJOo8M2}#-@=^W z!Yp-7fpMhu%70oQ4M~;djFd=-n*JFrpJ$n6DVnrae9!b>!PLWub@@9>4O#;QWtyM& zFI7ns)o{1ysbGv9ArSOnfFn_)(xQ)n!r43@>=a(SZ$$RbG+}gio19a8 zD|`+Rp%kyNhKc)pz>Y#gqQr?J(tP_(oS(!}o05r0U5lCk1*zyZDEC6S#R~Lh7bFyD zGaB}V^FC+^ad<(&UL1GK*t|_z)-2HP5S(y69A@GNaI0eZ)A*7hgMRGtMG#0l1fj~> zz#~S1^H2PTRE_-?Vy^y1HC7aG+1I+pXr8qV^Hu4f+ER%kmmGI*yM9Pk6QLwgWnHrk z!)UysF(xo=R2ArE*}pwrHI}O_Lw}9@+D!Qho&f(93F(h!Vc1*!A+{H z?)wg>1AI+nwhk;?r5a_o$E=l49_ z@UVy25}|~m)BV^|iR@FFaVTruI+NscRT^FRj%)&W-x$r5rYM_Q^ywZ-N8s=t886@D zTZfV9Fo)+EU)fsCRJ>bfzbhtq!H3rktANK7-<|Ej;O1QXabSYy(W+zNsO2C~q2dA8 z9sL@%HLpai@9~6sz2y*y` zGY9ZrZ44_^LHVy41q5men_MW-9q*>RgWGDA1_E)oZqd!E^UBFWthi{$a*MvFNAoPg zsEWwf#~x_ZX_NR&kP@5BE`Y*v-`m~CE`5-4THYX3H8%Jx4alb)piL=%lF1_p?1#Qg zQD8&jk8x%U_i!m&*S_-5SqGeO@SnG|FCs3gZxVQ4_G(5W&E%D~lP-wXEmM zux3@|c-l;mNv-k6$+6t8JK9jSNoBD%89bX68V5ss4GZQ6B^UMx6m(DKXP=V0qBMwc zgTWk9U*yBVF1P(ey*Yx+_TDS`DQv$d-Gx=jrzj>FyBb6ClA>f-4*?7gY@fl+$QX_BB2pN!2WCy?rvrhM9QBn4izrBtRZ3WZAP%plT8wurJh7qEWixXvS!qciq zDW1nCP87O=LlG%K0th3+-ae9H?hV{3ADd?tRlb4#4N+B_z)D^Ve_8*Qp|dR!l4LeqBF#ahxTwUTRHS z1K2jB9}O-`KcT~`2{m#|2oIC~(NKHFIeNPHp}RYV?`40s{lKNcm#_4m&(M)mP1DA# z`Au3L*YVt0A6_DdlP*)ULyc~<;>fxhXJzng<`}xXiAA&kP9@(KcTH-UYoF-w2$Urq zZ=@lXr|$9w_?dvhoo>8Ml2B{#igHw>7_c@i>B3u#B&g)UsuDRX?~mrw8cHRuT^y-Z zv!dMTw>z%zZkbypvZ+vC0i7?!yM`ghh%4Pz!%3`JR*Fk-H|iNiUt9cMOr)Q9U<4Mz z@Q#1tB;FSa$z5A#-;IbbBUKvf=RqEk;)5q@5L!AHv~cmp!lct2{sh&QIe7%03@}#D zeq*Oek(}}XS7k@3)AzND@Q1kt1Jn(C_`27_l*d=W1=2>um4+C#Cxmgre^vR*lFyVe~0exet|d_27<@V#E&Y9fXSBN=|3K zTpx~)>D1m0^Kd;q9t`iTADZBMO#}GrAH9Hv`YU-5xOw(#a)MPAjQ>gIEz-L;qiMuT ze(%PjNTQdjg<(v+c|~Ajk2s14z={a3zSjsBOIq?m(WZKSy%DNucw%c1%X~M{rBNen zzN4N!F^ zj2I%jB||J|D2g0Fr9k>kpZ1^J9Xzf2Kki-Bd;)tJm9H&dZ{dhfIFkH83R#bdMeJ9g z^Ml9QZIQSd#gS9?7YX)^#p&FPg@De*~We% zoy0@{&3GKSNtfo3F22LKkxpV+&vSMMgR=c|_gvjyIbR-sZtqX~jQ(^DU$gx;=RbjC zO-*4IPeB>0rU65mM$X7dtm9#kMWQgf0`{K)2vGR10SGn>W0tQo6@RCQ{KReu^|s@b zxAc$DRD=XSDkE4UrXfd$v3m&vbX&uDyKPS)cA^q3a52{OT4aBjB@#G8@)%Z2KiXW5}NvtAk7ejL42cv5LCPL3w`dXsu7Kxz-JPAjSgQMF6+wAt|EqTm_)FGS->xHZfOf-V}|Bn@; zHjZ4p|sEga(&R2M|(q^6>%`5=F=UZ+D<|pcvP%VrWWl$yxa%cY>KM7yh0GB zl3o^@Cg6T-j#Y7Tx7GL3*=$)*j;qI2ZmZU9#!#?kZ#ZlQBi4YsZ0`r`eLAk??ziGp z=JMfyKV0ZBn~Nc=`mOuv;?ellP)_^Ft3{{j_UiDaQYB5t?bLY`904I{sUo%Qhb@=! z9Lo*0Nrmj#TE>&JDhEe#YQ0UUCg|n3cb}dP?s^q=M%o>lkAW`#yo-YKgwb<8`j!B@ zZ@YkxHv8_=;4%Yj_%b%YHpciJf*8v0&}!*M96jfue6l z4R~62Tm2D-qek?4L@`z60F$=+BRj9oug{{ZN7koeH|VpmXJ-eV-0#!-`b(Vqt=!X| zRhGlFR5%V+nYF;*k!!PgTJP$~08^J?N&e%VkGGd4Y}O42&h#F@&lfj~mS**?qnkMO zgmwhp@x+b}?zZpKLt^cp@1{ok%4@vh@sHcyNAedOCjnw8nfhA$F zr^O26-mGT|SM^)~rw`Lm4}QPSpAIf1C8`6ttuOXs*gVod`7WV{DEyAei3&rt+tW+irnl@8%E>|))zsEg`iUBZ&LH$wFwQcUuB`lCg zBmclO-a{S9sUT1OYDY@seWLXWX@5Zv;wC%5O65GtjB+sWFX(~%3VQqsiP-T|4@e{T zp)qC$T)m2VNAP;!{+e`APpHubzJ9)`e!g}qu5&WfmQWF7@Tw7vz-4aaoo!T^VIr+x zU5)uJh05RsIY_nt$3|33usYw(NKej;kj{W8f)S2a2k^%$4N}wdB2B4MlbZsP)r*pw zeE#asAQ3(;xhmL7XcSFmv^Mh*qDpQgL!WavDIKwC23&Wt>LH;#3d9C@&r61I8#zWln=MUEX z(#^YGJHKWJ7awZY$Ee7~;--Ixom=b%lH=#|@wBrSr`{!4H$2HTRx3XTl|N^iQBToCGWLW|dg z6`uo8`Jk)(V!U#7Yvhe<;$zYB;?yf^ z>=Ruz4u)aXvz3wV=m0#=bOvv4 zH_s0RaS>h>7kR5@tXjb1)eGpotdyJZd}-Q%vT5A0(f8D_@3#@b5G9^3c}--<^t7-< zUTcwt*0*%x%#0jkL85{tf+ppvCiZ4FJ9KTchthqjC|R+J$Q(?iw|>9e;OO&77SF6( zYNN2KdQV09*7jg%6~9w-(P&zT7L|eCBtYxcvYbgHknhN52os$fNg7Fd6hm5HO(-=7 zkVsLWDz?hUC-T+A!mO$rUG$&##RjWiW=Y4ZcE@pCh7il?`@*|{fvj4?ji^wVyuVIF z{9?{_l;&PdHj|WQYl@!k=aM#y!~fw~h%FuMX;PEbhm-Wo19wKyx8eSpbklaIOjT#O zt$jWWM~w!+;Q++}{@0YKI1GNhHOa(~9rN@}RWC~A5IgvHy}|8Jc~hA$>>LiS^*DT& zum=9Ir078`DXD>^?7<|2?Gf`GICB$%zcxf_g4UaL(i_7>_dgy@+zMs+hkj$OIzK4_x!|kTWoKb{+%Jd z@zUl>bTtdm`G1^!WmH^Sw`?GIaCg_>+CU&ka1E}(-Gf`$xVt;Sf+YT{AnT`dER?g;bWa5Ni_l1ZYtFdI(g0`%8^Sgj{~FWJ=+-vxUh$+B&&fBw&=-Ssp1ulF zr{STYt-J?DeWQt|dzrR{9FC11nTJymqe;xSa4h6m2mK{0QP=c1SvrqL1cR3k10MC3 z#3w%<9NO*g_BsxeHIjU8;V=N3;fIsW&WnN_9PtG9=ZV9*XLy{%fvg@~uHNUC6Z{^C z)Mt3*?{2`E^N{aG-OzOe4!jsL9KYTf#zy4Sc6<2Xer6+`ZB^l1+&=v0j_24}l%_*d zIX9B!!u~@h_sBRD7PiBvHNvr>DhBpVM>-fN8*)LQO@^9fah< zQktHuLht(j=!X9PnxP)fhaFjSSIvAyq0Ui)*de49(GW4}9=vghKAFCugaH{Tpst4X zri9BBVLB*%_RdiGzRcbe1F2Y~;~r^(6f~^|n~RMvA6d2LtQ_KsdZ+VmeRrm*WY~ ztIpO;+yq1Hd7H&0j~tPRD3a})>@zTpSg5b*1fiuF+Z54%j(}Y^_9eiVskkZJtNGye zI?mF!yTSy!PLt7|c8aA9EH&t?fFeIwHPjzCgV!%}K+xZ??y9H9;hE8f0*ysWxJk#`*U5JU!PU`##jvE{C{n=4d4}b zS?{D~CAe*0NPmX-QPdIr6AX!(C9DcP#?PNG%;GVaS!@uq*-#+j1@nsQQO+#`rcmBj z+gb;m_2G9v(=2)ncn?>bdEOXt$Au2#%4O_2cNPFkR`<(O)#ICCJ+)IX*M19yx^LQ8 z?^Gz=tbYqvm2WFspk>%BT~u#ZPJf;G-2gsSx#X(wPVxbKsxsrGIpEU~ z)e2u_*yerkhv6-!UJIUZTndTSW3anJDP*LzZH3?pzg2J<4|WAShYwRx5ErQI>>><> z@-*mPiyKsm>oxm;Uz@1kiI{rY^~dLd>q(7q&z>P{{moPY!|>7THxiq8UtbBBU;Oyd z5JfJd{`KL~1C>|f&BoyT_~j`u8wQ@fKl7>)on7{pBpU|fK4$9wa98Ibu4Sp;p9xnj zEg)V+^d{08B()|VP0G01+xWyang_QdvRGa@;FoCIlQ+MA`zCPdFophxQZoUK0Fhzi zS!6cM_;h9kep&Ij-Ejt!9~-kJA*h~sIBEc*!rA6sr^O_Zwo1fLm8C1HL!sPx*#oLU zoX?31ip4+Bc9MNs_|^&k%D)N9z=-KEhpR|Jnuj9=%v6K6^%t#Y=Jcz}FSC33@1xn) zi4hi)Bdrzgzvh3MHnWpzSmZS-osL#qgpF0SC#~5cHk+A(E!Cfk{u9JAOvJg^ioZ3T z))vf2Bo+-jSWS(W&3a%3p0(P&_yR>2J-YT}0FFb(5bm&{Df>xm@s?L@67s zcFxhPvlOFqTn}GOUxW+|RTiocCsAGw%j!hY3?XgdCp*1kpBvv>t_Z@+)SaoKlL7Hr z5EB46!&NFTN?H3YnQWOrxQB&1EmAYjWpaFiQfe1rf$jC_{$umZ=jwiuL+(VX=u4zf zfPVfZc>>lFsYDN|;tSkw%&pO1mGc{YxOs6|oIxXbW&Rt2t@p*qS9;oMVv{EF<; zg=+Gr{nKrcmVoVk=6SdC^|>+fzSjLy%9Ab(K7Gd8CvC@1A{$Sxvjv2|W<$nMpZ`^dH3$Qqn7yLk^1*tUgl039De1@x=`_MzN^L>&{2i^CPVosn6N$UWs zZtiu=K%hk0qM!i=f=CDU{d_PcJ1QxF{&FFDcTQBKijDdmDtxeV3*!}{)`5`37I~hI zflK7{&CrY^6SAq9aG);;{3oBc%E+3naPqGK6r&Vag7*C#O+r%Dt3N*0bX#OqE9Cz* z<48)~8|z?1k~*0CpTdDk1kkY<4a5bL+@0wKQzk4bdNo{Y*iYEspIQ`UttW9Z#WY5i zyF(d1D7|51>>utm7j0x5Yr-uH8*jSNKzioSUbDVGFW@wH)z9XB8xHU;2*}6>mT+u45P!k+Uw0* zIB_H#i-wP#m!-iZHd0+-#lwujuHbcp6MO@7G57`tftPN6u&IbW3|bcUsTCc0rk#Pq z2t$q|={DK=%gVwzOii}-+wdYWJ1Dih8wh47Uu#@+GCvkTFHf5=-hsDVxB z9j}ksg&9sKz2g!0@)ZO_fsX^tHo14dib!<)i0sa_*v@CeWAgp#@m-FH#)=8N67LP8 zFJLtij7>BE+PClUwWr0s0FZ`U-O&QOVO~e3f~Sdwiax8y_Qh4J^!YeS{hjGzyOqo0 z(J}^=g|_mrAqQc1v8oKMQ9MgolNVzd%Tmv#2K2u2?-t=N*jNf;k)Qt3;AyI|?<<#J zwXcY&myQi_R=-vvxSdqUQMNSyWpqLl^xe3nn6sb8Dxw;%A|D8mM_Xh3e8(BZM>P6i zxqp6p-yWFN9y2i@VyXZk+zO;qH<(U3nG^;&uc>Mf+%7NM-Lz2ve0cz(O! zU>2^_{=`Jox^&i5-pTzylxDC9ugEkPEF>{4`j?PovxFg~h3f+B4Si$&Ejo0h&gM?z ze9qwGKQl?pQ%bMyjbrK@*X3hG3o;_;`pJfJCq9aq3Ut5uzmi$(l(aAgLJ{OUc_Q|w zM1O@cz61PLFU8+9eAyI!DWnf5onMrD+X^AIj8G81G*tRu;WhPnuUH=Rv zPp<8#KN>iOr#Im_z3%34UYfeKc6`qV;D2fmSk`_vY;0Xwu73oO+n>bBd5?9vwS~KW zUAyP%^Os^rEhH{FS&C82C`H-AghVnLM{`8&l*oEq3aP8y$k3L-`KMyJ47{5A!J=w! zCV7wWRmE;>p%faQBz4Q7+d)-RQ&G=f-QvCCcO4l7u!T_qBJZQRV)E9f?dZ?s07#G0 zDfYVNAOnTfe{3o<0@sK$I6I+CClHsC*&w-M{TA&5y#d%LYBd@Bld>|43b6@MQ~)Em zI^@3xQ`z3!@0q(^DXg6abDYNrt!FdABQ7lE+e0kj;*dUkx;wcRxqHtOGD&upzpgp zOCf#47k($8qx(yT#N*lXnTcTb7%)d^gF8OIblbV^S*TKie>4B{LD`Ie9^z{n{VUWn zrNMsrZm^-CMi3~Zoa((3~UIk8}f=h&79CDX6 zyj9tAj~syV)FgjDUbTUNu{}E!BF{#9GOpc~fAwGNATs%b~7#TF7pdv&%b z_`^2S4L=$QdL*nvI-IAa@cRavEucFmj_Ta!%WBb=qQ6;(rUo4VPj?qjgX2NOw}4*; z@MybJR#`sUN^!kc0yy8c2bnzs*3LU@iT%MZB8r9jhb{iyb-xHdi%6`qk^E z0ZBD*Qm4RsgSP80n^b|Ud`5t!>ombNHCteO<0_uy+_4jE(UZcZ&iVV+k@p8bBGs*$ z7MA|Bq)p-MIb#P0+4Cvnb?eOUyd0(Ae@bW5S?ww3*6t0JVaI`+&#D3cJ~hP5=e}>d zi2W!tIk6|cLC)9CjdAMcJ5e^DL%WyMMUW5q!PTX84@(4|Vq^3I3RVk0&u zzQIctkz>Tl{>deg6zequ>vxL2|0DR%gI)tCl_;LVOV07Yg(#2(tSg&$Fn*9mc+vcf z1v}QViYN+0#&FHI>&MJD?OTqozXDS+A{{G3Q9hN&V@BGB?88#4m&c1sgQ1^kkj^be zD>xo?+Gi|0lBOHMHxjkTCE^Qn{$4y2fhAPjsD!~X8n-;r=oXb*L~m*=X0%2t1?N?W zZ$FzgpK+ZI%$RFR{jEJ%BrK62DE0NNr>Uu^i5U_4Nnpfh^k6gS8U~l=5Ir*Q>kIPn z1)(Z7!WFeQG74cUkWv~sL=V$RbJ1{R#|%TjVS7cQ05vBS zAp;PnAq!EYY*b6*Cx^GQ)SDX@H;aQ)VA>9ZyTy->l_LHXUQseDSz*&RTb5KIFVXgr zUa=QeI{s6uGsXP}qojRb^Y61O+v5I;o@^G$4DdiwCp+)V4jt7Lt|0EO!N;g}7 z_$Q%IvfCfHblCdu^a`8Z)V4)9M&?6lZ2Cxdz6!&{2M&-jEfL-yNu2 zsfGDYZTy$13HMul(n1(<2NDU4c!&c%qX?x?3p-^$+Yb&T5!>&BH4_;u++13CL<|Un z{gJBWNfoCAy(Q*Y-iQdF{$v8kW36+a=}^rHxQ3*xlA-_74U0+CiJ-%C{w@?^mPB#~ zyZ>Q`aD!#=SXh{05UA)Z#wzu>;6KH_{5~+$8y5&mX<`1CzWoh->;mL>U!-dA@99OT zLS1TKFQi)e^LGsRqTf|SAw?P&dqy8mc5Du zZM#M5DlKD%*#hwr&;zsGEx12!ox6(E>_B|3hzY(iO8GIcw5|6Np$ULRGWi_e!G7|W zI8A$1?}V1`1`I^K^ZG7wZ-tC}{*t>L^`sT=2(vVAgO)TbLhWWxx7 zdsehC&dR2$852z4E1Vz%_iWXS=Ja4WStnZvd^`6bZUGxMWyo=Kq{bC=1dR*vw$Uqw zS0vt}gDAobGynsOnEA+1PiIp$RDG_(-3|(UjX%0*X-L|Wlro*{^wZtf&9#0ONn>|- zbZyNGWN85rfSZ_H|xy-aE@S7>Q#}@5q{t z{2D!~Fb8ggyMH+#*l$|9vvgnQUXnR3Upu*GCzkQH{>Sg$`gmA-K3AB#zc zDtn2{ABzclxy=D=7HGJE9BegbHnr3_r>kR21qCS*X&oK6m#mbBR2&}; zrhGuc)AGW5_mVr9%KY!#!L{WU{MyrCzv9~a`kZa9v^KK2|2uV%a^~NugD=r1B4TbY z&Fz=WteT*U!?ZOg|1n@H5~bhuGeHFxC6nH^=0?xy)Su*&8o75jHY4F2^#So$i0or2 z9q$SAUo>~bF_iyhF^Q=_SN&Tj?XSncE8G0vg1h*mKg})nmVcU;>Bl!{^bHw3PGuV@ z`A2V0|EQ#azhu(*B0JV(imC71h;qjZ9t5dPj3Ve?bkY$b{d&A-@RnJ4)~VWA-!Bpm zT|3ODi4J)g58+Zy6XRnR$Ahqc_y6d>+cw!hWR)&_OgZPTeY*^n;dOcKbhd|!TXuDW zJtnF#ArD}W$^PWGX|#;lFK%A$%k2+mfi2I#dF-IT9atJo?bM|mK{ef(tTM#`jy3@& z;_MZDc1`4o`*6>vezoWGg}Oyp`)x=shm4Q27PP$A9bYWk{6v5)JEpW|+IyaM#m~$6 z>v7yL?;)}hgXCKdZn}c0&exUT-X{+0gvxi7qnix-$me2gbIINOToG7?$nut_>Y_mg zJT(!sl2?5f9qUhkjW6nAC2pp7N8e2ItZjj|S;3CLIX`fz*zd zofxi=K=h@z4e43~_0pZmOBbs}(q%F-xKJJa%U8z;UqNg794-Xnr73R6jiKQaWrwYxX?`Y5^&5ev+SfjL^z;k% zcM$z-HWK&Odt_92q&{cD7%Q#UG2Rm0;*{1KV}CZqT?<41Jbx&%Y!uGBk4axqoZN+T zQ8-ypQ`q$MbP$cCo&>Id91`Xdh|t}Xso`0r@qiB@Oy--Qd0WCL4<-tLDi}*EkfmSLQ7!ntzE)t>D=hCW26aW zx$ju@?E!%$DIEWY-*_yoynXXk!sDBS-vd_+gAX~`DiVaP2gV8Z{urFAAFM$E zB60Hc>-=#z*AKuCEybo^hd!l(s?=4nD_)WL*j2v4_0T5-)}(WzLR|#h#Dsu1VFlFM z+~`j)xzlTh91EXl5bcB)t)kBSjB?6H1knyJayC?eVcZR|(bfU1hMJV_y+!RESQ7#BpQzd6uqUTcnI-hs+$lwZGw1wov>x?T6#UUFHnx}ok;c&&fWoEFN`6TOb#co2rZe~ zOBrC04@5{zTz5r|^wwXFt5WvI6YU7a67%Y`@)usCvrF--&r~=rkPQ(kl;x77r00L| zFR3r^_qbi>d*6lfD|#Lr1BQ(R;o!uWts^rKkCx7RO-`Uvu}gS$*SULp8#XuyI@bLX z96_6_-wN_-Lv}k(RQ2<^*JAnf1Ic+A348To^{q{GN+Ctu=aZT51(|k?k}!^ua<_6?I&Lg|P?<*c#5*YQa@=Apsp1v~L(l3~ue#-vafG zjR<7Hm9C*BU=~R-E@5(iuO0c*(yFVr`%+mF2|HH%$gkFSF*M4j7{#I|av-HUni_2+ zf#SO_(S#P0>D_B9t>x*+nqZSn8fJpER)l44$Iv)_*`P2xy9>kNz1mUkar<6@^Gbx$ z;odmpZA>Y{;1N^e(x>o>i;=O<1AuQ=U^S!4{^TVy2r_6=J@`~%t{nNXMCaMYURDqu zOZ?Ta$;183efj762$@G-Gqc>M3o<&fWU4h?jR)~0M#K4s-Utpu2}#dT1U6B;!FHpV zUx<@jC3T+X2*8dx$3rQE_TnIX4iE~h@EW2fAu>w*n@*|y&> zi36)PAMuuyeY0*(a@9F#-2qQ)Ztpy8#(WcH@poD-S32i&G9QavijRDCs?SKp!D!nF zrjo+AK^a0+H6yG0Q|+p}ZE;^!*Y&UVJ^<=?_4VdT7!xB5Jv2-Tm3XG8Ee~TYg8(R0XAZkR8W1b>phpw z)kIv=zd@N?KSX9j8g#5Y)3o0&T9%HFd+f$@VOF)>&(}IP0BF_${gq$YTm+Lj_wJR* zE5$ch_S~nCB+U8Dl#ZpM-cPNx^W8seA6Aes0Tj&b%UzFd`Pjd$0G_O` zFiBJ=*6<|~Co%2GPD$qoWDK0=t-e-W^vS5H0>ktYVikHFz-8``PBt!R6Rkqe%_HFc zTa+8LE^P0p(yHUI8U84aPWASD@oY_Ibjp|j^$@)efXPG5XTn1iyfV(YE7;sDN3hyB z|0=QR+Ox>Rx8=>dlLPx3&HQjG=a%==X<2oY#t2jc3OSw%4N1Zw_VKhqjbsVCKD}i; z0v#y^@ilV+0Qwd>)j*7^`6xQ`X*D4hyvp;(OWSPn>^+j=C!v^V!OI_5{ZdGxzT}6( z)9noANgpp!LTjW$rv@Zr7=-WH-cH1`5uy<@&n0_tg!C(i+t=qv6cW-XOQrCuj*N6I zmHn1IC*M^^jiT{?h`rNOdYwOGLoIRd`0BHZN9eilH(*mn2Uj8wSBttZXjtf3%*C!o zyXV_w%=3j>NMM;2-4PI*+IexWlV8EQ=dLlh z$^YQf3(zd!H@l6&^oLjB7kJ5?#m7%<^OYu<=w;{Ewl=@@0N z9S81SCUoIt)U!GenQbL+yEi|Ehw?J{}7OT&AGvmAEP{ z81{S{-uDemRCU0QgNrkQWLI#+2fv<_J}L0GZRi=1YWry#s;&jBu2!qR<|$pRwml3y z=50&I@Z5eMLjO7%w(l6RPw8!`5$Wx;#PYE4{{sney%VYacO(P@p^Aa{j??2{|2CCm zWBZ^sDZgXh#`L0}J2PwUl%MgVQ~^;3FoZVEdl%EM!7I|>?jhBX#5}U`;o%2T%42_+ z#W*U9+AR8Bcb*L1&msrrDuv6`5&a5*^vtaGh8EBBr|F=%U^e_2kBy!E=xbyw=8vc3 z0f$F0DIvUUc(Are9((Y!u||SBzb~!?Ec)eb1oag?@{_!V`)$nG2&F)TY!w$Iz^tYG zlw^&uNB-C6B<&sM#-OPyf_#OIZinB?VjjaG!N8e+v;oN^HgGSz0WfFGI8%?UyC{I-k`shBE{RSyaHzt|U?O ztudx5<7YEx*fRvyO)O!v-pl}JKzpabq8|zq-Yo!|F4miztO6Aien%2TGo~gQJrqjx zZ5z2pM2#>@9zT2DVme~~7fhk;=`BQaiu-tTG9-oj!Wloc;FH2r`~ge!(T^3>iVaBei#MsGqk<^{1#$GcKdOwni4Iz)uR?%K{WJ zwBn^Nh))CCZZjso5F9d$hrmwTn4bl>V(mt(>7NH5Z?Dxl)z&L?SDyHj?+dd9?nzqM zcB#b8J^2@%@x4sdkvx>CD8;TVY9hp83Z?G1(+ZUdkP4*zME$_Q^){3tZN_WC=wDX& zJJoVFWNOYoL1$^0zw_Ob2UuR5wn)o6*KvpXSNqMq`|$cjl2Ba%af_~XA+UQ)px%g- zU20dQ?%EnT57ZtArCeI2@F8;;u7v!~f+;ibq%c?_mbrJ@Sqzl0N+aflY20tw znN720K}VD;PGP;UH19ENpd_2WT+{?U({jM?#cYcLHrvW^fB-PAP0jy}YiWC$AtYlZ zD3AKazZ451lr1|=4gAq(KV}+)AH_7WHY`~MMSKwLUGJxm=WysB5N>1@jE5FTZRH#9 zNb5Ndm@Rdy+v6;wF&fY^!LLUhx7~~9RQ7ATuc~#%z3G}d{T2D1oyconxj8N{ZMd?4 z9zVom4+vg&pK?;_^=~Y6`SdvUEPb*!n0WAHxSScaa8~uWIGx4(>~_yL6Gve^#hIm< z%t^jL`~qEW_SV~Ye8iAFNoAm*)ToU8ilF-qqa9WyU=+UrLECu!Z9Pw8sL;jygt$l3QEZ&aN(5R zj3cx~?j?2yQ&YckFFf_tu`C#6ae z>}#D%cQqn`!Lv$Boj4Qf!E#`FdT*-)Y`?xfq(M#*Y3&`sXhGujyT6$zsC(u=R)TIi z;1kbh=2q$%5LvOUdGB7j`pYLGO`U{Cou&O4`zd^E36B8@9v6HRo-aQ`+)-KK=dJDX z@Eq*7i68HZa(X1@H7orKRi5rHXF*8!Z`uP2g{H0;AwF=A2u`V@bJ77kRFu_)3i-)Q zErqOSh2In!d!P^_ufzLf$2V0m8NK99p${K*ciO!k>z~hbpRN`cT`D|Qn2sNQvfDqc zY|lV3UdhCG>#vMjk6tu&3{JO4(^KjRihCJ|FPA_eMm6TM4K`5Wm>}7hBl>7{Fuuw3 z);F1&3xYySL5gW;?^gxTStPQ{`q~o2i)g(dVNAknqK-Btjr5W~X>0TgCOHgmPHMzi zmGeNqjtk20C97*{SC!2PQIc&(dQu$A6E>fyDH-@Z-akL{U{TkDIdVmggpKx$lh;tKb`N6R2ZI=tEiP1)pco93pvGhxd0g2hBaZ_E4MlVcUs zm`UV^Ln}fQc`MTcqzPlrJbCDqoLw1WZ{wg@QxhEkxh9O5|hZ+8iWm({{%* zqAOBi7cC>Uc`hO-&R2cKmq>sp!tPK~U@>QcqRKpU62uuVUE9`W zm$n_lNEJvCDnJ(I#PWNHrN`BVhB9-2_f^Q#MURPGJeS+b1$HL2ZmNlkH2Uxb(sTI3 z(;SFLgg+CsjhV>2WZHIL8!uXlwt$=ufl^virxc?L7UY(u%5yQcR8qXIX-+D zcD}t6M_eAeKyqAiN@#p1OOw%-I*md&Bwh%FC2dw!?<$=yTsn=9sbd6#6@r^F{jxf= z&xZ<_=r0f^Ez16=k zLkt-~E~4lyKSH}^o8emILow-mAi&*pw%Oo&dh}sWfC&bS@&igSr9)L|-`^P9>q)TW zvD!Vv%!%C1KV04?B1+;;9f=&uO&$G;TgV7Oj#$VT6Fi6)dd+V6Rp@ZUN`aUjd@15f z+SGbRs33Uz+Au$z)bOe@z%qhHv;EVOe$Vg=2HEj(KfU6~{Ol79vf4TL;Vjq1fO-le z3M^oVHucHIP>OdETseHtss`QjfE&$6LRZp`yHy_zewMzP(8qKJvR(Rvodc0*jXmc` z6+5hkfi4xz+eWFHNN8>70taj^RI8m;N94a5Ca6wlucvx5N`C%IQR&7@2fJlxJ%AXfNbI$|* zDgFBee3YcG%<`M$>Br?oQu8SZH|-V}wRga>fYXL9hg1XRanwSb%)r|^w1=u)LTPyp z-J~5>SLW~mD(efe#K-uQFsJUO@@!v+rGaKF3?|&VGp&vE!eg}B9~tL-B7Kc(iCcvI z#Uo}v>cqJQy4P~lB`v5ojjPvLe6jcNHD@3U`+y#CmUDln*7~%xnW|S@(qLXXZ#8R} zbh&hX3J|2Enw-Fifdx-79w;Q($^LA`x88_>D4uA$rG7gt z)+zL;H@=GgC5k{Y$5w+oM`XoCJ{z2&i*e|w2K+QtT|h3q!?;^}p%|`jAB{YcAMcJ% z-G$XH)}xI08Y4^z&}oYEw;Nd5m!NEm8(!j~1k%_oFsYQsc!qy`%kjF2$3JWnAVQNo z69rMKz_|Dg{Qidi(A6ImD;zdA{H6jaC^Nn!z&Li#40JfMY>Ay_@%B<~`qP-DD)BGi zB{u2?e2!2~<1XUcY)5F_f~VSv(2BWS7+nHXC#r zz`7G&`7*ERf$PZ-*Xz)HJ7jcIrgR9%rCM{Lq-(l7MDnIL5IZfkutG5HnbcXH7vG)R zih-UI+NVdfp1m3@ms^US$I(X(m$)YcKP?sol$eb7d^}X8UmAC^-bNb=%RwYLB0Uu$ zxt;>|V-X>&q{w3HLZzy2zUE1xr`5T8{?(8b{@swFWFa2iUdW{be^FQ3_e)p8mAPK} z+ohP6pRiL?8r>JJD|{io+^GoE-j6&iOy@%H_n+TsBMb})?{_fWjBRj{t4_CcNeP!` zHoW<#DRY^l-=fgzKV;J}|IOPnVTMrQuZBHMzY~G~=8*+?{K>#jV+0usd^k@1ho*3% zfl_A)Adm9Q+*zV}fowzBr0zp*qiWO~+2|tjClZgDFcIin62OxjAG z&FSwgr}OThudN)C7QL(ym28exg|J-wHz-FZ<@jB z-mbf_)omU7A-QViw2SaML%<1HESQ7=MgMc$ckcYeU&z^9ZKhYW%m_R*=bd9qO)ZcI zM*u-bJm0d;>Qd)sXH`!)16CC1op_WfL9wxcSGn`UlbsD@K$|X6c(a^$cpR&}`CN$*X&`}$T0I(5?X2B2M6wOj9R;>AtwPm34@(hZ{G~AO0 zD)Q2D@yf@;X~o4K6x*8`;{T4yC8G zvl*qQ9}Jk6$4^#yU2C~0ag#_ju<;$eO%nWgsf=-cLRKm1IuaNkfHfR6+hEt%y?z@g z85;@0T?F8bn`}LTY#k}I#x(T8a{c32{m~TjFKhFw%Cg)5Xhi<*@1l zx9)M5rY zR8T#*sy|TvHImtM`6#ybRfbw4B*GFIV?wN!+!X5LKEJ^DZ{#}f?~hmYdi2DI&F6?7 zuD^O|_4ha06bzXgqSTAjcG~pDQq~$zQ#oIR*I&z4vXfX5P;i&>HO zyzjr9)N*m>peYWbdbrJRh&b~)D7)^2G}CX4R50ZfTi zh`!v`cfwcZbq*BUIXoR*9ERcjz;o`AH9%f%Fnw4$KIUBeEr3bCiavl!lbSea7){V?vHNACqEs2RRo^#7ku!{}9d^o#(fu zW$wDbHTEMxAw6D=jY-jYqiPa1y@vA=Ad^(q5-Rxn*(0$vr+BSmnA;?IQmK@O?5N0DqsSg z*X8g?W%t`kNwb>Aqhjt#a}md)R{^UlvAO2fY0GEr&?k-i?FNpcpGUf_6Kc=pQ-?^> zveyszTBJ*Jf+vm>M9y_WO}Ux{pJ0DOI=Ub`2A~>6nCAptTKgP*b?3)*st8<>YpYvQ zx?K7(O~BOO>Y(OXv`V zd+E8)8BP;SW0A?sH+h11+JOA*?^e2Z8aRuZ$)!`aHeHfg?pCu)7u&V+VzRxDIGM>5 zc-}Z`xOlo9JuJCuTp@w^Wv9&xT%W*J@V08!D)9<1wi@)y+sBF4?h@KT{#8-& zZvGAJN=y~EVEE?S>GnJE`XKZd-YtYaA6b@}cbMGG% zlSs0Fa%9aTE@TgzWsmcR38xYLUKFn-O1gmdvkl_|3csOVP|}K-3@QTDb=HWzuZK8? z|Er^{SJ&yi`Hlluw!c;<>44LTAd8iyceCj$=><`@wawWio^{wVQvJjb&t-S6I2Fip-QH_ix_9?se(tUlj&ozSObtyg`A zygnJ2+K;a8#BwAAF?T7(Zh2s%P8^vu_X6sDRpi7n&0Rdv+3}WGK`E;tqh9CkW0*l; z&CcQyqUJ91MW+t{+6vg51!MZGERc1tlVD;hvnxI&ka}%ztd3Gq$kbqPhX?KCXVHPw zmL^??1=2HSqW!hH)<63~V?&@`dZW^3IM4lvDvZpwwqJ*%S$FpspnD;)F*bi75&t2v zTar1ycHoH)pd)~@bR%GtWvn+YgC@_REp&BF{H7Lo@19|)YexW()vNo zLMDB0(#yWsR&8XuchpkinU&Al>NbvGF6TZs7M;+5zOwYUOh~t@=H!71v-CG$BKyC2 zY!~u5>vsW!oHkMlb2mTvy)3;LG9HveuZBrFGH*6Mha~pEvE5r!xHkcHBvliNXRj&7 zx5(-2wdjy-d!IwNTAXD2bupCAGH%ru2jUq9!YQikc0*Vk5M>p75imyagaVQiD^IG% z18~d(miuE{($a+jR6134}SgralF!=R8gS_LL$k5k~a;1a^|az;UV+=bFZFw zi7JMRaYTRs(n;>U0s`LDd_1`%7k?|{zpDQc9yY;SN{~t`7rhLw&`4TYxDo3iM0x!w z6_)x!?`K{DNiwYnsO*r`#J!guHG>wC7b3%3u1v*JG+Hs|_Z zaE54R(ry-r1{i=rC^x0zYf8if;=eDAngu$*zaT@+Um*A&2o!!#@B)J7-hV*wKLN;+ z!R(tEhtlg83~c&0G=br9r05Skrv8s-5d+{iA(;q=r~U`fg-`cEYjdYILjE^0-HWpO zYW(>UZ7>Q;vbR30o78|27LmhY>)M1Sqr7=$DP`aS$8Cq#uEcTgD9n=Kw6c8}oXqgp zEafp)BIB_{ayo)4x6Ur$##Rnn&z`kkmDtaFo^f)AQ8IYsEOIZgXZ8-yYkNAnwYMrB z`fNJ8bmjPR!`3OneidKkCcXGbD3Jr67|4`%|iQ9~@54`QUt3dze{# z3u>rw>nHhTtpZgiO+n+RSl2|&U*AIp0Yf!37Mj&>qw;Kk(N`1Q{y zHZp6Dj^hU{+wK*gj1*bHHtN%k_P7@twfJ5Widb#?5-ool5ui<+B(_wsw0wQ!U_rOG zwsdQU|0@Ee%(-CUV#uC{Vi>Vdfl-#J7}3sH{r^c@>3RnnE_(t{%^>%;nv*Asipkwe9(nL zv~oqdXBzA41jw`o+Y#~+vJBRTEo>Ugt1C9`T<5wU8AN_Et-gt87JiNfIsH=uT0(srVZ+8eqK z;Nrf2-6;^>3AQ>ko|myRfQkV>)p?}mEsOg_$<}e%yyOwC3#k&(&mav9q|IGde7;2I z`gv*7DJV4=nui|tE8zLz=IVU6nfNy2ljm*Od6?xV;6kpXjQR0e?RkYA_9?>j&?2`Z zlhb16{duEprh-`UsQ+i#UNev|m$l0D{;vp=>23C&R42MJo|yPp41K`qva2ePU*AcH z^3+^uN+zGzqQ(PjU~m>he%FjhSOk+}sE#1{s@7*=w_3`QyCp=Rvh8`aPoA%5%r2-* z$2F@$`-7D6LfbK1&AVi>O3jMTpfCk+_ah)tGdJJO0+L4*_uEByO@Xk0Iu4WDH;D|_ z%xW=La@}!-#}&{Lp9AntZZze7&30f?DHXc7`+3OkzHy{f&?QY$`~|f64#v|V)2sK& zB4aQ<#gQEpXG|?J&|;k#Tj%-EI%d{=;QO%qq4$A~!o|vTWe#zFNs6{4 z1aqcAQnxGXen`;ixgcTH4MzUl%ja?X+a$3-jA{LB#^!YdP@j9*#O?{)$dER7ORuWQJ^U*m-P=T17l+ub^ zdHP_kxdUG@ue&2Uk)3joGl1-8bf~R_qEQH3jxa)ZQI)?XBQ#i*pll?1m-&&B_vU6c z5i>*yL3H3NAVH9(rn*}e^d5(d+PZC`hxcMKfh(PH&F2KnP9L_zS_nhO<{5{csZ;&1 z!MU z%aZrVlDGJP*q_7k#@XR}TD3qkPog0R7C*S~z1b>ohA#o_>`*0|R{_36z-m&o$OC4K z|Ipu83?Pjd!fey~tbP8|^cWc|#4rvGg6;PuJoc@<;u2&j%4rhci<8rSglYN)N>NeL z*eGxF1s^S>OcmDS{D}P`agn)v_=6gJmUq8U6};gD>G*vecb-JZ@@*VO>oL>tCJsA2 zz^V9^u!}ql`xTxyqM(T->4um9LzR_zOu##N3}~jp`evh8-O^NYbyJ~Ie1qvLYE{OW zY_t*>sO}i5u43aJ^Xd_PX(Qsfq@mZC*%ojr1f!uYw*kc(`fG1#lTx&g1RIC)p~z;! zJ~Cl=c~k90uyMLfvM2MtH-X(^o9&!Z1*G=AsZx}xXlH9v4;bfYZ*L%G1^er5ue;MD zRtyr}Bf+A=$GDCJ`@b@QWCw+%2xIt41b4yF!GY3({iBbZOFD=_`ci1dnAJzXmf=Tj zN`^-0#8=XP_R0Qby%16F?V0Z)sKwSXuQ^;2WS;m3V`QRb?5tt+Cp~mxPW*w_^4>H* z;;h#~2oQOYJ8Uci@+4sO=OvwX$#wUW))9cpzC8=aWs|vjG$p4Sczdsmlj$T&p z8@iMgr4mVY2PPNbFO6XnP9?!1n5L7c8_*hKWDLL;R_|Y%L@fpGmyx{{;!di&2QLnw+r}L=3h{c@{5}q6I)^Jcp(Ht;&JgaU#kZe!{O$U< zcJc7gy|tBgUGct)dUt#*0`gCX|BBT+Iez{MEYmb3Phs<`59Gh}x0GaiCC$;l`CLdP z&hUG7Fx~3qSj=f9#2!D);>$9!Hf(0!IbqNK7K3o2 zfn(r?n+?UMqA`2fBy|&6Np+6ApV@Uz=*JSFKcTJ-H_dC|x!f{0nV!%!80S$n6v9-) z9q)-x1t(boHOR~HjAmm*TLziSmjInyB(EQ~l8wi4@dG#H9rnz5;;m&-+Y_|#bHazC z3UXA{u{q0^E;F9$D^R*v`)1B;?o;9a*@8bZfF+$ECTW#@qtxv}vs#E(^0s9y_i`UB zfMi_^sXDsJf(GqjAC!>LlpvNzyAOhp%M|rMJ6Y9HW+ATM@*_cEYGVL^SvMEgay2vr z=hyA-166og-jw{6QNVj`4U$D7=hS83(-wQW;7C==<=LD%hBNImjha;m>xRzU=|3;8 zD;`DJEefPNwXU4p1{;m2T)gd1k8O>oA`9=IE3UVt#1nlNYP`|GLoH#k}xv3zhQuuohbja zob3^!7L2mnbvd>kt+#T*1A~5ofCYW_%-nQS40vF*8g5;_mG@em8WP~=XZw8T4Wg~@q^+A z&jK6&W^os35lFI;ns+Hr$X~0Sr4pL`ekkYp{b2+1J-md#<_FmkGSN&kBA-xEkup1qzNx4!C?$7@%x? zmZnG-WpVQM`fz!=KkY7X#RtUtbEUhFJ^%alAX8J<;PJfjwcUd2ML!u;5EdJdmKI-B z@zX0)t*dO*B9h}+RmYi(mXf;b=qSt#(YxyiG^}m9s3di$(XIPjqlCd=U3~b42$29W z$b@cR)}H7l?ze+KKRS z#w!Y_4OOy=__D#NHcwrU!50tsoodXDr%v^yBlKg2}<2PZm;?fSYP3=-fT18VBnJLCQ~bx3%5 zr$V>$I7%x;BNWWe_sCgLN5SPtNB6ZGBj+eCofq@39+&;V>**L~KgFvn!-eBw#I@}^ z2fn>eao>}8$TJ-1*>eMF(STOwCBNUMWiNyS`aNUzxwta#{>1VFThA!k?dm4qt}eGj zEM_dnSL^|e=CbYWZZqfnnfqQZcZmVrim0gt%H=nJyciqXxCA-ntUCfAx+sYZE`{Y< zi)bPRr>!wh>#x`4W2iEU{=)fHFCJgb)TxM^xhW}geCW}8^wGc0sX#9= zA9YOdqa!PqRsW-Y7E4)vRsiHGodVkMi{B6I;?qsda)%OzYh)tHZ!2FNM#6pErqF4h zqRN0)?d!+=>qop>9j*mcwwij|HVOWRyT4Xj>6#tO&h$@j<)Zw~i>7RzGW#|>3mB97 zO&%R-A1zMPx2Kwhfq+|CgBPG`BNqe5YJhF|a29_4YaOIRE@C{z^RY@hAd65}^WK`v zFKY4AC0mJQw@>h0ASL51|QG%RT9>iPe@C zg3H(Y*t9O-~RX7V!}+6l}MgZWZk}xN1%erOhIZ<<%(b@_LZ}Vwk&jv-1ZKbm%R$i!O;EG~@Sd&U=+bUl%Mu;h zjkx}E!tIbR1)A@m!%l0C_}xggsGJNkJ<&9OSxC+P|K6xC%-CJPZ<;QjR{46;Kb)&B zY=SoG3o>~BO&heE8T7NFS_B$wJ>w_h`W=u6$1Qjz%lx7f7B^+eU0^0s_xUmAxSsk5 zK(SQQstWS*{krBuJZZ=jj>h9Eq_KJKNS%G|pBhvu{JQ>3dJ-l?l>F5)lB9N>ldRbK ziL}g?f}dr|shSx+K#McLdHWn4l(Jxef6dgwdS)qkYfYq0HPL3-7U$N0{q=QDt7HaB zP)O8jcoS_BlDG>dcM;p?PZ73{R#k~9pkmay6I%KkX7=ir%TMBXa!I21~UH8p=eO$sb=7!Xsn4-HqCjliA#iws1GTe%tT2@Hor{*3WUXH z6;Ni+1H63c#VLp5jFt~*bFGz-!t^O8ZaTV4kOgyWn2xC)K_7XOAjh@P58$n5BdAor zLeV0(5T@xE6k*w{8Jg-3aq3P_6pFGt^ui% zALVpHh3V(SDr?vNVpe(c4W#}7K=R**)14O>DaEXWD$>P>EISwx1YQU*|8KjeH{@iI zDwf}8!W@JwF%95V(>M4D&4%cpMNDz)P78LrtbVJkp0D35Z~pM!!LQuwli$_|>Oazt z_pC3XPS;oSXgI_@g7F1$ko0RuU0b{c>{pIO%Yo$i z_9I}@@x7dVnVx$9^qE17oPCyoCf~1lj%c~_?Cf^H)9e0y;q~-X`dvN#+zN44d;05P z@2=&c@7vEM+c$hghC(H~7MsYo+o?(**u)FD^x*DV_A{?tS1IS}IKC2EWCn^?*N#-5 zfaU5sZSuU&ec|(9fiV?e9(^kaFwQXP4mv(qZwD|N7~G;Mm|m4z1Ar=CK76lD{7g~5 z4S=oZtNSy&D~RV~A=4XnK40tkW`oz8E$ho-%VhUkkG))37&3v{^iB3><_d2G^X{Vz zEy!mvZyv8TOSbC3&#f14&s&o2TtV|^ve!%iRG%#CkKpc4OzVII!5ixoX?7ZG|4hiS)C#vd*zyg$Ula_e z6UVAfJ_E;+ELgUat;n@xY(cF`F|7wvv=z4OIjR23NNs?=z{X_p{GKVkH675L%D_fi zQ&=-j#LSfmVc{3{xduISm6ncWMO3IM*Vm&7_>j7g9~SJ{mDdP;mV|AvEU_iKu!n_jDLCLvkH51 zlr_<5%N^s}0Lm;BII6jbwC#p^Cb15vVIO|LY*^yq9!p3=e7F@YnKXCpg`07bk%1tY zkAwLJPs(AICMN?i^??NO!_)`<@C$}YZkBtM46scVUcW}octiAS8?wn<6+R-~?}l6_ zJEj`s-KukTNUcsjRylWYR(1HfpGyn3&#&oC+BY}u@c|1Gel=vYrjQ|;SRM9t-$}^e zLo_=sH~xt2cx1-ufuU-L4$!UTVg`uO|Km{5v-`QO|V=`{gaT~UO^UX(uSmxn2e0Nw76ZHX{ zMeF+hI`F==c7S=~O!?ue?&jU{SVn>WNbD#oz7rkg zcmqL&|9J6Iad_cDUOaiz!o>7)no?4b7kXf*Z9ukM?A?N~Q0rfAnusZq@~xcYhM`%6 z;&15m&$af7#@JCkK&WApE*h24x?AJl(MK0`^yH8l)e4iM>m62-Aq*`($Ff%k01uQ4XM0lz>q-73} z`7^(z(LLkW^7u0spT5t;{@KD|6OueCdf)T+xfR$KqcGIS;4Ns{VW%%Blm#q{NxMbp zAI-kRZ&T8Qr}D(^i-f4+B))dNxVza`_*6E8*z7g_PQOk)E7M5JytLXu&7>uAd;=ZB0&c=D zEz~1)yf?aWL)$lc0PTble_CSuM}Ni8pSob@N&5`KY6N42FhgFZ&^cRO?*QZ&K7M3z z$7Cr?ko#CvfKjyE(VKBMWu z04uBn&AP;$tG#s@O+`E61Rw$1X&OS{FXNI58-_BXA;zM{$1ck9y)p#L-?E+}kQB<9 z1FKP!6pBrxZv_V!jU%sE?+767!>Jc9(+lt1(S_+W#YgT`|5=(9n`Ss(g7TP3QsZe% zW1HnrREpt`+fJH=s#%-x@F@PNS21vgUzp91c>s#R0aS&LHP^F#Z&dp+Oy|nX z{gQM`f5>vim)_QNqg(gE6M#*{;@irGM0m;zbN%-d;k$MYHy_hC@IJsc1tyJPfd^%( z$X$ED@N44;nvO`#n@V48Pauv_K|wf<3`0J2`m230hGj+Z4CietXP$I>_HMCsxLB-{ z21RKCV-1-EJ`6@_pjV@E0UGNzVFsC{c`V6G6^2aHo9fYPsk>aPbdi5!4;&-+yq&Zm zgBJ;MG=vmg4!PdWo;1LpmiupNjhNIP`de%9O@{`Xf+J?N_@DY4G9K7@(B6cxK{#(61>F~LQb6szH* zZt8-pAGHgEQB`7w(gBXz#>GEbHo!&g;3Pi}^>ZZJ7-sarw;gv-T-NcFkft4PNOuVG zj7j*lv7OG-R?4sc zU@a-sV9=eXlRYQql<&Z88I*-lkISW|fBWbjZ~YOej62$jb9=pU%^h*Y-t=fWtP3YP zS!1uIHzTQHR7=5K-`sf9Q5DdT;Wua;w*3om*J_8agSgiI`Vwma6SU$P^ulkPAi0$S8 zQM0oF79q3y6LcpJSAioa2o9poQo#Li$KyO8{7wJ$_2K1kzLq)J{jK%SwW#Yr^7*(4 zxLCm?^e&sV(Sc-LkOpuz+@yDD1ks26vqxSSf7_3#GRO-4PYokUI$BQMb;mlpGPUPf zGWqkzl})-GMIJ0mEoG)U0xn++z%L2yHdyFh-@RmAIyC zX+{vWO4A5&8f=lFnDoBlZ0yr9mQcgGY%VC@`iW~1WM+AD{LX?^e!H+o?Za1UU)#)D z>oDIkvLUYgDAo~9;3q0D=K*k~G*{GG3AaCczRqS$&5eJqJ6&J#EsfS`H)uI%5M)*k zaC6TzM*);CV+K^%RZC*mUmNtVU7Q_n^&Y~;Go9$NJvAQBQrV~xo=lRvj4|*@SqlKv zXQIe!clu)W`uk9KSwvC{RTLb~N~)C)jeCI5%aR#t)rGd?_xVW|Jb=CwrpE?U4qkmP zL52O4#d`trM9XoSYOI%o{Lngg~wj6#HS8UQ0VfkF`ek*a$ zIKN1R27uov9KB=RNf&ct-NE`?9E$5pV944XzE~%2>qt69usfzA;aC3fG@_11%4MNL z!eC5D)C3iM@4ShR0PRJ5?J&2mp!~q@glUlJ42B{OJLON>Byy22;YH%sTk^XT_Mdva1tVP|w?@w?O>qbId6ykKoe^_vJu3Sg{2qvkU+-O;| zkuAz%q>3kVeE7*49J%_Vx-@cikJg z*z|H`rguB-DrmYu`ABl2R!A^trOFyodys)%Qg=W$DKrAp)Qqb^dCE2jZ2`{4%$UAn z#U@B4V?vwtnZc>Y;V@T8IzPgjh`8u?h|1_5v+o4rnmR&Zx_Ka8Gfikkwd3vGpK)LzvdYaO>a#`U%0+R{YDo~yrvKi z90FmIWq!j2MS|u22%)viY`-s`5~56bj`L}XC9TH@o(8)Gj@kA<_0L!_FPI}s+mhn} z?gc7gcvQ@nM7N24yS$$x#noH;XNG|C&UrJS`ZsI!#md~KVs2Tjt`L%6U}3Lm94)bV z&9!;WhdpTbfDwM;)V;sQNd%ztq;K9XbT1&4syJsX5=;NE(7^epo|jhNL{D-F35fb( zR6o+CA)_4)oN=k=e$X|}^!o=ry z9l@VChhwsy!m7=MT@l?Aa@C&zFy`_^e6-pSlkFkRwCQ#E`ft#FvP!q0C$ ztIm9NZV`ZLY5%lTQ%9&~cR1}YVO~6cSwL>SH)qv_XNKPJ18yH%zX6wAoPux;T*cJYWG=KS>}Y* zEk`C6u=?##YxTOK6l}g$EruM)n9Bqz(pDPbD07V@9i7Fhpgxk9kwwye5%zIYxkVa_ zs(rw!XyQu%EqjC&9CaAYx5-gv-9gGB3i(``A`+P5n;!}y9T-XMkaBv<<92XP@I@O$ zECI9~7>00i>7p!hKPeTyqst|+LTcKmO>knX0ay-;a=1+4INjA)dJeyHXmaz^YYJny zNnkKJVL)OKE@UoH6sCYzzr-jQyNm_%>>>zOyV%5$sSoc)`rC1H$~3v<8e*`(;q*>P zk_KvVf{b9cky><|gMB5f9@R3cv~eMtII%V0q%@S~YSl7DIH22bjwPu}SD4Faq`s;G zHu>|Wh6c$oI0=%*h-zbv=uUg|Fy?<6;Zy$y8GI8{iMmk+ zMAGeM;OLKv7hd@%KDEa}_XkiEi8h*IXsXCoRq8`5SSSfRSCSHs^O;1HN$gzBVf|eS zA>??KPXG?z89yH^rnEHsMU~L?n;VGFQoEq8_HRCm@WnrT7Oab~3?xLnB+WFvmhuwU9R;Jz?>svU0^ z4sNan{w{I9T)(e0sODPz461cZE^2+fUvIaw0e*sjR#NSZr@bl$)jCp{i z3eDg7$4et(9y8n~$hVHgC$s*Xp#5XZgMtXH8>0ltz+t(Vi@X^R=pIW#o4`7p5AQuU zLUyi`c<2He3oM+PBTr8szvgXL^Q+k6GnG!#oS=59)?)QA+R)9}^R2bz*ulm5yfPKd zG!b2VFl$ALe4p>=$WTw@T;0Wx=__jYT# zxa>Es-`BQ@ou|13nfHfU)-2McK~J!>9TGoWqeqXAH2X}Y*&r^UkQ%s8gwHj6!uoP` zbn=vbd=Ah6c!Qbwvz}(N_C{}tq$a6Q4W|yZ4HqCRhUrm-=@s3cvodNH0g!k0miHUy zM}f7->+8Nxe|EP=vy1c7Cqp)C=}%ZiQtvcV$HsHyL(*VBWI7w|uk_$%8SCU|ez6b? z6jRq;qShthGNV65!}`SLNS<}PhM1Z?<^z$3z{gG|NA zT=yHLf3sd+$PL-fBL-%9cbwM9hWJ$w=0rw}KS!FqDY^EVU9a^LkC$U|3eovpzNEj@ zKW^d1ZneA~J6t$k?3X+|y0l^5Np`zh8MXM@%)?*nRm3zzMga!Khs8rz8`HV$8xmGK zbif`4)%-L|h1>0Er%Wf9>$mYe16LrGN@cT7CX^~=iLy*3e}UmlpUv#-jj)O-CwLc* zz{WW|7UZqyD!5i<#(8JpU-!&Fn#fL_o$1KXRI?ADDUTeDI|8z28q9S|U^8(6#u|Co z6+amE=DeA@?g2}YAf6fp{X*%Wo@U;x9{W#VhgwqUSsvtQmXU%juSM+zjO(6dtP$c| z0D|?fx4*ja;Sp0p&hO#ipFri`jk9`zTXSEFV9dhhqBBPM;%XmeamB%S(uv0xN5X2V z2?U;W6!nW^4j7VFVL4-aso1I2)3**F_K6Zj%DyQIQv-6)<&FdMM43Dj{P8-IuflNn zu#{+MFeUemFw_gwN#et0>TwHm%1I8>FsuD(`a&mWB+mt=IIty1nXc4ehH_D0B1H{n z{2(MLdD%bacies;^UB!*?yGn-DwqWEZt1!)fE=PirY_$Sq zr$j{nnn^>CiLGj8gs`yd2M;IIU6snmf$JO9b-+=5-VfA84;g%Zt}|bO(c|&pQyoSQ zRY04RxeX78=P?JLx?caSF0gB26HsY!@s!Ne%yB=;m(ln~S!YLAKBs2@Yf`2EI zz#K#y%#~IySXC*IjtC-SES3&tftTQ=k${Wl`I+7zDsg(=4zk~=I>4+rdPmZ}5 z>o<755E)4n5=2hAhxo}JNO(cKY) z^?VP+QMQBgh8v4P*VLHMTl`3Ts6jiP07;&3ZWSc-+Gf2@W1t^oOq!r7bwO07F)`=` zqQOb4A#NR(u-A|tMo3q@9bwY~MhJWWdRO?lLp z2uXG5GBrjr(jfxX1rY>{VV!Xf>@c1Pce`Je%f+_8qR0bKfS^A}IoUvoL_Y1b2PYXf(POByKv{_a$@{RPr0f4;=mGwL=;fy4_eHIruQ85RzGw9u;XeScKL9^Gf~1L&73|c4 z|CqD%UA+D|@|ED8oS|>Mv9_aQS_KlRbZuM*outpect;Tiz)W?k;qzxzSOinFw+`v$9bfbjnW7*Buu)>?0(YTBQx=|=UR%C zI-gO>1)Lq5eyeqyw_j`JeNb-w^KkUE5ep6Dux#Ow4x&-k6;>=ZOkaRz`7C78ZKmw% zM>Sjyz!+Gr`=BRU@>h)FFdlLYkKDA%1`w)^5lxW8TZztirv=OQ*5F3Ka_yRKTb2D#lF>!Q-B3oUT2H_HOT_ zy!>}ko@7$^_W8ea>`rQ2`wX78-2Mdyqc%61jX;n@b@%u`JfZI2lwk&!7r?NCvmu3k zZ4VNtzZ#W~RANO>_sQQn%wf7gGBGuGrH7J%a~*)-pG=%K?^;h}8z=5Dbxws?whaAA~Hw4YsjCXHh4Q z-{DaiyIW}yGbi4yj{m9``((J~ab~ET%11VWH{csxyMXKh^R7-MfF>`MQVSW(0p2|O z51H5Xed9)Twr|2Yp6Zu&*Vo^?i0~1~7zMPvN`kxtCe1ZK>Go)3Yc{TP6rJc&0E;{;-kCHOCo^2D<;VpB|TSrRCe z00Ha(9`4XTOYjBVi^rO{fG zG&(d96`B8dalON($CCCRxDvLK02lV7$=}?Bb zPb^r!shfaR_~T5$m7fRgoK;!XlCWfhr7^_wI&_hk(0YGr0Vre#E~jvZe#X-HTen?G zCqxSED3hu9FISg(sa4Z9KUtq2Cl#6gij@(VcOe$3kkT1(A+AN-AvsnUl(;Rzi1z%h z;8whbQLUc0Hbb}H0zr--;fY+ahQX|coA8GOsA(T=I`GG+oJA8ow|PSop5l2S*GsJ? z=eB4^@>pTl3?LJ}1*3PC)B|TDQw{Y|&Y!X~&TTQy{|-q`XE1Js#?DZts-U%+f(|pj z%j$>-$l)&%pCc1A2SR|c50dS?hV`d$&_`;;x{i$b_i@0HV?KQ)Z7aB2nxSz`p&mi6;Y{M_E74;O)x~2xWfhs#oFrRX zy}>pfq4RBN)yjK%>Vizo1QcwA^E29Soy_oNIjTG9RJ@1of05n3ck13BPmZI4YyCM? zs=fhWS5dg%S$zzGg{f#d(5FiDMrg%{$F#h=cBxO@Mu3Fp=+O(2!WIX%uZ8UnZ-uM6 z^y_7(r0Ea!XL~;84t9BqxWF0I3c^wEX4Y~cuiigwKcx;?YQsA#G)Vng2UJLDFpNKA zh&D~qdG(x3VEC)i^jyK^hMEr3LabJaRsm`hD0KWqg-LTzv@!hIekH5Hg!uk~X39tD zS|Fo`F#8h6kKu0>{}V;kPMTC)1*1!*#At;U9vQSuvli+dvZ{PFD@^gNB(|R?5A!cTYkhyWEbzRDjTHO9{ZI zeBw@bM?iEfpK(VZjm?~4#K3d_sX#1~5Mhss87{|*{!kflI%%kUFan{z=+B{Y5LFDd zc+?vabUK;_6c9Dyn%uEwEumzvpDi8XFnROdAjD?E>vs3LKe>We=;``7S^xg#ZtJmk zE-tTcxgV@Z0#Ucm{HI90p;U+t@D89nVqs^TF={5zONm=oZEs)_;HKAIJ?z3i=w}g8-tJgSETv_rjTZR)g7iz zQSWn)U9)$#Q(d!#j^CbV-;TFyb6+YP@1J_d11itQ+kDJtzSvfhh`0C>4lHg{0;ovCYA`shllg+&L@?4hl)RV`T+&>=etv5B47~ z@P@^DARH*cwWM4_cN8*j{Q-bri`xk7Hy>8}Hutx};(g||thYz!?b+cuKyL$_cn`c8 zMxH3dTs{|&s8zfdsy3B(HyaK5QOLLXwFc2BZ-GHaKZW;n@8UPFL+xysQIT_N9&^~} zA2e#o(>A8bpeMRt959*MDWQzIW!XA%m^n+OE?-fp}r?;3qyY%hSnUgRY0p_XeX^;(>~B8xSrfi7CJ zghUO*qvrz0=oItroOuB0Y-T4l3PliikmFQ&8tGM;w=T_%UuAmClBL#oH_c65xBfEC z4HqzwJ5vX5*Kc05lcC8Nz*&M(w8Jm9@>vGY=Rl?!Sx{=iA9G17#Lvq$ip3Hp?(ti@ zTM-!~*B6|G0xenz)JD~>PX%!px}$V;gctC}X$#Xe5K**YsH1=;)o|GSdbR-31gVsY z^KUgU(E3=LCg2AbVgQ`&Q$Lm0NGvuXkz3Hp^x8zfK6v$a`R z(uyT6biCQNO;$dQ(`6R_ip0b~Nz1`I;F7!D;>3NW-BcC^ghda{Ss#K`hM7(gQUl4K zjD3R7WderjtI+kM(qHHsbG&64DSjPL3K9|1BKa(JW9b4KV@pF!A`o@FzUmA?)DoZq z$}CGYXAH9$hhpKO2|Ld~`!o#9AJ;jcr?y7A@+nt|M6J-BBP5WT$Y6fkHm4&Kgv zs+1TEUn${PqbH0+YA1tz2(iS&SbkZm{wlv9&xi&!+!U1eIL zx2KrsS)~S$Kx~ua{L$in4u>bz-z-W%sO1}?m5CD+!xHE=UvGz- zdRF>}*o>$SA~yR!L`4Y8WM&-I=(PO-qWB>HOsEQyAe89?QETIi%4vM9!qDz%rzR+6 z6P_PxP9v@>Pu-p%WfM+-f>^oYgDam*j4DvMG*5&t?-x4_?MhMi0v-5z0qbFyqUKDa z2fvDH4tm#1bGNE>$P-RI58cxXqr+T86&rLP1uh-Tt&@DtzRbM|@>vfkwOv_C?n1m4p};3NR$J`m#cr zh(k%*QRVTHEqF4*HHaBym|f*J?o@o$v2Hh4#B0HeN|D)) zHL_Eo+3AJOt)92;R@3*+KO2M?thZDwr33s3!(x2zHgD&4s3%380MpqD5Z}zvbE<4@ z#J{~N!c6Ql&+qG^k|2Tkf7m6MbKw5igAI$K7Fc!iap&Oh5MSs^v%P6DO3wOgEAX}W z{^9gI+b`sU$hQV^;nMs*A{dl$24R1eT1v1j3Qcyu>JPXIO-#>iG3+{mbix_RAHndl z;d5e6UVd<#zfcfQlmk9guQk7MVPdy8{PHumw|^N2w7u@uzV#m-oJLf@D(3|ekk-bXl6zO=GQ7Z6iN{vof~BN`d#16BPX}VCL7ob zJ-+}>?=5b2{X?tV+$&^%q$Atxb_BQpvYQ&*wwCb5_{zQ3jPzslTFwMS)`AEM^G$@ zY%IMj1h(CTwW3h6k=1~4yxDQROI~N+_1|p{$+X==ycwGz4%|IDg!6v(o-(k{5}QR z-vjpnYOsBP|BW7CX9IwanPAc1!SZqj7bpNBvxTdipZbGaBRJ`o01ODyGrGf&am~^xK=&HE$1F?K=Zq`1GnCy`=Gn29oc}ud| z&!V?}t&??Mw2z#lL~o_xUAZlD&vba2Q)r!g%59pJUxESK zA@wU46S*F#6#E%)EuaYy;M-J9b<;oPm5VPXCzj9Pw)QaT76mP6(6OKSzn(~@dPz^V z$)L(X;JyOhPFgMO@wM+xUtay-M4P}}Oc)+_gyp$NN_S_X$Ai#GE=fWaFeFQ(n z2mjQSkpu}*0VR^a`Vl5v7jagHgeJxp$EYq~lBo+o&QDKNZC2DtzJYonE#g7Jn*07M zg#hUxEn*l8J-al8BAFW@g)t&(AFPrLqek40;9=OX`7q9Is!nZm0d>{FYgNiXXfKXP z?pnDvLZ<9pp_+_KLr@tqzOl!nB&A<{s}vS7(Y<$_ETf9gAAyJ0WM9|C^UwG+f-U`p zEr5v(0nt_3X{dAU0F6j zfusC;YW=t-8Rkd(o!#-6is8NV{4)1SgL%P{IotcuQ$ufsqi%3hrR9XG(Fr9Ay#Zj` z?^RU_S#89}MY}=hq~$o|*v%iVgCTl+NC2@xXc8$fSwV+k2p=EE)V`k(+g3-MKs9vVs`%`Z#HuRoMQr_tCPD zi8SI(WQlO42>ij8NXDNpan3%1{@;Vp!YY$F2Qe@hgzb-D?>8=Rh z1u1i!={#<(DYTJkqV2uklz_|w*#E<8V-=Se>on77=+KvM-<^;(l#d%UcBJ-xb_jlmvze%SsaRlN52{P^?J`tjV^uj!*c zw(I6mzT6^Fm3S9PUl)z1#`#;y#U1I#+**su&Ws$y>{RG+%K9IuOd?X`t#j4XQVYyT7xGIZ zlM@r=l(mni5Rl)z)QF$O0K#TDHU27#9;u6vbS9;x^15RU;%2;&brGeJy1hA^RuZNkB%dd^Ic)omouV?DSz7KL$ zkK@aC#kQB)J8gU5ldNogSf4cf)*^NBzpOsR%nfNWli7d0nor04gT4q8dPe)KEzWr#2y9WkywNXIkcumhx1H>U5Zk zHoGBZ=;2;ATMgEo#NP0e-C$B0{_1c@2OGqdhCS~NC)TMptA6*i2#UWTsj1zj3v%5-O zQLyqJohtFvgPR&*_E)v^V4|Nqlx{~h}fh!e@9wohPo3smtmvv|uPFnP{N?!1xVONHEu^JLGi<0Q^P1ata3}_^jdcC&O9- z(&x`*9Aoodf zlkOyCe}=~Pu)>LdB-_P{9b*-vP(+pV-?#0*BlB3>1CZN(745!;LV|$y2cLGz(U9!C zOxio-T)=W;cYa`e;IINJ&`^ z(^UdlUht`~@&i3^lU1$=(@umwCvmXt57m~S_ubFcMYswWbtPYl3Y$XFdA%Zr!eDL9 z=R3d6j{rUAh`R3~8Y4J+iZQ@dB^({LxipPO~|MiUn0KIwwH9u=0+Wu3+^^#GR;YjZfN%^9GbRX*Ixtb8D}29oO`=~8 z{n60>ss7CesG2(L)T+{k)9$u|wS9QmU&E-q_NRPft?j1y^kt-trb^5!5rHtFnsrjA z=yb$s%O!W368Xk_GaeAZ(_A8lffDVmzc`zPb=gb^hG<-rA)@L+vfpB}ORkGZ_of$G zEyrHZ{kmACPyuzW?}StKK1BFrO4k;1&s6|lVi%T4zN=6OfUUR0F`=wAp5;VTRi)!vEh0S) zIgv>ZzT90HNLq<*>VTeq%doYSb2I$Th|Ak!>*}!OC={jJGR2r)${9OAQi&U&r3@QYiHoA>)^9m_ zZbp$ALS089Pw55j?y@Jgs_Rv`DjtPOQ-gvw8| zr4c4E9#}K5UDnzNYmo;rPrbA_|6aa$#SuN9^@kdm626h_it8ubC{+w3AqJ9NU7XC6+5n>9bTUT9d5l=a} zrx>J(s%#O%cT4cOJAU0|Aqg_^$~Hf5Af_yMY4Y@1ihE6CWPV8p>>mno)qDPb=?wuw}RX#)oOihN37S>tPRU@5}L^pTUV@ z{#kF_swhHrQZbj;z^My-7{zsW|2W-vrf3Q(YlI}} z3YD8>BmNP(sKQ>9D9yC^pyPvCJ`d*8ENwv>FjG`elJ(bEn||vG94*a{E^>g3QQ0Xp zC3XDIV!N}6h0lr;f9LWp*WW)3; zMFr-`2e%J=1xC)F&OdnBp)@VY=ZE zVEj8sL|)0a5hVQ2-W6H)L`3ou12vL%l#katGi?z3T1?oSg1M8~&|ZFk^D8OHeDR#4 zdpegqipjKGA*GpLrltB)03ylKtB6ajZE^Tovh2mkuv2dgCxX~*?nP`sR*+@Tm$De$ zTuePI`R|%F8?`_6QoFztt6f&78bV=xaJp+S)bihX>E zVS57Jn$YHhVs)-_-+4R%FK0fzWGw2->>>!{kqPRkER#`aS&Y9+50j#i>wJv8gNqG(LM}YBZ`BPgm{K1y{Tob> zF^qI(LBpXPk90}b!;z6mSu^wsIIJKkY8(g*K13u5)xs5K0WiWmGQbS$;$`>4B{gQk ztWfZ-9jp=|fF`h-Voyw}zfWZax;jB=r6SXVx+~DlBvz1GGN5U!c(7VB+f7=OLKf7b zG=p_cpV#o}KI$|NMr-2y{?X~zApHUb4Rc~ql`S$LHgKN*V}7Q~59(==X<;1V#KN$^ z|I<{v_To4|J{1Q^QdAroHPcw!g$x}JmGB#hFbYWu7DVDC1}dSr%hm$r`@T+F@x@${ z{{OJ`6;M@mU9{4TNJ)1i-Q6kDjf6^fHypa8ySp1HX$eW`?k*{j?sw4d|Nrm3@x~g$ zxMyGP-uHOM-fPV{*IMz~W3q_a2n?3;)D&+lSUUKKJgS4%+_NHLCCU(a)Nnw!(;P!7fjzrBY*?zG@z*B%G-G_AN&9iSu0^sz@Dr5Ik-2q_<@p+&rku=9)LdfU)}WdO=(y zO&Bywg)|x@D|9W=K*Lx|(KH%ktf3}uyCiX2ql5-IyekuvDTD#Wks+Lo*0*JG+x;X$ z=#-ANq)H^9andUR$g}3JDP=pj@Z29LIb_U@7sr$ae$@QFT;89bZ>dd&G?N$nogE_z z_Vu%rUm zq2&(#h%qOf@t?6CWYFX~dytdh*|(1^clf{|dXu%Z|NdF$RyeEl;>hCs4@z(dpf%?9 zWaCczXTHQ_yEru8!ljJiDO=83Egq;<MlV?MuGU1l;T5HW1X1C+4Rbu%&WK04Y zB9(ExXf~~j3EOM#wE6OMUmI8xw&*_w6UR0~Cc$T8!bSwnMr#cHe@(WY4v>w-x74Ok z{eM=8Eb> zS^b4ojz^5!*DZ}}?P1$-(}#seo()rOgvJl^2)rYX;LVa@$@_Dc|2y0EpV^Hg_8E{G2@BuD{O-3GNa4IobRFe!1lI8cf;+ zH@>tIa3OIYCA+!&YjH!KE#+ewC{Pu7`fR z9!G3TE3$p90>%$k<+C=Kmem^HG-@A7?wNVHxU?FV`tGm#07`(f4rYCC>}eJ|t9(*L z{=Q*)8eLol`ESN%GQ)X>Z2ifQnt`tZ>qYt_`YV}UZXb45ek!$1S_>CrX&1jU84!sr z4UNhuoW-5#Wh-6Si|BP=;_ihSQmOZP5L2}nHeSU?#%5sboc)?WaUB~-FZ;{MrL+|9 zy@_AkNf$6`4zwJojyWc6cLv+s&o=4uvl4CSuP(2Ip(UpNVo0&HifaoBAkwl9#_uq6 zJnAU^DXCp_1aO+fYwiSnO<_Z}%ylGOEii658CDlZ_Znl6neIHw=54OL&2oKG5}n_3 z=zFWsRU7fK3wm|lioeEUSXAd-{dh?e^||)6N5$K&QQ+&771`JE_b#y0EaKPtMW<~G zr_HZF=@Nte4?gXol*PsH;^!Zy!E%vbEnKVkDePSZwMmY?erXK@HZB z|J+id$PKV$yB{xcD(dDWoSm`>ULkRo$VmT+=d|3;lAu#(pCfgGf09WExIOGl-<=5! z)ShsibUa-DiWj_l)G@__gDuAAb8_KI%~9)^sZeXlD|0`@{y|zkFia?ZY#P$CB=Nb* zrR_F=7@Gj&MmQd^)x0L-`vYXwi-0h>4ZYRiS$`m}Y@wsAvT86hUe6hS+YqPiwVR$l z52Xjq%VkYI$4|pRfzC#on095vYU!l|+O+FyJ*I}$8y8Dw!YJ6J3nig1v)7-7tQMEo zmnT=6Kf7x2+HWkpk~$x-rn^|i!8tEwbH2lrEUoz#GBCTp|IHPT_aj=6q(K>*cW2Hs z&IF_kY5xys0>+OUECw_j>@9YO=b%Y3lUk9e!4AO>LY-c2x{A&?2q}{mB@NJEe=uP! zM4GflWLrkH3A$ek2#@liNh`Cr#|r|qZQfqL$3%taeUkWuc)RUuIlsQ)Yo(uE5JJTt zw%)>_u)DSKvIi^VIP5e`8@UMB_^EhwmU9^G5Ca$okMbLGwIeEb-W{*!v6k*}zMcvY zv2t)3rxq++IPK2JWW~mzqFk9)>6>4A%&JinCRLRqkOHn;OP&Oz>^a25QeO#Bs~XXy zUu0rKEA(wrI`-YJ2$3_{$UqtC(>RaAK_iyZDXtyrw|CKaTl7AR{o z%)S4x-q5{n%B*vRqZASbol9oDtoI30K9_e@TGddo1uvXHS^jV zu~0i8d-8!=koer5m|3>0AM587U-~mlWkQ&Z*D^c+-Vg65`3~ z1gD$P1se2PgcSu$GZORGo=_-td`rp|usbJ#fkzUh(eY?y=AzSP2tzQx%a(avuT*

OM>-FF5}a4WaX^hpV_&A@IbKZFY)g8#PjO3+{BPx!Z zYE;-&kUjCf>n>Tvs1iDN`AJ<6*Ld~xt97z$mbV}-Z^8lFtH|0$)8bug-Xx43vGQHa zmoS}81Q}QNWrxYRG{IE@bhm!6$>s)d2DjYs^rP%|!mQ;is)dUm*=3K?Lz<512{3lk zw|ab~&{x;-&M4qXC9m1=-a%iFCzOl(aAwe7WVc%2reg;%FsQ$|zHJpBIwZm6XB*Wo zAu<8;^kx-jo^4TMCZ`0>2nDn@8KVk>8puK3%JO~Qcn)e=S^7Zra3#Qqw4Aj3jHJAF zNJJ5{l4y(MQ1cp-2mWl^-Bgqu4#J&qhEg+0xi&Z!_AsW`xn;2Ak@4CT9Rsa6=hy5v zeYU`aLuHWg!78&IEQTtU3g4mxhG-pU3h&Qc2( zR!&q7&Z!{m)nurgX^*3ipU3OT9QjMq;#xdJ)@}|zUK)CitmYT=9;o!xT=U<;D2yzy z3}B23c0yM7UWjPX#wYki26I`wG~(aIGb&J2H>VzyRRS*_RREd|jY5%Z;uJ{YgP1Y- z%AB(yhQ87RA%-%ddAcO%Xta$Xm^d}U`P*nRiq^i;9wzR2Qx6p`NHOtpzRx1=z?YA) zY`yDlP~_XGG4kZ$6z!>J70l=i4j;cs|7y*N6d~oe0iF6$d||X2Rv!a%G{;5mH#Wte z(2(RFIXM1OZ0mUgv5eS1Nd`M?-;f!)T^^d#Y|qaI^wW8`bfiw<){lW)#vGQ6iiq1&;fPn~mpu}%{$+6DgV9J#0YVuY+j0zJdXiQ6ZQo*TxV~0^voxy#%!=5XsN{F<9q9{H#Krp^9{wShP64lxZACs zfTO)Vn2&h7e0G(C1y(w4ij> zj5)>AVVhHOQ}1}~LCehr;Ewj_XT_WDH_u#qGyOQ}u<}WI<{e-Ndx0uKIA8}s@hZ^1 zfZ}1OCWfI2_f+fNl~TU3h7w7Ah5#-^Iz7XM1dEVFI$dJpO+LcN%;kw?1pYt__vfDZ z4C!Gbb4MxBuiX-V@eu@a5&Q~J6+(usaCiU3x4K>9?RF~tx94#I_oi*HPw$b%Y* zawpn86`S}M^!mUxF(CM58;;=lUO>=GLIMy};AWpt&OpRc)m3n;CC%73e%g{?3e6YR^Vyb^ZtoX%BYMTX8 z0JQ>%`1D#az5z)k=e_|HyZd$s@-p4D!=T$diaa|Q4Z6($2}a6cnSZ#BB9%GCZ`|gM zMDpJ53bd1*JO%n}BE`{7l?o(TL~G7d$9&s9qbZt4!%#z0hBMRPv#PY!z4l+V&SEYFd47`F(*7Z=cR^vb7)b z#$_Y$S?|gDmOx)XE#ua#zDvJx+$C?qqA)dj{W>(a>&U!hle*k8P$u~6899YtB4v{P zWc9LPyZ2uDldjigf!$oI>l!xXeHg)c@<^;dMRmx3qZwYkn5Dc<79!2WvZDjyTx|=^ zyGQ#bgK_xw9aPa$m(LQmu)5bLYJe5r>1-BVoq^$E%c=g>MIIN&H6fMMhhri&%yn^b zM1`oU?UE=ePv^F&Oa2&-*~ibN)?XbLHo4jJdXy`ZlO33>HvIV7r-q$Z(-pGieBJ?eY7T`)FO9C5- zm(FDZM3r=3dlcY4I9~qX=>akX1vu>j$mt2=bs`WrFP2Sa7dKs@RTOp@;ij7`y6%fV zoL{n2H4pA*4Gg}cCzj_+a=t#CZ+TrI#Hd%Z8`~%k%k*@8(EUAlRrIZ>LF=8`#KEUL zF*P%n*3MEo+#{rucLB`08d^d}F_O8S zpOqb2B1A2jqw;Gvu=xpDZ*GeHCV=x71u?qLY-5*dm=m;H_HX=kWh}ux@SB5Xumf$c zoEe6{4G@rO2)SRq&X_|Oc2%}7j1OJVzO6+{yN!3fZJwv(=S_AHSIB)5^y(BMuL3-x zODE#lwUIuuV<;cIBLecOG>YFFQ>*3&DQdL`PO@UKNSRZ**5;^ZgT`5|9#7R$tbW@z zK6b!FtDwBOSQtO>2KD0K2-_LNy0Ue=PTR^@1>f?AFVSx0FL>QN&Ue_U{DLy1ofY@w zn?L-TJb0}Qy(|nZ@{eK3LL-pjiYo#u;$w9a^fkveHKo07n)Jg$=eP$M2GK5~=Of!J z=cxafe9d{JblNIvTdh-D_t!fekrTsgmyv9j|5#Xo%Q^2IrtnGmyAz7UT>q8%#1-EX zIQPF+r0L!l0f*2Q$JM6du<-pTGj6N6^W)~o(|r-}D5(FVRX{qW zQ(+d^e1sB+;}X~u8MRa&ty}N#&HQV$$(iHWk7-N$DJNrW_%m$3W`#%p8s^(kn!#wH z1U>{n`DCqJpVu}G^rDb=>R{E>imcC z#SgB(W6wij1t#p2*zQy|?u94jXSq1E$sQ{P%%>^z4TFh$=Tn6g-kDv?Wd$zHE z3}%u|J6F*5`1}Xgzt;ZG`rfbp>Syz6Tnm& z?fop?YTLTOy;5&a(vJW<;xdbVu;0|nj;Y~n-!zC#5jBUrQms;5eHZJ+<cWnpeWk*h_{;QDw#r*T+nel#4Gwt5WsXx@Ngy;)SR;)@E@e{R=_1I?%%+vB7 z4-1=Ml#nEPfr-79{@m*3V<)6hLx3C=fYre29g+*H3O$?AXiU=>$a61R_K^;fUJ;3T zV>*~S>2enoBdT?|C3550F(Jz!N^jM{b;#kq`N5WlKyP$0GO-d&hqL3 z$#pYwJq;T8a)r@Vj|3^=SdBVK!Eu3;4@`}ysElpKcy7bXlDY62sw}yhdoqt!QNTlx z5Yh92jj#8TF^+gIN@Fzu4!y(voTqVl>vap0hLsal>Z6Z4+!;|ND*j8sPrr%k{S9T} zcw`(S*~k&-c%;c-WR{o!)p!)JF+?8N7{UTdNM_rlY39*x&eWMaJmZ)>fsdD@N#I=s za&%u-;ca8VveiZG_m77DSx2q^zxY0)^55~jmE&;Hk#_B1Cf&5Mf{bo;kt+OyD%w0R zdwc^b&!j41XZS3p0s>H`Gsy2%ocuA^8o#)OtDNJd(c6a909R2ivkR$~{fko7#HvaO zX;Qv{y{caUB>|FIXl-b11B-*2eu2lDt9K?_64sl^y1_|pr%vs*P_#lLR#*o7cj)Czm7-qBAXn@`*s1s&vqaT)HG+|lEF)< z=dORyBJm`%e{m4EMXz4$&!A%5^$@Ii)yOUFD79p^6J?UMl1bpj|3Hok z+4lH89A`xi8dt{Q*GK}HvLIr;*pxi6mE?)d|0KJOZ1^!T6un@Uw00 zF6%3|$7SBuSIe@Km4t8RvMK11)C$uRwf0u1#>BeDfuuG3f)VXc?j@d~>?;nv$ru5z z8pn0dZyP6fuUSif8Y-4yJ+?=*<7euzP5(d+R>WLiV#E-snaTgO%)^47^WdU1;r$NE zEiUwKe-vZrr_ht*!5P#Q8notCb)RD*0mUmx&qMaMk!sFNrRmebZTj{#im&=v|MiIg z?`-$Z(pR3tgb}JI8lTrNn}4mAFF3PS3r(AMG6%YBb_^a!otUq^T}m^fvra^R)m|M( z=uW5HO+EA0Y6@fBbLhS@0CLqi1X;J*wx8r8E z;>en%C*FvY>B!kO9E<+7;X{s~m1j zj)cO}I_d9Yvbsd#`uv0#|8|FP{&9y?C}f50u0nJc7At^D*SgX*bRk0jn0dAnc9+}p zxt?{u)3t|lfAmMZC6_E+n7W z%yuFWq`#2wXQ2L}^FC40j*LTJ+$gqD^MX+d2kbn&g8@4a|A86(_kE=(4h7|huThBe z?bsMWWZ@-n@cu^caN?Qo&X&7pq9;!b`PTns`hMJyawtBOvj69`NjGObUaJRi0|C~3TA(S8GM*nu{(%TrtG_q5AF2m!c>0jLw zWgP~!$I^=8Dy$Mpb-H)@q(H z9SvH%*_RQw;bz}cAXfbxufLG1Vckj{u3E&?Z#-FNOy50pB`rlwU9`JfwJHD*PweI8 z=yXu|uO6)Ac46XBk-pq=j^@3iGFT+OD*E+Tg(zK%fVci6#c-qhN}jeNKGW?2Y<9ty zz56~%zzZx+#8RXWP2P2{&3oU5nV!}WZn9COAX~@&isRGzku`+iuq>it}nOuemm>Y9n=ebjFf&Mu05G z=x!thpw5M2c;i8g-O}8Z0K7ld9O^mLRo0``u%iz2}LYd?4Z?zIVx(^9OEGhxU z@BEVd%DJ>SJoPssLy0eQsY z;&36BCBS!AS6|AXGhP#==5}va^XiuyRt?2ffh*Ln0W;=L7S(OyT{MtHlZr4##wZX` zr!Dz~zQo-#-(PtsR6g=ce1qbyUZzlLKLsepgGDKu`qADgyi(n>W%wLn6w*vM3R~vS zue!|k`|!PS2qQk7o24lk`lQaMk9&Eaa1W%BmZbwWJJZLOk!&r8g};b~RIz=8 z5cvlAwpMtB-ch!|65?lnbfA-AaUH)GtPg{Z1@SO^;hPX`zgLfL`x&jp-URQxcqDp& z7a@vuh#8N(wMb5e(ziq}v~5a6i=LF|1SsLnT_5QkwaIV%0}VxAT}+Q&6}8RLH~|MJ z;_^Yz( za^eghEv(0KZsMvb$4XyGhe%%|>fU+-GGLy3d9xS9q>1(>`O}r=@6wvP z;~L5k#`iuBdAiF>QUm9-tcd|Xgl^BE8Gr*_#b-q?g3p7XpoM zo#ASF-vSqUXPiXZ$u)p&kK~Hof{!VCvIHZJlBqJbsd8a{{l2{R4nk(DBf+A%X@#qn z#u>Tc{$k!RXXjkhR|`nzXC?MN@u{&%+vAeDS$Eog&Q~(p)ND|cjh$}MNWt9ewr5sT z@bg%|uP^TLAw8n)1+73^(@*gZJKL#_>+918K*b$Ee*NTrWL+;H&?jj7nS{sn{aH=R zZscu7-%u0D?Do6ZEm=CNAW(+=i9((NhgL;$;VaLBT{tEli9tRIIc^~b4nlYxUpPoo z802r`$T+}AE-*>TIwNgo#nj18(k#G}7i`i#>(WA?#Roaabd7_hkwfB3D!dZrn@@mU zr!pwRj@8ea!;p3t>cbH!#sm5nHei?;t0V8JqVSiiomO8wV2A5~36gfRKl@*lDgN&$ z^Hbb1c64F|mRVm5B{v#~B+nDsX6G#Nhe0(Cx-Z(jq`c#w*c^+5vF-}Rb%~)x)P|^# zGusBJ*tB28`l<{6k*R5?C_Ky5z#&kkrY-Z1UY2c47O(F+V%--E(s)Bn1UZ^-gPGlf zTF$t<)`5`ah6jSRs=ISu*dXJyEqDjgq1GEiJjZOZ+#0Z=M55j%0sIABvapmLv9XQe z($}MFLW{9ahyUT5>aqve0U6$Sy20g4oAjWM>fd}DkdoOI61HR+tf1orjj<+kXv&+} zskU3m1Ietv(+guMHy0z)=7puit4UwXC4DE>4UA9yQaI$8Z?M{acGfZ4asMEjjkr(r zT9M9JD(n>81qo?Qf8G|Pnl>jyVoK79$bc{2n|A+RiSfgiihVf^Fl}2{NOcaW-rkFT zF_+3|9FHV(SK3sQ`kwST>k#AaX5(zW`gFaB*TUk#%;4$%*Wrm3N8Z|=M9riWM5qew zNgIuz)K5I*0`Cq=Lv&TB6a#;Mlu8`Vub@Z}1$FPM%{bc-=5|PC1*X7eIt?oEd%TlA zIxRlFR|7KaT{1l`0NQFw*PxMe^+%;*Jc&8%Q2o!M(==VMgi(%(0!gP6bjfQ5ev5%* zmf&DCt!lYk&L|fySu7-3PSPluxUw+C`ELla9Km@#^4K**H_^TAT8uVN8uuHY7{p#_ z{YbV?6lRL=ATqgJR}eSdKsw3we{>T5B6?yYz%CdiK>uL;g5D>Aw%jl&I}e)Q#s|xB znijbnB!)nq38WbeC^^b$0xNk-2wvaKsDbU4h3VtGPA$~yx|Dpa%a*FzxAqU7_iAFS{FbrUgyby?^Ui{dp%?V!)euowUL8v$x1V!QPn9)$-qXo-22@$ z=WX@(O7m9O#o)=20zxod;aK7z>a)gS(^f@X=aA6jt?lUt9gev!7Y<^HIrbcxqW(X? z6VdH}^$gGpV_$IbuX5 zLYY)7wkm>4o?np6mGuG@8GM)g3+({&d&LNLKdpvzUXx?WNdKgmLExB@B8o?*Hj5&G z>gT{EnW)R_UU>XfpM3Nv*|X3}HMa3>3@=0d3a8dbTWfQL)iM;S$-dWMh9Yw&4*M{^ z`QOxtLP@{vAQhwJEp^GTp_@j&$M5)$+ys|W<2Eh=U*){Bh4h>-h(f%V_qsu7X7+|; z>8D(-3fvT5@)ZCkO(Z_nHLT&*UP)uKl=bw?45CJCBF}gF5gL$+wZA2OV+gXRNVs+P z?OOfuEjoi;Vhwo7I0b8@pQ&22d)WvK2kPS`R(}jwvwb+Bbyv-$84LfcDuZl<5-o1;Af&GROPbvZ`cBQY!4~!{q+>ITe`L$ z&!v`JB)BOH|C^qa<2*!K692eqe3ZkB9C;`^kOh{4P=y1TLa_xU0Hg|4L8@>V_y45| z&Fr=Do*E$D>n#SCtA9KY%;r|`Zf1(7C*1#|=GQZP+a7;-0UpKXcHSWkNMHx@;`(CR zum+@PDjLe#S!#<36pJZLiN!$OVp{WYX9%~d?}Hu}jBH{Qk`!nNR3c1D*V~vr->7`R)D!$FbX>0ka*Nq|9 z#r7t&o4nhA|1W!-FA6v*8t%P8?+E+m9fVA{=el>@Hgg(;hH!_=>gfE<8(SF3aPLJ- zn6GrwpIrwewqKFalAu2`+swvCTx4bpKGOYT^MS~Op~!^H%Hue+Ey#pJ+&BoCT!wp? z-_Nj9$9}a!fZcOmbk>oWX0ZD0qTuq{9V%yIjSU*=xAp^!Vtw|>E5h{sW3;Fhwvgb_ z^Jl@S>TgK#E})}xFdD~|{z+#t+S3$)0NN-jN83K6Q*j-3@T~{l#&jr5Vqu=wLA0QBbP@PC=HbCBnYsrtYy$ z{r1qJ6f7ppkM}jhoLPEB+4zn*&srg-uy{`N&t903vpxX{@})N1f^paZP$m;=at>2j z%k1yi$>W4*U8$R?%18LDms3I#`%U)3bn254fZpZ0iyT;6Xl_{qDGzu6bFkP^*sjBh zrh>uax9!-zb&ip0Kfh$&@sK1uW2R-4&M{*+_M3JHnQizRJARDS_tZL(p@(Jlk+Z}j z5qsxt3kIxSp6j#tD4VC*W5#%j2*F% z?nmcQ1NfNy>Zsz&kuryAu@ z=o$q@qasG$PRqEeeN)>&MlWz>-skZ1p7l3GTkjaYIyICNrz8(K3j&c_n2Z6Yi`X*c zl68Hb7&&*gF&95;Z^9duf`_}v`pWaGV!F2>u*&Bp6ud5Je>B97hRp^vCOKDup>AFS>3@h8tm)$|J zenAdMi23?*wtUAaKYTG?WyOKIthxLAQu0Z3)Z6=JL+7813J!LcR9 z@q{20*%30C)s}&YSNIl?1rgIF7Q4+$NxqL5XVm*W4_78BW%@1i#O}}9nf2YF#j0EQ zaA?T|I`WbTwh7l12#N}58Obrloi4HHo~9|cV2WPKaZ*QVXi7Q`T{!w-r17e_`2LUb zA9dFAubm=lCw5gF?yk~;Zg)TJF1y_2kXH$Ic#f_#k}{c(0h95O?UjUJBb7dHnPBq zuE3cymuT3CXX;e%!b$OHAe+hmP!>XqYk7gD^S#m{z2fmppHxwULKLV@`<&K$5H-5` zc##L3TFcXpzP;pr4VP; zBmd)Bo!i-_s-uO_sJC8g%4lTUxNXHR93qm%z&^{Dm;Pd($gd|yE8jz+Tw1_A8Y)8a z)pR(>%Nj@laPZC036Q#ekQpm6^Dooqe7~6ZzWV&dWJrznSJF$&Z!2Yxb07<&eAT#8 z!6>3!Py)OwAMKXGYoLjtKdDz~iN22dnqEzY7D8Qc$aQCrTfS1fdP)6wTEJ z6%v41zbTfV^E87{uNt7~6A{596sB4kQxoBx>GNs2YVck9djdp7xiEbgS}wq2N|~8b zF^jH~qpEZ~W4X!xwz$sy*bb%|-Pe!!sBkx1cn3vYbk%~q`u7!oTUtJpNY$f>@5E*_jj-~-I?fSKO&w@O9P>=_|N1{=P z1Ch}mASn#@*NcG>u>y`6;Wv2t6A%oNAS!&+3+wFTa4SrqvuR&DV&;8`3OG`0|-%* zp*I)B9gAzjnM3m;_9l|!C8&$ciWUP2r;9!}+RI8~0@=G%`cn>ZN(B>_OH+b}uVjg4 z9aJi9HKags*vowY-DD>{@HO_=CXsJ1xba9)WDp`x2io1^ zZAsM;u^+=*Zjz-@;JbZAUNzxKRTeL9{jd+yRiUH8LzY!zG-jwEGTT?)HY=>RB$9oz9i6@q%GM4hJtu3B zox(dxvF8yI2u*+0Yy=cMS4mi)RS9rgc&#zJT_$P8Ea%+8LUpgNWh~R>7BQZP8}e`c zV(k^F7aLx)geU8(*5jjz-!^zwevkBD9`V7D*R_|?7Bb4FZP`(4z*Oui z)_VM$?0$*{lag{XUtE%$s_c^;+qEKLP>^#0u*C#R*@(_9f7n3y;g+oiGn%3q)Gh9N z-wM!=>^5An-Kn^UbeSYw1$+GAeMTfgK?)a6*<|&i=jfX?)Lw%H9Fjc5&DKYG zMmhyRSV;F%z#51W^h>CtNxWGfO5fA6BDR1z9fhga?n1P`ul z_d}lxJC%3Iy=HErQ@z2Fn^d~T6L<@!+dDz3qQjdXyE@kFI)jV{9Nc+xfNd-}F zIiV?;&Y6D>F&pCA&+%o+%=sSmJ0Tep>`cq;+xx5g?j#qf)u@il)yJ#DDu8X8R38{| z2|1VSuGbdt5;JU}it+GTaLW5#J?(OpKYwtcK|x&`V8g}D%GssU7X!VRscNFL&H%GQ zm+g=~3AyH{9e|WdAG^XmGQ?>Wk$zM6O;roA7MdX$_&F-5<)$sP?+b=f-`OJJtY&UF zBFpOHMM`!)zU{RugMO=k3s|Rpa^s3rdAE$^8O=(ARYU*bu+-ykFZrIX#X*gn);KPyM3%t z(Ql%6^419(_6YXP*9Z59j_0CT?kLe1{UttIJ;L&3F>z^cWecgP838}z5YJeQxHnil zv{3fijOFMp)pqvo2M->1x$E_sQjcEh9fBw6ZJy4H0FUxhSVfG=b+2E#u>2xPkZ>rb^w1(cy2cRt=?AC$#-ItdD2+n5fBhbv>1snGXp$cDG{6> zczsNM2m3iXo)~=RTt`L=N@u_597B!`LTblgg4ca(ftPh(AS?Eup)T7eWpnAhV6^8E z(zIC1O(DR9UAczulc3N#Kj;A&m-ll|)t}#Er(>sg6`Ks3h|gi@p=eN~a1bh5i9txb zZcwB#%|{2hTL%*I0O=kFw9!zJBV?&@x~1VW%vliX zzzh2CzE~({xCTa1AHFMY8*-T%acJ9laF|lc(kK3`-x^dbrE#%nuuBcpsuBANd8P%8 z=v|kV=?|I0rHSBGHT+H1IfWIrepK%osl6u79;%}MkB|3K_o9> zU55;T9>pINd)>2cF})>$#3bq7-+Jw;xR%3Looj$5as4sO^sy5UO*yk`HxG@(k90tt(cf+t#V92 zfQidy3m1Vt1Rb&_B}y5))Wf{)WPq6rD4zNzXV_JR%4V&ULK6#ywTLQ4!&|dGJo^|( z{cu}xv7VRF*!hP0rt99TW3pNgTOY0#A4JO%M)DYrQMpReuoW8MC|zDlDuE~)rc$~f zs`>_)#b-Fg5))BBb9&p|bo{0LSp^kU_0v7?!%`Y&eI*BPo9`^Y^tuS!Kh-D7x?xc7 z7YUy>Pyhn3Gt6G2MZ}3>7u2l(&=%b7<~H}b@7_s>peNsM+|ujH23`zD-s}p0x0f2h z5eS3~uDyo>vD?FR-x}0Eaz~+cug?PA-BxJ+>_+k*dJ&gyBt6FVBn&0GXCtQNJ@~)9 zTtX!D9NKecUCG2hN^u9zECic0sK(;+XPte^_Iu~hH-H?~cj#i(084fx<6aV`RpN~F z^vtXd@2h(+>Dllg>*Y*j?<$X$y2Ar7U_O9#)Q@pmU2~4szJ-ar=xqrFD_Xv6>Mp>< zV{#?A6fz$;3A2@TD>(mAmIQXcOcK-G5my5btJ+INLRcy1f~`?NKa+w(JHr))lQa#@0i@(J%LI=S!Q(X`|OH{I}qTLOZybAp7c+THWfX~yz z*YU&j?Tk?$%3Q3HvB?P7_uSEkBoNccndF@T;Y!CQ$J^pHX;O)l3_@vAH9R9{14o+V z@%4KuK1o)@@BmgmBph09;cwDl8COZa4{pS`1Io!m4$?B&}PoM_N0lm7=#&-sJ^Q%)jg(teGCf(8vHfj~W%7z*ai9Fl6l6c&cV z<<%J+177_DTL~IzcqEu2iHq`s1K&e-#i`ggc-Dk*?!Nh&@hF;>z8Vz?l3$WE`A-x-XQZj0vYY=sG|G}UVum`*lX(ac4P|b3U?4;t2y0Af(PR72FoXj4(_kW88G3P z1SAF&hI>9SXa{p*lFG_{F_G&IHX6Z=f!`3zyE8i7{(2L2L4!n zPC);~DFH$gDSAv?UgkCiGWzBJ1tlT^Fd zPj_0TK8HyUhoJngDU@k<5BQ4=!(*SD>U5(3nYk9&=YLI;) z`Bg>y?2%AVBhyo+N13lMj0lhoGsXN2YN7M}57g3RZBxKEV0BjccN6ovSQ*(LiM!UZR{M{OD~n+%1?rOElfH#FCSctZU>g;i54;b;97g{ z`W9;QBCZ3S1~<&7oOJqCJ;r5sja{8?Pfw!ihaSI=5A2Pm%?uY!<}E%Ead|&tr;hv9 z{0st=ye!$_BR^|5syp?+k6I3L+Y)N;^S_Sp!nyNs0xTuf1FGfFulN(lkFS{S5ADTi zfuzY7=tU}i+Mx#%fwlC`#ntML?nEV;V5{M~3h`v_Fnbrs#IF9jQu zGU1C?@=L!hm1Ctnr^<<(Q~PLJ$z|BNoTy{G&q-EHM9=VA{+l%90MDmdM{cE6$ejxTR-(yQQZQK*Kg% z%ijcdy|(79q1Cyv4dnBG1&XYZFvXcn?6aw&++NmZ^`z9Ze`fRipsIXC^>*J_{&YA< z{{OJ`6;M%q?bjlbQW7HFEeZ@RE!~ZDcXtU_y1R$&?rxCol5Rnyk#6_~_4mgA{nlR0 z0`APY=ia&NJo~AAj`1Mdt1UydDN9O}g-stC!>00Kl*@j_w!Yf1nIjTvU;Z1>o|bYU zzH!V(U3H4l{^_2mmWn`3Aba!_+g_iW;r}a6_A15$Z3A7S;z*+-Xr?z2;NE&J{Gvn0 zl;PLxxrUb)9+LnR(lgj+K0i7;#B<}Jp`|I}gx^BLrr5WnWaAtYq#mOqe z8%Uu^kp;Xu>EcYYN9p55IPegCgj{7AWvO0av3SfGb8E4f<7Z%1M{fwWqFPkOF_XHn zP?u&NbFZVP`g$^Mmy&3S$NlIkS!elOZi==zS1{$z*V z@-|G%JLTqPk%;Q?Gw=1@4Hd+#QRK4A!rZJOot-fEM6W$3*v%aJQ+$ArID zlau_;O><+7xyekU<>q49;nCw_3>c`Fc~s-T^<>+>I#0IrQn+gKPVSIeT+6GEid2xA zv|e1J6dsC|vr)(cJQ&cEpZ~}~6?XWtuR;{+8s?hk!Qg$+xmNmIJu_3&)94-WUAu5)pqJtl?RKZN5+>=3`O-VZ z%r6jy$w7}5;Cxa>lGLSug>!#yx%3L?@G1v zkw1|ngvB9{1Ka-uZ}hn@%i|`2r4nw%fX*mQn(Nc{P0Dt%DXT@sgD0`e-4yK{M(_VA zK;8L<4I#u@PuXOn$R=|N(VtH(rzbh&eF^$x>L)(~7c*(D^GhuTT1t@d*KrcADiwdu zyduPb6xP5$PFMkM(jg%n;Wkf|H38=1lppLHgoE&op68p>rIv}AQ*fZmC z%wEdqBj!V*xfh=|m@%uL=l#-TZ%oM-x66%Z^$}yk(T$ElSA&X?MQ|jf6oQ3EHy zMHKhec6%fi+wmoP#fMHz6A&lMLYw(@N$#zEACRyC>0;hO`Sw~ZQ1o@6?}7jyc|*-5 zZdA=C?$ck*vg(1Eb!cx2O+p>wama9>g$0`4nZ3j!*JNYLj4FGH24UV$s#M5SxI0Y+ z^q4OtasFg=6OuZEDV|q6A6xuP`$Ul=IC&zmL%*PKS-W1e;J5%QzgwyI zC%sGf%Hg~1Wj$*dj#I{cg}LDH;q{5w8R+5E{7#B@BzJC=J>#B8@$U+iLy)SIAnH?6 z*+Usg4br*}q5Cj$bmQXUYK(#k5a0jy?Q7DiziqR2>4i)rkY?`+rbWa?`BUW&m#e5M zTIpq9XiwFEZ;+nZ3lK-9FC)`KjPNTF;gQ|oxv=4Zy4Tl8JmIfQPFaq7Z>pS6PjFgk zFEUhw_*tk7z4ND1streABQyvPDLS_riYOa^3XS}r^TOHr@~C)nLO93eUC+7Q=J~n( z^BX!uwHVJRwuq?)+jCA1C6ZSjYI`pC>lzC3kg5-W^0WsV8dCOQWeVm@`K+r-q~Z2IkLq3zPTHFsH{A*zbDQtr<}OG7Q{+cC_+arz>;68D|0x zo15kwbQS;gGd8!I|SmlG#%rl}q4?XMe7c3#s4z=#W$s2K$dKfx?C}mj*C$B4H z6f_`*FhN%0H78;G>3z&`sN5O3ApLx50mYD<#B10jZyW=&gd|4v7}!wXFDP~qA?V|f zL<59-dqZL|ke2%zVbV08r44o`geP}PoQ^GN0#OCOCfbs5K4;CzlawPoU@ zDj0wspn@(=DDG(-%SGW&L%vl;`J*uhc+E%<8?!7g`SYLZF{Hg5GqeT_Cw3k5P-~2d ziK+^Q27oWhrc$(X!wgeVsTct^|Y!+f%V zdHv1mlX(q%Xqtgp?|@n`v+ZBn?mk6;xR;S(!GzVHG8w!?T$*AC2-8^|eo>Ch18Lv; z!@^HGMCL)0pgPYy47k*X%LYfHOgccER}qDrosKJIhKg0e1@HC9#X3Z{ zvmi2UyupxM&>+$qgt~f79rEmPA%Z}~w}Ng_aXV762p?BA3yXqb7e>Nv=mYEB?KwI{mu)#wAQu zy(GzC5!pic`GR~)VSwYm!U`rrILON@3^;dMm#;O4CwjQ}Qz4=6y|xa@gLVflNH`&$ z+^^%MmGxtG{9PG*zM`V|Sc_Xw^rQz1tQGBlb?vt=*4F;l;^{jn{_uaR_jeiqf`3-e ztq5@ogtRPFHzRSo-#U=(q4>l+#RQA=mIKk9Xeb}AyrB!npLvns``d_Oyn(tnwveKF zJH_DJg_id5V}m~letvupXYFU#Bmz=f1VI7KOqf83Ys*Le4eL2+r)Nb#;O1)#NZ>#- zQ?r1sTUG`BcNGpW5FWMmaV#+keMt6aVARZ>`AVn1o1N81?$NmC|~ewj!8vV zbQ!es)f^;20Kkn)#iaA(ee9D}(I*;|N(_P-GRl|5lYfk1NSj6ctK|)l*9b zY^totp#GJbSuOj|)XeM#BsJ4c_B%CWr`@oyD>=9Gr4D6_TZ4eLcdX$3?}*p=2yJ(r zmI3<^8qT;69+szUcnvX@Cq%Lk%QNF7%FlOA&P>mC;T4uAWE0OrRStQdD_9F1g-?yc zD9T9R@c_ufPDYPX^5*%Ih9VJsMHN?x$smOeh19#fwm7mMf9i=WQl{JCOn>A(Sk&06 zMYRYpFMXmhHLSxnBU6-X^iorJT{pZmDHWHbpQMK%1O)>p`_@L1#tQ#qj-4chi2UE77z6bk^LN8RSwH2rwoCc1=Lm0&ZPstR$rBtG=7 zHq|)!m?KNnLi9hriPOdz&A^7~soRK`_Ms_h`;Zi+seDxYkhNgFHwLRNf1m+haA7EM z*?a(6XAsz`{$=yk!}D&!zWT$Qcg;sKD3fN*X(wg$>b8xA&F}ZkP8xK~Vhl?;uT>v_ zEDQzOm~OSNK79xnB-8E5qP6_4H`OVyI4p3jqb8C^>#GbN)BDc}35Ey0Q%nHqZENXK zv+Yu3eGR#isv9#%67;JESqE-PgA|I0e<7}`80;lJ4;I(;?6z5^?YU2)QrvDsj7uK& z4PL_(Fuaxy9Fpw5D~KB(@dwnrAeb*utMrv`3Ng!F#Y1j=h&~}_X|ohh8rC4UUQJC) zZT%2p8o9LzT8^INa`^tkX1tI{zO2Nie&AOX8|U3l{NqQp3(j-9gQxyM^;-_ncu)ie zKb3XFN=mQd_;`Ag_sA=LE8@Ge8yIE&)$mO3jK2uZ^#**gWcgj?_?;&WX<9+e@js8k zqa8zP+>6z#Kwa!fP|H>Cn;^oFnd%u3u$HJJ{TQcTv}?!QI1@fBMQrj#^!^LlSi~%= z)GvsG$%x;xhRNw}X@<<&+EfFS!Pf6rF74Cts0sffO^=4~l88F3g@%x35KxONe602J z+8hu(`ONFT>Gc;h@tc)MnPp32X(1;)6&stO&30BuB8V!&4r2l&rx#qR12*-i2jviv zKDgiVgAf72PkR20UZ=@RK}nR|!<0Qp`)q&2`_MoT`967xz@(O-B)Y&PsbCy-^Cx-4 zCm;fpMsNAKQy?E=?H-2hk%UY8quuvMy>B$pKXD*AvC%hiJ}1%3_>a=zZ>>XN@i$-W zsf=*ZK*^Y(U&DNVfhjrs1{vDsuv?Nq4?tjPIdGLOkT_OLlh5T>_2%7N^6c`xE5PqMD@b@KQ|9cYN zK{%JIXdqV%5dG7QNZRKDKnvo5Ntk+&mU25tOL=boV5f>n#`z8QhE>rP;+?K0uwIs}jT)XKhNFvY@FZDti?^PJ|N+zP`d-Ukewku*XX@$5kb?UZipEplwbfUpC~q z@R$buzM$08UVlEZZzS;)e$n_J@Dj}*gJTaOF)5*)>-5067m2g><*A0Dzjo!!QSFAhA+ z&tPM=OvaP1e9R{^_p-(A1FkdH@RDR)t^9bl8sn}U)6}<`A7yrB;DrJr`hKdg3ye_+ ztcoFd0Kn|(ojUvtEuIAOcCsVk``XHQm?phToV;IOn!Yrhtlq?Os#do!ew zcV3_ZBeGyt|RbQ3^yRVpf`?vp?U(xMi36b040<4N}jmP;azb!CI%0-3~aVr4-U!^ zm9*!Kru+JduBWeew($$3Pl8j^H_AU}T++P@1vx|tsrYO7~z3!r;p)wqmx!lS?6j^*p zXFhC666w~=^hqoYhaRJZ?}5Gpu|r(9LLid#8J!S478X3605`63+CJhW?v%zGi>TGK zB&=RYL>&S|AFQHRK!-R=1!<&!j1!DlRB3AbbuDTR^j}n~=8)kivc4tQvC*?XHAJXR zT2M`dO$iFvvi^kl%owH?CH?Jc3e@Vezp%hum3;x?__2X!)>ar#8ElW>qVQtH;hFV6 zV0~%*#t(CCa$Tx9(1+&R#UxS=u>5S~4=mn{h(h7jONfAwGm^MWw{YdnzZm@iYlzVs zc|?;u3+9byBb(x&NKt6!Kd9Da?qVQEOb9np;{!ELB5nR1?AgfEaIn)R;vyjKj3fy#Noy84+82rL*1f`KF>UvISz*Kwrm z#9t!#MN*L!mE^4JCdZ8nqc-fcovsUsFRd1$#{~i6k+T>Qyc$#k=)b6zGss5s!Us=A zA+xP2Ch~&us@C~fU86^EB9Z@M#3%|GOEw_yv%yD;Aj?qXIflfl0W1s7XRQAq8HN>| zKg$Lu-vSF$Rrp^mgqz> zX>fuIp`V_a*?*4kfs%zliUO=sJ0^KBzrX)Tj|`l@NE*q)$z0zaoScxvHlb7jb3p&T zolm!Po*LXK>s0Q`JO%qdUy8q7fv5r}cn9kD)5-Q9PbZm9wbQjp9uza=Ig{;Aej4ca zU~j=B@SPKJxj=T(%m4fJhZ<2+JblMFzo+2U@~_DuXXA9Tj7!d&Y{897mN7%S{_Aq_ zgh6Wj^lOl5W0+9NfORAPJqK0hk2L;j9l6;_DF6GR=Ty=&?}$b;oadsKJIFRnhG^^6PLF2@%Zmv^=v+#&69_R zgzfCx+^!0hAX${Vdg6>z;Y=w z+*oOMx$eWwRLCj6`Q6a5#@<}v;$5SmXYb?NhYH!xS1zBebdv>jnk0!^dSmIJrreV9 z&*fiQ1a(Msgc3$#N2=&<_RLKU*A2$CV9HQ0*LbV)d}Wun&)MXs^R%ye?m!Xpzh>kIaZj@`pNp$1c`DkyfBUM)*P1m05d!hH0=+ZB zs@9iX(T3M@mvfNhD#YqUV`L<{I9yD{7{;B`-!SBODG}f9&=~Q`0Y(_)7H@;3*xl@| zWunsHu4OvHI>N5)vd7 z>06sK#W`}h^0CV=^Ib*KOdHFLQ`tT2y+pQn z)7AUlkEW*WI7;zi06S}En`b`?9V?6poZm}*GKUotsR!Jh+Kf}(Eb~|I2|}}Gj4|FP zPd#!u<54~X1J{eN!+RUr`MhsF(4V?a@q1?=PGV*8qO1K_xO>08<2d`7=F&-44vTz5 z;*Ouq(}x zIY>YszkS^S)~MVX*Gv~JO8z@!EcAm{b06e|STD+b$d7*ldtKr9_9dD-oe0Fn?B~lYw;}5Fk zG(Mtv?e6~Az#X)FTUc7doqURQ{tUt){c>7>qidGFISP&1u_5-l}PcW+Phs8h{=%S#&8?_MsVs7^X z7h*EX{$QS=Y#lc`K%$Q&e3|eP9499mVq=he%SdGXI(oSI)F3v~Xj4I50)*9H@~>r@ z0X*?S-XCJ4>3=WMRi^(zN#J!OrT$s;0Z=6Wf2{gl6!`J7od3%dARK}W>4`&_LKa*x z5X*lVgiJ~SsFBz(BhLRN5jLa0NrdD7T8dcG-)sQ*O$Yvy{=6Px@MivPE1o}Dg!$xw zWR5@F;OXLACz-ow6k*;G{GlwvIDh#M()h5^L@4@i@-g-7$<9G$^AGTZK=|ebFc6cv z^V?qhhe-t>HWmN3DXH-?I>|{&*c(cIg>OQM{J*vY{(SP9d;50zvC;9H_1wTj`2mVi zFB2$q_VC@vN`XSUOQmf$QH)f^VZ>4T#i(F-c&)KjplR+gmCTL)QQiyzvYGSpy+RE( z>>0ypj5S>Bmq|%FeE_lV#`wJpzmRzHz-<+7_41Vc;#R4Cy7o0bH>8VH)tPtOe%9Ri zR+H+wNXmzrinV?uUmuJnh?7mxJ1AQ2&ZQjgE~N7#XJwD|3#}JzI-wG{)7Wo*ZbMj3 z(bYZj@~X&gg2j3IU~$Xc(0AB%cZ7QSYCY#VpoxKLHW9r`69`2N+tJ(qZLikMe%q_c zCws*#7spzRucFkdmap`+I7MaIEsnV;R*|B3*GP$__`jDqhZL57o2z3t$o+XZ?lB)@ z)|{=DPHAiWN_Lt)R=R=xQ+mvydCPw9tfzBlU}s2SPiKtt5YPfQ7(JYr~ zYc1|L18^S;&gWkYZ=LauE&B(3+0y1=NuKR%mj)P|)V5CZvS09H<%5^0K`~+lp$T1!KW&XUl{wN<59kYkBN~%lB_K#qhs&>XygSZy zy@FUs(}+qf@XRzG()*Ed<5pHe79>Iseg9|mrqk9X^;=XQ{4?(u*jp>$%GeI;?woej z++%Ew*OC~`f>k@sSKSW{o$XvbJuN(TF2Klr$t%^sqpBT(K<3%TaigCldSy5|PFJzx zkGv!mvKPI-;Po?%_{7ou_1p12eRDf<*;+_?=kz&}t8Uu5x9o965v{CCI^6`rui3kX zB0U>XZD9+A+_^AmU1Hw%mMpObVI%5z$W)_YLyjTe>ukRxZya%8^%Pd?EH}?RRPq!> zEmR*2NKV=Lcddls)RbhhnIww9rA?o~cBvKbU4XN(Ghge;1YG=7zB+26T$B2cbv;(( zxW4j<@|!xnJqTQE7q!*h+-x2V&oB2&23Ix6@hV^_7=c#dbFc?&nVqfzZ9CP4n6?<7 zr2mr+t}Yp)(|W#qvA4yxQpI9<7T zF_4QsaaByJo<#n2sBC;%Y+R|>peb^8s6}ch6bb%%UiVTlgMva9w{X|58A`W4XVf>LyzTV+s0m#w1+NPdATp}h zwQ1)5P15_&uwj)S%B0kHHOYV;d<=9gy#~YMt0`HCP+yzgVKGAYvND?q2`PT0^^to^ zsl5e8_sF;(8Pv|jPNmU`yi$Ua`gxI45xr*EsM>OyL7rdnFRWAD$%u-y>$3Ahhj0m= z^u>8&|L)?nsdmej`4pRrCftgKl(TycU(=S}>4D~1ZJt_B$5FNN5BWg)GKsA-)g~^$ zgU6yJ$mvi}2v$}^-KzXL@^$A!?Zajjk3Dw0o5_CLJLeI84{&u2G0U{fS8^07BgUMJ1)SSX~A zj-s9>KO;6HHdkqogI_-rSGZ$dbDws;MV2^t?(_R@oE95a+~IS9?m)K`?C&*Nfd#J% zThZ)sr0=E91e&bglZ&6`D)*~8lp1aFlAPxVAyJNm#L$l~xmW;@#+KirHTVvNpJibSmS&1DKa zKWju1%8~FzJTSKjJAZrA-8eU^Gbw=|7BO zIgk6t$o5yZFVj%O-#d;m0?DJ>E*CDpt#1`A2GFdZKph0QESa#AX$^quUMwcWOCm{v61AaM zkXg~yGY=wSa}6jKoKrL!fZHJ&RH33Wp6xn)nb_hp&>S`d$LO_%u<0`_9Nl>82_{jJ z4%$NJKr>kpmXODy?2vx>ggyWCfY2#T$LJx)0Ie( z*NI!9DWu=oNS&oR9yh4jdZ2RY1R2*e6c zq&5aEzVJ1Qe8u#kSe{Q<^zNZV^u0>TD|B;W^(1t3@Vs^*3Cm??WL>TAMBQ9O6#@u| zWPLQs;H|zPb6h~4=}sW>Khv*XXRL$S!rApPgKI9*+vPwyMcNx_`R>J!Eni(pp~O~>(uAos%789^pG@wmB(|N zAm;FP_4dFzT`LvSh$q&n{_@2EDbW!J^pRH_$tN5{%bS=C;c7DnI$_h1z-W==SG7Tu zIKu@&ZQ74qWZP%62#K!}0zz_(Jhjp1@cAvdfhM7w}cRD3e0Rf2co&Z zy7bTqOsIp*g&Z&0EH8f~Z0S(*B5B&*^|*RurxC2UWPdFYwXDa4DJ8|GG3$BlBY3~M z=baO1gCZa6sA9DnLnmRkrFO^DCD+z5X2Zl^Muov31>+Gca=qoY4gQ+)!?xx9Y_HH3 zkTwu95V+72=^xP8(*#d;NB`S%Tf(VE&3z_r2ma_%Wqn1@id5U^W&d zErqAV*FQE0-?dCFMOG~E&vqk{K<;+ZZ1wvZmb`PM|OUy7jO=wl<0uO#NK1zo4ufq~eeAjW=LpX6V@y z_t*Gnm(@>TeuF}M{uc}6h~MEEkueon5y1(sQV{IoyC&~c)1SFCtZ1z?!mdF5#r)e9 z-8WE2v60RVk8!!{1Sl;ETt_vRUd~_sf;Gf>GhGv~?D$~#oxn{0@D%0wiYoLGpEBw% zl;0RNI!5V@eRdQZ=8WsFIlRrWOu(X+(s)YrSok;`kmUSxfSIf?esKsCnGVhM2i3Y< zT`z`LW5bP`IzSw!NSmwA#{R(K&6p_iHCygR((7N6ZCq1cceraf5CAx9Nh9BJycze? zX$i*eo}~>W850ArE`MOu<>Jo>!==EQX6t2aw}sQ64wd!?^9*TG^3TU&!;Hay&h+;@ z&&DiXkI9B+nAz^QW!%6nboP7!=9-uWM4} z>Wa+k02yv15&n`K<$}Hjb^HZhFDR7HV{P(SlE8&hJM9|kzYax1gp((aLm`s@jqyDo z{rZDpqhm-qa2Fb~hw?kfH33^m=Rd|o{k|B>{~AtjYrFb1)7a`k2rVauZl)L;;6;kO zc?`LY@mB3DqOh5BbB=5U%+3RV$Gyvm;nDIl4`Soh)r*zHnRC;MpAK#A`3H~71a3ZC zR@FD$-SwkjTPO0|BSkR!0A#)Bu){H5c7GAwE_#YM&S$?$@;)Fo^P$Gi3}22K6A!D!D_I0ca*>#bcUIRBi} z$WIe0y$m<@ez4!Wx*~>X$SikS7#}9Tnr&)T3urgbo zSS!Oi{2Yv~kA`R5`*V?!l|a^Vz&4b^z4Me#ZDH3FhJC3ln-|dMw4qC8IE6DkwT@@7 zqbd+LlW!-2HTLvfh4WdxKi;2e_Gyg>c)!uXg^Svfv(0UZHmgAVk;VpxZaD09qMRhU zwCN_-)x3`5V?E1b{0-X~;dnromb06JQ~7)M<0Cw)3u}n3ZhJ`B)$qL=-PYOdPwAGG zjUcNv$3<9FcS9g2T7F{k5xdQhZYswy_lGSW$#@PkICin$PK3dqF?Xr$Ro{~fv38lQ z2tCntKk>(ZFb|cSLQxCR2TM$yKtD*;uhvPDoBm(#VMbRbd*7b!&Uty=-h2UJ1W+!0 zdD***+N(UY6ueawTE}sG2plG5d@{wnixGC!PrY9sG=Dyb`BN{Qzv#^(WxuD)eni_# zZv}6KuehD~$QYk;hu2$(K;&7Q*LK{^s8!za6AOo)D7q=UGT-N->^Z<^iyOs*LbEk^ zvw{nq>>F9#`^-PmGXp5cw7!d&$a0A<+r~bE^r4HU>|2jDj*c~qnSld#o*`t)4OR1| z^CICV_u)g~ohYpU7U)3QK97v-vrWBmyK9%Vx4t#{qg&}33I!JfzGF1eFKy~3^l-ne7#QD%9>)7WS z`3LcXd&Lno_BXEVkJ8Z7Ry@-y7tyKYFH$T&NY%4Bc@rwVlmu4Oagd$8dDjbP2(&7} zQxtix?uk6b26B@NzIEFpl z?VXEd+Y5|v)ynZ~NITyoA4}|Vl=4yOdD_H)HOE?C z22wv{1c}y8i~t3!I5T%LNFJE$$3J1CsCMQt8B4laYkqqZ8UOMopih5$6JdSP+LR$tCA^~L+Pj2uyG z+iCgMSBjmnlnXuBN*m35jb6!7wN|MdFw0+ z%X0c?aC*F61xCUd8M*p2+4T9`)du^_P0nFEcfW{Pd2lJut%xu~BFPSbHp8zmCHVGU zvSn#DRPrK6mnbMGV`C9A+U*e?>joB0YcnL_F@6yyV zqq8vwc-Bj{A9cbW7&n7q%GJu3n*5?1$1)Vhi_TZ`W|ajgma2;5S0Cx8uIcS#nyjY4 z%mK>mWIx`QF=PMs005iSe|rGJPac4~EyM$;SSGsM;2N#dbzOH!l^Gp7P=?6zZZeUd zexh_Dk{FV!5hPbH1}QFcnixaC3|o>w_sH+5!9ECXnnV zwclA$d`YsinW7`6;?m8(!m-x#B|UvwiZEfC8^|TkOf-1$G8boKJ?VtWk|As~d-X6q zuHpc*E>$`}sPdg^R3vQ_M>1DJMZ;GIyQ1ruF@{7-@B|X{FcM?lFhd8=SF${!1l=#i zNQ<~3NI0;A9uYjPn{4+gRFS&RaA5tmVnXgt2kzMwZhTL2_?X@^b`sNk>>-a$MpfXn z)B~PR%KI934<^ZuCSFUKn96em)q&xDLQ^N(w6}^TlWzrAJ+wB2(iM`@lgg!1qrdn@6T>;8F{kSIeeA*G@#JSDz9&2PG!eN|_=U_x_j#0H zSk^ZhC;g|B1`#5{LYa}Hke@WsRw6JTY3^{&x+6uB*uBq49D5ZH|V z9*fSgxUQo8i&<8Zlo^u?hRDx5KMC{={uL>iszgzavMO~#P`}pFBo=p%C<)Ds+y!Px zzt%Uu>L@yz&%yHxbm>g(qAyrT7Vn&L&&Uwd%Zl3yn`_z%t06z?GdFp09yUIu&d|Lq zMvMEf#|AJqK8jWu%*by|;TM%?!)*$#@Jsg9osmHqINM^4Tq; zFY_9pE;^z0bJ;;)v^wEPAEy3JEsJ%X?E|bB`&{Ie&J{OmXXqbR&yMTLmym;En-RW= zt-~cWGs0&ot^BZ>^z4s^{O_H}JM-(?R7a$N8Z*zg!?Tv3aG7HgtMaw80nQa>ebezz zbe)qj3a083cXM1On8R#F{XX&fCwr&21Dy$DtHh|dCmC#SQ90q6W!5CK=0%y?5M1BhCV!rIy>q0ShTm1T1+|QV45OB-MVZa#42pG_jrFP<9j4TF%1bwlhpa`0C zs&~fdOPb4hTYeCQ3kR%TK=w=b=(2gFx^-~;)=o`(kCX8J8s}v=x(wfZvx6t<4Nnqx zefSOXt#09%d$zR4_w(6QD9irzLJo;S`2|UI7U#Md`$bR5_S>TL<}}8cvg&G`PDkl{ zbyaZ9j@@;`G)u#@0(U?Bjjhn6h$`(Mp>e#)ZoW>u4iKNqGQ=ULUrAh* zZ*wLG%Pp9)tryM{9TP_&BJN_Kqo(f zMfAmY$maPZ=hkD))`f~Yto&R3&x*V*s(}=*Dso2Xy0gbAU7o9c7N?yhKc^{#UzF#* ziB&v(_o*5Q{N=scc`Ja*!oxgE$PC4-JB4_h$bO3XIz!Z~i-8Q`y$RHywwJg^1MO>Y zLK_-tp6B=DN!&b6uKcU+ym_y3!9&Yco3R3;%q#5ZR0d|^!Zxp zn}Fh3n*a_Wb(ex5PTDa}AV%QSE^XrA2sTx)>1*3bH>~dlill%KJIiWoD{chpBLRLb ze+pj;YlU~=3tP7WcCje_6mtEdyCio(+QRdbeQxiytAJ3P&!7Y+F^HXu&KFu zi}jZ6lHsL5|0b9@%iI_zXDh=XO!JWpBE(gJ*?jO>9RV z4a0p|`|fK??s7@&%1)rLkfrj;7?kLd!>7VYYvn9jw-WiR34~DH`shYw4S3CctK6%D zq;r9Vt6ySmrk*?(Ry?j(=Q1}JQ~A!;z(Fm((wtSU$?e?N19ASLei6?yen<#J$4IaF zhX`4`kSFlXY?DfXlw`l-`8AE2XLL4fzl`(=S@l2!Wo`ly$@Zi;vIbwFzb|*7P`}Ln zMTrS$Cin-{0#BWs=hx;n6 z(xMh%e&2d0OEDpT%lP6QA7JE+&SR3UBzzwPtY%;x%Id+;I8YS@41iflX^IujA5bG5F% z59~XP9W>%SUaZa{kfV!Fhg`S(<*UX9)NuNT&^@?wfu#WN+mc0(2a8Zec_EZp(JCNo zL?OM={oQE=;TT@`ce(BD{dj$_gm#k014+iy=;nt$Yds;W@-@IpE=$ z#%Wp&;_mF;w6&SXYwhf}JRIiMWk8D~ekWH}lk-VI9AT2t*%}F>&85pa;K_S&`nUHI z2rOT9vDvSTvjJ7gW2Q3aWo@9N^@WDYGaTomC`m?;Gh`o^Z;u$baQgIjk7bHT@PVB% z+&^OxN(enichVDovWohFwZ&{~G`pwET223%#qxheeK&R85fLcwUCtzUF{pw#A~n2`%M*tE58{yzGV1{-HXAAuV5{ z_44}r_Tr`W`(zc5yXMpNUpicOB@u|~zCnZ}&3*y7H^^iOEN|>!i(rI`RTOGCC&k(3 zF+Z^?$kG9fFtB;g@}4ObV=xrfC>2lP`5Sp-I&4K;7a%DWQ~dmnfFC~?pHQL&Gd_m> z9ZR_+eD{1j6j`3%zw&D>yv>%FM16l zW$W9`Br+9RvaOi83EmM(qg9N|>M7p~E)pr9nasMxLcv<_x0jd!3dTFn!QDYV?75iv zmOCFm(IuNECwBPxEll2hXcJwC71*I8mQAkiqrV-t*RKf2x%BEiHv5!TdT zSmh?0BQS+fFnFoxAZRdEyr_8bX--ThXYw7epHuhJ4`HU~?S3L&4%6Fx>O#|bY^NO2 zDA)REq10<84U?_Zw|c5nPD&~{Fm$6W>Z{Qx!?+1NrUw!h2S3EyaIp1Q(T9zeDdER%S};Ru?_-NX?Di;};gQiD|;nMCPhJyzMbXem43{DfIqhS8o^Z6xaq zOgU+Lnxgohbd6*6X{XGx?ar@Zd_ecg#Y>gP-coFXP_ zzIsnDl^$`<7z0QIXQlT8{h|4JSeEBC=PfJB7YAImiHe0c>d)nC<5)UJT+~U1?_`m& zM@(}e}(#2K-teRkfqT#|Dnz`w^g}9P_#Dq2F2s=7c zPL2c}Y~3zX(~}L z6a^7}=EAts?7Qb&;+?l!Zc7cHRTlehH49`^j@-W5kxCj5u1zc{h{@ ze$oD-)hpBV!<#73L6kq2E&SfSRp+WL*;!x|hG?I}11CEl7>$(}7p*$Hd#iL*blLiT z2d{t?-bm?-DuoErcu`7?_=b(`*Ic#QJL-a3bF5Cx_w-u){3XNZK%U}8kDkzkSr4s~ zz0t@nRrG4a2jiPHWHU<%`A(7&0b zD&0OXTS^LlWBtTYmpodapB!)TVYyg5d%j-k*C$FPnfnw_&PcoJ3d}8+HQGzjJRnr^ z76lxtzwo#20Kn;@2YqKA&W0W{bMw(131x5H+7>DZnwv_#Tta-*biP^wUkIM2EA4%4 zt-SH6oJJ(I#f3KK)HmLQ^>SoBwqBX59GP;ORNM}9+!kVW;4qPPv$|4+)xJ*m7^iDiHR;XN|L7>Z5olD(srS&qIG$ zdkv4t%CLX#t(aL>g}~=ShcFzJzL*KkB{EU2;X4R5uy99)!lUvKb*;pNstz>-|tE zcQqP&m)~{`*+t^rL)U!ueWtm_p0d2NWV+x4JVRT!@{;H-g?|1){q-Y;eDR#-UHj!2 zkm}OvTF=1!h}2@Wh*aN+x@376{djY8yg9Ve40Xdd+SY#1%D8>~@9;iLLU!Y#BbcR% zPEcY$i<7K5k+E?I%~}bww-k{A-M%-_F4+P*s;Rd-4hy0o!|-lz3pv%uuim9ND00XE zW40{RAH^(jF`elT``RfHp#~rk@bWCHS#E#(ex{rdWN=f1OlDv$|> z4R-3*JmZqG8h@#*l);<8!cO|zwoxp&@S{)V<7CF~^fnAvKtTOdSnE}w9!b#*UA@&( z=M9KP=fN=H!#x5nkOp-f!Xz-is{Dh9Zi(#?(e3-{7`=tm6q!-GrHSfO1dAc`F{Ygn zb!`NjcG{sC;IPAqZr2hC*i<>W4-oJ-FjOGb5%uSK*u$Q9xe0Qq&TyfisAH_>!h z$L)e-sybNrE6LdNlegbNnJ*~Obf4RDzVrN`o?P1DzbFD&HDKZIC|Nf26bZl|*Ds-q z9}ET7vA|uJ z!Nq7q~(Evjz_MBO@!f4qzhQpl5Q>BxULEF- z-nu(NSE^c4<{;8f!Gk4Y*%Ezt5g(R4-4%BvcTvANr1DR_PZgdlQIy{{^8Dy|6GDCL zkE1TgPkm2|ScfAYp(WJGdcI0=PCJ;qHxTx4fBf@$^SQE|4p#0LrC5$kimtcL{umT@ z)YUH6egF^Tg)waU?gw_P?zJIn=&-6Mqp&EB$I{75@#Z^HGR$_1Yazt8{Suz4i|_fc z1@W(Wdx}5(f|usYWL0KWLU>77`T9RAX$-lham5S_8BP5J->H)zkoBd*q=&LdWY0P{ zts9J6w6waMLd%o^hwHB%8rW`TfQOUL+y6({TL#CmG~1#UGcz+YOBORTGcz-5#LUc+ z#mp>=EoLT*EM|)>zT>^WbI&<1Zp4fHQ|g+o%2rHIXRlnj^45MXzt3smvcAQP#$a<$ z+SxK!Sx_{Rwqm3p6*=`KvN=?so15wc(+A6AZ~gnXG#l-6_?C-Pt99HJ#pXzDuQ+$r zVR~~NJaI1wYx{w2Asswu?b9&1117V^?}W%r@FF7(k%f;YBr$^BsUl?=1>%j#_s!mw zIbmnm06LLTb_0LR&1mx)KSsz+c21id37FIi%5)GQzrl$=FB z#J-D)M!_U5UDB}#cTi$CQ4%F{RJLk3r9!1{E3Vr4M7>jPe01|W) z7+D4yrET)MX#0Gk80RFpM4Bb7C-7*xISneFWYo?C|J z`3;F}r~ahtw#+xrI%WBd+{}TtUu@T9ZtqPLn9kByGK}CfcSCXV)Xx^T-g&5MiMlZ* z)4Vh2ZJl5HaJy)RPwr2^YK8}N^ge8z@AgL^mokkiSC^Ps_w7kID1#G^hf{&>2}v9vUt z6+`m>RM+Z^(n8bL9FFR>PD@L-ypnch{!PdYSJ;%11Fa(=(CgmAxl;t|2R8#A#3meA zvMRh_%a0~jw3bCIL09<$NdQd@t;!Y1S|>k@u$#;x{x}>vX5Z(K56b3@gu!2gz$nC= z@)yU2Rts#}Wj8fSDbJY-EHwdj!68hXBt|(@6M~?w`0_wbE5uUq1tNg;t`(7nATPa~Mm%f7zi@Kc$kWEdm^gJHvz8NAg7beg*fpmM}Z!D*9=m-4<@(lzc zGe0M?jw(L@*(>Mb%)C^KJfS)d8!eLXb ztNmC%CI@!xG`NUgsRio7=sfxn8i#H}v_!r$z-pebEL6xF z>r(oaL|3JS>K`T*y@updOFE^-(UKbrR76_msD?JQ}SmbeHFGSfN{^%6^6(Y{;XiJi`^0@8D@5x3GeAA z2NfEtwX4Jt5vmBwH=GohK6(Ypw_mYuODQ+spFgc7kESTm*YR^uqNiZKvLEwnBq&h* zNG|2SFm0o%7syN0eAjkYAkIUkMp%Gpt`&oo%Pb?;{Yr8)p8}qKj8?_Us26UN^80w0 z1h82kG;0aQPbG6FFHfVEX;Q~?oJk$){0%3pS{lEmp4hp;VCBa^Gh)MsN3(!&Dyh-? za@nY>y z%T_2r1Ni_`C;+qok0q|c7*>UIxOnL{urS%U7jl)X(hh6?q`;T5dI$QmoX0Y9)3GLHGzpNFIT`dR;cmGIQ>RC9UYt3cWXd3xHArOqM@jl!Ghv0XJ3# zy0}O>!C9MtlPCbR0FQ+X@bTEi7oBK19KO`_oO>E3gwvefXf6*OLzm&mK@rCM26}iPKm-ADCb2LF_Em+fZyaTuLl}19L3ZS&;3?>#oj(kU1c;QI!6wiGa0m^) zu28{i5dlq*_ndB#oVEP-n4GznRp;by=Faq}cR&d)e6CeXC)FzqZ5Rn7W8;w;bl`jP zzz0tMN4nyLEPR9E$qxZ0!3$NruWK35|K*i!F3RJ(e0mn;BTbOsd#W}cJWOk2!z_wK zv{KFc;)Jn9pIbxUOsqd>gJE!%e-uQ2K$1AuI9leq=DJYF=Ip0+|ZYQ=&pd>TbG4Cet@r8o+8+Z)x?K}YkTjxR)PNp_P_XnWbu5m9#J@p zw$Gr${Fq`X1CN440E4}2MsoL--2tbY0y39p_>{1l{GCGY&G#TIf9sQ)n{-oL^~Ku+ z^*)vf<1CcrpL6s5&Dq=i;5l`hw($m`8;Se`i~j<@03h;PXY)Uh-y;on*9OQaWX4rk zkij;M29Yl-Usis9u|*~?<}exo-{XtnG8&QXST~TQ$h>%^`K@ciSD9ZJCJ!|a- zQ;wDX!9yk27+me;Bg{QBO`{{5H>iDvUfc9_Sd+WeRu&6cWMEFrV71!mPL!s~37|I+ zyC$fE_4Cng(Uo#K-ST9Zvv_o7QO~O1ZBHh|plzX{D6b#JPWz8aFp$QfBLEM+$BV5w zSYl&h;k&!_Q(zP-JR7G+xAtV!K2zE3>yHxJXB<|9Go;B%J~AyHV(XX)MrIgux`Dp( zy-(}e>r3A9aDjitvQ0c*VL%ncH@fV86vW@HSHGi| zb1fF{s9Z6JV}Hk7;dFTr(GBWXT=r?#ZW47HOu|6!{|0aKz3dx%_~prQPvOwH^0TB$ z2)*$nED!Ofoo!gTcanVpiYW{J9cx+6_td>y7mm3sm^$?6r(7PkQ;6->g%99LUv20H zO5Uh4&OxGeyx|D&YfEx?U-9=(;y`k~94iJft=K7SX4hJ4GyIDGVuTlS{D%>)^baHa zr2IdOaL8PR3kyVCQ%}8|w)XBa%$$2zJ@UuYwfvT(&p!o6?x*a7@~Dlp8p~xBZA$8U zHhI@S0ET{>q`&G#)$RU6U$&{i4*%=|621%Cic1!^r^qN9{<1%6!)=XsTKlzjvdT@{ z6$?%|K8#`a;P!^Ph=Ta<)`48{Q%QjWJa`*dvO&N0`0bn#w~^I`1$LYLv!M3ZtHb)4 zfzwH}`uD4|j&%oD+HFBzK#YM{k#Gf|@*3N@8Y(4d&*ShuFMD9wi* zUHi{`e5rl78ssSM$K!TecSgbHsN}BJu2$Gr4R(t_)58NTy}g!r^L+V4+HO<8Gi`@l zlZmzICarcrkzQjmMmJA$dTBx*SA9T_0KdS;N^zf{zis3Dqp?2c;a>S5J>A0Bw)v(( znAGal8ruf?270aW;Ix`S`j|$!^wJK4FmvOifhNWPL#~%rvuJ6D52)M;I)Hif+20dTb(wR(gpxeYJt)YX(%t zWdH&_9DTLcWb_DpLyaFjT=Ce{JL}}HmizQlY6Dtrbn^4Z)DaU3Iv+=X1;M$F$9&G? zy_oX3dd}|dwiV$`mvVVBmteD*Rc)3IXpfbKHZg8p%$GoJ#!8C&@b{7 zW92T`p<7o(RlF4nUNql`av~{$Amboo3>z(CtuScJQf+X$WF4&;1ns0!9IfGOCM`Gs zuoBZG-lCW_CR=$bYED%~_eWDY=_<1Z`ucBgPk(;x>RR5O|Md0-+zMZ{1rUxE|Kc>8 zuiZ%$cWt6yON2-VZfqo~5tJ^@s*R~Uth<8r5t77IV(2^E-_#GBS%IuGtCVl1ugO@! zj3tO^Z^dh3Cxy_}_-7Zt5yYk5-leYMt$P3E&wz&69mBk>-@?x6VQv1R>DE}CS}Pv` z$7~nPNl8$E@PDaDE=lhM}cQIg96%sXZoB(|Q1Es5+NE>FVzsy6a5 zN85>-Cc>A$l=FyBuj;DVsM2gzwLhiZx8@@*nw3T+PL~z}a`?IBB{(uW8=5_K^$btA zj)w-GiUany`V?|{k1q!_{U2Y^avY(yK4j3gin!Xe_%pd66y!4$vOxqn_XB2&R(wa< zrms2y?tZ{BEYof~RNv|5RXW~yR|iiWJ}Up1QaIn$sqYUm)2D|oQ&FgpNB8B1oL$8u z#Eh^XNtGOIBap^lCbbrAX7Lk_fpn87d#||SLO|`)1jL76?50P{k zf2#uN)(v$KKc6ENSO|EO@_Wt zyx64wu8z2%1vryayl+;$nTEX{844@Dy>^Dx(pXFdY|eR4)4e7RtF`5Z0FHzcpG8VD z&%ftP-7`rtir$_pxJi8oeC?q%lS=0t0;)*0jmu3*E?wzAjCd^KxZ5oj*_HdMTeH93 z_{F=`%E(H%67Z?wN9OY(ac>F{25fu(X>)t66~1LTYAi0lo(XmMf1r@H=Zi+Or+!Zg zn}E-5+meodVaUxI+n#e3%}d-q7hul;c}eLST87I=i4YU9ycI^0TF7G^b?%Xh!4@~# zYEr5%cLT|R}UQaZ#Jxt!5>_Z|vew?i=4q;G*^ge#={G4xc zw51F3qSIjcP55YrCrh&_`8zCRTzj0x^!ggWjw+YekONsn&H%U9ft%Cky~%a7GpOyK zcbB89s+hWS!=LziOqp}2&Shyh_uBWpv*1;)eF#Uc@7><3w<7s1z5xIA7{HEG4&d%) z|5g9ZGQj0=)BUye>hj<%9wx}@*cobMN6_=v10j;DaWx%YVk&IvElbJy0}kq_k(4bb zImv{b6n+Q^1zxg5ZZJs@2|s}-Y^xS?iCuUJIF^x=k<=jOd@;aN}I0%s37; zDz!=$#_9CO26_}4EFk(m(tk98P?K;$x80xKr$fkRn>alLOGn+2r)-*?LGWzH?bUuV z6iu+y^55irYnMYkj}M9s>ErzofBPU{l|Z1qjDP;ka=FXNvF5|bt~L06=q-(N;TutX z%YYROAv7U0ow@FAP&Ud3H4^>O1MCEW%+#$^y{Mw?7A2r-{lGz6Ca5~F`e)a~dbXbU zIcWgE;7%(w6FqI>9xiQyg!;XnNz)QAafmQjfuoO}J_C>8uV$ zhpUL5r>DIpgTkto{h_3j{$=slxeVK{e$*vXagwaWw?%UmMewo5+T1~jX0e0zYGyJ{ zz)ZwU1ZW8B$7C-PF{2kR?m*Tur-dsnvgA#rpt&;OqKU`X&TLQpX^4$N^QE=H!;n%t zi$K3zG(HxgMq&10#MO0@Zxu(rJ3$dxxah^ncFE~nJC7Ip^GG3E{%f|iJk0Xoo3gU9 zHThafr`i$I=r;MsVR*5^Etmna8?a|8U=x_R2fPEDrivE;Img78MxK`2L#@tAP*A*Z z`OZ&-{?2^~<(Z4}s2jB=#A=d88$(gu`e6~Kky5V$T985`K;gQjz z-5(b*Q;QV)(rvyc4BJ!|b%S9o81>++vm1)DsPAQ%$?MCd{TGiI8pzyXi^0+W$himX zYWW=m!(bl@xEU*mW$I#J$SRM0gBy@E&hDk9wTMlBpMwY=Z;Gz48A{MIvX-e`IB~|4 z9@bd5QPhjv&RS2dn!4lwr=pK+9<#e;}?N)+6V-&XD8nDUZN zRWZcXu5W`dr<#b`ciW@%(uEWNkHYTxQ;)A4Eq(A2456DRkgq{1S#LsB>VJYHcA<8m z6n7gS(qE0?Somnqwc&7TL{69ihu$l}$TG$7mJE?&>xQL#wm}lJ*19$rNTq+C5x-BU zVit|$27YuTx?&b#xr>W5Y_MUfog!)lRvs@a@>}w#k+Adk=!l=yNGH7k*3Chp!7(N< z83ds#lprxC`iqU)M>UQeQNnoCs6$}Q6$?dh!eGrCk}QTe7jpIL6_dbgNC#NBV$h|D zmB_h|Akkr>J?&dbmFuv9ch&+L_mKo})<`PHT;ArY4@IA|VYS4WnsTvqO@m zB6NK26xtn=Zp7UAUD{pRMdh3KE=&z-bY`vgYP-p+&Q6)+ItRRsz$$n*Wp&7)DDu;4 zR%G4swB%=XoY)Pi+)`T6`_b&Yv0_20`jMNbKG0{;SV=& zncS6NRSVTD0IU!Unnti9W-MXX`vZZo+2szeXqljyBHtc1#jYMUgMmCc*p5<9cnS)} ziol#?5#Vr$pyLAKCv$SLbmJ5&IYxEiOQ*{B30jAfM%;#IT!-dWcMYWN=yyfKI>9-v zysaEdqObgp?H{oLfafC-&giOr%%1wgiUUZr#b*V8oMq)%_$^AgEix5yd0G@&v2MeU zLHCKJ_S7Xh#FZN^_tBpGb7Tk{6}5?#f$| z#R3d+Ya}{wb;s&Sb?M&&Sz-M4%cmY%_WoUYW5*3k&gFMB^nzW^%u|K|UdxHKNtlU5 z+%VKhjh1-Oshw@RV90Yij#6FWm{&CeziV|K4F&uoj z^;^dyB>HOp<(!fp9y_wegb>)G4e=4Su=6FmHsPi_Dsm|?9Wh;dlS`X`wsON3lo^DX zxvQBtNg@XDeV`dsdz_IDoCUTinR3UZS^*T*2^G0x;GW$d(%bjkb@jdV z;}>KZTa;P#KCY(mnuNM3Rnpt;>=iOPAgxnGYjVi@OX}lT@%TBg5mF=-F|E zuJf|%BJE8}b!Ql^H{T%{Dm*bh_7&{#@xJ;{`kcJh51x_y$R6v0CB2ug2Gq3hxhiId z1U>a@e@W}X6`5moxnbx;>V+uXOE1+ZEP23kPv z>FXSDM&*{1jzZC}em1e=i)e80IvhOBPoe%qdg@GsaB%Z4ZL^8&01|w782D2d^r zW;}H3A@uPmf{G1Z@6X;yFm;%wN|Qn)ks6}lP?rh#PRWHdHs$g>4e!& zY`N=tlI@%+3#V?jbU2%a@pY}@9A%p#M1+wK*^qzB5l-+4w?9HSUL^k-o)jh$^TP*{C`Ui&sXk+JVUD~oi4Morv48|)> zZ_Vkjq6ScMIu0u(=B@z$@E^OxZe!W9~M3IQ^h|J``GaN)oDRlyY!C%@=VrJlX zM5PjW)sp5`nq(DpbQp!1z!Wyl-GkV5LWxkITS%ZPe{A`yl)6`1@%q4Y^>GJc`77aYBQ5*bCt}3l9KX z1Q?l~K^w%HBfA-!c#Vc^FkEPD|H7bkjzk!(Y3YolkHF>J@+8yrj@%*ge}I6H}XR4MaZd9YmWPU zW-Mxse|%-HISzyp(IN6OvOxkYi46H5Ud%)t&nf?n7IigGYi8Ba5Ay$pl6LXc)MNZ$ z|3;2b9nrhcA=N@x>r=2vpxPkXS%@*0T37442WEZ9+TS=u5`7=BwFfAB&&hTFQq}R? zIQDM-RfY)}-h!5ehLfxpBVaM|bR<1K%82uI_$dsFi3y;5FLt+TYBUnDlUaWg`N-eo zye4=BO#{+5q-VQc#SP_%*+^OPxn2}Ti5!F!&~lzhQ~ivv#G8jubpi4bfAuzgi9y%Q z-50Ruqn=M9J)xs9l{KKe!rKXqNLk&pU3KR$kr8tcb0i4vJBf-5k<2Va^}iSPr=icX z<%*0g19J7+8#~?3Rie8MMR7=gDjRXHF(PUrC6bxvqcCF^ncR7|q>-Z|qUFav`<*zZ z`RB1^{G*nw17>_VjvhJjD<=pN4z5(+2iICSK~)G-0_M0mmHjLjPGJWZW)JvwxPwW{q4pel5H>Aiz`bdhLxLjKpIGQL z<0l%;j?7F>oeLHYE58029FFa8 z#%#1+#6Sanx0bA3=Zx9TH0&h~|9!wMXy?=@{rDS>32AVOYmgG)ngJlpAQoPPG!`bJ z&0rPmWz&*-_0g|W<(PyNOX+6nEEZqzm*e)9UUf1=%(5psaMmLzyyGNya zRgV{o!BKJ^ndDLE7!5HlS$S8DRmyozXcUVh=a-7WWu>StU(7PiC4XP_c!1DZ(wS%` zANCSw9xwk2H&F@TjG2XfFz{TG)+`KT6+uaolM?1ArJxnQrAe<^P%qySiIiCru_2~i zyXHg6H$ebzdN%H3OC*qsbs#HcMSRU8$@zpayNfuo0Un;>ar}{cS3dIsFD;xTv3C7^ zEO8J493JM8H-tnu{}mHAnG*c(m_O`&1|K*ewa*5S>eovrP3fXgXT#}28^H~P+mS@N zTdj$F`TN30n7IMg8vZ`hu;abb1^(~d|MtC4Kzkk^7$gA01XDALpWlRm|4!msBr}Rj zkb$w-ZDP8H9iDvAhynF}^|E4<^2KLN4~*No;yX_a{llp;&_~{Sj;B~~dSqlK( zn8#thzI#sH=^sCZD;xtjfms!(=MyezN9?{vY3DZ)e(_Q9E9OP28n)PYKQbOfRzsSEV z-uzPuho_4B@jak+6~V~@3NR@(7MrjL@`IzxGuAi23mM^-?0<8IxD}!IGIO9atNpg( zO#W9noLK632TSI*Ay^NWQaa28E5+Q_G&P561f=O_sjyP*96vDbfAkgTu4S(v zX9J%};=^hFV?)dWjbqBu8w$2L4oJXaBGKF7^^I_|ilvSt`WW(cwxNZdIO#0-HT&3(Low7Psv+9;**5l=&CG|mj#)BvJ4))8~jDyYVm`R_@<@tJwc4Q@+ z6y>wFj0+{M-E`Q>%H-O zOCc)MmZxj=BSw!YKvUH4mmAK_XVGex29C&&*$gd4EtvkV+t77t_y@YH5E@)!u*`r_=oGZKc zbz1@kJ3ZTb{JT)$>PJgbOn`X7&2f9<@2<55%a%1N_s?^7MjQTBBLgZAHmH9@aW*&g zRmp(;R<2_CsZ;{It%_tAe)clvNp#4QY7AFxpf6)q(dyNXrmlVe(<&PM!vy>b(wnoB?{^oQw)aPq^M}t7+s)U1ev6Y6 zhT?V$5-1@h;|?)Qp7L@G**#=cx2q|U)|x(}4i#RtUuubEF`Vf`HcMxNOCuBY=^u~@ ztP%?Vhy{oRbQuKXzNKy#ziG265S{W*D2@r^oBz&F*umx6NiZZJc>4-^4Fa@v_G^;h zA73R{{=FG2Zf!9{Hg-0;>w1$$*LV@2P?=I$$P1$= zkR=i{Qbb$a*uZT((D~GL?pN*sGy<)mf8GwZXDNYiV_CxejBL1B7=ZXlUnt!n_%J$O(sj z5|-O*wZ4#c4rc#>`zaNm-f`UBm?}4K*Pv4W!59Pf!baTV&@#FzuANSXT)Iy+VuMug z>fD&uJrm|N(mb(x{we1vV(a>tis?zHPNAHeg2g$j$|NeS zFniFy( zV8rM9d*pH+KW^LTfYWmUzmbGpT}~xzifBUGjj|}oX)wG~<6n64L1%zK#>@Q_775&pdZ_DieIJuLs^8w#ed5p0RE$kfW&iV+FIm>l4L`*Sq7U* zjM$W@j7h$#l_7(f*$Dv~LLUe;vvdf6*d#YZeO5nd4x^YVk}MT`CNw@xyHX~r5eCiA z24;I>js>ArM}(1CX7i&7rvZ5~zfg`ES;U{EF1z$;VC^+7%<`D5FkQ|{oh*(}x!6_=M2*7<;kE&9^g006+hyL>&Ny{}Is%c_BhoA5a3 zg^db-YU^u=*Pr`oy-6|K=tZIgvP|l}kIe99w;g!0U4a4GdDbWG=f*-{%C}m;G5)cS zqx(Si^ZxAi*WvL|GbYCUB7}cTd^9g+s@?kyw|CSmP9##~>`2V)BVj^{h#&d_d(V@V zuJW7KHG%P3x|%r+r<0resr<>!uHkP&Apelia{s#|N!3zD4j-%(fZ~WyI`YW-m{4N< z*CV%u{+HXV7NI0yE9KgBzu+M>i2^`?|MN$7JYhspyx`l5?VB&Xz=z$I-^0jBSOMJ#sSqO?1)fy|Siww%K z=WXs16D{&wYoqZ^)y#A>VzSxYl9q6OjSb3csHX8Y??2IHW;j57G!;P_{?q_Xg@rtQ z_+kVDG9~}`2#CwHe<#!pGIonGi{0>l;%Sd15qI#C;6#k2g{BZ(eTf_WE%2Ip8kc2p z-#RO8ZBS zvvcUZJ@LkKr$GZj+K}@DlQLj@`n+x3Oqy=~-HWWZ4LOqP z$#ktPgmN~Pq0(I?CE#)stRD_p>s{B~^V_TTF~b}Ep#eNAUELIg#D%*ng~TMO(2PM4 z879IK4FDe$IEU1y75&-EXL7Wj8oSL{S#S}l?9rOUZw_gSj5oYqqHDm8?Z+**k0erb zJ+EJ#Il___g}jlq*&hE9&rW_iS-Dy(=!5_QB|@DC{lr--iJ zt@9`pP7BjZ_bMpYnX>)ks|nKUsVRN9Qh&rhscyxq>(Hf1sOsR-fZ%_3I zsi^*l`aKL%pp`bi>HB!o9CY?(9sSu zW5trvhNUMTNGbcngFm_BPS@v1i5In$Fhhz1AS$K2?c%{Jr7BgEfGxXKl7xD%bZJp# zGDF2sKyW_DhdPy#S)@c@J18*Hy(pxmHfVyRpe6BHP8q^78DXr=_+t?_i$hN(NzD19 zu5)V74~K@1aV^0!Fuvk*=gg9jA{eOZC53B$u#ZICl}hI~IS?Aa;v)g%) zAaf2l1jSV7*bC(iLe8LWMBb@Kb7%r2qdC~MM7tm|wIm){A76*!*&c_!o(AgTK4`F+ zWU12c2I3)hJRJwVvd;P6Sq=gF)Q*%uV#{t4Q+B~AH!bUvmfmh4Qd%Kuw}z~*Adpl= zz#FT4nfx+or-+0j#$l|)?)?1+HdLf*#7=#A5orWbC zAECg~Nn;uoJ=lOYa;iqzKkIEFfF@UA5R6MUjAhVHymo|h3o^A58MQAM!XOsZ{qSAf zF+Zc^;F#%d^a8z`@MWlET-QMXQ))SBR$CC6DFNg8=tdqyqdsj1ld)}Pcgomp2TORy z%+9P#G|7#l>Osx{&(3KnTo5#I4Gf|(rWY^?b98)r+MbNR!abD6|G<$}=803ex$G;* z)Rh_y2wD0*8lgdLDeQ3hhDt&?EBx8*Q{4IOYqy>dwSbIsXz{F+X%bHj*gL;Zt=Fh* zX;!7x3sR9zxUjY`i9d+;Y!I#s)C1{kvgj;o-InMyc^V~~RH#%$z1!?68NcAWds{p` zJS?9~1hgfwE4}cGb0!M-- zMCK#*@{s+V2>}AGhzOCOi-?rdC;Z!t)QeI0ci=9_02uINvkEYT;Yr{FDWhnFYAO=f zN(eqwa6Mo_{Dq!E*MZw0JkPs}EFk~P zK?*lJ2!oMu{yPC8+-w>g?u^XdiN>yv%zh4BQ1pK-2>SOVSGZt{tzbwKz(0$D2!jP% zw1da>V}r|Ifln(Uv)f{_WBvec^LGXkd^#QmcSLCJKw*wuXs$+gP6+-V_x^5pky)68 z`uD6jh<{i7Ukm<#{%1j^|A!yg5P$vPUIhQ=%0jV$m;0Y9V-Y6%rsDJgE{_2|-35X0 zKiqJD!3`_?X9^*MMFJKL0GSqiM`d+JY_-B*)fDs180bH$@Eza!F_(2*-jy?Hq;imW zym;cQkO5yzCzms39!$|^_A;J3~UKY+AM^sYk}i*mJ+E$ zGhK<}`*0EjrE@OAA=1J}?xyg%an=&^3k@5O=y@-#ELgB$@Cw!XuW3y5uXY-h%6;3O z2urPD+=pMQ>NPtxL{;m!03P&tDvW-R^X++~zP|_f${m6*8LQf~?+q~o{J5h6Oc<(( z@~8Nli?iF+Eff!bzD;=Sja5LoPJZyHUnlsIy*4i3JX&ga{T^n**=l8J5mc17bE#5F z#)tZ0w%XHMVLl!SS^qBi5j#F|c@LC5B#JfvF;hEttMYCQjOw5*0f=3FuP?Wg&*SqC zr{{$xgz+yPOK1Enkr7eEqSE)Q%QC7oStAlT#J{@fTeSG!ZHIAGEQJctUySB1IiKFB2*Z0$n#x4KOqVvtX^rVO_zN%!s%F@qcf+lri6}sv%K6Mdj5K4;vlGaOl zHUNYuO1hL%&twiF15OOt5`a&w_OnT%E_^Y2QLKCZ7TJ2!fAdp=O)z|{r88io8)FxtibFX6+cMAjH9{a9k zF@Bk#@tOV8Jjr`q@BBI&yZ!^CemK~d zBCZGvh`;yuG#OrDG`pf1kjC0?_qg2dEiNbbV#I2JY7l2SQ&MB%D$@W}d?z@)G=Gsx z*Oe^je5Xsuz+p}PA~BJfggwnc24hrWC7~iFV?=ILa%oJSFbqmoYD#Xp3Fw#Vm)h)? zQll~=9|%p4WUHO3n*}FEC040Jsm#M6wH60SYJwNiwP?F~HE4MPv2smZ;reD6-*V*u zgAa`l-P`29D-`$p4E1nz+UGo8ItS}G2`CScgU|J`)=V{v4y6O4lXVgEDe%YoaJoX0 zOPJ0gpA^~$40w1QMF&O!U{#1wi18cP)S0{#W1Ip^M;g_+5xmwe42}X<<8OaZtt`8k z16DGvfyB)MjvBF`h$JV)DU=_v3>K&sADPzZM#<3gT^1%Vcfzd#{*W^>7Y^9(E2=bzXLB5 z)WTsiR>bkml_Yt=6>Go%GN|W;i^02FI=&dpX2T_W%~i$OOht4zIS)qm_mo}l=~_2P z&l(kbcKCAm<2u}JE`FMWiA9^eJQ0TDAzA{m=Zi{4vh56_TrO=7CpCVq8@=W>dSvmb zPa~@CE4Ah4R)Z?Qv?u8i zs~^6`NJ#Wu++uyQ42xs!&+*nPP*nF;vb^uZR$qI5H<$J16{=ioOhdd|9OCFCenubf z9Q7n^3VUifThDdoz0}LBvN|mw!dvtSG)bgI^-RmfIfaS>q~C&UGyBS>=Dgq6dmXCX z>w#GLNYzi|LrPjYy}Fx_-JEht6u$ztqeGoq`W*A%iP+F>&(+$;GK?wGLCk473-fDs z-nvHEYgj>!f&PQ2;)c`1Z$MH3<^o;m8Jb$twCC#Alx*Zb>K8UjQTnLA&Q-u6NBa*h zJC4T+#=GJGlh-o|0s)`rUS7}dlUs8VUH%^%CZ3~Pi+ytd|MQ^HHKdn)T1ted*7k+!ET{U|%22&*TWC+7I(j0DK2jhb7rhv>vN3Pc>1#Z{{4w zt_dP~liyvDEbUnS82#WboGn2K+opd3AElZSAgF~h1njgM7{Z5N-t37#iCX$C`xHK& zH^((9_6t2G1>i4g!M)F!77`T_IlW%6y<5?u4JBxgR-`k95tYcw6{7zhGE7iA9Gz}l zR{0|Mg+_4qex2iwaVBXtb^vyf$N@n>g9Y4r1S)aC_?|$PqJUUkx*uo=8e~C6v>q%j zU<3QlpBhueJOML?H8Rk72S-WZOSBOZ$i+CWZ~hAkv&1Q4`Ht9m#_@6(_1J{;`VR@@ zA5N$m(YY7Z*T(zFsYkdzYhOHsk#btRS@5&$SdyA zU}AcfIqL?po@xhV*o31*7HXs-8{cj80E>ES9cAgOBOFBtg$>t*{TLXbxBLgBPA0k^weCY5kf<y>Yf&ndL$;}8{ zN9L)8sCM{2NSt zgC-tUM`;8bqnAVm9w%{UKGPR~-4Qq?gn+Qni$r_qpZ2YU7zM$wY4>-ZbM_ zn5%l=3Mp2`jZAw_n+*F)p{U4}FuTgG(WO~qW!XhF14l7AV)u?&jDn;=TpHTo@FrI^ ziFJhjUTZ#A}2K=L>tv2qh1qp*rkQ_MDXbdTvwO)Q6on^#ebtmI}&?Aigu(j9ooj- zUb?m}LdY)Df17(9nko?$1D2aaT>;@pROf6P;4WDz;l9S0#Zjep`4i(j&S0GWjAo_s z7?H=NHsTZJhhapS*&Hn*<H*GYz-&Neoihxr=BioED(IJU@??Be6&i`0`$l~7TY34t6s%67T8H(6+`0df7 z@p<*~@(Wqe7i!RR^;G?<>gq<2HUtn4HG5fXHSKW_Qz0oN;QDtp!%GAJ8 z)c`pBo&761t?58@() z0;6K|tuyqTF&@lFy#06=d7Uhr#$>?JK`9TXUIw}UwiQYv!6OGUgc02~Zo{7~g3)5cM<{#Fa62NlmS5&Y}`iUlG-h8v6Wb$>T zk{`0R^QAS6z|Or+(Fo05aXT5B#X~9e1+T3IFBcAfv{ydF_mPI;O4lmz&DH>Jywmgc z?p8-?$|%b{`m8I-rHT#Cb|wrJi`~c0<4Koc}*}t-CIJv6v)GGD&9ke)nVh@MZoeL?#!EK5wrUU2fs74AZ(3#(lBC$Zvu zBw`?S53)h?Pjg4tZ#V)(VDne`ULi%G@>rKr)C6s533@~{`ZAsEE>uj(DiNl!m|MT+ zbtdA|o6ZO<04iia&hYex>>wtWvf8=3#A6Y10=ejt`=pfrjHl+h# zvtOB;CdT$vU&lD-aCtq*gNop2hL@KvI`Y6}1-fc-Kx7Vus5?st_W77Yfz5m~);# zjGaQ_M|0@m$kV#B0D}Otvk5ebeNINq`$5iekcWG3Zhogpzv+Zat z;}MWrQXYdtt;!SO;3%QkR$lr(mO(MCGHgLKKU(hu?eNiTE!xw|bl=CA*E7VLBD4$7 z5W4yjtg`tgFCPwObRyYa-4ypCJw*Qv>ZeyfHGd{%qBgD7JTB4s{5L$k9>Ya8f1h&3 zn|;m6ORSQT1cl)vC~tiupaQT|iRLscBZ0H3WSIn&3iCRbmtXMd9QX)3W44Y42Lw_S zbz2ynB#)oKL=9_9@#5z(c-yB}RCX;Fk2qsq+zRXbh2B9N$;Hj}A0ugdg-y}(uz zL$A7gYVMCbSqXvj0!?x9-xg9z3QA;eTkMQj>5YPY>gjDJ`HbZ1wM8>MQB>$LJ0Z!T+UT^%aq-LD`X>wwA~4C70z<#&PEIfGnlu(!7`!! z7*z*1n8O-PMpooTo9HX;yc%o^m;^mt?e8s~P0VkZW~{TzzFJ*ztr0Qnk@@@)^EkezQ8?JMZh#+&W3f)<_Tx3M`NSJuwYk|Xg z<%mJ^<4=ab%|T^*aJ`!d8Bv+7ZcS(18_SJmncT29v{Ki#J^?Ta$u@GdHZ)4gVIMOV z)aW~CaFu!$o^=uu$i?<91`#Wxkz$*ov!gg22X!;lCfO;FBcqkj6pYQXp5JInDYqdd z@K9+8t@`W29m1E*PJdLcxPMPSF6Y~6^ptUV4=ZjDtOe2}tgD@v0s{7rUAGkhUpe{C zmxsjC)qGhjS-ogN<3s+o-PxqRD7p%2U8&TXka(VH#=X6*PeyO=w~BzZTNp1mNNe)+ z>PJ?Tlpm)rzfhFdDvXFL4#3zuf14eSdA?cDD;$ zu5Ou@Tukt$LtZs_2FoDfM8O8H+Lq6lEhN4WgK~~?$#kqBo z(!=SnJ;i6Iz^4lvX^~>WQ-uZI*@jW`i9ZUkq1pTJm01{uL5|Hre4b&_6MuF}h43e> z;~}p$TM-i`{R(eQPwoW)Qn9oi(!F zMINcMSdy~`Ug6|hR?Ixa{;DF%6K<4}N3QXbL(?nzjY_d>knGc0T(@d=BSxYH} zRb?y$`-nxH;&#xiVcty)CXm0o*0?A1v;XBcVqg`Lk-kY=#9J)D$S$Zyo#y+-!p>Zh zrv*j7cuWvyyi@xtrup>oQj_RQbu4D6-5{obY*MXXB>$`R4b#0AOCsrS(0+ z0HTBTr+$wiKq(Wsrr2zMujS6Q`&ZOw#eqs$MMT{^Tt;RhNA7B5Rw75wHOF-S>L}&c z*WW%~e`^X-jgLJ3@%^_ox-kM#W(*}8qq2$^FDd5zBMiD~m(P)|t)_6wcY}5=j*BJ{ z1IDbSAqkuN>`=HNx_d1K7cnQMQfrUvTpo1~+TVh?<$wmstnR%M5d0yMwMVsQ;&RL8 zsJP)VZBt8vnoh-~T#H0o1%kBm$wUkXl?lWNnCLUcGgad9yK8J^2%Tx2+nV|H!3F#X zs2>)0trH6bmI<`acCXI0+oQ<<UZ>SFG?`P~*gGd~gl9@w??;vMx4y3=w zji>hI{G5N%vqYLl%n+u3j_=q1Ao8?HhpC@Mtb}9u{PVI<^U+&t@p<9r5eE3T4@XnJ zt8^ujYT!XdDP0b7?Jwho?c)K#G{bGNrhF!#Eifg#1p~nL3qPrLbwLhGZ6ov!o`j z#$kVkT;jA=(4^OOEO^POI0)WV=^vHL1hh1y_}q{P4PLuvVShH#q((*=m)a@yZvs60 zbJ1(vbc$ghcMQXa8;69fb|<3ZA+@>bt9MXrODTVSO8j7D`k9~d)vkMutujWqvB*Jz zUe1qX&IndPS3)y40;Kn$MI&tw=7sX4uiNF248&Y>nlzeV~2lIfA`L*4Li@|4F(&(i% z67ZqtWb+BtllOP~ELF>|bS6Po^mSk1;J@ptHQ}NeUWi_BB-_J6prGw3+)co#STtwfj+ZO!U;BMm=tYo<#W3T#& zbJWePR_9Aqm`o3TWhY!kp1}0uZC3 zw*Kdt@=vKmjict;-xXk&!pc8M@eELY-HU-$Wv{|w zfGd+owe{IX?9&g1b2?W((C1924TDb@an2~pnTc+I7Y0SM>~w42I6P99>M>#=n)U#0 zfaWPHPsFN_YipzL7`8#8OZvC+Ph8RRq0}D*`xGoAZlA8gX&n=s)Z`<4*s~eaHtn`XA3kX=j^2d78%geol5#d`8FZCM6xO zu6&*VYAo~KIO5Vf(cS0Z43;U5D30!O7Ug)jWIfc_&2O=O%SNHZ{yIiw;;MY^l*=8L zS?@0Qht8u#_D%_k0Gc4QfiAWTnSP%H`FlrF#Yf6wi$o_YG80`HzI)#Afa=hCQI5kl zTgG^StU08!3|igD>wd*?l5$B2&yseFs==0zz_*cc_fkVZ1ciG#HTz)oY080wrjQ&~ zREGGsCaz-b11XUE6JtGKm9sZV6l2X~mb5tP6~Z^4Kd3G3*zz5q2h!dQa?7rfvn}3s z95SJviFaQzn5h?+LmfTqG6N&ML2)BlLn(OVP_Qkyurz&|pwqMM@whpX>+&I_Z+-Jt zfIX>NW#N=S4XG}wDJkL1310k=bfYHv`wMeuW?D3#ql10i-7hjAerjpA*Z_JJ>3BJ% zLXhE341Hz_Ls%$%2&AR|M3$XB4=>j*)R770E%Nue5NS3y&%R)(lv2QV4+(D@JnTiu z64WtMW1Nv9{@IIV;niJP{56p&+rJEm8Fi1;2@PfP*f6Gm$wkfaVymomV;lD32z$8Q#B2jkMXApDV{fkkqqEF)K=(c_PX38nceuyRmQja7ch^hl{yzU8^nHt}fa zl1c(GSL+aZarE1jFO@aC0R{=gkj2<~7-SQ2`18oGE4tqrcR#_4x?Bkm+E|LZY%a#N ztvV2tT;$9rmgUT6`p4)80*yquab>WPt{dTTKS&<|?!=q^* z&{QltD^23+nZP|PENQqwsW5L?FLw8?cx+Z0+B$U8C%D{`UrC=_@FW<>LY8pc+W4X? zASbNI+5HN`{6oOc(lL6}c(pGlan8)jAOge^Z~u_ z6-D@Te?Hv59Zi;_fxrI~Pc(0S=8rH_-QJ%IZdjDFX-6_Z~GNU(Ty><_h%K$^2mAXeD^A89ayOS zR-dy)R^WX^dHuzw0snWya*wD+qhOcKMc1dK3OjCi9+aY_RAYKM>I;T4I(BbVPRM+s zT%yFrC@yAQd?B(Ms}QSj`fi%RWde%J@Pm33)~4`tzOr007f|lLHZrV;NB3b$LCXzA zP(7Dg{>F9(Mdlqg<4xKc|XULgL$-*-TwW7=Z z;=s*=mHELcBeitv3HP2%YGZQg^MTmLWVF2DdN=}r;YOje0E?kA8cO5{|CHN9Xk+#I zJMDwuvgR)9kD_<*kQF;eQ*}Rk?kO;ZLNF1EJ10FmV1U2q;V!>sNm;^i-tmq@tHaeGV# z_B&}r5}{=cjSvY*=%|3@+DiT)Ad8YpQZm#Di;>HeQ$0!sDybN2B&7{43N8w+?W#Ri zA)6cSrRPa)0js_Njifx1Cnzjyu0atX6WCJ;#u#v7vr@uwx@HY_h+S&(h3>d z*_HYfvgM+rwy}QLh`)EEHFahyJoZ2QiF!A}{^}S0+H3k8bX2Fx`8w+ai;6`BxUllj2gm>QUoccAw zg?s2A9bX#9vSoMQ6};Obi-C!EWh zv4IR7uf}3Mz-;kqYHIb6IZMFXpGKO4)Q$WqvFit-nYV9Hbb4Nl9G@}MWnFM9OMXMAG8(X6^4I^|?A?_ZDOfohISt%5TO0wq98*1zl+^+zw1mjdK z1N_G#Tn3JrI!-NNZn;gg6$Q`*0;j7m&c$xd6l9YEsf!D$x0GU-vk!EJfEO$k&xr8} z<`Y*$+7Y%_cnBP62wvrBBloAxoGB<~DCUi37=1-F=1s;oC}!|X4Y%OKN257?LP*Z&m);eZh&85~dzI$ldz9*aM4KMM)Kmd zOc-K)}Fob5k+jp%m7iCNhIZ;hn_leghlIWChPKhbBapJbA4? zz)Vw!LI@Y?EL&uQ5s^))ZPUtS&6dC|O#|~p!Z0U-nS>M}HK9>S2tw9cyCzA(l?_qQ zsPspLbXnn;5!siTgW_mBw>irKHCJ;t-0PQ7E{SutIz!$$q0` zfdofK{c}G=@_N>3;#SEN$f9IynC{w&{ z{X}75T{DWV=~Dc;Z-;1%X1~I)K#WYD>WgC?^F^n{%1UsxtGHUdyOqqqaEMK#_O*#k z&RGLdw92e$zCH!5b}Bs`Z5(!_^#C5lF1P}qD0WSj0QY+U1qSpdOpD)^D@M@Zni6;; zDjK&bl+52dSD1UtzxI`TZ9HN3=JLlE+t82yqh;Yl|HaC-cAc5lf1lpQ9CIC{&eXMO zV%w2YzY}OvW{I0BnkG1RfBx=5Yz*Uv^v%`8X*%Jo{_T6K&uywc#NCC;twX8+&uovs z_JF=&>sBB?tsELEEsWOL5}H?OwvT+(i>f6iDvUjww(5UXEt94LwCHaR*+ez_{pVgyS5BWWoE z$Kq1k;9C7QCY|S?6wnRp$2bi8__&5u^^NZuz2+P$O_Xr+IQ8#)uCe_#r=IjH5PvBR{oM? z`3!1?{o}=}+q$#McaJv%gRa2rwP{ywcel8M?mQ5L^8>K_I2hyLk{PLI4#Dj8@g7T0 z{}*YGMQlj;+OMD0uTQO4G?hr05!9vA`v$zs2uSkr%*_E2L)uq&$Ci!8na5c{bN&xX zKYtz4_F(o*g1@PImBRE)%H%VA^s=~-EDfg#1{fbW46$QML&)!T9*5Yk2Nvn|SVPD| z3gUXy|9pf#ZN$IfY;RTHop?`v;DrwsejtGDgQ#9$?o|37_5=SE`8Dt15ae>)K6Gr6 zBUE&&2b=hkle2Z@^Symo-xcf<+JF2`ayuo8NIt~203$XLvRKjE{eu{qTq{`$>P7+? z4yasgA*KaE$T1}fDAr@6&D3NWcdEtV)O-*r+A}p)YFMHDn(4X~C{4$EIqNDTRYCqN@S;kcH?=kpgFovo4 zg>oxu^HGi_HsK0Q;YeRR3uWzDsNm7y08kYas}gh)ipG)u2`E|tfmNwUc3-!NVPL8l zm%tw4YRe;}c87MMLGpi>*h-4*kE&vaQ*CCo#Uv*WaNS<^Q*kb|43ABNZUsAn}c73(FU% z2f;Ii!s?$|U+g$h({I2GGf=h_c#1*%V@Yp;wQTSH%83EZ$)FpjIAF2yvT@WB@V z1FQ65jilN?96F0W^~s0+*6p2tp&;lMoDb11G@fhwe4*w-5}c74hrZ z;(Y4Uh&B(wo9wTC@yAGz&65ro0{cEI=+{un`zN@|D6H!90k-9Rb!zG`CJhq-HZK&U z&!fH*O3kNmdB(tTcqzwAoC%6wN1J=w+kXxYzE!lo>cX=Y;WGNxe^a|=>2ND_{1x@i z`|$FRWP(4Cgf2ZOU-gH7wXpUF9gkFrb^q4C%Z>Ql%`?A#;UM8-QGk@4!~^X4&&D^V z+>RfL_nMD9db6J4xo^=kuY?fnhvFoAnLVEhQ$bg@MK`{^!u-!}wwnd@C|@}2b4k05 zFxl#ll+!N+MZB*D-S1{sG`hk|{a=t};!p}yA4@#`23lg`)ZE^5v|sND3&>}%cfq%m zVHe+C<&h)M^W>6;0Z%_#FQls&XWT-*j6+k&>WC_n2uS2UpoPNqRtre*kQ8!I%Sn4u z@%$);l|e#Eh-cgojPu?&6c%e@YqZ3h2z_1Hxk7S$$P22JGYq-%fSmm(6Hirsr~q%q+^}NCq#+Ss#zyj&uG}hMgloRHR%RJ*6ZJ0?DAWbQ-Ybq!6D5MiWdE z*V3z;p`~e*Q2Z6pA3pU*Y`b1`Nmq(($>EdM#Ed9&$az1t%m>%$4iS{f{os`wW#b%H z!8M~f-2)`B=JL+=IQAS6DUgzapu)yN3X>EzrWLW%x=dv?1QA|@rF}|rghJziATOt3 zd|jKjEVN-~kFd!VUq8q|SJ3=S9sHgjmsM!Uu>F()WfhhZw76Efuiv6(u@%jV~!$RYY zTd_Vj;KO+2_#^kztL)!MvK<@*EhVO(R?`GFBQ`LRyB-KGRCgnpCw_-#Vz^yU{N4dZ zE4xl(Mr`LWioGYea$B@C>_}}9P~C4%qxsCWuu_H zK_AveMod9=a||)E{LGH=xfl=4C9cMvHbx{i@@-f=h3!$UEwxm09ic&Ah(_(CVPux~ z^s1?`_wjtseA4{Ea>A@*?s2=nDMB8Jg85pWM7 z_bNwK<t#(mUKVk0lEHVg?r~?6XwQkw=55*~jN3j9xAL@hi^9%{m1&OOz85 zzc(JtdA+37I>hMT7{9fBh`d%+M`=56()X*-7`y$XG{hkGmT9abAL_8zKgAjmke~O& z(dKnTs5)wbvkJAz`&}-K=N(*?;c${?*A{wF9@CKFV!L_B*KLBsBs*?)FpRetv=A5X zJdw^z5;zTkqke9E;v&<@bRd39psL4@kHk+B7so7 z`0}E2^Y3QG{!#rj;^Gw<>xi*tiIq?O7jraWC(_nVZ1ri@jViIoiBtE#zs|2UxhscX zk91h*Ua2*15mleoooeHtspJcw}Nwh3vTP# zAjs?>y(YQjHfVKkyT4dnT;@K1EXV=&Cx`0EyACl6&Xx+F7Q1Vo?-pPa8ibv#9e*zs zE`ENgS`=Cg_x4%;z~9waa>hfd7H33VTycU%+u-rkp_1%%oDbJ{5OTM%bo&kw5j+ap z2ja$QXN071-4F%PFv9+AJJv9M<`iV}MO;pjnF`A|@b`Z6J*t-}Sce0>Y={ zDsg!VNw@e%K{41Rb^vTrVV)H|Y55>XpveS>1o(r_ji|Rdld-8a&c_)22jKj?uEt8F zl{1Aa?CdVc^8Uqe#)Q1Fzj(nFqi{_#g8^tm`FYVARE4#l>sTQ2cn(m>d<{-<#jUsZaF9mz##MlQc1^cWHpI5B*ai-Y>fTb9`eL5BA z?oC%6u@;(m9wbPNKq1xuuuxgqOr~-Tr3F{GFJ|2`@_Oy3620)yjJyo0O6bbDS|x3! zh85~nlE~T)<9eLQ0%e0D4yNv7m8nFKrR3vqaHH^P=Ru=-$%9gDTaWx`TMw$#*ak2@ zYdY2+(sG(V*QMutJ;DS?qQ-*EW7&oS%|CFNc8qQbCed4qsho~Pa$BsSH+$dbJ$hf> zE?1P84)N`?Xw@bR3^^RHLIUgU1`DG^d{b(Wz+i4R(~<3@Q&E zI9zIt1)Y3fdBnwkr{$`7btP}hm6^aEc&vZDRN+C)fjvzRpbVZXDU9A=$hXXU@V#H^ z%qK9nz=uAuG%;({FWoU=kl2t_BD!X$S z1dIyGyGZ!v4x|=aoR8HQ98r0dqG|^%PRj06-zDeF#`%1?kp;~~Vq&q--V0wRk zdTH7oLd{EbI6Gs^x;=5IQjx&hldFSK=u_Scgl3xmbl_5rtVgl!45<2-P|53TT4yFn zcyD9Mo8Gj@+q`MBGP-fF#M`0O@)h$_T8F(35L(+pRfWvGK6owiF2SYR#zH8ZH|x^} z45Jz$&dIvr5BgJ7>Er$t(~i1W86SVkzdm_yuWs}&Q!d)stgXvx6RiA#)|U>kmj`cm zW8(hZ2#?Errh29rzoLusA?+_^wN9bnys}FkdMbZ=(Sx~0@LPM)!Aq(ZT;VtR>hvCL z4zwf6s~`43^Wr?_BF-acvX8SlTdw3{PoD0VWSzH{Zf6(2FDQdA94);sWynSkR z9CG$~Sz3mgX;%@1f;2@J=@wuBy#Wc$&Y>KlH8^9<#z_x`kBE5Gg%Q5qvi6MC9lVOSTEhDhTRUspB;mr#g|R6@ z>@X^l88i~5q|&8hv7qQ2-VkUi$?;{MyhX`zBa#^eI-dRxXvDC3Gyx7qM2C`0%57G~ z+#zgASBMoUI^Mqo*A9S4@|2j5kL+Z%U;Hh@Q%i(~)3^|!9(;$c1apXLE2!>gRX;?fT_{NPyC9OZq$&8wYmOZ>Pt*##g_HvYoUlC^`Ve_mhP7^^vp z$Pug;-Osy#M7x$pS-`tcNt4X>@iSeJ^}25ZI9ox-HjY`*)R02Nn(?&fG@Q8>{k=Gw z8iFtV;#c>(Gv3zcV^K2R1Vr1{{@o2qj=}fCH4BCas)ij9?UslT3hgf*=!C2Oj7Ii7 zoWsx1SMES}76Xgh=7M}`dN>`sH90ktpsKdn-NC_D)!mQ#hbMQW{~=O%p@J7+#CI7} z`r*qX@aOcX1Ts$FCDA!iK7weV0J?nUvR4}k#;i}_2n^%mCEyI=d*}M6cJKSM>(-|V z;Hy<(aJTj`Orj(4A#`B~0PL;j*jQ3S(LjY@!%S&c!a*G7`kvc!z2-)n zS+8hL?ObD!ENI%cB*ViWlCiYiXGnx$Oc9laMA4nLvD?p2KkjouNd;#_Jk&vO;1TVs zuTwl}1W_YjUH?Qj6sc|v21w`Fh|8Af<$UnXZXaZ3G9`e=6HCwTUqw(a{b({q1`L$f zF26X;IO9n;zH;RL5u1qiZIYTO)LVuS!NYE^!tAM{cT*V;1W}BbHtfq{4pcW32v>Ok zX9Z1n7D-K74IR&B?Ke6zB%c|I49+RhuBwbD7@wi@4dW#;Q|K+Q=n~(^roxnql7tFMJb>rmD|TdmC50v8b$aJA zS0y?Zk`?G5|FDlT0%N!&!j39}U}!{BcpHv>RQhYd5A#|NZ3)$WU)C&pFQER*I;?aG zVqrkaCqc;{hFPcZOkBYXF+Zx|CPe-&FK*9|1%FY+^5i4?xKk+T;zNt6QcllW^c zhPZj<8KaIy@;3Gf&MbT;6=!bUg8%%-H9YMhr!;Y`KP3^1@nRYN>&Z2&3~28~p1izQC|>dT|r~H2@F6#U)eNdC=RrNJ31$_W#G_ zn_g%R7g{)yS7;wrXwX_1`hV=Y-x!gySCF%rkg~l|iK2@B@eHFQWs~CYD22T2RQ0aV zps`T!-GA)`u`f6LwKiX%{{}* zof8g^$tH6DbsN-%!{jVF>DmAPgs@;71#f-QcGej#0;#%3ImD7!3~p0OcNpjp@P9~E z7|&X=u0aq6WJ=398>}=zk}ukN+WkdJFQSaOjp4&e!_v3A{(nIjgg!$qv~ukm1Xq$L)-k1kDA_+mVe zl{j{{LN`g_y;8Gm)oRp^9sD+`LjaJ=hvsGoDxjzVp6Ym3iXJ4O z6qD<_;&fVSqK+%_TW&hy*4d`KbPnI_mXfGEqoSR%yIDShJ1j7X7jS*KlW~z!ayYvv zIUquEd0aXF)&hiyBN>UkXB}GE7YhOlViDceq13)se>QZNnDY14E%D8 z;JWB|c~V!;j?n;J@Vy-{YES{b`Z)QTvhCgZR9MfM^CuM3=vnMP`@eUxPECDnmVe6t zmzo-$ywK7x4i_sypsecaKj!W>z2xx)@L2>5sDB}A)XEfh+WCh!9d{iA)mdcHmTPqb zI&mXBDB$Af@B7UtHoR3idiOp>=GTa6HbVz|k?pV2>r54y3-PfC z(*?_-MRL4s8xErCupcio=xn~4!K8ar>;rU_o1Lmf7A73oS2q}MyQ6bcFfd?r zVRXX^DB}BhW=9l`?ALo#l%KxPlx%iFkedzyq zh2$W*v+K!SM(C-CmH2>wS~o7=T4Mxb=9}_cPwA;1cm%uQnP!V!=HfQ*S~xVTZe!+o z_mbIqGomd+^B9HGnh>}(vdNf5i{6H0C9vZl0sPQtu%K?SdK=%SzToZYzJp>tO7JGQ z&0Qge5!@gVL#@hj^SY(C9=k%pqbzk{Q?D&>7?gxWp;aE$A29{A$;l?Qt$@Zhb zQbAMg;3tXTqei7-BnkAwf$Zx+(OKdIIo&%xl-Om+plFH-ni8FC+E9>EXi`Yh`MAP5 z8@DA5GNI7YU_L9i(RC2_kNb^AK^11b9L=5I=}=)WO&Bu_*Sv1{Kx=yu{p}%!VvcWA z){D!xvY#Aydlhbi_F_R$VqSvpWUP7t4_lbOLfO&g>q4{wFEtOhM_TC|A{acR<=TFG`l1=@IQ2HYR((+Xukp=MRR_q@N8oqBrf`|~L z$ig44aK)*OIbf86k!cg~Y+_vu#Q!*7bo&eKp9w zmzpyp?sBR9N|D?l$@%neI=O4EVU3hl1sChRgzK^eduCqI;;odMpzEEC)BK*_j|Sq% zvuS5vSXfqQ#dcQ^S#wy9EM`&j=S3$R;dTKbLBYkfdekJirn>uYw){-mSwv21jsNa(m6@!en~cZix!zBKDFTCaSqXL z5?Du@b^k`r+o}~LqGpl&c)4U_rYrdB$yoL0>P=j@-9PqfKuMqT(BL0`b74H^AsH9P5?)ysSZ17Cgdq4o!?h%&V&$N0nONZU8Xm2rq2$F>qG39g&>V zH2v;Fr0c8WZL2e2l9c=PVomY1gGEp1ov>~dA5lxAG1!2oYR6FqBZh^&^2N=iP)s zAhKLC>ZroF{=qQ(V$j_GB0e?Dc+^?UTap8}awmEbb>52!QPmMrb9(npv#8>Z2g`^| zmoD?hQ?9!C>JCXS-s-`Q_(sXakVc?nCvUmx`J)#rHQaJ&@6n?CLM0bxYgQR!oB)dA zY>%uy+(&E7Jm!4WqZY$!L)!mk`KF(mq4;z7)oZD4#B>IC&kYUu#`^W4kvmW7jE+@> zxn)RVa`eW3tU=hTx0h>Y<0$WD>E-^Yv13k0A zEM7(2B)9jTRjG%kVM(Nv5oZ7^>nqQ~cR#+8ckB5Uknd%_@mkYa_d-y4Tx_NDLt7K% zscb7scysvi>LXsskwei?D}m($!sqWe)Ag!EKPLp;%_nU;vamJg%oX)R+sYg8C4@x5 zNQrPzS_|fT_b}oO!NBLoB67}z;Mh-_Jc5sI(&FdVf3~i4L9u0p1??%+?N^WM1&`O= zA;BTR3+mzx)q@xt2@3Jzu_LNKF)dj*pX@?;z`{=;D!9!LH}A0|LxJ+p@|>N5DX0kO zy$(5caE>x)yzA$3tPRRm416L}ZHZrzQ>+`PTx>qhFEt4sqd&*Ei z+N`mrBbHl33hdU!)Q}@fr9xoXLrCKY?t!zX!84E{LSg)hVom;GaC&?CzfcyE+w@zC zP5>9hZ(xXfsT4LmioTsnX77)#B2sA5Dhp)~v^O8(oVK-)Z$Jb_gC2^yD;sn^RK6~v zy2av8MI}0%&$HnH;ePhHgc-DP-Y7nIb?p0F?OPYKmS*&36(&~n&__)q!h}TFLTw3= z9#ZFEH5u&KGbyh=6jX@{ovyU0cjzgzIY7?P;Bo7$T>S#+Ie*5)m3qL1G?js9_d2d1 zJOchO@~}P5_8+zlpS!{CMLt9&q;-42LCl-=mYSg z*0?@{@ghegH4Q2Ed|R>fQI(FNh1R)kK7OwWUPj*rhoLm?JA!GucN@rGDyT^tE5iIe@mipL4$-u$O zgk|za`7fts@~?+SX7X=HKw1w_N>aJ4ouC-y_b&a{ODBbA_^S5HYJ9_yq5Oa@qY8x@*X(q>A=^C88=CXq@) z5hB_8403YY@7Jz%{j1vo%@jbv;e-{+MJc-N(pcB9@eqIpfQbg#V!BHHL&Y)X z_+Z)h!$ti*QYr>JzubT(iDYMbp66Z>M!5{aRw(6@#g?`lpH`p8NRP`dn3*R?Ted|qs3w$2x zT_*k~GvzZeBr_%W9lQ8d@%k^Gcg{ZaQC=ane|62R;&gTYgr;!W5ONqX5(c962Rv@9 z@5v2I+~4!T64FFn8jc-oYx6<0PFY+($v$}sN2|Z$x~R+#1Ue6+Nvp-Y`Qs12IoZVg z%R)F$>_4nH-3c!*Oc?STAic^dH^n55m0~C&+Xe57Z6d2*Z{e}e)BX%pg2@wVSaEGm zSst2PDDl2{MAXEML65ejIQSCHU|HGLwwDmQ51aa{^7&5XlVYirylOf zy;K~qyy`tDdlAqo7c=?Rb;-F6(IZSuRA(&xzv!bNmmOr5w|WBiCO> z><|7+9zmekTbjygQ%G&yDXg>>e8O;3Y>>?KZOGhOq*7pA;GRhaSF_h~wTyn#fl~0o zWOW}xK%6=A{zE_j5C)=;^tRsb$@vX$pzt0BGn<)UtM>EjeM6gSN5rl|Q*win(S9vk zIi*DWu$0724C6>bIxHQF!FiVcJe#3r&YAg>_;ig1qR^5viqbHrS@^e*o31b`^m{4 z@%dTl{w2l7g6Y$Mo1hgD;k$ZQxwlU9nUENdy7M2hkQk3YgRRX|94!44Jw0r4qrnpm z6Fo5-8Hz_suqh>{vcGyK$>dL2e8%1>_RTU%)rNcTuPosS{WM_|GC`E;k$abOs9K0K zO*>ko#vKlXNFsfA2@ip%=LrvimXbmu2oIsX*awxwC*Mg9ze`-VrJTe{wT~=)I#xKiE`+DKgrz=4pbioQ$0mK*`1gXW z^Yem~vj25KQV;&UAVEHw0Ng)B<*~#8cy(iFmCi0gOJUWYvKF$$PJCZl>tk@WBW)3G zpIx-uZ>#nU2KM=bvh@4427~Vv%&*trhBn2&LZkb55?|JwYcwPcoxkd{!X#H zv`9VeWe345*v7Y_oG^<>H81cvV#waMxf&UhDp|D9Y5_qBWI647+}!1-75Y%DpV5xc z8d{L>AC~Lr3`RElEV}Fc{}2!>^us}hz;Eq`uaLF0MrvMNcxDdI2&%wn_HTM-y2X%` zpN4@lzLi!=+*k{$2$*A}WKkN@O_(Q#yD8#tb4-tWW|q#yM9B)OAn2F69uf-a(SRFJ zt$5`#`Q?AHWHk)^Tf%&YlrWPi+D$RJOqlmoG`E^^#1*vejMowzrVI*gSz!t z@eKudY;!irC)_=rig0IFE)oDf-?pe=f<<8raVo5bOx7qDf?ya(NG^Hc#p8B{P~Y() z>q-Mc0{^`G{l$)b{iCzzOG0kVF#QK6lQ(1fm=7XQ4-$D_=I5d>4E8ZnU|!{1r4eYE zAt^vBKp*tW?v-{dL@W0a5K(t#3Auyy&bDKV#xI87<_TOJ(dc<$Spy16dOCD$L^1pZ zbn(u`D#kZ$bx4@HMs#5DIt^MEa*XoEdTja6=R^(IvM4?K{%;n9zXga7Bdb{`4jg^@ z%@tDiCr6hVSJoI30J`uJ0Q&uTqO`e!J;q;&1^*`uoSa{3k;QxFg&6h5rQrYeR~Oij zC5)qp1Ap^Bg~qIu5_)jk$8qIo>A>LA@R{~wqTDRQ(&Q32dxABJKhI`yPd;kTX)G`E z7iv`$b)p!~I){=*mGm)%M& zEl6-3L+HRu=FDHLBa6PKhvsSTkMtuzW@##8Ep?)5n-M=29Vs+gfaVRx<&ROR6kC#m zuIkNX2?Jp<>Sdd>R4UR-3!O~M*;h!c?AAtv>KZM0%;f?@FpTj$y&BDU2NXMP7}(-q zj3gR};-_&yL?#&tge+tP1(96OcFNJjeu9w+1LGToDCA>TPc6X^*vk{_b8*XI8$(oz z!^GhbmE!P=N)Z_TSEY#au22VsYAw0np9Slz1us5lZxCMv>aXsnERV9rE(9;iKZib; zSHO#67u`!_@1}F%EF2pRgA`H?K?)&gPS?NUils96tV=i$@`K=1RiNI3U>7p_6Ul}I z1ZsZ~&*R#|J>}9!?%yv|k-*kM)v8{iDYVRmkeu%#a(gpq_u27Ur)ST!kfh80w;t)dq zS3%3=g&STV83{H%YyaU!2YC`wOd&F_hpT-*RT{_}k+vlUxV&hr_MoVa38<_yib`ny zJc5ams0=fAkditOKAT42E-E_3C_wmJTn=oGnFS7PxgSwfA*E#$(WtCY$xz9BaEgl= zreO8>x{RGtnzX9c;zLF=>_7Z@Q5ab!4vB-HD+F^_jbSs}zBNei-M0n>Px*|jz`=-& zLdO%{DM<;ub8EqZHiWJKL+k^}Gt*%&AB#jX7(5l@EA@BVjeJT;%P@(73V}G;i$YNz z`sF)mkxff;jK}~Nv5px3d?k!(qmIkvY)K-17oCk*-Xt-2ukp{1v%;0|Ra(;cLO**Y9 z_3jf8;x?cYcHYqT%Sy)9-qpt5JB{8UBMoxdn%w>_<~V@C8})}2Yu_{c_$8^Vs^>pR zWpB&P{;#+*wvrrdWZZGW$sB#n3j8f$@^$P6+QEMGren9`5E%vYTP7foU0mR#@u*NV z+;ttzHH$MY4N#!VS+;6D8yYQL-lEI4-{`2aV5wbp@5;fBEtONMCg7e*(po1ilN)NW zVWvXqvP&-=J$2V7#AE{V2XrgJ)q7{;S5`-J5m)+VU-eC9-?U^abpl4bum0qu+44y| zG3Nus7cM;Set+7O%J3AvG)=3sZu#o7fqM5>Kf&T{Q`&Ek7=60ma#ufPok>ZAm1_H+ z0;XboP}J^_Bm;@d(lPdtBGA8Q{6DU2?Tp9w7PGD4EXMu?nb7R7h@Cv^o591kI#ht^ zfZEkm`rmS9Feetl_J}mNPELO%{;dsSmJ+)$83tgSi}qWs&U@?6mZQt_@>>xHGEDHt z^QZr3`}c9aH4II5HU0kQOt#q7xUH9@?_YCTEFd2IlJBE|&ARS|TjPs;j5jF!2onKSs3eAV74*-r>ne|A&yfPPYMmyh*( zld7{?kAklLUGeI#0Y^^vv#%F7#7f_;-@9h{_KktdlAdj!qMCNa`Ay)|+^sUX=DV-1 zm)(8!CFn%zFvdKMj@hCI)|}G}Yn+*uV(qXjM{j1*N#P<*bFJ$&lj=058$|_8S^D78 zzRNUVnXPV!~=4t%uMogUc>9m;= z+zJc7S32aY&XF!&Cd|GzCh(+Kfp+wfwVIq)?adNx-bSZysVtB9ebesm^LKLt-oNjA zziaEW>-^ilR@l7lcVGP^c%I~(wAYp&W*x2iuxhSgTz#ids?dj5H-EgEo48kA((Y~{#|yNYv(oK!6j#AfmRL9UJ|(U+ZR_u|B@q3aR;Vw_FJ(Zh*8)Q<~QTu zwVOvTo;>;T>eY7teEphF1vW;-1xbIx-W!&_xLP9BRC6!&XU>w4M-x>28#+ISl`j)p z>3Ec7qvyQ~J^v-@1^;eWj-Lt|7u?F^)~c@PwNgj?-}N)M7HL%J?v5#VwqG$g(xCau zMyb}q^w{Mn16H2Y!W_x&t=XuJxM!z zbtCsF6TZw}Z0CF1V@_*C^@VDI`R|S_4}P@c#-+L61N2rpS)F~!{nX>hMv=>J)ID?S zuB<+*c_4jbS8bt#|He>`$J37ZBT+^)k+s{NgvDBx>IJ|okl%phgXoB_Y`;9C@EbEoZ!xUB-D7O^*wYc4$VhuDQ zU`h#>_Vk+vyF?hYXMW4;SW`J|@;zSQ+JkRptp3&3{$HIhd|dE&Vcc`S)fIk{C3!bi zpX1HUPJO;~udFDijKu9gB~jqo18!f*mApMHx(6C3E?~6))@MQ?ob_jwl{LE>CN9{0 z*UUgj{Q{GWK<0LVPF8`HMZx>;2`EYSFan1>w*TM1*Erix`Si9AzyFH1JT7wyo#L1- z*Rif^!V}M@p3_n)D-ijR; rZi}3cPH;N>nT^k74G(B#mF{-^`CQLzc<;Jg_|F`jIDI<9Qb9%ly0NwJ delta 141962 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 Faeoz-^Tc-np@l{rI`dzuB z-tgqk=hO*JKXbW{%o~{WjRnzuVIE_R-;O1*7L0FBx)2=};;4-9GvsQ?maH-6SNa}b(uzU&eBjgk_`FRw?Y^altPo>yLk?MRW8p$O-OR|^Pe)~=S?2O2_ zF;(O4043%GReV}mnq!$N+>`@jZwu%!g4r`}fNz7_BW!5chiuS%((m4klV+e=%y>A} zN;(Qv-5|@t?yk*=;$4&#PqwH?MgCEhU#{nEkuumJV^>b?)>Wv-(ORcEOa?dnuwi7) zix`CCF#(B#5bD3nf*N)-UPB1oj~?oes(ql!=#3MGW%4uBfBz}rGcO{AI{`qil^|AN z^IAE?wA?@e^TiU@s{l!bb>>bCzr>?ei-MYCokbY9Sl6bohSU3!bRsp2oG*K%|CQZKEVNP!>k56nHT(4ui5Qq^$EK;W|f z`F39%v#cu&`EN^>g0#HR6oW!j#X)=jemUZbxp=t%@5rN?gZ~)gl(5`Q<8o8@Qs`fn zBy%ZgDt!4~>C%Mo39`G9s=F|TyUY!+InF*f$*!_-j=zgR>V^PWBUg7}I#PFI%?&<9 zdrSMgME*RCFfpVLNdQT}IAs7$DI{50nlLfH1yLc|?V8_ayT~LAEAgN=i5rRAIHg+> zRJ%%Bnu4X3XA4(XUrf=7m zg>2Jm-<9|uPf0H!T7ewGchFYQRwcStAsGI?d{EKbHbD9HGPJ#-XW%YU0CyaJ96x0u zKllYiBz9N3=#?3eY&9%?0`kCa3rz`4CCN@{W__A^&*;9ej?CFuU5|?&%o#RC!Ue$z z!KuQ;NgmeEb=5y)b{aNSr8<>Y2VIXl2nzF`K%)ck;juH@g>B4=t)RcK|4%bEPGhC4 z4|;8@lbA;Am8$G`|KS5beTEA`^nm)TLCe%C&k){1Gy*mKS1=C2(B8q3Q%$J<*G0pa zZx(@-c^|Sm2^#yU8EU4m&A-Mjjy9b4=DP+pE6(5rZ7uPiUHTWIfWovS=W0~u3e}}-tX^a-2*9Qtkm-KJD|7!M)pxX}tJJS&~fZ~ku ze7paASCT|Qpz)BIz@V9Wg_$CE;3_B~Fh&z0v>G z<$H<0F1vq5C%rU9^EQNkMsHTR6s3L)rQ5bD3sIk*T#!oX-DyR=k}VwV|LZNtPw7ggI%Mgeo^__O?~h*W+coS zLSO5eI;-_s5T&bh7buHU^T6RqAXa~Sr5bj^z6V$dHwu0U%XC)E?It<2ei_xQBrR@1 zp(x%LvY7ZVTUCyt`3Y4@U>*HSr|X8DXE&bdQf5!s3ll_PZ~#=KL*(_+M7vV=f}PNm zZEr>=9`fTg+HLnGIWue2S5-CyRc7z$)ZsWb)5J^M_yxiuNTKePE(LnOhv!)YB6iM? zlJh`1eYqBGNTIN80X&XUTuJPF61rh`Rndlfxnb=b0uo14uvWvDRn2OfFDfcE{O}Cf z&gDkXbGLyboo-e+Dy9AO#GiL~o}b50PNaTebl!QMjBRq#S9s{yKB#_7+qtQ5GFc34 zKlqbnbtk@+59nK?c&gBEJ`$`%=G)6w&tL!;2suQp6)Cb-WAg6L{w)>a9HJM3w<|cz zo36=HXfMT!#&3c$Fo)sfH^WtmZ(OB-q`7QffPvHmrm85QZNKJ|J%#=soKmF zG0GzpYY#8cQXRY$0Nw1R9>r~$rs3sVeDeFDS$*S-1E!V?OPSDX{aO0X{NlyeQ~+&C zFnhe&P5r0KGY`4mdMccN1EoJ*=-u_Ff8PhAB79t?l) z8Nw)YMUr#RLPNYfs<5SF;0{`kUE?`f&el$e{38vftL`Kuc}~x*xIqL+*zM|k*`<4g z5_IXpWu~wP>AF7Lk3NSzR@Kuu3BSr(xz7&P>(KPReRLeUV{Zta9G;kbk*yORKzCuZ zF-UO~>4O$CfXJk;px7|vic4Ux`g7!M8e6Al7*j6Rh`-=T)D-F z#o3f1gj8Li{E1x2^=E9c*I6F4nFgaw03MeVQsn-t>xa(n+f|lG_ymlH15>B`D8Jdz z*`17eHmV|yQ^?z@P4NIP-NS0KTGSxP}3ezA4qzxiONO^xr+b6U~Oq^s! zkri2n*2;7;u|>zg)56c&ozBk_3+z@h_!_JkM@JdoEG5A<#MZzS1z*58#lvnlh}D#) zn~=UpnumF=OazxF90v@kDMkVnI`yDmTuWFS85V*_Mr<5UBMmHEkgB(c z5ud^sKBh8_d@|K$1I2VG7#SvB{6pp^3Y~XAyy8uZsWqDPwi&tYUmAn}M1%0K5W~Rt zhoREAPpBN!3w_;C-?wEu+e!ilRq2K+zyF@9kH7-20tc1ql7iKYFz`T!!qf0o38`vr zb&Pe=Ii8V2Tt_y-(3G8fc&xB!*IXtzl@`|!P4S$S|=|To8@j6x_ZU+78FeKu= zJqq!Nbjp5gIAwabAg|s+f-J>2gQA%~Q`rGcqolk=l9mu~q3xoMkx%3#95y|TnT;8= z#?!&1VdvPIk*7R}f+k479C>s^t9jqVq)7@{$EJ}!B>iNhe#`*SF>GD2c>G(*1qr!1 zY9frV$)3gWpITX?zu{1$cYIe27ynt%{`^m6N%O?Y4AZ)KJ$lu&2bZ`ueS#y96z6`y zpVZ^DP-^LkA=iOh#iXli`YDOv)XSzeq2=ZF@JV+0;4B>i(Ngba_SnSk+*GQ!>4Kws zdKL*dQeupvps*46o?>SpL^~*T=czvL?Xg+aB->UcJ$%iy8lLC7*zM$H zhuBAEC$bK}}U^Dq$t0hI(e{;ve<4 z;@|2mYTUonTjn?QHbMPg>Mg?Nf2p?tMc-$_=`F;w!*Lb%{5GmxEpX{h!>ISN>#j)> zinY`r{j0n04&ZL>)?%o$)VJnp7Up9{0Z*Cr2C+p4B(vbC-OSAD)`7H+)m+{&6@*>e zk&EG2K6mJ6A})@&H2dCm+%HoFtaF-+yblK##|6Ig!0SZ%@6u;Omz!?K-+Nup-+q?% z>JJ?{4Dv;PTO1J5T0{rww`VbSr{!Rp0?lz!CEcC|5pXc5D~im~XC*)W2Sfhxc2 ze+rYZ_0Qv-c7+eRP43>6FvlK+?>QqX>nL zA%x7hjC#%%TAFHN<)bl-D#I07iEG`?K9_8oNF~1?hWd)G#Rs&&;;yfzGa7M0Y0D)y zt3Q_Am6GEZsnVVAA-mg84uFcla+$%_e>jeht`GUMwy7@Zm%D&PB~KCZFOVO%+WURW zZG;{Dw#nMbOE^|m3o|zhWpGy}MhTTs?o42|X0^K$Z-S%I$rWc(N@r8$Si<2}#Y)%mw)4t4| zUT#PSl%YX<&EE`74YR(P#z*%T*i*dz7qDmP52CF0)UGf0rt0An4M2SUhkTzx=l~aF z_-&Fs(mglDVT70dXnM&blI+Hu0B!^T%ATYs0d4+11Qw)ENJMh~)rF+Es9FD07mBte z&kTHlI>FhC~w;7wn|n>qthY&5kX)fW+3N%HTil8Vj$f?$TpozeC1 zOUKPEYxC^mYynzgv>#+}M(vVwruZhUl|9Ab0F@x&kxwJ`Gqh<*TALwp`jVrC8|!vh zxl@jiKiMK@{s+o=XcRawAI5ix)CtLpLZRmR^o$#W!+3*Ms2|H6CbgR1=qNiMJWK&6 zn-MOB1x5vy*aDM?gQ@*45o>_L*3kf+#gd+dR$+nDigtSP!JK{!=LjziQkD*2qiPSg znIEEktjCg7Ruh?ZvHd7}njwR%-Q$Qkr8lF`GGr&AA02Mg>x2Jij0X5m?B#E=q%Nxk%!htW3IcM3 zLdF=@CgxWxH!MA~^YN$4w99a&DwXhK-An(?zPSG%_Qm2q*_U{Q7ty`{VqX9d{E}Zz zNStsz&ZTE1*~MdC17*jM_P@z9TD56PgKqk7@|^#hJh^{{QQQ|eN;Q9d&f_{=39ygy z#gx;-@5rgDNOY~4zL;(vs%Gg=&2b&*o@G6wv5QU zqO!+=@Hik$R3!1sc`7C?thn_9;tovWS8wlwnU>$=xD=Xz=vRlBab#M>;fleAec8O9 z-4h0mX~6bbI2xCk;YG_uA3^G9` zK#q>Hu^?1FR9k(sg-OMqu5~UaV*@nL3EF0{*nOMk(DtTxrICCzzQj$DE+#W6ZsYoi z_+PUe*}~Y6VIVqs=WKf>8|Y7;rNb$iL^M{l{4ps(VS@KC`7i#FHpT+=W=AzqKl+nl z79VJW(=8%(0CvoqDu1AFwoFtOSZ2zfZ1AEnxnG+mY~?jI{-&ATE(%I*%-b4Y#uE;-Er_Mm94&~Sfc#!GX^WfWSsZrr`Ti8cJ8tQp-2IN2tLy^7$(>03 z@ZUq<0OfE4vA4u@Y!9ia^-i5Z?(Hzi05e#x${=~HLNXS_rDg=GadkLqI9OudS#&q~ z8|(pgMte1?v)8lN8;y>slC-!%Pa-0EPQ!JMZmnED{+2FVY&T7LxqiUQagwGq&>p1p zUwf{$>KyxY-g$%8$3^_#@+eGPTC7<`#LcmmsHiyD_(;BHlMCx;YLk>U;=n_9ipDQU z!LXgMIq~VDS0pheP0=jqr~&_^Q{at@G%~E6H1n!AOZkpPS)9lcw?Q~ia-MV2;7(4?+J z$P>WHOv#l^=-+`D=b$Nikl+z%4J8UrhDjW+niJ7ly~+eB0!|7ea&8$WD0f;ENsdkL8Di)i>a z5{}RpF@KDlUAb-4idW-U2d`<`MRy~5qBYa%tB+Ah6FfLRj9)Vco|*%~wvkroEZU$6 zd%J;+^YE7DfVbptJcNCVc`Dnu9=`^rt z;3OROVD0*ZO;=)eQ|igvijA{qHB7#dx6u}Q9!NMGy-5fG{O$ymS_!pWO%(Woval)p za#&g>^*LH8L@dlwuEhg=Q6yUt^o;YsL%*%;hi*qh(zW0K(vAvzABVNuOX?L!yBf1B zwMxw1tq^pnIJL1lTyHXr6ro|NjD@y_F z*Df2M-dEeZ-?q;`*~wuk)yyb4(g{?WI;_ypud!DvOrTwX5C&dNDa$*Y2XF zJ?1S%ckc3Vtx%@P_=1@NQ7W4|Kh5NdifY~+bneRKWRwuk_c}*g(I7N;y7TwW%IbbSUtBNIb6ROMN||0 z(7cOJt&h3?S_oEk-JA~rjCEzK21rora6eZW*Z#JSjSF$#jIwGqgB_O1y{Qhr6|GtNKi3on zMz@FIN)$U11XfJ7{OS{igJ=vtdp2S=2s6>gU;+0`jVOEj*7f}Min7>T97CgrN%W?~ z2^9=#$pUfE9=tfAv_7|6KV4~-dDn7JP^{RqMKa(^%9Hl5a14FfPocpr=H-VSFKd2o zMEYKyb=vI>0Gl!|N_xLu=8s;zv1*N&NR2Lqh4P5hImM$VE;=|1*H6nwelrvdUhLgd zd;)5TR^9q52WdYEgxGV#b89)qo!^1(g?c2QfS-Ks=+IZ;QML{uS2BpXB_3BY$jO?e zVS!=2&^3%;iO|g-^v)lDFP1!*zKz>&PfK~Iu+n|C4rv0vv$#|c? z2d|=Hxzc4y>9}#Lb_M*~*RY>X!vGU>0QGm-?xz;lxcRY#GEZs5oLRL0-aWaBL0h=%XEin6q;(DHqeh zM4JMSsD>@$;cm~@>kWH-&sqi8PRQT>kIT+KEJ{{ZUz`Dng&zh~J)p-=i1FK*3-i7P)cI)tyZ12qUwXsCt0> zNO-nrpy$O_h9@IUv>t*5V(73#u_YpQ=Bx!GOpxd&IF6*zEkzOQkYNXp4AKjA4D0Y3 zm}5^C!{poO`iP60BJ1+-@t{oInP_cUmGxQQ#i^M%p&m7uHz+`nZuX=A1>c>z!r*f3Y{_-U4}lt z=vGwReBauhF^QrgL+Afz0`i$$n95~V9*U+77JgmVF*r+}FHR~oe&Jh!VzEuWjd(iK zu$G`@6*v%c&KHwq4=Z7kY`r@=oXAyBCzToGe{M1#G9|n2kW()!T=A&_o7tu8+0ONj?|KZfIP z`>f0Rrx`svQ!tqQ`sf+HI;!=t>>DdQ9qT&F54-uxM}V?3%}#ne1lCDoJ7v%C^}zVZ0r+g837 z5QB;qeCW}BNNb9!w5GfYe)7^bbEquSoaE9g_MWn()#bk1u5lm!j9>&8(ofsQl#&5?d#yT-q1SQ!iM{RPURuU|w!i1STQ=V)T%S4Fc zIXj5C=VO&SvA^lDbM>ByS}JboFSlwufWEI_N{`748rXItlO2b?2j@#;YmbdP({$7l z$qT=t9jy;TsfkMjKlJicWZkFQwLUAf)v3O4yfpB>90jkiAkRK2%p#0*33~9GeRb5? z8`d(5H`w=^g`g5-{UK@lGSSxcBR%tmDl+0jdk!k~6EkMrc}pNY@bpKiyZxL}7BFF3 z{%Jof6H7dD6!|<}=CyV4eB4uzfll->J67WB!XNjgA8m5A3%ypI@s)Jc-I*cQdAoyW zAv03~RVNCbJ*8Utd~aHBM4 zvvW@zecQ)vTvzhh(6j?5H`UY2aVRGe)7QRLRVSvmH0hJDLzE^agzdfHC()#6zW4wS z2Dxz`dIWv+Xr+F|jmW)t--KL>3vOQ?NZv@3;U+H{jVFwoRZccDX(VUaD+0-@ij@5M z(l%x2AWLX2N6&{+9m`M+Urf?uR;4_gVK5YNQ%}>il~1FAO@y)n4%6MCl&RrQAwg#1 zb2_*>%2k2!55nO@!Cg~L_mPc}@*jlbT!2ypL~vw%zOK(=nW(!JjT=HdLYZN1PHPWL z^Z&zslkepw7b{Z-o{qH$;sbz5!bQY?nQZ%FR35rjiG|g0V8$CCAipy8gbku5{xP%6r6@|AMcKK< zNzAvVlf3`ivV1X$N*aVm$W3{JnwDp@2mEI+-?W9_TpW3CQvZ)P?fV}CDc}IZFo;$t zG0RYV10bl&{sISop@Za%xgbe!P8AN$J(0gmh26gcDKW7M(E&;MJeaPT7a<+BTb=@EiiHjN&6z58lTs#0*d9@(!^aPTFY3lg5XP$Cc-qbKGB8_rE;m~{ zQZY*sZ>r3u=&1C@R|xqCTmaTT88jx6C%)8d&IG%e0+>+*iA zps~^lpqIjJ4XJ%>Fum(eetXkush;Y{)h8 z+I59D43Y5)r&{L$+_+9g?6pk(j@Ez^M~3}iaD%ZIvv}AWHF1{HPHW##v6^@W=h*+6 zu!7QYVUFxd9Cf-Al}RKRGlTt@tn|BM<8jVM459`;cY367*V4Po%5Ae`V|Hc_(n&xSJrrggz~s`YEYn5x=1{A4_SmX4S&}jxnRy5%C<(=W8%mT(2XbEd!T z6!{@||1lLdUSmr*UKI}B1^+Cq>MY?4#QlFvwtYXUfM>DW-Dx=Z|M86NN7ciQrWcH* z^X*ScA5217{cjjl<_rkMeZh(BD{<_V$?Ro+g8<$lc?+IKnAYLjzAS>1S+f&#Gke^> zj53iupzwX0gHs6@Z=*JE;5zQ;KbD>_hAWf*<{1vm(kjoo5Bgu1(->~1MG`o+{Pd>K zbd~yao-4G|KUQMmB(C_^)AV<^T!03DA#GsR7^yi^x1Q(HNrv@QV!0d;k75R`uNE`u z%sPzj_7c5a#(#HdeIZ=SmF=3l*GQ^6q_QL6c%HA_0OC)G_;=uH1!vWl1Y(XU##~x4 zUfIt?*UC}QjnYAk;v0-HOan7q*6-*vCB#W@*Sphh@5W5;)4TF^^APa&?xE_I6-#72 zvEgFAUmcIh{~v2_8B|xdbd81(AP_7_2<{FcxVyV+aCdiG!QI_8xLa@!?(QzZ-R*9Y z=X~dU?|JW!TXkzzA$tL(Co#7{?2JM#e_-hFhCo{t(Qw=!_u@`+h`Yuw|V>n%|9?m?sHztc$J@gvVwOmdd zhrw|Yfn#MUEsc6?`h(<$xN2omqmxlj_Tp45MX5#Rp3)@Tboa#P%g2oZz;;Kgarv5i zy;JUP@^*0NHUmwwi-qTc+Y5&2M0zD$)p{xZuJw$dqYo?#O2SijDQe*{!Nz5oo_SmH z6RMjnC%)9J*7-f}&!-{s6Cc^9l(UJ=-m^R1HoARHCpYfK@`60y0O{RL*;58C&02QL z$%D)C1%t%1u--&A-q+1S zhyk4hozx(gB-$U(M50nSH04_rCjgN7;h7t%oI%fDeAbi@ty*7pHX)?f4OtEIY#v2b ztMNO73l%M+HVHX`ruJ-I%%rNs6L;i`SBWHkT?f&`v1DMXRV1p}WR=?=41(_H#goR; z6iEOaE19G@84~g0^?_6u!Dv#ZEoji{U)X{M%^p`j2#(w;T~AiMs031Z#8r9>+M0dM z%%+F(C?-_n5Z^M!@DJA)GUl_xsB^|C>?LMhJ+^;4ep)%uaBP01Yt^l~*<(wbQp8jZ z_?FnJmNFM5th)*K$U+R3yIhOXL@UY|D!l}#Ro(D*B;MT)WLTUCSH+t@`5AeO#A&z) zCDHN@M$;SpJkdxV1w89#k#lT^2o^0sI*r(Zv$HNNZUr0~MAGL1@J=^D^jEhB`N^{|tI7s1} zHxD}>NxBEaa`{M`k+(SHW<7K&><%d-y^0D2Sjl5uuK`O?0svV_=ou|S<7PLyUP`g6G(!(AL0m+#60Si*{ ztkfHGQ-y;qTPdWDQSP`l1wcddu?ls-N4Ag-w#y6=A%lM!HD0iJ zcKv@cGS~g9))oI@WI~k5GK0*GB7=X;5r@B5zZlTmn(C#vbULW_#Uk|io0 ztEfuL#Vv@%n7k0}{e<^BYb+Jcf3%!ad5N!N$)!pPSaQ29lF$DlMCAr*#Gfl5aF z8k{)O-=#Zyla~Crwt?r@d;{|aVqn=3EWBpzdk)8sg^>1fB^0e+S>|f$d670eJvwhG zQx@xV=Rv(R&;SLF3fHLR?502wr5=4K0V?2|e5_x>4; z(o9Uk0Q2wGlwcuG2LMu^=AO%a`YTqw814uj{@?A2pg&Z2FSGW)`v~<< z{?2v3gyhz_{!W1^WD+@9K22nj*QBUucjY0h)Q||(3#epJA>D_wn!!~bOOyinP4s*> zhS{C@{>+m`_y^YyInfZ+RC(&$3MEy#Hg#27DAl)r7VuV8?vrYEAxR{$Sv2v46xM3( zcPd)IkQ}+OdZ3$oC6i88hU9`G=FU(vYAeW_!wa-jQ#d}xw}hQ{pM?3RbLZpq51SPS zM@oc;J#Yq=oh3J?89htr#h}CIg zgX+Qnq%Q>m1>LoU0&YnSwdb+c;|8(TvIaJM^%gT$yb$XJ>wIu%ruFHlXI+v(&a$-) z5FZgh>*ejoj6^}iv)5IOauzBwg10eAkWMYwjVxt8k|Y=l-_0TLx*jhGJmoQIb8X(g zC1|}wjR>+45(Tp-vEMOuATf~3*#Ky>=ozf^&HXH3lq6V;kAq`;vR2U8o&oV^R_lkU7n5lbNfLrs#9y8sUds5BzRD8&@+38{Eg?{#)K&>{nf872uYh;)c)3v{m+}N}D4s;A#$CqqYES^fO*@)ezMIf}nx0Pw{=<3CUpp zjE0+GsKOk5@F-O=1(o4w>PoAV3D^C)(u?^+0%(BbvRk%5SV)mesDF;ibTG7EC{mu{ zZ21q=yv0P0V(m1TG-aS*G@D?cuks&;-k_;rnrZFE&EoqI)Z_+3M{QF=fK4pclsYU0 z_IV4jE>yXeLmkIZ%CoP!Tj7K22X9G1y%zCua;8Fv&moWUgkU^CN2&W ziYPuT3^NlV+TjiZPW~MQMjWQPc@T?EY6~(nSL!@HzU2bnA2E5M`lC+?ByCOA^dO?o zmLTkfA_upwv0#Z2qK^dzZ6eWiwJ&c%)^DS?HcU4E*|GxqI8YFKcl|!&QE=cy8FJBy za7+<<@isLne96SzeCyjLj{BT0vPw#7!zR$Gz;QryuD!b2rX}tNFW+8`w$s6qKrx7r zim|*}csd|F%RFk?X6x!2ZP7G3ye%ocVSr;t)7ciQW=EQDF86jrLHc7pfm;7#J2{;7 z0u8tnx;qT8?he0pIlAhBCJe=ln*xBdfTb2gjU;JqirUunGwJ6kSeh%Se={49NGcyl zONv&2kqS;v+Njf(vjD;D^{=^(H0OAzX(oB&t7;`GwcV#8OV&zLO#V^)6Y8xsTO?} zrRjbCsO4`;NSM6K6}gmMd=JKoC)F2Vyny1 zKvOs8t3f6Wn%%21Cl;j4@y?auGhy_#Z)N4Hic()-z$aJK=c|JLV>ifDA+6i2P3MC$zMcF1aE@mftiZ#o0A8%8Wx^M zTY|`K${p?3YwYAuGr&Ag6}tJ^qsdK`_BdBZ^XM)vZ}nhS&7yn~t2sDP#DT;4Uu7O= zl4O7_&g`Uh;s}niv|>i*N(3`yj7E6Dy7nEEH+U2|B{!5DA9Y=`o|n?F>jCR0vZet- zZg>mj6%x&PHc4^lzZ3}~^;Zgz2w!v5@TaaJH`zB|P=-+jwOG(@=vYfTQM|1Oh zeGKS|$?@WXORn|D$TyoGob7GT?>9Cs4{su9Bj_-a<8=PIRa~*{O~c(aUY%b-_rKaz zD0xINvN@Zv$RpGfi^9900U9gMl8krLEGQ&}uZ>H}SOpv@pN&wKe>)HUV?1aLG9C>4 zm+@d>V#R;iRZwe8I$>sQ|M2M7{UsZ*>o63ZvEvW(gV5)dcy}kPD|)>O+@2)I>xby> zQY1eN!3u+PUcmI4@iDlGH{Eya&=MOlS-5c1Qw!tcobe?n*}-T*>XUHh0FhAes0y8H zXn|mi_lVG#hF&6MTyuf~RTh`rAX$BvziJR%^MsDqFaDpFqb@pva^K!4Rp>A!;mQ5| zLme~qQG8N?XtD$O-+U4qtzd_u!(j~o`QLm}B;(}YQ#}(OB~V5D<4pq|b<7O%n~{eR z=sZrH4@99y#6tq!4J_>XI-=b)3*gX~nj|inXYpoOu z!V2V)>CLPSa^z`mZ~kn|*=T{%tm8DIry2YfbV@>2X;=gq8ofGWf|bNVDuMLmuO^uz zFcr~gN})eCS=d3wH^hNde_3%=0=fpL&xfwmCA!McV8!OKih1HC#8f{TGzv z9s=|=zMn7(qM;O%LHV0$9kGRAC%20V3GF(X5&EV=k2ld7_5|%o*fmE6v6n|3zj&GKKt`KMtssgYg$r7^u^b%eB!v<*yx!s= zt)WU22M5mMI&_tFe=K22zFcrReNE>DyebaD{Pz}WMEBHkCNZ6dTd)L;)sZgREnc|; z;rVXfAEj4a2*3V%^@P#*>j}fQ0`i3U`JbLJu%iFv3Bzajk>MK!=II4or57aTPz$vI z@iF;9>~4XS9X}>%XI9;$f>a0#6X39~s`Jtw)gNbRXM;Jp=|7x}dY?E3GMJD1KVp;M0@S)gt5BRf`9! zT>-w{AdMdBtDE4(kN@K)h`*GgoWq1;BU9`6qBI388BQ|4d-xw_f`Q%tHWU0~cG5={ z@oIK5dJ%IS+3G>x91hB(&hXJ`EH|h9yCH_u&6Zfw7hbJS;%7{tR)>?KcIqN0(sdx& zq7jTtS@umsGiawZv78Fwa@QnY5_4j(sDh9`&it*ZqPsRFA$-+CW;JQLYPbEh(1R$ z<^VZa;bEUqfJ4{D!)x7vw(41mt3G1needkgSH23X8FZ&wu zX`%0Jx0iItIx@0)`7ZmL>kCW&;BhNPzsS2>9R0i#2_(3O1ev7IvJcS5#w5>pIny^ zC9#Ro&oHJfYhs-@>x^`un>_25OuwVYCdl%!Iw`!&caMttog4b(c&Y@NyP{`aPV)RE zdfsM=AzN7@XsC9ilxk>Cd>XH{;Bh2BA5}855g`^nJY&KvcJcPtjrZ}cTJI|30k6dB zPV#DN+9Vmxz|XsST~lwU$xCN2;S&1&p+Bh7U|KTSW++b8D7?A%biX2o;o0?xZ*qN8 zg+)+2vGE2ED>Fa)8$&?!91np0%RkLz9>0S z!#XV$!({atzH?05nw7{=>yi5b5dBUK?F9izv^KlkvWWc-q});mX4P&QPpD*Z0u&j9 zq5EL;4G1WI-t`A}JHqQjR8?_T5io+@dvj9u4V+hX77|CsQJsB)Qe@~=tA|lH;Gn#| zU{A|Q`d*B8Y0mY~gYlkk6wwtj6siZ8pvSBS(ba#f8v8wG^?Obq{G%j%jV)sl7=PbK zh!9xOj>yQiH~zjrL5U9&5kA#9T6?4;KH$ak{FZDYoqPhXO_E4FQ{=rffBWLfyXIeP z3~yJ~yynP#pbW2gOhBI?p2o+1adN|>jEoB^+4`BGSLj!Qw_ySHD1`a`+79syG90QG z7q6F+m*v{7B18W1DYZZiZwoHC1~)iXxsFkhB$h9#BEtuGN`0Ce6}2}$+-(Q{I17a^ zwC|N{>i?8VMY{(TZz0L2ghz?2+Au7wL z!X|)G^(qO?|Fy1aS=GtnRkDTQo)=i_2gfDO5ZML8^)O?3TedmK+F^7YbNkdG`JIEO z^%hTBBO?-kC2B+J$LxXY9EGQR3{7ZwfXZKt;CgUA>utK2j3|c8Gq%~qBOgfnnv{cBR1B0>Ikbq#T#04;{j;9dSmOP|oR8CyWhv$d<| z^Tzr4@Pjh0F5!T&%1Ky8IsZ!2kLk?S=T8!7);?)YJ`gON^_co3`+fQ#4%lHKsk(SH zSX$2H;!6QBcLSK8=s}$3JtJw;kACZdWowb<2|&G^QqDfw}SyHT&eZIfQ4ll-+NuE^bHCHGSdnD?aRjda(-oI z7Mui4r-SWYiC^XPPA5`Z(29?~rXQOphhv|isg=7Tiac?N0u~sIY;K*(Df4}lET&FK z1PvCIHWv!M+SLdhRE-S{VT(UJ$31{12j3SiJ8dd7xz_M_5>XCTHH8>Bp>0yO(A%d1 zRd|)_=Hk=$_D_Rh?duGmblp+viuqrPX4_KKk!ARPedMV|e`&pHHCyr|ly8H_SSaB3 z5DEThD0-{>>1EttP=)EmhH&_^98yNMw}foZIgKij;nLCQUC3xc`NPJvKMmv8tO-(|q2RK%Rq@8ZE1XA?vyV&LxSNm-Lb zoz-MJ;(b3cMP|y1Y=@I4iEZ2EwrqU!v{x?_L(}N>gRUM^L5MkSjg;$=>=RrtfTM*8 zk4LU7UWh(DJ~ETmGRwh)tgxR})RZ|}!qN8;)XF+-3i?ejB55Q8T}pq;c2yo1enM0b z=bYGbKZdK+b7ZkFPU&kE?%Fr-ZNfJh{ zG0f~QHQ9c^`IVe_f<}8CYYBYQv85^)!bUUE!{zN}zW3t8 z?&WxxXD}qbJJJ_0(c_effb|nuwK7=`oJ%*Q%8KTC>zeR9u*-)xCX z-9BR}sXobN1oVa28m?eCRD`M&)P|G2B-_|=*(9X1CDZpG$DCUG>3Aod@ElE8txDv2 zLD=QeS3CLCqDg!~wy|VdD91l!vayH34r*AZ80_3bQXpl(cJ@L@{I(B1ip1W(BG!w`kGh)z=zuVHq$L{G=Ju5{PVS|ao@ zR<@R>2(|MVOqs+f&AlI5c2(b!VFM=M0){A`667?XF#&E*L?N+zy}hk`xf-iy#OrR{ z2=N+*FQZ={EC}6#%^vWJdEHH)0$~m4ZNFI{SoI3!Z5>oU=IQ(6eb_=3)B2fefycrS z(#*$$+>ML1RP-ZW4Bbyr94mR*tC%pU(G|#zp2M`+ z|2(;yeyTV~VUr-yY_aCQGg*95T1)iU#PvdS6W`6<*J6xu}N1vg}C0zSu zF|O z3TW0y=_HP?P5Ttt01Ba9vX`X6-YGfbf(O7x06I2WiWI>fL&l9u65j?z;R>prFIfK; zZBP^I{XH&{;^=g(Sv{v9U+7eH?5$aSuB}Am`K#-MBpZ476|x+dZh^m;mDi}W0d=|0 z52&F3oH8MtUN}wqoYl=3oBuh-E!Ps(l6g^QQ)ax<`MeK#SiP!B#u66Mpd-SNM!M!S z@63Ij(JZ~xRq_Bj={!EEhg#q=h0OqNI`gE}yc8Rfi`IeTXU?cZz$)AHaqhaI-Qixa z&_+62c0G>6@)SU;^JQN{nfvkusrkN&xalSF=Wb42v-ykT)$Sm$!WD6~C4%WNod3x% zEU+%%6_(P~Q(Pb;0=}R9kN}~Qn!YYpU{{oLMZvT}28F13@_y~%GjY{t_Ri4DlB1Fq09Ce)FbQC9yw-x7`S&L7ms3%^kDzId= zno{{4XcKyk_HEGCzu-NoZY%yo*k^)qxuAS>f??x8fso%3uHA?}tlk{DfgD!+TMUMh zd;Vm)cEAXpGv~#Ipf|;G%4A$5VnpMhS-PcbsI&KQGmWnK!Pgm=5A+w8^bK`Y(ci!1 zCkF*olT06m`I|XNMx~hTG(Bh3)wL;!HcEE?eqy_wSdSA}{dnYovBLm^O7V;h6&2QCOYHw--Y1*@HaeFYt~ zAoBCz1(iyO3OW<^x=(l&*Q+7R-YO^64_HW*=^}d6U5=-hHEre2I}wWH%pR1pkR=bN z9@sD^PjCjd(1qxgQ*F=dmD|so-fhiM&T683Be>o_bX#Vs!Dt4a*mcVh-D;=pI1M*< zU4c#;L$r~r#Gzf+`VDt+&|3n-AUn9%x_hUSNpUm0j1PLBKP%w2kS40RtguBhUE z$9LtH6~*4sD)+;#*Ei<9;y$&4`kr=gQ3KW;*MCrEMrxBgdw$=V2mxo(uE>J1H) zIR$>f#Ic@51+;Q?N>uo!ac!PYSCU=NomTj!h_xQ#?TF#@h_!J7l44TO{Zyt30D0aA z8q-jYA`^u&S}>nYPC{FGh6Yr@kkv_5UbmOoyK=3UqqfI{wx{ds<%5-osy^Q^_}AjC2fazP z6VVy3@xk~F`H7CLs^Z?k${ABu0an|x6u}waz0e7da@bvv&_5fZDJ#*9ZL8DY+0PKA zm`QcCZ|US~2bLa}E5;aaC`?-Uw4pE*$|N%!716oc+tx91t5LXMP^7sTn0rY9UKOOsKR@2|14(RJcjFBABL*G!>2vrmTt(`9)5R zAxEy~rNBdhHw_~~T%!SB2nd+N+2ltJpgSH(?u) z;3tS;G($##TA7Sg$=4SWs#qRKiWiju=4q}z@$kbg+)9E|sNS9A?sgYZKNpXPipvl8#x zSTUHs)=Y|&H+@_86UEY9%1r`|XSzo2!PV}UGf7&t1=xaSObD~cBlP+7-tMzADrUhA zmBC?+sCP6K1ZP)Y-k!t|2#RU*fHGyWg{skD0s4#(FA%Js0}4cx)rTa9d`VcJkzh?= zu>c~bC{HHfsg;-?39^=5wh6hG{U+DZD4RdWk(2?E-C(SJ2*X&WiT+z`FH9}Flin&x zt#dxX>-OcW_GllUQKAB&%G?Aq*6UF<&M2nKe%^`tSo8Zf2&HA9TjOlN2%B>X*t$xQ2sSW{;{ijSd=UY zRDeicQtC z(ds32Ka97^Ud8Q-*S{12U2F`{Cf<>bs!m*7Y&^iA4pC`D&n^H9svMz9hXBM(N}AJc zsTP7t0!fH{1Gbe$nCPGNwq~q=5005R+Nz~c<%sLDn~bruMCn+bQA_~9 z8GK4drA$Fj(0o9(nZ$HP-sw?DH@h$X2_E<7(#%cF0S)y_Hsk)V$JF;rPOnP{ZT3B4 zVG|UVMMn%zBNaF|1!8r1>vEw*XZ`O*HCC-bVzuMeGTbT*^#ZG#LZHDvpTa?df0pHq ziP=U3*jE)#lj49n@Zx7*Pv_TSfrlseJdR;ot6OtAVtn!~A-c5X=DdG*kZB>S<&Xq( zM+!yR4~K=0(Vb8XL1iLQN;q!UECm<8Y#J9m|u(m0I$yd?j24B_=-+EZC;m`n8TZY1Pf(K;jN=oh?~%(W84F zC^W?wrU1j>`7_vUIq;-q!Wzt065m4_la3aei=H1-#>0SZtJ;g1Hr(T6W~+Umru#yL zIh;Xe*3opmNVSGmp=nyo$zCJH<=sU#SyuqN2*-FYXDulE($j?v^oeptES`Q#Rv6u# zSBmpb`bF_i`qf41dP8Y@142&rL#ii|Xs(TK&Q$8Z0Yf?;2a-32P!HiarV`K9;zoqcP*M zX+p=oi#q<BtWYSK`1y+v~9_o#yj# z18R_8Wr>JNs*w06e?izu66Zh&-$?)CSNoq|%HK3StonZ?j`)e@eDn3LqJ)-E{MY92 z$T;ZrYnqgpQHI_DTw{S_2{EmTG3QwLzhFC_TRD zqc!hoyHT4Pr?GF>Guho$@;bek%evv17=VB05ks>&eAmwNkep_Nwf3zBDOh~N;LFX(b zzE()kt9X?1swUf{l!4Ct-HUv;g53Zn!Akqt+AaUC^AE%`|D#lmKxe%`XHdZ=iQp-j z1?AGh`s^ScB}f!pu+tO%+V0wbn{+0tG6NhzKn0iMYcUi?hpah+yvRK-DkkG=I*dLV z+?KYzOA*M~1p%3p{Qso?zjq33P;H7qn z^nO#lVpuxr>Xs9mFtqt@I|wV>HYqCM;XpW{JqlA6J+GKsWsTaMK75GyPtWBJJ64v3 zEJjpGcQd)mw??+K4;^gEbyS+6(T5t(yzPm4E*Pron4=2^=Z02n?!Mk?YVN}^q0;_z z1I=f9LubooLlEr*8ZbV%$!D(nMy+hMu)XhawW@gos;b-|t$Nx%UCyN83uXP3Jh@ck5swmgu-rGJ29hL#_q= zj?6nVCj5!hF5={$MtB&AaDk8l;Mwz(+3N!0h?3)hd9tk-ju@mJX?7MYAGKoMr1%kC z9MfSNBz`=r{|$6yCw&-$HHKsWPX-%4L>mrV4vm?=z$P0T5;B22W5`7RbFtcpAtwo9 z7$wYbKQk$80#?_EhyKqc!!~0f#6li=!JMQvUiy^WB&Wa>u;K59pvy^|Ip~%w#(BmJ z^5Dbfv4)7uueW%;@*DKDgHq zCL#YTgfh|ZhQWXky%sM$<`4Alzd@sq4W*BVPV|8!w8;&i?};|#`j6;B4NC;StaXkL zp&A>;FkIM>Sniy=iZke;Lk;U^ChZTUPGUpwb1K5?=)#rGw!xScugq$3{yFmR<*df7 zrX&q6F=!^OBv0}dGwqY^L}^O_j^GYX&cHl7vu%x7{;^lRQgXBN6!!HA1xOJ`cXSMN zyXlA^(6^oI^FgPxJC#a&PX3*db_z%O2dFG>4j+_{bC9`Tw&a_y4=;=MXf6wv+f1Dn zr!SkBa0Dg?*QJDI@ozC2s#Z^~Hmw|Qts{BpXD(!s4uZj!UD=aUFC6Cy{NeL$K;fc4g7bi zdda_aJicYJ7ib~~Ef=r;aIo^6P^9!{2cn|N!VPwJNi=3@udZLwtFb@IKBx0W5!AtS>=4}D3&T$I*J{U z7B5#hk6F@}wP1s4z+EF}%{nABz`;L0i5)a+J?MGfaz$1jo$Ec_0AdfImL07PeyWwN z)R0bZx7A{L(v)^TYAZY}!qp+PO>Ot?W)y?k*kN7iDK{$|ZT4w)b7wwU%%WoJ<&Vzj z4}EwSXT#gf7|6bFJD&2ZQ`c5L!r^~^AZ_Q|wINTddctJBwHIr?%vx}|8DZRI-rdvl zJhJ=^l~D>2BUdHd4gd!#<%4P?S+2!{$I!V>g-JTgu^>$jKt5e*)1vmWkKn_OM^#%5 z-ioh%NtDAZ^t2~WKV&N2*;d8lp50Xre`YCzt|z!*BodKGr*kQ8ngJ_=-G{IRbw0}L z$zOduwK|G9L3h)-DQvK&lR52u@%zKmN`>-?-*6@)*24vUqN;rPK=yJuV5sto&QI%?kB`5$w^MG) zxw_vQGT4J()}K8rvkTCCKb4zXw~RzTe+w9yt)?8-=cij!i$W$JTrDb>(fi%}1}rHa z`{BqW=*llA%Hzn$ms5~;J1L)fuNIIUkSyjk$$!5P&)%iIcU+Xh7Y21^QJ6ffBUY1f z#Yws2vOO*WDoCH5)w6%ldJlOn2Bw!C1(ejpKDLY4H;4o;DFt^eo&ni#RvPl>vp{#O zyAjt+9UXB9-DV(_x+}pD7QcLKW@opZkPLpF0adfP{kou9mQxkc35k)6PFzLGdxou^ zuk6fhrw=zL+Xux{l3f909h2xeZP?Nl`ci>wf6n0soW37>d>{Nf!_amrJ=Wh+qqw*9 zMTsHeJAYQ_ zysqwT7%W6j{a@&^`3(6Aa2S68?*9T8j1S4=7{gOMulV-m-&fiIV~_~=5B8D#*KK6q zHhljeOz-etx6xy?1w#urEaUmVQO9#URQuDPZ<)nHSAJ zD06Viqk9ruX@Fm%NNar9zz}x_4$E(ZmUUjrCU7n(CN*z_o9TUHZil4PLk~KRb{k6! zs{Z&dbnjO+VUKe~vn@#ZXSguxpHxyAc)2@}9o)D*-G0-^!KxQR<;pK|lL?c%+R3w< zJ=Tn~yl-iAtDU7`yl+Vnt3GnV@Y#*pmBT@3?EUdOqt+^1d~@gIc^aVfxH=JAUa6R} zcWSAGkO;lX&ez+hsD_iknr1sZmLEkdmle;}bNl-F?n%hmXf&gZ zjs1&;r~7l!iCWnzO-rfcG8|4l077LKPt~J(%~=)@f_OeZA3bEOCV(KrYGKw=#SU>5FFJ3NWdK{4~)(BHqWINHAE%wpbTN+mD@UUYxyC-dFH8WiIum&D` zFA}CLa~4{FeZQAoH0H)8@@7ZnWT(53wF`CR&-IH=cX^jttCSv=P8e6FfcwqMYO@wO z-DgjCJJoCh$Jh~;26}hyj?>&{_Ia4DLAo4B*tWx9eZ!kC1G@Sfta`LaiO@q!REA<- zoNUb;ViL)Hr)`lx#7cY|-Yui}(w-hL{Ra&wdQY# z_O+{`7Y}**pbcH|PUS5XSo|See8KY2Lw$@20n6-tkjln$vM|Y|b$>1d-FygQ*;G0d z2Uz+WX?SF5s;;xf($YwMxbgNP+yEMc&^YMb;Y-X}1xu*071x!-@ z`HLcnl9%D1I7qd1v(fPVKg7NlTcRRP{u44R+Bad?gzRW*>QG$?JN}QIeu!UutvLry zyQ-Hyr_(|DkG7v8Y<`Uc*F1JVfE^6m&s22mvTRs*c9gTSM<&m!hHC*POl6lOX9U1q z*wP^*ek@yDPoOh)piV-!orONFa&xynx!;!wdm5o>c^*7&sLkTGOqw2m^kUO5H$z^) zrfSndL4{FRa_y-5af(rF)IPnA`Xuc_Sfu1P#VaR2W55P5 zdJYdB-pm5w_i6cE>gB7gw)%7A1d%8(vCq<%QKiF?U(V@?$hAdSF{9-KnR1Q6z3>I$ z`lDmvOhEPI!U}&Blgh8T+pzt%k~$(^b2l)fQB(=M3nKY!im2Ar#KAzU0#wzgR#KE8 zc&_JKV!;g%^Nx;eqGu;g(e)r}R4`C9rM#vR{t2-E0cRxcjK=}0KtG&#CChjbnIvU% zC_z^&`gx={Yp)74QoYt$Ny;V$MimiH{lEY8I}G{G{H_@cR1OFTKNF*WEeGV^F0y{C z=4r=-HQ@#|vbp)I$cDX_u?}|*M=is*=Z3u?35pOf>YE|uyp~hVKkiY2t_X#y?mGhE zpgQquiMyF|P*RCV`1kztuB$YM5s^GZ7lGuAf5WJ0xcbT2M>!FaX%eIoiXD>E?D)(q zIq3c%%s5tr>?TJN#{DCR3VmFpmV77n3h23a=C+aMorw%0m#x(B=P~-~#{q;8s&8ug>m!o_ULW?4z9em-73aO5QAI5FSE+3Y zQVel0?k)o3wb6&JG)=NuD6tzwN`ks3zIY>8fWbH2Q@x?#nPsY^QV%m=K$5^N^Tm#w zH}HxecF-4BJIFOhVtDxyHZMG4p0{D>>T7LWbYtQ4doxsJvVWjQ{m+8tx9P91K zYtX0q-<&rf`NMrG7S-^{feBuf>r0=CCNX-BHiu7ypkpt-`ulZPB$6K2k9_q!L7Cl> za@kq#X?t?lq`u-Mq<%EWsbX0r<8orY*7&|3@YN&en)}QICt}fqr*YdgP5xu^r_+6R zEry&}=!=BeKP6o7)emlc!WUByIx1ClU~7bmIvBLU1OMLPtqr`0zjY#!u&fKhuP><5 znQV)Y!0K0(A(s6KUgvM{X3p8ULhonmlthA2It4RuI%}&L>{2j?t$nD}qe!*>P%*Jo z5%_{B(i~Y_aAZq!aFehwyBhLV(no$J(2Q)_wYNJgJZ}ls7Qh*9Qvf6e1E2q-`s$3> zY?=TICpTc@a<}tTj8G}+%3z<<{wLMvfyE;+sB6L0-$@k78(J&Xk>*@ii-v7SlBB!i zHtme3-0a`2<}dBcXzkO-Gh5@g1ftWfZ*=#7JP@ipY85H zm^)3+4A6aUovP>PDY)h*d6x-^A8ZT;>1iMEmCt1seK#GsmEeDMVUD0{3jTeILmG^p zU$p%6Ie_VKU}{J<-*gRlB0LV|!%s3jC{TZWh{3(vSQ6R9n!6QL7AU;%fVybnfRo!% z!6j_O!x4`tzDkQDok@;E`W9JqNM5$w>yDK3vx`TyapAZ-Qp==qg))JbT_&)B%+djCI^gUb|p_Z^7>*eMmk0NoT2ahY~9Tuy41gwbS5BR<)SS ze5Gy)OS#(i-h=L8o!|X?QM#P37~D5{ek!Vf?qsFzCT2lv^}M2HyC>@-%BCXf?3;u^ z7G7@cp_@O8Sb*=I^ZzI?-&t~5zfJiWvsG0JgrHJSN8p~@?`fE*S}Q@7RX?r_&)hbA zchA*uo+!|yXZL8+!*oD>dcCi$`Qxw){_DPFx`BQ-4=QPQ2s4kPMg$`ER#}nAdCztM zivk+;11uPXuitH$A0`q!suBw<=<@EyDTdd5@G}Cq;-LOgy-$3yu{jQ53)Kj|{QmTv z%PpMChxezb$Sy*EbR<|^$&;i)*743ixk9yquP#upPQvzCh7WQRiNTGm@IiognYyvxRrwKYTU!){|DzB{@)9ekQZ+YZ2v4^|9gQx6UmVs1?G%>LetlTZIn4A z>-~g}NhkAq%9kxHLTJ|lQyxXA3Clzi)Xld?u|UTePq>OuliX9|POx+`)!ya)Z41=Lkri8WSGkWXK8BNE6ThZy`4y>}{dl&xCD+8T-G7 z=N3r9|ruh20BeH#3eXJlu7D(%Ev4C|Gwr9 zR}qxRr%uo(fbMEs!((t6p2axqXTo$oDyXBQndoF~lQr_SylN4QS+3NVC&SloVCt03 zMnW>E*HH^$b{$?wE6(EoY-T zR?9U$Va|Ho#WKo!kiwjEj40U6Gb{P2y%&FOeuZT))*L^ZE+#P)TG{Nbuhx@U+59=~ zPc5Z+!DZRXxd$56$Q=75Q=2HbsNhEOaMM&8RI_~9bh-bYbJm`E&xZ6<=*=@A;=RcT zsWl`m*LKdU(-agBD+73~>B+b-_`j>u-m*@7Z|)+<*Esh328MEPJkPoSGYT>R27@8z zU7&lZ69;y5UkH8aa^*vNVOm2 zPFnb18?SfA+#c{+E?&^oH%Uc~fj7l62_q)7yT!E~g|JnZ)l%4NKb1()O zY>htgnCW+|Y&DmXN>>_!_=r|YfotnaNnn70pR{&$UEmZRJv46}{Kp~;tFr785nddpL>exAP8BJ=!O zw_Du;?#HAHzj%{OSXXclRp3}%cX&Si*}!sIWWHM}OPM;Wz`Nm=-D}eB@Y-3gR1_kk zM5TVt+9%dXBiTWYFZ?oa8h|LK04bizULi*sDxIb(Q&IAI+uTJpWOv}ype>X2t>Bud zsO~y;p`ZWiS;*lZyOe#{!ma1FdKQBN89-7tBEZb-!t);$boxMk@!Pb{zGBN+fAL%2 zZktR^t%zx-+7fw7?74&ww}vPy<63Cgd+V@#@$By5qM6ith$zT|n&*3 zjbd7(X4^E*pGX>ROa-i5%xNVUS`==~E|je2!<%fpPmj6V4HiKY6gz=w{M65Z+jG+G zp6q+zD|bIxxDBwlbLw*4=v9JlL@Pi7U31P}yZn_ASxmiKGa3M8S1Uq_yS*_qx8(0m z&yR59g8&LqgrNN^L=kC=Ufxg`V}HNN!^{0?d4DpiwFq50OifTXIi9jatjm~mVgGjG zH_rcc=VtW8`ndA$i}jQD-KPt(&K6YXx8OwUpr0;B+J`SU0WAkK;KRa6^Dm;bz&%Kw zi;8ZYlI&2<$z#F#WTu9AlJK(SeiF(RT5nl_di@%A^dtk`VnrU4+b>NCi^FGY%=%j8 zc&SLa$PPezY(@`|s$&xm9yde|9xQqfn&ZGAMAT{?k92=d99v)h^B4e%O^o;f#tT*dZuKu_?tW_hz?D%Zgq2@JvYoK3 z1A%3h)L#U|+3h%Jl;h!s;c5pjT;PNta)y(N#HvEV#-HFpZXZ~ogwP@Y)dW%~fn6S^ zylxdkp8Eo``A_b4`;wG|hn6}QLt19ICWqAffw zITQrSG)}qz12!n{(OnIo*lz;4+O@Pbo(|t+J))Yv$uXrfmd3c^$GM`&n_kEn(no8SCnu$7cirkud+}k@_ zYk$4>I(VwRF7P@DV!aFAJ1YR(?cCJe*E)VWFTDn#NFIF0p~u+*+OChR-#NZQE7&*P zk#|I;+5VKi1FrhNe;_6g$Yi*WwUbr9a~a-YUGt&@n2M8!ZUS64)|e%)L4AdtyR)^C zIh8gcloXz$#Wm}A{Iw`Px@gJV(>d!ik2}t~PcA(zR~syiI0Wh^GIbj+*6Jtb+drq= z&YHFH;3fC0XJJp%TGXcb4sNuV;m-UYxA-zUN}X|LfYWavs&Gf+e8qd`G@Krs{Lb?c{7*ya zFqNOpy5c6VisgMlTbGXp1q)*eo@rW538|JuT2$omLrt7A7`hXJIn!7qEjkt%-*>P7 ziax+5E(NPZqi+{K8)3k3hPcDSGyH$*%|}1dbaOD81>{7ATvC825u_}~!hF$WY8s4{ zl9My`f-q9>(2hO-0Aci2d7f;9#u#H<~0*yuXd?E|k?omb&4867>&4p1jT7XBK zMqGLIWy1z$lN7x7?A7>fr^AYz4l}+?W6})SRjHP$ijyr>5^0%epChbi&`3f!id}*_ z85F*vra?mczfzWI$={6*T{5X~6!5mwX&Q@`;y_j@r46EP+e3qv<#-dbe8`u&QN*3E zwly{k8bNO;47H~(3%{qXghg<|J{OCY^G(<-ja#DAKy8`%Irst90%U^A{+9_3lGM07 z{p#$SXryz6fEyG2dS{hfXL({C{0wv**l7L))qUY~Wc~a?D1bWTh~Zc4y6LRVl3+29 zdI?Lpqoi;L|Gl97Fs+PI5qQM z1cPMbtO6=Cz{rGVLL4U$J0-$|HvL4jT^mTWQzn)(=rLaf2__sy6{kn(RFo|ym)A|D zkkbf@XM|uamhp`prGA#|eZFc;Il^Q)WTCUU$tDyvzC1r};OhMR4#%I$~MXKejtvdfQI?pjw?Er6yCaDD0_&CBD8ycyV(W z!EWnM&LBqz`4jHwC`I`Z{x|+Tk`REr& zbb-As{Y(w083`kjeWr%~B592%{!hI0#S`5np~n3r+Nv?kKxkmmHsN0x#}9Zj;JRgw ziyNLE|KvBwU?_7}GX>^BEi~6Vg2s(f5G#T<^|~ez%|xL9zEX)wfDQW>n^XE6fy~5& zj;40I+v}mAr4Z=uJj(F*?#v3b#;URhN}oce6w@<_LfL%uIE0ytGwf{HzrOv~#@hNF zP205vse}Z|bdAw?gvvwoQ62dq$zpYz!mn4!@+)rollqLwC~Wq8ik+v=$@Sa++FJi# zJ8PdEgf%w(k+)O_glOQ|M{91a@=RB2TmWk|DpG3bOrs9c>xO}JZS_fc zZ~&szkgO`NBmP(E#fOc9H)jXCsp&xe+=@G=)>^@M3Cvz}DMEA8p|{z&-8##T3aZ_w+u9bKwrou^fV!=_V27TD$G2jS<9z{VaK^`%%-$d<_&t#h{t+8o zBj}rgRHTu3R0VS?Lr?L_%xakf>*U9tx4vxH*g0ceuwRA#)<~@TFD7v+I`vS zu4locd4jP?E4G`ENtozzhbGo6L7V;))=bVU{vTV&O?r-tH5*YRUK?QBuI6YsyY76^lNk+qBk zh(0*XAdde26p1Lce)Izf)K#a2(F^I)jO;7>7SbgZ!^qxWP7L{7(P}xEQG|BVJV~G7 z9vyUezaT?``A?HPvUz5z0B^Do%S=p(H1c#aszBX-n-G(L85*N@UU{i16hfylFWovj zqO|IT&%GGU{M2iUA3Id+w$8W&7}#&x*pSaIHrU8j?9Pl;pS1v{M*k_4~`VnQFv{ywW#nhR}J!RacT%IPHIF(U&sn{gwnoIR#l@_%)VAK_=P%KrAM2wF{ z82Pj#z8N@NQ2@dy2hyJBJY#W0#U<8)!8{)wT94r=7Q#n6aA zA&3xNWh9ny2&9Wd(s6^pkcN!;M)643T&cIv916&oMn)Y*wEMBT+JM?5CgJ|yml|hK zay!L{lveHJ$B2Y^Zy(i7y0bnU>54KC5?I!$OjaMa27@PwX-T?=!qtz;@$@&H_GD?# zB0CPlmmA;^NX+&5eudCYLem3kxFYB>(cbqROZw!3!n?(RaK6=yEN@LlNZJuXJX)BB zI1aQQK@x%QYVn2*KEtIBe6=2rYYzQ_XMc5Mi<8)kRXxvZCmSsB({ge2@+UCYa`;E> z);@Wi|4Xti4V{Bp`OJt42$yTEogN`J)K@fcsNVX~80YRHU)Ji?V|9ksap8tHf!9iY zH#K|qvg#6j`po@wyQ}MnIG_5@ALA$+s%Vv$)XC_Rxyqv1!kd_73S1fWALPPT{bTVe zZ7(a^sXjeaQMsvOf9}few7`KooRkOW9EPARqXbSH#zG?tX65OOq!d-x^my7roodz1 z#-l8+ilrcB|GNqR*v1kdbkQcnP@T(5!p)}~wp=p%lcC3YET3TeCyd-HGV1)_v0@oc zsPKWv{g%_ff=dQ%A@0d<=XMG8IE{}etKnqNH#Yt*_s`o7k$`7paOr*~QF@3FW4A5H zWnMR+vYwQBJaF!c(ptQ!4#ML;S&pZpF_6`zUvXF+R^qIl{B;Yz@o_)W{>LrM_>ij# zifBQDB3hJGp<&Jqr^jtks3=Gs23ssn#qEM3T?tJtWCq6fB{z%YLIhrgG4-k!uGipJjAkakkpCt~wbi%0e#XDC09 zJEqM$?S_jprMlDnFyHfVYBIOD1*9)*x}IjsrEoKi$}W6)48Yaaif(?-A1P{k_{>!K za+9^$kpz;EfQOsok)0KQ{-sq8?{eqyYQ7WE?3(|6R2{P!$x3g=x^7doip>F>U<@tO zlqi}$@7kQ7S~h~VCLcXLPoC!2;TQg202AA$2D{05 zS;j)b;-L34G3~F9IcEOlgQN&rgpR)UZSi!NRghW?0`x!Nt}SYuA3TIte?$F(*zewT z(pz1x{?H#f8iy3c9M0-rQHljh+U;6EE<_k(b{$W%_#4i^6YKX$5KO|4T^po!UCzSe zeOSL3pb=E4`&5+Gq8Cqx2S{(-cU#QzXxyaEN_ve*fwONHqa%_=Llvuye>Ao}D#iXq z4`c$Yg|#JRXU{O`o69EPerK;}6=L-g969&tmS~ht3ZFd9Rk61|HoMxn zcjv)9&W^sExYxlfDM5K$LuW9Lj8Cdh5TH424bn8(8O~MN32{mx0%WR6DCykhG)m2w z7pGnINP9|_W=n(5MWmilj0NHCRzi_cNtv?KoW{3a6Jkb-%o3%6mU@g9w*&pT(E8x3$EaO}Djt81a_PXsP@L z>2c@OcN!C8mx-h`fr6fXYD4Y$&|E=^h%j(rIHUZ8tWxMVvcy;ATM^|PJZw;mfRjay z5Q{Ys1yVZHJZwh{F)4@ALL70RnC-L&GdIz+uDSsJd1<3&mLWHrr2OD|z5jS>M9!%W>Y8Fa=0b)!6qo7!s8tVeiLeeHu{uqO!%r zPEPt{=a2(QN7LSG{ts0ukVvCc zeu;2_jqNmc_|&~OC%ygB?kg%}gnwBen%iX5@o;Y>lLqDS&(v2&q_aOjE1=Qw{K`xt zVUy_9aip925NZpNwDFD_KR(ohX{5|cP_t_QdZ^@%iST^kxQv?a`zTZUo0$XREWzo1 zW6pP@yOtr?r0H z0x4a8Wj{LB%$dw@l39Ls`E#@xk&vf)A0eR-2iXuX>rn=7FE*oH_6iA9;Ejku{f`HV z;o`|u<^k_Z+lhx!w^7ErMY#F}aD}Ciey<5?0h#!e`d^K~bXsqXCBu_c-Mt^605gRX zsQxu^=}5)WD7m?fub|gSC;zF|*wy$}|6*(I!Ws!+q)5S0=PJaGC0?hDM^*5pXJ&OY zwt8N@%mmNxvtrMBZ0#NSJX*7vF{T&}2d5mjrqKA@cddM8o)9g#|4)Ny9X~_jRh0Ig zvWPi1P{sXVF5Nr{Kar6oDH{t04`59rATe2fQsufYMmKb~;f8){LL-0>f$v5&zb@E};oCU1RjG)&>&BxTN4&m{8SdldU?}G4b;HpJez6 zf?&HTiG-_5GeyIY6o?=cc^o*qw~Hztz#h}}1EoB=07qOVS+WSP^29m`4W7AJz$b-Wr;whv{3QKSf? zgzl#NVyKA75J)QBr7(9}ljgVVN7)E9std~ik=#91fH)dwF0Q!V8<#KTi?)PXJJtuF zN;OmNe@yWkTS0}lbJvYTlaVPyLk!eH3Jk{;elHB=OwJ}wx%<`f)!;j3Mva~fr@t%> zURoaXj6G*=Hcpf@a=8`-CPW07NL8&oG+|;S$TNmRoERou&1g=qZ5gK&w*3Q5B=7hu zv_$BFl4TsFh-DmVfAgd`)!hiyFj6X@#1UOoYkvtH_%S%YX28-gS%TXRqp!|vrHXx{^Fd1bJ@SOu_etM)gQrR z#Ozmfp8WWXIRV)Zhdv!SO?p8JR~e;YEjeS|k@a+SBzy!sE{lFlT>(-v-Y6^AY5%3H zNO;F|6E4EwLl#Lq?xqzf;Y4~@zN^x;4Q(HYB$;fW!IjTBYcc7Qa7+(%ZZBD9ran3S zbtZesCbT8>^uHmh@@aK*?<*R6SQBt>2&SARdan%TRu{{UsypYEQIRF0+ZWUfgc*&%K-7S z2V?p6U`(vM|5S@a3^srCa=$y1wPvtI*@!DczJOhhjAD9tIPXq7rS#}vAt5v|zfM+} zOxgLkI)JH-8+cYvW#)Q%WQ~Uzt_>c}`yoY5_1#W~xrT``mzB1aNey7vak1x9qk2*7J+Fw($r5+2VstjD^3XI~1>U_?JA^(cy&%yN0O4Jpp|kdUx^}PA-VLVbo7T|T z1d4oRgkO|*%+n`2G-XExB%j$k64QyY*6f}+B#Y|rgjh3=X0Y(8 zsAad%>T)r_Y!NsX9j4>?Y7CUMyNcv-RJ?NGdg4BDnz!?2*aWss+GeO@+7K+=bbG2C z<xc;$43&H)|7T%_t)3jy9!(A4xiIF~yy-BA#X8HvV2e52I68a$Idoi!!nV&By8w zs5K7`%WLFyWee!$0w(=gstNm^)Fk0eH<{t*KpPt|bpz)Rth2d&Qi7=yM&u#gdA!lj z7E}Hj6II2u@dX+lfebfwLskEq&pnHmnV%C>o15WCi%zS59MZ*~S~+3-Xk<;L6iC^O zBR08;+P3s|f|UO{zB}N+=8$7aBRbKZ_6 z3xL`0o#OgY6eEeBpDl8p?@81j)rSHr5jg3F34un5HkhZcU?oCHK`qv7EL{3IjFE_? zZqg&#aZFe~B>V~0&z|A~SS})F9f7ZW=%>g|3Wnzm2oa>*G6CJ+=0Q0rBD%jVb>p=} zbx{i!8xag5)N|1OKHc9}zTz!HB?rVLCA%?i6P-=hDPl5a#L1DdVIcRxQS)kE&`&A^RV3$=#%tx$a{*~r+6FT=Z+%^>xqr&(kL^i~I*n@hMQ>~-lQG{~>9E{e*Z1Yxz=B4V0iN&TQ z;)Eb#V@SlN5=joW`UuX(W%KK%awQjQrcig&*I)EjGb4_zePN`vg-R zr>4w88iTgYnEb^uPmj7XAr$oPMFvd4H9*gVxCW`*9J&5Hknh}lp5FWMmm|%MWAAXP-xNCqa!GuN^+ch#xgM)>zwiH=pY(+m_(15VCM<_Y zRhjFLm!WpTREah}+^bAyUyUXjn%bj`&!ye=rRWaXQwbra4pd1qpCZjL=E;nc5}N#8 zQiN~uw8KAp1!vE`d4uImzi8S>z*k8XWH9_tK&qbf$|>Gy{VyvI_y?A^zZ+z?b=Tq| zd1V2L?5Qq;b)NEc()qN%71MXZWC#B#rhPCnRzWS_dvPQgmKzEB=hU-G z@Ohiwp|9J!!*;n?F{V~LoRm17^qJI2$|ho)RU2=K*$sE_F0f5Sbi}`L;?J3XX)gXj z&YJEkWl01Yyw^vkUCAi@^P#iksdZhzo)-F^?Y ze2cYArnOCBWoA)-!tyj;iS1k{!C~B_l554o)UC3}z9y8vXnKu@N{h>!W78}eKis2= zbRwwIRrqaj<;Pl9>1gHtNJCf4llNtnNJk&0;IiT+m^~^?AsqSrP_v9@ok?+%cWb%> z@TO2& z2_FO4{nvMbcb&A#MAJx+@L9D5-K00M4rh>GPF8u$5QpxN{zbhRWqk)qTiaxSrYc5= zNl?Ui^nE-&G3K`XNyXJEi>+IIHtM@Kv{Ta-6gr=QJv$(o?{!yWaUutw%#q2Bsk9pf zT?1*KwMBCajwkRYPLW26S{)8eBmp?s&1{?x0ac(t)9ivF%PAnd4-aTHuYcSD7oUx#=Sk4cIC(k^{a8+TKpyR5e9YZ zs@y1pnWAux;HHZ{)c6+pkB3ldeLlz`?|XG8`gF%*sy{S_9`nY2CI%RH=l~PcH^B)9 zVj)BxS|-6ORX!#{M6c)<|3g&jQ=AwJd`YIN z2zZkJ?aGk6BlOu>bZ-0o$tf4B&u+nc)qUQGz*Cr0y5s(u@QtHy)l2E|qw)EHafHYa zu@vWt{^3GZQ~-J?vVE&#P_;Qp*m|lB4>IW%0%yD!2n}udb5+Sw;`C+lu{obI#llcw zf^|hy?kEXZbbJ1!%jcFTY)1&LZi^Npn2P=s5C0z~O1Z-9rOPenC zUfw=A9eCo>v*YtY=8s&kuwz023D^_n6F>81-&fr>=hsYjj*?ub{zYMQ_K)(!_-OUc)nR^TxdzZCvW?`kLnL78=ISE;aUTK%ZA4O|3 zzC;|#bB&hj+gf}J(V@3jf`$#8M+-!>t_{OyDTL4i*CUR0P`mZAj(kTb0vPHCVfnF=NDu9=FSw(EqXTs3+@U7s~Y@3&IHQ8X($}5 zXjOtssi!ud$>Neou#D21OX$3RzsP(qh=@8*+OdMP`p`Q^nZnc#!bpXWJ3 zoLX(rxcLjClJSWbp4a@jFKum&-c@yZMHjbrK4$VgiB&1)a3o`>8s)@4S2-tCva}(vVDn8zCu6)~?N%;eN+#Q9~oy5J2q%ym}+^A&;$mBST&k%O(c~PZ0DlNVN)WP&r>Q5+f8PUHxj< zsWOjYnn%Hx29IH$=?T_uUd%^2blQW+J5g>+S%f%-kH4CQEa(}Q>rs^KC`$-pjwcLh zVs~qeVNtr9LCfSRL?@=99KCyJ;%)7}L}YxgIrMH;9*@XP(WGr1$l6eQ-t6Pc8cjP} z0S*rC!yEQGUY1>Ns&90v%D|8=1h4{&5Pfg<$I3&|1(PY* z!V@tHWLh{|%Ren!I_W1LXjbe?>NB_ZhRU~8NIGt`hgp0SFhM8NADKNYoSkyWBHCf9 zyKZcMzKv~I1)7lnL^9}Ul?kBDxQr z*o)5?uR6~#g=&W(x=GoZ-AJ;ZM?pIJr_~>Yr-JdtxO47EfQ~MBVw~@JwdC1K2f%qM zw|I@4OzWz*6vwDY$KNWRxu(NYb_xzY5xw%5c=#}MlMx9}Oznj)qlTh@_=3{hzia*Z z;y;xY;K}~3b-*4iRc$K3n^CrEEzs&Gu%}=>@ms1&q2w(5Hj@33Dv*+M0`cx!93+9e z!mU5=uXj3 zW1?arC>sG?LOEpmWdWh1sUfQ0L!ku&a4MQudXv9N8}6@t%Bl;(!ZRe>JK)IH=PLJ@ z$P}J-a|_~u+s!lyU=z|}Pwj`kYhax~|1KWe=vhAvOep30NAUNf56=r*GZoNExY4T( zd&qEgOXYgd1S?O%x{#*{Y6rHsI0=ZA+>Ql^)Y&wS%6xldi_o<&BK;w+Uj1Bto1wvW z{alh(OAgV6#TeGY=#OoZl346d3(dR7IWS|6FmHUvZ^eu}H%z;qsQ?#B?H(FEAQ}dq zbz9j7%vu>9Zp`cZC*r3jGIi02_O6+$|3qV*HyNo$Zkgg;qWdFjtsz&L<6ocCaXB)Z zhvkn(IF4u+^hm@H;!?o)eZX5@O|Mddfq+vV@{1sLRQ+XHOQ;hJAx{)xks5DN94Kz6 z*xy7Ru!zebH-$ zLxsv}ra1DC$w8G2TeRX!z1h~>0t^QEc>eO0-N(2OHclj)S-(KVXep=|wVyet0w0ey$tjQ*HkT&SztDYH^QR)U z)RPyDs}c&m%%h~1$WqVg^$KHg3`Hgd+ASY9pDbEdynT^LAIqbKDdd@4MpacUdLz-e z<(|Bp8Im>312_qnWq=D8{lJ(MN#^E~VjA}g7xN<5(phLD5ABB)<6;A%jF|5yiQck2 z=?kf(S=>oC9TVf&m(w<_vh5(p-d%_J^@Bv){o~OrRmXt3sCD34g%&w(y(R`udaXzu z+8y7?rO{fCaurh7<-}*zU~CK*F;Wq6Xa*YXSF-OnnAK-f!~m&Q0ZT4U-}ba5vxJH4 zNWAfrv-e`f^ZnUc+gf|K$NHDFyUaHs=PWb<@V}+`@g-hDl37JHUIJR)@noadYerOZ zN)ivH(MyRSLD-9fee&4H?67Clea2+>{n+qC3wB4N*ImK=77m z$*id-zSM)l<=I6uR5jEbwJfu|GiVgl8vRMOfetU5S35^7;S(L0jbNI3SLF;gwrXHo zLbvnPxuU;nA(Q(Ekh82ucT52fS+`~7BkHY4O8uMSJ==y@M(j%TBx z!Ys-M>L}GVX|;36{t86#eG4juT|IjVsFSgIlhMFrVS zBXK&`+BCQ*yL+YeXdW$TqWGEjkV9||S~Y{Eo}=TY;edm*?40 z_I$aK@9F+XFc#ZO`I^sY_x(1O}b z@nST8x4&n|zC<@^r!&e0hFWaDbtOa~)eK`+qT#DSS{HovI=#|QSy{0_iJOZ6rG8fX z?Wl|uY#m96kHoA_waDp3^$O@6a&0;`EVL?#51P4hU#0}`WYmjVlx66QhjAIHHRzN& zfQ>&_g)yEvoZDJO-g9IhP=5vwAM^ikA7Z5fE8k^S#tIa;p->_q_WMGwBumSlPSr!w zFa`U&ctRo8E_l-Tj?;?ylS^7w599A*(G2(B#cOjP>xB>oAaP2s&xhM7sO4{sNU5Df z=&ME&%?OgD!m$vSRKMf<&XRACW`9hiE~CstN|!bt@`JCXh7Ax^Gr5 zFp0Po%$5=#z|hq5(U39eGm6L+v0I=E7RGrUC?RK9Z5;LlVP>|=hw50J#r6dcJmZ%s zNTL#W%eKE7>1f?P&OnACoY_$V^ej{`?^eSiB{oaCmXW)KV5;*)NR?B5M@popEBrwB zXtGqwp)|Se`gEhIcukp7Nxozq{jmQWnnYqf75;+bc7J7XRDHj@f4FiqSBLP^Y01lh zdtUqd!}+^~X*Njuf&OTD=$phxcV{h+*0 z9Ktfwdz}S|N!)T6(IKdK&-ubQ1Z57V{sd%YhA~VD-n=2}MLn~cM=mR3c=Bjw0}iWB zTZ((oaeZ|dLB<@%f!R}SxeENGut?=%`2tkn(R!)=^WS)aT6{pi@5}dcN-Pu)#9+b$ z744C12*N*!^o}%mD-(nPQ>Vo!N4<{Yg)pl|^p;cKaD=f+D49H`&Y>_wqke(|ADoWx z76VC+b(vL7;DNWf>0#Rx`x6JpI@_sFT0=F>h759Xq{Ei5ag|F{#c>A8+jWdvRKa5} zPC3?Xl{3e5+ttGC3|D+FW7^M_f69Gtxh7=>!F5k{c9oNEM-Uk2Z2y#&YG_2b0__6c zM>hYPXv;(I?$m9Zjqs1Y4h{;!{i0vk)@ngR`Vy_D@RoK%=3QKaH%}SR!sB(b703j< zaJ)qgHeZZ-T3^W&70dl5$&e?|nt3^K@)Bp`jPu?hgDRntHh>l?Cd+NYECts zSVJqH@`?CFpK43FYFQDBc$R_`f7HxAq$v?Mr-cG?3&*cUu3H;94K!0(?Wwu{{@4$2 zFMO$gwWYvRtJkgsf?!VTKMpOw)C1kO0%|fc&z2w$a&xAv3 zJYO6xJp!~<3FxqvPJB){p!t9p!Z2%pzB#p=yXI%B2M5mz(+uiZ)SBd;fT*ZBNa^Wk zvII)uzZW%!!@pvG7Y9#}5N6Z3*JE4IY3JkO5G8KZmQN3#q3Y@z6vv36d8p@bc+8uR(J)p*sb$Oc{F}3R&mU zi=Fw=M9-AT#L*Q5w)r^u9gJ_@aJoIwvZnLrKRRy9kDy&z{Cp7rGy>i|b@}%M-mOKS zw1N@Ve0_fSaU#*CR2v3+{((2Lm4|eJrDk8~0>a{a5_Vwu^D~u-l?9-VU6l>`b^F@LaQICtIfgnD?AQlJqZoMGw8!*kfIK_(c+hXIW z^hv5Bz(8ZIn?&+J-KkK;fY^1nrK&dQ%!Ye0oYY_Et-j!0zU!T}xTXp6wypV`J(^t? z^(b<2`>qatSfF`mDcuszFkIFIkfraG0p}6TcdBadsJmc3f@Y?5&O@n+!%+J%n7^ks zlRBX89JX#8jWY|>_yucfR88L=+BlKfX6{liKn*sdNFYwFQT)p(iBhsyFA=SyO{eke z+%l2XdP)-y3I%IP>5iGjSpQtWjIW6vfSB`VuGcJ0)fCn70~eUQRH%StyCH$iUNfv$x#?QR85 z_>y7>RH|ZSLYm^A9jm^lT~rn)hp;>dJ#7bALXw7P3mN`t)Bhy5#HgKU>-QDc#bXNgFUo(L}m#6!W7jsujubIzI1zg)l6Zckh zxP4`H2zss|mJJhqZM-MV@^15oEgn9h~q zN4cqdFN^R62{6OF|gOEXUX=(IB@PwEPLX0qnC2)0xQt16y?DVHI60P5yhy`OA z@)6m@6g&&74aRa6Fzsbn_|qVVGSW_n8LU&Rv;|$Tt`XL*AaO z2x7YJvZ0GPiQTNk9tvTFT{2Nq-3%lq@uy7YWPLBI8QmYKk+qSH;w@J-i_c@Q)sQZZ z3FE-(t7R)g6rob<=M4+4?yi>ou*3jaFnr2n zc=x>}r-n9t*{BG)*r6qamb=|m(>lomLtR;bK6dHm-g z#gsXw0Z90L+!TRiBwit6IjU&-r`#yD^ zbUKI?-KbuLI&81M-q#GgAToo&D$nfGk=UwSS8{wDrKIknPu-V^*<0CI=*g0bwN>lD zI4L!1mf%3plRtKLy`-?24%TiYf|A!&-=uMtk!jhi7T^Ag^cOL8q9QGaOkyo-5OgZW z8vwn)|Cy%$Vn`n;WB zi_feJW1?dtN@^-p=om}5OJ&`$&zIbDU9%q98|xegjt7>d9v;& zc61p@@$x!WOrH;P%1m{A4!IuPTsa2sPsWTtHw9C3rdd zDP1)qNh}~neg9(>_z(=Ytq25?pX6pD5&t`cCja17qh}&$gjem7y|iE`MWpJ|SdGvZ z9?m-Y_Xvq2fsvqTb$h;V$KLTgs-wNf3(J2{hDQw$@@YOLx6cgWli#iX&64 z*e~wWB^bJG+}{x*5Oy#N@N(!AZY6!ckTJ?}o5-B;Rl7vA%5c(^(eB{Zse%UJXV|0> zd!UI)zx9ggV+ms=Ykkdg3nNjHFk=pJgb`ZQ5Q>vf`#eQQ6h~T=0Q#O(2sT3X^OSu^ zZ%E?Tyfy)njTgbC?BE!tYE5;Zi3djZQ$*a2V)FB77 zOh5G8!J&ziArYnE{CMHIfy>1Hy(+&QD{?UQ&?t8I1}JdQ9Mc5|M;0{DJG~j0aKphpi>^2SO`UwU@BWqXn-v9QMRtmMGK-ctjwZS=;(S6 z_K0O|hqHoh@ z5D-SvM(y_N2fcm1huXNp=}cBXUB7$reG9H*A#wDKAavZAafQ&S^4gUr%&?{P>;gM8 zB?n(g)+#mBb!Bg&^6=x`uvMc~NJIG&(AjRg{Y@#Gugy{l&M9gr|5(tJ$(~}qQ(>k= z3>6eeDvG#UPrSS>a_!MDq~N+FE|Pu}#Hlh#^@`;gs$tP|aSdtGREqRTs&K6zj*N;c zlxUx|3K`=2pB8alL~FlYum*FVP9GTauntCxBdl6WV}Ow`CX3PAup|)%OrJ&u>j5$f zacPU3&g!gA72mzxJY26&=!=BY;-mS^3sC9G;nU-rr0f)pewqHnbsNacw^>LY{-1#JGRmMjoU|i0&SLt&Q6ZSFLOM5=WEAt)p-4;-sZ7}oQQ5xo zb3*aFLXDnB41qd^jfXG&F1Ri=G935sH5Mo^)R>QWWLaZ%QhfbqYhk(h>4nyyfY=g_#Bv2kRKS!;}U zaRt=j4!$DQe+YM6g_zsUj7DK zA>X|n(I7oFzPuO_@^>_db)^3>7WCL^Uq(*@B@PeNXe){r&;>Sm)_F#e@9D7i5(@GOlYf1wc}1-tjO@QgEeD|`3snM zwr~;&KJXnO{5#r*|23Ks&)?BXx2#R;9AP_fGsc9+Ux6Vv{-G!)FSDsG6$^Z~z>i5f z0KQ%SJSW|K5doIq#{~T59RAOnL!>gJmk4)V8#lEC2U3tSbvCwP4g2L4MVenE+5Cjn zPR31n|0_sG*uN+;aFnzxF#oMM?jFOIp2%kZH-^7)$dBW^{Vjj8Ee{1an&vz9_hquJ zH&U3vlg6;oY>z&v6Mvq&@7*+M^JL-vPB1reB1zA4>dk?%bQafmn$uju@hBBqqO4|7 zCi_ht2{bDams3lXJGaUU^AW_-&i!1=pXF)9gFcINa;SfK-!$|4R?cmXVFaYnhUTHY zzDih?YH4uKWiXq)iX{PnYK$MLBO_)^=qz|~e-{lK{|^2BtrA|#_3hpQ`xk3gTcz9m z*MzEpPTS;p#pxm9@ssTRdcs;Zi2GklOAdL8X7t9dIjM zJn^i_82za5MZj0?tLOCO55#|GOupA$CT z-?tl9OGrZ^nu+YH1~v{xT^O3vju=9K5wn4X36BdHk5CWjLHa z3ry|{X@vKgG3?b2mOkxtC6PWb5$-@ zb0>RcL~Srm@K%maaIt)NzZl)7ejVyo32uhK42TP&7D85OTbns_c2U2{C5vxfxY@kg z*ekoXs{#(oYpDy9S0#CHB~K-?77P@Jh=#?u=22EPFZB15+)rbYthSoUo(RM_)`Awk z9lJdfrt1#mcbj<6MjvrJ|8!h-b#uR|Z#p59cI`v+u1%Nq=7NQ7KZsZr42rd+ zXa4fX#ew=#Fc}2$zQ^$R%5*l_%FsuzrO8Q`_Ej)%F!%W~FkC{gwqDU8@?(*yrlqdlt1T|m#oGm9y#h;z$!Sk(E^{&= zicV)b2B8VmT&FTLw|2*e)P+Ox&M$SU_b01Kt?h=T9Bas2#8U7IdjkV#j3K>;4AAJl z#W3A7=k5rrH61q-gWp#A&%fgXde{96cRk1jeOKKUhlhG@sC*ukH)&1hCKg4er3o5u zIX`JOAKP=|jm`^5V&swem4xavEu{FymyC0vW8%(M!jenH2%&T~t>Rp@(h((5nbKJH z4;{qD3D5e{NfcDenoF#v2lty;@2)%@rXW6no){H3T}!TwJ$*c!=E7hBUem!tp{pMQ z(WlwdoZq0UF_`H zM0**S>AxI(x1YXHJ1ud&Yj`>N^&;SsoPSrZYo)QMR;YbIQ~LHg0WmilkxVBfczT}H zEKQa)kx)-|z}C9=pZnFjePR_9TqMt@fFcbFd4QO%M zVrj?11kM0yu0_%~@P=3l+PTD$ZuG!mHH570_X#!AzZVK0l(^m->%ol_ zI35kwZ<-R@zTXJe9d9^0Q?ItBEc-VOe=-I|h( z{CH5%^R@8g<982rfNuU<+4Z#n^Pl^%^Fo2U z9+M}`-7Xl!*@@a_cHt2$4^51rComl+c4rOWv9+V4;Ioc$I;W_=1O ze$Bg!qG##dtgv4fO>l*X6a6_4j=6mlX*w3VDD&FkSZ?TD%FGEBa8Q5Q#aenGc78r@ zdU%>)Ikr>71vX!1OBiuqR+2v{{z67+YxrX@$z!ebTy;l`qiG}9A;>hv$|nswF?#W- zY#^1!YKSA@6<61ZF6IX!T4G?>scKn?R`}LN(OI>kn2d$RP0QwD8mVi+Tfral!yg_w zqGAMEwqZbvsr;Z_#t7`Qu6WG&7y>)!Q%Ev85|&m(qTJIWiUJwC@*^Je!YJ@G&S(?0(IJ$^ho@flNlj(>HU-gK{th~&9Y86g^orr z1Q3rpBcfaSrO%n{Jst~T&c@mg=aP7D_=AdI|55wM9F$?%v0}!q;jG@_AqCEAGMPnf z7)=qaQl4L2yu!*Fh$e+OTbpA`Vz?76l3FwgiA!O%su(7P2A*_D$H&oINN7Wlv8)ml zr3qskWLhMutYlholjhi=(Bi`kWH6HSsDK5JIC_E($@E(4+6Ncla8;CoQjO$Q>Ae}y zxgFu)zSbq(Vp=c*Paama>qQqKK9YgMjLvUYVx$Z|p#$FVU%;Y@S0It3;6bl)qKx1l z;PgSNA^jy;hqYX*MW=2Ft80y@&3qGK{`tng1k=C-M)N!f&44m;>k9y*xfuC+i2DGe z4FQt3*kR?W%pkBwtM4bOZGydm7FNGx)5|U;JoLz!dQ7KOTuNNHKqpy;b^=))`NtSOxyh z-x;qkLK=axGcJxx94F9u(!!aVH?pXsjSRGyi`FIP$%u0Z zc!;hRPfK<$XG%>Z$>$RY6hN))e(EPC6;;ITf+5*`A=`PPvfhos%7n)|eaHCqSc|6P z6xZ4Bj4&?aOrOmyeHaLz^$^F$^!wS)7pN(-cD|cF$KR9;LY6>gM$N;2PpDGe*UNo8)6~v1c*{a9Y`mK zo%JuH>hduoe~IQ`0_vg+C?Io4@DoL138Ss$r-8welgJ+R?WruVjKKh=nl&h~LX_^i zJp77TYR|BB^iIF5hB3*e39UB?>Cjh?&;DxD_Oedk4KiDA11orcj65h#^>9G4g_RJ7 z7v>dQ*}M~aZco?OcDFZ!SOPbDajSmlALpO0z)wiC;(*HmgbQhr;cAcYFKwC%g=ooU zTSrTrRECqBgQU=Y5aB9^otDLq1xvWiY7ZQ~`<*s?uV=%Y%F~f@7#Zv!w=`Qbzjq0% zcR><#HG2QiI};^oR+UmFMHvs_=XPb{!+;@x@#G3RCzN&H@UTyP6b8PdQ}d%f5l)5J z{q~A`=$X?1%tYnk>Rp&mHxH^=d?dZQ*-TGkE37m&>l^$<54ri2g=v9#3)-ZEm7-E{ zSa@x!gh^J2B{wsrN18f+HG;b;s_jBdX?2mjVa0lR={eYRRf(46i^v&eTW}XaL~W|= z78B7!`d)X$QT^z!Vsp`W&Ll2sCOPW%@^TfoRv#ol_IJFE?ODNP?ed4@G^Il&EAXcE z%dv~xK)&Cy9Bja4TlD)WH+&`Ms>Qj;Fj;L=@m8H)^X6%*2s};#udrTI5DOi!pEQ21 z!B&(`643l~oVU=KDLC*+>0_~vHt1}@=5n>#J)}Y;1+>S$8ehTA4WFl$~decb;Cs0(kO@cuGpJPkZCyE<$`v|zC9m|LN zkdpbdv5wBqjGFBJRV@KA2diJuGDNVSJwGlhK3)|gGTZ|Hg9QP%k3U=YAIVdp5phM8xGJ zjakSNr(Ga2tkUt`tk!X67zmjeFC-N7ygrdQjQ;lNsAU@z-#sGqd~big*)$o4igW6d zczOSG50&6^gDvPFP*=e9jtJ>v@W4QCF;RP~PzQOr?5(lx%9e2v<6yzBGlwS*B3%6L z{BQ6?Pmi>GIz8k~X;9Hg#}OOR%eS{N`~%%NliogF%q5G2*4=!8f&en}yJO2yQkI@( z$21W~yFgtzHhWg7!MW(QCkbj-QMRmv3>uTX#-!(?o+3fYtPWdOglLpqf~okuP9^=b ziNV8lqJlDZ%E)gFcOi=F$;$n z%MyL;*e~zphT~^}+eR7_)^B3%|AR`K@DgrLz~9lR;&MJzbW5Q(CZh9ITqA1di44mz zq>dxRXpOhUdAz(2!V=*^75Og&p^NxS!=fc{p|OK5Wh)+ZD#{#)=4CJ5dG~uz<7}_8 zwL5)9YKQt4YV_^o)4NS#z^S$FDf7v*#v~u^UMAZf;lIfIvQOAPE(kNpXEnnYR=Ahr z)>!CfaNxK04``Cs9JWM6Pq!6LXER(K+I~~;SXTdRz7TpT?VP}7vzv&Yi--a`1*X}~ zehW|h0}OfalPNs0tuWy}$(BCHW^-$oV+Q1yy#lewtUl<4%FSb!?{YNw3h9w!lIJ4&;y?RCXS_kRGPJ9j(#~zmD@{2KE%EK8})1C;e}>MHHfcK6hZtQi|{{Vfy3xlCgui*0VPmp zC;;_>bomeDyDuY>O5SDg2>=(!|0i~EfO1F&P`?!?>T_P-aP6OoP*zfC52~Q7(jTsw zCxiM&9J#rM^M?=RJKgE=$%XN2b8{t!@9=MI1E%kcH*xuC+K)Jg3wLMkXSDb0Ivc=d zgRQA9hK>M{KeSq%gdWeo<;I%vH~pj-zw3DcTt}_h8@8G*uHNgdi95B<+qTIMteXm@ zQ}`|+Ps^5`ljY+{0ZN-Ryc*awZ&_FE!I=mbEjc_e`E`Er4#b$=hF;n|g!Sw<Sc0aGv6@na#x;PDX~nlTv*6lb_H(o zoL5g<_;~lOnXTbC?7Gj}(dx=3i1u0yE{H#!@tvJliIMy zTuPUAON81iY(-{8W6!hMTe)gKR8)Gd_OLC6_GWi~3_53x|7G>-`_?#DkRYZhE2 zaino>$`o(YYWFTzI}8hylLWph3$6oI^{U?{WtUHpJtNoLaXzDjEI4u8RM%*Y2|UOo zsL5`}Q?Lk@=psw5e%p-hJ+%#RTt zusq^` zQoc(alW0vFE23v^jY|8=qQpsypx?a3Gy%7Uc-%u88C&X7QoYlvYyb#2(^lb)iun|F zqEMu5mDI?gw$F=8pKUDMbP(E&Yj74f%=qk*kIE3pSn+i)EZXKPYKvtXX4O=&k7zJO zg)qe%QIHEkV&m+IqRd+yKh$~-l3109X^Vd5F2f!q3&wz3?pUFz4l1(V)A1Y9=1x(I zGl|>%X=F_@$mN^AdB*)3yUcC6uxVoFmC3XsEUTXEJrUM)LP8~T(7tQqrPMj2-=|Hs z8x9L}5+R#PAu2Kocf((UN7kuD~2VnE!^8q0jeHP_Y`;G zmA}7uRnp@i4)?#rJwG^?^OK5;_l@K<0FxPt#$!UV` zPKBWu8VI10c+%YBA6VsW0O-DHwlmjF>IwWr?)&Y}q?apRKEQ@NeTybu7b-O2CH_3` z^$WOJQR%#JmsmJ#V#?q@+Ez*2mSuR#-eAzdr!p}CNMhle`B^ta6Dc??taw_>o|X^q zi+SVWE4e2N~eK3U{V2FotAVV{jNcKh@3B~M30887av zWf0J5mwy^uydclP)=P>Z!QC_>u3W*fuj!^3A#VPnn^3PmBfMt(%jf>0ul9aIX!ZWF zO8^=Ii|2?XlM+rQ5RI5mp^B{{(oEguyW?Fr6F0)i!tejyi__Tc|I!=RCoAM6;C_PBi}NwiBc>Bl??8#Vx?IVatW7ACJ|Y z%`-BWt3t7V*}8;9EFmmND^KZ5u7cTykdIJLrDfzs4n>}*LSZQ_gDOkCYBJmuw$gz3 z|J>lf{=31!2t!w15%`sK?OHBC1fp&3QyMTZz8>Wp%M=vgbZ9oJA8hSuCmn+wIgO?V#M-VQsk}1_Q zq{pyTQnwj2+DFiW!A*qk0!27QaUufwJIhgFWn^$p@M3r?$wH{K1+g0-I>0JoZX;cR> zAkg`Ax~OkfCf4!1f@LUiVy%cHrv4BQ;q zPIBX3BK|1?`J4qx?IJs9aro@d)6~$={@vZ7+r)YZ`@Q+zeAUp#O>0vLGfc3|AXE!s z!FUG(@bh}$iRSSiCE>KSzvS(Uik#1balv!odo!car)vYiZ6F%KviQ6rBgt_j8xhUaVD1QZ~6F>VFZ5HM_CFT;t`4OgcY9DzTQ`k{EOU97Hg|#2=97sWz z2D!Q&H^df!o!hn2Ah;2-8t_NMA8oAt9}1F#27X9#o(wC@L>veL*80S*cKFt*bK!w< zw8bOY(&mdDPP<`y!f!{`LVi?M+V2p5;-6<_@l2jg3S)X9(DVNO^!3ltpS@f@xG=fsS8j8jeZtk3JVwI9?m{(5|+4eJo3s z)!eZd#mLo)-zX$GRM0?PPi{8)71CZ3KXIy~H1YCux-(Pvt}04!VXf0LWh;A^rL@eM zCgtc?}5=(V<;l1bl^6=&UmI4SD2T)Ulq&hCBP6MGO}s2Vn2A6zmy@ zfmB(qz6v_MP4Ot8TTx#bL-ldVo(;XYuW%7;y?0#nej%*1M;+fqFgq!$L3Koe*sg%( z(V&x56N{SHC|gchzU4jzZuuUB`b1^34uHwWvD zpMaa^gOZ!iPm^X7+DlJ@e#o0CQ~;d;>rd=&;4m$7VO@ zk_;Y3XbPiNcTLmB+#qJE(&+f|vKku_;?goGWkVQ@%r8l?`P013OEL%q^gO^N35el7 z=_{hKydlE?i57Q`ABhs;#&y8?&g+y-?gI(3N(laVSucp0^U}`-q^Zi{-d7h-7EGM7 ztLq+O^{9x2CYpt89)RxFU>82I;6C=)MAbu6_Wk9Z(Bp(s_S*B^Maf6DWm@w09aVQF zWKaRaj+w|?brv>3x+env*N|Og|Gl2XU%n0$Zg@71Zm7mlgVM~U{wwL8AT8;JWOGHK}FNfo$D%bRdSp?IrrGEg~swpT7nV)duJ zmr+C+xiwMgL(`yIqVO!*8%kp5O~XpiOz3Yo;H;ZF4IHN+Xiz!AvxBWkEiu{!ta^G} zk_q7>quVR^P`RV^=^noej3fC#i_o#xi;B^)hk`j>=SBcDDP4e>MlNeRR|cA-FiEm) z#nfJUw-~QszBN)4%Wx-VEJq~$wWW|DRmFN}1efOnKDZN&6u1-3JZ!QFSKhywKb;eg z-a@Il-5D3P%lS07BTPb)@}_abwItW3Ik}Ti%>6IyR!p;A!_TMs#Oq!>9?Rs!KNlB- z_?Uo|z57|dGF_kJ&bC`XiLja@yU}Wl*0W4qPJq&-J4==HQccA8a8h}RcUxYK2AWMz zji0jOM005-B%H?eLqTO5R|UsA6S>B;KzC6tiv~{1M$eDKBcB#>-`sQ^9|`7blJVeq zilh}JP;GIl{byIbmLHPbe(ur%G_Uvc!YO)B9LKGSRGh1}FMN*-!7@D}Ca8&Z%ituz zLpF_lD~XYo0F#zLV`0-8pY+wAnu&0r5l@>=Z+`9(UhDqayiS4nn*1cq_f?tgb1(IM zQL9R*>EqIwsmF&(>2NA@ut*!`_Ywm_gaeU>wsmRi!@~J_0U%^%#3T&JD%n-?PT3I< zTrmmyc)cX75%>P+)N9kRQJScEw?Zb3LbTv@bkdUV^ZVS9anR*!JVi^KY`P&>m5mej z9zk+AA(qot5g;HBf`!MS8I%sTK$e6gKSm)3CmwJtcqFGk`^8>=i;Y_qy)&Z#O|yq{ z_DJu$4})cBFk}$1j*(o_$%~}uP-G^SR{AE5Cl6m&58f=E-jHe334dXgOTVshxW9%lotk#bP=rRHaSrC>tMbfGV|NCuJPQC{3Dx$~P@M^% zMyikNcc_5`9f`wJ;%Y#?N35>>UG12p8yuyR3zn_5PSDTsxMl}|6GcGFgin2XR{E`D z)I$XNc%olSNX$AesZwcmoXAjB!8QXq`ZL?@MB}#5!@r3lOa^mSg*cSLaL1BPs_aFqVl9mwcfz!BiEvHaVC2 zL|Rx>vCm3K^Al_we0)5;U;;YPOGH}-U=qR?W50X{&x2BkX{|n`RB5(_DI69qeCDwb6CZ0hqv^=94YRL*yPQ9tzgbliGzT6^7= zjxT8gct3@N_#ZrV#y)U+s2p9Y2>((a_GAj5h;4-xD_sZd5K^J%gsFaR7zEG-BQt`9 ze*sXuCpwp-tP(tVW^@u0+|=Q{aLN4-HL~;LisFvwk@o24gne#B)sCrz6`B}jl4y+* zzZUY8Il`+&2FNo_CQQE9BT{jvY`Esar%R%78Y5!TsqI}T1cw&*O7HE|!N+2tBD8z? zN|z`#E`$OU&7xVT9(PCLOvK@Of(8ZtEYrzbqc}2n>T15fk+Yh5++XuRS^wsNz-gfV z#=sqh$O)qf*-qRpL<18z8_>1NuD2mtZ@HLa(^j9)V*ZSXFVrdR;(Y!P-wK&NOMm<0 zkCvZ;j%|>833NJA_~o2cwTjG0gmjYwi}oJ6bxk>5RrmE~y^}=<*rDJ#bq{R)!t`YP zdT4z1C%RMcv)4}zp9MXsbm3vH6SgsUfO^*o%i+4 zlwOlFKVGxITx5Pb<1D9L$4~cEjyd3y^FcV*HWV){O*G%C=ODHK=3~!lNsi%kdwOFSynpq3U#wg_ zA$9UdgCvIH@l?;StqqfcT2F)_BgN?>YMH_?kJ|Ro$<-j1o_;Qp(!Ts@uRNAx^gy1@z=}R*=mH|VT=RsiiVFWd-!bR}EZiv!YgBD;@9ha&lG4_|^^Kle#9xQ|s z@}zRPtox2Jo_H_%(`q1Go<7(88JLA}5rl8zjo+JvxcbKjQ78mraPL17h?5wlWvOYX z72Dz#bFDUj(;SRBRfT`61x|X3!ZLK)VX^LIo(8BAhl z@FsvSPAIkgTBg-KVGtE7O5gvU7Le6CzJOepwvcapEeWG?b^A1mwetnk41X6>qmc*d zjK3Zi@^k@4P6;ecs(1{+#PFEN`$5x~i~n_A&`6k?JVuJ|K6SB6PO4JFC%m+Zoydc0 z3YaZps+NdekOzv0903Ly#IM*Zf9ojeqA7;`$9q(=>L^WH_|mN9S%MNk-lqEJcc;GK zoF6zT81pwN_z|2GbdvnPNx`&?r2bBuH^~dvq~(b}Ti<;ckIz1NyCW-g|0>Y0#a@hK zqV#MBFU8s!#CgX({=mftO9spEykp1$1lggZtD!XKUOWzoDOW>m%W&;_UEwvWnm>B& zBVYp$8iKg!a?o8U1|ErU0s0c-n^@&8(-%~kDJiUK2(sMc9#>Qu#CqK~@2qdBG9d;o@3+1xvg&M7F*sf#UY{zL z@1){AKH$VLVRbglBqT1caKRUnX_LRR&fuh0pfqA=AUGk79-;LRDXsmM1fA8{l~ha$ zAQOX&P-mAMW)vG>MUnLXjf~4HasEAsik;u?4Y)OqFf#+Zc5%eUSFvD4f;J3un0nSl zY^K_g$r^$pu1Q2z=WsE)3}5il^BQkb5vE+IqyU8R9+)J;_}9XO%d4T>1^z*-(DjWs zeosiayp!jX=MN=Yn1$fzfxj8>53J6<(mzBCM&QZ3ABLlv{G}V^ad`o=2x)Ngk4)9r z_XwNp$(&1o>wJemJTLGfumjJ4f>~7$H%#>xI~s`vrF0&@2o_Y_8<}*!f@rhswJZYf z&$03DX%vLAm^-!;T#8~WbiOiezA_i;GL^H_rp)`SZ1P`1DY}7c*kv6RYr9wkU?7Z!wJpX&ifc+(6dWyCRx6;PZB%}p3*F4j zo9l%^=d1Wp6F>pXW>+dZ_YA?68JEKQvB7O6#I>+Wgz}3h9XF~x%0IZRzcd(3d$Jw4 zY`jY#2q2)9%|A2zfmu5CAGcHhxukF ztjZ(mLom_DwJ?-qMD}0_+PVsHBIot4;!Kez*1x@y>;>HU&GA?)ojstczQ&OKF$z-C z|4idHlxj*Z&lU;Y=eRKZwDte*&+^{1EN9Cthg#xIxv_Woi6fNXxPe=DBdx(z&b+Ff zo9B&G@)I{-vv?IxZw^+h3NQ!PMFBON2Q~9hxZfWG#Lp23;Y~~Kq3>04i>B2Ru}X2Y zOTQId;Kfz%RLr<)SjjU*b;d>}XPu|vsB4`p|0@+u*PT1&|0@+u(}AEKF`_lWR~@pQ zkORe~GU(9Elx_#{YChBiVH~)y+O~AuoyY2TJa`GbD2gp%=`Sgo4T;2|L_}v6EdaRl z{cL5tyWan#SBw9fcm%L&3~UfO`WYy?lj%Pz`&YHSkDBXZeV^fp{j8(0tlLDZ_)b0G z>~!^(>EeEB6ZPf#W#hw|H6TJU1-BZmPPl?nmVa3G66P13#|jpO4ueIZFQ_!`wmZSvk6=-# z=EFwooI8ctLm$Jr>M*f*p1=zhsjD4Hrf4ooBX#ZlBm;?$WKblGI z>u+SC;&%7O-LI zUpf=k>xh$5L|HPu-h&-i~uL!_I7r_>{Iu-^5J~h>eNR8S8O6n} z7%6=CVQuvjzS4XF()c_-wTQ{@%!CWhVvJi9hooD3j8h%X%_XNzOs~)*E?dC#!|mOl z>vBOza=+NdVQI^)2zEWwH!^f0acJxbEx;Kng#)9@8fln=j59nTx=5I;!a}#~h3MrW z1!ZkY{7(&T8Xw)Qip#s%mFK6T+~>QWUvE}@_6Ex*nAR_DgtQ0RZE94vJ9eRx8-Il@ zVt1s0jlEKzjM=PR5Wq#rLD3-1sl{Pt!`?=@USaID9a44il+*1Xww*tvDuFHYtzb=Nx(a3s5(-W4WYs;@sEt^#nNDl0?>;<**MDJAbNqv<#wZm%_3++o0073<*URqf z4x`7)g`!{hZPp&SF;|x+>awxzcI%An*gwJUY#YNB=nm0p=76g_CoHi`|T`p{QMRjdGeDsN2}NQ?P89`PHZ9e9*@Dl%P%z14@%7` zCl{K*fBKeR1N;MEZ{0SLi0bPJO-*~KGRxohb*T?7`jLwX)ab>Nfmc=klDUq_@NH4w zSIf|KMJ^2-*!4@b{OdzfZf`q7cX%NrcsYfrz<|*Jp9a8RE^=wIs5+Pk)6q?alLeZi zXos1Z9yau8eE68q#<9#jhE5C0^85@@A)d1#)wa*`A?9m9;^fT|e8uDUQ4|e!n2MZ? zF359y0)Rw1QG^F#&t0?NTDjjzj6u~zS5pE*z|> zgXA4dq>&V+X3a&Lg!sFou@F&CZ+q+Sj^bzn`4b#bP9hCx#aNPV$ybAw(I*LGWn502 znpOCkE{~0=k3Vuxx#!fIQTdPZpSw?g5`gA&Mv|RRaeq!a;lJ>H02&KZ#{bKqi8GI8 z;m^xw7y?DreanePctB4s|I3`bm7U6DYRF<~-_=m+YX27~105Y^uVo1PYQIc=OKG=i8X8TP7i=7?(@i6UWqwH?kB&n3{!y z(@iOnE_dCR5CkiUqF!m8OgfpDHAGef61923=7+f{S&eP6*1l98v&|qFTU%7-H&K$( zVygZ|UbR(3l%GQr{ey(IYz3)Qp?d5Ml*KFiW9be!dFnFqu+(+hBU%CE*iW{Qx^>yT zEB;`$HD}WUXrM^o>*wJoto4u7>BvU0gbnlO_q{DOc^#kd7c%v74qnvl7eBX%n^apD@IBFz zs9F4-Z|7E0QC>xBWqVy-dpS>$0M+lcj?0$gr_twG-I%k*ou^HrzixIXaBX_sTff;w zHvtE}>g6}B$4lM*YQlmoDe>QiX8__!r3D;PcZdoS$5>2pG`U+=Y7dR&0d0{-ClOFm zwLig&_0J-W05>L~E<{MW!Cer^#X@9I5lWLDeWP=AA_Ji!JUYwzv`BJ|^Wba}3QfV+ zjKYATI_F#BA1;=1A*gXe#`_yuI=m_GDYS*G4-DuDLh)`Vq-}V@p(9tn#RE13Cu?dq zmmU&Lw4;$wSf09FrZp((GQte$>`7?F$TZ$v9Ard}k@Rk9gq>mzA%oxit}36=Uj$yx zc2=iuwyJ(Ny$C!U%DW6MWM2@HfoqC`uwu_p7b|79^|D=8OZcs?Rs}4sJ)SU!hUhn! zk)t9a&*mK{x*MtI7B$@E{D3CJJ%Zo$Z<=$kHvM)^kKPL6ii@e>< zzOPf#$eLI3$bp#@J&)KDNq6yy+@fVLQ7&uw8RxJ<+dZuoyu7Qq7P+Oa<_1GtfFv74 z6aF5;aXW9)i` zeH@V-A$dU28Je3zLz;1XuU_j% z&31mV+Q#UpA)$_$;RFWvqbmkwl6c^FOg_)fp=K@TRmMX2b9xsFrwjJhOS01JS-Q2d zK}%Y%D1M8peEZ%AQ%dGjg7az+r*~TMU`OF==P*YCCHnjid*L0}Ur#*G2ee#6DPo)= z6nDR&%HWWo^QJ<@PIlQ=p~TQRi7i*4B#DSkXh)4x0`y^k8UV zO`siKO|!``HPkplt?cr`^7AJ?F8ZA#4D2Fnh=PqH)p5E-5hBNIvw}JlKFF5Yx!1VP z{Hkj=pZnGFXhzLSyc^#(Owe0qljf*Z`;OObA>j`B$HwH;g~rn3ARzD>P~g;Er^iOT zAtx0vqege8KnEYFVZ;h5dZf$bo8ORiUj+Y|{BibO;`Lm=A>23IJLYq8yNI4IutLH>cbE1<|0D1f2S;?-_m=c-rL5c>M_$+dIRvhc$E zTU)QfLD7%+W09fNAeC7#<0gSo937B&d&0ZuC~s^8asij~u57C~1#6%7x5``B%yDjt z6hKyyigp_u?^N97HB%fJyk9pmNYSbS8@Vp}|`3oS~7Z)Y~i; z&uHVXb%@oVM4WN*KKt9NGkg3#5`|Q?lp094jwvE`4>YZ*GZ&+V8KQS*P)(w6>#VJr z5lz3r%aR^=S?XEd?P8$)tA@AbN!BGBA&!?}fuO}C#UJxeWf>f~k)oz9{{6dZT>u~k zraAI+b(*LH)(_Vh86NJBiJw~`RzDf9ay1hcB>DImwV&JmnwS+kv8M^@e@hhl6s`TI zjVwb|k4E6)0NluOW=A=hN9BKK*w>TIP~NrKz$NAHy3mw}_{4s;c(&RlCD!nify(19N5C3jmlbGf`i$8vdF$<(sv+@N=e~wf%r>OLY zLZgF%E7}n*LlXN%JABkft_J)1Y)*rn8uer%bjUv$eNHjC@0+Hy{`KT9PK9rRxp%}Bv!L9>jlkCu z0H_U+pn^ioA@JnY<&E_g4Ul<_q?W-aEKs9N|J{&=!H*;wE?>-q_bJpqYg=K2Ub*-+blyB3juY{?d}a^amEF z5G8_9U#Id0KgTyvp?X_BhvCiW|vkz`yV!oAAJ*B1!5&%Kig?MBZ z)azk|H*psjKpY6j#KG8q?%@I|MbDaBY7|pdYH2H zu>Cc{bIm53q6#TXB9#E4F@{XHbyl4DAJEL1@Z<4F^6D`$c#Vu}2M z_CHnX1wVAqesJmZgTN9wB7O1*?A4m_cV!MYS4hB`p&B>HaswhGKzouj_opImDM0$|$8Zphdv{fLvo z>(BRDBCaX}BDr6GA*9}cj7y$az-X`4xuPCbn)9y(0GXRaHD_<-9B@~!VC zv{@zf2benL_12WuE?FHEoPA>Jv$=;U@9s}V=9k4@bW?p;-5Lk3`~Ff_9y2x9N9N={ zhMBd^crL40taExm{d5biUZ&6EgVAv<;NZ-9e^KOev46RD-8m4M-5F%+Y*5i^s7{QJ z?7x*a5Bf;Rx?t2~NOTu{dQReFMBM+Zw@REIi%Ci!-zT876Z-JPjun!#?6^gTLn4+8Q+n#KIK4ovHT-J+ZX!M&poN(a# zCjRsU3Up$Q@{r732gE9A)y6n)h3_?Ctj@;{nKYgLmf`XoKO%z6M+!eHW+RLwPsvy- zt`sa1jv}W=q@^RLkNSjDDm9v=YB%@OQT1&_s5=a?*PKYsss1H^^HE+2;87fX6tMcw zee??+Fn8AAA1?)#27isAlF4F`ZP<90sb_(}{w3S(+aOzZ6Pu@kl1;P|;e?ekjGmEJ9Hcmm!TxA?;`+KU?J_0D%L!=5e zHBFuocnykipe{I(?}8~FTq_=+Ogo8EMluuDPo#`K;h2&y7HUaO7i?L;BpsH&pjSG9 z5ae!N|EN*zc1KL}?xb`X5@u>7m7rwEXs!2%+QIbyvGo>UQFYz>uyhF0QX<{WAdQ65 zjdbVGor-X10qO4UZlsa!?(QxDLHZli=Y44I8hD+nVgfCWFv zmYPNjFBuk`n}#>vE^wHUCL~!&CFCyj)hhdIM7>>z#Tq(KwHgR4=c|524PFo(0bWO0 zCAm&k4_Ru~gjg>8@(VFpXu&c$(bXy_#c%d-<0)))18(=X_7>vOB&3L~=odKb4I`{H zgQFIjOcp#m7m#dQX7Paxq@lBJDEMnT|W+{^u{GsDFdQc8eZ*5b~&1f<=c z>z*A=0Ie#a{wt`w9`|6)RqU3sRVv#Fj&FNb6q`y>7YiKU0>{{lu@|Gwh=V(G1-bWp zFo;NQrw|Nv3{xR*>AA7E7PYCEnyPB0#Vf_y1~K8e&A=HZfGZCUz3rX~po17$@+r); zOnJxNp(ot!;&2&fSE1ksdPT4qQ&=O8yn&oB!J^1Uj-UGm4=K2sHy9hQLNA*VzYm>d z+=F#I8GB+86d7qo00#+oW%r*{{FB@v9+yChiG@g>!FC>cB$7YK_dCoNlK@ff6SUQn zd@BRd-gm1zI)3W#iB(EC#Kb#BN;9Yw$nK#~eWghtdl!;?Dh zYfSLuN7&@Zr@56;OjbUeO-nzqV8E8M4Afo;{7oemo3~2_C!ds z6_t&PALKH{It7B`Z@(wEI#SzPHlOjeDVzw(%NOXdj`E$)gkKALp!xA(y(dlgA%ky} z@AS+JfWj*<1%jg?`5)ns=w`qR$hIBk7?O1;R@~;Hf~N-gEM!t}3iNG~=4y~{R_hD++)J}PQJi@<_97#EmF-Dym1FAPMWUG{ z9PWJ@N7X&N$52x|i>Z5LwQr{gfTIKyUIG5Vi&2N?8o*7uM)lFiR&FomfRQ4fx1>m~ zsEie;|Ks(;?&jvj-QCZ|os)O;{ieH@{=YL$r4DAyU{nxiQ*g_lzh7B(4%fJX<1qV= zfF-Pst=sM2AWg$RK^nD@dyAY4VonRRDScZbKvnYLj=8??q_=v(S(?{eC(fH^2iGi^ zs0JU_cytvr8kA>(HsYaosPE-B@s?SrUV_Qu|EuREJcKA6#KvN2o0h`DxCdN54Y zJNb%1vT3;6A({ZG6YB<{1KCFko zY@}$ueImY{781ARU*SUSD)yxPj4R8uQxK_DkTaw=E+ZPhneD66Mxi8}@vMrl53_6z`H1PY;j7U6~TfR{?fojK2ko0b^et$)%|Vs52liN>Bn zBlF#N5GT{J0_M%1H3Egq~DE}d+e8os~k zh?&WwPw#Jf=>(~Wy_c4y(GL!O%vR`(P^fAkb0&8HDoaG(`h*$6&VPoO(w4)erq7~f zLHxVQ3i3k|39EbTJC^EI-^t^?xJi_Amlh%&6En=18MyB|U0P&Q2KESP*EJB=-dJ;R zxHUfnc~58SZVqj*TWdAT$|{S$Pn+h^0k~$OC!bP1KL6+vgrs_CCgz4x>(Wm09(~V& z#7TiQU3>DOqr*s+e)g(OJA3EmPy1B7{335IuwMXnzchn8R(gHA*O)sGT8JJrGJa}{ zy-0pwD(H;S=eiF`eW0pY*XSy$#0q&683y_IS7*W~tBRL)h1D&Q9ai6i^gVGVBeh99 zd|+S;dMGC&{X)NNeSS3JGsNacQjl_{Htz%MA@2(1>cJ<>8-s&8vmp*cy3gW9Cafc5 zM*)fmvel3NR32Xv5wJsY#TBXz{m18$0av%}s3J7420bimQ@vs{U?;ZIB zN_F8`_o|)Gtk2_(=zZh-L}Fif^Kc{XqaQrHMBL|tw%EWT5PDJ>$VktgRD*h{ld00p-n3 zl)Wd|+mTWO0Bp-8VC z7!5Nh!w+PG5%oT@!o};Oaa2Gc!+9Q|V`TgZ%eY|NLoNRC)6QL*^b%4s|U1i{c_LjEIpRiKquLKoW>GC-6CXx&HpOU>Z_ zY6^ffFnULkWd9`LTqtzJ6+=SaO&hP}i6SS*nvIG<1b^00q>)E2&C%akI931?r${U$ z3uhfeiB6bf-z-UC_Nut0TY;Ho5nKmHRylcUNQ}FIxm@CwnFtb8D5aDj zJ@sB#c!a3`(zny%#EgT=bTYFYbwj+8{d1dDp4L78ES}d{n3~>s zyFRH2k*{<^0f?R>GdV)Qhw9yPzK87t&Ybu%e#se3}zT1MDbk zEWSIV=%xCIJq5-UvW&Vq;4k7@&=K;grch)M2Nxa5$gj#lePq^2 z9O&PvH`t~xZiDQfH;FFg8L7z&fP9!k&NB(mY$Ee~lLGei>=+seHYmw? z0ZENqKLrnh{Xq7J>=aWiC~4uZL4mujPRSTleQcz*3&x41ydPL(qq(~Jf-H4bA;GP4 z=!A`iEq@YCPShz5vHLmgDql^RZeU!`#;Cn4wAorALA;^YWEUCNSfssq|71IR#Aj6! zu-)4DK#d$^5G0@QqU-n)RkHrgWgq4qYA{=p*r%j>3W;PRx5{RtAV}(lUx8qA8p7212c(T@i&!Bkg|vtM-hWMCw`hLxp+bR*?;z6 z>i*e-0e;u@{e0SlISKf^3A2b>TFZmw%#&W?^ASz;OUMt<{-3aydlhm;2`>IH+k5zn zRZ&0UXmUnzzch&SpdWGmXCqQl*XTsGWasyOY3%sbZYrUZBrQ;cv)C$3RX#XAzu@)Y zw#2`}(EC5dUV9Osiy6@96YY`I0Ewu92AeH$?msz1geE^vgf!|41PHB?RVd2PQ8`s4 zH4={e<`I>Ztkb8X{TM-YjvtJ-)pFH@6$HOSVLyNMA&9UCz2Macq$vBNP};t`_M}NR zu3S%QTWLn>y&QIbi(d` zfiKxMjTpFCJbY10ax^ObY~EV6CMBk`_~aW$z3XEs(G0Q-CJJYPNNnqFXLLVBMeOOS zUHg0SpC?p`R`RJ240(W%=#Wquh+x9)7pJuDn?_HFkYc5)#KlS;^DmRlpEeV{tk$$2 zroX-EP#oY)Fm2R{u}6x5{tHFC7=v`h+FZqWVpgp>NjqR038$eXC5mK z`$b-I>UUDzeqPIAkl|YlGjlhO>tD0JQ*zAx^B!eS|U4I2KHkQ z2U%pnf^~;qtsw%ByDuS#MLl@=j@xmdc9FS@t2x50$eSs{JN++^bG-94snfmBa=pLN zfcpA9`YRL5Y^F0}wimu$-7oII2O<1Lo?1}PJwgz*O^{enrHb)BV5Lv;ku8F6C5-eV z$zK3Llph)1<=rvC`~5ph-i<&SgMlmZQ_?xVOu=0k!ys=@J(VGP}vx4BO8FD4B&?eehVG`kvf!;N27*( z2bHx-h;_ottB(^-?EStU!b^L47Pdy zX%6^5?X^F(H{tc~_8MAAoa9%wb^yj ze$Z9RR`*raByKxQVTrMCO}ld?Vu@{uXqo@Oaq>jlZOkO3q2s}-2Ex)zs_wSTesMoY z;@lQYxEocX$8hhkvoZ2+;Jzwk!|EPRiFQ9}Z+6(+K+`3rfb973>bM;p>)|EuKk8a; zZDtNq0Q3uNC_#z%tX%HzqXT-=p~2UZk{!;e#8mJv#2(5u9!vU=Q*S>orH*Et^Fiw z2vuE#Q7l6Lpr9iXA5^N$r)hSI42ppq>fy3v1rY9G);t2LLU^U?%F z42|zF;dBf2W~tlsYPD;jYUwA= zZe`^s=i^K7mi}%Y0PkCauhu~+G=yFWn7m(G-4%2yyo(zzEUUD_YjfY;3yXU0#5 zgW<5VE}G?K70`b|YG`5^R<=Ddc$5Hux3^343|}RJKvxrn;uB~?mGHcfzxXj8WDiYWW^9cVj{GvGZQ|3b z-(6i=?$ftt;`DHQef0s7F5SQbGYs_?a}2`~kx)C)kOPTMCHo~3&L^6=^V`QR+xrO| zG!e6xOHouJO+*J^>BE8N<D zgy;}^#Vi8G9VT>^*}3c>2ro<(@cv462kEPx9>IXZ3c= zT<4d$P$ugc*MzaqZR$cL9n=GyCT*PmfUt`b`@6L4^)LTKo5GyHbuH*+Y%fltHp0J1 z8fqsLC58Lu=sLl)u7_OH%noD5DG2%lLQ#-nTldlUm^6$jl^l>*?>|Y9j{h48Lz(#g z(a?#sghO0{p!#tXit%Sde_)9>#DWsoo|BdEa#XsM9p>ZT)&xP2_9BJeBtqIlGo?~Z z^lJLk7Jm9uYoWgIPpxS^8`_irafWlku>V1oKKr|xXOK(45W5%HJ_o-y2`cdq=2#LV ze4&S;L%>Y`?-ho`A2W%b;C@jM)4vCyB$=L2IVOz&nN;F6>i>)nQ;2aDGCtgYk1r6Q znS^E{8k+onyJAUX-5?m1o-^G>ctFXmVjmJES1TpFKCYeBCTDcCW@LH9GETH3=Uz3@c+ ziy^RA$op^_t!`REVZV@=zzxY~bDI(z;o$$%LKcRPft#^R)mT4OGSuuQA_rcj<+H!w z08lLReV637U1FEGhi6=%o-ih9_pX?~TmB997$lqbPqd zIFW;oMUR(_5*G^Ie|lyH-~9I)cnl>bT;>B$q8ZfF?{7qG3jY`2DpOHYu7*lSfPDfk zu`dQZ{B$$_fFlUZ61_xEI#m7dA0^`z-FS2;_|xyFbMx=B`D_UCbRy0cYrjo2`~9F{ zpZ&M7uV6%BTSwzP({1Sg=jTVw!k0t>o_^!*-$Nj=`OoM&Ohs)`**|b3UPG}*(GLkO z|7W`XW5Fu&&%ZgcPrxSjMS=1D&lp|~$p>Y;wB0k!h57fFJfms`#6WSs?-0Q`7!f{E zLI^ZG7!ORO{mOU^@*+odFvkABOP! z48$cAyJMY$-GBJ?V0I$CxvS>3?H{i~0GwqDTw0qijio!!ED4CX=?kKP1g@P0f1L2X zDG8>1b&%G)3OTIaiYhR1fuFz5YMJNqI%Z_7$^(cC8x8f98HqRblZ{UC> zgjAIviI~N(7LbhTW&CZ0|20ETGg+Ix;)xSsTTEMwTsVD=n!fV3T^3Dg6Mw(kXXX0c z#K!$gtMg_ygKfU++}sg9?>FxjyYLL)>#KF61UlL( zV~PQuhIx5q^)f|uktPirCCVamjhyOv79g;wP<^Xu-c;ovlg_C|q|oVg-q5iryInKb z)(maAnG14?<-t()TectlJhKb@&5r{esYrUu=_^*j&S*MK{0sb#zt)e2(pO5W8ykC= zhpAiP?|25jQDuhTSVsW9T1un@~wwMf)`zqk>& zY`<=3PS|TW*yH-LEj@kD?&=f;E)A9H#K=@)qo5IygS;qX4U@DLj4lzxeh~l-fg)a} zxCoR2vM@HNUA$KEJ?rCO7IsrjbY=G)ji0BYN(^z#;&Ulqy0s+Kd}s(FnG5lnzgV8M zmm8^jO!C)e`^7*k+a@dx)oUQ-{=!Jz*!}BU6f-@XUXM>fb8^vhutCVz%ai!V126t^7Q;NCn3jzzP)wjMC?oaWQU>@gj z*Z-t5Q=&zROi%PU#`>Uqq(W5JZ(PGvv{-=L%yPfib#QOC9ATnSdY}$a%dTjxMqH2V zO#k@mkZ1Bqdt&504;MeT`$u!4L-n2|DXi&4q4BY!mDH3I^*o)0Jr@8WEC1(Q=fL)b zz{rw6lIOPWLoL+#&99j~v~Jmf&&!VCB>CQse!F45D)k(XQm&tt-stu>6DcXdNt|N> z@<K_MQt@ z{X;mOW|PW3WQ(lqB_;NU2RXq1WmPcjRqE_nu)i4%JA|9$K)U~rAW3+ukC)IRnEYBucz{vQYnHpkRdKUTz@C;!viuPxQyPS3Jx;*O8AH z2cNYRcU#7}Za}iOtj_o1sbCelO#>^~#t&YH#cb$csBsruHK3+TruXNG#eh%M^*JuT zDPSuvzux3;Db#Wt(ssJ7z1G1ebx8dLl6>RAW%iK46g>DQx6>9kOW3dhukp9-`1Z$k zFg)1~8Ks;dx*lcavT3uJQ@S1HIvvUoI!fifLZCrid5G?R*Bl~~|Jn|nre(l71^E19 z9wamKvluJSru4M;ZpY!^S6BT6XsPsik;mQ6_LKe1*(A?wRcK=zRcS&ipR3DNoym^d zbis`C&C<$ubaQtOs4DLJ5r;Z`vh?dXxuNZ!KguSEgHvLG>!v*#A$hnx|EJO^|M{FgYw9QK6C*eWKbzi7HjR1-)^P$&4NF!rw zO2hQB(IUPpI5^Qj<#hfk)om_CD>aQ+Q@5cR-0>s#>JW(4@|LH$cl~UwpY*;s>wWjB zxpuwT_7tKQD_=WaK7M$l@7nAM{L7kU-qd>M+^+x;F-4fw&!mcjR!$t>gYpUL`S)w3 zBvySp`QEX$^)P+f=HOq79BU7VR95Y-MtAlExW}&8gJvZByydjj!e>`aUbyZBd#}kS zntWbv#8XXFC$E*e7{W7J?4lBEk9nEAY5rb5z2DHhy(^OMH#?DWUyt+9Sc>F25o-ES zWv&f;0jHZt(2k75_bzV-fq#SZMKsV9&OK|?b~5~ ztY84Yz{AuD%vu&db1zzaG z%bVKgAd`E(?V>ng6%Y+a9-TvNY-|x}uK~P%9z|zRJ9_9w;GI&d#m?jA;3*ceF>+L2 zM{w$V{^PPX?vSEl)pEhCp}7L`iD)@mx_85$%rMH zJ_y#bGP(8{?Y8EFH8jcy<=MaE(aR#HO`tfEogzSvarn8|7!a_ImKd%?xC8{7N9hke zb_x*tafb+SB0@5sI3ztg6i1InbSyCO&CNqn4O3Z6ryfZ7gWhh8*gU`O*ed5NgxlYO z=%R|0>?CHCV%>TQ86JjOOvHYg5ohi3^^L=`R_A+Q$95ksDT}`~hqkMmLe&UBMA%%o zeQk5_Y5~>`%DI02|rnlheJX)a7Lmr~8DQmJE3Fk7Sh-1RyBg1p$I#iE%v zWg~KA$N4gW^he>&g$*i z`tGz5(Gc8-7ewZTxj0ikAB%0PY;R;s1nP@N7X5Nw6Ev0$XgkQKZ8HFj;xa#@$`$*z zn~<~vZO1)e(ww>H&3HTP+=pWPt5sE4sv@KM|Cama8BEF+135^k4+9dDxk zd2IcMWS><(Ee$1&u~`gYFFUH1?~h^YjN2&5!HgY1#qgJnIbSE`%@kECQ|9;g z4ju@{)?!MefJi|jTpJE_663V75+)qY!7HgaeOr2LIyu^+3t|<3ef@I6W48Kz%>LNI z>^xQ>F)?nom=fY>mOx0^7||PeJEqI3SaUE7@;py0+q~mE==r2NmE zR2C;_&3)lBB@{EI;$Dbdt2r7+WD;X~SBXWBC>r+2Pj4g+*m9W>R6-kJ5rnUHk)N9b#kstBXw zrZliPPBdC(!KB&FeK?t7MCFbT3nP1&HMC^nb=Ed+2?w$7Xvi=^LUU==2j>vcW~cjx z1^ZFF`jmTBK$ZCNv6(8(xp|-?^GwL#3g=9S!#H}WFkXmhmjP?EBANE3 zFM5uGqlxu82UG^Wk?-JeA$B+hW~%`G_yCTHZzn-7ppxtB3%*n}7awwG$+lwDuV%c= zvTPqD&K_#T-yJD_5KnRTdGllI3+er=rE9R2*GKqkZffGP5$0CAt0n4i;_$S)Efed} zXSaP_9sx)~eD@q?1`oj85rTzGTv?#k&98U-5x*+vt?{ok#B7F(ukZ9)37Oq=6B~Oo zLc)kY0X^Bb4_6+y3wf&4ehFwf3rGAyjlDf?!)5!rXn}tMsu-+H%V4)RdIeA#`zvn*^!0F6-Hn?|QFZ;UuB3g~6r!xVTY&0im-W z!@=dxzCvU>T8%rfVuy3`^!^6`N1!*Curv%@Oo;ckF|3Jq@>V%JFirjJb!lCkOR1NO z=U;Gqb-@#DzDcX+a@1Rm+3a% z@F|$4Kd4e~@?oWH<2Bw$@z=)%eUfz%3wdb*9N+Z-`vT|s+e;tWhQtfEF3(Ulcb<*> zfhFDu3)DF$s+XgB0IA$n3f1!tq5hk2sRF!n^(fxXRUE59Kyb zvIivKX=1;P-fW=F%>j`1|F#zm^VA;Gzk7=C{@v4j8;JWHW%KWZo{d<(9AU|( zJ(Zqw%|+mg0s$j}4=AU9FzEjSg`x{We+cL_2j=I!%m{Z^IQ@AnC?R8?RxvfIBECviF^;w-P1Pzf_d z$!In1b1Vs=I^5d#wznD^nf4M_qGKTKrP3obNHot_0nbMG-BS;OdpdTB&KJ|LIGqXa zOO4?3zh6+inh3}I-sgb2eIW)ylqY7l0pq88fSkpIqNWHc>d6c6X}hBoj$)tp-s?Dc zPCS#v|D;u6f|b+l(@kQUE~FWcP`V-7vbsO$SpU#zvp0D+DDH#j`mnXc%`sD8qHxf> zk&ynl2=KgpE8b#Y<-)R%a0`C_hPh}-JH};O)w!7e9oja%*sYQw%U)P>l7NxM?57&M6PmwEq6}U{DvV5= zJo)lHfq3oe`>G4TcYATHce1fIz{L{Q4Z}?PNe&?F{E6KwkF3>=?2rWq#*Xs+K){XW z!J)SFXf@QD^MKlnaIscCld>GWbTFWEck7>Yp9E3WJux7E>(II!#C`uzk5zW%nn~!o zRQtU{2frX&srus4&t|Tl-Avo;h1P)!IO#zNr1{vQHFE4zoNioQ+nDwaZ)YTm%Xw2Plk;SC+J_vv$;PPA?=9D{fd z+p=^5kwNlZ(v1_4as));#iKc!<OZI;wt}y!eMBB<^$8E5O(U|C&{t}0$rZ0iUVbAh2{YS z_!2~BYRdP%^+QOBTn5U;g)$0O8HMdrpT;TBL?kyGcpzzZ%%KAQa23>uLHccMD=qw| z*4AkoK$ycD&}p^ClIW%x6|C%rAzeNy4BNVRHi8k@f@&P<3>p^9VYp40^K8bfG3V@N zpZqA<}QAkR<*c9}{m5FFa%Bq}eq0<-D;%)Y%RE&9% z3d%bIEb(?`bv*g@vc{cm4VppUTb%`9K%>qE$Xq`%GR13Iw0JZw#kF}+wX(dpLN!m<^tBIDsY$5-=rG zv~mO$%J{!|#Ck_8;(Avvv?=k4Lj>i(midn}Vfr6uqK)sjGhw)<4}fP0r=Zu)AQHrx z(+;R9E(XLbrol^gR`c>F^E3*k@ZSyPB9MX%tn-oDmQ*-R3D)49TsjP`v}_5V>to4E z(}($HF5q?&xJoH&t5{7H%@@=<#{BS&8?3g#EPCr-gW+d|oQ?3gfsz^eSwRysa>DqN71N_v9ID{ zFKQGfKJS08R{qA%<(@a4rZsJH+^+Z|I$_aXJ}uXXvA4+>h}C#qOA#PpslDsGez~Zp z3?zHtjJA%t2nf7|xmC)u*ttrDrAz1<@k^ndbg@^L+Vdjgp8{&IcO#2VB9WG?9IV2S zQu{7c{t?CRE>)ysx8=f5V&by8vwno9QR;1l|=4b!SXA!zJPbGhoMx;`X zi~dGHEek-YH~3yOO&xyBS;K&Ocg6#%C$2m(Sh&Kma_4b5 zyV$h+;&BJRMbd?ZS?<-EI-0A4<;HTj?=H^6O|3SL^V%-l1$g1gy1HZH6xCzwBu6Vj zLxulc*sR;tHMdEcP&(^;x9--2(vsKDDsMtxp;$_VB3sgEm}-QQp_C;h+5BM>gaS?i zvv)iLy$hxVp_GT62JH11Uc;}jr-}xFJ+L$qm1HwZw!dFL>!(_@VIHRn z1Mb z@l2~<#>znDVDY%RfzKiOD^H)hJhgn@Q~}n)XD2dWV?cpAXg6yra8`UDWq&fYskrs^ zMbmMTZn|u`EMdMZ%H*Ec{(JN+{7H!zfSGASvQYf1xDs^`ER<7!wk!zOStaFH6|mBJ z$4&8tSXS;QLSRbPeH6c)JB30PjZ@H)+EZs_lM+2DDewYQLZtiIf+^D}WG=*{a3Yc6 zsItC*)Nzu753^Bk4y`L)eKuFl`(fu_Q@DJn*ine6aB|^CN>#I17_kz-X94|0m;?}EH^TC?1gL{2lPz3k5$WX2Sd>E&qEro9hn&pRlz*=H)T z*=KZ{0>Ko3zXWL8D=D|Ey$2!&G#)%mh~BZ4BoaRd&YcKj z;fE-45BFyBLpg`k2-v43%P%IB=BF_QIM4{-&O`9e(zoL8ZtgtnPq)rFdwu-*c2Ng> zUO*3FaYdPOL=F!5Y$sP3oTU$mtxcL>k`9Zwj%6o*990uRdnP04-AymywcQDB?|f!d zl#H2tWFkm-W@0|9SQyO_^?oR&z_(!Y~CJPksf>tVw`gf^@9dLY*1xS0%hV2 zZ9HYXvDuKl?4%k)z#;7`_h=zB4C;pXtT2j9vU?8o3s*zF! zU#3O&zmag4q-(EL3VTZlOf@~9X7Hg}{i@=A@-75zs0KminapgpFdx-0pC24e8k=&ok9@MdH#RzwI36PM?A_*QRR!f)^vSZ-4OcbrlN_Y0aqfwym_j*2?E!{5aRG z?c#dAl;HR_ndp*N*8`^p9jCcW-XEd=6kEaHd(L1%zowH_G(xBDi>Cv&Uq?uqH}koLk#Ieb8p5v( z=A^{r5iiLR+nDZL+|5iCUG)szXUtx;WK7d~WCabZe_hrXr5?=_z9@jXfxW5bamP$5 zl}koX;o%*+dOb|s2%H2yPl{j=+aW?7`%Y*#8~=*6oVq*@wVE30@}ljWn1Y<9nIEHA zs`aFgxs~qJ{^R->TZY_xiV?;!yPLkr)ZWTQl1ko2i-|y}#);bt{E(6Gx8{+uW##9@ z2AnSkkp>G89U7n==I05@G$*+eu6-)5>js-NB{GI|r9RZ{Z~@t}!qH(mQt$Au=kQ8(0@NAryNTu*1DJDPYby2jb zBedaciBTyIt}t$+Cas4XxH+8T?dM3F#54%YmwWATAJuYyvA49K>&7UCQ>#fk|F+h) zQE`;*EF#S!oEQivj!&4iz8(uOjv%ffxbBMr=Jh5F}Mz_4YP_)J7xM6(?7zTKlSVk=B#S#>|J1Q^_fo} zva^B$r5-L$FB$|RNBwAh<+wrULsHBFN)pwR9w=VVfzhm^S9!Uae zm>M5hjF|4(?jyz|mlrGr)+=~(D(B?xE{jdYCWE%9A@iPef6sL6WB65I<3^|%{VHSi z?E&DNCO}9YqZHBcCbHP{eA47Nb%3w9=N!Jm6`O~raqDRV;_gGc%^-_)0%@N9Ya&;b z2|^SLaPQt5F=k=L&Q$-L9hF}v4IMkv)#Qnf#TvNBAydS`B`WBF6Rv6#_`Kwt0YzDX zfND>uRVs(gkT{F)L>c}V{(a(sbezw2Hn8L0Dr%m!t^vp$MgSC|#zdr}BIE{w3S8WH`a{O)okim~g)UUmI>f*dClO!BaT}05T?g zuaAw|n*=bUY~zl}#pwDQZzWz8^dc(_U*L*rMbtu%-7|kx9GjBvh!0eDdB62II@|W- zpCn_Oc#H8vJe0;TIVb;P7XvvK){n2WE=6rv?2~vM9F=H98a=noLoi8NTOX?VNr_H7-pAjDek|u4$-sh96$tn7cZ}VKDQj5q zAbL1-xIcrQ*3(0!dVCXqZD)w}LMo>~RUc2JFr9(@T!HW1OM-VfBf^HsBC^k9wEP0! z8d{)9;iv@}xU6=b3?GsO@6f8AxVLcKT;4AXY%3E#9)ITI!$T7|$ZCJ7pDEUBy{2E_ z(a~#+>YwaoE;P13g$PfALAdC_{(3Qq0AO4C_Q?O*t3B#^+RTpPZn zdpBj?SMLh_C8u(WvPc!`;@r>G52q;WrfE1!(E;5@d8UX-yT&{oBFKw$ijq_DE^3n= zr@DDoW46iuXM`jF~*Yg zifV5#G%~ID=v`PpiK*~&MGv75uShEf$Joi~d6a4D!Ji`Xka4n2e;hPq?vEAKRPVa` zz4NPGTa5fkOy_9ZOl7xDB1_w4rg?)t-4C9pqO#S`sAYc)Wsc;?k-tGkoZLSA(JyLA zsswM$d!#MfOM3%cO+4$@^{K?ku!JmjR7NX5CM^uLKZ%* z7v_->rA5pYaOI&$ogKhiN2u=vR!ATEMDj+K-IpyYRez4TKCa$nveGbIS%+9yZsh~3 zbzikmwzkw4<#k#S-g)JuATS>JYVK`ocn=yNNw4ClLB|0o3{VVEFP$;*3aX#;790ud zdpof{=iP=cKzYt9X|8eUM?|Y=v|M7OVA6tuoA{CXtJ-v+_7slU_aM;8bX_(~RdsKZ!E2Du9=P)5*p;sQ4Wk5>v=gVvN6>h3zo%D4Tr%Y5MsRNC3twXWSL$T?V7P@wi zJ5`^1%jt#}xOdCqspWK?Nnp!?7d^>&%auO&W*C>iYz&dK6&6%w^0S~8-A6w1-HREd zZ_wY`{YwsE?Y5DM4+r5RKgO=bDd}|;ADa4ixV6No!7FG)dl-Kq!$j&1j1^L;s_v+e zxx?WlEVF2Q@lvGtptEeR7=LnUrFtn&H_<2Kj>WO-2ky?#kWbF88zDg&v!q)KMdTQ= zi4kwP0j|myxpB5UTfCLSc}s@uCFOc=Tn-vTf6fuVLvXhM*w{7-%tSQ#t@z98V%&M< z7^##CA7VX~tc+!BLCY$LAOWR!BGF<>?^)x<()>8sYEpP3U-Ht*=nA(l68#h>Zg!7j zuu#?QEmDp0d8iYDlQn`PX3QmUweOwvJQByR1~5sLN7rMNwALpz%u*R8TV4J3#&hVQ z4^$r1<)s-Hg0oec@B^82YQ~AJJplgey$8HQGWYwv1+*RM*8B1=KM&SbN_w4{)!|Aq z!|5CfJ&>JiN}MU_E88i*O=T@gCdv*|#!nTi;~Xj_?B^1jLmU>}9%_N_1#JaE_Jwou z0Fyd%Vemd}S_y@dk*YFMuz4l|@dzw1W7qoPO71dA#*SxvNoS@ctSujzN3G8W z=NfMc9}fp_s@hio6Q_jE7i3!~#uZZ^TzknW&r)89po!D-8BPVKNy@xv9+Ecw^&Y=Vvs2+75ZZFSI(=JZ4QbyY@aLT(C*w@_UZWv7exR^nGGi2h_G}? zeN~l5r*~+kopP;EQ>fOc2wF;3ueu4`yxJH}c7xx@-)Sd>gicgn~DGpuVl83)pWkm!KtbR_X6~ zL?+S{qo?s|8~S(rFmlAbLc~M^wJrnc{0llTY++rwPXs{PO&YJ`gh!{#G2wp*z*ja$ zXw=z%5rD>c*N7(qKy5fN=tmI{>3GQV1vk!Tjd)AqTk%yzK8lvBYPmEftx4<15@(40 z*wkPOQnucH7qSES@ca0KK~x!0V17$_r2cWC?d@I0{V~}!`J~mJA0&9YENh9~0-}5@ zuz{TK(E9b!_RN`W3$XC zJt6>8w!qP0bqeE>)VSH&;=y-ad1dYSHoWS@#?1!hlgEF<^}x`U>9KPPIOGs{46`wR zxR(hmeazOWiQ{KiBple8%$m7KwIGsR%4%mUf-XcCJkap*U7q?HnekneIX z3%-_XeX!cQ)C7EtphH8>jrV`8nK5;If0*^5!GRWkE&i|<&Nm)U|LhvUi!W~9j)XY3 zH=VKg`Pp-R7Q>|6v2nt|B^Iu8^1HWqcgIia*F=Zze4p{-BF0=-DMd~Kv{&m>?h5*_ zOfgNzv3Zt{%Os)#WZ)2FZYF*ZEGZbGkJz7?Tv{|+djcR{wQgkiY7^n~iQQ$^weg=ZQk7OQ9K6o>n|H0Tc|Wzf*xI^!czpf@u$-}HN_U5Rzjz?n zZSG@0sIw^2Lr6--deeZP1KuCiJ8Wg&{k>fcHL|vL^c1Fo%~T60{MlbZ=u-Y5jT{fC zKLS>ttVERB85_;7?^oDTR@gWT4me6A98CR81RpYkxKPHiIy(=YEoJmX38pwfr~BX2wXbV?IA-gp;bzMI+)xl8!*1F>sKL zkS%9G{`t$|0Bk}FCIH2!y7yib8^qfJy;YukUw=u{cp<%y7fcTQx-vWsrY~Q+j3Bgz z6Z@o0XkAf=E_}yW=d0+(R`_kWcX6w6sSa($&5dPOhUp+`?1pp2{JUA@I*mEG@W=U~ zy1bNQy|HdhOOya~fIOu>cA@@?W4YPT&1Qm_NbVaW_NPO;@Q20#h8~-0YaP{P03y-1 z(5iR9XxYrT&ei*o)ey#cWfzt}(0_Q5t^)pnAWjX?nKMn}7-_V)vl&sL%+ZBsi zitG;k*!w6HN=eK0aeyII+xIO)$QQeVN?Dz+?9f+&-T7@NsvF}^$gqkBWPZsoNyPt*;}8*P)(3#q&a zcKR6XhJ=;yv7xwHL9A zS<@rJo0+#Ltho7C0aRg5m)sA!mwet>^7$b#GRp1VV#R*{H(dr_u0|A7U0qs(G-5zS zyuJ5_$#-hQAz*y>O^P-bK0BceGbDfML*@(o)m<`LyLTVf7Akvg0j1qk7Ox zt*zoBzRBbW`v1q*TL9J3Y;B{#J-CP9F2M;9+}+*X-F0vc1b27YxCD0zZo%Ch0tAQf z@4V-H=YHqEw{ESfsoB#r-95WzdR9N{Sx*-rR$Nh2LKpMzFyv1$O(L{~ZiMQ2aynQR zYcKFXG5YXmH;3KMF&N|Mo2;v{$fPfbqw5Q4>-=JhTYwc-_a?=BMABlYfeT>>j$;8B z$jUl3f9y;#6~`U#TPT4jUTyVH%=3AMqNZ75G;#-X zcG4G}U{Z1>ASWS9%L+zD#?Y{!Urs9;LsGasOUt5FBZPrQ!cFC@tFS-pLr_xTP|yhL zZ>AjH5)I7*ysIccbnM2C(h5q?cP^W7pYt>w5?!Q(d z5l+85(VglJM%IuYoL5ch-7mILGZfi*=StoY$oh7rlv^;oN8Tdn(QZ!o(wR0F-Bx@{ zxzvaK*+|?X`N`D-n3Oslt{zk}+n^lNUi(uMW-rac!}s*g#;F!3^-X*2rKJvl;Gohx z;o$f>?x`ag6S-Ar`NY97!SU%8;WCJ%sbdmaOxwY;93k0!eX^ExXfP!sty81{$<0B0 zrSoMpCmVQhZu6*ndwn@rUS4FI5!nQ=)$Pd^L>JVY3LLb}iucofWGd;hh2qW%3xd!;$b1N^B6u);4SSPQ?VJArv>PS!R@h1igIHsLLkx! z@4xnkt7agT0zTn!#4iZW}Bv%E&{)C&uLVhU;F{BA6{hRI9Tim z&2N2on<(5y{0sR;&!5V+7RpJ6VP7a(wnUoWq$enX&bw=0xvKT>Y+-Eo7u0!d>apLi z0>tgF_fBR-Z)cJ-)&Tvfh=f4*wU+~R4c)9uMLcffK38Z^h{qvDvDwLb>y`bBqlA{C zL~0sDw!gxeRU~1ppe5KKN)D;Wn4Fr4qGUxUl@0uvIkFo(*)L)i4lwTj;At`cxDNp- zCQ(}{bdK&3H3V^xxMc6-iyH#tr^*7f+jlo)iCvyI9}|<}MOr{KH**Tn*6aEQdSaTA1tz zx7p2GpsD`k`FCzVmCHZSr5^QWU>uDdew$b+{L5eo76kETbUOB>_A3Y4k7KaF>edE8 z{U!dJ@C($=LmoKQmoPQGd}d2F^IG){kCBo$Ro@Y{c*@5 z*9#~kJo*yfR**;FP)8zU5}xC-u0?=mGs(M8;H$2ewK|DECVVOa?Fmps(+$PRJS^$< z4HE@F9X2veXoZ>fx!jBm@p(*)gvhRB#Xp9JD9Tz6nf85(PDJSbOfGP1`o-Z7uoBPR zfFQ;>Y#u`967+t;>)U+c973I`73y=^`ADS#^`07_o{cF<4J{q)+Gk524+(&W{*e^< z2(RB1f%}gk6N_b1Eu`*d=K;liXB@Cc2j5+twIxr}UB^ zK&c!~zd%r+?sbp?UNO8Ta0{9`&I&|N&b~#*Zd3(145T@yG5y;%v2KJn2?k%ANgZe>_& zrfBT;xGkE)ll`@GN0G}EqJ;b)%TU3VOLU8JRPc4~Daa(@TyR^tkUvt@oYr33 zfFiH!xRNmXsic#31dmlfnI?>*)_+9v4OtTyJG^C~!qDvQ0X}@xa$lmRvQ9<3i*Lq; zU4jD}@a`;H;Lx%(Ymqu$YZQBhM0qGGpg z*(Su#&1);aL0X8PpTG?#`D<@BM%2rln!pyJf-N`uH>D8kZev#pnF=gw@jjK`sEo){ zNzG17Hn5PY%TiD~O<)p3^H1lzV?f^mZ)JL(Br#z?-QEittglMMX2E`>^}YO)#CNoR z`v*o&#XHjRlxFFZpgt|Y6 zeul4h3fn^PV2nJyuW-~LEIc*#76EDj4p@L&n3{YVWse-E{lcn(|55vb^^0t^nXy1Q zEEF|?-NlH1khD=mv*aG~(_Bvi$lRnDRP@_6jklC>&#e_`62~f_B>f?0 z4sziW%&7s?se@0TA5(r0Kh_c|?ha{MO4Mz9bMb7?(_hol+Wc)g$y(o4=SNeUs}bl& z#@U4S4ZM7t2{Mupz^sleeU*fK*L?abs{SjogD#v912t`+aua}lCJT{I)DXu#S92|Y&!PS#OE7dOy(WFI%|UYGhE;l#b2NjF6Q2n)4Pm9++Enl;no8x?zoVqbiK>_{6Y}R1jA_(K?Sr$m!pps>*5l%pj_&h!UKp^g5)>DFEpqv$?pFq7YXTY&k_xB5Fvs$n1ByKdsB?uH$gfLX6)HZQe`9b`%E z2&se9m9)ifUz36gCG_xqD4DrDBW?MkC)f9>tH6A7@k@33CpSWKtn~LR<hC32cJh&Ag_i;8Uzb)7z{-u!^W^cdXcK*nLdu$8T(De9@G5_OqUdacUFq@N zkoP6?E-p^kG z&-I@_Id?wjq4-7WRC92Z)1iqmcpH_9yqwEAC0(+{{O*;Z5_to}IOg=d*N+z+yb_~6bvz6fDzS{G(2*|CBib3N~st{yPIaKV!xOi^hgq2rLV!H(} zO1<=WVjL4iK~ZW=v=xl1YAxD_yjQrJ%@Gf$irD`{QYN4e+wQ&qv${*qX^tDYZXyuQ z{!%?;lsd(29U_ttrr&m&Oj;`nquVAI{sW8b`*6?H!~xmkc4Z;57o!YjUZ(raqiqQ~u5 zYW}O1-{mT0?8{WqY48&kp-KNCGlAsnqxYo#NBri_i{wwCBNn!6)N0iWbzAT-jv)Nu z9jp&Fw_e&?nkvK6eizqv?l}I9CRUlG$-Q-9-JRdhFZK`buF!$cIG@$?W3glKw=}uA zaWp%iAsYSg>T=wZ;vh&HnnZL z{WMeMydKJ#$D$fz?HWOjko(q*rvwa03`pwrhLn}eW5x`LX0+8BMp~MtwV>$D#Tfr{ z(aseOLoGwC+617v_3Nb)vx{yRZ^R%u?Mqhw&oH-<$$^dSV>o3ALrp`?Py!rybXg}nt7VF zq&84QND>KeDctJpb+uXLK}s%?8*wm|njWQC*jWG_UMF`$O7YJI4Gmm@H@>dV4-4rp zJRbTvzH#kUxp3EIEht*9r(C8pSqw;=rh#VQhL_^h^3398Q^ZuSQf`Ca4EKZ3HN z3ajWCndWDCj*gL%XjI`qY7aNVqB+&c-2ut z_1FEhM-NFK^cErp;esa>k|5}-yLxgua ze-n^TR6;RlIs*}XUc`Nxcy#>rTDIwVUo%&7>E-iFE%)`$z`?4}_wHHI??*8JqdMw= zT%gKaaiV$8w~3a`hO*m@E7=Agdm>_Dim4^0%mMwIv)j?w-K^DYoGGbIDhmWb#ez|?x;Yn>2Y59>nX3fu55H<!!KfxSN!_ZiLs`K9a3yfbutBy2w z)}nn+4s$m21sL|rYGapguqH+SPYOi)sKEy*skdgjH_h!X;89~5^UdGh$R-NEVUyEU z|7MimlqH$*FwYCkv`dlpfaj8m?G;QbiF;|oBueQ1CSQYypHMu(4AzFSW5v8dZ}QRT ztXp>#Ct7W!Sv}TQBbf02l1r{vIh!z}3pa%YS3o@lHOUzlp6l_ki*eoGCeHV(*V)l= zJ6rxg&?NBR*re>~6Z?`2&t~V`-P;8Lt^L2CNzPO4%eJ3t?L#$LdL^=RN*I;WGQ0&d zd3Z{tO)`>|y{+olu`CtLjM-6Ca(bjFVV|9yqUY5n(%IXC2};1&B$U>zv|EKq;8_u-u@5HcOg%KT=%}uSGP%nIIdR$aEnM(jiNx7l^LubPUj_C;K?6{ z;78pz`;DfKIO=nKgS(wguC;?r-2vdRzi$nL&=e_BJ@&2Nkd76;W%MN9Aw%|Qrcb^ zJPbVLN0i8TtS~^7c~@4EfxST488!+!O4VG0f-r~9bz9ibN5$S}MbU*thNXO*XY7DwI z3M@duBg)4(9B3J5s2&Mfz8~OE*K~#(2b(QvElf-~8ota74HL9_`e@#vyJsgcNT@)l0)fKTsDNRK{{X68@!>R#FocgeSb86WJ(QYqsS{S>pQ8(#fU&Oh}V zA#HQE_4?rJXn9vXY`bC_?Ms1yysM6k5hYohQJwmlb*>rWcO}y88;isI@`i7@m0Ds!VCU zSA&;Rs8NsSu~DV~+_eJ8ghK1Z#!w;Yl7vE8f6*+R*Udlbh#I}e9?cV8#w=45&lkqG zEn2RPVW(a^RiS{Wlyn@QAQQuY$3lp0g%Atc(bK7tOrrn$V*Q4WZB=p{N5Pvl$DeJ# z-Cs8P43BkEAOz?&qLfGDfWb>#6m~TAQ9-CVYm&k&LA^$Ht&ckDxG{mC0MOd#=<<`P z*x%g%kZml8CJs9eTeAUD%PRsz0|Pf%H2Qt18p?vb1+it+Rn@ne<*R?7OWu_z zTE23|`@A-jfEjd<_QymbQjth>Ti}%6W1@aXI3^zmuCGO=$_x$2QiF75{?%AD^-+Z0 zAXrdA*y@>E_I&Vn!2rU5mD$d~5e`G0qh7~nsS3kL81OM#qageNS_!8e$y9?Zylq`ZZ0Zof ztolfmm$qt4J+r|btkxP5c@lZCh&gal6}9B|;K|nYWA`)*UC}vuN1;J@hJrvOVW3T~ zeC|A?N33`iA&|9bRctO!I>Vm&b~cnb7Q1M5f{7eA!5+7hk6v3r$E}S>T_@L``kI@; zZSB|>aqOG@2jrVnVto!%nxJ} zY^fe8K|@JGbIHV44*UcJsH9+0AtyVU>Q0EkCJSD6tVLLqkYv{Bo<@QQZgE9jUb&QE z_iSiU+8>BNMyo(sRSN1@w)YTP5L(M0w3OgYVN78bK!WP^V~9dugFr z^eij_|4bhbX6dVDw7!S*c>=_)%%AUMNug7kX>z=E6}IHXMsuP0qs-Ru)XtKnygl_F^eUd-*2qca4@9!J>bs3@@r| z%3`;(_57pCgW-Sxp#P<5yi@nTuctA=(yGx0NDgM}~*s zy0t!K$1&sxlF(T~G^J+4le*%qxYj^b3+B8L2qyx##_RJ%bUZXXMV8_%jKU$6PcRzF zZ@n3!droz4mV-3(?Qei#)cm!!V~7dF;MO=tsV)<@PjbQh$<#PXMpJIC!(i$9<$Cjt z&wag%>(9i=+rfr5{zq1ZNq=KTQ>3w87&~%Yh}k-4$EKMv4;X~F9z=WINU-9#n*F>?lv$Ya7a)G}ctSS4X9t%gbxcT)%q^a>Q2ZYM*!w$blo+XDHE3`k`d3jR0Cv4M z2O8R0&W>I;fZpEi$H%MV)BE@cR(vklxo4Y*d#VQfwd(yK0$XR!g(LH%j53kny0_W9 ze{v3Bc*4WKzZu5-LI3l30cIjOpW=uwoTI0%lq9HDy>WInlhJLb=rz6kaY&zZNYDJ~ zmbp;G-PqSa3@Bkjj{M)52$%q?dAD8J(C{e#o)H?5%Mx_B-To+Sw(|N>_isFR$jw!< z>qFLGextA{%}WO<1PxcIU{Ke)HL)pPqY1kG6{$#NJ}QIiQx@Y+!wb9k(iRn zVYR$wkW0$)8J_5x2L~S`ICvU-0Wt#kg4MW)NSwbO;XW4y6$wxSg=IB|b!=-FRfGj2 z7L>@gwf7a}Gq*{zNdE}_R$#3%?8mePC|Ya``ANyd{W>*j3mV93$ZF?Py6oH5s4%;> zxL?f?ejK)Qp&?v7o;?qY!=A+)42M0=lbDj8$}N(i z$9u;wjxQ-LU#Q_vaKSC8EM=1$dAz5YEuo!lb3Zi9L_>&zKIN{>X}~|_u6vJi%DojB zw*dDsZ3U`nx;6)@-DQW{6$|V_?k}kEoVsAcv|0dv9n8#KIz;EGfBBR95Y=R#`?l!f zd^j6~iv-mL)l2$~c~g8iKXWgC5>+pYLEFpW6IZW|yyO{C|4Utm)sqA3cM#nYx?dYQ zarI&J_07;LNgyw+XZ~n?G~3M~^oR=z4V8McB+9U5NJGn1=IoB^K5U-w8SWC?9|Jbz zXB#g3XK*ope3krq7}GU(6;2p8H(=fcPf5HaHgi@xuwXEk50=`f{)`Su&;CjsQ#$Z; z-OmSpmT7GV_@Oetv0xCqeto_;7=xEYk(}6_`n;xyt{BnaO6Dj)<48GpgItQ{%t5_q zXUnwSmb7!Rs3`v9W=D4SPXSso+A)BB@Zs0GLFop?q3lqu)2oMf7CU|oc?ch z4dKTBt*(LULGAVNmXx4b89;qN(`mHi*Z}DJpvE5r5t0PLOscjuZ3MgANH(>s_# z<+k#{b?IxHTBZ{Bzdn1e3sm%2EPtJ}xMaEbWXW(?@CPukkv}fEv7RhFNM%*IxX3{x zSpm8l68QTjE!wOyBZa!mwvMh#{=m=1JwxVY*z|YDeK)3B5K0EZlhG@n+_1i;nF)%F zY1Ood#969E;?T~abEcciuAjF=53wkp7CzWh<#@h9YNWVq((?<%X-c_fkYdqCm%T2Z z405iR*l7^%TqJUv#kS17g1I$Lcinv#9HJC1tAjj zI%y~wci0sgR)i4vcVEG%n=SlxGEXwIL~;@AQ{SjVM;-LxKrRW_lIp-46A?6{0RiA? zU=Uo%onRIC^$IUA$VB+{X->Bp|qrY1esY2xqcv? zdBh%08#!V-CLfnA9lLgg>Vd1`2fR+&Oz@egqNz@$O^Fte4pE z@aHD_grTF$LJdO=3*ZB>!;?f54NZYU{C zpvK_T4JvE7mlcC`ch~iuQ_Ka?ZVvHB(cqUK|B#G;|FDcEF@--LP(dEh8F&;f{Z}d+ zx*4lIa>@Oo;3Z0uSx~(!f~yCc^u*8n-X*|lT7_QKISDeSzkd~|6@N<$5KgMru32ky zf;;8>;EefRY5u=~Acp@11Wg6J3<4n~*AA7}->@$-0T{lk%R`*z5{?k?H_1}T$&C1# z`Ktnhb5cR`+)Bx6@Lv?j*QvRg6rYZxntO~)>TbN&_0r3!$*1q*k8$F+xDrcNu|5X9 z$#R?q-);5_vQ7k}z!jJtw2$*B#Eozp6Xz~3%o=RH74uR4>tPldS*x=1z-qxhD+_f} z2`Ht!5_y@Mir(#l_Mqnq+^FKhy~O6K!46iN|x(|EX7+j+7(Ah0V?Q2THYD z!)dFB6Us0#dtkA7Kno}S!iz%3Gfkw|Lt)7j3Z&$0Lu;OH7_Sa+r!9d*xJbY^{KaUx z;x#=&Y{uf{(T<^miSrDf@lI;}jVC5rdx|4%5r|wL|Cb)lo%`ZXcnQxiUX!WFB!iC` zWy(n3Yh+5%?Gq!^>MA(JnnEiOHBMP5IX`vTVO%Zd)BW#cO}*Q!Kj#A`eIehy21M`d zD+$@v(PMvomt$V=I=DIm$3@yuR5Xv6r8!C(l5!r;ytxeBqH?EVV4HweQX~J+rKJfL zO@Hp==Lfc!Rj|?^Ib6GB2M^EXm*+cz&PQiguRr?Fxk&8`9FvS&M993}H;@6=w~1S%nnfnf*S$A~G82vo35sYj!#&=lX( z01IE|B)q>}V>+Wr0Qen;yWfWZRn4;ckaX;~=`;w=oX3x^INWlN~B-^*0=X~+a@6|*x?Ow6tcBB91 zDrbY=6V-ES$Vb6>huBl$*9anQx_@W*vU1&U^}V7IQZ``LSvt%2S03h-N)@*9$oj#ZT7aPcp82@BhBmdi_HFlCCc1~*L1hs%7q4tnEQvr zaDAI;d%s84r~4yw-(OyrbF1P;7nn9AtCj-(b3X?CnM{uDeb>ryjRi2y4&(2FVI+8@ zfWO`Y0M;XY|BoK&EA#y_q1y>&O}9M^Yt?uQP!A<##U}N0Et?BGhk=W0uX$=cZEAn5 zZfNL9`dpXJEc(M%oGlt->`}GPSXPQjmy|4mE@vef+0yFn2M5`4H`3vkVEWFNU*0bn ze$V%N!|=KYy0m~s1}-N~1x7SQL()RBsWqUXOru^)#igOFOdr3H91=&Cu%bH2K_=a( zc_M8nEmTKYG?E}j*1RKD07juWie(Nv?_-n>)xz(Aio{^4)Lf6v=I*X1FXb#+yH;u# z6mnvPlK^VI^dRw5%Rs6yszKdmP_lhJjb)M)7Mgx2jUjTuy8=aZr8HbURzuyV4?yE* z>elEwu1sU*lDdo7;21I#}s)ybNPH75XrW1V)`$QX38AkRR9cX=-S%Ux?*# zVpA&GKr0m*O)7TBbi3s#G6gz99}C_YT|Ahu;}4Q}%W3SvtpBmbRa_{6VfNB{8adT* z)>}fbpl;Ey*6`B|g>2W3*LzGaum*O|qcEgqFMsAY!>2xbFUb>`_wgI!?^*wTJ$N;` ze|{VpWR< z?PqJ5%hki8S1W}mn_I9qXp4?Z%9kwLXe`(t;k!{dqC|WTE$c!fElC2ity^r6otZoX zmy=Oniw147=VJ`WHo|>Qf!1Yjh_*kH`j}=IA5&4TM3)ijK)!k{f6oG&2g=3UK|=cUeAp!lx$s&ive_kU z;pMOsRY`BcoiVZ_Eh(~UjjI2RS$3*BhGTrhi{%+X^%SCz_aylvvV*!g{zze9tZ%j5L=+Qbq(bm?puDa4Zxjz?jfBC8rB-83@ z5o`Ft{q6bDP%>c{peixD*#wUza)LgO&vSL2QX43Mz8iH+U=Qx=H-T6O`(KCdPVH}n zD5iv`MUQgisqB@Rn#q>sK*yw3oaMZ$mmx`E=G9ebv!HM% z7KTy>_#&^r;{v+_wbO95)6hA*TZBd&$}V@wx1x?Eu;7E&OsS?7h4Mj9&l}VG%L8r) zTnD%p%b(#dl_KbpSA6zTv%Vlo0_X)^8?E6=%`JSfTDSqeRE&yykk>+$l(}2KLS_zg z4Gg-vOA3ec%XU$_{}8-=jQ%E|!EYZ&A#?XfQ!Og&U0}UwC7sNHo7@E* z4H^Tt6ejTyw3d)>+5r4ce*jhJr4(e71mLaS^h0J9 zVC0A|=E_mePle;0s5Y`EUXc)*a~c)Yr>>hkE>QhgCJjrAlwQhUYS8l4mcPIrXAZ;; z(;^L{k%nqj?z2dgOfYZMZmL>`NHF_ZjFi0AAc(HzaaL_9vb%cun*So+Re)VqVK{fpBv$-sfHs zgUD_Bvys2CtoVHlS@}m+Guh!I%+w?aL@HqN?BNyhpm;T~8&uYd`#t$xagdNV-#bm= zcP@#Ye&psl-NWjJc)3%sOWHZ79|E<%L|;CLx&l$cjxMFe(eMc$sS#~y)^ zncL%2$BDo$BAq(J-&+zbt;z63JL4njz(Q|Yrn8?Y^YVTJ%^keTI(JovAN;KJr9U~k z3m(~lGOwHWL4xrdCz530=J!-xtail<k<+10WR!M zxOmIH17k+9osp7L)FTehuj-4^&H=XLHrD1Hrl4x|Pfct0u@mbG=&UriI55+Gu2jK~ z4}FWVZn=K!+1nq`{r0{h(2~-6F&wO@k1c;NzxOr{iCNb4$v)}LYB+vqZLj~q%jU8u zY?TYePq}{N#wl!7B#I3o?V}HK0%RL?67OLQ*D12_wzVG_;+IKIBW9DToo1)E>SgCZ z{|*y^@_8yqD}6EcViEKm+8}4Zb_rb2fi-Go&C>gjot34p=lAgYuCH`vn7qMX?(60W zU&$S-tQ9t%c`E);+3bMDO-``tcaIP@m1ywvW(#e@2mTSP^tU;=-73D{2M|`O_murA zIxffB?|aM8(!mm|F-t|7eEF0%V!#~yvyLFt$wcv2j@Vmo?auX-@YQ9Ihy9=J$pHZa zY)2z9>pqXuE9>ernG_@xpK4t~>eg|T{gcK`uMalM2{lkU&Q3oE30D%fx7e4(ACew} zk1DyPf&4%PyT~~Z)D|CgJb+~+rTjrG!R@=}?xYYU!T`N(%OIg7X$6=t)UZOJV2P z{M7sL*RR$g{9dzA;62>rflGvB@FJE*kx`03%+Cs7?eTc-E zWdE@l;_>IF^ZMiIN;cY67cSD^*FTYAfkwOQ(d+6WF~F* z#_r69q_qy};)j@iHNEM(!`%QvlS!EPC}Y~zAsPwlwZrpqfE|0EfE_!_u^-{yKFbk~ ziapCQI3N_${`0mx$pED^!@&J%NG516gpjbRAgdpVvB+!Xk#~D&g?rndXDda#bN;L5 z0T$BdtuUyISMIGYWY^7?PKguu4(Kw4*yY0*i zhL^vo^XAz#8BbIK*Vak*W7_tXF%<4H==^)LUwdZK9MTxpCCzViy4IMwU)#L z8(K}~X<#{rZ)rg2``rD+$L$%REKL4~%Q>!>k2-fI1?-~Yty=t8C28c+4?KMPm1=b7 zXGw?}d8)JIJ{jq0gMT6-zqn35~sVBaz&}Leo_;pJ_IC)6-4MPf4UVW?5f7q1^bL`*x~(5WGA~+b|Li+!)E+IL5m&c2_tY!6(ci?zka7obBG7AAeN) znze143xg7J6p#lY1Qi4eJrRpQP%bpRCqLaNI1SR8W+#D$gGPZTKw~GdbeEZSlokA^ zOlTUUGc6eL?*hT;v$Q;;572?mmLr#S3rB7eL0PlLQvmPOEi zuQCbz?+Sr`YGi@@r$(gzkA8^%b7$<}-h=OqH0L!siW7laHR_zX9sj5A}v5)XVgqSId#?jGf|O-g;T;Eh!c<4w@_ z*y2*7Nh~yZI?V;N5nwoLmaAt!Q@q{0KJ9)lyy1V6Wpdc?*u+15niZ&Mb~sb0dgJ}D z^g3izx>6R`FD`c~60LoLhN;SDI+_-npoyK?Mt9;Cg`Jtf>r; z62X^!`#fC2Y3Nv(?3WpT7^WJJN?DDs@-_q&|FtP9jz43^avO? z-}>0Xgw3Q&n+Kn?PqmsM(<*Z>r_6A78c9O^e2N*ag)ifa1?Ah+BU|COCud|Evwu`C z=?fr%IQdyAzmGJ=pQ&d3v*un8%FPa)RK7L#@Gr_NOp>OO^1y;a5TVHzc#bsC5i?hG8tKSn( zSz35u7g3Y90`iU#*$+jGPT8heRq2wt8LEf}CL~66g*R=du%GzT)S>)%uDppt|LwTd zk>)O~>eK=9K%2X*he7qxlY6Pzo)Oo#3JMMD<2SExTeY;Gqjana$!Nj>QV7gecD!S< zy^0}}7^;`oB_c9IJMg!}sA{L(p!mw|#sl^l`^GP#EAE?j-Sgw$^6MNHO)G}X31BSd zfwSM*Fb!EhCo28gr)!^sr5jA#2>ai>WsBIgtPKF{j<*H;4mw%$g2&wbzE7uh)2H7M z<=F6I)Qs#*Y^TIgRQe)?F94|?F6RAIID-a|tf<}=uW9-(jKn=EXLTM?cvA#Zgz6wX zJT@B=d03Mv-f-gxv^#5-QogDtEYgZ=Nyi3a$`Ep5eX;Ttqg(gS7fs?Gg9bz<0x4R~ z&xJq|f7Gx1{Tt4ZxXWmZKS)OUo)EY&xS;e});Ag@L!io?(FaRLxLJ)zo+`fZ;%QeY zt+1p>?eZ>Mojfu;kgP94E2ME}{Qd?hkrZ{)YrSqLp6~sJ-W*X;1TJj9`){P?b{dHe zv=^e@RAQ5^ku}HS@y5}SwccybwXUm#{_;P!Rug-I zWAMrGOb8PJAL?CeKX*-i;n5^RG41}qFz-}2S7S)9YiL9u*3vHo6O1@n2@KlQZRtxD z9>IXIbH|#qRG-1KwUAVJlT44AEZ+y$rXmLz@{|BB*k;CWqFcG6RPw5J9Y{Dx zxS$$a;?IiY9c`kIZVel4CbI{FUO-XQmsP6a7=gR95w^iV^#FCM=bdg;e{CHi0d>zo83(3zPYU!Fo*OIwP$GvWK+T^^>NzrqEzx$w6Rs}FiFXWQe9Gb>buZq_YzgA z5~B3e_P17s-ODK;wq7>^+McC~V~@4c!;<_y6=M04z z?72@9sp}HB+L!*RoNYqRYJ>`2uK5O1GBb8yQz8Gbt%w0^5ggRevbpL5%{8mm>o$oI z$#ryGqOFmmh^aO&Bo7DWQqY@+U%gt@>Br2|^H|CA@7LWbJFQ?EB5K8MqO_KICt__t zeeHb;a?H$LJ2bX{x0mG#b7<&q>GCJ&WZRqdrpY2IXn*W>0#)PGkcT#`z+M(+FWw98 zYm0iYCU^Ty;kV52dTcCJP* z-Y_q$;9x|Goa@FgbmecS%;+tz^6m~fF8$h5_39;pt}|8-0KxgLyyJhz&x^`Glgtj` zyXK%C5zoFxPU}Z|&rDs8Sh|(7G2gwnEm8?A3qV~!Tr9)ii+&>L;j`KK2xv__t`(v! zvR=ZfaZjEGv*PI`GS6fu&+!W*hDp1Cs{k<<}y)+M|<;Z4*`x zY7gpXKX(*=ypjm2FygQ>G_P=C(6aDdKJ*U@=N5&7MAUdN>e90n(tCKyE3Xfb~VimG!XOdI%0>2q?n6Koq=ERkASm)~~pXfYJ@_U>#!yI>cv51UOB?P};;fA;Zy{ zocE&Xrx+Hrq+sdKfMOzS@c^z%VD~YuOED+=2}m zbQG%uv^1KSDqCch#J9V#n%Xp?3@@|rJE!OHR3h)fHhnhUmMcirU;|Q8UQ@jHnU-Fv+#sbmFKbpcsDxI|?GG$5*D;}!^B??r zED{-`S1m**8<{AQ>%9?_3syFP?m%#4q9<*Lj=vj%a?Bw@OTze?u*fu{n;HCj+@VME z>C2Cs8$z@Lq-gDU&vFs=-yo62%v<6CcYg+qhHk7zW z`tSu=NebRp2_s0u>&u~P(N`8EzC}m(J}Ze=+pf36MTI**Nq^+M+uG-YKR)L>d%q=o z-GxiPkM4!^wAgdoZFP`cAeAIeuxKVC|=mLsh}Kc2+ZbhSU8ASeQgM)?@j zAi{`Uyl!?QqA?6JE5%<|_473bo6=gQe>KeGYP)p%yruInwd+tQK`uhAvN^TYj(;k# z*ouGjeRU&ptUq%a4RfVd9>_f*-8jZQW{wXK)tQ@-li+>4*B`HQAMn%lq5(la40 zDw`6h>q#G+$8ohpzyf=b3xff^x_+ngteG?m*mzmY55Ab;h2S-FUit%abh8%U9{mAT zk^ZZ1nT5oe^b3P`IX*3#NcU?7PpuYtRbz6Fs3JXlULy@oKt1Iizr_~0WSx`_DB3Bh zqt?l>zJ~m5BMxg0i`DjBJ4rv4Ss022JZ1uGoHSXLGWMx)E7QWD-|*YtdT}B;=gsF$ zbKM}2LRe~SmQrbM$mCBWfnq|ym z=+t;U2EBno4c2JyD7TYVkyzc+Z2bVdbFv7{i9lLJ@XXc~F&Lt_82t5V;mZS00V>uvXS$*PbhU`CrJS$uG$aNXRQ!W~6 zWF+79?vE2Jza{*(?e~X!Z21TZzmg)W%KJ+e5j`4(;INNdhbV%ZZ4U9ehgMc#Q{XW+O;qg7FcpPj8{T%qgNmi~dX(GTBvQSY9 zxcN~{dQRF-aqFJS4(?f^p22FWgM90B5p6MSd>M| zLDi@agmlCgiq%%nbBho^aRWYNqUwDP44D4Ef5^Y1zzO}h$$G5u%H+A6kPwv8EO>p!K_1$&`r}gIBQw#US z%(K2uPuUN$>E33bt zW5ZmQLaB)iX+mfV{|{kr9o1IXcKzb6!L7KL;>F#iSSjufh2kz7cXusLp}14r-L<&8 zLy;Ccq4)hh@AG}PBN-vdPQu=6UHh8zHy6=i_x3EtI{U_g49~%(#plh3df!tR;e>`;(*jboI%n9E2TU@f$D~hZrvjaOefG~0c?b0;4qa(4u#y1Agw{i3Z*9KU7F|KyLRz$ zz1W#=Wmh6Kv4rWNua^(lHq|g|D)b2jEo^f?efdJCzJEBrtuX>5%P&0(V)k6~u1j+X zumh|n{oTnZ+HBTCo{iLuzgwvllf|sQl4!Ze;hH(`9vEYM_T<{|}`X!_#H5L>fKk$_aEE)_YXRjWIE!K`DPaUhG?`1;G z4E1F4tEM+IkQp!QA`3Wtfj{yllThAj_8l#`>(bLY58w&8dMnWuv;ENgMVj@|3CNCHY$AfE8I($5ePIO){ed#iBi&h8YNoPQ!$9uS7ZEh@5jWyhM}z zS)nej9>$Qz=yz!*mlq;Mr-Qh&s-)exzNoLB-Qmsq$JxvA=6+%KPHswq>yC&K9iJtx z>muG+(Z!ulCRX2c*BmT956?d=fsKdqOLRuoW_HhDBgqv_Rig)`U4(*A~dAZQSt#$Jbd z;-t#EZptWxLC##$w={Rf)Lu2}=-0E3zXslL4UL+L7)aY4XS8a8!CU+;( zLO^a0Ruxj!a7C4@fhcq-MCl1pDF)D2ya`_C+tfgUNDmW&(NF`Eu_Wyaoy14_wEn$} z);MJ)b`m!#A$|wK(6>a{FRhChF&1$A@y=sTWeytb0@K1dW*(4MMFDE-TIJDWnHx&% z-aIAIeU53b`{$f#Y&ZK;-~f}NW7l&bEj;DaS&-S7d}SEV`RDSSh9!(b8t9aXlF@|W zSyMY!wr_ij)Pjv`^6*jFzvxg=Vk(eoT%0wASmttC9=kv;^;?N)zkZDB?!Z{}oJwpM zR2m)8pm><3mdXxd)eg>N<|i{B5V9_BSP*N}Cod4PY+Nr$PjV|>BQPht{cRX5wY-s` zzkL>WSdhKKu0IuSyfX;d6bQYNka^qQ3@5iAiSJ>!hhDU2iyOxQs=EB&0^14gIesVY z9#oeXFMp9og;javHl8Mv;sNq1-keRSJm+?Q+ReNDeY=0Bee8OCbZ~RNc5z|-Qy^SX z;P97Pn!9LCsYZkH(t2Ou{?8H)p>6l?lKbOjlgi!STjT*q7D$$IxK!?lP}QHTV19`G z?o(Q9yaD(y&(2aL=Z9quy9@BCz1$wy5SaCW(_7-vbHF9oC@gf7v52Bm7?vBKlitlr z!PnBjh$@FlF0Mu&iz=K1(O7+`+hGoAR~6X*v=RT37HoL9px6&M@Nl;u2(>@ttm)Us zET86zTmpVe*l(*>szGK@rF0s+&E?O_=RA4VDy&w@(|(_5C5FTMmqx8bBl?#z@6t`z z7`9aAo~n+XSZwqY@(o+wH+X77r})7Y8HLIXgAx=!4D|SP2#Y0DlC;ce&W=;L%vYd{ z@-r!_$(r4=#xAy-k#$uMwPS~8pl2XirmYCjjsXceVV-E;=&=Xt=Gv#T*YgaK?Xc_| zpPC3-EUbaTChW;j#Dt6z>;Y^njvooA%H$6E^a_*;cxvJKNDO@+h-dE$6^4ac~i#8jf70==iH=3E?3Y zgad$n!V{K@t-=OVQa7fzPk3j2mtD5j%n2wH6~csg(%a1*dl1+r#uI-I#%0%}`G zP|Ek0F&IR#vj5PR44H`@^Qgad_q1043UPm+mw!WIK0z1344nUlRF2L+d!e~1RPGvZ z-4osX`2JCsM4I(Y{amF~%k{{gni304fDsv?JY@0@DtI?&f%8HfOL#=|iv@D3SY$MG z(Zv6yo5VKB&@_;@iM znjA0Y&;DFdgNeMM+_*LzJ~3Rkp@D_NI{^PcS!%8VQ#5&Ec@Hy;!|2VYmSh2cN^vCv zMkND2kAtG9_6*v(HLYl-d1Sm9ARwz-=H<3w=`*&T_E|V8yz>OSv&Zj%<{?>}rLERW zKt{@_fh*+t&x+$|ODI6%qGdLdS|OvZ|87Ddx*`Ti%Iu{?P|IaAW0k9A^5c$J?qYS+ zAD>hGk|$CQWwk*3`Y1bp(3wj52X*P-Sen#fXEhc5l0S1PoX8#CY8}}xz;CB^vzv%v z`9#cFA!$;(l~WF>#<|VGnuze?v(xyQ>~h+*)I6q2IXuhMXFKEE3yu{xk=E+pZ@&Z< z#NA%OUiR;O)JWR~rLak~vL>OsF4R389{Y;4vi1_$a;&A63#|RrG`k}CLR=dy9zsMp z@RcpiT!?BxB)tczAPm+00{>m zpd7ZU5)-!~#FE2>#Vip+MVtjKZKM3FoW&8+ z-}d7JBwddxYmgqc7xD+g#_{FTlhqn=+=7hVD*7_{E#-|+t7w*K4a4>h0mGps$_y?t zSqJLmc`+FqJ1QGXd>mZj!`;tE6FU)rnQS5VQWKky^=v(x;HE(h6-(X}5s0QhJgP}U zm2n+_?z5GGzh*cB*pD^7EfDr0W(+;=1=?GxIKLVX zbJwgkKBJF%oN0zrD$sC>KAMIlZ3@_f*h4HaCRYwBG`?4tAK9@v5|_-A#&pYb6c%|j z3e^$9BOVM0qfZ5UVoRtn0t2MxO+AfzuJU#!F#)a%P9bz#L0wfOPyVMBy_n1}fYinA zK&q|7qubb7U(L^<#M5q@zeL7+gO>|ny-8)+0eze8A`)j!dh{NeIWDV}!U|EKOgRDUl%Q8GTFNgyoT zd3UlKUIp}8&!lybZ1AAwruxh67T#QHc3^IAj;VRWpSX$m*VgEkfe5)m^&_j1JErL3EvO19r} zJ9LlThTod(A?dvy2^X*9bblHJsHR_}-!>-lPU~&)eIkP%9jcMcb}UDGZoy>&dUi$f zDE#QuH27`sME42fV8~QBC@g#F z$v|Y&w`B1HMv!sSX#@--(V&aw?UTa`@_?_dXm_cPnUqo?)( z7F%z)-Z6ZR(gWtVgZZ*4SY)TR_de_oJRP3DS*Qd=Vlo62f)_PnGVYy?zcdo|A3U0I znjD&Onti3fT`z%xCz=@txP#HZB z68o8_$9;G;4aoiiO>2N&V|| zU4VaU7 z4hmH0mIZm9ythN2wT`Y_Y-P6Ip zcQN&wwlEej7Ii)x;o9uJk@H(vMuGR^9sBWd1(BASu51n}K|>TA@z|N7<5>F$Grz5O zn3x-p-XozY;zw)!8lk-udzrJ22Htc$IWfevdz%-yy!`xK!^(ZNJRs;1MErUc^W>R^ zNdjzw5`?9c9MP=CPvysW)&qmn9UA1q$)UuZ#=Qx)OJAWkBQX9wwsPhMdgn8Gol zr*(y^Ois`qAJm5KP5cfMye1g*k;wkwNm847z#fT^fD*`$@VgxIN@0$%Oc)qq&flS? z@E3a|=*_mFdp>#fR)QOg@#Gd9A`t0|$eatJ248Ny!^j|Pi0J4Q5_e?ZmIuYF`o>q- zRs<6&{g{Nzdr0Io+))eo84-}DA{pZDejjO*ir9Cmz0(hoe;pqGR z&rJDVMn_tOA}EbbG?ks<5vrfy^df741dDiad*hUI6*Jt;ki}Z6!=Q!Hz8ATR6y)`r zbuT0H{kN1!7bGH}*aRL)g8>3oI@)h1byYeVQQks28qynG#Cd~Nc9;Q$9Ib>^2CDn6 zY>fc663&gYsA?MgLu12hKx+7@vGGAOt|6jUK~+I*+CVUd83u{H0cs{sygySzmplqH z&Ujyb^i}(E-*`!5(Kq^Wm~L|Ty0_Fd_{K+=bdF?5>(B*QA-RK)%Pv4Wqplb)b~R%= zIr`Nr^b%qwQu~cL+SEf;LEMtA-rW-4;veEJhxer9b%enP@bX(@X4n%=!y;^p88 zD%N(RM@-30>FN(hof?eoE?vhL4M!(ZCz4w^gc_(P+$}r> zO2ZFHXrfLOV-jg{*hK#^Q#UwTbTW+h7$qxIr|&T^`!|Y7NB6{*3f#9%b9`k6Y&v(P zEA9N9>NpY|-$Z>tb{P3BHcXC4^ms7TWCe3aW;U@dGeJNy6_gF*cOnRC5t0CUYF#rm zcpP$=#KaK2Ss3FkgeCh4)ZD%E)a0C0L#TIIiBH9xY{%MLKC@kj9nn6sv$33blQD!< zpg+prXj#XUntf(_tB9_H*_kRFq8sYhg*x4ZLKXh-29gs<$>J zV?M%hEP1I21@%jn4YTz@HYFMEHgZoqEo+FWqDDf!ej?MuUwZvuX*qiR{6^RL&f^Ru zq3rEQnP8dXu?}u<(R?PoaN-OiQ_-ivgC6deum(DeNWTDRV&ab)?t^G*b#NMfqGOJ| zl?%c-NScrU5@$ek$j!NkRK`LvPkQH(HOA$TOt2{9_s zTqSmFD>!lg#5(~gDhW(75VqACl=v0ZCiwXV1tf+ACs!uLd7aW2*Kn-1EuibYj7jia zGK6+Eh^_*%Vpvg(%Ver?;|U~AWM6QHioVPw1<2`vfqOldMaNp87~B6jm-QHZlT50% zcBVffRmD?n8LcC68o&0?>B~)0a(f7{t;Tu9XercLg*MFvp~0_&waqmPP$y30r~A#s zFgwZv)zK5LqKAM8X%U-WixZTdKy_#>;S8NaRcy>MMXV1c!^`=6>O`3+o~r~nTFGjS z{Ekz^UC!b&FZ>0Po@06&szFfdAeNX>TxR#9pH1dZ$^5sNfjES-^y6W#N_?)y^`qsO zna{)o%B*ZTizl<*DT`)aWs(##zfx#%rH8P0!(?Rg0}VCpVMBjh(}x~pP{p!WudJKT z548;6T-;i+K|`Jzf7m>H%M+>s{4`v))L2!X%TmTsXHQpedw-^x!|<x zz>NB`-SjMc%X>W`ywYuf;C$yZPqyYEKCG#tDcVi@<3{U5O~5TiyEl8QX+MYBGkKcz zmxR@R=7Z@|d#o`IyERqT9#XS4L~HL=#!K9;za?)m%FUX7{^0)5xE*SI$ABu*hXcotd9 zB`@Edm}=+hq4g*Kv81a(VsNQwsC``FTwGryKqCz}wXC z)p_YeW*eLlR+U<;ojS;6UD&-S{bk5B2wK$_o8Cv*Hy_7A%Vf3o%kJqbm6*MC%{ zBb0;G3LRp28u^M(U0FHx(2^;KJaJG9vd^5IW|L z)4G@cPK=8_fXNH(!y?f`pHdE+8wo|DrRE)OwNb~#B-zYlBI8ZxoKlvb75!=~`|v(1 z7jP8W+79+r<*<$3<6^(~siXJm-NC0M%e`~Ix5Duva7_dagm=xv7TU3r;KPNOOKAKg zjZqs4@_G3A7SGJnjMVu}hsynL55x=Ti`wf8ERqt43-&nLaE2^=9}If(FnuJU$mBo@ z`i&4D_m|5N@5`H^Pskha8|IW3SZ!7iz+)M#&*<4{g8TJm2ya%pr7$FS_4Jpnb9HAmy0EO+j z#wSh@FA||*q1=qaB+FVy2P?S*a7tR4_e<;e5+RDNk?q(>iLOCm5sI!sz;vm@k)>k8 z&<{-JaVTdFe66QTf?$MT{AU!Ug4OU#ZRFWfSFt+~9wqv>XeKbiCg#PsZa`(V1sSdV zt(lhw(#YdqN5SVzCggVzfCB&Y9~zE(M_*|2Ds*lZRsfzszB4<4iq8ABU=~l4;B(?{ z;h7w6pOJMT;8l_SzY69g?|dBcYKY1?hq`WhEMdmn&t@qtliTUFP=4(;WAsjN!ul0g>0mb-sQyGcW(Qi`gNt}Ic(r)HNz;NSJB1d4kK@(fBMy5;66p>)Pq-vLPK=J~y&S zV2x1=GQZn|r=VH9{w?0~!st>Sod;8kj@=&6CGP`W)D|tW1iW%D!N{C-uHCevf0bV1_5h<-;{HG(DJ@ise8iA=+b$hmrJ;Mg`Bs z3~dXMz0|Oh{soIR22{~G#?WNb(d5%&W}yY-NF;#hT8?qgS>S6K7T5|2wuz!}v(UpM zMN^5lQiomttc^xZgf53Dm%r`Xvv;Wz&4J~DX&d|40i$InHc5owj&b$Cv_ox#4?gaH zHK2;v5`zt+aV}ADHF79ySg`nr{Jcsq&gT5QD9uZd2%;vWz8h?07E~ZNr+D$gb9GEr zAQ}?v94)GfR}MyFCxsy)stHP3d?OcT;Pv9WQ*uV3+(|FPUC7#CZcI~*i}d4#8X|4O zME{M+s6U%BrQi96DT8cie8%AKgGnSMbft+Ax&1Rb`qY<{s-?x5uU#Azl`7bcy9_aJ zioh2)fg|b}#&O@ii7Hd&9pEKvBA~QCqpK8wBY24At$1zfdv=g)N zs;@@lZL&CaDVZ^hWNEhWYW+^`e3JI-W@CR!PvX|LB0f<}W|ZL513YV2>S#Cedoh1z zp?i;{QcFTuT;CcOrTZ>H|A4MA_B@RU<0%%KWl|ipyzLX&7mA5 z;M-peRVx21nao0_dR&`qXr}9Qho`RV$!X_oQvc_6`xl}4Lq%%&kHuf>Usm7Km~(>0 z-gm@6Inslg>2&V=$PkJ8N9{!~0FcoU4WgF(US9LdT(cW~J{;*ge36Z4-CIU^+98p| zD%53#o}=jRXMx|F7~^MByZPY1rmV=C+YKCL7<-s%3^=RWn$B_LyU|aoFx@C1!5{VUHi=@u z^2|s}?_wcvFoUT;yypxa2aYFhowdt7Z9vs*YP-R7T*{i84onza)@%HnVH*!h1Q{cr zO&8x{8ADP1YH#^c&tjqWZ=2`P#?9=c>G`4gD< z*Go%vE8HHgi^@PddyM(6C=>+a?@((47--_!qdeR&*m{-?*> z>wWRdjqPzq`%S0uiGucGy65|Y`m)!uCB7Wj!vopdPw-eHavNN>Ec@Z~q4%Gpk+Sbz z7MnFA^LsJwel;Y^j9AyOsuGu=4gP?O%U+t zMc34d3Y)@;tpmU4Vh6q(I4jBlhM#SU!3rr0x4F^mOB-lL;1y8dp zEX(@(xDS3a0{9Ya*hHI{)Etg69_p=LcYm*x;mHy?TynDF0}$u`~P-pY80|y-jVnfcSmB3^I#JC z$(jGBR}&In<8a6_cq{WkM!->~+A^asZ|Zzm?khdDJfDq^)!0-p2xuFGU0bd= zoB7D1>hcx_zv|4gsImzvJ)m#kg_Ba|4?kKdbte*De~P41C}E9RQeRQ+!ZTYFEOO?~E=p-UyLTo`h}7=qdXp=*+9#6ZTmM0w=-3ruRlKL z*0mVt)RpJfy{*|+@g>~0xD)xnklyO+*JByl-sJ1Y!v3L%-eB^1&cjuYr~?@Ao$;M{ zKWu4qnz{Fmz0-2Uo^UR*b|*6!R?U5%V;H6@^(`D{Yq|$CaSFng**?W_H;2Ay44o`i zMo!&@BdRgskrt4xa7;RQP`RdP@8sd^}l+J+wov zKxU@VlrEpJS=y~xsmJiISYpn6dWSTyox7+WMSbf0p}dKpk*&$Y1+_A<{0!Qf+LrK> zL20?PRrhG)rNG2S{_^*=-g2947WB&P(I=07l-JdmaP+FFeIxE~!HaG* ztu)2+MqFna{~Os1mdBsdqm#?4Wj9z(z5KUPNTn_B_` zV`0*IS~0vgW!K;v`?gS~zG%GpnXt?VEtxBoJ0o848}twOirNld$}hk6?w3PiUUYQY zq-=czbRJtDyh7I>mo#(*;zDXX8qJ`hm&`m+BTnsYWE%Yx^i?P7!|FRfu_~#aUls*( zL8{N5)Dnjufs-_g@vDh&D8Wbv10V@Od#asBu%JT+8)ha)m5xadUXqB7LX}PQ`cq=0 zL9bUVE|g>K7rD9*)RY)Iq9X5RvDMzN1>p4M8i_aHbW$#N?iLt{PYUNiHGMM*Y$T_8 zt%WDMol;C&MKMP>W+U!ja=hKn7<@m*=jimhI7NXgk?$T@L&`khM$qU4059qPPUbRl zhaJP90Ln=QN|Hg?`Q*u%O2RKLNA8t(`8Y|9h+#PZR%j^2x6Dutz^$e02HkyUjBDJG zIzL2kt=;Lj!3d2eKkTnu4wTm z0t6yNP9VfDYz99t96nFX<81dc*=-LN5#V3Spzz0+Idj7xC+{%nRn6oWi0)kQo3>Yk zCi>A^!QX1tjN%)+Zc5%!$|@szmDu)<;{!FEQOy}qo1wMEOjGsRWYMDH)WO`|R@Pp{ zW%w|jq)1RqA&q@w7gmYYLXA|lWBNoYs>E_is)*QgI;V+vNgPtpzx#jhDsPWZBYuZd zMJ-O}{uIDkR2osI*GRmmQNZaVqE}pd5J(lwN6)hr59=H#;8_(09rNuxL!di9AT^wq z?my5kh~7V_GhH?~b{>c~Y8(H~1*U#e(&%yg$m3Y+Rb;rZt|`^M0#F@bcaR2?I7e`T zci#`=v^vT9TS~)5HCF_ZvoZ|+>}oSTZ$PmMK!GBF`Ah!htj3D~NQSW@?g=6a2INeJXE3;V zrk}=*>al^dZH6}$cN!P`uRQO+*l!ky9|jr8pEkswwx*K{;p+#)uZ;u$!~8<~n>WIs z(-OldzEO0`Q;`z6u$I3NHbF;t^A8t%lDeUcMB(W`>&7eDn!4&3?+I9{6hxo0_ zj8nN50Q0o@|KVv{s4eLHly<=&>$_Kwl`ypH9~KxDA)N$^BhxQuC@ZJ>FAdxpfKT*F z0{?|~Sw-@x5Ykr=)3yI^Ko|Um_#$K$4zw2OWES&G7G%M|f1|c`Nd7dg{zXXsW~=^i zM*s4@(EervFj1htuQ~$1>aE2%*?$4LVDz}`FTDE*_5a3j`^$pKEUsuQeEwg6G59lb zzkWs_{rx{*E%!fPZ56};CH5EJg+oZ^L{10(dw24ac7LJYng5TyN&W-<68;PQS|m!6 zS%47I_lE>KWImrb#bAj*A^JPM_4k6ia=_d{`AZncFy?mdaV~!%{Qp4=pj+0tPgIF; z9O%S966X<8hNQB(4`SHj;`EPEP=g%JTnJM148fO^!@A!LZx~ZkzQB(@Xa`H8@rXPkun`3w{ySKuV zjyfLUT5RT7Wk|ey+UyBQIG~-c`Lj8+!p`^IUEB0lb$qPS8ZSE1gQf8#`{T`X6ITr> zW0oOc76h;V7(b;;B=&GU+q?1+Rx>3=8f>ZIu=z$knpJd4XSA7whZ^h?$PT}{ z?(O}1_i^Xo&o5^sR&*(EKC7Fr_`N;ivAHlFnq=QuC<7f80wvo^ML&ZRUDPr$o%^q4 za?s&c$4%tXNWZjnE#GK8wHzNuh*@{i-kzzwoyo2sSzb*+Zf;+-Byj#YmQOd7r11v; z*2uL9s7-NF%>|Jlsi|`d>TTY#LsDY&tIX)GIS}hOH4vX=uiog-54uCCGR9djYrP@2 zX|a7+w<;Q#Ol|zk`pK9r%D?tN$i<`FU-QG!-dww`#m^^^!o}+5s7*isS0%lyt`cbt zI7ZRKp~0GZoN(AoxzRYdkqRmzi0uCkNlA>ZTSp{X=57`diQ2)|7`HwvM#n7I>=f6TE zT+ORxCxF=SRfvS)G%fopM9O#}W6PQPkdtdr(mxvY6I{N^kRM-V$W_i&*8i0u9l$c= zI_6&)auiiPeHBrFWMfZcWh6=2dlM&NqL@USF>_RxF$Hn~sonB<1%t!R50bFPsXX;} zIAHNbmk|4Tyu6a%OfSRloh7{!hD(EImnf9QsaTSAFbNV5;o zC7H>P1*#ZO85HodPdAQ?;>(BzD>PJ_kBrWHuSebr-dm&149}UV{%E20B?E68;{jw6 zsf;zv*uR~7)|$np_ehM2UU^`K%Ym-~hIr8bR8B4;wz5{Q;>&6HI|wZx>>JMdUyQ+T zP%tN{piYzp7YqdFO{e4}l_Ri61mi^iLjrHvL#VZ{coA7csbMg&QbDM(jZZ2wRBoD! zKrfDLnZIqg2L}@Q#ln+!2=q-L;6?hz>x&K<_oa1W_`>n> zR$C+IpOIuqClzg4YMgRi}DlB<=*jk(FzI*l@)?s9-f=p z%KiBs09(7{wV-GzGMym~`PrM0FzR}9c9+sEZuWXZ+S zQyK`&S32Jw(%dWnJo(N(sK5H|!C9v2LA82qsuslaXr)1whTJEu zbrtFG3p#8hBu4GSxFt0yepY&l?z?@C?njV|weoHtNc}V(B&7b)jmw9U{9h0oq&Dg? z{||^=T1Oa0Q_yi+yrUJ-TMtM@t2zD|mV zLS9_1tEN4p>44!pi`S49JV)|rmEe=TI@PzcR#y-|^GMS8M)areQNgEgQyg(o&pp4I zNbFixUySD@Uuz~Q*qSWPh+%Dc|L$^6FolPo^F&vSY8sCIX$*ifs-__Kl7lX)GwoJs$;cXTYDeE=L^aC5Ad^7%Hku>a8ut?K}$&au6*kEICh=tJ+`j@bwY_clUDO zA#%zQZ6>;*#@Gn!Pio{vcdtc|p@47su=Pkz;D*xKSwskBByi(`MZ+sZ7YFj} zIovt^t6wA4ZYn6v90a9zc`5(?5Q2Pbr~(0#x9t;1)WC#G4gs(e&KiTfQB51q(#sV) zN$Q@-kn^SW{WjN?@YC5XK7J_hgd_J2xgMc;zp0FImVZ|JvD}~gv-`(i_&*VUTH-Cr zK=3gQCfbwf?kC)rZ}GU(a)wYOJo|8QD2Rq7n_IA&V= zl(6;~E3Gzh&LsgT`1!#)KshYI@U$T}Wwl?P*MEq^N)c92dd3;1x4jlO_^x(^NpjZ zMM}eH_?>NEzS=$}y;~tx2Sf(&at>G4O59{9cyWa<)qw-SuN`1gO7!lM#I)eaCeGd^ zjf4`@A}-E3A~JN0ODa+vhDC*g(w#5_k`j_qq_ic=jEV_-DKF9wzLYNnCt5HzBSV2* zP9HE!vIr{mt&g`afoYoE{($ zPGjh2HWubn2I*_NF=y8uQtN9#?E2acjy#NH&Q6NTRk}3V87{j z>J;G_!4|bcc}waRViF0QNu*hTH8tO-#Gja?*cjrqv+0BEUcut#loQ?cewI~9X#fJ> zasdC(n@nb(@5QGYQ!<{Kf`tXFc68>~61~X+1AsATeTVZQ1mNW0(Snp4Gv$k5?S*9Un_~ zxZ)hyYA|VY&~wl?z#(d*Td7qI%QNk{v3Y^tEOBM1q}-i2$9&>DRSwlN^5eh3=hMqA zP4VHB2f8i{CFesC{ZmZEMA>`_NjTgtZhm&dzP*!Q6}kBWSa71n-#b@fehH@({lNi; zZ*i&}13`BURE-KnpV(jA{u{4yBH4=3y1p?I({^yjGiH#nibz3XaQxT(d>Rv0`cJ${ zq$b>`nk*bCbhVz)Jy$a(+vIcmm@pioQQLeC@9)GYuxqMFz6t(hMPX|uXq5jut^T=( z(ZF}b)u`=1EE#D=|H>KKj=VwuSH|;rgLCct2i)$yqQiwAxO@!R;*cMX%`tA>Gf!@P za?Uc`+3~{P6yDxxpYGgV*4|jGK59*#;)$QUi}?B1a^YpToL1-H`faW(yJewY09mzI z-*aVa%UdzW{9y&B@1b33+r>5OQlUNhI_;nNC_wq>bw1M1!2*65FXS$B^?WYM=pPoM zs(o{V`T|Wa@1$}i@WmmW_kW!hh>|KS^rn#n2hy77(eaJzd`RsU$pym~_8J7}4C7qm z?MRpssuxuAkA;m8`}r?bGPW*~X- zXvvTHU_olWn5}v?Ee=!=v_VzS1f60SECZ92YR`#m|83Epsn=7OgXqq;T(NCEFulXO zU$9NkVBfLjo8mf%&3@P0Bs$$GSz~#{x}2T5Ouf2RppJG8oD@=WQzYIo8NfNb<+8%A zJ*eur>2R$zIr6~wqIpyzShf^O|zMs2#xMk667jh`(?OS7J2O<#lxlQgBlb zS6J}FsG8c?^T0X~cM5YToS!G zm$ZH~yD`-}?tf26#y2G3Que=2$WZ&gCuE>5HsoK$Q-UwH*^%qsz7bI?7hA%_zI$a7p1)6myb7%8JA zK;j-QdjyZ;ggKr-En@DCP4UQ?o%~M);{vW=u6MA@DS&UoJw6OFK8aJo_{`FAMiD9n zDl}q2l609UH(!d&m(NcsODEO^NuGGye|S6|Up*8ar#E9cgC& zH(BbAmZL)T-IK|fsWk}tx8Pj>>AG*@Z4Y0a)R5cMr&$pBq^z#^Zz?jXVp%C+;HnQs z9A)De8zvCo{4ABt=wnWiAz2xSjY;cY}0nvFKjPF*6gO>*Kh4%pcQz zmq*%v6WtRd4I^ZRoJSO#-3gAzgAd9ys5SQ#boLc_QwL+?L#aTh`10Cg^3qp2Z>g{Z_erqaEkx8^X~QCy1ZMNeYVy-ujRnW}HEXh38Yj*c~vJ9CjVUs2a8$ z5^#7@+8bBaDp@8T2W98+HRWc!Y7O1NKS4u*B$^=nFyELK|J)3(-x$DabFM&1{sh+mdzPabI^B z05m`sipqc$c0bsgD#rlW(N{m$Dm}JrWMu$N?3WYjusW&5kr%5THA`x@)FYqZ+$xfZ zX#K%)q4euL-mh_?ng(({_>XQKxwZ1qn{TnEy{;E&(Wkv;ihjeRmQ&avqCc!QD_J$B4(T2%wxPgI!deANQa`|KVfN^!s*2faJFoYSU2ItD*h9Uvc z5xGUReyl|B918{tg~KU7u&CMu@k+Z_1oXz#icuk+5g%ByqQ_AIP~!gMxW3X#lTMYG zh?HdzaXGbpxMcC)dKsJ=AS9PCC7VYh<6u(2zKbh3aeT~z^{)rAmy9mSKeUm` z{*9b?t4+{0O>;FY)<32qOLGK9LIYT%wY@NXR5X%McW4rHUY|;5{#=*fKOru@o^AfE0%U(3}|7ae!!B(EuTMZVaf0R}(&&1R>ajFQfFQ-I-xPm{FK9 z!CM(@o1}!rX7xqM0uPhIn9zfhkmTs1J`+K$WGKYEvAMOV1ibicPX9PJMkbZPv0t6} z&;-1E+f!hp{>1^rU+V_AXaP)A*)I-+gB9o^6`=n0=c16nZkosDva3HpNBwZNiV%6itJ0}TYxGueY2Z#osfTQ3h>a&m>!iMcp#<1Jbj?e z6EjO8EMN_66ZuJm&Gs{`iVF-sRB;K53<6Lfd0BsdL{vjtr9rYx8*yK?&JuPog%Iyl zxAFR`#1_=D*KK7@zTU@Jfv<~CRHF(H?FyzMk)Bq5{huV*D4XtTZBhqfbjp55sH=Y) zDY$C}xSkO+*Qsl$9gj2qcly>_BO6nlp&Obf)#I6gZENE*trG_2Nm@s|my8X9)bO1&HuPn%pD7`Fd3RjFwp}(c|*TLkdLq*m^|;y@|gQVR*fa zen?4WFWC5^V3yzwq+{LtR}MVrTJw!_<| zFf&4K+wb^t$1a)YMKF{lanlSyKZ;YqtgBSXRCW1cc&I;fI&}$~7qMD@K=^gkS|zCK z^J*dOkyYL(+)-9h+eIx+dwG${x!M@)li6+>YV1q+{(65a(O3>&S<~e1io%n6;pepS z3KB4F@YkIomqkEtk848V1%{Rxoe0cAC1G~c{!`OD(ANU?=u5l<)c&JC35|si^xv>t z|1Z-$YxQ z*F}+{Y2=iU9#TBofR=>MtK3ib>B}#-Z(`C10&2gvzEs+ZddkmfD31vUU8hUbtCs`6 z`Wx#f>3aKAo5lE1Vvdb0P8W!0P~IZ=B=vq}{rn?THq35Tm1wvAIX|Jy4eZN z{C3cPzjxWA`2PuB1flyJH{&AoOjx6OCOL%ZP6_%zp${ zQ8W1HwrVD(gIJRZyT}h@)rom_2JnkmqaxGJJB?nminvsDKdO2^3*;N5l&P5cEoF%r^$>ehWm_#r+s$tEYsYSNdY$UQoK=7u3gTu3FspNlRbZwW*$$8? zn@grx@`PN15_W)xM;NGz71#Syqx&l zBcMmko1;O}j5;=#*UGY4CdL9t=zSj0TM6gJoaw|tD_2yq1>DLOacfFK^?#2|7*G4w z8ExJj)_%56|G9f7)cd>RyKb%d^}}sF9#8w@(JJ|rX9lO)dJep1u^zl?XM|UxM41G< zdN#g#XISqC1+f!tRWaL;YwK7_zv;9>uJvlYGqa|v)04m^X;i5_eNoI49kHMnFlEA{ z&H*qN2(6V9X0Ua3addKWdVh8G;nUj-pFA9o%p9B;ztww89eOpLh9IAJSw0&nl{jR{ z6JX-J)t#wDYEUsjY?3!L<3C13|Lw?ErOSmkR;_?h;Yo;6D$9lcHM6!TieAeu7o7QT z$W#{0Aa$%pVcZxLy!*)?94n>%EENAPc<1IH?o9miRRI?!8)^7%J%6E|EBlh=viqM; zqT_aYb3=Iwf^r|ndbZ>TIPu)l6VHu!EM~%;GR+t#yBY=m?64p-dZ{23BZ!Vq5*_c2 zy-}Lr#IZLKr=?4V&(Dd>5hW!3=crH9HWFtc)*kd8#HTy)>6ADwwshw`luN3RPILM~ zITCp+#Wed#Qkx(3YJYPI@L8;4UmVa=Y!$-zW%2Rh-F33($iT*0?OOIIww{q~Rfm)L z<0wCa#o=m5(|SquZhvSs4w6)d6;unZ8Nz}KDg&qO^@x~#^R&!Aj_h&p_6Eat^b5AT z?nb;2yx-uK;$8}_PmL)u!|d1-G)MFI!Lc9cj3MuO@>Q$}h7BS8yr zU?gY(4vYkh1XV)w$ViGJU?k{nw+)QM3A6wQMA|JxVgW>|+|;i(gh&Qs0FfZ(4SL({ zO3d5;-`<%ur;%k_`2GG0!f`vID$1ZU4@6f*Nb;oeBqvL<3iLb;%|y`u1GO-92bp4(PLE4`*+>f%-Ms=+=GfECd92J*EgjJgQJDW`BlnDPCl%jmUi(rRkwOBi5SmE z0NmUTydGQ{yz`hm=e|$9NB;C`zkJ^Z7T%TLUH&{62#!o?KVDy!2E*$R-CxMAtM6Uq zKEH2II+45p9IR*g{LQ*9Ip{Df!Z6^p$bLw)>^<+$xm{*l`toO+%mr`z@42Xw=eG7S z)Njcz4&z`+{?`y&VnHbW9JnPKLfr9Jz-xIxu^I6PVnb&hJ$wfLQ4qucf zp1n#ASq?lKHViohE`%x=qB1$4r~Kpn)|0E7T`JbYWT&lve7rL=x&+UKBePv?i176> z7U&3)VFdNhj=;q(A5-B@Y4(`mrGjsR9j6oT0=}TRiMJmmZ!gEQ*^@9k{O=@yz(zOV z>wEO>`#OJj_UCu3UFE^K{Oc#Ozf<@3o+SBbFs9?m?;;`rRowbKtEmKQWlCH2C;g8* zupzi=2;k`NFHbA)uUF-XN1nWnYezefoQJ6U`)5n;6YWC4XxZxfqgXjXq(K*rlpstX zzsuVW$?L@!NjN?h0S3Nk$BQ`t%CQ6HNba$|d`V2<=T_dMRF0%Oz zqD%VU$4iP2kWYmG;-RcecF_9<0Mq3C{rzE9nGyN@0?>VlWiHhb$iDb7ZO|d|ezfKb z?9X=*kL&q#rG5GG6*b^BG+xMHka%-qqBonL$X53~+H?PGJohy8WJeKJGXqEBy(Qe)O)@_Oq*`7oQZ>SMQ2Q>}YTtCY8 zIRTP!O{6b8b8}4>bRUomr%T)MEX^~Kbn^9$s+x&Uitml z{q}r#b@p~L%(>A0kPG~A!`N5x{hrqJ<+9AD+c8%VTIeGAiNE9aeBPW-&8O&{EqD{L z{0Fz2!t+Xl{rbCoRLRZz@>{&Gy%Nu*;QO1`NaX#Ki&xNc+Ub>LLkqz;NXWy=Q`5SZ zzWRm5j$ZXCS&(^B^L}%l)D#f&4=M+f7O=j*Cr)@)&S3weDuUF+sg!^+)^r ziZ^VcS&t+S>j8-QOM-zxcI({UPVwE~`XThbu|3FoHI4bj;jM%xJEo+2^G`L&m`ycqbr!kqXqhQM$Z2cM|+|SuqBF$#to=`nSd62FaCY6b(@m z&&nvnAD1@<7~q0UfrETY_e#B*XE#GNzkAqIKU|8FgAf^{A|6LG=EI{)%e*3Wp0^4# zInusBeCO`Rmx+OsxBx#%=azKvyPY$M0V@{n!HMN7h7n!!3&Y2Ke~b`1k9n_5suM~b zo(g6}2Maged}$mK5ZP=es&1-z+7Il#q34M_niCY$^h59ENs2o{{)V@ z;NCw&Lcd*kfHaKCDnyA8DGrszPP}=%h#_<-2N46dHZ{%QeS zwW27%MSG41!~^jC!4$@tx!?J&MLV-2`f96bMpLSq?FS(tn3Cu@yBh2wLMBgmpo}0x z7J}}HvVb}n=&z^><^84FzsjGO=rBoqcK`4sG0Snp3C_>N*m1JT`1dQIA6yLWSUJSm z1Ar5n(sT@I*;YAS#-Mbl9U|HTo7-xyuUwPfb!FjD)GEqEzqr$fnp9A4$`1}55_2- z9jn62!Ei5MBQ-c9*OU#=qwZ|5Sjo9 zOS+v{pL9PP^Q#YvVpzz_>&daG$zE>_s7oOP2n8$&k+^dnkeP0>6Lc9W<8HRFMyvAG$*}hiS{GbnZu1Z zRaMxZ6*15`|6F(crIF|BJ#k*q4Jej&YTrJ?tw5zpFXqv&&T(NM?ZwP9_n$RFG(~)q5aIVjlLy}h&NC*0efYb| zi3D1bGqqmdGU$Hmu6^P!u?|%tzDPnJu8j)u7|cT&^vO8xbga6nx*~3W(zQ#Z)xPDG z+=RSHVq>D)hx-}s5uqaM>0otRb@f((PvIZkTKn1y;tCUCzD|U=<>UP?aF5 z5eFPg3w}cTEms{V#(?Y=;fc9$Fef2iYBN!l|E78;D|?6WnuDUg2*X)N7_*3CPuzN- zo=oHcFuAnqi7VxE5y9id?=j%+TDgbexTfd@3fSZ7OB36HLs|X>1A@A>^3{q{U?pjz z79y)Fc1mw@HON9JN$FxzJ0};0GrjvI^B2a}zu8SVOCGGVM6eL>+v}AhCi#3gUxmI=;XXj@}6)f1Hg(KHRz((U?wK(h44)Fk8 z&7H2U@m7~$^HcQ~ejPyxOi6_dquB#~>{Dy@!p(F!E{vy@m3{+V*~*6SCb9=~_QzWZMZsdkOM7W? zabJjVnUE4PunnvktMJ~ULLw*)0ZyO7oM!t!Jv))-o@+3fqu;#;T(UUnZTncm$r%+m9fIw$Q|Ws{`%C!h(-zlmQT7n%oeos+(ZiLUle#y;}I{I8Bmy*UJ1-p&b(rS zQcm#JkUnQ#D|DMoqC^yA-cRzkeD67~SK3<%Amt)ej|^80jJRxK6pr91iPb+`YyS9F z9>&EsUybGa-4ZGAH{YNMvhs@9H_uil#E=P>8w*03L+-gc?uW*+GwVu~yegEZZYIP^ z)HG+?--4D5RbO~KDbUmI)KT9>gw7bX9$q6clFUCn1t%(^kW)K++3x@~swi?NTX_pn zHA6si2(i<)1jOZkjZ( zK^fY*yuV|7cO6(i&^gD{=vVJ|N7Q{u)@J?6FD5m%Qa72Iy_a^2`eYHwUg63?Nphsk z1d#teo83Jg8^307s|sj#TKG#^GS0~!hIz}fs%y^RcN!Hw&mT`*%Wxb_1n11(;ajpj*GZK9G^Mr;wQlx9GAUiY6+9k}y`Vx0Wcm z+-a$diUT`3nqX|>*w#>&WHnkQMnwwAVy}N`HCCEWSSdOvu3%pJTXXqU2Yd{1qPPOz zwWA=?i}x&j^71S4pCu39$~O$xE>>erDNzpZaWVQ>p$QS-g8Ym^gW^2x3s0v3p&7X> zS9T8C#wvo=%tR+0wU2xKt58i7Pyk}+9_NLu_g&?!9Hq9ds{#e0PVW*EN@uuyly4wIqFEB~zbYI!7)AB5qBfPvtk zip#bBSXa>r1|}J|gz9Y5D4>Pq-Pb-E%`hz{G3R!!KEz;fepWuS4`5vFGWL}zBTD+w zl1f3Spd(##==@}M6V(Y6Fcu|1etr{?Lgr((|U z)eByZ5U)}dX!vW51E7f$C`7O#oZlyrlmH;%k?Ba|WI{|4o*q+Wc(BMTgqZN3V{ zWPktJ+q#lCHz9i#-XgP7G7H}6wPWnanfYff`{;DnDjHrQ9%Gq5VAG0=*Wj3;$=rR{ znt6 z|3j}bD`#E(7Z7OTz6^OgTAX%({ir)=gh7ymCykHQ(aRmx$8lii>WZ(;&gX2z6NM%F zgss0G2Y&mmYI*$Bf5qQw>*nOCSb9rasuX!Gd0!Z(AU z8F*{3n_PElwY;*f)fFG;b~#mwQ`sR%r`@%Zee}RBJ+D; zq>3UTynUl+R{VH#6qF|Hu(Al@!3z8g;uABr=ZZuwf1RClawhV~zYPv3SK?WIjv+rX zr@WmFQ~pg~oqm2HSjWxll(X&zN!;*dH2 zR8T33w3F z96CJ_9+J%*&Nxi()-V9NNkt}T*0%6?pL3RTwvd9ziNR3VNE5CIkqW*Wc4mPKd|pML z25q> zz$BzrzKazfQN$|_1IRwKrl;gdJG4@qKFqNxuqlwD;X@y8-ikQn|J)ratzkjT1fD?N zFb0q26p!NXA1@Doq!8^I{dZGADU0rBJIT@6MBrR=XMmt~WAP2Uvjl6hZ3Ekd2lN8G zI4)JJt58A+dIaU{kJwbh8LsvORa@`@|c~%TuxzK`{m{PTo!riPK1<&qC3{za1XfOI&K;!h>#9w~IyqH(=iuGHl2O@Y<%D zR%-Hl4ct9=zR_h=aW)Cb$${RW9$z2%E?hIU>RC>(NffPyvh-1_QTXQ2A9NY@-X7C& ztq(*=zq=qpLKJE3FV68gA)oS?*>eojQ9;!`YFKbxrLv)8h0LtPy-OPn1>GtAr9nMw zSCJCa5qtKq%0zQ!ZhSt|Hk%^`_PK*6N81_Hcdw68_OpF|bk(Etdj+xw1^yj8Sql;Q zZ5vSVwYO4j6Mv1hM`4+t&Q7FTU5E=3D-Uh>j$Z^X%ued*=Ce$CaoC9638D0}YQeS} zHe$4G^eK&4$ZM}tHCM(#+b^r-=n-SSAdp7#iQ7q6x4`<5V+v2r@>mZKaE&Q{%r1P4 zis8%0C7E@_;q=N@i7dol#p{&cAC|g>y@$7*ZVeg~HiZ%sMlb}I-DT2s(DlGI{+&7R zEXa@@b(vPFA8-`~t()S6M~ae{vx)t-#kh?1ndm;=?Lbs@z;QrDcbESmOze1SK1qJt zQGI*%kAQwWe!?3qQzJ?Ol9Js44zf_A!mNeIaHHc=OE`G1$HLAs0d8qr%W-~ZrCCJ-5~ODTtp39MQ9(`82Y_*jG@eLANkfv9BR8d zXk7517>M*!s4MxYDxo`R&XqNB0Q>OJ)tb0N8(hk}4`CQ0&JiObLwD6)`B?dQ=0lkGdijMotF?8_ zn$8B4d1B-4VKo7(;mXoddg^zt{+TcTlGlPI19(9>Mp7GBY+Qam)@9dWe_pR&e!bKLE3X@AWS6NA(bhZ%(cnacsw&ln&NO4CM z0c0o0o+TZ6TU8d`pB!Ev0jB3pHhgz&_3n@Mg0@7tZYto4`*$U?GslC% zr>J<~*3Aj|9`ub@8Zf0T;c=-_dEReml8be-qK5NvR zY0_04zp{Md7_Y;Q=T^4G+UhvVg;w*>Yc|EqoYf%KGkc4+YoK*}H0*fs;k2#Hfr)J< z^_$)HT6DOj#<-QnqOT{)BFJZH(a4b2CU`-#6A^4`7A2h36xa9=qlI6Swj7j|CBYMU zkSc=x;UXrEb2Vg2uymVUt<>omBkofZzWF3?v3BwJ2kwo0*E7UyA1rS?{oVW56$GUe zC;C9(h%aMudblmi{-%&)b;9e-1IWcLT*fH}vcGYu`{-i)+aQj2=m=uZkJN+Ezg2v6 z37#BMYqX0pVEQ5IXT=|7R%4Nfi-Glr~@Vg)=1*D_o<8SiI^m(64mo~gL%y&_i3uV_D8`tpzLlseFgs& z#QdT!a@JmEvjQr1J9+aE1K$OjHvdkY!ND@^ZwjG%ooL3rMzlp*TO3+y=`4EH*Av#i ziM-o7nI{7=A**lZlZMA{d?Npi<&S<)+bfMf-j1E^a!;-wT{{u@oV?Y0FdVLOTQ(|< z(bQ?c*qn ziHxDBo$#mX3%mIjYZv=q?e0Cr2TRJ?00Zf8%RnHWs5}h?vex>k)xTs+wS&C58sJ^S8NC;#C7MUE@G>Xx9d#pSG(C?19asU-Ufp5 z?NOkeLMSO|+TIgENQ+3m{DHvFP%w1|Kk@KHwb9FF+yxnypT{M}tMxGV@|)&h14IjD zC=z~@X90I`SO0MOVCrV-do>9FUjwzh$LH~fV^a16(!O zhv?1WKz2eM|8nJb-bd}D;vfwH1y3U4 z2h8yQ$)dKD?u!0D{QXa&2f+4k{2ll=055W_#-EQB04ZDu=W-iZXqZ=$j`cnz z45U>r%QF)t}5_8@W)B|bM$>;hd6$lg^=)J=TR z_?}@ja%Y^iu+q8G!PwUM&4Etxw^PXsm5C;C_~>Lt(=M6f>vbTY&e?Pb|!kyp*a#SLGQae6Vqwq#pkx^k{?xq@6JsI$f9 zY~pOng?e~HxiI;@nwDhN%35Easb-uLu^`jmmFdRUo;9mFy)M!tsd=XPCe9+=ms!Iy zt_JOXF7ZX6(7)0jAle8E7RRT$MkYT9k|U-zj0x}cI?Z2=)yTJk9(Q}wxq0&F=UA<- z8-F!v`h~v+-Uy{RERl?w z3XlBd&SoeW57Cngd;YiYj>~XwXSHZ1TxLaTL4X{z-OzOjV80U;USjvEU7^69Ll|n{=QyE&&~uyX7xxXwn2;h_4$)+gup8$ z9yAh!X=@ns#?&#zxxu-Si>dk`*3@i^XR!T4U*fcCS+}Kmr(&fyP^UG0;i4Lk%(;Y- z0GbDSLJ?q+CWN2RW1bN2l)hoi2%~&tSKM;Ek>6TB#h)K_Vy}&9= zy4;vO*4ueCJI*TW+)DP}kXjq_pZvZ~lsY+~o(<7OH({@VI(KZ1vvGCTGZ_@60dAz) z`D*ET@R2k00yyfAq`aa%qVGLDhe)--pSi)>y?JVPWnrdSOn}aK@6V(WI(PQ3)w1K2D|4n`LCqmO*IN z%3a~Q#p$63oYn}tCzZr6fL1M*TT*8$Ob}9nE=)){2{*xy(!$pux}%KS7E8NxO>be5 z6hsPaEZvR@14$w&^4xkCOKqLbA<+r+X2D55lchd$&$f^%JX~m3&8(2ympjTeXe{3% zPHfwXJ=YLCu%ow_bA3OOsaggJ4w4#SXpu;G*u=%hR+zL|ktq4-{Iz4!IR7IBy>{@r z0T$X@A(a)4cx!}9&FoCt9@&MrGGjSh<5wjaf}cMDD`_ijMJ!N=ojzriX;&P}ujJp} za@~(lCA|e?OAy`6S3AotKJ<+b#YzD(KzAtbK$mt=3m|7R_t^+SAXWWjGZu+B!DH4}ZNe1$!9-X4qinfqxvP_vmJb7_xlL2QuJb>_XPc}DFpgl&_Dg~#+j%5`VQ5lo43gk5z>`6HCbpD{gMcuUZg2@4eW=UE54ud6?wYj( zSprSWq~)&F-zAz*CGRz2+yEtoXTnLuG5c3nXlkvgwS_E2+We8!e!3n~y3()!_iR7-HiB4SzlN>JSbEF9jBtw-Te-KOnB~__| zIsP&J@szV`)Sp+c+b$P9!AkWidW+k|!Ra;iL)E8WZT&fJpMYIC& zf8+Z(7H~Tht8LPTf*!k`?gXdaLCg;KG(4rSIejcJHE{$Oc`bWRad>I9lw&(>id#Tg z$9hJV^+&RH2zT)_sP#Wv-2W-_`nElOzS>V=mA+oM^L#4!V@Zo>C?S+*fKAoON4SW{ zMRAtFp84>9cypvQQ;mT^lvq#@7-2ACjfvrpgH|SPYaNTEh zN;4&lV+|j@lEptg^dIIccWbUsV^9BG{Oc>{qkZq~#Ny8#{M_rUDtH91ZdkO!e^|+t zNJmKwD0NfxbYVq^q@O(reI|dpo4;L*CHG!%5F$JhZW+9E z&&OG3&eu^`$;gVSpIfNZ8sl`(m6Li2sB3pW%6lUt+rTu$EodS;0=U(r`a*FV+*?v ziXUf7$7*8V_TiVT$6RDxt&iO*2p+d2c;ZPJ7GooEegcDCX`uSOA zW6!d!9;2w&uA>KQQCLdMQ9FkLL2yfNPZIku zzu<_^qrxPG`6A;zxD{%|L&oGY*dJ9%a9)hCKZbGjSR(qf@OH@8!x32$h?3B*IKGwe zhG?V=KMij1AU41Vl764psaC{yIYk|OZ-bk#uWl$qB3af;BVx{!04D4w>|YR?#%{L@ zyiFGnCmvsB^*wObwY*r)vTDcfP;5&KZ6P2&x8?iK<3qui=W{a%;igj;yCLYB@ENb; zk$;IJvw#UA&$~pD6I}w;(W(qN|I9yH9Qj`D9;0^>9n>~55`9k_UhEb`{ODtv@zYoF zM&l;c@AZX<=?_9~128rASYd{mN=@*cmw^!S-dN>@<;}kPU^>A+*jZ9OuA9%P@{vG` zS`DcHs(pmJ<_?CC41pC+jWMRyA2-TQ3Id5%T>Hpc&!br8Eb|9h%O-Tgzu2(d|ILQ= zTCI};{BbcER8zE}q?+ckMpb6%tfPU`;o%f4DX+`lsUDXwVZt$RaGd&b>&zJZb+0@C zdu!Pe)z?Y47!rRy?%7Mn#r)=Q(7QY0ZT7il*&&NHF}Ry=^?@qf%77!JTb#-W39`<-0eChn4Y2({T zpGuhHcrzx}%S>YQnG*5n6yXJ0N15?kGY5kb9qAZ={{`W&Zt!}m`t4FIrn!9PMG|hD zg^gnsdxeEw{-hErLbd!~5C@gx1L71KWwA^`na->!{z+Lq1MTsETl?$;NXzyugq8uX zD1;VhKL@VNzq#nT5Tf7NM(xPO_)IF`fM=R2$^DFI0kS4+c`~O^FRy;M&&3QoE{ODA+>0$YR)0fAqr>0F=O24l@9M0BF;)s*OM>A{U^G|S5Bxwm*aGsqB@rQE)*-;N*`eBWHji#4Q??M zW8T!$Hy|<{3FBSZw~IEX*LSxF_dw7$1?$4XM|#Rk_J`wkx6=Z5avp_~sqcB#ENSPg zps366m%cOEROsxl?211!g(xB##rf0^lst(gcb9ytt7cOZ$gyFHpv%PbC zJxd{k#6YOaf{r~*o`AP1`ln3kZ)mQ3*A~Wj$D*Y#?%hY%_}k3QPzbFnStGtN)d-am zRmbsdf~_2xpyq{@KB7+!r(~vN z#3yW=jNKI5S(5aLvJALPUdch1dUt#Zo_{Ii&#!&&zS>+kRCjLq&aqt_7a(kz&Vb|m zK6krqX)_9oxd=&&W59)An@%ie_)M(jTLIY|^bBiR@Sm`F;x&U9fNCX0)6sZ{ZP;Of54 zt=lkmG+xHcyiq09QKGN5l=W-hLtY2V%ONV5>fLqy8Tz#NHGs-XLiI|V2?Q$M^?PWfF4d=d8%X(k3 z#|7;bhV(ranKmm!D|hOdKKG2Qy?q_AcQYZq(^Gt1=4Ja!VgHj$pHj{A?+E*{AX9Y~ z2c7~);rmZyU+>_Nlx+?YbD4OskU8o( z>l?w3n>mDkVAeE3mc!h!C!R2oi7sf_A={j#7QfCm7-YaS-pM^j`C66m8C9ZJu77K2 zk8szR30pk>oV%d6_w}HZv)GNk$^Q3ZCgWV+L`7x_V29u0`@M6gS}b4H z*8{MRoUw?``3d9y@@9%{&dSS>V$+ewQUT!R#p~2@(Lh6aA zJTj_C#%Mr)kEm4VIk4>`dkINaXQu9LZ*SLm7;!TX-yRLMr=DqtM1gNP_cFjKi0Y}y zTIxi!0@Ss&Vs!8(dUw|=8SUT_My^60^m#PV%++4G;%gWr(I3(Q~&QAypyg1o_VuC<#vTO~1r8w|PeoJuV6N;=q`K zg@fiCwbNa&rd*PU$`?i`6+gvt7ub7->`*dZ`XyQdS^|2WXoORzy8H2CX1|7<=WG|&zLhk>sCKjc(#7aosh*Q%Uk3_g*X>(d7-09% zHJGFS+7S9b3B)^Z9ySq`^%HO`sD!->hYL5IBL#nmg(F0)g)n&qgR14*sf7J7n3M8Nc8{8W{zH>Zv-!2)oIONE&`W>r^(y(-cBll zb;rT`-+isB+au3^38cACF6~uOGo=JDBY4sY%wK6SiW(YXdk@)A%nzNuK4Qt z=u+;E+Y%YaF<1#$IoNwys0)=#MD8NQj`8=Yr9Hn!SI}p}M3Z2fR#uFF-`1e1;`F5$ zGmQ{QGUR@IinmAN5ydhF>s!bsgE6_cd?cbKuXJs!;-4#0|J7$X)+;oeBCp6z-$=Dh zZIvqv`*%M&vUkBYz{5L?db9NBMuTB|-8?x@UA8&@ZMveIijAq%*KvSL;xOkI>iNiL zTa`NrC3Q7Ob;y*kS5Kn-5{xaA`e}a6{66o6W6X2DfgX4S zX_V;*GP=@P>%%V(nU;HhMnvf zK9w*s)xiJkw+j!V_}$bwoykjKLMD`^S6bOsI$9 zz*c1=_^Q(V%oLYt{w=%!EGy8^yTr<6aazko;li}o>(uMoNO@upbX-wPxD5hqmU_ti zVZv8cU!Ola_}zWPdLbtp_l8m-w&%r8w+!Krwu*mkw{q@np_0KnM8%JFA=0=N*U$SOncsq&p ziCl{*E?dLSLfgZH*wMhT@RyL_;>^E!tI>3D*6e)!sYXdbmI=6-V*+%To0ft|4Ue%A z^=Z>@;cvV7Ke&%AEp05{QR?AqyAe7!tG;oa8TqOm{^}SrmSCzrH{1Y@KnJEcjcSgl zLn7WgZuYQuric-$(9McAHjY3@PfMNwJN}|zy=`;bG|1WiGS_0W3kocq0xJ`eerV0a zbxJWe%=$97>|x0Yyq{u!p63!gUlxEQieVdoP?ywBGbfe&uPWmWo^{RFe8WuOR$wVG zUC_7nn25kx2CGbOyBCS9I59q;6%Um>)RTH>w($!tNV+@`QR2e?U#A8^}dFPe9**#oJ#Lch+31!HavPfh5t6v zN!4kf1B4(3y6rSIDPd-hi`=1&4fDG9u*};te*KB5T;ZNp} zAv0q%y?n7DTd?q7aA*zO2G=W3l8K`pNl%&6RvgOXK{^ieynTu2dTC%p$PeJzW{Co$ zfsrI{0vihVu1xZ5U1;^h`ZI?77-yuT?FOjQIMoS(`9?VqB-Sx-o4dQa$O7YPwR~1f z9`%YApy5ia(rCz8ceo11F;u^PJ@CssQTB0}jA&i*>c-~9jjK`xtp>;wkdijVI4ROm ztfVncsE{62Sy3aX72nIcp3xxYi_ENc3k{H$UKh2 zOi%1pD<%fLL#TS=-`!&1f8=7!cJeEhM>;BNir)|t5q+3ga4s3-^}&C$!*`+f`4e3PTo z$&iDDavmXd-?_5qsp=q*6sF;Pk(oPp_M!iE^qvtKW|#wdS@R<<$meOFb)|{n*AFY6 zOFlzS`Z*wm^*@%#`WZi$utBn?nCi9n-Om$nAyn#5esJXPHs2kxw|munKytngZU48u z{9p2NN+S)4q7)je=?L#f!9n1H)Kc+4V<=3%pH;Lh#pD*Dizz_d`{@@Tk;KCH`lR9- z7KipWJ)pcJ!pic%&!US<*+}}N3OmEupF5)*Z`uuK@SnKy2UZp#Ecpj3OH2oLOuyQC zW?)Sn+O`xw(7@-><2^MZtnnDr1}EH}{hPk*3Z^&rtng!R{p2@YFVqIsIqZqdZ4r&8 zf4ucYUh@ivkcL4k3n`lQCL1kEr<;?cQwFiUO=6w^C1dFEMum&AY}2oawkER$N+4c+ zFbTfFAff`*_>Ai)xTSYL+{bl>Nr9lz#6vmpN&pjRj^gswYCss7&GKZM#;#l`;6zzr z-Jc;eIdr!eO_kv9*Cb`2E7bW>{!Gai8}9BajfIB60X+NPk%UyX60m(*srg3nDwE|R z4Y!#~F2plBxu4?VzGCYzs_0eeo;zlC*Kw|QTCN<58?jrzn*iU#8uN#50uO;B!vAPe zapujaQoC|Uf)5kvQd*HU;5%j`QxM;hOE?}XyST(UFKy4}&&6A`PtkX&!6&%VFn1NV zUY}~)&0V%OVydlSQSJB4)w{dRgNC=O{_uY*soh=RGlNqTr%+Tg0)wfzt5z2VtRer%nWz1=%aT?61pTwhMvR26MJ7w+_lG2`f*3>WT&RG$0m zZst`9YSfQq1^bp=MPBCiMAX1H1O?{@wRxpO=)>HZQB!{}Kz1 z;w&_xRk>a`ercf&M&$aN^L%qySl%=pe9}RgcfE_=OBJx^ zwdVTtf8T7e+HAOMQgk26QLAq_ zPF%N#B=_mDd~_+C6Hy)VrY82ZS5Yrofl$GBKt9XD%uefz3$}qJwheZ7qs$uWjpSco zYqQ{#P!+r-PIMa-xHYU~j!42^$vN%g+%f-qtO@^ICnu zOrflN{q|}W^mE35nkH>SiEkbO0N}br7QmM?QgzX1^!=KcPJN9 zfx&jg=+Q35+{NQKtuU2-^V;@j`8<5@hptO$nenB4J*p_j8{F!1!&q!isN}zN-S!V% z7kz00%`{$iZUm&Um-T?HgmI&6qOdSQ&SoCW#}g#Gq?S@cY4Bg7u7U~Mi>L2}7SM}C zJ|`JtV`7D2?c}dOOJpxcNk~VE+JD|NW@8VFoB9m-{k}OlTofl&jxl7QjiV*U{TY>I zj8`YgLxC!Fq)_KWF%|ZOGZG#|5<#kk+z=4{VG{0`aop}*byRso6u3b;nuyx%t-%wl z%%&)gtA-PX3?+VQwfkY4{v(?L|6`l#A0Kf1M9Z(*c{ZI@IMDe`D$1t*f9RxIVFG? zJcj{9f$Qlm0ymBZ&IaIF1g^Flyz-x+2Kc|GnvbETJz!Vo(j9eISNZ}6=ORQddN&2fJL+Oq}Ndd!(2cZQW%%BH{`8FvK!Rt2M5 z2uSFHa-j#g_ukXWw(;?CP4rUk5SIgSgx;#R?O&{)w>2&Umz%Vulm0jy-1HDDY-iR9 ze7S1NIeGTKxVl~?wx}mKs zSlj@j!lB4kPW@8o#z@eV#-^{~KRTNIMG9bk?)umg-{}Usazcb@6sxZD`#YHC98H~nqqiPp2y@hZ)Zy!U*G5Fp;xr1c8gw5~tqHf0eZZyjKHVBC*E^iNl| z34(uVJNqn1+4sju&zLwgF#sxZw%JZ2yh(4N{1tTpC0_hl2^v;vd3nuwQZe&PVVSOa z;oPNlJO|W?SUW}pvxBvtBR$E|r(&MyOzl(yZ|9-<-2+(SLMeN6}bIg8+Xno8YolLBv)f&}_VvRb=K%Pw2()-RguzrVt$A8+s>)AR}gD;~u z@gB<~oQ(n?B;d0?>@)x5;=v7&=v%R;j}1MkmA#`{*oa=llMyTQ?TU}{#hA1g8LHnS z0yAXpm!AzXM-^w45O@`ypMjjeSdTQ^7II6k*0^GQuEv&3ZQJ+RQN0?f&#u;;S0Y1; zzZQR?Xn}!j6e3$Io^X2yq4!GaCvWXwldah!6ou5l36rMdngF;AvbO^LUy1q8n z>3kO=K9EU2CSu0_N7r9Q)wN(<*C_4~EVw%a3liMjHMqOG+k!xF2=4Cg?(XjH5?liT z0{M38)Tw%(drvif(;Az`X0JJBAAMqglNvz;?KBCnu~pSZv>~u~eBrvjsNL=N(ubX3 z@5v_INfh6dxlSLt#!6&LfB0^~H4^m!d%U-gs8Ky}s7mdIp+BWyC>R#EA{Yms$N*oC zmeg{soy`RT)Kg;|oLy?=ad~*b|5+~t3N0nRpc9oPMB!k@uHdM**O6Fi7M+FB;O#T* zPZOMHyZtlcqg!baQxJQDg?2cCl77!7vpVG(KPpZMJTC2Du6k@N&pOLpILzMdFImjm ze_M8+e1gf8<0yPy)81wiW72-ox!CVh>=Oy)vtt6^+!wuNGf&DqQ*AE#L7l^HNZ{M( zNTq0bsc3rClf(I`X7O{vhyuKGL2B!XcKG`u7*PVk}fp^u}5XLeV=}%(D{f1;u#NKP1*Z&w>Wt7Vm7@oMcPd}p`8UgP0O%NpO zyM^JtWH6ew1_@@OzsRa*t7eH1FQoSz;2kj=M1)d)5!tA} zH({k~!DiV8FjIjk=|Ml|Fe+W_Fnh`in_)NWB)ud?vOL4_%+R|)NJfN%m-X{0@j6zO zM*VsrOSq>*vaV9e(#^SSvkcgL8+OadG9i*{QlaRAUZV|6F`!jyv2wOh3^2;y%&r{x zyBVuViWHmxf$%u~(EI&utoHJ%)H1u@({QyiyQ+ucEVZ3?DU{6acGaQJS6eiieAKPz z8Z*)@j%p3|FXRek@t7&!pAdko5D8-5*YOqAzQb`BCIs-2hBFLafbKwl?#Fh^2{Hqd6 zG(j7>goJY9{vAf002T)hN~En#a=@rQ10SlU!RRXOFzs*}VIt?CI+E9V;cf|;z{6*j z(DK{5fl8{vH;*dT*40Igq%W^r#&L5rB*i?Uo@t#swwW@^1m8v-u}&~weiVm^$TK6W z+@m1F?O}KR?vNI~XN>af{P-kfpL&sr&ECo0xjlz@Ihr3||L|-ST7PI&>Dxoi`q+zv&irQgXcIBGPCXtZvb+`{F za=GAK2%W%3QOB}d?c;9t4gskR0=g+*+8+#qOAa9gV{^^bajF{~t3-Oa5)S!&uO+2l zn_(W)_l}}i6(>E#lo|N%r$5P)7<#G-bTwCPv|C-V4o*TdL$PowrYFO7I)5boLaY3u z9FHtZ08llykK=K2quNH$kp7sjzb-xH+jma;uQxImP4r z=e_BdEt@;;=G(%D{yMGm%>d;y?&c2L<7kBLC=G$F5ZC2X(|_iaz|TOOl1{g-<-0M{ zRmOw~V0951h^c?xA?O+3KRT}y<^TK@PqhK7&p!w+G$^}?0!QBY^zl$|UTdD4tP(AR zgoX#Rh!4r;8|JSvDn>yTc$&mWMYQ0ZE)6P{tT05Ldl3S3>P_+^@{ZVcF5G5z&=-8N zq(fadyUjmBN~UXvqvAMXqi43lXqZUXG^da%;HEQBEF>yXY1Qnb?4#sy1PIa45hiQG zg<#td2cnAdt$Xmui;PrA0|S58NPp>vqDh5OcneLnl`s+0z1HWW5$J8Hk9Df}#T2V7 z>0HDk%Cn38{?;jAD{XSJ#W7QTJK*Um|1*EW@Nfa`H}*&l$ro9&j&dbI@I_pGSOzX;*q57}#`LYr}ew$xSq~WPI*}kf~WfVIHTF3gT zpuO}OM0#%+^!T;rE+OOKH>c> z*$vQ`NjT{6st6_3Mn_oNQSW{-toTMY< zlyeXbkI*;S-_?hd!GPXgDwk%3(0Lxchnp>GmC^7QRS z&en&kQ=qW%UE!B-FlG|P9V$P69xqBxboz1W>o62+Ycl{!M0;kMs!m)9i}q0Swhj3^ zA-C0)ajs{jC!yTC9}rn{>49R^?-b;pqrwsWpESyO7P7YeDEL(MO^~GmouF-h0d%iN z^z2Ji+$oioucY)g_oaA|4)8b;5Y{#%5L<$VwtUiBb%&iWxjq+YK#hlEF2*o>MRw#F z_U(}ASsvg>n#@tWJT6WSIDVMDjlIfcwdu~E((;!eD7mY$*M5=Oua40qhcZoN<)2lu zi8}jcpd%70pq`9IO7_%O8X)Qf2rcO67koW4jK~P#aur=~qv=7T%WO>d z?vL*@u0X|m4 z!$64bvU4!Y6ScpwOKWxT+h-okrY%?c#xFN8>D+M}^`)wyk}s8Vl*I!tQ?`d@4<4+Y z=aU~EFINvlC^H-zEuUOhQE}P45EZ1w{MDKHbQGFJmM6bOTg&TwXWlz(5%Y}pC|YY= zJW9bp0{<8PW!U29viSn{VXGkN%<$wOXxPRTe#jZiL37H~pVQyVZ#v%nibHrYRk5Qu zCR{W@2v_DJ!TBEAioA{#TvZv0(=bS!{w9wkmJKiNjGa>Kxp6h59dYq7mt z@g147iheqhQ}4r{TAwi(8g~2Q7+XAOIObnV5YBB z@{P1W+^|wTqj|if;c$|vb9D5br6=(Gic!nU<7=VIG-f(u=f|n}UUbn}a0GR>kaEFj zyiU-&D1Reu_Qu<*&m#dQTfdVOvjoT!P6HeyBW7Pqx9Ng57VPh$QY%Sc4>xx+Vlxw} zlD8niu>dl9ciz_nM<_6q&6*tH*nwGm0;Mn(WRqzZ676_y#!^xWM}i&woU2bzp(WWV z-~`~yQ1}SvVUAHqrhUa<&&+47Grtx&My<%SnIEpty~20#e$9M3artaO-rhHs_&VO{ zXi0PnqH&0K)(^ z4X+w--{Z|73F{y<2h0k4p_ zQXK9&g^&|+4Ob|PrSdWD!~*ob#MA9?+kO7faPuW4RubI0Y{G~h{c&3qMwni%a_&Xt zb^#bdRB#>8lBm$P+Wz{^YEiFqg`c8A3)law+|6BzyHZObTw%5=LK#dWxFqW=r%~J$ z0k4o}oTN(-9~BCzZgyq>L!|j{$-MUUt&+sR1H8CePtu9dtM+#v6lZ)cH}V z-i-{{*nD|d0-0qma}DxQwA}9u27EWcG|~73iamv)7;Q!LBc=Bzr_}*5Rsh&3a6dxk zudO*eK_ZoAC;UcucO`23o5Gebamx3?!anONuGT}}p}Qt7))MV>b%tt&vWX<=5Ue0t znaZ8ke8wAoE4Sa;AJ!^K7#wFy>ZUXBb#%dLs=V=Nzt*`!xqW)kr`z#JH+XFwr~m$L zn!=pGmVRFU0Tv4eBe+eSZ9r%WSQY2Jc88TuDc$+GD7~+<&&xjrpTJ*gWSS>L)eSWT zeHhA06)LLafD$hi^LvQPl!QEEJ{;6od$RW?kfPxzdj2$Z{FRK4HY0O8d6kwfQ6fih zmSJ3m7vby%8X6XNp#2r^U6>eBR(T~#gh7sZYMz^K2}lH&)x)oz{7vKzV9F^M_E$CI z$_M*`G;y1qPlJHkokEWhE%Qg8157yexOp#W7J6!@ej1#-*mGlimgql=z-I{>_C-so zg<+jhHx#<1W17>3iAy)pM0VSpIaoS~R-!2fpjM1Of?=Li zEs=X7)}wItBon+gzrF}uANg?FSQ=RyNm#$RDql@&P3~GLrt|0B-5B5499FimJGSdT zD@HXgb}9`8D|QEdCyZf^m<_J5`*TN7qj>5?->T>#YFz30On|&uh{$a z<4!ea7aEUG5)z+CCw8$ModyahB!aTRE?bz*|I*7TbVje-Uy0dZ7&^Ps(zU3rxY2hT zQ%|L)v?Uo7B^+$lR!+T#>V|CsYmG8%Rb2q$6t-GEwXI$HNbgF%Xi8sS#>dN#(|0y> zi|Ao9!7BYf*`LjAI3h##oPOuln`2dbnVuaq{8*`Z?6BPJ@Nm1&PF6U>XU^iX|9m|t zND{gDRxn{cmH+a~e}YBQ*SSQhLMnqZHe4&Bix zwZH`Km;&6tEU4{9Am>Q-S*{nGWwwgT1U>^&z-S=2e?8`eFtlhE)NtXP{lI?B%( zHkI9-9%j_;^n*3eLXFb=w&f+Em2F6GuBV`cdp)LE?tSNHK^-^+4US;2A~vioTm)s& z*GP}Y&r6)@^bN zO(WwTYuwQjE!dr&b~MK?Qf0_c_AJvGJ=7h(ZbGDc*3c>Hv0%wNXT>vt{rY5ZDmE<~ zm5hpv{TBsH@;O6Vd_l>@Eo%$^!zB~KkM&=#nlk^|Q8#_SY)vum!n% zLcXf{_Nk`E3r5~O2rAS(ddI+<_mfOmlQyB;GKE6!8vWS)cGfFFjskTo3RkFEl#EE< z!BPtw90{%V{+So6k4dLYXX?<;ZC!V>WIsG`9N>~3rpL8I2a;EFb2Xctu&wLd_iP*i ze`d3csoZkQYKvdS&9nDuvpiwC%DZuR{wW`%FoRuQ%H`!s9~JZdxi(i9y$O`B)wOVa z*NpodQpT={5xaN?_WVZZ%T+>V1{Q{Ho%xDKNvmqzopaiMPh669-gw*XN8oBt_wwRh z1FW8%Gf6*H5_2C^(;mJ^=(h55<;XZC2~>4wwdQk;Uw|=r z6M8%~QKTIsT)*<5q5O_s2zt6~jn<#;op~W|X|~;PW0hd`BK*P!O$g#djOQAhKq@(E zkV=mJ-zqsKvY!fz`6mt)Zqfdq0R=c_+mKp<2ODT_i`WbhD3ba&DDw8oLmPL`09RoL z8M&J=1eY`E*B(ng85dfucnVF5A z#p?%NSnZKZa_+^7DungYNKLpIp$4-Uz39~I*84geD<1m>P_As=*DK#x4JWe)t)*=0 zZ0#>?@l|G%e4B5tDR2NM4LEtkQOeGchTp5nBpm`JZme?eu86IgtedEfd3LN|2BcAw zG4rbf+~{!j&}ql{wBR{{Nj|RCTi`wfJ$wbJ>;a&YAm!0|1W9m|qQx{ng=tP9LujaV zxlcMx-kQUkDc){IKduh0<}Q9E{5EYD+)w2}FE+Z}OZ>D}HKb>Aa?%e_CRIxq&wAg#liijWmaZT>}6#N#|J0XZ#Cg6C_za7e& zMcM+(tytBYiL}8psOX;iGH;zL9F7a7T6seAlL`hS?5rnNzYSqdRln5{K|!m8V?J%D zdFXM7mMCx2?%oG@ndR+_^EUTZaoQ){8F~KUntySRJ<05Mhm@d*7F`&Gw-6O+kYvhH z7Z4p{{e?OzWLO#wUK)lpTb>VDY9#*}-&ll-qkEA?qevs6soc+|A zRJqe0{uA+qZvTn+=+3mmk)w)d!dWd8V{tYV@(T_*s@bouX7Dyju4k$(`?UjKKKtE8 zI4e$hOBDDt*klTDe|_p*9Sw9nMj2}+9<^umCynV1SnCiy$c%VGod9JIYoP35=D@5r z?$b>%z|p$Q?~Jq}o@s4y%f+ndl+A?(qp)e-MV8q68JgfctVq0B{4qFb3^DcCe7OFr z?$J}dO8ZLd;i9tNLfz@PL$~JZ^f+O-a$W1;r*^a+m;nP@4@7iN$bA1W`X6JnNt2yg zJ}#d>&j)6(EKiWiFAy}hPH2Lya$!8Nj}g_)WcI0(r_Nz$zfTek6pi!r9>{S*@`c?G^UVO{}4oGU(#@7VnuE^e4fXdnxzZKu_ zxpk6a-g#!Fxuodp>dTrIXsWA0(tw!}cMmULqJJc1l7rg^Dnowp3_T`L34m-PF@i8j za^uvp1nJy{DY!7lz6X+^jFw^^So`ag+(qZL6ety}({NDa1Mf#ZP$D}a-`a;N!EuZ? zHVaMJ0g5t=GL?6M{2kq1G=$q~Pg|sf^=o7kf$|?^^sA83iWtc)2x3ISxZc5dCLJ38 zR0Nd(d8tMg{h~>tp`BV+x1TWr355MgF>%D-TS0~~I6)ynS%{NV|J&)N2u{1XIk2uZ zpi~9VUlO8h~T0Y=J-QQSWCN@U{iwhkoz#zsvH8L9iPb=}G z5K-Ld!yMWt5(;?%?C#nDdM$9yKzk*yE+WcC3y+J_pBAh7SXJePfu1rJHr6)X2_0(5 z28iI;K-qU~1V{)&X1mbutJY9E^qEH*A>HhG#ypcEbc1@_nJ^^{JJXa6!3$F9sHk7( zMSb53qpOEMouL&>oQxVi-sWgbDjXsHQJ^K4^~)kMFqUyZJL@ncVc!?Io!zHXdTuev z@~gVy984&d&tRLA&RX}wjkC2yHRrFBI4kx8%K>ZuA{U}To-s5_9xjk)%=~Z97+uNa zo5^W3VSRV!9>cVm;w-bdQ3)10n_Tx@b9(%O3U*A9+(3JMnxr6&529K*et`bw6F!0~ zmgxlQ0BXAGTc+z%Y2*RTa}g>oXKTPOwlRGF=37_~u@iIcYhy3B#kTZpV2eFH|LE{G z=lN}Cvljht+gR=L|7#oj+8NMq{R_sUdGJ!TUTgoxhYR<7J3}Bt9)aP7z^M9T3Ffe1 zN7KpUgl9P$D;fz3C8!l!7mF-Po<54%Ltj5Inp;#|bai&}!jl3Cb;zQ&Y#)jfq)$d4 z6`BCR8I1@Q{9E#Z`r$!pDv%i>+Ngrzo`2l8aA@VZ4T;12>T{6 zc^^y=>83WiRqLd-zUEi?PFs;86~{=W`n9!)B8i~Km||I3{F;p;u%Y?L3tdbptO-*r zCGrPs=bu9}*I+^aFpDJli#@a|i5q*v{wF|Kdyg0ca+_hB{-N}@akb-|g-7M{@|A{l zMwhzQHOA2S2;@)I8&77H^3@POfZ#0q1{4L_&B&5`4tT4(SC-jDH5}FPQw+ZG2g8E= zu&OYk?C+uuWTesBlapOAa{)04V54YJNj%YtMg<}U1{9#2SPt~#ygnugq86$`UQUrD zXVHN^Ntc3x1X1R$V8SV}{Nb_2C1I68znFb`ncmQ7FY5woLGCE_r@#ZnMd`R~I*BO9 z;JlJDQbXp{4vf)irMWSM{FgvO%cyJqyw0Oa@fPu)@pb)n*e{z>n*rs&Obcbt4&Mg& zKlVDTbgkjDiJW!MO)HB~Fv~`lc%i`Il6fJ*0P+wImG}N~t~ol8Jm59B9^?i<-4;k; ziaNM6w9v!mxg87oz!N*0KU~~#kULww@vBW-Zdht~W6-aQUwS!yJ^bN!Xh%P;a`nAI z?wq$>TkqD<@5YboP>AZ2T6)rfHMBXd?rVZ%s6kT8l8{5x8HLbwk6kvJ|0{c&uQEw4 zFwrCTRvssdCmVWSlBqw&t*P>og~Hy*-uT zIV^bK(~9?3%J}`QKCvg-)jpp20vkjEzrI8X3J!Q1X_L{5%Eq#ZcMIld+ahR8>rfI>Rz_z_J$9}pT3^h@>4lT!7t*XfxC#2Ff5|&t-s3RPvBH$@< zF+uIrC(w%LA?ZO5085wgO5ZBioGl}q*uBZou&B0ExEa-LSM28H>PA9zFb1HcV7ROy zlwJ3br-ju83^lIMf|#*|or}Eb?o(EfMt8#u=Q0iVk-{*iQBIM1 zLPi&trZtV;Xlec_tV*#D4ql3~PoHd&7{tF?)oP%t$A=+P&z}(Sd%~4d^~XrZf)Ar5 z!F}-{2*H^(h&H#1b_du%ja6f{5Eaa7wqJ+~Us?B<5GRx$4+~9{*NsK~m z%SG8o*-QTvN1Oz6%XXRC^zr+cocLheJ_)0~)Zi?^lR2(z5eEty)j~~qu^KzcVzGjE7gx=9STWh4QQ8*es&C^&?C%q${ibk^y(4Mr)RP5r( zC5Yd>#0Ff2pUO!mT~oA0xVuCVBSS2&SLf#!@&jTC_N=>ZzsXyEY!mpQGCv~s`e{35 zHEpg9pJSb2K>0&d^=+Z1>(;H;do9$>_PbvtycI<5{Rc`)&$gndV4N<)U*K@iB@{{u zyA=3jKr*f-aaSEx5gZxm3&hZ>iuN#)FSwy|mGOXqNG#vS>eybc5jy`$j9Ip7H1E<( z$)_e4;0u$2p}8No?)#OIsv0NL-%j>A$dI2#ayCB=P-I03eFp$Hpu7C zr?Wooj=lIuzZKn(^3RU1ifzAL1iWK#&S5x%aChpMX`a^*o?$PKoT5$t`MzIA6>VVo zzSAA=WQ2{=3wLQ7$!~yh9?qbE%}`%>ENH=@{)5G^1R-hq6cfwvYP|nU7=n&H@?C;r z9QPku7m*}TMU_orVW8n%7i#R+$%9$G{67;$&E~2VL$PjElFY^2ljiFbcY4?n?MYg^ zifJWSttKm8TAw&l zn1)f3bD;lnVU65yy$4OUb%J$*{Ut2H7;$A(-Hp*P_&}JL@Y73%u{=>Q#c8L}LR;BfK!4W39XIKIYKYDFc65@s!LyzohyM;-VyU_s-?q5h zqRYGpAAyE)e??IA`5Q!6Uw|aM8NH1EnL!JT$D9FYc>fj2VBoZ=$4fhIT#Q67$561W zolm(^jV$uEgiM=2dPS5yGuU0)r!Mxc>_m%B10V0bgJ%y9V3mYWD|`9k)hV|1N5p7Q z+@m#ZaPw<00*EZ=PZx%C!t{JG3f+^9vL}35I)5XPcP?RmEVZ#OEi!FLW1&NLez8nQ zs9O$iJbES63dDa;^vrJSZtVb)Ec!X3jCo##CVWe(ypt$q7U1OZthw9}dU_!D{103Z z+5!Bb3pACrL)zFIF|;=5)%vL3?y(-%jHAILmL!pIz9WzIe(jy7ht+SNP%mIT7ct9}eZn9>B9w z0yB!KzHX+jfR}IAhSjvTf$nG=!8y`*CvyB9cMf=&`;faPk>YehcTsPlc2>^Hz5XnZ z^l_sU^s5SY5dIjd495t#y-I(%1jMDrPZ=32)yzS0BIL^GRpY>m`;8x9_~Rc>XfTw* zWp;=#IY2275+Y%qT}1dix~%vBp&^yVL;en}23SE=W8$>Ava z0!>l5E67737U%val{E%o5Av3ROr3BP#mY5I;7$RrjJ=`ck@@}v_<}Rt2nUIAFs(38 z90N4UNgp=ho!kPooHVU6i9sm%>!QfX&!(|Ql#`T2EJJb5K>{<9(5VFh!2$4ACUp#m zTl(=XCbhq&psELFSE9k%`_CNSV1QAKNQE6n3{q_9bD1aw^uH9^hw2A;EuWEH!$U_aZ0kue&@#|*y&{1>K`R0i2CC0s19k8HC=aJhv8UYM^OseJ zK6fSnQ&PUGu>4UK9U{*mt)yC5au3fQ;QNxm#m9B7M}%4aH0qPfRmt_LY}jm>J1F*} z$RN6W@b=5rf?cLxJ;n6P*U=EV^WY3ztM|`kRuo>E9EPdl&DPv)Ag}agQ$sa{BtJ%3 zEfkI!>f{yyW#xvGC(_lCHMIxY=Ldxb_DWjdHILobw*G~+ISRd68#7*NC!>-v1<-z8RuJwVOuDt`lLi(|jQU4i+Cmfn zA}d3J5TrUJ&S;uq<)QtSwJ;IREK@4aeMQh?CNI^nP>0zTD&Y6Uxr82G5>A2{uZvO+ zXP2sr86TUT+=qi5^#2?e&7m1R;-8n&{VcPgvfG|0oG`T|gkNkDOwTUGMaZ?ud5G!) z`!>*u0N)sgRz>Q?X;GVC&Tk9l_;?uOShk}k+Woo9dg4qUY6c3_pwyV zZ0^weiY5AZ$tytju6%fN#-!oCe)hi)m-gbalw)iOn=`pKQKu~>!7&4l0RT8xgKHQz znV)ei4ZGfoqKU$UwFwP5e>qr_yy$#~_<12-^{ws68@s zF@e<&lC)r&2yuFL!u*r6KHDDlIx?XM5J8lT#Cw)pc;pgn5rAS*LXed zK*E76(xTCqqLat(F3xdYrx0@uVIJ;;@BfGb2pu{{O+oz$u3^AE^Hr7qlIHv85a$dX z(|gMV^&EHZEa+HJ1mYf5%FXbjp=D+yhV^on&F7fRfnybB z&RJJk-!A{WbAZ-%w4<27&C>0E&OZ7ODrgUAUhnPmilB1Ic=eiX&40ybFp|QZE>NP4 z&1KmUS%Cxv)ML=q@{2Z(F&C*%z^j7EYn!p_q6Zb?RulGaYL6z zRsS4(Sm#CIhTt}wlfgat{@6p^WQsuR6`ij8)wVh#x-6=YlSal#eN#6?x&!BfT=3x~ z!$_(ias`NIj>9~$GBo^uLXVtJ<~MO^mUoUP4K~#Vj{x?MoBNCnC0WWdril<{c9pzH zmo)x4N^t*J4{>fNQgQAnWvI&1z%9I!lajLYlwZAhbl`N*fU`8$K9X4JvUr~Xiz7E^ zd>qX`;1TFCGp!h4zi=X|$A6CT4( zU`t=`O8s)Ej`v5j{QAIDefuFL@iF$*a-s^<3eHOP@4evc&y1tv!=cn#GNA^+4PA4j zpuD7kuF3u8`2(g6t6)G7i!?kA8>;k%Sh^%?AbhM}uUoyRLdYLH?l)(07&zz}LEpu_ zcMwUa=|tZJSnm4)&XKu~euc)Hc$-q;&ESWQ5S#irLU4Nq&ekivw$T{gL)qe^RQht} zIo5W+w;-9#+T$0w^Be-dMYskJl&x5Pv)7VondV9-3=wNG#M*L1GNiAEgo16TPhjhu z1Gk;LXb@F*n|Q6xX@!7Oen)L&57=hS$W)2v!kCiCO(yDf-W0U5c+Vt)Z1GBs>H{bD zb7|jJ-iv?w-fEtuqMgK~uwGccRy?Ces%S=M?N!(hdLhK5$jI^jc%$8EYl2y z?5y83kM;`=+{^jUtn(~Ip=MH`?%DUIU^j@~1_9Nu29~uKy8QQ_B-;xkm*!#?V|>xk zwrz2z50ug7KSjiw4)?v5`nL5UQvcRcY5=V>$;a&czJGrZ3TDo|lOxJEorN7pmM_%`&mqmf%F!t?(R z&LYAa|L1HXk_yFQ>zBM{|C0gyJkC-h|1wC}C=90}q}ysmErx=eP?_jb|JnO#3#UfR zya!J**iKY*-8yGBcKCgPgPWheS#gOf zQ2>NkGdG}c+1e{9MDzEzCGAxHXxsTp9S zUpLV|mKdf^a3*O8oze+6U-0K`?MW3tkYlPoZ^-I4 zDdFqXMYf*`=})2pi9PHkp5^tj7hdYsoLle~ioSjK`K7_D?OARow{aQLG$~KGY_q;1 zc)CSn+^^6AUM&@x$U9yD)V2N>V9|ZT64l6q>!Iq&89l37r1}3RSkQZk{|CVmPa!rU zh#(y!J_T7ESx@inKJ~j#gX6#S3e-N=xTE0|L{=2E>qinYE25tfD^z_)z^SsTLut*0 zh94v6-{aih^osK{9wm#~Z+QgDSM(b@Y04r95@Cx34-OUzxs)!du5#~pifcEQ;OE=O z4|khuxSqd7@37VC{~1_`h_R_Me8Wp24+q<_2*yzSW*eTUou8ZsL`3~&%6%Pc^q?I)O-71WAr*$&)g7UK@nCGGcTyW8xcctu@rXHt z!)_TZH9v-i-_;$>@jd#7k6`+$8qC6bCFyglHro^f|&8+RL~ig-4<) z+BSuZjzA1RUwxsDqjC z9$-MAQY018=g8uFF`_gcRxvyVCGkj1Bb4PGH!0n+vn-a9#34|?M-}u7BP0A~8TTz? zaF=^z;NUfl>71$Z))Kc-ET7!ix~{5gc9Gc}T@^`3Lub^L|EM6~j{-`Vg^8w}%pv*> z#`$DAm;m)Pr{yGXvT@yu81x7YR|`c{`R<^TsZ`?rL;^d^^9veLNDYcln_)sYV3ex)g$hTs*hcSsh~Yq$rJQM&%ZBrMxDe<4h|ZvbhJbjRBjqt9z6Lu z;+4GT5_QwvF1dLs5P8$ep)-s4nB(B3$!*ar?(Dh!LDnVq`3zhhKfYW5+>fgX&`1KK zp4j=G2zEU16@^?cT07x5)Vz#=05bM(L|Vzk)a_oLrS#BCgPUvjqqc6J06AFlp$<$a zWQn;~`fGe#V0-$7mC{^zIYOlc_#aj%^Mu6AKaTH07|_DHMYzr`(MjXC*4i* zG-vJCP1FhIq`!%@1LzfK1e;Y}%e`|%1dR_*_L)#=cEId@%8D36&FqXOUS)|(v5VK( zO>j@UGl@U8@szvK0l(HDnf-)xy8fw&adRzzwsB?o^qx7Wmb(E4a~4$9P7?BKo7-60 zShAhzeigHw>31l9$+4b0<^QgoO)rvmYnzt$O@3bCr1&?Y?^z7hVVoEal1+= ziCIvf#heoXwOvh-xDX8={!fia;8J09A18J2!IntD-c@I3e7!3jA%0zQ2)5CxTF-_U zU9A$S=f~&vc8W~3N@@}B%>D(r?Md`!{Y)+YZuKWip;MyVk(15@h?qj=^KVmTlCNGH zj`gDKi(HP})R)A~?_fY@*wURN^G8O1T5^O^L{$ky-NLl^Z49{jB_?8&l66~>e#DE^B@!1L!{Fc(igklHN=|rYO!k_yH=2()$ewO0*S$Z=n zRPQ>6{Vsm&_Ci`S90hIED$wy2;^A#l`!;0yW@{M)3<8yX?V_PWDjvmq)}X_;NYIez zqcpfT3nZA9UqRl1?oCB=uo~=&ADjqRP`mV)TU->5H&amgSJl^9_J6eg)Sm-BH}Qzv zs2Y5H#`72k1^gsrN_Z`(7CRi4on@a5*tfP-ppzg5cEzdVIg|nbO0ZlcRRd_zm_fCG z#GTjA26u#i{01f->MQ8AvX9g6++5EMq2Q)WFm2s~kfnl_zRj!t9xtt;ce@{Yb_^}F zuVM|8;!TNoT>ds*{U-wykgg&CzjfC99<)az%_fLPZ`rvD3e1A8jT|i-xvhix<^8HD z+4|V~vXecpU;xgHrHyo4V*VrzT>VJ3MXN^k>Wpli@fxzL`wPdePVbM6&Qh1jhd3#s z3io25R8?4DhSVj>ZZn*c!L7Vnfh)!)e^s>vIT|UIca=~GGNMAORwL0H*#Y_b`0EPO z!NBI8S*c?6b)qE)BU1)`^U8<7cKFk8!rHahNLsaEL_qm_8Nq@KhrYVV1ma&`W1Xzh zi5_h(IRqrQjKDuoGsrrJTl}R6%Uek7mUJiqgBO~jBvOUq$jrc;nDj*D8erv0x@^bL zaWdWSbdKf`#~c`Q+@5%PYfy3u!%;C8EY12{K=2r(W$l-c@lxtSGT3A#@OqN@vNpTL zyG;og-*mYiF;$rSpHn7+wre8?Rol5+-la=AtiRaBIWfoTcG?;KC)vG}VH`O>ZJV4S z6W$c>NAhp5yTBysE=r{5>fspG^h816`=3W$YDuraI1F?drbM9|O6etlq6pn!h~|(@ zYYty(PVa(aiWU-gH$#nWihT-b<{ic{40hl1(W9A*?^}KHP0h?x_Jl&f+^p*u$X{p9 zK$NeObPLoVO&Q#2T|50^<>HeQPan`VC%7!AV31ute#X|k!^T1K%0h@>K=H(3h8n{; zDW@bzSgkjB1FBlQ+gApRb&P)zmlJg4_)pPIu8%d)+Sy?@JI@N>>FIC8kn&zeDC6|c zyH_G&A#SmtZlpeN3h*xMEbaL5wE*&t(~#d^-0ueyrdQo57RQdlAXmG^rED0M{b;ja z!jFH`WM`i@W{IvbCi#Bd>1?+G>bhwToBbNt0@y)+_+A$eq3*!uT;_Q_Vo2Z9=zGqF z<4Q+Yr7PLsLUqLaZ%6daB7~WpEF!k+{?|I-UBIKwP?z_X`?Tpn`*zdbtLfak=Kj@h zsVdl=(QR2@Nb{*CKU!*W8Ih-82s0D+RhbK8w?lQLBs?6~WuOdOb;D^~{iXCWoTlP} zV2EQ~Y-Ki&XBdM6Udlmoy%TMJ^-UO@V&;i&D=;Re;-Gc+*K5R<9#UZ(mVm+>nm9zA zO?H~N)}9-8e`KloWY?43HNP&N(yrn+tAas#8*SyOMPf!u|8)pSGXD=ck+LDI*5*!Y zi0U)HQ04-6aG0CgPrdoY+$Sxc=-)YXdF$0YR(mdUwcE7-hiWNMn zl(0cdND+QgFbF8z1sv1VQn!^^kkLya$ZZJ9lt!%%5A$AzrcM}&@;ww7oh5}FcAlG7 zQp%sJ!KMQbe=aY))Hg8okjC3I8)z5qEk-k0!!>?v?;Nh|^wts(A}V$_Y(0j^iz0|k z@Hv1o2nFCn``v;$Ljr83mo&TPK*ef>AvY3cRI;p9`I}`y9!L%5FpB~dI=`bd$>@h= ziH`kz-&{~n`>mn?soXbAsde4v>Yn(L;A}S_%?(l>@h-jo6e9A0k5$$xlNoLv+nrRW zQfmy924pG)2hL`hLTK+Q=IiG3p{?b5;neoL0q<*2TK#pvq2Y)qd!h@4;@mzCzRiM} znpF$Pvn{YMaMWvk#KuP!ZjSvQ*k(W71nN|tDnU6kKJ0P8B0Itnn+&m!P{=a-M0~GL z@xgf2({D;leH^R|v0Y9Im?9EKZxs_b$vIV@Ke%H!!1TjW1r#&;^mD>8DgJUNRap6f)C7uHN-OXBODIix3!iNJ85OEgBiY zY@GMhrf&tAuiYM4eE7wON~}9Sc%RcIRh24|Q36QWIj7cx)j1cf(dYhaFK0C#zvZxl z1iOBg<+b2QdE*q_Bg;TxMJElH(VrBS;$ky>bI|Ubjv8>N?V!E+RU^P2g)*K~?FM%R zQ|4C#?kSiQE%R|q9F6kHfWRfigyO$xN1hp>+O4h;cZHD2M|*Gdrf6KqzQZq?@hJzW zXmeL4-ZpZV{sVTdY!G|UpBIx!5J2EwTH=)GGaNOhGn}VGFD~dNFU$bxC(a@kix2$) zmDnm2o)Ymo@w`-{xjQT+hYATeEeZEB{sid3HG*IgWn{wxJ=a$do`nUVb=Dj5$FbUj z_WG3-WUEorQdhs3kVo}*h5PGt+dKuvYT7~2J+!M9)0xUh8O&0g@s5Hh?}r@$=8^iy zAmU0k&^FEZONK!S$@_7NWU`XYY4e5=(mizP3Ft^IR{8iZ1mKY1X=o$me-?Cp9AHC~ z#qEci6@$NA)LPze>2}!%XuFuSO&K`$p?vFq&M*)%c}8bWF&qM^yal77FvxHYG@q9u zLjHyvC;mW=G^tUnz-=mAG-Z!c4{{B7oWHkog3DSu=HbVV^y*e!(ZpAb+}6rgYJzRSp<3^YB7b;)>tvU`8LR=PH<*|aQXJ?365Em1+HK^ zBHT^uyjxG0!1Dlm_jS4q)W;}|pK=4~n11^Wg1+aARngznfOm;QmCz_fPI;gUtx@_h z>V$hLryJXvpNkWi_;j#mz&VARL!Rse=rtK$rR`~&rJ{V|KK_4oo%cV~j|0caOq>dt zmlX{oBU{M`S!blIj6hRn4T8?3y!x1K}ealLVdOZ`EdPyqt`4=@0ZgY(V8k#bj;JGb_Tfiogr`jVAF5j-MBwG|lu*jd5@6k+C+H&0Un(c|676&SV>}rq~C4NqiNlWGkwt{`~ zPD23(6?FEFUL2bteV$UC{QY#h(Y8)WY?9o;#Kyr)lg434oL+eW$oOnV6uqWy?Y6It zaHkWVM0KpJ>J)bfibjMe!n~wGT>A)bI|jl|q$YtB@!ErC+;Rq{r+bi)5h)E4+d`lI zk_ILZm@^N8q8*M2nuF4x)RTDtROAm}0$nGu5@3t(Z=G&zxz#a8$%u%^x~F&MASejl znj|zfM{cdhXNy3>uT#R8pGAJQS-CX6 z?R=F%#DYA|u04!Ln^s3}4=@y~dBcm3steWRa<&NzKkjthNmF`?`*dvH>JDHhfddbE ziMpaV4xf9xs&VX~0_Gl95nHwIA1g&| zY|iC1)4L4QFRo?~IveIAMPcP}H$)G3eCypsOp3tWVn%;|mg zy)aSfuCbsa{QOg$VM67;j|k&uo}8Lij({3;u4geLzJaH_a9el|a^OH-4{hR26I7(R zs|)41Q!4>h2)FWgW_LMVm^Vt?eg8qZH8jwCLGMPr6MQicpsQKy(mjBq8IWBh2cPRJ z<`2%@o)li4A8l0Hwb-=zY*64Z=6P;U{)D_yw52>+#V&%Ct8|3?%ns4|I>N~8uaGMW zqtQ1aV8X)qQC3(*`n~ff7(!k?Bxl~%MN%mxK=~YfTH4loX(Y|#XTRQ6+YnpmXlci! zKiWO}5iJSu9k*GXms`6#FQ$ojvDi+!IuwMV%Y_dn^MNM8d)!hO!O`=*fk z_jfbbCPO0_U;3eT)!U9sG_~+c9u`WS^}S~~yI5^~tc5dU-T6)kF=wBm4GodFowgjV zi+I*@yct=F#8vaySzYMw?S8JrYpc(cg-|}7AvFT{8jJBUO(=tZKLzQOm-flUne!X( z)Bf3+?a4Q6oee0yosz=QC6!G7+9T{FNHRt*t=T z?myDlOhGqB_|TrnqGm_0?t8 z+e307F|-vW4SaYAyx;IGq0VZgMBAMJ?x{UYtYRBtb5Au(6wX8p2VJNvLlhcbnre%^ zVe#c_%n#^-a+ly=Nh>;!j?oV)MLUj1#@c}eQ744u6tbrZm}go1sLZ0ypaCE>GN7mY zfV4jirQ3I!8EJA%!s^{+w&vF0pebCdn(ylpx#P-s%h$miy}{CS7^y)*)&)TGaaWxX z2u@P)Lp!}RL^&)pEBxBDV^^F4{o4@?mv?wbq2A%qg8O@`^Nq3FuE#s~n@7ySjeJcv zULQ2-H;r^sUI1x{H2nExL-*&$&aMUig@i=Dx+K)#-r9$6VhptDCC~JO*%Mme(mE|X z7sF}Z#DLO4q#+pI%qYYFR6IuPPNRrzk+iM}faCfuaj;LjQ^cahCQ4mWsyHu;F|7n_ zt_p(2DiyM-Qd&kJk3n;f67Zv3+K=pUw2Hi@6)hWvjoru=9iW&%660AgW{im_b+7Fx z5E@Ld_TFyfrG2(_;w9^_g50U0eKp5XmJn|{a|N+A*9UMSKt#MwVdTjf#t8 zym54jEQ}PcNtUMTIa@6Uz~IX_M|WCWYlv=F$-BHqsxNmGbhCC8l(Ll7h>FjKs1ih z5eK!{89@B9=FkBt=s`_-ecWtKcIxYL{%liE{A{kYOkeNGj6>EPIxcp9pQ?jLc2M`zoc0^U zKmL{DbY2Uqx@KXgxsfd{l)iYFT%AW#RXPuBd4R(95T|op%QoB!uls@$7>ZJmxTalSz02ZKQq|~ x!Nbwug`u{nZh|Tt27cvwH^ym+xrd&|dx_g@CpE@(;i*gvAR5-$njyo_^dGN_;3)tA delta 37775 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 From 8406e04a427983ee6d6e93300fc96a5f3a6e0c45 Mon Sep 17 00:00:00 2001 From: Shahzad Date: Thu, 1 Oct 2020 22:49:31 +0200 Subject: [PATCH 03/73] Fix long tasks query (#79099) --- .../__snapshots__/queries.test.ts.snap | 50 +++++--- .../lib/rum_client/get_long_task_metrics.ts | 121 ++++++------------ .../projections/rum_page_load_transactions.ts | 28 ---- .../plugins/apm/server/routes/rum_client.ts | 3 +- .../trial/tests/csm/long_task_metrics.ts | 6 +- 5 files changed, 77 insertions(+), 131 deletions(-) diff --git a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap index 1c724efac37b..dcafe0922116 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap @@ -167,27 +167,42 @@ exports[`rum client dashboard queries fetches long task metrics 1`] = ` Object { "apm": Object { "events": Array [ - "span", + "transaction", ], }, "body": Object { "aggs": Object { - "transIds": Object { - "aggs": Object { - "longestLongTask": Object { - "max": Object { - "field": "span.duration.us", - }, + "longTaskCount": Object { + "percentiles": Object { + "field": "transaction.experience.longtask.count", + "hdr": Object { + "number_of_significant_value_digits": 3, }, - "sumLongTask": Object { - "sum": Object { - "field": "span.duration.us", - }, + "percents": Array [ + 50, + ], + }, + }, + "longTaskMax": Object { + "percentiles": Object { + "field": "transaction.experience.longtask.max", + "hdr": Object { + "number_of_significant_value_digits": 3, }, + "percents": Array [ + 50, + ], }, - "terms": Object { - "field": "transaction.id", - "size": 1000, + }, + "longTaskSum": Object { + "percentiles": Object { + "field": "transaction.experience.longtask.sum", + "hdr": Object { + "number_of_significant_value_digits": 3, + }, + "percents": Array [ + 50, + ], }, }, }, @@ -205,7 +220,12 @@ Object { }, Object { "term": Object { - "span.type": "longtask", + "transaction.type": "page-load", + }, + }, + Object { + "exists": Object { + "field": "transaction.marks.navigationTiming.fetchStart", }, }, Object { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts b/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts index bd4bdb9ca353..c2c86ae05d57 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts @@ -4,51 +4,60 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - getRumLongTasksProjection, - getRumPageLoadTransactionsProjection, -} from '../../projections/rum_page_load_transactions'; +import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; import { Setup, SetupTimeRange, SetupUIFilters, } from '../helpers/setup_request'; -import { - SPAN_DURATION, - TRANSACTION_ID, -} from '../../../common/elasticsearch_fieldnames'; + +const LONG_TASK_SUM_FIELD = 'transaction.experience.longtask.sum'; +const LONG_TASK_COUNT_FIELD = 'transaction.experience.longtask.count'; +const LONG_TASK_MAX_FIELD = 'transaction.experience.longtask.max'; export async function getLongTaskMetrics({ setup, urlQuery, + percentile = 50, }: { setup: Setup & SetupTimeRange & SetupUIFilters; urlQuery?: string; + percentile?: number; }) { - const projection = getRumLongTasksProjection({ + const projection = getRumPageLoadTransactionsProjection({ setup, + urlQuery, }); const params = mergeProjection(projection, { body: { size: 0, aggs: { - transIds: { - terms: { - field: 'transaction.id', - size: 1000, + longTaskSum: { + percentiles: { + field: LONG_TASK_SUM_FIELD, + percents: [percentile], + hdr: { + number_of_significant_value_digits: 3, + }, }, - aggs: { - sumLongTask: { - sum: { - field: SPAN_DURATION, - }, + }, + longTaskCount: { + percentiles: { + field: LONG_TASK_COUNT_FIELD, + percents: [percentile], + hdr: { + number_of_significant_value_digits: 3, }, - longestLongTask: { - max: { - field: SPAN_DURATION, - }, + }, + }, + longTaskMax: { + percentiles: { + field: LONG_TASK_MAX_FIELD, + percents: [percentile], + hdr: { + number_of_significant_value_digits: 3, }, }, }, @@ -59,71 +68,15 @@ export async function getLongTaskMetrics({ const { apmEventClient } = setup; const response = await apmEventClient.search(params); - const { transIds } = response.aggregations ?? {}; - const validTransactions: string[] = await filterPageLoadTransactions({ - setup, - urlQuery, - transactionIds: (transIds?.buckets ?? []).map( - (bucket) => bucket.key as string - ), - }); - let noOfLongTasks = 0; - let sumOfLongTasks = 0; - let longestLongTask = 0; + const pkey = percentile.toFixed(1); - (transIds?.buckets ?? []).forEach((bucket) => { - if (validTransactions.includes(bucket.key as string)) { - noOfLongTasks += bucket.doc_count; - sumOfLongTasks += bucket.sumLongTask.value ?? 0; - if ((bucket.longestLongTask.value ?? 0) > longestLongTask) { - longestLongTask = bucket.longestLongTask.value!; - } - } - }); + const { longTaskSum, longTaskCount, longTaskMax } = + response.aggregations ?? {}; return { - noOfLongTasks, - sumOfLongTasks, - longestLongTask, + noOfLongTasks: longTaskCount?.values[pkey] ?? 0, + sumOfLongTasks: longTaskSum?.values[pkey] ?? 0, + longestLongTask: longTaskMax?.values[pkey] ?? 0, }; } - -async function filterPageLoadTransactions({ - setup, - urlQuery, - transactionIds, -}: { - setup: Setup & SetupTimeRange & SetupUIFilters; - urlQuery?: string; - transactionIds: string[]; -}) { - const projection = getRumPageLoadTransactionsProjection({ - setup, - urlQuery, - }); - - const params = mergeProjection(projection, { - body: { - size: transactionIds.length, - query: { - bool: { - must: [ - { - terms: { - [TRANSACTION_ID]: transactionIds, - }, - }, - ], - filter: [...projection.body.query.bool.filter], - }, - }, - _source: [TRANSACTION_ID], - }, - }); - - const { apmEventClient } = setup; - - const response = await apmEventClient.search(params); - return response.hits.hits.map((hit) => (hit._source as any).transaction.id)!; -} diff --git a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts index a8505337e8ae..c27314923f6b 100644 --- a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts +++ b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @@ -10,7 +10,6 @@ import { SetupUIFilters, } from '../../server/lib/helpers/setup_request'; import { - SPAN_TYPE, AGENT_NAME, TRANSACTION_TYPE, SERVICE_LANGUAGE_NAME, @@ -66,33 +65,6 @@ export function getRumPageLoadTransactionsProjection({ }; } -export function getRumLongTasksProjection({ - setup, -}: { - setup: Setup & SetupTimeRange & SetupUIFilters; -}) { - const { start, end, uiFiltersES } = setup; - - const bool = { - filter: [ - { range: rangeFilter(start, end) }, - { term: { [SPAN_TYPE]: 'longtask' } }, - ...uiFiltersES, - ], - }; - - return { - apm: { - events: [ProcessorEvent.span], - }, - body: { - query: { - bool, - }, - }, - }; -} - export function getRumErrorsProjection({ setup, }: { diff --git a/x-pack/plugins/apm/server/routes/rum_client.ts b/x-pack/plugins/apm/server/routes/rum_client.ts index 2bdfaa1421ee..8dee8b759df2 100644 --- a/x-pack/plugins/apm/server/routes/rum_client.ts +++ b/x-pack/plugins/apm/server/routes/rum_client.ts @@ -177,12 +177,13 @@ export const rumLongTaskMetrics = createRoute(() => ({ const setup = await setupRequest(context, request); const { - query: { urlQuery }, + query: { urlQuery, percentile }, } = context.params; return getLongTaskMetrics({ setup, urlQuery, + percentile: percentile ? Number(percentile) : undefined, }); }, })); diff --git a/x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts b/x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts index 425268264612..518c4ef8a81a 100644 --- a/x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts +++ b/x-pack/test/apm_api_integration/trial/tests/csm/long_task_metrics.ts @@ -47,9 +47,9 @@ export default function rumServicesApiTests({ getService }: FtrProviderContext) expectSnapshot(response.body).toMatchInline(` Object { - "longestLongTask": 109000, - "noOfLongTasks": 2, - "sumOfLongTasks": 168000, + "longestLongTask": 0, + "noOfLongTasks": 0, + "sumOfLongTasks": 0, } `); }); From 63ff0606df1d35978049ff9aa25f04c46be895f8 Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Thu, 1 Oct 2020 13:57:28 -0700 Subject: [PATCH 04/73] Extended Email action configuration with hasAuth property to identify if the connector require user credentials. Improved UX for Email connector (#78235) * Extended Email action configuration with hasAuth property to identify if the connector require user credentials. Improved UX for Email connector * Fixed failing tests and comments * Fixed type check and reverted logic of Add user and password switch button * Fixed due to the latest design requirenments * Fixed due to review comments --- .../server/builtin_action_types/email.test.ts | 7 + .../server/builtin_action_types/email.ts | 2 + .../lib/send_email.test.ts | 35 +++- .../builtin_action_types/lib/send_email.ts | 5 +- .../server/saved_objects/migrations.test.ts | 30 ++++ .../server/saved_objects/migrations.ts | 91 +++++++--- .../builtin_action_types/email/email.test.tsx | 5 + .../builtin_action_types/email/email.tsx | 20 +++ .../email/email_connector.test.tsx | 32 ++++ .../email/email_connector.tsx | 161 ++++++++++++------ .../components/builtin_action_types/types.ts | 1 + .../action_connector_form.tsx | 52 +++--- .../actions/builtin_action_types/email.ts | 3 + 13 files changed, 345 insertions(+), 99 deletions(-) diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts index 7147483998d9..132510ea0ce8 100644 --- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts +++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts @@ -55,6 +55,7 @@ describe('config validation', () => { const config: Record = { service: 'gmail', from: 'bob@example.com', + hasAuth: true, }; expect(validateConfig(actionType, config)).toEqual({ ...config, @@ -66,6 +67,7 @@ describe('config validation', () => { delete config.service; config.host = 'elastic.co'; config.port = 8080; + config.hasAuth = true; expect(validateConfig(actionType, config)).toEqual({ ...config, service: null, @@ -233,6 +235,7 @@ describe('execute()', () => { port: 42, secure: true, from: 'bob@example.com', + hasAuth: true, }; const secrets: ActionTypeSecretsType = { user: 'bob', @@ -269,6 +272,7 @@ describe('execute()', () => { "message": "a message to you", "subject": "the subject", }, + "hasAuth": true, "proxySettings": undefined, "routing": Object { "bcc": Array [ @@ -298,6 +302,7 @@ describe('execute()', () => { port: 42, secure: true, from: 'bob@example.com', + hasAuth: false, }; const secrets: ActionTypeSecretsType = { user: null, @@ -327,6 +332,7 @@ describe('execute()', () => { "message": "a message to you", "subject": "the subject", }, + "hasAuth": false, "proxySettings": undefined, "routing": Object { "bcc": Array [ @@ -356,6 +362,7 @@ describe('execute()', () => { port: 42, secure: true, from: 'bob@example.com', + hasAuth: false, }; const secrets: ActionTypeSecretsType = { user: null, diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.ts b/x-pack/plugins/actions/server/builtin_action_types/email.ts index 6fd2d694b06f..be2664887d94 100644 --- a/x-pack/plugins/actions/server/builtin_action_types/email.ts +++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts @@ -36,6 +36,7 @@ const ConfigSchemaProps = { port: schema.nullable(portSchema()), secure: schema.nullable(schema.boolean()), from: schema.string(), + hasAuth: schema.boolean({ defaultValue: true }), }; const ConfigSchema = schema.object(ConfigSchemaProps); @@ -185,6 +186,7 @@ async function executor( message: params.message, }, proxySettings: execOptions.proxySettings, + hasAuth: config.hasAuth, }; let result; diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts index b6c4a4ea882e..a1c4041628bd 100644 --- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts +++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts @@ -64,7 +64,7 @@ describe('send_email module', () => { }); test('handles unauthenticated email using not secure host/port', async () => { - const sendEmailOptions = getSendEmailOptions( + const sendEmailOptions = getSendEmailOptionsNoAuth( { transport: { host: 'example.com', @@ -76,12 +76,7 @@ describe('send_email module', () => { proxyRejectUnauthorizedCertificates: false, } ); - // @ts-expect-error - delete sendEmailOptions.transport.service; - // @ts-expect-error - delete sendEmailOptions.transport.user; - // @ts-expect-error - delete sendEmailOptions.transport.password; + const result = await sendEmail(mockLogger, sendEmailOptions); expect(result).toBe(sendMailMockResult); expect(createTransportMock.mock.calls[0]).toMatchInlineSnapshot(` @@ -248,5 +243,31 @@ function getSendEmailOptions( password: 'changeme', }, proxySettings, + hasAuth: true, + }; +} + +function getSendEmailOptionsNoAuth( + { content = {}, routing = {}, transport = {} } = {}, + proxySettings?: ProxySettings +) { + return { + content: { + ...content, + message: 'a message', + subject: 'a subject', + }, + routing: { + ...routing, + from: 'fred@example.com', + to: ['jim@example.com'], + cc: ['bob@example.com', 'robert@example.com'], + bcc: [], + }, + transport: { + ...transport, + }, + proxySettings, + hasAuth: false, }; } diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts index dead8fee63d4..f3cdf82bfe8c 100644 --- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts +++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts @@ -20,6 +20,7 @@ export interface SendEmailOptions { content: Content; proxySettings?: ProxySettings; rejectUnauthorized?: boolean; + hasAuth: boolean; } // config validation ensures either service is set or host/port are set @@ -46,14 +47,14 @@ export interface Content { // send an email export async function sendEmail(logger: Logger, options: SendEmailOptions): Promise { - const { transport, routing, content, proxySettings, rejectUnauthorized } = options; + const { transport, routing, content, proxySettings, rejectUnauthorized, hasAuth } = options; const { service, host, port, secure, user, password } = transport; const { from, to, cc, bcc } = routing; const { subject, message } = content; const transportConfig: Record = {}; - if (user != null && password != null) { + if (hasAuth && user != null && password != null) { transportConfig.auth = { user, pass: password, diff --git a/x-pack/plugins/actions/server/saved_objects/migrations.test.ts b/x-pack/plugins/actions/server/saved_objects/migrations.test.ts index d577f0c8bbc6..1fa5889e77cb 100644 --- a/x-pack/plugins/actions/server/saved_objects/migrations.test.ts +++ b/x-pack/plugins/actions/server/saved_objects/migrations.test.ts @@ -21,6 +21,20 @@ describe('7.10.0', () => { ); }); + test('add hasAuth config property for .email actions', () => { + const migration710 = getMigrations(encryptedSavedObjectsSetup)['7.10.0']; + const action = getMockDataForEmail({}); + expect(migration710(action, context)).toMatchObject({ + ...action, + attributes: { + ...action.attributes, + config: { + hasAuth: true, + }, + }, + }); + }); + test('rename cases configuration object', () => { const migration710 = getMigrations(encryptedSavedObjectsSetup)['7.10.0']; const action = getMockData({}); @@ -36,6 +50,22 @@ describe('7.10.0', () => { }); }); +function getMockDataForEmail( + overwrites: Record = {} +): SavedObjectUnsanitizedDoc { + return { + attributes: { + name: 'abc', + actionTypeId: '.email', + config: {}, + secrets: { user: 'test', password: '123' }, + ...overwrites, + }, + id: uuid.v4(), + type: 'action', + }; +} + function getMockData( overwrites: Record = {} ): SavedObjectUnsanitizedDoc { diff --git a/x-pack/plugins/actions/server/saved_objects/migrations.ts b/x-pack/plugins/actions/server/saved_objects/migrations.ts index 0006d88c4414..993beef8d9b2 100644 --- a/x-pack/plugins/actions/server/saved_objects/migrations.ts +++ b/x-pack/plugins/actions/server/saved_objects/migrations.ts @@ -3,40 +3,87 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ - import { SavedObjectMigrationMap, SavedObjectUnsanitizedDoc, SavedObjectMigrationFn, + SavedObjectMigrationContext, } from '../../../../../src/core/server'; import { RawAction } from '../types'; import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server'; +type ActionMigration = ( + doc: SavedObjectUnsanitizedDoc +) => SavedObjectUnsanitizedDoc; + export function getMigrations( encryptedSavedObjects: EncryptedSavedObjectsPluginSetup ): SavedObjectMigrationMap { - return { '7.10.0': renameCasesConfigurationObject(encryptedSavedObjects) }; + const migrationActions = encryptedSavedObjects.createMigration( + (doc): doc is SavedObjectUnsanitizedDoc => + !!doc.attributes.config?.casesConfiguration || doc.attributes.actionTypeId === '.email', + pipeMigrations(renameCasesConfigurationObject, addHasAuthConfigurationObject) + ); + + return { + '7.10.0': executeMigrationWithErrorHandling(migrationActions, '7.10.0'), + }; } -const renameCasesConfigurationObject = ( - encryptedSavedObjects: EncryptedSavedObjectsPluginSetup -): SavedObjectMigrationFn => { - return encryptedSavedObjects.createMigration( - (doc): doc is SavedObjectUnsanitizedDoc => - !!doc.attributes.config?.casesConfiguration, - (doc: SavedObjectUnsanitizedDoc): SavedObjectUnsanitizedDoc => { - const { casesConfiguration, ...restConfiguration } = doc.attributes.config; - - return { - ...doc, - attributes: { - ...doc.attributes, - config: { - ...restConfiguration, - incidentConfiguration: casesConfiguration, - }, - }, - }; +function executeMigrationWithErrorHandling( + migrationFunc: SavedObjectMigrationFn, + version: string +) { + return (doc: SavedObjectUnsanitizedDoc, context: SavedObjectMigrationContext) => { + try { + return migrationFunc(doc, context); + } catch (ex) { + context.log.error( + `encryptedSavedObject ${version} migration failed for action ${doc.id} with error: ${ex.message}`, + { actionDocument: doc } + ); } - ); + return doc; + }; +} + +function renameCasesConfigurationObject( + doc: SavedObjectUnsanitizedDoc +): SavedObjectUnsanitizedDoc { + if (!doc.attributes.config?.casesConfiguration) { + return doc; + } + const { casesConfiguration, ...restConfiguration } = doc.attributes.config; + + return { + ...doc, + attributes: { + ...doc.attributes, + config: { + ...restConfiguration, + incidentConfiguration: casesConfiguration, + }, + }, + }; +} + +const addHasAuthConfigurationObject = ( + doc: SavedObjectUnsanitizedDoc +): SavedObjectUnsanitizedDoc => { + const hasAuth = !!doc.attributes.secrets.user || !!doc.attributes.secrets.password; + return { + ...doc, + attributes: { + ...doc.attributes, + config: { + ...doc.attributes.config, + hasAuth, + }, + }, + }; }; + +function pipeMigrations(...migrations: ActionMigration[]): ActionMigration { + return (doc: SavedObjectUnsanitizedDoc) => + migrations.reduce((migratedDoc, nextMigration) => nextMigration(migratedDoc), doc); +} diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx index e823e848f52c..ae698f2304e4 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.test.tsx @@ -43,6 +43,7 @@ describe('connector validation', () => { port: 2323, host: 'localhost', test: 'test', + hasAuth: true, }, } as EmailActionConnector; @@ -72,6 +73,7 @@ describe('connector validation', () => { port: 2323, host: 'localhost', test: 'test', + hasAuth: false, }, } as EmailActionConnector; @@ -96,6 +98,7 @@ describe('connector validation', () => { name: 'email', config: { from: 'test@test.com', + hasAuth: true, }, } as EmailActionConnector; @@ -124,6 +127,7 @@ describe('connector validation', () => { port: 2323, host: 'localhost', test: 'test', + hasAuth: true, }, } as EmailActionConnector; @@ -152,6 +156,7 @@ describe('connector validation', () => { port: 2323, host: 'localhost', test: 'test', + hasAuth: true, }, } as EmailActionConnector; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx index 3e8e71991a59..b75d809f6a32 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email.tsx @@ -75,6 +75,26 @@ export function getActionType(): ActionTypeModel { name: 'email', config: { from: 'test@test.com', + hasAuth: true, }, } as EmailActionConnector; const wrapper = mountWithIntl( @@ -42,4 +43,35 @@ describe('EmailActionConnectorFields renders', () => { expect(wrapper.find('[data-test-subj="emailUserInput"]').length > 0).toBeTruthy(); expect(wrapper.find('[data-test-subj="emailPasswordInput"]').length > 0).toBeTruthy(); }); + + test('secret connector fields is not rendered when hasAuth false', () => { + const actionConnector = { + secrets: {}, + id: 'test', + actionTypeId: '.email', + name: 'email', + config: { + from: 'test@test.com', + hasAuth: false, + }, + } as EmailActionConnector; + const wrapper = mountWithIntl( + {}} + editActionSecrets={() => {}} + docLinks={{ ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' } as DocLinksStart} + readOnly={false} + /> + ); + expect(wrapper.find('[data-test-subj="emailFromInput"]').length > 0).toBeTruthy(); + expect(wrapper.find('[data-test-subj="emailFromInput"]').first().prop('value')).toBe( + 'test@test.com' + ); + expect(wrapper.find('[data-test-subj="emailHostInput"]').length > 0).toBeTruthy(); + expect(wrapper.find('[data-test-subj="emailPortInput"]').length > 0).toBeTruthy(); + expect(wrapper.find('[data-test-subj="emailUserInput"]').length > 0).toBeFalsy(); + expect(wrapper.find('[data-test-subj="emailPasswordInput"]').length > 0).toBeFalsy(); + }); }); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx index 4ef9c2e0d4d2..1e92e9fc2519 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_connector.tsx @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import React, { Fragment } from 'react'; +import React, { Fragment, useEffect } from 'react'; import { EuiFieldText, EuiFlexItem, @@ -12,6 +12,9 @@ import { EuiFieldPassword, EuiSwitch, EuiFormRow, + EuiTitle, + EuiSpacer, + EuiCallOut, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -22,8 +25,14 @@ import { EmailActionConnector } from '../types'; export const EmailActionConnectorFields: React.FunctionComponent> = ({ action, editActionConfig, editActionSecrets, errors, readOnly, docLinks }) => { - const { from, host, port, secure } = action.config; + const { from, host, port, secure, hasAuth } = action.config; const { user, password } = action.secrets; + useEffect(() => { + if (!action.id) { + editActionConfig('hasAuth', true); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); return ( @@ -160,60 +169,116 @@ export const EmailActionConnectorFields: React.FunctionComponent - + - 0} + + +

+ +

+ + + - 0} - name="user" - readOnly={readOnly} - value={user || ''} - data-test-subj="emailUserInput" - onChange={(e) => { - editActionSecrets('user', nullableString(e.target.value)); - }} - /> - - - - 0} - label={i18n.translate( - 'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel', - { - defaultMessage: 'Password', + disabled={readOnly} + checked={hasAuth} + onChange={(e) => { + editActionConfig('hasAuth', e.target.checked); + if (!e.target.checked) { + editActionSecrets('user', null); + editActionSecrets('password', null); } - )} - > - 0} - name="password" - value={password || ''} - data-test-subj="emailPasswordInput" - onChange={(e) => { - editActionSecrets('password', nullableString(e.target.value)); - }} - /> - + }} + /> + {hasAuth ? ( + <> + {action.id ? ( + <> + + + + + ) : null} + + + 0 && user !== undefined} + label={i18n.translate( + 'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel', + { + defaultMessage: 'Username', + } + )} + > + 0 && user !== undefined} + name="user" + readOnly={readOnly} + value={user || ''} + data-test-subj="emailUserInput" + onChange={(e) => { + editActionSecrets('user', nullableString(e.target.value)); + }} + onBlur={() => { + if (!user) { + editActionSecrets('user', ''); + } + }} + /> + + + + 0 && password !== undefined} + label={i18n.translate( + 'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel', + { + defaultMessage: 'Password', + } + )} + > + 0 && password !== undefined} + name="password" + value={password || ''} + data-test-subj="emailPasswordInput" + onChange={(e) => { + editActionSecrets('password', nullableString(e.target.value)); + }} + onBlur={() => { + if (!password) { + editActionSecrets('password', ''); + } + }} + /> + + + + + ) : null} ); }; diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts index f6bb08148b3c..958d77a11c88 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/types.ts @@ -69,6 +69,7 @@ export interface EmailConfig { host: string; port: number; secure?: boolean; + hasAuth: boolean; } export interface EmailSecrets { diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx index ef6621f98fac..f91bd7382b61 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx @@ -15,6 +15,7 @@ import { EuiLoadingSpinner, EuiFlexGroup, EuiFlexItem, + EuiTitle, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -169,26 +170,37 @@ export const ActionConnectorForm = ({ {FieldsComponent !== null ? ( - - - - - - } - > - - + <> + +

+ +

+ + + + + + + + } + > + + + ) : null} ); diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts index 329bd3433d38..f6b0f06a6722 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts @@ -25,6 +25,7 @@ export default function emailTest({ getService }: FtrProviderContext) { config: { service: '__json', from: 'bob@example.com', + hasAuth: true, }, secrets: { user: 'bob', @@ -41,6 +42,7 @@ export default function emailTest({ getService }: FtrProviderContext) { actionTypeId: '.email', config: { service: '__json', + hasAuth: true, host: null, port: null, secure: null, @@ -62,6 +64,7 @@ export default function emailTest({ getService }: FtrProviderContext) { config: { from: 'bob@example.com', service: '__json', + hasAuth: true, host: null, port: null, secure: null, From 7211f78ce195f1925ebace43905b1301bbf82577 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Thu, 1 Oct 2020 14:38:51 -0700 Subject: [PATCH 05/73] Bumps Jest related packages (#78720) Signed-off-by: Tyler Smalley --- package.json | 14 +- .../elastic-eslint-config-kibana/package.json | 2 +- .../src/integration_tests/cluster.test.js | 2 +- packages/kbn-i18n/src/core/i18n.test.ts | 2 +- packages/kbn-optimizer/package.json | 2 +- packages/kbn-spec-to-console/package.json | 2 +- .../server/logging/rotate/log_rotator.test.ts | 6 +- .../listing/dashboard_listing.test.js | 2 +- .../step_time_field/step_time_field.test.tsx | 2 +- .../number_list/number_list.test.tsx | 8 +- .../components/splits/terms.test.js | 12 +- x-pack/package.json | 12 +- .../alerts/server/alerts_client.test.ts | 4 +- .../components/__tests__/app.test.tsx | 2 +- .../settings/__tests__/settings.test.tsx | 2 +- .../event_log/server/lib/ready_signal.test.ts | 27 +- .../plugins/licensing/public/plugin.test.ts | 32 +- .../services/ml_server_info.test.ts | 9 +- .../new_job_capabilities._service.test.ts | 11 +- .../capabilities/check_capabilities.test.ts | 21 +- .../annotation_service/annotation.test.ts | 15 +- .../new_job_caps/new_job_caps.test.ts | 12 +- .../public/lib/ensure_minimum_time.test.js | 9 +- .../monitoring/public/lib/setup_mode.test.js | 91 +- .../monitoring/public/lib/setup_mode.tsx | 2 +- .../lib/authorized_user_pre_routing.test.ts | 2 +- .../detail_panel/detail_panel.test.js | 2 +- .../sections/job_list/job_list.test.js | 2 +- .../job_list/job_table/job_table.test.js | 2 +- .../job_create_review.test.js | 2 +- .../test/client_integration/job_list.test.js | 4 +- .../client_integration/job_list_clone.test.js | 2 +- .../flow_target_select.test.tsx.snap | 16 +- .../properties/new_template_timeline.test.tsx | 12 +- .../server/lib/bulk_operation_buffer.test.ts | 33 +- .../task_manager/server/task_store.test.ts | 198 ++- .../public/app/hooks/use_index_data.test.tsx | 10 +- .../step_define/step_define_form.test.tsx | 7 +- .../step_define/step_define_summary.test.tsx | 3 +- .../public/custom_time_range_action.test.ts | 56 +- .../public/custom_time_range_badge.test.ts | 20 +- yarn.lock | 1236 +++++++++-------- 42 files changed, 978 insertions(+), 932 deletions(-) diff --git a/package.json b/package.json index 26a7fef9cfc1..0eda8dd9f411 100644 --- a/package.json +++ b/package.json @@ -291,7 +291,7 @@ "@types/hjson": "^2.4.2", "@types/hoek": "^4.1.3", "@types/inert": "^5.1.2", - "@types/jest": "^25.2.3", + "@types/jest": "^26.0.14", "@types/jest-when": "^2.7.1", "@types/joi": "^13.4.2", "@types/jquery": "^3.3.31", @@ -337,7 +337,7 @@ "@types/supertest-as-promised": "^2.0.38", "@types/tapable": "^1.0.6", "@types/tar": "^4.0.3", - "@types/testing-library__jest-dom": "^5.9.2", + "@types/testing-library__jest-dom": "^5.9.3", "@types/testing-library__react-hooks": "^3.4.0", "@types/type-detect": "^4.0.1", "@types/uuid": "^3.4.4", @@ -356,7 +356,7 @@ "archiver": "^3.1.1", "axe-core": "^4.0.2", "babel-eslint": "^10.0.3", - "babel-jest": "^25.5.1", + "babel-jest": "^26.3.0", "babel-plugin-istanbul": "^6.0.0", "backport": "5.6.0", "brace": "0.11.1", @@ -382,7 +382,7 @@ "eslint-plugin-cypress": "^2.8.1", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-import": "^2.19.1", - "eslint-plugin-jest": "^23.10.0", + "eslint-plugin-jest": "^24.0.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-mocha": "^6.2.2", "eslint-plugin-no-unsanitized": "^3.0.2", @@ -411,10 +411,10 @@ "iedriver": "^3.14.2", "immer": "^1.5.0", "intl-messageformat-parser": "^1.4.0", - "jest": "^25.5.4", + "jest": "^26.4.2", "jest-canvas-mock": "^2.2.0", - "jest-circus": "^25.5.4", - "jest-cli": "^25.5.4", + "jest-circus": "^26.4.2", + "jest-cli": "^26.4.2", "jest-environment-jsdom-thirteen": "^1.0.1", "jest-raw-loader": "^1.0.1", "jest-when": "^2.7.2", diff --git a/packages/elastic-eslint-config-kibana/package.json b/packages/elastic-eslint-config-kibana/package.json index a4bb8d5449ee..3f2c6e9edb26 100644 --- a/packages/elastic-eslint-config-kibana/package.json +++ b/packages/elastic-eslint-config-kibana/package.json @@ -24,7 +24,7 @@ "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-import": "^2.19.1", - "eslint-plugin-jest": "^23.10.0", + "eslint-plugin-jest": "^24.0.2", "eslint-plugin-mocha": "^6.2.2", "eslint-plugin-no-unsanitized": "^3.0.2", "eslint-plugin-prefer-object-spread": "^1.2.1", diff --git a/packages/kbn-es/src/integration_tests/cluster.test.js b/packages/kbn-es/src/integration_tests/cluster.test.js index 0ae0ac0aac27..6229a8add0d2 100644 --- a/packages/kbn-es/src/integration_tests/cluster.test.js +++ b/packages/kbn-es/src/integration_tests/cluster.test.js @@ -60,7 +60,7 @@ async function ensureResolve(promise) { function mockEsBin({ exitCode, start }) { execa.mockImplementationOnce((cmd, args, options) => - require.requireActual('execa')( + jest.requireActual('execa')( process.execPath, [ require.resolve('./__fixtures__/es_bin.js'), diff --git a/packages/kbn-i18n/src/core/i18n.test.ts b/packages/kbn-i18n/src/core/i18n.test.ts index ec08c82b502d..3364f20879c2 100644 --- a/packages/kbn-i18n/src/core/i18n.test.ts +++ b/packages/kbn-i18n/src/core/i18n.test.ts @@ -25,7 +25,7 @@ describe('I18n engine', () => { let i18n: typeof i18nModule; beforeEach(() => { - i18n = require.requireActual('./i18n'); + i18n = jest.requireActual('./i18n'); }); afterEach(() => { diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json index f90fcaec79fe..5871c81f48ae 100644 --- a/packages/kbn-optimizer/package.json +++ b/packages/kbn-optimizer/package.json @@ -24,7 +24,7 @@ "execa": "^4.0.2", "file-loader": "^4.2.0", "istanbul-instrumenter-loader": "^3.0.1", - "jest-diff": "^25.5.0", + "jest-diff": "^26.4.2", "json-stable-stringify": "^1.0.1", "loader-utils": "^1.2.3", "node-sass": "^4.13.1", diff --git a/packages/kbn-spec-to-console/package.json b/packages/kbn-spec-to-console/package.json index 0c80c949c1d1..557f38ec740f 100644 --- a/packages/kbn-spec-to-console/package.json +++ b/packages/kbn-spec-to-console/package.json @@ -17,7 +17,7 @@ }, "homepage": "https://github.com/jbudz/spec-to-console#readme", "devDependencies": { - "jest": "^25.5.4", + "jest": "^26.4.2", "prettier": "^2.1.1" }, "dependencies": { diff --git a/src/legacy/server/logging/rotate/log_rotator.test.ts b/src/legacy/server/logging/rotate/log_rotator.test.ts index 70842d42f5e1..8f67b47f6949 100644 --- a/src/legacy/server/logging/rotate/log_rotator.test.ts +++ b/src/legacy/server/logging/rotate/log_rotator.test.ts @@ -22,6 +22,7 @@ import fs, { existsSync, mkdirSync, statSync, writeFileSync } from 'fs'; import { LogRotator } from './log_rotator'; import { tmpdir } from 'os'; import { dirname, join } from 'path'; +import lodash from 'lodash'; const mockOn = jest.fn(); jest.mock('chokidar', () => ({ @@ -31,10 +32,7 @@ jest.mock('chokidar', () => ({ })), })); -jest.mock('lodash', () => ({ - ...require.requireActual('lodash'), - throttle: (fn: any) => fn, -})); +lodash.throttle = (fn: any) => fn; const tempDir = join(tmpdir(), 'kbn_log_rotator_test'); const testFilePath = join(tempDir, 'log_rotator_test_log_file.log'); diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js index 6acb491f9a20..99b1ebf047d7 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js @@ -20,7 +20,7 @@ jest.mock( 'lodash', () => ({ - ...require.requireActual('lodash'), + ...jest.requireActual('lodash'), // mock debounce to fire immediately with no internal timer debounce: (func) => { function debounced(...args) { diff --git a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx index aec010d2dd3f..4d1033d12d2b 100644 --- a/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx +++ b/src/plugins/index_pattern_management/public/components/create_index_pattern_wizard/components/step_time_field/step_time_field.test.tsx @@ -30,7 +30,7 @@ jest.mock('./components/time_field', () => ({ TimeField: 'TimeField' })); jest.mock('./components/advanced_options', () => ({ AdvancedOptions: 'AdvancedOptions' })); jest.mock('./components/action_buttons', () => ({ ActionButtons: 'ActionButtons' })); jest.mock('./../../lib', () => ({ - extractTimeFields: require.requireActual('./../../lib').extractTimeFields, + extractTimeFields: jest.requireActual('./../../lib').extractTimeFields, ensureMinimumTime: async (fields: IFieldType) => Promise.resolve(fields), })); diff --git a/src/plugins/vis_default_editor/public/components/controls/components/number_list/number_list.test.tsx b/src/plugins/vis_default_editor/public/components/controls/components/number_list/number_list.test.tsx index 82d4b9142fb7..7964da23d8f5 100644 --- a/src/plugins/vis_default_editor/public/components/controls/components/number_list/number_list.test.tsx +++ b/src/plugins/vis_default_editor/public/components/controls/components/number_list/number_list.test.tsx @@ -33,10 +33,10 @@ jest.mock('@elastic/eui', () => ({ let counter = 1; return () => `12${counter++}`; }), - EuiSpacer: require.requireActual('@elastic/eui').EuiSpacer, - EuiFlexItem: require.requireActual('@elastic/eui').EuiFlexItem, - EuiButtonEmpty: require.requireActual('@elastic/eui').EuiButtonEmpty, - EuiFormErrorText: require.requireActual('@elastic/eui').EuiFormErrorText, + EuiSpacer: jest.requireActual('@elastic/eui').EuiSpacer, + EuiFlexItem: jest.requireActual('@elastic/eui').EuiFlexItem, + EuiButtonEmpty: jest.requireActual('@elastic/eui').EuiButtonEmpty, + EuiFormErrorText: jest.requireActual('@elastic/eui').EuiFormErrorText, })); describe('NumberList', () => { diff --git a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.test.js b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.test.js index 4d322cd7b7e6..da840adb75cd 100644 --- a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.test.js +++ b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.test.js @@ -23,12 +23,12 @@ import { SplitByTermsUI } from './terms'; jest.mock('@elastic/eui', () => ({ htmlIdGenerator: jest.fn(() => () => '42'), - EuiFlexGroup: require.requireActual('@elastic/eui').EuiFlexGroup, - EuiFlexItem: require.requireActual('@elastic/eui').EuiFlexItem, - EuiFormRow: require.requireActual('@elastic/eui').EuiFormRow, - EuiFieldNumber: require.requireActual('@elastic/eui').EuiFieldNumber, - EuiComboBox: require.requireActual('@elastic/eui').EuiComboBox, - EuiFieldText: require.requireActual('@elastic/eui').EuiFieldText, + EuiFlexGroup: jest.requireActual('@elastic/eui').EuiFlexGroup, + EuiFlexItem: jest.requireActual('@elastic/eui').EuiFlexItem, + EuiFormRow: jest.requireActual('@elastic/eui').EuiFormRow, + EuiFieldNumber: jest.requireActual('@elastic/eui').EuiFieldNumber, + EuiComboBox: jest.requireActual('@elastic/eui').EuiComboBox, + EuiFieldText: jest.requireActual('@elastic/eui').EuiFieldText, })); describe('src/legacy/core_plugins/metrics/public/components/splits/terms.test.js', () => { diff --git a/x-pack/package.json b/x-pack/package.json index 6c18902c7736..f9b193bb4da0 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -88,7 +88,7 @@ "@types/hoist-non-react-statics": "^3.3.1", "@types/http-proxy": "^1.17.4", "@types/http-proxy-agent": "^2.0.2", - "@types/jest": "^25.2.3", + "@types/jest": "^26.0.14", "@types/jest-specific-snapshot": "^0.5.4", "@types/joi": "^13.4.2", "@types/js-search": "^1.4.0", @@ -127,7 +127,7 @@ "@types/styled-components": "^5.1.0", "@types/supertest": "^2.0.5", "@types/tar-fs": "^1.16.1", - "@types/testing-library__jest-dom": "^5.9.2", + "@types/testing-library__jest-dom": "^5.9.3", "@types/testing-library__react-hooks": "^3.4.0", "@types/tinycolor2": "^1.4.1", "@types/use-resize-observer": "^6.0.0", @@ -143,7 +143,7 @@ "apollo-link-error": "^1.1.7", "apollo-link-state": "^0.4.1", "autoprefixer": "^9.7.4", - "babel-jest": "^25.5.1", + "babel-jest": "^26.3.0", "babel-loader": "^8.0.6", "babel-plugin-require-context-hook": "npm:babel-plugin-require-context-hook-babel7@1.0.0", "base64-js": "^1.3.1", @@ -188,9 +188,9 @@ "hoist-non-react-statics": "^3.3.2", "i18n-iso-countries": "^4.3.1", "icalendar": "0.7.1", - "jest": "^25.5.4", - "jest-circus": "^25.5.4", - "jest-cli": "^25.5.4", + "jest": "^26.4.2", + "jest-circus": "^26.4.2", + "jest-cli": "^26.4.2", "jest-styled-components": "^7.0.2", "js-search": "^1.4.3", "jsdom": "13.1.0", diff --git a/x-pack/plugins/alerts/server/alerts_client.test.ts b/x-pack/plugins/alerts/server/alerts_client.test.ts index a5846cd1060c..088390c3cb6e 100644 --- a/x-pack/plugins/alerts/server/alerts_client.test.ts +++ b/x-pack/plugins/alerts/server/alerts_client.test.ts @@ -4130,14 +4130,13 @@ describe('update()', () => { expect(taskManager.runNow).not.toHaveBeenCalled(); }); - test('updating the alert should not wait for the rerun the task to complete', async (done) => { + test('updating the alert should not wait for the rerun the task to complete', async () => { const alertId = uuid.v4(); const taskId = uuid.v4(); mockApiCalls(alertId, taskId, { interval: '10s' }, { interval: '30s' }); const resolveAfterAlertUpdatedCompletes = resolvable<{ id: string }>(); - resolveAfterAlertUpdatedCompletes.then(() => done()); taskManager.runNow.mockReset(); taskManager.runNow.mockReturnValue(resolveAfterAlertUpdatedCompletes); @@ -4165,7 +4164,6 @@ describe('update()', () => { }); expect(taskManager.runNow).toHaveBeenCalled(); - resolveAfterAlertUpdatedCompletes.resolve({ id: alertId }); }); diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx index 2ec3cfde8bd6..eaf45db0a0b9 100644 --- a/x-pack/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx +++ b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx @@ -40,7 +40,7 @@ jest.mock('@elastic/eui/lib/components/portal/portal', () => { // Local constants are not supported in Jest mocks-- they must be // imported within the mock. // eslint-disable-next-line no-shadow - const React = require.requireActual('react'); + const React = jest.requireActual('react'); return { EuiPortal: (props: any) =>
{props.children}
, }; diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx index 34dacc795625..28aa6ef90aed 100644 --- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx +++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx @@ -26,7 +26,7 @@ jest.mock('@elastic/eui/lib/services/accessibility', () => { }); jest.mock('@elastic/eui/lib/components/portal/portal', () => { // eslint-disable-next-line no-shadow - const React = require.requireActual('react'); + const React = jest.requireActual('react'); return { EuiPortal: (props: any) =>
{props.children}
, }; diff --git a/x-pack/plugins/event_log/server/lib/ready_signal.test.ts b/x-pack/plugins/event_log/server/lib/ready_signal.test.ts index c216651ee94b..d23d81861acc 100644 --- a/x-pack/plugins/event_log/server/lib/ready_signal.test.ts +++ b/x-pack/plugins/event_log/server/lib/ready_signal.test.ts @@ -13,28 +13,9 @@ describe('ReadySignal', () => { readySignal = createReadySignal(); }); - test('works as expected', async (done) => { - let value = 41; - - timeoutSet(100, async () => { - expect(value).toBe(41); - }); - - timeoutSet(250, async () => readySignal.signal(42)); - - timeoutSet(400, async () => { - expect(value).toBe(42); - - const innerValue = await readySignal.wait(); - expect(innerValue).toBe(42); - done(); - }); - - value = await readySignal.wait(); - expect(value).toBe(42); + test('works as expected', async () => { + readySignal.signal(42); + const ready = await readySignal.wait(); + expect(ready).toBe(42); }); }); - -function timeoutSet(ms: number, fn: () => Promise): void { - setTimeout(fn, ms); -} diff --git a/x-pack/plugins/licensing/public/plugin.test.ts b/x-pack/plugins/licensing/public/plugin.test.ts index c20563dd1591..ce3fcdb04232 100644 --- a/x-pack/plugins/licensing/public/plugin.test.ts +++ b/x-pack/plugins/licensing/public/plugin.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { take } from 'rxjs/operators'; +import { take, toArray } from 'rxjs/operators'; import { mountExpiredBannerMock } from './plugin.test.mocks'; import { LicenseType } from '../common/types'; @@ -92,7 +92,7 @@ describe('licensing plugin', () => { expect(sessionStorage.getItem).toHaveBeenCalledWith(licensingSessionStorageKey); }); - it('observable receives updated licenses', async (done) => { + it('observable receives updated licenses', async () => { const types: LicenseType[] = ['gold', 'platinum']; const sessionStorage = coreMock.createStorage(); @@ -104,27 +104,17 @@ describe('licensing plugin', () => { Promise.resolve(licenseMock.createLicense({ license: { type: types.shift() } })) ); - await plugin.setup(coreSetup); + plugin.setup(coreSetup); const { refresh, license$ } = await plugin.start(coreStart); + const promise = license$.pipe(take(3), toArray()).toPromise(); - let i = 0; - license$.subscribe((value) => { - i++; - if (i === 1) { - expect(value.type).toBe('basic'); - refresh(); - } else if (i === 2) { - expect(value.type).toBe('gold'); - // since this is a synchronous subscription, we need to give the exhaustMap a chance - // to mark the subscription as complete before emitting another value on the Subject - process.nextTick(() => refresh()); - } else if (i === 3) { - expect(value.type).toBe('platinum'); - done(); - } else { - throw new Error('unreachable'); - } - }); + await refresh(); + await refresh(); + + const licenses = await promise; + expect(licenses[0].type).toBe('basic'); + expect(licenses[1].type).toBe('gold'); + expect(licenses[2].type).toBe('platinum'); }); it('saved fetched license & signature in session storage', async () => { diff --git a/x-pack/plugins/ml/public/application/services/ml_server_info.test.ts b/x-pack/plugins/ml/public/application/services/ml_server_info.test.ts index cd0f10bb7f57..e935d443f985 100644 --- a/x-pack/plugins/ml/public/application/services/ml_server_info.test.ts +++ b/x-pack/plugins/ml/public/application/services/ml_server_info.test.ts @@ -28,9 +28,8 @@ describe('ml_server_info initial state', () => { }); describe('ml_server_info', () => { - beforeEach(async (done) => { + beforeEach(async () => { await loadMlServerInfo(); - done(); }); describe('cloud information', () => { @@ -41,23 +40,21 @@ describe('ml_server_info', () => { }); describe('defaults', () => { - it('should get defaults', async (done) => { + it('should get defaults', async () => { const defaults = getNewJobDefaults(); expect(defaults.anomaly_detectors.model_memory_limit).toBe('128mb'); expect(defaults.anomaly_detectors.categorization_examples_limit).toBe(4); expect(defaults.anomaly_detectors.model_snapshot_retention_days).toBe(1); expect(defaults.datafeeds.scroll_size).toBe(1000); - done(); }); }); describe('limits', () => { - it('should get limits', async (done) => { + it('should get limits', async () => { const limits = getNewJobLimits(); expect(limits.max_model_memory_limit).toBe('128mb'); - done(); }); }); diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities._service.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities._service.test.ts index 81f05065b513..471a55061617 100644 --- a/x-pack/plugins/ml/public/application/services/new_job_capabilities._service.test.ts +++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities._service.test.ts @@ -26,7 +26,7 @@ const indexPattern = ({ describe('new_job_capabilities_service', () => { describe('cloudwatch newJobCaps()', () => { - it('can construct job caps objects from endpoint json', async (done) => { + it('can construct job caps objects from endpoint json', async () => { await newJobCapsService.initializeFromIndexPattern(indexPattern); const { fields, aggs } = await newJobCapsService.newJobCaps; @@ -43,27 +43,22 @@ describe('new_job_capabilities_service', () => { expect(meanAgg.fields).toHaveLength(7); expect(distinctCountAgg.fields).toHaveLength(10); - done(); }); - it('job caps including text fields', async (done) => { + it('job caps including text fields', async () => { await newJobCapsService.initializeFromIndexPattern(indexPattern, true, false); const { fields, aggs } = await newJobCapsService.newJobCaps; expect(fields).toHaveLength(13); // one more field expect(aggs).toHaveLength(35); - - done(); }); - it('job caps excluding event rate', async (done) => { + it('job caps excluding event rate', async () => { await newJobCapsService.initializeFromIndexPattern(indexPattern, false, true); const { fields, aggs } = await newJobCapsService.newJobCaps; expect(fields).toHaveLength(11); // one less field expect(aggs).toHaveLength(35); - - done(); }); }); }); diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts index 4dd17f8cf488..a436bcdebde4 100644 --- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts +++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts @@ -49,7 +49,7 @@ const mlClusterClientUpgrade = ({ describe('check_capabilities', () => { describe('getCapabilities() - right number of capabilities', () => { - test('kibana capabilities count', async (done) => { + test('kibana capabilities count', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientNonUpgrade, getAdminCapabilities(), @@ -59,12 +59,11 @@ describe('check_capabilities', () => { const { capabilities } = await getCapabilities(); const count = Object.keys(capabilities).length; expect(count).toBe(28); - done(); }); }); describe('getCapabilities() with security', () => { - test('ml_user capabilities only', async (done) => { + test('ml_user capabilities only', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientNonUpgrade, getUserCapabilities(), @@ -110,10 +109,9 @@ describe('check_capabilities', () => { expect(capabilities.canDeleteDataFrameAnalytics).toBe(false); expect(capabilities.canCreateDataFrameAnalytics).toBe(false); expect(capabilities.canStartStopDataFrameAnalytics).toBe(false); - done(); }); - test('full capabilities', async (done) => { + test('full capabilities', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientNonUpgrade, getAdminCapabilities(), @@ -159,10 +157,9 @@ describe('check_capabilities', () => { expect(capabilities.canDeleteDataFrameAnalytics).toBe(true); expect(capabilities.canCreateDataFrameAnalytics).toBe(true); expect(capabilities.canStartStopDataFrameAnalytics).toBe(true); - done(); }); - test('upgrade in progress with full capabilities', async (done) => { + test('upgrade in progress with full capabilities', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientUpgrade, getAdminCapabilities(), @@ -208,10 +205,9 @@ describe('check_capabilities', () => { expect(capabilities.canDeleteDataFrameAnalytics).toBe(false); expect(capabilities.canCreateDataFrameAnalytics).toBe(false); expect(capabilities.canStartStopDataFrameAnalytics).toBe(false); - done(); }); - test('upgrade in progress with partial capabilities', async (done) => { + test('upgrade in progress with partial capabilities', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientUpgrade, getUserCapabilities(), @@ -257,10 +253,9 @@ describe('check_capabilities', () => { expect(capabilities.canDeleteDataFrameAnalytics).toBe(false); expect(capabilities.canCreateDataFrameAnalytics).toBe(false); expect(capabilities.canStartStopDataFrameAnalytics).toBe(false); - done(); }); - test('full capabilities, ml disabled in space', async (done) => { + test('full capabilities, ml disabled in space', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientNonUpgrade, getDefaultCapabilities(), @@ -306,11 +301,10 @@ describe('check_capabilities', () => { expect(capabilities.canDeleteDataFrameAnalytics).toBe(false); expect(capabilities.canCreateDataFrameAnalytics).toBe(false); expect(capabilities.canStartStopDataFrameAnalytics).toBe(false); - done(); }); }); - test('full capabilities, basic license, ml disabled in space', async (done) => { + test('full capabilities, basic license, ml disabled in space', async () => { const { getCapabilities } = capabilitiesProvider( mlClusterClientNonUpgrade, getDefaultCapabilities(), @@ -357,6 +351,5 @@ describe('check_capabilities', () => { expect(capabilities.canDeleteDataFrameAnalytics).toBe(false); expect(capabilities.canCreateDataFrameAnalytics).toBe(false); expect(capabilities.canStartStopDataFrameAnalytics).toBe(false); - done(); }); }); diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts index 4c511b567615..3d90cb098439 100644 --- a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts +++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts @@ -35,7 +35,7 @@ describe('annotation_service', () => { }); describe('deleteAnnotation()', () => { - it('should delete annotation', async (done) => { + it('should delete annotation', async () => { const { deleteAnnotation } = annotationServiceProvider(mlClusterClientSpy); const mockFunct = mlClusterClientSpy; @@ -50,12 +50,11 @@ describe('annotation_service', () => { expect(mockFunct.asInternalUser.delete.mock.calls[0][0]).toStrictEqual(deleteParamsMock); expect(response).toBe(acknowledgedResponseMock); - done(); }); }); describe('getAnnotation()', () => { - it('should get annotations for specific job', async (done) => { + it('should get annotations for specific job', async () => { const { getAnnotations } = annotationServiceProvider(mlClusterClientSpy); const mockFunct = mlClusterClientSpy; @@ -74,7 +73,6 @@ describe('annotation_service', () => { expect(Object.keys(response.annotations)).toHaveLength(1); expect(response.annotations[jobIdMock]).toHaveLength(2); expect(isAnnotations(response.annotations[jobIdMock])).toBeTruthy(); - done(); }); it('should throw and catch an error', async () => { @@ -106,7 +104,7 @@ describe('annotation_service', () => { }); describe('indexAnnotation()', () => { - it('should index annotation', async (done) => { + it('should index annotation', async () => { const { indexAnnotation } = annotationServiceProvider(mlClusterClientSpy); const mockFunct = mlClusterClientSpy; @@ -129,10 +127,9 @@ describe('annotation_service', () => { expect(typeof annotation.modified_time).toBe('number'); expect(response).toBe(acknowledgedResponseMock); - done(); }); - it('should remove ._id and .key before updating annotation', async (done) => { + it('should remove ._id and .key before updating annotation', async () => { const { indexAnnotation } = annotationServiceProvider(mlClusterClientSpy); const mockFunct = mlClusterClientSpy; @@ -159,10 +156,9 @@ describe('annotation_service', () => { expect(typeof annotation.key).toBe('undefined'); expect(response).toBe(acknowledgedResponseMock); - done(); }); - it('should update annotation text and the username for modified_username', async (done) => { + it('should update annotation text and the username for modified_username', async () => { const { getAnnotations, indexAnnotation } = annotationServiceProvider(mlClusterClientSpy); const mockFunct = mlClusterClientSpy; @@ -196,7 +192,6 @@ describe('annotation_service', () => { expect(modifiedAnnotation.modified_username).toBe(modifiedUsernameMock); expect(typeof modifiedAnnotation.create_time).toBe('number'); expect(typeof modifiedAnnotation.modified_time).toBe('number'); - done(); }); }); }); diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts index 891cb2e0d1e6..1169123e93ea 100644 --- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts +++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts @@ -48,42 +48,38 @@ describe('job_service - job_caps', () => { }); describe('farequote newJobCaps()', () => { - it('can get job caps for index pattern', async (done) => { + it('can get job caps for index pattern', async () => { const indexPattern = 'farequote-*'; const isRollup = false; const { newJobCaps } = newJobCapsProvider(mlClusterClientNonRollupMock); const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock); expect(response).toEqual(farequoteJobCaps); - done(); }); - it('can get rollup job caps for non rollup index pattern', async (done) => { + it('can get rollup job caps for non rollup index pattern', async () => { const indexPattern = 'farequote-*'; const isRollup = true; const { newJobCaps } = newJobCapsProvider(mlClusterClientNonRollupMock); const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock); expect(response).toEqual(farequoteJobCapsEmpty); - done(); }); }); describe('cloudwatch newJobCaps()', () => { - it('can get rollup job caps for rollup index pattern', async (done) => { + it('can get rollup job caps for rollup index pattern', async () => { const indexPattern = 'cloud_roll_index'; const isRollup = true; const { newJobCaps } = newJobCapsProvider(mlClusterClientRollupMock); const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock); expect(response).toEqual(cloudwatchJobCaps); - done(); }); - it('can get non rollup job caps for rollup index pattern', async (done) => { + it('can get non rollup job caps for rollup index pattern', async () => { const indexPattern = 'cloud_roll_index'; const isRollup = false; const { newJobCaps } = newJobCapsProvider(mlClusterClientRollupMock); const response = await newJobCaps(indexPattern, isRollup, savedObjectsClientMock); expect(response).not.toEqual(cloudwatchJobCaps); - done(); }); }); }); diff --git a/x-pack/plugins/monitoring/public/lib/ensure_minimum_time.test.js b/x-pack/plugins/monitoring/public/lib/ensure_minimum_time.test.js index f37dbe3283d2..eda9c17db4e3 100644 --- a/x-pack/plugins/monitoring/public/lib/ensure_minimum_time.test.js +++ b/x-pack/plugins/monitoring/public/lib/ensure_minimum_time.test.js @@ -7,28 +7,25 @@ import { ensureMinimumTime } from './ensure_minimum_time'; describe('ensureMinimumTime', () => { - it('resolves single promise', async (done) => { + it('resolves single promise', async () => { const promiseA = new Promise((resolve) => resolve('a')); const a = await ensureMinimumTime(promiseA, 0); expect(a).toBe('a'); - done(); }); - it('resolves multiple promises', async (done) => { + it('resolves multiple promises', async () => { const promiseA = new Promise((resolve) => resolve('a')); const promiseB = new Promise((resolve) => resolve('b')); const [a, b] = await ensureMinimumTime([promiseA, promiseB], 0); expect(a).toBe('a'); expect(b).toBe('b'); - done(); }); - it('resolves in the amount of time provided, at minimum', async (done) => { + it('resolves in the amount of time provided, at minimum', async () => { const startTime = new Date().getTime(); const promise = new Promise((resolve) => resolve()); await ensureMinimumTime(promise, 100); const endTime = new Date().getTime(); expect(endTime - startTime).toBeGreaterThanOrEqual(100); - done(); }); }); diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.test.js b/x-pack/plugins/monitoring/public/lib/setup_mode.test.js index 9aa5a6bdc049..424da9d27ff0 100644 --- a/x-pack/plugins/monitoring/public/lib/setup_mode.test.js +++ b/x-pack/plugins/monitoring/public/lib/setup_mode.test.js @@ -23,7 +23,13 @@ jest.mock('react-dom', () => ({ jest.mock('../legacy_shims', () => { return { Legacy: { - shims: { getAngularInjector: () => ({ get: () => ({ get: () => 'utc' }) }) }, + shims: { + getAngularInjector: () => ({ get: () => ({ get: () => 'utc' }) }), + toastNotifications: { + addDanger: jest.fn(), + }, + I18nContext: '
', + }, }, }; }); @@ -59,9 +65,6 @@ const angularStateMock = { // We are no longer waiting for setup mode data to be fetched when enabling // so we need to wait for the next tick for the async action to finish -function waitForSetupModeData(action) { - process.nextTick(action); -} function setModulesAndMocks() { jest.clearAllMocks().resetModules(); @@ -75,6 +78,10 @@ function setModulesAndMocks() { setSetupModeMenuItem = setupMode.setSetupModeMenuItem; } +function waitForSetupModeData() { + return new Promise((resolve) => process.nextTick(resolve)); +} + describe('setup_mode', () => { beforeEach(async () => { setModulesAndMocks(); @@ -96,22 +103,22 @@ describe('setup_mode', () => { }); it('should enable toggle mode', async () => { - initSetupModeState(angularStateMock.scope, angularStateMock.injector); - await toggleSetupMode(true); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); + toggleSetupMode(true); expect(injectorModulesMock.globalState.inSetupMode).toBe(true); }); it('should disable toggle mode', async () => { - initSetupModeState(angularStateMock.scope, angularStateMock.injector); - await toggleSetupMode(false); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); + toggleSetupMode(false); expect(injectorModulesMock.globalState.inSetupMode).toBe(false); }); it('should set top nav config', async () => { const render = require('react-dom').render; - initSetupModeState(angularStateMock.scope, angularStateMock.injector); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); setSetupModeMenuItem(); - await toggleSetupMode(true); + toggleSetupMode(true); expect(render.mock.calls.length).toBe(2); }); }); @@ -121,7 +128,7 @@ describe('setup_mode', () => { data = {}; }); - it('should not fetch data if the user does not have sufficient permissions', async (done) => { + it('should not fetch data if the user does not have sufficient permissions', async () => { const addDanger = jest.fn(); jest.doMock('../legacy_shims', () => ({ Legacy: { @@ -129,6 +136,7 @@ describe('setup_mode', () => { toastNotifications: { addDanger, }, + I18nContext: '
', }, }, })); @@ -138,20 +146,19 @@ describe('setup_mode', () => { }, }; setModulesAndMocks(); - initSetupModeState(angularStateMock.scope, angularStateMock.injector); - await toggleSetupMode(true); - waitForSetupModeData(() => { - const state = getSetupModeState(); - expect(state.enabled).toBe(false); - expect(addDanger).toHaveBeenCalledWith({ - title: 'Setup mode is not available', - text: 'You do not have the necessary permissions to do this.', - }); - done(); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); + toggleSetupMode(true); + await waitForSetupModeData(); + + const state = getSetupModeState(); + expect(state.enabled).toBe(false); + expect(addDanger).toHaveBeenCalledWith({ + title: 'Setup mode is not available', + text: 'You do not have the necessary permissions to do this.', }); }); - it('should set the newly discovered cluster uuid', async (done) => { + it('should set the newly discovered cluster uuid', async () => { const clusterUuid = '1ajy'; data = { _meta: { @@ -166,15 +173,14 @@ describe('setup_mode', () => { }, }, }; - initSetupModeState(angularStateMock.scope, angularStateMock.injector); - await toggleSetupMode(true); - waitForSetupModeData(() => { - expect(injectorModulesMock.globalState.cluster_uuid).toBe(clusterUuid); - done(); - }); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); + toggleSetupMode(true); + await waitForSetupModeData(); + + expect(injectorModulesMock.globalState.cluster_uuid).toBe(clusterUuid); }); - it('should fetch data for a given cluster', async (done) => { + it('should fetch data for a given cluster', async () => { const clusterUuid = '1ajy'; data = { _meta: { @@ -190,22 +196,23 @@ describe('setup_mode', () => { }, }; - initSetupModeState(angularStateMock.scope, angularStateMock.injector); - await toggleSetupMode(true); - waitForSetupModeData(() => { - expect(injectorModulesMock.$http.post).toHaveBeenCalledWith( - `../api/monitoring/v1/setup/collection/cluster/${clusterUuid}`, - { - ccs: undefined, - } - ); - done(); - }); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); + toggleSetupMode(true); + await waitForSetupModeData(); + + expect(injectorModulesMock.$http.post).toHaveBeenCalledWith( + `../api/monitoring/v1/setup/collection/cluster/${clusterUuid}`, + { + ccs: undefined, + } + ); }); it('should fetch data for a single node', async () => { - initSetupModeState(angularStateMock.scope, angularStateMock.injector); - await toggleSetupMode(true); + await initSetupModeState(angularStateMock.scope, angularStateMock.injector); + toggleSetupMode(true); + await waitForSetupModeData(); + injectorModulesMock.$http.post.mockClear(); await updateSetupModeData('45asd'); expect(injectorModulesMock.$http.post).toHaveBeenCalledWith( diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx index 3e555c843a0b..6b956ce71c00 100644 --- a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx +++ b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx @@ -206,7 +206,7 @@ export const initSetupModeState = async ($scope: any, $injector: any, callback?: const globalState = $injector.get('globalState'); if (globalState.inSetupMode) { - await toggleSetupMode(true); + toggleSetupMode(true); } }; diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts index 932ebfdd22bb..cee8a88000e2 100644 --- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts +++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.test.ts @@ -130,7 +130,7 @@ describe('authorized_user_pre_routing', function () { ).toMatchObject({ body: `Sorry, you don't have access to Reporting` }); }); - it('should return from handler when security is enabled and user has explicitly allowed role', async function (done) { + it('should return from handler when security is enabled and user has explicitly allowed role', function (done) { mockCore.getPluginSetupDeps = () => (({ // @ts-ignore diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.test.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.test.js index f9f3cda6f2c2..3ac2ee5f5aad 100644 --- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.test.js +++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/detail_panel/detail_panel.test.js @@ -18,7 +18,7 @@ import { } from '../../components'; jest.mock('../../../../kibana_services', () => { - const services = require.requireActual('../../../../kibana_services'); + const services = jest.requireActual('../../../../kibana_services'); return { ...services, trackUiMetric: jest.fn(), diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js index e0fb73ef9c3b..ea70bdb3fbc4 100644 --- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js +++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js @@ -14,7 +14,7 @@ import { coreMock } from '../../../../../../../src/core/public/mocks'; const startMock = coreMock.createStart(); jest.mock('../../services', () => { - const services = require.requireActual('../../services'); + const services = jest.requireActual('../../services'); return { ...services, getRouterLinkProps: (link) => ({ href: link }), diff --git a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_table/job_table.test.js b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_table/job_table.test.js index 481c41940375..462742bee978 100644 --- a/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_table/job_table.test.js +++ b/x-pack/plugins/rollup/public/crud_app/sections/job_list/job_table/job_table.test.js @@ -12,7 +12,7 @@ import { rollupJobsStore } from '../../../store'; import { JobTable } from './job_table'; jest.mock('../../../../kibana_services', () => { - const services = require.requireActual('../../../../kibana_services'); + const services = jest.requireActual('../../../../kibana_services'); return { ...services, trackUiMetric: jest.fn(), diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js index 87fdabae1824..d50a718e5c52 100644 --- a/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js +++ b/x-pack/plugins/rollup/public/test/client_integration/job_create_review.test.js @@ -16,7 +16,7 @@ jest.mock('lodash', () => ({ })); jest.mock('../../kibana_services', () => { - const services = require.requireActual('../../kibana_services'); + const services = jest.requireActual('../../kibana_services'); return { ...services, getUiStatsReporter: jest.fn(() => () => {}), diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js index f05e9fd1decd..4091f79052b2 100644 --- a/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js +++ b/x-pack/plugins/rollup/public/test/client_integration/job_list.test.js @@ -10,7 +10,7 @@ import { JOBS } from './helpers/constants'; import { coreMock } from '../../../../../../src/core/public/mocks'; jest.mock('../../crud_app/services', () => { - const services = require.requireActual('../../crud_app/services'); + const services = jest.requireActual('../../crud_app/services'); return { ...services, getRouterLinkProps: (link) => ({ href: link }), @@ -18,7 +18,7 @@ jest.mock('../../crud_app/services', () => { }); jest.mock('../../kibana_services', () => { - const services = require.requireActual('../../kibana_services'); + const services = jest.requireActual('../../kibana_services'); return { ...services, getUiStatsReporter: jest.fn(() => () => {}), diff --git a/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js b/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js index 76be39a2c0e0..7513e88a01fc 100644 --- a/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js +++ b/x-pack/plugins/rollup/public/test/client_integration/job_list_clone.test.js @@ -16,7 +16,7 @@ jest.mock('lodash', () => ({ })); jest.mock('../../kibana_services', () => { - const services = require.requireActual('../../kibana_services'); + const services = jest.requireActual('../../kibana_services'); return { ...services, getUiStatsReporter: jest.fn(() => () => {}), diff --git a/x-pack/plugins/security_solution/public/network/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap b/x-pack/plugins/security_solution/public/network/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap index 6e38b5eeff5f..efc4d4be9e95 100644 --- a/x-pack/plugins/security_solution/public/network/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap +++ b/x-pack/plugins/security_solution/public/network/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap @@ -7,21 +7,7 @@ exports[`FlowTargetSelect Component rendering it renders the FlowTargetSelect 1` hasDividers={false} isInvalid={false} isLoading={false} - onChange={ - [MockFunction] { - "calls": Array [ - Array [ - "destination", - ], - ], - "results": Array [ - Object { - "type": "return", - "value": undefined, - }, - ], - } - } + onChange={[MockFunction]} options={ Array [ Object { diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx index b14248487281..b6e921ae9c00 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.test.tsx @@ -38,6 +38,10 @@ describe('NewTemplateTimeline', () => { const mockTitle = 'NEW_TIMELINE'; let wrapper: ReactWrapper; + beforeEach(() => { + jest.clearAllMocks(); + }); + describe('render if CRUD', () => { beforeAll(() => { (useKibana as jest.Mock).mockReturnValue({ @@ -52,10 +56,6 @@ describe('NewTemplateTimeline', () => { }, }); - afterAll(() => { - (useKibana as jest.Mock).mockReset(); - }); - wrapper = mount( @@ -100,10 +100,6 @@ describe('NewTemplateTimeline', () => { ); }); - afterAll(() => { - (useKibana as jest.Mock).mockReset(); - }); - test('no render', () => { expect( wrapper.find('[data-test-subj="template-timeline-new-with-border"]').exists() diff --git a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.test.ts b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.test.ts index 25abd92b32a2..c007b3233849 100644 --- a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.test.ts +++ b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.test.ts @@ -161,7 +161,7 @@ describe('Bulk Operation Buffer', () => { }); }); - test('handles both resolutions and rejections at individual task level', async (done) => { + test('handles both resolutions and rejections at individual task level', async () => { const bulkUpdate: jest.Mocked> = jest.fn( ([task1, task2, task3]) => { return Promise.resolve([ @@ -178,7 +178,7 @@ describe('Bulk Operation Buffer', () => { const task2 = createTask(); const task3 = createTask(); - return Promise.all([ + await Promise.all([ expect(bufferedUpdate(task1)).resolves.toMatchObject(incrementAttempts(task1)), expect(bufferedUpdate(task2)).rejects.toMatchObject( mapErr( @@ -187,13 +187,12 @@ describe('Bulk Operation Buffer', () => { ) ), expect(bufferedUpdate(task3)).resolves.toMatchObject(incrementAttempts(task3)), - ]).then(() => { - expect(bulkUpdate).toHaveBeenCalledTimes(1); - done(); - }); + ]); + + expect(bulkUpdate).toHaveBeenCalledTimes(1); }); - test('handles bulkUpdate failure', async (done) => { + test('handles bulkUpdate failure', async () => { const bulkUpdate: jest.Mocked> = jest.fn(() => { return Promise.reject(new Error('bulkUpdate is an illusion')); }); @@ -204,7 +203,7 @@ describe('Bulk Operation Buffer', () => { const task2 = createTask(); const task3 = createTask(); - return Promise.all([ + await Promise.all([ expect(bufferedUpdate(task1)).rejects.toMatchInlineSnapshot(` Object { "error": [Error: bulkUpdate is an illusion], @@ -223,13 +222,12 @@ describe('Bulk Operation Buffer', () => { "tag": "err", } `), - ]).then(() => { - expect(bulkUpdate).toHaveBeenCalledTimes(1); - done(); - }); + ]); + + expect(bulkUpdate).toHaveBeenCalledTimes(1); }); - test('logs unknown bulk operation results', async (done) => { + test('logs unknown bulk operation results', async () => { const bulkUpdate: jest.Mocked> = jest.fn( ([task1, task2, task3]) => { return Promise.resolve([ @@ -248,7 +246,7 @@ describe('Bulk Operation Buffer', () => { const task2 = createTask(); const task3 = createTask(); - return Promise.all([ + await Promise.all([ expect(bufferedUpdate(task1)).resolves.toMatchObject(incrementAttempts(task1)), expect(bufferedUpdate(task2)).rejects.toMatchObject( asErr(new Error(`Unhandled buffered operation for entity: ${task2.id}`)) @@ -256,10 +254,9 @@ describe('Bulk Operation Buffer', () => { expect(bufferedUpdate(task3)).rejects.toMatchObject( asErr(new Error(`Unhandled buffered operation for entity: ${task3.id}`)) ), - ]).then(() => { - expect(logger.warn).toHaveBeenCalledTimes(2); - done(); - }); + ]); + + expect(logger.warn).toHaveBeenCalledTimes(2); }); }); }); diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts index 45c41b4d1d69..f5fafe83748d 100644 --- a/x-pack/plugins/task_manager/server/task_store.test.ts +++ b/x-pack/plugins/task_manager/server/task_store.test.ts @@ -7,7 +7,7 @@ import _ from 'lodash'; import sinon from 'sinon'; import uuid from 'uuid'; -import { filter } from 'rxjs/operators'; +import { filter, take } from 'rxjs/operators'; import { Option, some, none } from 'fp-ts/lib/Option'; import { @@ -1242,7 +1242,7 @@ if (doc['task.runAt'].size()!=0) { return { taskManagerId, runAt, tasks }; } - test('emits an event when a task is succesfully claimed by id', async (done) => { + test('emits an event when a task is succesfully claimed by id', async () => { const { taskManagerId, runAt, tasks } = generateTasks(); const callCluster = sinon.spy(async (name: string, params?: unknown) => name === 'updateByQuery' @@ -1262,49 +1262,47 @@ if (doc['task.runAt'].size()!=0) { index: '', }); - const sub = store.events + const promise = store.events .pipe( filter( (event: TaskEvent>) => event.id === 'claimed-by-id' - ) + ), + take(1) ) - .subscribe({ - next: (event: TaskEvent>) => { - expect(event).toMatchObject( - asTaskClaimEvent( - 'claimed-by-id', - asOk({ - id: 'claimed-by-id', - runAt, - taskType: 'foo', - schedule: undefined, - attempts: 0, - status: 'claiming' as TaskStatus, - params: { hello: 'world' }, - state: { baby: 'Henhen' }, - user: 'jimbo', - scope: ['reporting'], - ownerId: taskManagerId, - startedAt: null, - retryAt: null, - scheduledAt: new Date(), - }) - ) - ); - sub.unsubscribe(); - done(); - }, - }); + .toPromise(); await store.claimAvailableTasks({ claimTasksById: ['claimed-by-id'], claimOwnershipUntil: new Date(), size: 10, }); + + const event = await promise; + expect(event).toMatchObject( + asTaskClaimEvent( + 'claimed-by-id', + asOk({ + id: 'claimed-by-id', + runAt, + taskType: 'foo', + schedule: undefined, + attempts: 0, + status: 'claiming' as TaskStatus, + params: { hello: 'world' }, + state: { baby: 'Henhen' }, + user: 'jimbo', + scope: ['reporting'], + ownerId: taskManagerId, + startedAt: null, + retryAt: null, + scheduledAt: new Date(), + }) + ) + ); }); - test('emits an event when a task is succesfully by scheduling', async (done) => { + test('emits an event when a task is succesfully by scheduling', async () => { const { taskManagerId, runAt, tasks } = generateTasks(); const callCluster = sinon.spy(async (name: string, params?: unknown) => name === 'updateByQuery' @@ -1324,49 +1322,47 @@ if (doc['task.runAt'].size()!=0) { index: '', }); - const sub = store.events + const promise = store.events .pipe( filter( (event: TaskEvent>) => event.id === 'claimed-by-schedule' - ) + ), + take(1) ) - .subscribe({ - next: (event: TaskEvent>) => { - expect(event).toMatchObject( - asTaskClaimEvent( - 'claimed-by-schedule', - asOk({ - id: 'claimed-by-schedule', - runAt, - taskType: 'bar', - schedule: { interval: '5m' }, - attempts: 2, - status: 'claiming' as TaskStatus, - params: { shazm: 1 }, - state: { henry: 'The 8th' }, - user: 'dabo', - scope: ['reporting', 'ceo'], - ownerId: taskManagerId, - startedAt: null, - retryAt: null, - scheduledAt: new Date(), - }) - ) - ); - sub.unsubscribe(); - done(); - }, - }); + .toPromise(); await store.claimAvailableTasks({ claimTasksById: ['claimed-by-id'], claimOwnershipUntil: new Date(), size: 10, }); + + const event = await promise; + expect(event).toMatchObject( + asTaskClaimEvent( + 'claimed-by-schedule', + asOk({ + id: 'claimed-by-schedule', + runAt, + taskType: 'bar', + schedule: { interval: '5m' }, + attempts: 2, + status: 'claiming' as TaskStatus, + params: { shazm: 1 }, + state: { henry: 'The 8th' }, + user: 'dabo', + scope: ['reporting', 'ceo'], + ownerId: taskManagerId, + startedAt: null, + retryAt: null, + scheduledAt: new Date(), + }) + ) + ); }); - test('emits an event when the store fails to claim a required task by id', async (done) => { + test('emits an event when the store fails to claim a required task by id', async () => { const { taskManagerId, runAt, tasks } = generateTasks(); const callCluster = sinon.spy(async (name: string, params?: unknown) => name === 'updateByQuery' @@ -1386,51 +1382,49 @@ if (doc['task.runAt'].size()!=0) { index: '', }); - const sub = store.events + const promise = store.events .pipe( filter( (event: TaskEvent>) => event.id === 'already-running' - ) + ), + take(1) ) - .subscribe({ - next: (event: TaskEvent>) => { - expect(event).toMatchObject( - asTaskClaimEvent( - 'already-running', - asErr( - some({ - id: 'already-running', - runAt, - taskType: 'bar', - schedule: { interval: '5m' }, - attempts: 2, - status: 'running' as TaskStatus, - params: { shazm: 1 }, - state: { henry: 'The 8th' }, - user: 'dabo', - scope: ['reporting', 'ceo'], - ownerId: taskManagerId, - startedAt: null, - retryAt: null, - scheduledAt: new Date(), - }) - ) - ) - ); - sub.unsubscribe(); - done(); - }, - }); + .toPromise(); await store.claimAvailableTasks({ claimTasksById: ['already-running'], claimOwnershipUntil: new Date(), size: 10, }); + + const event = await promise; + expect(event).toMatchObject( + asTaskClaimEvent( + 'already-running', + asErr( + some({ + id: 'already-running', + runAt, + taskType: 'bar', + schedule: { interval: '5m' }, + attempts: 2, + status: 'running' as TaskStatus, + params: { shazm: 1 }, + state: { henry: 'The 8th' }, + user: 'dabo', + scope: ['reporting', 'ceo'], + ownerId: taskManagerId, + startedAt: null, + retryAt: null, + scheduledAt: new Date(), + }) + ) + ) + ); }); - test('emits an event when the store fails to find a task which was required by id', async (done) => { + test('emits an event when the store fails to find a task which was required by id', async () => { const { taskManagerId, tasks } = generateTasks(); const callCluster = sinon.spy(async (name: string, params?: unknown) => name === 'updateByQuery' @@ -1450,26 +1444,24 @@ if (doc['task.runAt'].size()!=0) { index: '', }); - const sub = store.events + const promise = store.events .pipe( filter( (event: TaskEvent>) => event.id === 'unknown-task' - ) + ), + take(1) ) - .subscribe({ - next: (event: TaskEvent>) => { - expect(event).toMatchObject(asTaskClaimEvent('unknown-task', asErr(none))); - sub.unsubscribe(); - done(); - }, - }); + .toPromise(); await store.claimAvailableTasks({ claimTasksById: ['unknown-task'], claimOwnershipUntil: new Date(), size: 10, }); + + const event = await promise; + expect(event).toMatchObject(asTaskClaimEvent('unknown-task', asErr(none))); }); }); }); diff --git a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx index 4d752ee65fbf..8b514b3e0651 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx +++ b/x-pack/plugins/transform/public/app/hooks/use_index_data.test.tsx @@ -6,7 +6,7 @@ import React, { FC } from 'react'; -import { render, wait } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { renderHook } from '@testing-library/react-hooks'; import { CoreSetup } from 'src/core/public'; @@ -33,7 +33,7 @@ const query: SimpleQuery = { }; describe('Transform: useIndexData()', () => { - test('indexPattern set triggers loading', async (done) => { + test('indexPattern set triggers loading', async () => { const mlShared = await getMlSharedImports(); const wrapper: FC = ({ children }) => ( {children} @@ -58,13 +58,11 @@ describe('Transform: useIndexData()', () => { expect(IndexObj.errorMessage).toBe(''); expect(IndexObj.status).toBe(1); expect(IndexObj.tableItems).toEqual([]); - done(); }); }); describe('Transform: with useIndexData()', () => { - // Using the async/await wait()/done() pattern to avoid act() errors. - test('Minimal initialization', async (done) => { + test('Minimal initialization', async () => { // Arrange const indexPattern = { title: 'the-index-pattern-title', @@ -97,7 +95,5 @@ describe('Transform: with useIndexData()', () => { // Act // Assert expect(getByText('the-index-preview-title')).toBeInTheDocument(); - await wait(); - done(); }); }); diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx index cf1bfda6128e..a03ce841a09a 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx @@ -5,7 +5,7 @@ */ import React from 'react'; -import { render, wait } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { I18nProvider } from '@kbn/i18n/react'; @@ -51,8 +51,7 @@ const createMockStorage = () => ({ }); describe('Transform: ', () => { - // Using the async/await wait()/done() pattern to avoid act() errors. - test('Minimal initialization', async (done) => { + test('Minimal initialization', async () => { // Arrange const mlSharedImports = await getMlSharedImports(); @@ -85,8 +84,6 @@ describe('Transform: ', () => { // Assert expect(getByText('Index pattern')).toBeInTheDocument(); expect(getByText(searchItems.indexPattern.title)).toBeInTheDocument(); - await wait(); - done(); }); }); diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx index 7aed0568e6ef..b3cd8a293795 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.test.tsx @@ -27,7 +27,7 @@ import { getMlSharedImports } from '../../../../../shared_imports'; describe('Transform: ', () => { // Using the async/await wait()/done() pattern to avoid act() errors. - test('Minimal initialization', async (done) => { + test('Minimal initialization', async () => { // Arrange const mlSharedImports = await getMlSharedImports(); @@ -72,6 +72,5 @@ describe('Transform: ', () => { expect(getByText('Group by')).toBeInTheDocument(); expect(getByText('Aggregations')).toBeInTheDocument(); await wait(); - done(); }); }); diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts index 9af79c9ac525..99971c42e551 100644 --- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts +++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts @@ -5,7 +5,7 @@ */ import { findTestSubject } from '@elastic/eui/lib/test'; -import { skip } from 'rxjs/operators'; +import { skip, take } from 'rxjs/operators'; import * as Rx from 'rxjs'; import { mount } from 'enzyme'; @@ -27,7 +27,7 @@ const createOpenModalMock = () => { return mock; }; -test('Custom time range action prevents embeddable from using container time', async (done) => { +test('Custom time range action prevents embeddable from using container time', async () => { const container = new TimeRangeContainer( { timeRange: { from: 'now-15m', to: 'now' }, @@ -79,19 +79,19 @@ test('Custom time range action prevents embeddable from using container time', a findTestSubject(wrapper, 'addPerPanelTimeRangeButton').simulate('click'); - const subscription = Rx.merge(container.getOutput$(), container.getInput$()) - .pipe(skip(2)) - .subscribe(() => { - expect(child1.getInput().timeRange).toEqual({ from: 'now-30days', to: 'now-29days' }); - expect(child2.getInput().timeRange).toEqual({ from: 'now-30m', to: 'now-1m' }); - subscription.unsubscribe(); - done(); - }); + const promise = Rx.merge(container.getOutput$(), container.getOutput$(), container.getInput$()) + .pipe(skip(2), take(1)) + .toPromise(); container.updateInput({ timeRange: { from: 'now-30m', to: 'now-1m' } }); + + await promise; + + expect(child1.getInput().timeRange).toEqual({ from: 'now-30days', to: 'now-29days' }); + expect(child2.getInput().timeRange).toEqual({ from: 'now-30m', to: 'now-1m' }); }); -test('Removing custom time range action resets embeddable back to container time', async (done) => { +test('Removing custom time range action resets embeddable back to container time', async () => { const container = new TimeRangeContainer( { timeRange: { from: 'now-15m', to: 'now' }, @@ -153,19 +153,19 @@ test('Removing custom time range action resets embeddable back to container time const wrapper2 = mount(openModal2); findTestSubject(wrapper2, 'removePerPanelTimeRangeButton').simulate('click'); - const subscription = Rx.merge(container.getOutput$(), container.getInput$()) - .pipe(skip(2)) - .subscribe(() => { - expect(child1.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); - expect(child2.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); - subscription.unsubscribe(); - done(); - }); + const promise = Rx.merge(container.getOutput$(), container.getOutput$(), container.getInput$()) + .pipe(skip(2), take(1)) + .toPromise(); container.updateInput({ timeRange: { from: 'now-10m', to: 'now-5m' } }); + + await promise; + + expect(child1.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); + expect(child2.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); }); -test('Cancelling custom time range action leaves state alone', async (done) => { +test('Cancelling custom time range action leaves state alone', async () => { const container = new TimeRangeContainer( { timeRange: { from: 'now-15m', to: 'now' }, @@ -212,16 +212,16 @@ test('Cancelling custom time range action leaves state alone', async (done) => { findTestSubject(wrapper, 'cancelPerPanelTimeRangeButton').simulate('click'); - const subscription = Rx.merge(container.getOutput$(), container.getInput$()) - .pipe(skip(2)) - .subscribe(() => { - expect(child1.getInput().timeRange).toEqual({ from: '1', to: '2' }); - expect(child2.getInput().timeRange).toEqual({ from: 'now-30m', to: 'now-1m' }); - subscription.unsubscribe(); - done(); - }); + const promise = Rx.merge(container.getOutput$(), container.getOutput$(), container.getInput$()) + .pipe(skip(2), take(1)) + .toPromise(); container.updateInput({ timeRange: { from: 'now-30m', to: 'now-1m' } }); + + await promise; + + expect(child1.getInput().timeRange).toEqual({ from: '1', to: '2' }); + expect(child2.getInput().timeRange).toEqual({ from: 'now-30m', to: 'now-1m' }); }); test(`badge is compatible with embeddable that inherits from parent`, async () => { diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.test.ts b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.test.ts index 03fb80c3ce75..a83907913790 100644 --- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.test.ts +++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_badge.test.ts @@ -5,7 +5,7 @@ */ import { findTestSubject } from '@elastic/eui/lib/test'; -import { skip } from 'rxjs/operators'; +import { skip, take } from 'rxjs/operators'; import * as Rx from 'rxjs'; import { mount } from 'enzyme'; import { TimeRangeEmbeddable, TimeRangeContainer, TIME_RANGE_EMBEDDABLE } from './test_helpers'; @@ -13,7 +13,7 @@ import { CustomTimeRangeBadge } from './custom_time_range_badge'; import { ReactElement } from 'react'; import { nextTick } from 'test_utils/enzyme_helpers'; -test('Removing custom time range from badge resets embeddable back to container time', async (done) => { +test('Removing custom time range from badge resets embeddable back to container time', async () => { const container = new TimeRangeContainer( { timeRange: { from: 'now-15m', to: 'now' }, @@ -60,16 +60,16 @@ test('Removing custom time range from badge resets embeddable back to container const wrapper = mount(openModal); findTestSubject(wrapper, 'removePerPanelTimeRangeButton').simulate('click'); - const subscription = Rx.merge(child1.getInput$(), container.getOutput$(), container.getInput$()) - .pipe(skip(4)) - .subscribe(() => { - expect(child1.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); - expect(child2.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); - subscription.unsubscribe(); - done(); - }); + const promise = Rx.merge(child1.getInput$(), container.getOutput$(), container.getInput$()) + .pipe(skip(4), take(1)) + .toPromise(); container.updateInput({ timeRange: { from: 'now-10m', to: 'now-5m' } }); + + await promise; + + expect(child1.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); + expect(child2.getInput().timeRange).toEqual({ from: 'now-10m', to: 'now-5m' }); }); test(`badge is not compatible with embeddable that inherits from parent`, async () => { diff --git a/yarn.lock b/yarn.lock index 876f938cfce8..77e3a399c431 100644 --- a/yarn.lock +++ b/yarn.lock @@ -514,6 +514,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" @@ -1650,59 +1657,61 @@ chalk "^2.0.1" slash "^2.0.0" -"@jest/console@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.5.0.tgz#770800799d510f37329c508a9edd0b7b447d9abb" - integrity sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw== +"@jest/console@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856" + integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w== dependencies: - "@jest/types" "^25.5.0" - chalk "^3.0.0" - jest-message-util "^25.5.0" - jest-util "^25.5.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^26.3.0" + jest-util "^26.3.0" slash "^3.0.0" -"@jest/core@^25.5.4": - version "25.5.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.5.4.tgz#3ef7412f7339210f003cdf36646bbca786efe7b4" - integrity sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA== +"@jest/core@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc" + integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg== dependencies: - "@jest/console" "^25.5.0" - "@jest/reporters" "^25.5.1" - "@jest/test-result" "^25.5.0" - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" + "@jest/console" "^26.3.0" + "@jest/reporters" "^26.4.1" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" ansi-escapes "^4.2.1" - chalk "^3.0.0" + chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^25.5.0" - jest-config "^25.5.4" - jest-haste-map "^25.5.1" - jest-message-util "^25.5.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.5.1" - jest-resolve-dependencies "^25.5.4" - jest-runner "^25.5.4" - jest-runtime "^25.5.4" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - jest-validate "^25.5.0" - jest-watcher "^25.5.0" + jest-changed-files "^26.3.0" + jest-config "^26.4.2" + jest-haste-map "^26.3.0" + jest-message-util "^26.3.0" + jest-regex-util "^26.0.0" + jest-resolve "^26.4.0" + jest-resolve-dependencies "^26.4.2" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" + jest-watcher "^26.3.0" micromatch "^4.0.2" p-each-series "^2.1.0" - realpath-native "^2.0.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.5.0.tgz#aa33b0c21a716c65686638e7ef816c0e3a0c7b37" - integrity sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA== +"@jest/environment@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0" + integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA== dependencies: - "@jest/fake-timers" "^25.5.0" - "@jest/types" "^25.5.0" - jest-mock "^25.5.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" "@jest/fake-timers@^24.9.0": version "24.9.0" @@ -1713,57 +1722,58 @@ jest-message-util "^24.9.0" jest-mock "^24.9.0" -"@jest/fake-timers@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz#46352e00533c024c90c2bc2ad9f2959f7f114185" - integrity sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ== +"@jest/fake-timers@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a" + integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A== dependencies: - "@jest/types" "^25.5.0" - jest-message-util "^25.5.0" - jest-mock "^25.5.0" - jest-util "^25.5.0" - lolex "^5.0.0" + "@jest/types" "^26.3.0" + "@sinonjs/fake-timers" "^6.0.1" + "@types/node" "*" + jest-message-util "^26.3.0" + jest-mock "^26.3.0" + jest-util "^26.3.0" -"@jest/globals@^25.5.2": - version "25.5.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-25.5.2.tgz#5e45e9de8d228716af3257eeb3991cc2e162ca88" - integrity sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA== +"@jest/globals@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a" + integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow== dependencies: - "@jest/environment" "^25.5.0" - "@jest/types" "^25.5.0" - expect "^25.5.0" + "@jest/environment" "^26.3.0" + "@jest/types" "^26.3.0" + expect "^26.4.2" -"@jest/reporters@^25.5.1": - version "25.5.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.5.1.tgz#cb686bcc680f664c2dbaf7ed873e93aa6811538b" - integrity sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw== +"@jest/reporters@^26.4.1": + version "26.4.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795" + integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/console" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" + chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.2" graceful-fs "^4.2.4" istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^4.0.0" + istanbul-lib-instrument "^4.0.3" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^25.5.1" - jest-resolve "^25.5.1" - jest-util "^25.5.0" - jest-worker "^25.5.0" + jest-haste-map "^26.3.0" + jest-resolve "^26.4.0" + jest-util "^26.3.0" + jest-worker "^26.3.0" slash "^3.0.0" source-map "^0.6.0" - string-length "^3.1.0" + string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^4.1.3" + v8-to-istanbul "^5.0.1" optionalDependencies: - node-notifier "^6.0.0" + node-notifier "^8.0.0" "@jest/source-map@^24.9.0": version "24.9.0" @@ -1774,10 +1784,10 @@ graceful-fs "^4.1.15" source-map "^0.6.0" -"@jest/source-map@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.5.0.tgz#df5c20d6050aa292c2c6d3f0d2c7606af315bd1b" - integrity sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ== +"@jest/source-map@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9" + integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" @@ -1792,50 +1802,28 @@ "@jest/types" "^24.9.0" "@types/istanbul-lib-coverage" "^2.0.0" -"@jest/test-result@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.5.0.tgz#139a043230cdeffe9ba2d8341b27f2efc77ce87c" - integrity sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A== +"@jest/test-result@^26.3.0": + version "26.3.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb" + integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg== dependencies: - "@jest/console" "^25.5.0" - "@jest/types" "^25.5.0" + "@jest/console" "^26.3.0" + "@jest/types" "^26.3.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^25.5.4": - version "25.5.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz#9b4e685b36954c38d0f052e596d28161bdc8b737" - integrity sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA== - dependencies: - "@jest/test-result" "^25.5.0" - graceful-fs "^4.2.4" - jest-haste-map "^25.5.1" - jest-runner "^25.5.4" - jest-runtime "^25.5.4" - -"@jest/transform@^25.5.1": - version "25.5.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.5.1.tgz#0469ddc17699dd2bf985db55fa0fb9309f5c2db3" - integrity sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg== +"@jest/test-sequencer@^26.4.2": + version "26.4.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba" + integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog== dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^25.5.0" - babel-plugin-istanbul "^6.0.0" - chalk "^3.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" + "@jest/test-result" "^26.3.0" graceful-fs "^4.2.4" - jest-haste-map "^25.5.1" - jest-regex-util "^25.2.6" - jest-util "^25.5.0" - micromatch "^4.0.2" - pirates "^4.0.1" - realpath-native "^2.0.0" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" + jest-haste-map "^26.3.0" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" -"@jest/transform@^26.0.0": +"@jest/transform@^26.0.0", "@jest/transform@^26.3.0": version "26.3.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55" integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A== @@ -2841,6 +2829,13 @@ dependencies: type-detect "4.0.8" +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@sinonjs/formatio@^3.2.1": version "3.2.2" resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz#771c60dfa75ea7f2d68e3b94c7e888a78781372c" @@ -3753,6 +3748,17 @@ resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.4.tgz#bfd5b0d0d1ba13e351dff65b6e52783b816826c8" integrity sha512-WiZhq3SVJHFRgRYLXvpf65XnV6ipVHhnNaNvE8yCimejrGglkg38kEj0JcizqwSHxmPSjcTlig/6JouxLGEhGw== +"@types/babel__core@^7.0.0": + version "7.1.10" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40" + integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + "@types/babel__core@^7.1.2": version "7.1.2" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f" @@ -4374,7 +4380,7 @@ dependencies: "@types/jest" "*" -"@types/jest@*", "@types/jest@^25.1.1", "@types/jest@^25.2.3": +"@types/jest@*", "@types/jest@^25.1.1": version "25.2.3" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf" integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw== @@ -4382,6 +4388,14 @@ jest-diff "^25.2.1" pretty-format "^25.2.1" +"@types/jest@^26.0.14": + version "26.0.14" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz#078695f8f65cb55c5a98450d65083b2b73e5a3f3" + integrity sha512-Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg== + dependencies: + jest-diff "^25.2.1" + pretty-format "^25.2.1" + "@types/joi@*", "@types/joi@^13.4.2": version "13.6.1" resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.6.1.tgz#325486a397504f8e22c8c551dc8b0e1d41d5d5ae" @@ -4768,11 +4782,6 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.16.1.tgz#328d1c9b54402e44119398bcb6a31b7bbd606d59" integrity sha512-db6pZL5QY3JrlCHBhYQzYDci0xnoDuxfseUuguLRr3JNk+bnCfpkK6p8quiUDyO8A0vbpBKkk59Fw125etrNeA== -"@types/prettier@^1.19.0": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" - integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== - "@types/prettier@^2.0.0", "@types/prettier@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz#5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3" @@ -5166,13 +5175,20 @@ resolved "https://registry.yarnpkg.com/@types/tempy/-/tempy-0.2.0.tgz#8b7a93f6912aef25cc0b8d8a80ff974151478685" integrity sha512-YaX74QljqR45Xu7dd22wMvzTS+ItUiSyDl9XJl6WTgYNE09r2TF+mV2FDjWRM5Sdzf9C9dXRTUdz9J5SoEYxXg== -"@types/testing-library__jest-dom@^5.9.1", "@types/testing-library__jest-dom@^5.9.2": +"@types/testing-library__jest-dom@^5.9.1": version "5.9.2" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.2.tgz#59e4771a1cf87d51e89a5cc8195cd3b647cba322" integrity sha512-K7nUSpH/5i8i0NagTJ+uFUDRueDlnMNhJtMjMwTGPPSqyImbWC/hgKPDCKt6Phu2iMJg2kWqlax+Ucj2DKMwpA== dependencies: "@types/jest" "*" +"@types/testing-library__jest-dom@^5.9.3": + version "5.9.3" + resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.3.tgz#574039e210140a536c6ec891063289fb742a75eb" + integrity sha512-5YxiCFA2vk0cxq2LIxYgHBpFlnJvMH9bkUIVNin+1GXT+LZgVOgXBeEyyo2ZrGXMO/KWe1ZV3p7Kb6LJAvJasw== + dependencies: + "@types/jest" "*" + "@types/testing-library__react-hooks@^3.3.0", "@types/testing-library__react-hooks@^3.4.0": version "3.4.0" resolved "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.4.0.tgz#be148b7fa7d19cd3349c4ef9d9534486bc582fcc" @@ -5409,14 +5425,17 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@^2.5.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.15.0.tgz#41e35313bfaef91650ddb5380846d1c78a780070" - integrity sha512-Qkxu5zndY5hqlcQkmA88gfLvqQulMpX/TN91XC7OuXsRf4XG5xLGie0sbpX97o/oeccjeZYRMipIsjKk/tjDHA== +"@typescript-eslint/experimental-utils@^4.0.1": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87" + integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.15.0" + "@typescript-eslint/scope-manager" "4.3.0" + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/typescript-estree" "4.3.0" eslint-scope "^5.0.0" + eslint-utils "^2.0.0" "@typescript-eslint/parser@^3.10.0": version "3.10.0" @@ -5429,23 +5448,23 @@ "@typescript-eslint/typescript-estree" "3.10.0" eslint-visitor-keys "^1.1.0" +"@typescript-eslint/scope-manager@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7" + integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig== + dependencies: + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/visitor-keys" "4.3.0" + "@typescript-eslint/types@3.10.0": version "3.10.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.0.tgz#b81906674eca94a884345ba0bc1aaf6cd4da912a" integrity sha512-ktUWSa75heQNwH85GRM7qP/UUrXqx9d6yIdw0iLO9/uE1LILW+i+3+B64dUodUS2WFWLzKTlwfi9giqrODibWg== -"@typescript-eslint/typescript-estree@2.15.0": - version "2.15.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.15.0.tgz#79ae52eed8701b164d91e968a65d85a9105e76d3" - integrity sha512-L6Pog+w3VZzXkAdyqA0VlwybF8WcwZX+mufso86CMxSdWmcizJ38lgBdpqTbc9bo92iyi0rOvmATKiwl+amjxg== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash.unescape "4.0.1" - semver "^6.3.0" - tsutils "^3.17.1" +"@typescript-eslint/types@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf" + integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw== "@typescript-eslint/typescript-estree@3.10.0": version "3.10.0" @@ -5461,6 +5480,20 @@ semver "^7.3.2" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8" + integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw== + dependencies: + "@typescript-eslint/types" "4.3.0" + "@typescript-eslint/visitor-keys" "4.3.0" + debug "^4.1.1" + globby "^11.0.1" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^7.3.2" + tsutils "^3.17.1" + "@typescript-eslint/typescript-estree@^1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.9.0.tgz#5d6d49be936e96fb0f859673480f89b070a5dd9b" @@ -5476,6 +5509,14 @@ dependencies: eslint-visitor-keys "^1.1.0" +"@typescript-eslint/visitor-keys@4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0" + integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw== + dependencies: + "@typescript-eslint/types" "4.3.0" + eslint-visitor-keys "^2.0.0" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -5844,6 +5885,11 @@ abab@^2.0.0: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w== +abab@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -5885,7 +5931,7 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-globals@^4.3.0, acorn-globals@^4.3.2: +acorn-globals@^4.3.0: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A== @@ -5893,6 +5939,14 @@ acorn-globals@^4.3.0, acorn-globals@^4.3.2: acorn "^6.0.1" acorn-walk "^6.0.1" +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" @@ -5924,6 +5978,11 @@ acorn-walk@^7.0.0: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + acorn@5.X, acorn@^5.0.3, acorn@^5.5.0: version "5.7.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" @@ -5949,6 +6008,11 @@ acorn@^7.1.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== +acorn@^7.1.1: + version "7.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" + integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== + address@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -7030,7 +7094,7 @@ async-foreach@^0.1.3: resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= -async-limiter@^1.0.0, async-limiter@~1.0.0: +async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== @@ -7270,17 +7334,17 @@ babel-helper-to-multiple-sequence-expressions@^0.5.0: resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d" integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA== -babel-jest@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.5.1.tgz#bc2e6101f849d6f6aec09720ffc7bc5332e62853" - integrity sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ== +babel-jest@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" + integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g== dependencies: - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.5.0" - chalk "^3.0.0" + babel-preset-jest "^26.3.0" + chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -7378,13 +7442,14 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz#129c80ba5c7fc75baf3a45b93e2e372d57ca2677" - integrity sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g== +babel-plugin-jest-hoist@^26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" + integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" babel-plugin-macros@^2.0.0: @@ -7588,14 +7653,15 @@ babel-polyfill@^6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" -babel-preset-current-node-syntax@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6" - integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw== +babel-preset-current-node-syntax@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" + integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" @@ -7604,13 +7670,13 @@ babel-preset-current-node-syntax@^0.1.2: "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -babel-preset-jest@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz#c1d7f191829487a907764c65307faa0e66590b49" - integrity sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw== +babel-preset-jest@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776" + integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw== dependencies: - babel-plugin-jest-hoist "^25.5.0" - babel-preset-current-node-syntax "^0.1.2" + babel-plugin-jest-hoist "^26.2.0" + babel-preset-current-node-syntax "^0.1.3" "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5": version "0.5.0" @@ -8143,6 +8209,11 @@ browser-process-hrtime@^0.1.2: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e" integrity sha1-Ql1opY00R/AqBKqJQYf86K+Le44= +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + browser-resolve@^1.11.3, browser-resolve@^1.8.1: version "1.11.3" resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" @@ -8851,6 +8922,11 @@ change-emitter@^0.1.2: resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515" integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU= +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + character-entities-html4@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125" @@ -10451,7 +10527,7 @@ cssom@0.3.x, cssom@^0.3.4, cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssom@^0.4.1: +cssom@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== @@ -10463,10 +10539,10 @@ cssstyle@^1.1.1: dependencies: cssom "0.3.x" -cssstyle@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz#e4c44debccd6b7911ed617a4395e5754bba59992" - integrity sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA== +cssstyle@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== dependencies: cssom "~0.3.6" @@ -10875,6 +10951,15 @@ data-urls@^1.1.0: whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + date-fns@^1.27.2: version "1.29.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6" @@ -10965,6 +11050,11 @@ decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, deca resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= +decimal.js@^10.2.0: + version "10.2.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" + integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" @@ -11641,6 +11731,13 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + domhandler@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594" @@ -11992,6 +12089,11 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" +emittery@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451" + integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ== + "emoji-regex@>=6.0.0 <=6.1.1": version "6.1.1" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e" @@ -12481,7 +12583,7 @@ escodegen@^1.11.1: optionalDependencies: source-map "~0.6.1" -escodegen@^1.12.0: +escodegen@^1.12.0, escodegen@^1.14.1: version "1.14.3" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== @@ -12644,12 +12746,12 @@ eslint-plugin-import@^2.19.1: read-pkg-up "^2.0.0" resolve "^1.12.0" -eslint-plugin-jest@^23.10.0: - version "23.10.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.10.0.tgz#4738c7ca9e6513da50f4e99d7b161c1f82fa8e8f" - integrity sha512-cHC//nesojSO1MLxVmFJR/bUaQQG7xvMHQD8YLbsQzevR41WKm8paKDUv2wMHlUy5XLZUmNcWuflOi4apS8D+Q== +eslint-plugin-jest@^24.0.2: + version "24.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.0.2.tgz#4bf0fcdc86289d702a7dacb430b4363482af773b" + integrity sha512-DSBLNpkKDOpUJQkTGSs5sVJWsu0nDyQ2rYxkr0Eh7nrkc5bMUr/dlDbtTj3l8y6UaCVsem6rryF1OZrKnz1S5g== dependencies: - "@typescript-eslint/experimental-utils" "^2.5.0" + "@typescript-eslint/experimental-utils" "^4.0.1" eslint-plugin-jsx-a11y@^6.2.3: version "6.2.3" @@ -12779,6 +12881,11 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + eslint@^2.7.0: version "2.13.1" resolved "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz#e4cc8fa0f009fb829aaae23855a29360be1f6c11" @@ -13055,10 +13162,10 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" - integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== +execa@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2" + integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A== dependencies: cross-spawn "^7.0.0" get-stream "^5.0.0" @@ -13067,7 +13174,6 @@ execa@^3.2.0: merge-stream "^2.0.0" npm-run-path "^4.0.0" onetime "^5.1.0" - p-finally "^2.0.0" signal-exit "^3.0.2" strip-final-newline "^2.0.0" @@ -13152,18 +13258,6 @@ expect@^24.8.0, expect@^24.9.0: jest-message-util "^24.9.0" jest-regex-util "^24.9.0" -expect@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-25.5.0.tgz#f07f848712a2813bb59167da3fb828ca21f58bba" - integrity sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA== - dependencies: - "@jest/types" "^25.5.0" - ansi-styles "^4.0.0" - jest-get-type "^25.2.6" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-regex-util "^25.2.6" - expect@^26.4.0: version "26.4.0" resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.0.tgz#34a0aae523343b0931ff1cf0aa972dfe40edfab4" @@ -13176,6 +13270,18 @@ expect@^26.4.0: jest-message-util "^26.3.0" jest-regex-util "^26.0.0" +expect@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" + integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA== + dependencies: + "@jest/types" "^26.3.0" + ansi-styles "^4.0.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-regex-util "^26.0.0" + expiry-js@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/expiry-js/-/expiry-js-0.1.7.tgz#76be8c05e572bf936df40c1766448d0b3b2f555f" @@ -16085,6 +16191,13 @@ html-encoding-sniffer@^1.0.2: dependencies: whatwg-encoding "^1.0.1" +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + html-entities@^1.2.0, html-entities@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44" @@ -17499,6 +17612,11 @@ is-plain-object@^5.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== +is-potential-custom-element-name@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" + integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + is-promise@^2.1, is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" @@ -17726,6 +17844,13 @@ is-wsl@^2.1.1: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + is-yarn-global@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" @@ -17860,6 +17985,16 @@ istanbul-lib-instrument@^4.0.0: istanbul-lib-coverage "^3.0.0" semver "^6.3.0" +istanbul-lib-instrument@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + istanbul-lib-processinfo@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz#e1426514662244b2f25df728e8fd1ba35fe53b9c" @@ -17962,82 +18097,83 @@ jest-canvas-mock@^2.2.0: cssfontparser "^1.2.1" parse-color "^1.0.0" -jest-changed-files@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.5.0.tgz#141cc23567ceb3f534526f8614ba39421383634c" - integrity sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw== +jest-changed-files@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1" + integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g== dependencies: - "@jest/types" "^25.5.0" - execa "^3.2.0" + "@jest/types" "^26.3.0" + execa "^4.0.0" throat "^5.0.0" -jest-circus@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-25.5.4.tgz#d5578346f53d5604b7b1d1e5e56be48b1c73c61d" - integrity sha512-nOLJXZjWuV2i8yQ2w+MZ8NhFuqrbgpPAa4mh+DWPYmNI377YYpDKvDUrLMW8U1sa2iGt5mjKQbmJz2SK9AYjWg== +jest-circus@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-26.4.2.tgz#f84487d2ea635cadf1feb269b14ad0602135ad17" + integrity sha512-gzxoteivskdUTNxT7Jx6hrANsEm+x1wh8jaXmQCtzC7zoNWirk9chYdSosHFC4tJlfDZa0EsPreVAxLicLsV0w== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/environment" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" co "^4.6.0" - expect "^25.5.0" + dedent "^0.7.0" + expect "^26.4.2" is-generator-fn "^2.0.0" - jest-each "^25.5.0" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-runtime "^25.5.4" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - pretty-format "^25.5.0" - stack-utils "^1.0.1" + jest-each "^26.4.2" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-runner "^26.4.2" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + pretty-format "^26.4.2" + stack-utils "^2.0.2" throat "^5.0.0" -jest-cli@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.5.4.tgz#b9f1a84d1301a92c5c217684cb79840831db9f0d" - integrity sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw== +jest-cli@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da" + integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw== dependencies: - "@jest/core" "^25.5.4" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/core" "^26.4.2" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^25.5.4" - jest-util "^25.5.0" - jest-validate "^25.5.0" + jest-config "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" prompts "^2.0.1" - realpath-native "^2.0.0" yargs "^15.3.1" -jest-config@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.5.4.tgz#38e2057b3f976ef7309b2b2c8dcd2a708a67f02c" - integrity sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg== +jest-config@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558" + integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.5.4" - "@jest/types" "^25.5.0" - babel-jest "^25.5.1" - chalk "^3.0.0" + "@jest/test-sequencer" "^26.4.2" + "@jest/types" "^26.3.0" + babel-jest "^26.3.0" + chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^25.5.0" - jest-environment-node "^25.5.0" - jest-get-type "^25.2.6" - jest-jasmine2 "^25.5.4" - jest-regex-util "^25.2.6" - jest-resolve "^25.5.1" - jest-util "^25.5.0" - jest-validate "^25.5.0" + jest-environment-jsdom "^26.3.0" + jest-environment-node "^26.3.0" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.4.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.4.0" + jest-util "^26.3.0" + jest-validate "^26.4.2" micromatch "^4.0.2" - pretty-format "^25.5.0" - realpath-native "^2.0.0" + pretty-format "^26.4.2" jest-diff@^24.9.0: version "24.9.0" @@ -18049,7 +18185,7 @@ jest-diff@^24.9.0: jest-get-type "^24.9.0" pretty-format "^24.9.0" -jest-diff@^25.2.1, jest-diff@^25.5.0: +jest-diff@^25.2.1: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== @@ -18069,23 +18205,33 @@ jest-diff@^26.4.0: jest-get-type "^26.3.0" pretty-format "^26.4.0" -jest-docblock@^25.3.0: - version "25.3.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef" - integrity sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg== +jest-diff@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa" + integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.3.0" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" + +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== dependencies: detect-newline "^3.0.0" -jest-each@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.5.0.tgz#0c3c2797e8225cb7bec7e4d249dcd96b934be516" - integrity sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA== +jest-each@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae" + integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA== dependencies: - "@jest/types" "^25.5.0" - chalk "^3.0.0" - jest-get-type "^25.2.6" - jest-util "^25.5.0" - pretty-format "^25.5.0" + "@jest/types" "^26.3.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" + jest-util "^26.3.0" + pretty-format "^26.4.2" jest-environment-jsdom-thirteen@^1.0.1: version "1.0.1" @@ -18096,29 +18242,30 @@ jest-environment-jsdom-thirteen@^1.0.1: jest-util "^24.0.0" jsdom "^13.0.0" -jest-environment-jsdom@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz#dcbe4da2ea997707997040ecf6e2560aec4e9834" - integrity sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A== +jest-environment-jsdom@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c" + integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA== dependencies: - "@jest/environment" "^25.5.0" - "@jest/fake-timers" "^25.5.0" - "@jest/types" "^25.5.0" - jest-mock "^25.5.0" - jest-util "^25.5.0" - jsdom "^15.2.1" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + jest-util "^26.3.0" + jsdom "^16.2.2" -jest-environment-node@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.5.0.tgz#0f55270d94804902988e64adca37c6ce0f7d07a1" - integrity sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA== +jest-environment-node@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849" + integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw== dependencies: - "@jest/environment" "^25.5.0" - "@jest/fake-timers" "^25.5.0" - "@jest/types" "^25.5.0" - jest-mock "^25.5.0" - jest-util "^25.5.0" - semver "^6.3.0" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + jest-mock "^26.3.0" + jest-util "^26.3.0" jest-get-type@^24.9.0: version "24.9.0" @@ -18135,26 +18282,6 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-haste-map@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.5.1.tgz#1df10f716c1d94e60a1ebf7798c9fb3da2620943" - integrity sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ== - dependencies: - "@jest/types" "^25.5.0" - "@types/graceful-fs" "^4.1.2" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.4" - jest-serializer "^25.5.0" - jest-util "^25.5.0" - jest-worker "^25.5.0" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - which "^2.0.2" - optionalDependencies: - fsevents "^2.1.2" - jest-haste-map@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726" @@ -18176,36 +18303,37 @@ jest-haste-map@^26.3.0: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz#66ca8b328fb1a3c5364816f8958f6970a8526968" - integrity sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ== +jest-jasmine2@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257" + integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.5.0" - "@jest/source-map" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/environment" "^26.3.0" + "@jest/source-map" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" co "^4.6.0" - expect "^25.5.0" + expect "^26.4.2" is-generator-fn "^2.0.0" - jest-each "^25.5.0" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-runtime "^25.5.4" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - pretty-format "^25.5.0" + jest-each "^26.4.2" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-runtime "^26.4.2" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + pretty-format "^26.4.2" throat "^5.0.0" -jest-leak-detector@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz#2291c6294b0ce404241bb56fe60e2d0c3e34f0bb" - integrity sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA== +jest-leak-detector@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f" + integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA== dependencies: - jest-get-type "^25.2.6" - pretty-format "^25.5.0" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" jest-matcher-utils@^24.9.0: version "24.9.0" @@ -18217,16 +18345,6 @@ jest-matcher-utils@^24.9.0: jest-get-type "^24.9.0" pretty-format "^24.9.0" -jest-matcher-utils@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz#fbc98a12d730e5d2453d7f1ed4a4d948e34b7867" - integrity sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw== - dependencies: - chalk "^3.0.0" - jest-diff "^25.5.0" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" - jest-matcher-utils@^26.4.0: version "26.4.0" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.0.tgz#2bce9a939e008b894faf1bd4b5bb58facd00c252" @@ -18237,6 +18355,16 @@ jest-matcher-utils@^26.4.0: jest-get-type "^26.3.0" pretty-format "^26.4.0" +jest-matcher-utils@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06" + integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q== + dependencies: + chalk "^4.0.0" + jest-diff "^26.4.2" + jest-get-type "^26.3.0" + pretty-format "^26.4.2" + jest-message-util@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3" @@ -18251,20 +18379,6 @@ jest-message-util@^24.9.0: slash "^2.0.0" stack-utils "^1.0.1" -jest-message-util@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz#ea11d93204cc7ae97456e1d8716251185b8880ea" - integrity sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA== - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/types" "^25.5.0" - "@types/stack-utils" "^1.0.1" - chalk "^3.0.0" - graceful-fs "^4.2.4" - micromatch "^4.0.2" - slash "^3.0.0" - stack-utils "^1.0.1" - jest-message-util@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a" @@ -18286,12 +18400,13 @@ jest-mock@^24.0.0, jest-mock@^24.9.0: dependencies: "@jest/types" "^24.9.0" -jest-mock@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz#a91a54dabd14e37ecd61665d6b6e06360a55387a" - integrity sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA== +jest-mock@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba" + integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q== dependencies: - "@jest/types" "^25.5.0" + "@jest/types" "^26.3.0" + "@types/node" "*" jest-pnp-resolver@^1.2.1: version "1.2.1" @@ -18313,24 +18428,19 @@ jest-regex-util@^24.9.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636" integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA== -jest-regex-util@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" - integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw== - jest-regex-util@^26.0.0: version "26.0.0" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz#85501f53957c8e3be446e863a74777b5a17397a7" - integrity sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw== +jest-resolve-dependencies@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5" + integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ== dependencies: - "@jest/types" "^25.5.0" - jest-regex-util "^25.2.6" - jest-snapshot "^25.5.1" + "@jest/types" "^26.3.0" + jest-regex-util "^26.0.0" + jest-snapshot "^26.4.2" jest-resolve@^24.9.0: version "24.9.0" @@ -18343,21 +18453,6 @@ jest-resolve@^24.9.0: jest-pnp-resolver "^1.2.1" realpath-native "^1.1.0" -jest-resolve@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.5.1.tgz#0e6fbcfa7c26d2a5fe8f456088dc332a79266829" - integrity sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ== - dependencies: - "@jest/types" "^25.5.0" - browser-resolve "^1.11.3" - chalk "^3.0.0" - graceful-fs "^4.2.4" - jest-pnp-resolver "^1.2.1" - read-pkg-up "^7.0.1" - realpath-native "^2.0.0" - resolve "^1.17.0" - slash "^3.0.0" - jest-resolve@^26.4.0: version "26.4.0" resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7" @@ -18372,70 +18467,64 @@ jest-resolve@^26.4.0: resolve "^1.17.0" slash "^3.0.0" -jest-runner@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.5.4.tgz#ffec5df3875da5f5c878ae6d0a17b8e4ecd7c71d" - integrity sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg== +jest-runner@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853" + integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g== dependencies: - "@jest/console" "^25.5.0" - "@jest/environment" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" - chalk "^3.0.0" + "@jest/console" "^26.3.0" + "@jest/environment" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^25.5.4" - jest-docblock "^25.3.0" - jest-haste-map "^25.5.1" - jest-jasmine2 "^25.5.4" - jest-leak-detector "^25.5.0" - jest-message-util "^25.5.0" - jest-resolve "^25.5.1" - jest-runtime "^25.5.4" - jest-util "^25.5.0" - jest-worker "^25.5.0" + jest-config "^26.4.2" + jest-docblock "^26.0.0" + jest-haste-map "^26.3.0" + jest-leak-detector "^26.4.2" + jest-message-util "^26.3.0" + jest-resolve "^26.4.0" + jest-runtime "^26.4.2" + jest-util "^26.3.0" + jest-worker "^26.3.0" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.5.4.tgz#dc981fe2cb2137abcd319e74ccae7f7eeffbfaab" - integrity sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ== - dependencies: - "@jest/console" "^25.5.0" - "@jest/environment" "^25.5.0" - "@jest/globals" "^25.5.2" - "@jest/source-map" "^25.5.0" - "@jest/test-result" "^25.5.0" - "@jest/transform" "^25.5.1" - "@jest/types" "^25.5.0" +jest-runtime@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42" + integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ== + dependencies: + "@jest/console" "^26.3.0" + "@jest/environment" "^26.3.0" + "@jest/fake-timers" "^26.3.0" + "@jest/globals" "^26.4.2" + "@jest/source-map" "^26.3.0" + "@jest/test-result" "^26.3.0" + "@jest/transform" "^26.3.0" + "@jest/types" "^26.3.0" "@types/yargs" "^15.0.0" - chalk "^3.0.0" + chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^25.5.4" - jest-haste-map "^25.5.1" - jest-message-util "^25.5.0" - jest-mock "^25.5.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.5.1" - jest-snapshot "^25.5.1" - jest-util "^25.5.0" - jest-validate "^25.5.0" - realpath-native "^2.0.0" + jest-config "^26.4.2" + jest-haste-map "^26.3.0" + jest-message-util "^26.3.0" + jest-mock "^26.3.0" + jest-regex-util "^26.0.0" + jest-resolve "^26.4.0" + jest-snapshot "^26.4.2" + jest-util "^26.3.0" + jest-validate "^26.4.2" slash "^3.0.0" strip-bom "^4.0.0" yargs "^15.3.1" -jest-serializer@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.5.0.tgz#a993f484e769b4ed54e70e0efdb74007f503072b" - integrity sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA== - dependencies: - graceful-fs "^4.2.4" - jest-serializer@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef" @@ -18463,27 +18552,6 @@ jest-snapshot@^24.1.0: pretty-format "^24.9.0" semver "^6.2.0" -jest-snapshot@^25.5.1: - version "25.5.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.5.1.tgz#1a2a576491f9961eb8d00c2e5fd479bc28e5ff7f" - integrity sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ== - dependencies: - "@babel/types" "^7.0.0" - "@jest/types" "^25.5.0" - "@types/prettier" "^1.19.0" - chalk "^3.0.0" - expect "^25.5.0" - graceful-fs "^4.2.4" - jest-diff "^25.5.0" - jest-get-type "^25.2.6" - jest-matcher-utils "^25.5.0" - jest-message-util "^25.5.0" - jest-resolve "^25.5.1" - make-dir "^3.0.0" - natural-compare "^1.4.0" - pretty-format "^25.5.0" - semver "^6.3.0" - jest-snapshot@^26.3.0: version "26.4.0" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.0.tgz#efd42eef09bcb33e9a3eb98e229f2368c73c9235" @@ -18505,6 +18573,27 @@ jest-snapshot@^26.3.0: pretty-format "^26.4.0" semver "^7.3.2" +jest-snapshot@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6" + integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg== + dependencies: + "@babel/types" "^7.0.0" + "@jest/types" "^26.3.0" + "@types/prettier" "^2.0.0" + chalk "^4.0.0" + expect "^26.4.2" + graceful-fs "^4.2.4" + jest-diff "^26.4.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.3.0" + jest-matcher-utils "^26.4.2" + jest-message-util "^26.3.0" + jest-resolve "^26.4.0" + natural-compare "^1.4.0" + pretty-format "^26.4.2" + semver "^7.3.2" + jest-specific-snapshot@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/jest-specific-snapshot/-/jest-specific-snapshot-2.0.0.tgz#425fe524b25df154aa39f97fa6fe9726faaac273" @@ -18544,17 +18633,6 @@ jest-util@^24.0.0: slash "^2.0.0" source-map "^0.6.0" -jest-util@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz#31c63b5d6e901274d264a4fec849230aa3fa35b0" - integrity sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA== - dependencies: - "@jest/types" "^25.5.0" - chalk "^3.0.0" - graceful-fs "^4.2.4" - is-ci "^2.0.0" - make-dir "^3.0.0" - jest-util@^26.3.0: version "26.3.0" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" @@ -18567,29 +18645,30 @@ jest-util@^26.3.0: is-ci "^2.0.0" micromatch "^4.0.2" -jest-validate@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.5.0.tgz#fb4c93f332c2e4cf70151a628e58a35e459a413a" - integrity sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ== +jest-validate@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c" + integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ== dependencies: - "@jest/types" "^25.5.0" - camelcase "^5.3.1" - chalk "^3.0.0" - jest-get-type "^25.2.6" + "@jest/types" "^26.3.0" + camelcase "^6.0.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^25.5.0" + pretty-format "^26.4.2" -jest-watcher@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.5.0.tgz#d6110d101df98badebe435003956fd4a465e8456" - integrity sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q== +jest-watcher@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08" + integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ== dependencies: - "@jest/test-result" "^25.5.0" - "@jest/types" "^25.5.0" + "@jest/test-result" "^26.3.0" + "@jest/types" "^26.3.0" + "@types/node" "*" ansi-escapes "^4.2.1" - chalk "^3.0.0" - jest-util "^25.5.0" - string-length "^3.1.0" + chalk "^4.0.0" + jest-util "^26.3.0" + string-length "^4.0.1" jest-when@^2.7.2: version "2.7.2" @@ -18599,7 +18678,7 @@ jest-when@^2.7.2: bunyan "^1.8.12" expect "^24.8.0" -jest-worker@^25.4.0, jest-worker@^25.5.0: +jest-worker@^25.4.0: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1" integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw== @@ -18616,14 +18695,14 @@ jest-worker@^26.2.1, jest-worker@^26.3.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^25.5.4: - version "25.5.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-25.5.4.tgz#f21107b6489cfe32b076ce2adcadee3587acb9db" - integrity sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ== +jest@^26.4.2: + version "26.4.2" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312" + integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw== dependencies: - "@jest/core" "^25.5.4" + "@jest/core" "^26.4.2" import-local "^3.0.2" - jest-cli "^25.5.4" + jest-cli "^26.4.2" jimp@^0.14.0: version "0.14.0" @@ -18750,36 +18829,36 @@ jsdom@13.1.0, jsdom@^13.0.0: ws "^6.1.2" xml-name-validator "^3.0.0" -jsdom@^15.2.1: - version "15.2.1" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" - integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== - dependencies: - abab "^2.0.0" - acorn "^7.1.0" - acorn-globals "^4.3.2" - array-equal "^1.0.0" - cssom "^0.4.1" - cssstyle "^2.0.0" - data-urls "^1.1.0" - domexception "^1.0.1" - escodegen "^1.11.1" - html-encoding-sniffer "^1.0.2" +jsdom@^16.2.2: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + dependencies: + abab "^2.0.3" + acorn "^7.1.1" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.2.0" + data-urls "^2.0.0" + decimal.js "^10.2.0" + domexception "^2.0.1" + escodegen "^1.14.1" + html-encoding-sniffer "^2.0.1" + is-potential-custom-element-name "^1.0.0" nwsapi "^2.2.0" - parse5 "5.1.0" - pn "^1.1.0" - request "^2.88.0" - request-promise-native "^1.0.7" - saxes "^3.1.9" - symbol-tree "^3.2.2" + parse5 "5.1.1" + request "^2.88.2" + request-promise-native "^1.0.8" + saxes "^5.0.0" + symbol-tree "^3.2.4" tough-cookie "^3.0.1" - w3c-hr-time "^1.0.1" - w3c-xmlserializer "^1.1.2" - webidl-conversions "^4.0.2" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^7.0.0" - ws "^7.0.0" + whatwg-url "^8.0.0" + ws "^7.2.3" xml-name-validator "^3.0.0" jsesc@^1.3.0: @@ -20011,7 +20090,7 @@ lolex@^4.2.0: resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7" integrity sha512-gKO5uExCXvSm6zbF562EvM+rd1kQDnB9AZBbiQVzf1ZmdDpxUSvpnAaVOP83N/31mRK8Ml8/VE8DMvsAZQ+7wg== -lolex@^5.0.0, lolex@^5.0.1: +lolex@^5.0.1: version "5.1.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A== @@ -21653,16 +21732,17 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-notifier@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12" - integrity sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw== +node-notifier@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620" + integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA== dependencies: growly "^1.3.0" - is-wsl "^2.1.1" - semver "^6.3.0" + is-wsl "^2.2.0" + semver "^7.3.2" shellwords "^0.1.1" - which "^1.3.1" + uuid "^8.3.0" + which "^2.0.2" node-pre-gyp@^0.11.0: version "0.11.0" @@ -22583,11 +22663,6 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-finally@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" - integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== - p-is-promise@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" @@ -22977,6 +23052,11 @@ parse5@5.1.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ== +parse5@5.1.1, parse5@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== + parse5@^3.0.1: version "3.0.3" resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" @@ -22984,11 +23064,6 @@ parse5@^3.0.1: dependencies: "@types/node" "*" -parse5@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== - parse5@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -25249,11 +25324,6 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" -realpath-native@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" - integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q== - recast@^0.14.7: version "0.14.7" resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d" @@ -25874,7 +25944,14 @@ request-promise-core@1.1.3: dependencies: lodash "^4.17.15" -request-promise-native@^1.0.5, request-promise-native@^1.0.7: +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== + dependencies: + lodash "^4.17.19" + +request-promise-native@^1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== @@ -25883,6 +25960,15 @@ request-promise-native@^1.0.5, request-promise-native@^1.0.7: stealthy-require "^1.1.1" tough-cookie "^2.3.3" +request-promise-native@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== + dependencies: + request-promise-core "1.1.4" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + request-promise@^4.2.2: version "4.2.4" resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.4.tgz#1c5ed0d71441e38ad58c7ce4ea4ea5b06d54b310" @@ -26531,13 +26617,20 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^3.1.4, saxes@^3.1.9: +saxes@^3.1.4: version "3.1.11" resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g== dependencies: xmlchars "^2.1.1" +saxes@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + scheduler@^0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz#5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4" @@ -27693,13 +27786,13 @@ string-length@^2.0.0: astral-regex "^1.0.0" strip-ansi "^4.0.0" -string-length@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" - integrity sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA== +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== dependencies: - astral-regex "^1.0.0" - strip-ansi "^5.2.0" + char-regex "^1.0.2" + strip-ansi "^6.0.0" string-replace-loader@^2.2.0: version "2.2.0" @@ -28270,6 +28363,11 @@ symbol-tree@^3.2.2: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY= +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + symbol.prototype.description@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/symbol.prototype.description/-/symbol.prototype.description-1.0.0.tgz#6e355660eb1e44ca8ad53a68fdb72ef131ca4b12" @@ -29029,6 +29127,13 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" +tr46@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" + integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== + dependencies: + punycode "^2.1.1" + traceparent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/traceparent/-/traceparent-1.0.0.tgz#9b14445cdfe5c19f023f1c04d249c3d8e003a5ce" @@ -30143,10 +30248,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== -v8-to-istanbul@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20" - integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng== +v8-to-istanbul@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5" + integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -30823,7 +30928,14 @@ w3c-hr-time@^1.0.1: dependencies: browser-process-hrtime "^0.1.2" -w3c-xmlserializer@^1.0.1, w3c-xmlserializer@^1.1.2: +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg== @@ -30832,6 +30944,13 @@ w3c-xmlserializer@^1.0.1, w3c-xmlserializer@^1.1.2: webidl-conversions "^4.0.2" xml-name-validator "^3.0.0" +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + walk@2.3.x: version "2.3.9" resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b" @@ -30937,6 +31056,16 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + webpack-cli@^3.3.10: version "3.3.10" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13" @@ -31193,6 +31322,15 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" +whatwg-url@^8.0.0: + version "8.2.2" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz#85e7f9795108b53d554cec640b2e8aee2a0d4bfd" + integrity sha512-PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^2.0.2" + webidl-conversions "^6.1.0" + which-boxed-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1" @@ -31535,12 +31673,10 @@ ws@^6.1.2, ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7" - integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg== - dependencies: - async-limiter "^1.0.0" +ws@^7.2.3: + version "7.3.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8" + integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA== x-is-function@^1.0.4: version "1.0.4" @@ -31634,7 +31770,7 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.4.tgz#519cb4ca686d005a8420d3496f3f0caeecca580f" integrity sha1-UZy0ymhtAFqEINNJbz8MruzKWA8= -xmlchars@^2.1.1: +xmlchars@^2.1.1, xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== From 5f187307c2e20ea1c8057a0e65c7b5801a4467f6 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Thu, 1 Oct 2020 14:50:03 -0700 Subject: [PATCH 06/73] Fix condition for filtering to installed packages (#79205) --- .../ingest_manager/server/services/epm/packages/get.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts index c4232247cc4b..2d11b6157804 100644 --- a/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts +++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/get.ts @@ -51,14 +51,14 @@ export async function getPackages( } // Get package names for packages which cannot have more than one package policy on an agent policy -// Assume packages only export one config template for now +// Assume packages only export one policy template for now export async function getLimitedPackages(options: { savedObjectsClient: SavedObjectsClientContract; }): Promise { const { savedObjectsClient } = options; const allPackages = await getPackages({ savedObjectsClient, experimental: true }); const installedPackages = allPackages.filter( - (pkg) => (pkg.status = InstallationStatus.installed) + (pkg) => pkg.status === InstallationStatus.installed ); const installedPackagesInfo = await Promise.all( installedPackages.map((pkgInstall) => { From 117b5771dcee1b3ee00e56d9c7bb025e459fec14 Mon Sep 17 00:00:00 2001 From: Patrick Mueller Date: Thu, 1 Oct 2020 18:06:26 -0400 Subject: [PATCH 07/73] [Alerting] formalize alert status and add status fields to alert saved object (#75553) resolves https://github.com/elastic/kibana/issues/51099 This formalizes the concept of "alert status", in terms of it's execution, with some new fields in the alert saved object and types used with the alert client and http APIs. These fields are read-only from the client point-of-view; they are provided in the alert structures, but are only updated by the alerting framework itself. The values will be updated after each run of the alert type executor. The data is added to the alert as the `executionStatus` field, with the following shape: ```ts interface AlertExecutionStatus { status: 'ok' | 'active' | 'error' | 'pending' | 'unknown'; lastExecutionDate: Date; error?: { reason: 'read' | 'decrypt' | 'execute' | 'unknown'; message: string; }; } ``` --- x-pack/plugins/alerts/common/alert.ts | 23 ++ .../alerts/server/alerts_client.test.ts | 20 ++ x-pack/plugins/alerts/server/alerts_client.ts | 21 +- .../server/lib/alert_execution_status.test.ts | 185 ++++++++++ .../server/lib/alert_execution_status.ts | 66 ++++ ...rt_instance_summary_from_event_log.test.ts | 4 + .../server/lib/error_with_reason.test.ts | 28 ++ .../alerts/server/lib/error_with_reason.ts | 29 ++ x-pack/plugins/alerts/server/lib/index.ts | 7 + .../lib/is_alert_not_found_error.test.ts | 22 +- .../server/lib/is_alert_not_found_error.ts | 8 +- x-pack/plugins/alerts/server/plugin.ts | 1 + .../alerts/server/routes/create.test.ts | 7 +- .../plugins/alerts/server/routes/get.test.ts | 7 +- .../alerts/server/saved_objects/index.ts | 13 +- .../alerts/server/saved_objects/mappings.json | 20 ++ .../server/saved_objects/migrations.test.ts | 30 +- .../alerts/server/saved_objects/migrations.ts | 23 +- .../saved_objects/partially_update_alert.ts | 4 +- .../task_runner/alert_task_instance.test.ts | 4 + .../server/task_runner/task_runner.test.ts | 15 +- .../alerts/server/task_runner/task_runner.ts | 59 +++- .../task_runner/task_runner_factory.test.ts | 6 +- .../server/task_runner/task_runner_factory.ts | 3 +- x-pack/plugins/alerts/server/types.ts | 15 + .../routes/__mocks__/request_responses.ts | 8 + .../rules/patch_rules.mock.ts | 4 + .../public/application/lib/alert_api.test.ts | 8 + .../public/application/lib/alert_api.ts | 5 +- .../components/alert_details.test.tsx | 4 + .../components/alert_details_route.test.tsx | 4 + .../components/alert_instances.test.tsx | 4 + .../components/alert_instances_route.test.tsx | 4 + .../components/view_in_app.test.tsx | 4 + .../sections/alert_form/alert_edit.test.tsx | 9 +- .../with_bulk_alert_api_operations.test.tsx | 4 + .../common/lib/test_assertions.ts | 18 + .../tests/alerting/create.ts | 1 + .../tests/alerting/execution_status.ts | 87 +++++ .../tests/alerting/find.ts | 81 +++++ .../security_and_spaces/tests/alerting/get.ts | 1 + .../tests/alerting/index.ts | 1 + .../tests/alerting/update.ts | 5 + .../spaces_only/tests/alerting/create.ts | 1 + .../tests/alerting/execution_status.ts | 333 ++++++++++++++++++ .../spaces_only/tests/alerting/find.ts | 1 + .../spaces_only/tests/alerting/get.ts | 1 + .../spaces_only/tests/alerting/index.ts | 1 + .../spaces_only/tests/alerting/update.ts | 1 + .../detection_engine_api_integration/utils.ts | 13 +- 50 files changed, 1176 insertions(+), 47 deletions(-) create mode 100644 x-pack/plugins/alerts/server/lib/alert_execution_status.test.ts create mode 100644 x-pack/plugins/alerts/server/lib/alert_execution_status.ts create mode 100644 x-pack/plugins/alerts/server/lib/error_with_reason.test.ts create mode 100644 x-pack/plugins/alerts/server/lib/error_with_reason.ts create mode 100644 x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts create mode 100644 x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts diff --git a/x-pack/plugins/alerts/common/alert.ts b/x-pack/plugins/alerts/common/alert.ts index 3ff7ed742e81..4ebe66f7b7c9 100644 --- a/x-pack/plugins/alerts/common/alert.ts +++ b/x-pack/plugins/alerts/common/alert.ts @@ -15,6 +15,28 @@ export interface IntervalSchedule extends SavedObjectAttributes { interval: string; } +// for the `typeof ThingValues[number]` types below, become string types that +// only accept the values in the associated string arrays +export const AlertExecutionStatusValues = ['ok', 'active', 'error', 'pending', 'unknown'] as const; +export type AlertExecutionStatuses = typeof AlertExecutionStatusValues[number]; + +export const AlertExecutionStatusErrorReasonValues = [ + 'read', + 'decrypt', + 'execute', + 'unknown', +] as const; +export type AlertExecutionStatusErrorReasons = typeof AlertExecutionStatusErrorReasonValues[number]; + +export interface AlertExecutionStatus { + status: AlertExecutionStatuses; + lastExecutionDate: Date; + error?: { + reason: AlertExecutionStatusErrorReasons; + message: string; + }; +} + export type AlertActionParams = SavedObjectAttributes; export interface AlertAction { @@ -44,6 +66,7 @@ export interface Alert { throttle: string | null; muteAll: boolean; mutedInstanceIds: string[]; + executionStatus: AlertExecutionStatus; } export type SanitizedAlert = Omit; diff --git a/x-pack/plugins/alerts/server/alerts_client.test.ts b/x-pack/plugins/alerts/server/alerts_client.test.ts index 088390c3cb6e..b20018fcc26f 100644 --- a/x-pack/plugins/alerts/server/alerts_client.test.ts +++ b/x-pack/plugins/alerts/server/alerts_client.test.ts @@ -393,6 +393,11 @@ describe('create()', () => { "createdAt": "2019-02-12T21:01:22.479Z", "createdBy": "elastic", "enabled": true, + "executionStatus": Object { + "error": null, + "lastExecutionDate": "2019-02-12T21:01:22.479Z", + "status": "pending", + }, "meta": Object { "versionApiKeyLastmodified": "v7.10.0", }, @@ -1034,6 +1039,11 @@ describe('create()', () => { muteAll: false, mutedInstanceIds: [], tags: ['foo'], + executionStatus: { + lastExecutionDate: '2019-02-12T21:01:22.479Z', + status: 'pending', + error: null, + }, }, { references: [ @@ -1150,6 +1160,11 @@ describe('create()', () => { muteAll: false, mutedInstanceIds: [], tags: ['foo'], + executionStatus: { + lastExecutionDate: '2019-02-12T21:01:22.479Z', + status: 'pending', + error: null, + }, }, { references: [ @@ -2506,6 +2521,11 @@ const BaseAlertInstanceSummarySavedObject: SavedObject = { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: '2020-08-20T19:23:38Z', + error: null, + }, }, references: [], }; diff --git a/x-pack/plugins/alerts/server/alerts_client.ts b/x-pack/plugins/alerts/server/alerts_client.ts index bcc3c9bcf7e5..bd278d39c622 100644 --- a/x-pack/plugins/alerts/server/alerts_client.ts +++ b/x-pack/plugins/alerts/server/alerts_client.ts @@ -28,7 +28,7 @@ import { AlertTaskState, AlertInstanceSummary, } from './types'; -import { validateAlertTypeParams } from './lib'; +import { validateAlertTypeParams, alertExecutionStatusFromRaw } from './lib'; import { InvalidateAPIKeyParams, GrantAPIKeyResult as SecurityPluginGrantAPIKeyResult, @@ -122,6 +122,7 @@ export interface CreateOptions { | 'muteAll' | 'mutedInstanceIds' | 'actions' + | 'executionStatus' > & { actions: NormalizedAlertAction[] }; options?: { migrationVersion?: Record; @@ -228,6 +229,11 @@ export class AlertsClient { params: validatedAlertTypeParams as RawAlert['params'], muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'pending', + lastExecutionDate: new Date().toISOString(), + error: null, + }, }; let createdAlert: SavedObject; try { @@ -978,9 +984,19 @@ export class AlertsClient { updatedAt: SavedObject['updated_at'] = createdAt, references: SavedObjectReference[] | undefined ): PartialAlert { + // Not the prettiest code here, but if we want to use most of the + // alert fields from the rawAlert using `...rawAlert` kind of access, we + // need to specifically delete the executionStatus as it's a different type + // in RawAlert and Alert. Probably next time we need to do something similar + // here, we should look at redesigning the implementation of this method. + const rawAlertWithoutExecutionStatus: Partial> = { + ...rawAlert, + }; + delete rawAlertWithoutExecutionStatus.executionStatus; + const executionStatus = alertExecutionStatusFromRaw(this.logger, id, rawAlert.executionStatus); return { id, - ...rawAlert, + ...rawAlertWithoutExecutionStatus, // we currently only support the Interval Schedule type // Once we support additional types, this type signature will likely change schedule: rawAlert.schedule as IntervalSchedule, @@ -990,6 +1006,7 @@ export class AlertsClient { ...(updatedAt ? { updatedAt: new Date(updatedAt) } : {}), ...(createdAt ? { createdAt: new Date(createdAt) } : {}), ...(scheduledTaskId ? { scheduledTaskId } : {}), + ...(executionStatus ? { executionStatus } : {}), }; } diff --git a/x-pack/plugins/alerts/server/lib/alert_execution_status.test.ts b/x-pack/plugins/alerts/server/lib/alert_execution_status.test.ts new file mode 100644 index 000000000000..3372d19cd409 --- /dev/null +++ b/x-pack/plugins/alerts/server/lib/alert_execution_status.test.ts @@ -0,0 +1,185 @@ +/* + * 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 { loggingSystemMock } from '../../../../../src/core/server/mocks'; +import { AlertExecutionStatusErrorReasons } from '../types'; +import { + executionStatusFromState, + executionStatusFromError, + alertExecutionStatusToRaw, + alertExecutionStatusFromRaw, +} from './alert_execution_status'; +import { ErrorWithReason } from './error_with_reason'; + +const MockLogger = loggingSystemMock.create().get(); + +describe('AlertExecutionStatus', () => { + beforeEach(() => { + jest.resetAllMocks(); + }); + + describe('executionStatusFromState()', () => { + test('empty task state', () => { + const status = executionStatusFromState({}); + checkDateIsNearNow(status.lastExecutionDate); + expect(status.status).toBe('ok'); + expect(status.error).toBe(undefined); + }); + + test('task state with no instances', () => { + const status = executionStatusFromState({ alertInstances: {} }); + checkDateIsNearNow(status.lastExecutionDate); + expect(status.status).toBe('ok'); + expect(status.error).toBe(undefined); + }); + + test('task state with one instance', () => { + const status = executionStatusFromState({ alertInstances: { a: {} } }); + checkDateIsNearNow(status.lastExecutionDate); + expect(status.status).toBe('active'); + expect(status.error).toBe(undefined); + }); + }); + + describe('executionStatusFromError()', () => { + test('error with no reason', () => { + const status = executionStatusFromError(new Error('boo!')); + expect(status.status).toBe('error'); + expect(status.error).toMatchInlineSnapshot(` + Object { + "message": "boo!", + "reason": "unknown", + } + `); + }); + + test('error with a reason', () => { + const status = executionStatusFromError(new ErrorWithReason('execute', new Error('hoo!'))); + expect(status.status).toBe('error'); + expect(status.error).toMatchInlineSnapshot(` + Object { + "message": "hoo!", + "reason": "execute", + } + `); + }); + }); + + describe('alertExecutionStatusToRaw()', () => { + const date = new Date('2020-09-03T16:26:58Z'); + const status = 'ok'; + const reason: AlertExecutionStatusErrorReasons = 'decrypt'; + const error = { reason, message: 'wops' }; + + test('status without an error', () => { + expect(alertExecutionStatusToRaw({ lastExecutionDate: date, status })).toMatchInlineSnapshot(` + Object { + "error": null, + "lastExecutionDate": "2020-09-03T16:26:58.000Z", + "status": "ok", + } + `); + }); + + test('status with an error', () => { + expect(alertExecutionStatusToRaw({ lastExecutionDate: date, status, error })) + .toMatchInlineSnapshot(` + Object { + "error": Object { + "message": "wops", + "reason": "decrypt", + }, + "lastExecutionDate": "2020-09-03T16:26:58.000Z", + "status": "ok", + } + `); + }); + }); + + describe('alertExecutionStatusFromRaw()', () => { + const date = new Date('2020-09-03T16:26:58Z').toISOString(); + const status = 'active'; + const reason: AlertExecutionStatusErrorReasons = 'execute'; + const error = { reason, message: 'wops' }; + + test('no input', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id'); + expect(result).toBe(undefined); + }); + + test('undefined input', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id', undefined); + expect(result).toBe(undefined); + }); + + test('null input', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id', null); + expect(result).toBe(undefined); + }); + + test('invalid date', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id', { + lastExecutionDate: 'an invalid date', + })!; + checkDateIsNearNow(result.lastExecutionDate); + expect(result.status).toBe('unknown'); + expect(result.error).toBe(undefined); + expect(MockLogger.debug).toBeCalledWith( + 'invalid alertExecutionStatus lastExecutionDate "an invalid date" in raw alert alert-id' + ); + }); + + test('valid date', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id', { + lastExecutionDate: date, + }); + expect(result).toMatchInlineSnapshot(` + Object { + "lastExecutionDate": 2020-09-03T16:26:58.000Z, + "status": "unknown", + } + `); + }); + + test('valid status and date', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id', { + status, + lastExecutionDate: date, + }); + expect(result).toMatchInlineSnapshot(` + Object { + "lastExecutionDate": 2020-09-03T16:26:58.000Z, + "status": "active", + } + `); + }); + + test('valid status, date and error', () => { + const result = alertExecutionStatusFromRaw(MockLogger, 'alert-id', { + status, + lastExecutionDate: date, + error, + }); + expect(result).toMatchInlineSnapshot(` + Object { + "error": Object { + "message": "wops", + "reason": "execute", + }, + "lastExecutionDate": 2020-09-03T16:26:58.000Z, + "status": "active", + } + `); + }); + }); +}); + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +function checkDateIsNearNow(date: any) { + expect(date instanceof Date).toBe(true); + // allow for lots of slop in the time difference + expect(Date.now() - date.valueOf()).toBeLessThanOrEqual(10000); +} diff --git a/x-pack/plugins/alerts/server/lib/alert_execution_status.ts b/x-pack/plugins/alerts/server/lib/alert_execution_status.ts new file mode 100644 index 000000000000..9eb0c8817f28 --- /dev/null +++ b/x-pack/plugins/alerts/server/lib/alert_execution_status.ts @@ -0,0 +1,66 @@ +/* + * 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 { Logger } from 'src/core/server'; +import { AlertTaskState, AlertExecutionStatus, RawAlertExecutionStatus } from '../types'; +import { getReasonFromError } from './error_with_reason'; + +export function executionStatusFromState(state: AlertTaskState): AlertExecutionStatus { + const instanceIds = Object.keys(state.alertInstances ?? {}); + return { + lastExecutionDate: new Date(), + status: instanceIds.length === 0 ? 'ok' : 'active', + }; +} + +export function executionStatusFromError(error: Error): AlertExecutionStatus { + return { + lastExecutionDate: new Date(), + status: 'error', + error: { + reason: getReasonFromError(error), + message: error.message, + }, + }; +} + +export function alertExecutionStatusToRaw({ + lastExecutionDate, + status, + error, +}: AlertExecutionStatus): RawAlertExecutionStatus { + return { + lastExecutionDate: lastExecutionDate.toISOString(), + status, + // explicitly setting to null (in case undefined) due to partial update concerns + error: error ?? null, + }; +} + +export function alertExecutionStatusFromRaw( + logger: Logger, + alertId: string, + rawAlertExecutionStatus?: Partial | null | undefined +): AlertExecutionStatus | undefined { + if (!rawAlertExecutionStatus) return undefined; + + const { lastExecutionDate, status = 'unknown', error } = rawAlertExecutionStatus; + + let parsedDateMillis = lastExecutionDate ? Date.parse(lastExecutionDate) : Date.now(); + if (isNaN(parsedDateMillis)) { + logger.debug( + `invalid alertExecutionStatus lastExecutionDate "${lastExecutionDate}" in raw alert ${alertId}` + ); + parsedDateMillis = Date.now(); + } + + const parsedDate = new Date(parsedDateMillis); + if (error) { + return { lastExecutionDate: parsedDate, status, error }; + } else { + return { lastExecutionDate: parsedDate, status }; + } +} diff --git a/x-pack/plugins/alerts/server/lib/alert_instance_summary_from_event_log.test.ts b/x-pack/plugins/alerts/server/lib/alert_instance_summary_from_event_log.test.ts index b5936cf3577b..566a1770c065 100644 --- a/x-pack/plugins/alerts/server/lib/alert_instance_summary_from_event_log.test.ts +++ b/x-pack/plugins/alerts/server/lib/alert_instance_summary_from_event_log.test.ts @@ -511,4 +511,8 @@ const BaseAlert: SanitizedAlert = { createdAt: new Date(), updatedAt: new Date(), apiKeyOwner: null, + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; diff --git a/x-pack/plugins/alerts/server/lib/error_with_reason.test.ts b/x-pack/plugins/alerts/server/lib/error_with_reason.test.ts new file mode 100644 index 000000000000..f31f58440030 --- /dev/null +++ b/x-pack/plugins/alerts/server/lib/error_with_reason.test.ts @@ -0,0 +1,28 @@ +/* + * 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 { ErrorWithReason, getReasonFromError, isErrorWithReason } from './error_with_reason'; + +describe('ErrorWithReason', () => { + const plainError = new Error('well, actually'); + const errorWithReason = new ErrorWithReason('decrypt', plainError); + + test('ErrorWithReason class', () => { + expect(errorWithReason.message).toBe(plainError.message); + expect(errorWithReason.error).toBe(plainError); + expect(errorWithReason.reason).toBe('decrypt'); + }); + + test('getReasonFromError()', () => { + expect(getReasonFromError(plainError)).toBe('unknown'); + expect(getReasonFromError(errorWithReason)).toBe('decrypt'); + }); + + test('isErrorWithReason()', () => { + expect(isErrorWithReason(plainError)).toBe(false); + expect(isErrorWithReason(errorWithReason)).toBe(true); + }); +}); diff --git a/x-pack/plugins/alerts/server/lib/error_with_reason.ts b/x-pack/plugins/alerts/server/lib/error_with_reason.ts new file mode 100644 index 000000000000..29eb666e6442 --- /dev/null +++ b/x-pack/plugins/alerts/server/lib/error_with_reason.ts @@ -0,0 +1,29 @@ +/* + * 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 { AlertExecutionStatusErrorReasons } from '../types'; + +export class ErrorWithReason extends Error { + public readonly reason: AlertExecutionStatusErrorReasons; + public readonly error: Error; + + constructor(reason: AlertExecutionStatusErrorReasons, error: Error) { + super(error.message); + this.error = error; + this.reason = reason; + } +} + +export function getReasonFromError(error: Error): AlertExecutionStatusErrorReasons { + if (isErrorWithReason(error)) { + return error.reason; + } + return 'unknown'; +} + +export function isErrorWithReason(error: Error | ErrorWithReason): error is ErrorWithReason { + return error instanceof ErrorWithReason; +} diff --git a/x-pack/plugins/alerts/server/lib/index.ts b/x-pack/plugins/alerts/server/lib/index.ts index 2f610aafd8c3..32047ae5cbfa 100644 --- a/x-pack/plugins/alerts/server/lib/index.ts +++ b/x-pack/plugins/alerts/server/lib/index.ts @@ -7,3 +7,10 @@ export { parseDuration, validateDurationSchema } from '../../common/parse_duration'; export { LicenseState } from './license_state'; export { validateAlertTypeParams } from './validate_alert_type_params'; +export { ErrorWithReason, getReasonFromError, isErrorWithReason } from './error_with_reason'; +export { + executionStatusFromState, + executionStatusFromError, + alertExecutionStatusToRaw, + alertExecutionStatusFromRaw, +} from './alert_execution_status'; diff --git a/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.test.ts b/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.test.ts index 46ceee3ce420..b570957d82de 100644 --- a/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.test.ts +++ b/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.test.ts @@ -5,27 +5,27 @@ */ import { isAlertSavedObjectNotFoundError } from './is_alert_not_found_error'; +import { ErrorWithReason } from './error_with_reason'; import { SavedObjectsErrorHelpers } from '../../../../../src/core/server'; import uuid from 'uuid'; describe('isAlertSavedObjectNotFoundError', () => { + const id = uuid.v4(); + const errorSONF = SavedObjectsErrorHelpers.createGenericNotFoundError('alert', id); + test('identifies SavedObjects Not Found errors', () => { - const id = uuid.v4(); // ensure the error created by SO parses as a string with the format we expect - expect( - `${SavedObjectsErrorHelpers.createGenericNotFoundError('alert', id)}`.includes(`alert/${id}`) - ).toBe(true); - - const errorBySavedObjectsHelper = SavedObjectsErrorHelpers.createGenericNotFoundError( - 'alert', - id - ); + expect(`${errorSONF}`.includes(`alert/${id}`)).toBe(true); - expect(isAlertSavedObjectNotFoundError(errorBySavedObjectsHelper, id)).toBe(true); + expect(isAlertSavedObjectNotFoundError(errorSONF, id)).toBe(true); }); test('identifies generic errors', () => { - const id = uuid.v4(); expect(isAlertSavedObjectNotFoundError(new Error(`not found`), id)).toBe(false); }); + + test('identifies SavedObjects Not Found errors wrapped in an ErrorWithReason', () => { + const error = new ErrorWithReason('read', errorSONF); + expect(isAlertSavedObjectNotFoundError(error, id)).toBe(true); + }); }); diff --git a/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.ts b/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.ts index 0aa83ad0e883..038e23458668 100644 --- a/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.ts +++ b/x-pack/plugins/alerts/server/lib/is_alert_not_found_error.ts @@ -5,7 +5,13 @@ */ import { SavedObjectsErrorHelpers } from '../../../../../src/core/server'; +import { isErrorWithReason } from './error_with_reason'; export function isAlertSavedObjectNotFoundError(err: Error, alertId: string) { - return SavedObjectsErrorHelpers.isNotFoundError(err) && `${err}`.includes(alertId); + // if this is an error with a reason, the actual error needs to be extracted + const actualError = isErrorWithReason(err) ? err.error : err; + + return ( + SavedObjectsErrorHelpers.isNotFoundError(actualError) && `${actualError}`.includes(alertId) + ); } diff --git a/x-pack/plugins/alerts/server/plugin.ts b/x-pack/plugins/alerts/server/plugin.ts index e9caf4b78e62..4cdcac4c9e88 100644 --- a/x-pack/plugins/alerts/server/plugin.ts +++ b/x-pack/plugins/alerts/server/plugin.ts @@ -264,6 +264,7 @@ export class AlertingPlugin { encryptedSavedObjectsClient, getBasePath: this.getBasePath, eventLogger: this.eventLogger!, + internalSavedObjectsRepository: core.savedObjects.createInternalRepository(['alert']), }); this.eventLogService!.registerSavedObjectProvider('alert', (request) => { diff --git a/x-pack/plugins/alerts/server/routes/create.test.ts b/x-pack/plugins/alerts/server/routes/create.test.ts index 274acaf01c47..51c5d2525631 100644 --- a/x-pack/plugins/alerts/server/routes/create.test.ts +++ b/x-pack/plugins/alerts/server/routes/create.test.ts @@ -10,6 +10,7 @@ import { mockLicenseState } from '../lib/license_state.mock'; import { verifyApiAccess } from '../lib/license_api_access'; import { mockHandlerArguments } from './_mock_handler_arguments'; import { alertsClientMock } from '../alerts_client.mock'; +import { Alert } from '../../common/alert'; const alertsClient = alertsClientMock.create(); @@ -46,7 +47,7 @@ describe('createAlertRoute', () => { ], }; - const createResult = { + const createResult: Alert = { ...mockedAlert, enabled: true, muteAll: false, @@ -64,6 +65,10 @@ describe('createAlertRoute', () => { actionTypeId: 'test', }, ], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; it('creates an alert with proper parameters', async () => { diff --git a/x-pack/plugins/alerts/server/routes/get.test.ts b/x-pack/plugins/alerts/server/routes/get.test.ts index 8c4b06adf70f..c60177e90b79 100644 --- a/x-pack/plugins/alerts/server/routes/get.test.ts +++ b/x-pack/plugins/alerts/server/routes/get.test.ts @@ -10,6 +10,7 @@ import { mockLicenseState } from '../lib/license_state.mock'; import { verifyApiAccess } from '../lib/license_api_access'; import { mockHandlerArguments } from './_mock_handler_arguments'; import { alertsClientMock } from '../alerts_client.mock'; +import { Alert } from '../../common'; const alertsClient = alertsClientMock.create(); jest.mock('../lib/license_api_access.ts', () => ({ @@ -21,7 +22,7 @@ beforeEach(() => { }); describe('getAlertRoute', () => { - const mockedAlert = { + const mockedAlert: Alert = { id: '1', alertTypeId: '1', schedule: { interval: '10s' }, @@ -51,6 +52,10 @@ describe('getAlertRoute', () => { apiKeyOwner: '', throttle: '30s', mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; it('gets an alert with proper parameters', async () => { diff --git a/x-pack/plugins/alerts/server/saved_objects/index.ts b/x-pack/plugins/alerts/server/saved_objects/index.ts index 51ac68b58997..9aa1f86676ea 100644 --- a/x-pack/plugins/alerts/server/saved_objects/index.ts +++ b/x-pack/plugins/alerts/server/saved_objects/index.ts @@ -16,15 +16,19 @@ export const AlertAttributesExcludedFromAAD = [ 'muteAll', 'mutedInstanceIds', 'updatedBy', + 'executionStatus', ]; // useful for Pick which is a // type which is a subset of RawAlert with just attributes excluded from AAD + +// useful for Pick export type AlertAttributesExcludedFromAADType = | 'scheduledTaskId' | 'muteAll' | 'mutedInstanceIds' - | 'updatedBy'; + | 'updatedBy' + | 'executionStatus'; export function setupSavedObjects( savedObjects: SavedObjectsServiceSetup, @@ -42,11 +46,6 @@ export function setupSavedObjects( encryptedSavedObjects.registerType({ type: 'alert', attributesToEncrypt: new Set(['apiKey']), - attributesToExcludeFromAAD: new Set([ - 'scheduledTaskId', - 'muteAll', - 'mutedInstanceIds', - 'updatedBy', - ]), + attributesToExcludeFromAAD: new Set(AlertAttributesExcludedFromAAD), }); } diff --git a/x-pack/plugins/alerts/server/saved_objects/mappings.json b/x-pack/plugins/alerts/server/saved_objects/mappings.json index 8440b963975f..a6c92080f18b 100644 --- a/x-pack/plugins/alerts/server/saved_objects/mappings.json +++ b/x-pack/plugins/alerts/server/saved_objects/mappings.json @@ -83,6 +83,26 @@ "type": "keyword" } } + }, + "executionStatus": { + "properties": { + "status": { + "type": "keyword" + }, + "lastExecutionDate": { + "type": "date" + }, + "error": { + "properties": { + "reason": { + "type": "keyword" + }, + "message": { + "type": "keyword" + } + } + } + } } } } diff --git a/x-pack/plugins/alerts/server/saved_objects/migrations.test.ts b/x-pack/plugins/alerts/server/saved_objects/migrations.test.ts index 10e1a9ae421b..8c9d10769b18 100644 --- a/x-pack/plugins/alerts/server/saved_objects/migrations.test.ts +++ b/x-pack/plugins/alerts/server/saved_objects/migrations.test.ts @@ -177,7 +177,7 @@ describe('7.10.0', () => { }, ], }); - expect(migration710(alert, { log })).toEqual({ + expect(migration710(alert, { log })).toMatchObject({ ...alert, attributes: { ...alert.attributes, @@ -199,6 +199,32 @@ describe('7.10.0', () => { }, }); }); + + test('creates execution status', () => { + const migration710 = getMigrations(encryptedSavedObjectsSetup)['7.10.0']; + const alert = getMockData(); + const dateStart = Date.now(); + const migratedAlert = migration710(alert, { log }); + const dateStop = Date.now(); + const dateExecutionStatus = Date.parse( + migratedAlert.attributes.executionStatus.lastExecutionDate + ); + + expect(dateStart).toBeLessThanOrEqual(dateExecutionStatus); + expect(dateStop).toBeGreaterThanOrEqual(dateExecutionStatus); + + expect(migratedAlert).toMatchObject({ + ...alert, + attributes: { + ...alert.attributes, + executionStatus: { + lastExecutionDate: migratedAlert.attributes.executionStatus.lastExecutionDate, + status: 'pending', + error: null, + }, + }, + }); + }); }); describe('7.10.0 migrates with failure', () => { @@ -237,7 +263,7 @@ describe('7.10.0 migrates with failure', () => { function getMockData( overwrites: Record = {} -): SavedObjectUnsanitizedDoc { +): SavedObjectUnsanitizedDoc> { return { attributes: { enabled: true, diff --git a/x-pack/plugins/alerts/server/saved_objects/migrations.ts b/x-pack/plugins/alerts/server/saved_objects/migrations.ts index 537c21e85c0b..0b2c86b84f67 100644 --- a/x-pack/plugins/alerts/server/saved_objects/migrations.ts +++ b/x-pack/plugins/alerts/server/saved_objects/migrations.ts @@ -30,7 +30,11 @@ export function getMigrations( // migrate all documents in 7.10 in order to add the "meta" RBAC field return true; }, - pipeMigrations(markAsLegacyAndChangeConsumer, setAlertIdAsDefaultDedupkeyOnPagerDutyActions) + pipeMigrations( + markAsLegacyAndChangeConsumer, + setAlertIdAsDefaultDedupkeyOnPagerDutyActions, + initializeExecutionStatus + ) ); return { @@ -110,6 +114,23 @@ function setAlertIdAsDefaultDedupkeyOnPagerDutyActions( }; } +function initializeExecutionStatus( + doc: SavedObjectUnsanitizedDoc +): SavedObjectUnsanitizedDoc { + const { attributes } = doc; + return { + ...doc, + attributes: { + ...attributes, + executionStatus: { + status: 'pending', + lastExecutionDate: new Date().toISOString(), + error: null, + }, + }, + }; +} + function pipeMigrations(...migrations: AlertMigration[]): AlertMigration { return (doc: SavedObjectUnsanitizedDoc) => migrations.reduce((migratedDoc, nextMigration) => nextMigration(migratedDoc), doc); diff --git a/x-pack/plugins/alerts/server/saved_objects/partially_update_alert.ts b/x-pack/plugins/alerts/server/saved_objects/partially_update_alert.ts index cc25aaba3579..b829a6788a3d 100644 --- a/x-pack/plugins/alerts/server/saved_objects/partially_update_alert.ts +++ b/x-pack/plugins/alerts/server/saved_objects/partially_update_alert.ts @@ -15,7 +15,9 @@ import { import { AlertAttributesExcludedFromAAD, AlertAttributesExcludedFromAADType } from './index'; -export type PartiallyUpdateableAlertAttributes = Pick; +export type PartiallyUpdateableAlertAttributes = Partial< + Pick +>; export interface PartiallyUpdateAlertSavedObjectOptions { version?: string; diff --git a/x-pack/plugins/alerts/server/task_runner/alert_task_instance.test.ts b/x-pack/plugins/alerts/server/task_runner/alert_task_instance.test.ts index efac4c5dcdc0..cf0dd9d135e2 100644 --- a/x-pack/plugins/alerts/server/task_runner/alert_task_instance.test.ts +++ b/x-pack/plugins/alerts/server/task_runner/alert_task_instance.test.ts @@ -29,6 +29,10 @@ const alert: SanitizedAlert = { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; describe('Alert Task Instance', () => { diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts index 801d30b6406e..d9af3d0ae6d5 100644 --- a/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts +++ b/x-pack/plugins/alerts/server/task_runner/task_runner.test.ts @@ -11,14 +11,17 @@ import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server'; import { TaskRunnerContext } from './task_runner_factory'; import { TaskRunner } from './task_runner'; import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks'; -import { loggingSystemMock } from '../../../../../src/core/server/mocks'; +import { + loggingSystemMock, + savedObjectsRepositoryMock, +} from '../../../../../src/core/server/mocks'; import { PluginStartContract as ActionsPluginStart } from '../../../actions/server'; import { actionsMock, actionsClientMock } from '../../../actions/server/mocks'; import { alertsMock, alertsClientMock } from '../mocks'; import { eventLoggerMock } from '../../../event_log/server/event_logger.mock'; import { IEventLogger } from '../../../event_log/server'; import { SavedObjectsErrorHelpers } from '../../../../../src/core/server'; - +import { Alert } from '../../common'; const alertType = { id: 'test', name: 'My test alert', @@ -71,9 +74,10 @@ describe('Task Runner', () => { spaceIdToNamespace: jest.fn().mockReturnValue(undefined), getBasePath: jest.fn().mockReturnValue(undefined), eventLogger: eventLoggerMock.create(), + internalSavedObjectsRepository: savedObjectsRepositoryMock.create(), }; - const mockedAlertTypeSavedObject = { + const mockedAlertTypeSavedObject: Alert = { id: '1', consumer: 'bar', createdAt: new Date('2019-02-12T21:01:22.479Z'), @@ -82,6 +86,7 @@ describe('Task Runner', () => { muteAll: false, enabled: true, alertTypeId: '123', + apiKey: '', apiKeyOwner: 'elastic', schedule: { interval: '10s' }, name: 'alert-name', @@ -102,6 +107,10 @@ describe('Task Runner', () => { }, }, ], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; beforeEach(() => { diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner.ts b/x-pack/plugins/alerts/server/task_runner/task_runner.ts index 7ea3f83d747c..1ccf14a3a533 100644 --- a/x-pack/plugins/alerts/server/task_runner/task_runner.ts +++ b/x-pack/plugins/alerts/server/task_runner/task_runner.ts @@ -11,7 +11,13 @@ import { ConcreteTaskInstance } from '../../../task_manager/server'; import { createExecutionHandler } from './create_execution_handler'; import { AlertInstance, createAlertInstanceFactory } from '../alert_instance'; import { getNextRunAt } from './get_next_run_at'; -import { validateAlertTypeParams } from '../lib'; +import { + validateAlertTypeParams, + executionStatusFromState, + executionStatusFromError, + alertExecutionStatusToRaw, + ErrorWithReason, +} from '../lib'; import { AlertType, RawAlert, @@ -22,6 +28,7 @@ import { Alert, AlertExecutorOptions, SanitizedAlert, + AlertExecutionStatus, } from '../types'; import { promiseResult, map, Resultable, asOk, asErr, resolveErr } from '../lib/result_type'; import { taskInstanceToAlertTaskInstance } from './alert_task_instance'; @@ -29,6 +36,7 @@ import { EVENT_LOG_ACTIONS } from '../plugin'; import { IEvent, IEventLogger, SAVED_OBJECT_REL_PRIMARY } from '../../../event_log/server'; import { isAlertSavedObjectNotFoundError } from '../lib/is_alert_not_found_error'; import { AlertsClient } from '../alerts_client'; +import { partiallyUpdateAlert } from '../saved_objects'; const FALLBACK_RETRY_INTERVAL: IntervalSchedule = { interval: '5m' }; @@ -204,7 +212,7 @@ export class TaskRunner { event.event = event.event || {}; event.event.outcome = 'failure'; eventLogger.logEvent(event); - throw err; + throw new ErrorWithReason('execute', err); } eventLogger.stopTiming(event); @@ -278,15 +286,22 @@ export class TaskRunner { const { params: { alertId, spaceId }, } = this.taskInstance; + let apiKey: string | null; + try { + apiKey = await this.getApiKeyForAlertPermissions(alertId, spaceId); + } catch (err) { + throw new ErrorWithReason('decrypt', err); + } + const [services, alertsClient] = this.getServicesWithSpaceLevelPermissions(spaceId, apiKey); - const apiKey = await this.getApiKeyForAlertPermissions(alertId, spaceId); - const [services, alertsClient] = await this.getServicesWithSpaceLevelPermissions( - spaceId, - apiKey - ); + let alert: SanitizedAlert; // Ensure API key is still valid and user has access - const alert = await alertsClient.get({ id: alertId }); + try { + alert = await alertsClient.get({ id: alertId }); + } catch (err) { + throw new ErrorWithReason('read', err); + } return { state: await promiseResult( @@ -306,12 +321,38 @@ export class TaskRunner { async run(): Promise { const { - params: { alertId }, + params: { alertId, spaceId }, startedAt: previousStartedAt, state: originalState, } = this.taskInstance; const { state, runAt } = await errorAsAlertTaskRunResult(this.loadAlertAttributesAndRun()); + const namespace = spaceId === 'default' ? undefined : spaceId; + + const executionStatus: AlertExecutionStatus = map( + state, + (alertTaskState: AlertTaskState) => executionStatusFromState(alertTaskState), + (err: Error) => executionStatusFromError(err) + ); + this.logger.debug( + `alertExecutionStatus for ${this.alertType.id}:${alertId}: ${JSON.stringify(executionStatus)}` + ); + + const client = this.context.internalSavedObjectsRepository; + const attributes = { + executionStatus: alertExecutionStatusToRaw(executionStatus), + }; + + try { + await partiallyUpdateAlert(client, alertId, attributes, { + ignore404: true, + namespace, + }); + } catch (err) { + this.logger.error( + `error updating alert execution status for ${this.alertType.id}:${alertId} ${err.message}` + ); + } return { state: map( diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts index 9af7d9ddc44e..5da8e4296f4d 100644 --- a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts +++ b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.test.ts @@ -8,7 +8,10 @@ import sinon from 'sinon'; import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server'; import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory'; import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks'; -import { loggingSystemMock } from '../../../../../src/core/server/mocks'; +import { + loggingSystemMock, + savedObjectsRepositoryMock, +} from '../../../../../src/core/server/mocks'; import { actionsMock } from '../../../actions/server/mocks'; import { alertsMock, alertsClientMock } from '../mocks'; import { eventLoggerMock } from '../../../event_log/server/event_logger.mock'; @@ -63,6 +66,7 @@ describe('Task Runner Factory', () => { spaceIdToNamespace: jest.fn().mockReturnValue(undefined), getBasePath: jest.fn().mockReturnValue(undefined), eventLogger: eventLoggerMock.create(), + internalSavedObjectsRepository: savedObjectsRepositoryMock.create(), }; beforeEach(() => { diff --git a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts index 6f83e34cdbe0..944c4dc64ce7 100644 --- a/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts +++ b/x-pack/plugins/alerts/server/task_runner/task_runner_factory.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { Logger, KibanaRequest } from '../../../../../src/core/server'; +import { Logger, KibanaRequest, ISavedObjectsRepository } from '../../../../../src/core/server'; import { RunContext } from '../../../task_manager/server'; import { EncryptedSavedObjectsClient } from '../../../encrypted_saved_objects/server'; import { PluginStartContract as ActionsPluginStartContract } from '../../../actions/server'; @@ -26,6 +26,7 @@ export interface TaskRunnerContext { encryptedSavedObjectsClient: EncryptedSavedObjectsClient; spaceIdToNamespace: SpaceIdToNamespaceFunction; getBasePath: GetBasePathFunction; + internalSavedObjectsRepository: ISavedObjectsRepository; } export class TaskRunnerFactory { diff --git a/x-pack/plugins/alerts/server/types.ts b/x-pack/plugins/alerts/server/types.ts index 8d568e8b7ecd..03d41724213c 100644 --- a/x-pack/plugins/alerts/server/types.ts +++ b/x-pack/plugins/alerts/server/types.ts @@ -24,6 +24,8 @@ import { AlertTypeState, AlertInstanceContext, AlertInstanceState, + AlertExecutionStatuses, + AlertExecutionStatusErrorReasons, } from '../common'; export type WithoutQueryAndParams = Pick>; @@ -115,6 +117,18 @@ export interface AlertMeta extends SavedObjectAttributes { versionApiKeyLastmodified?: string; } +// note that the `error` property is "null-able", as we're doing a partial +// update on the alert when we update this data, but need to ensure we +// delete any previous error if the current status has no error +export interface RawAlertExecutionStatus extends SavedObjectAttributes { + status: AlertExecutionStatuses; + lastExecutionDate: string; + error: null | { + reason: AlertExecutionStatusErrorReasons; + message: string; + }; +} + export type PartialAlert = Pick & Partial>; export interface RawAlert extends SavedObjectAttributes { @@ -136,6 +150,7 @@ export interface RawAlert extends SavedObjectAttributes { muteAll: boolean; mutedInstanceIds: string[]; meta?: AlertMeta; + executionStatus: RawAlertExecutionStatus; } export type AlertInfoParams = Pick< diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts index 5d9cfb4bb449..9081831c4549 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts @@ -419,6 +419,10 @@ export const getResult = (): RuleAlertType => ({ muteAll: false, mutedInstanceIds: [], scheduledTaskId: '2dabe330-0702-11ea-8b50-773b89126888', + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }); export const getMlResult = (): RuleAlertType => { @@ -630,6 +634,10 @@ export const getNotificationResult = (): RuleNotificationAlertType => ({ mutedInstanceIds: [], scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7', updatedAt: new Date('2020-03-21T12:37:08.730Z'), + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }); export const getFindNotificationsResultWithSingleHit = (): FindHit => ({ diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts index aeb136a969aa..8672c85f9842 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts @@ -110,6 +110,10 @@ const rule: SanitizedAlert = { muteAll: false, mutedInstanceIds: [], scheduledTaskId: '2dabe330-0702-11ea-8b50-773b89126888', + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; export const getPatchRulesOptionsMock = (): PatchRulesOptions => ({ diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts index fc5d301cb7cd..f6cefb77a240 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.test.ts @@ -398,6 +398,10 @@ describe('createAlert', () => { updatedBy: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; http.post.mockResolvedValueOnce(resolvedValue); @@ -440,6 +444,10 @@ describe('updateAlert', () => { updatedBy: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; http.put.mockResolvedValueOnce(resolvedValue); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts index 97feea6ba8a0..d5711a3e8c91 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts +++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api.ts @@ -136,7 +136,10 @@ export async function createAlert({ alert, }: { http: HttpSetup; - alert: Omit; + alert: Omit< + AlertWithoutId, + 'createdBy' | 'updatedBy' | 'muteAll' | 'mutedInstanceIds' | 'executionStatus' + >; }): Promise { return await http.post(`${BASE_ALERT_API_PATH}/alert`, { body: JSON.stringify(alert), diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx index 16d1a5c7c9c6..5c9969221cfc 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx @@ -757,6 +757,10 @@ function mockAlert(overloads: Partial = {}): Alert { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, ...overloads, }; } diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx index 7a40104e97d9..5ed924c37fe7 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details_route.test.tsx @@ -404,6 +404,10 @@ function mockAlert(overloads: Partial = {}): Alert { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, ...overloads, }; } diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx index f59b836a7936..2c1020ff1d5b 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances.test.tsx @@ -254,6 +254,10 @@ function mockAlert(overloads: Partial = {}): Alert { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, ...overloads, }; } diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx index d92148a8fea5..603f06d0bbae 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_instances_route.test.tsx @@ -132,6 +132,10 @@ function mockAlert(overloads: Partial = {}): Alert { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, ...overloads, }; } diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx index 54d335aaba5a..7e43fd22ff8c 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx @@ -105,6 +105,10 @@ function mockAlert(overloads: Partial = {}): Alert { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, ...overloads, }; } diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx index e408c7fcb814..24eb7aabb954 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx @@ -8,7 +8,7 @@ import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers'; import { act } from 'react-dom/test-utils'; import { coreMock } from '../../../../../../../src/core/public/mocks'; import { actionTypeRegistryMock } from '../../action_type_registry.mock'; -import { ValidationResult } from '../../../types'; +import { ValidationResult, Alert } from '../../../types'; import { AlertsContextProvider } from '../../context/alerts_context'; import { alertTypeRegistryMock } from '../../alert_type_registry.mock'; import { ReactWrapper } from 'enzyme'; @@ -73,7 +73,7 @@ describe('alert_edit', () => { actionParamsFields: null, }; - const alert = { + const alert: Alert = { id: 'ab5661e0-197e-45ee-b477-302d89193b5e', params: { aggType: 'average', @@ -93,7 +93,6 @@ describe('alert_edit', () => { actionTypeId: 'my-action-type', group: 'threshold met', params: { message: 'Alert [{{ctx.metadata.name}}] has exceeded the threshold' }, - message: 'Alert [{{ctx.metadata.name}}] has exceeded the threshold', id: '917f5d41-fbc4-4056-a8ad-ac592f7dcee2', }, ], @@ -107,6 +106,10 @@ describe('alert_edit', () => { muteAll: false, mutedInstanceIds: [], updatedAt: new Date(), + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, }; actionTypeRegistry.get.mockReturnValueOnce(actionTypeModel); actionTypeRegistry.has.mockReturnValue(true); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.test.tsx index 074e2d5147b5..72d4f8857a61 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/common/components/with_bulk_alert_api_operations.test.tsx @@ -264,6 +264,10 @@ function mockAlert(overloads: Partial = {}): Alert { throttle: null, muteAll: false, mutedInstanceIds: [], + executionStatus: { + status: 'unknown', + lastExecutionDate: new Date('2020-08-20T19:23:38Z'), + }, ...overloads, }; } diff --git a/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts b/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts index 9495dd4cfae8..6124a5fb7c35 100644 --- a/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts +++ b/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts @@ -15,3 +15,21 @@ export function ensureDatetimeIsWithinRange( expect(diff).to.be.greaterThan(expectedDiff - buffer); expect(diff).to.be.lessThan(expectedDiff + buffer); } + +export function ensureDatetimesAreOrdered(dates: Array) { + const dateStrings = dates.map(normalizeDate); + const sortedDateStrings = dateStrings.slice().sort(); + expect(dateStrings).to.eql(sortedDateStrings); +} + +function normalizeDate(date: Date | string | number): string { + if (typeof date === 'number') return new Date(date).toISOString(); + if (date instanceof Date) return date.toISOString(); + + const dateString = `${date}`; + const dateNumber = Date.parse(dateString); + if (isNaN(dateNumber)) { + throw new Error(`invalid date string: "${dateString}"`); + } + return new Date(dateNumber).toISOString(); +} diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts index 983f87405a1a..19d90378e8b7 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts @@ -119,6 +119,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) { apiKeyOwner: user.username, muteAll: false, mutedInstanceIds: [], + executionStatus: response.body.executionStatus, }); expect(typeof response.body.scheduledTaskId).to.be('string'); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts new file mode 100644 index 000000000000..8fb89042e4a9 --- /dev/null +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/execution_status.ts @@ -0,0 +1,87 @@ +/* + * 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 { Spaces } from '../../scenarios'; +import { getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +// eslint-disable-next-line import/no-default-export +export default function executionStatusAlertTests({ getService }: FtrProviderContext) { + const supertest = getService('supertest'); + const spaceId = Spaces[0].id; + + // the only tests here are those that can't be run in spaces_only + describe('executionStatus', () => { + const objectRemover = new ObjectRemover(supertest); + + after(async () => await objectRemover.removeAll()); + + it('should eventually have error reason "decrypt" when appropriate', async () => { + const response = await supertest + .post(`${getUrlPrefix(spaceId)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.noop', + schedule: { interval: '1s' }, + }) + ); + expect(response.status).to.eql(200); + const alertId = response.body.id; + objectRemover.add(spaceId, alertId, 'alert', 'alerts'); + + let executionStatus = await waitForStatus(alertId, new Set(['ok']), 10000); + + // break AAD + await supertest + .put(`${getUrlPrefix(spaceId)}/api/alerts_fixture/saved_object/alert/${alertId}`) + .set('kbn-xsrf', 'foo') + .send({ + attributes: { + name: 'bar', + }, + }) + .expect(200); + + executionStatus = await waitForStatus(alertId, new Set(['error'])); + expect(executionStatus.error).to.be.ok(); + expect(executionStatus.error.reason).to.be('decrypt'); + expect(executionStatus.error.message).to.be('Unable to decrypt attribute "apiKey"'); + }); + }); + + const WaitForStatusIncrement = 500; + + async function waitForStatus( + id: string, + statuses: Set, + waitMillis: number = 10000 + ): Promise> { + if (waitMillis < 0) { + expect().fail(`waiting for alert ${id} statuses ${Array.from(statuses)} timed out`); + } + + const response = await supertest.get(`${getUrlPrefix(spaceId)}/api/alerts/alert/${id}`); + expect(response.status).to.eql(200); + const { status } = response.body.executionStatus; + if (statuses.has(status)) return response.body.executionStatus; + + // eslint-disable-next-line no-console + console.log( + `waitForStatus(${Array.from(statuses)}): got ${JSON.stringify( + response.body.executionStatus + )}, retrying` + ); + + await delay(WaitForStatusIncrement); + return await waitForStatus(id, statuses, waitMillis - WaitForStatusIncrement); + } +} + +async function delay(millis: number): Promise { + await new Promise((resolve) => setTimeout(resolve, millis)); +} diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts index 268212d4294d..adfe5cd27b33 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/find.ts @@ -79,6 +79,7 @@ export default function createFindTests({ getService }: FtrProviderContext) { apiKeyOwner: 'elastic', muteAll: false, mutedInstanceIds: [], + executionStatus: match.executionStatus, }); expect(Date.parse(match.createdAt)).to.be.greaterThan(0); expect(Date.parse(match.updatedAt)).to.be.greaterThan(0); @@ -273,6 +274,7 @@ export default function createFindTests({ getService }: FtrProviderContext) { mutedInstanceIds: [], createdAt: match.createdAt, updatedAt: match.updatedAt, + executionStatus: match.executionStatus, }); expect(Date.parse(match.createdAt)).to.be.greaterThan(0); expect(Date.parse(match.updatedAt)).to.be.greaterThan(0); @@ -359,6 +361,85 @@ export default function createFindTests({ getService }: FtrProviderContext) { } }); + it('should handle find alert request with executionStatus field appropriately', async () => { + const myTag = uuid.v4(); + const { body: createdAlert } = await supertest + .post(`${getUrlPrefix(space.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + enabled: false, + tags: [myTag], + alertTypeId: 'test.restricted-noop', + consumer: 'alertsRestrictedFixture', + }) + ) + .expect(200); + objectRemover.add(space.id, createdAlert.id, 'alert', 'alerts'); + + // create another type with same tag + const { body: createdSecondAlert } = await supertest + .post(`${getUrlPrefix(space.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + tags: [myTag], + alertTypeId: 'test.restricted-noop', + consumer: 'alertsRestrictedFixture', + }) + ) + .expect(200); + objectRemover.add(space.id, createdSecondAlert.id, 'alert', 'alerts'); + + const response = await supertestWithoutAuth + .get( + `${getUrlPrefix( + space.id + )}/api/alerts/_find?filter=alert.attributes.alertTypeId:test.restricted-noop&fields=["tags","executionStatus"]&sort_field=createdAt` + ) + .auth(user.username, user.password); + + switch (scenario.id) { + case 'no_kibana_privileges at space1': + case 'space_1_all at space2': + expect(response.statusCode).to.eql(403); + expect(response.body).to.eql({ + error: 'Forbidden', + message: `Unauthorized to find any alert types`, + statusCode: 403, + }); + break; + case 'space_1_all at space1': + case 'space_1_all_alerts_none_actions at space1': + expect(response.statusCode).to.eql(200); + expect(response.body.data).to.eql([]); + break; + case 'global_read at space1': + case 'superuser at space1': + case 'space_1_all_with_restricted_fixture at space1': + expect(response.statusCode).to.eql(200); + expect(response.body.page).to.equal(1); + expect(response.body.perPage).to.be.greaterThan(0); + expect(response.body.total).to.be.greaterThan(0); + const [matchFirst, matchSecond] = response.body.data; + expect(omit(matchFirst, 'updatedAt')).to.eql({ + id: createdAlert.id, + actions: [], + tags: [myTag], + executionStatus: matchFirst.executionStatus, + }); + expect(omit(matchSecond, 'updatedAt')).to.eql({ + id: createdSecondAlert.id, + actions: [], + tags: [myTag], + executionStatus: matchSecond.executionStatus, + }); + break; + default: + throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`); + } + }); + it(`shouldn't find alert from another space`, async () => { const { body: createdAlert } = await supertest .post(`${getUrlPrefix(space.id)}/api/alerts/alert`) diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts index 1043ece08a2a..93e9be771ab5 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/get.ts @@ -75,6 +75,7 @@ export default function createGetTests({ getService }: FtrProviderContext) { apiKeyOwner: 'elastic', muteAll: false, mutedInstanceIds: [], + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts index fa0130780cb6..1fbee9e18fda 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/index.ts @@ -14,6 +14,7 @@ export default function alertingTests({ loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./delete')); loadTestFile(require.resolve('./disable')); loadTestFile(require.resolve('./enable')); + loadTestFile(require.resolve('./execution_status')); loadTestFile(require.resolve('./get')); loadTestFile(require.resolve('./get_alert_state')); loadTestFile(require.resolve('./get_alert_instance_summary')); diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts index 48269cc1c449..d75aa868253d 100644 --- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts +++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts @@ -129,6 +129,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) { scheduledTaskId: createdAlert.scheduledTaskId, createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); @@ -211,6 +212,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) { scheduledTaskId: createdAlert.scheduledTaskId, createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); @@ -304,6 +306,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) { scheduledTaskId: createdAlert.scheduledTaskId, createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); @@ -397,6 +400,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) { scheduledTaskId: createdAlert.scheduledTaskId, createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); @@ -486,6 +490,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) { scheduledTaskId: createdAlert.scheduledTaskId, createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts index 86775f77a767..41f6b66c30aa 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts @@ -87,6 +87,7 @@ export default function createAlertTests({ getService }: FtrProviderContext) { mutedInstanceIds: [], createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts new file mode 100644 index 000000000000..ac63fe8faadc --- /dev/null +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/execution_status.ts @@ -0,0 +1,333 @@ +/* + * 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 { Spaces } from '../../scenarios'; +import { + checkAAD, + getUrlPrefix, + getTestAlertData, + ObjectRemover, + ensureDatetimesAreOrdered, +} from '../../../common/lib'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +// eslint-disable-next-line import/no-default-export +export default function executionStatusAlertTests({ getService }: FtrProviderContext) { + const supertest = getService('supertest'); + + describe('executionStatus', () => { + const objectRemover = new ObjectRemover(supertest); + + after(async () => await objectRemover.removeAll()); + + it('should be "pending" for newly created alert', async () => { + const dateStart = Date.now(); + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send(getTestAlertData()); + const dateEnd = Date.now(); + expect(response.status).to.eql(200); + objectRemover.add(Spaces.space1.id, response.body.id, 'alert', 'alerts'); + + expect(response.body.executionStatus).to.be.ok(); + const { status, lastExecutionDate, error } = response.body.executionStatus; + expect(status).to.be('pending'); + ensureDatetimesAreOrdered([dateStart, lastExecutionDate, dateEnd]); + expect(error).not.to.be.ok(); + + // Ensure AAD isn't broken + await checkAAD({ + supertest, + spaceId: Spaces.space1.id, + type: 'alert', + id: response.body.id, + }); + }); + + it('should eventually be "ok" for no-op alert', async () => { + const dates = []; + dates.push(Date.now()); + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.noop', + schedule: { interval: '1s' }, + }) + ); + expect(response.status).to.eql(200); + const alertId = response.body.id; + dates.push(response.body.executionStatus.lastExecutionDate); + dates.push(Date.now()); + objectRemover.add(Spaces.space1.id, alertId, 'alert', 'alerts'); + + const executionStatus = await waitForStatus(alertId, new Set(['ok'])); + dates.push(executionStatus.lastExecutionDate); + dates.push(Date.now()); + ensureDatetimesAreOrdered(dates); + + // Ensure AAD isn't broken + await checkAAD({ + supertest, + spaceId: Spaces.space1.id, + type: 'alert', + id: response.body.id, + }); + }); + + it('should eventually be "active" for firing alert', async () => { + const dates = []; + dates.push(Date.now()); + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.patternFiring', + schedule: { interval: '1s' }, + params: { + pattern: { instance: trues(100) }, + }, + }) + ); + expect(response.status).to.eql(200); + const alertId = response.body.id; + dates.push(response.body.executionStatus.lastExecutionDate); + dates.push(Date.now()); + objectRemover.add(Spaces.space1.id, alertId, 'alert', 'alerts'); + + const executionStatus = await waitForStatus(alertId, new Set(['active'])); + dates.push(executionStatus.lastExecutionDate); + dates.push(Date.now()); + ensureDatetimesAreOrdered(dates); + + // Ensure AAD isn't broken + await checkAAD({ + supertest, + spaceId: Spaces.space1.id, + type: 'alert', + id: response.body.id, + }); + }); + + it('should eventually be "error" for an error alert', async () => { + const dates = []; + dates.push(Date.now()); + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.throw', + schedule: { interval: '1s' }, + }) + ); + expect(response.status).to.eql(200); + const alertId = response.body.id; + dates.push(response.body.executionStatus.lastExecutionDate); + dates.push(Date.now()); + objectRemover.add(Spaces.space1.id, alertId, 'alert', 'alerts'); + + const executionStatus = await waitForStatus(alertId, new Set(['error'])); + dates.push(executionStatus.lastExecutionDate); + dates.push(Date.now()); + ensureDatetimesAreOrdered(dates); + + // Ensure AAD isn't broken + await checkAAD({ + supertest, + spaceId: Spaces.space1.id, + type: 'alert', + id: response.body.id, + }); + }); + + // not sure how to test the read error reason! + + // note the decrypt error reason is tested in security_and_spaces, can't be tested + // without security on + + it('should eventually have error reason "execute" when appropriate', async () => { + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.throw', + schedule: { interval: '1s' }, + }) + ); + expect(response.status).to.eql(200); + const alertId = response.body.id; + objectRemover.add(Spaces.space1.id, alertId, 'alert', 'alerts'); + + const executionStatus = await waitForStatus(alertId, new Set(['error'])); + expect(executionStatus.error).to.be.ok(); + expect(executionStatus.error.reason).to.be('execute'); + expect(executionStatus.error.message).to.be('this alert is intended to fail'); + }); + + it('should eventually have error reason "unknown" when appropriate', async () => { + const response = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.validation', + schedule: { interval: '1s' }, + params: { param1: 'valid now, but will change to a number soon!' }, + }) + ); + expect(response.status).to.eql(200); + const alertId = response.body.id; + objectRemover.add(Spaces.space1.id, alertId, 'alert', 'alerts'); + + let executionStatus = await waitForStatus(alertId, new Set(['ok'])); + + // break the validation of the params + await supertest + .put(`${getUrlPrefix(Spaces.space1.id)}/api/alerts_fixture/saved_object/alert/${alertId}`) + .set('kbn-xsrf', 'foo') + .send({ + attributes: { + params: { param1: 42 }, + }, + }) + .expect(200); + + executionStatus = await waitForStatus(alertId, new Set(['error'])); + expect(executionStatus.error).to.be.ok(); + expect(executionStatus.error.reason).to.be('unknown'); + + const message = 'params invalid: [param1]: expected value of type [string] but got [number]'; + expect(executionStatus.error.message).to.be(message); + }); + + it('should be able to find over all the fields', async () => { + const startDate = Date.now(); + const createResponse = await supertest + .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert`) + .set('kbn-xsrf', 'foo') + .send( + getTestAlertData({ + alertTypeId: 'test.throw', + schedule: { interval: '1s' }, + }) + ); + expect(createResponse.status).to.eql(200); + const alertId = createResponse.body.id; + objectRemover.add(Spaces.space1.id, alertId, 'alert', 'alerts'); + + await waitForStatus(alertId, new Set(['error'])); + + let filter = `lastExecutionDate>${startDate}`; + let executionStatus = await waitForFindStatus(alertId, new Set(['error']), filter); + expectErrorExecutionStatus(executionStatus, startDate); + + filter = `status:error`; + executionStatus = await waitForFindStatus(alertId, new Set(['error']), filter); + expectErrorExecutionStatus(executionStatus, startDate); + + filter = `error.message:*intended*`; + executionStatus = await waitForFindStatus(alertId, new Set(['error']), filter); + expectErrorExecutionStatus(executionStatus, startDate); + + filter = `error.reason:execute`; + executionStatus = await waitForFindStatus(alertId, new Set(['error']), filter); + expectErrorExecutionStatus(executionStatus, startDate); + }); + }); + + const WaitForStatusIncrement = 500; + + async function waitForStatus( + id: string, + statuses: Set, + waitMillis: number = 10000 + ): Promise> { + if (waitMillis < 0) { + expect().fail(`waiting for alert ${id} statuses ${Array.from(statuses)} timed out`); + } + + const response = await supertest.get( + `${getUrlPrefix(Spaces.space1.id)}/api/alerts/alert/${id}` + ); + expect(response.status).to.eql(200); + const { status } = response.body.executionStatus; + + const message = `waitForStatus(${Array.from(statuses)}): got ${JSON.stringify( + response.body.executionStatus + )}`; + + if (statuses.has(status)) { + return response.body.executionStatus; + } + + // eslint-disable-next-line no-console + console.log(`${message}, retrying`); + + await delay(WaitForStatusIncrement); + return await waitForStatus(id, statuses, waitMillis - WaitForStatusIncrement); + } + + async function waitForFindStatus( + id: string, + statuses: Set, + filter: string, + waitMillis: number = 10000 + ): Promise> { + if (waitMillis < 0) { + expect().fail(`waiting for find alert ${id} statuses ${Array.from(statuses)} timed out`); + } + + const findUri = getFindUri(filter); + const response = await supertest.get(`${getUrlPrefix(Spaces.space1.id)}/${findUri}`); + + expect(response.status).to.eql(200); + const { executionStatus } = response.body.data.find((obj: any) => obj.id === id); + + const message = `waitForFindStatus(${Array.from(statuses)}): got ${JSON.stringify( + executionStatus + )}`; + + if (statuses.has(executionStatus.status)) { + return executionStatus; + } + + // eslint-disable-next-line no-console + console.log(`${message}, retrying`); + + await delay(WaitForStatusIncrement); + return await waitForStatus(id, statuses, waitMillis - WaitForStatusIncrement); + } +} + +function expectErrorExecutionStatus(executionStatus: Record, startDate: number) { + expect(executionStatus.status).to.equal('error'); + + const statusDate = Date.parse(executionStatus.lastExecutionDate); + const stopDate = Date.now(); + expect(startDate).to.be.lessThan(statusDate); + expect(stopDate).to.be.greaterThan(statusDate); + + expect(executionStatus.error.message).to.equal('this alert is intended to fail'); + expect(executionStatus.error.reason).to.equal('execute'); +} + +function getFindUri(filter: string) { + return `api/alerts/_find?filter=alert.attributes.executionStatus.${filter}`; +} + +function trues(length: number): boolean[] { + return new Array(length).fill(true); +} + +async function delay(millis: number): Promise { + await new Promise((resolve) => setTimeout(resolve, millis)); +} diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts index b28ce89b3047..850ec24789f5 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/find.ts @@ -56,6 +56,7 @@ export default function createFindTests({ getService }: FtrProviderContext) { mutedInstanceIds: [], createdAt: match.createdAt, updatedAt: match.updatedAt, + executionStatus: match.executionStatus, }); expect(Date.parse(match.createdAt)).to.be.greaterThan(0); expect(Date.parse(match.updatedAt)).to.be.greaterThan(0); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts index 165eaa09126a..14a57f57c923 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get.ts @@ -50,6 +50,7 @@ export default function createGetTests({ getService }: FtrProviderContext) { mutedInstanceIds: [], createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts index 1907eed72805..a80970788e51 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts @@ -23,6 +23,7 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC loadTestFile(require.resolve('./get_alert_instance_summary')); loadTestFile(require.resolve('./list_alert_types')); loadTestFile(require.resolve('./event_log')); + loadTestFile(require.resolve('./execution_status')); loadTestFile(require.resolve('./mute_all')); loadTestFile(require.resolve('./mute_instance')); loadTestFile(require.resolve('./unmute_all')); diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts index 9c8e6f6b8d94..f44a7d713187 100644 --- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts +++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts @@ -57,6 +57,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) { scheduledTaskId: createdAlert.scheduledTaskId, createdAt: response.body.createdAt, updatedAt: response.body.updatedAt, + executionStatus: response.body.executionStatus, }); expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0); expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0); diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts index 1dba1a154373..5d82eed41d3c 100644 --- a/x-pack/test/detection_engine_api_integration/utils.ts +++ b/x-pack/test/detection_engine_api_integration/utils.ts @@ -248,16 +248,25 @@ export const getSimpleMlRuleOutput = (ruleId = 'rule-1'): Partial = export const deleteAllAlerts = async (es: Client, retryCount = 20): Promise => { if (retryCount > 0) { try { - await es.deleteByQuery({ + const result = await es.deleteByQuery({ index: '.kibana', q: 'type:alert', wait_for_completion: true, refresh: true, + conflicts: 'proceed', body: {}, }); + // deleteByQuery will cause version conflicts as alerts are being updated + // by background processes; the code below accounts for that + if (result.body.version_conflicts !== 0) { + throw new Error(`Version conflicts for ${result.body.version_conflicts} alerts`); + } } catch (err) { // eslint-disable-next-line no-console - console.log(`Failure trying to deleteAllAlerts, retries left are: ${retryCount - 1}`, err); + console.log(`Error in deleteAllAlerts(), retries left: ${retryCount - 1}`, err); + + // retry, counting down, and delay a bit before + await new Promise((resolve) => setTimeout(resolve, 250)); await deleteAllAlerts(es, retryCount - 1); } } else { From d6c712842d86482d23534298315d3f849384496d Mon Sep 17 00:00:00 2001 From: Frank Hassanabad Date: Thu, 1 Oct 2020 16:31:00 -0600 Subject: [PATCH 08/73] [Security Solution][Detection Engine] Adds threat matching to the rule creator (#78955) ## Summary This adds threat matching rule type to the rule creator. Screen shot of creating a threat match Screen Shot 2020-09-30 at 3 31 09 PM --- Screen shot of the description after creating one Screen Shot 2020-09-30 at 3 29 32 PM --- Screen shot of first creating a threat match without values filled out Screen Shot 2020-09-30 at 3 27 29 PM Additions and bug fixes: * Changes the threat index to be an array * Adds a threat_language to the REST schema so that we can use KQL, Lucene, (others in the future) * Adds plumbing for threat_list to work with the other REST endpoints such as PUT, PATCH, etc... * Adds the AND, OR dialog and user interface **Usage** If you are a team member using the team servers you can skip this usage section of creating threat index. Otherwise if you want to know how to create a mock threat index, instructions are below. Go to the folder: ```ts /kibana/x-pack/plugins/security_solution/server/lib/detection_engine/scripts ``` And post a small ECS threat mapping to the index called `mock-threat-list`: ```ts ./create_threat_mapping.sh ``` Then to post a small number of threats that represent simple port numbers you can run: ```ts ./create_threat_data.sh ``` However, feel free to also manually create them directly in your dev tools like so: ```ts # Posts a threat list item called some-name with an IP but change these out for valid data in your system PUT mock-threat-list-1/_doc/9999 { "@timestamp": "2020-09-09T20:30:45.725Z", "host": { "name": "some-name", "ip": "127.0.0.1" } } ``` ```ts # Posts a destination port number to watch PUT mock-threat-list-1/_doc/10000 { "@timestamp": "2020-09-08T20:30:45.725Z", "destination": { "port": "443" } } ``` ```ts # Posts a source port number to watch PUT mock-threat-list-1/_doc/10001 { "@timestamp": "2020-09-08T20:30:45.725Z", "source": { "port": "443" } } ``` ### Checklist - [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md) - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist) - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server) - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers) --- .../add_prepackaged_rules_schema.mock.ts | 4 +- .../request/add_prepackaged_rules_schema.ts | 2 + .../request/create_rules_schema.mock.ts | 4 +- .../schemas/request/create_rules_schema.ts | 2 + .../request/import_rules_schema.mock.ts | 4 +- .../schemas/request/import_rules_schema.ts | 2 + .../schemas/request/patch_rules_schema.ts | 12 + .../schemas/request/update_rules_schema.ts | 12 + .../schemas/response/rules_schema.mocks.ts | 2 +- .../schemas/response/rules_schema.test.ts | 4 +- .../schemas/response/rules_schema.ts | 3 + .../detection_engine/schemas/types/index.ts | 1 + .../schemas/types/threat_mapping.ts | 40 +- .../threat_match/and_badge.test.tsx | 46 +++ .../components/threat_match/and_badge.tsx | 50 +++ .../threat_match/entry_delete_button.test.tsx | 123 ++++++ .../threat_match/entry_delete_button.tsx | 67 +++ .../threat_match/entry_item.test.tsx | 130 ++++++ .../components/threat_match/entry_item.tsx | 131 ++++++ .../components/threat_match/helpers.test.tsx | 225 +++++++++++ .../components/threat_match/helpers.tsx | 171 ++++++++ .../components/threat_match/index.test.tsx | 304 ++++++++++++++ .../common/components/threat_match/index.tsx | 220 ++++++++++ .../threat_match/list_item.test.tsx | 382 ++++++++++++++++++ .../components/threat_match/list_item.tsx | 120 ++++++ .../threat_match/logic_buttons.stories.tsx | 49 +++ .../threat_match/logic_buttons.test.tsx | 90 +++++ .../components/threat_match/logic_buttons.tsx | 55 +++ .../components/threat_match/reducer.test.ts | 101 +++++ .../common/components/threat_match/reducer.ts | 51 +++ .../components/threat_match/translations.ts | 37 ++ .../common/components/threat_match/types.ts | 26 ++ .../rules/description_step/helpers.tsx | 42 +- .../rules/description_step/index.tsx | 22 +- .../rules/description_step/translations.tsx | 7 + .../rules/description_step/types.ts | 1 + .../rules/select_rule_type/index.tsx | 23 ++ .../rules/select_rule_type/translations.ts | 14 + .../rules/step_define_rule/index.tsx | 63 ++- .../rules/step_define_rule/schema.tsx | 136 ++++++- .../rules/step_define_rule/translations.tsx | 21 + .../rules/threatmatch_input/index.tsx | 114 ++++++ .../rules/threatmatch_input/translations.ts | 14 + .../detection_engine/rules/types.ts | 14 +- .../rules/all/__mocks__/mock.ts | 3 + .../detection_engine/rules/create/helpers.ts | 80 +++- .../detection_engine/rules/create/index.tsx | 8 +- .../detection_engine/rules/helpers.test.tsx | 30 ++ .../pages/detection_engine/rules/helpers.tsx | 8 +- .../pages/detection_engine/rules/types.ts | 9 +- .../routes/__mocks__/request_responses.ts | 1 + .../routes/rules/create_rules_bulk_route.ts | 2 + .../routes/rules/create_rules_route.ts | 2 + .../routes/rules/import_rules_route.ts | 9 +- .../routes/rules/patch_rules_bulk_route.ts | 10 + .../routes/rules/patch_rules_route.ts | 10 + .../routes/rules/update_rules_bulk_route.ts | 10 + .../routes/rules/update_rules_route.ts | 10 + .../routes/rules/utils.test.ts | 4 +- .../detection_engine/routes/rules/utils.ts | 1 + .../rules/create_rules.mock.ts | 2 + .../detection_engine/rules/create_rules.ts | 2 + .../rules/install_prepacked_rules.ts | 2 + .../rules/patch_rules.mock.ts | 10 + .../lib/detection_engine/rules/patch_rules.ts | 15 + .../lib/detection_engine/rules/types.ts | 12 + .../rules/update_prepacked_rules.ts | 10 + .../rules/update_rules.mock.ts | 10 + .../detection_engine/rules/update_rules.ts | 15 + .../lib/detection_engine/rules/utils.test.ts | 15 + .../lib/detection_engine/rules/utils.ts | 14 +- .../queries/query_with_threat_mapping.json | 2 +- .../signals/__mocks__/es_results.ts | 1 + .../detection_engine/signals/build_rule.ts | 1 + .../signals/signal_params_schema.ts | 3 +- .../signals/signal_rule_alert_type.ts | 2 + .../threat_mapping/create_threat_signal.ts | 4 +- .../threat_mapping/create_threat_signals.ts | 5 +- .../signals/threat_mapping/get_threat_list.ts | 9 +- .../signals/threat_mapping/types.ts | 9 +- .../server/lib/detection_engine/types.ts | 2 + 81 files changed, 3224 insertions(+), 59 deletions(-) create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/index.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/list_item.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.stories.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.test.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.tsx create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/reducer.test.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/reducer.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/translations.ts create mode 100644 x-pack/plugins/security_solution/public/common/components/threat_match/types.ts create mode 100644 x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/index.tsx create mode 100644 x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/translations.ts diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.mock.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.mock.ts index 777256ff961f..c033e0adccf0 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.mock.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.mock.ts @@ -60,7 +60,7 @@ export const getAddPrepackagedThreatMatchRulesSchemaMock = (): AddPrepackagedRul rule_id: 'rule-1', version: 1, threat_query: '*:*', - threat_index: 'list-index', + threat_index: ['list-index'], threat_mapping: [ { entries: [ @@ -118,7 +118,7 @@ export const getAddPrepackagedThreatMatchRulesSchemaDecodedMock = (): AddPrepack exceptions_list: [], rule_id: 'rule-1', threat_query: '*:*', - threat_index: 'list-index', + threat_index: ['list-index'], threat_mapping: [ { entries: [ diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.ts index 3f338c57dd93..6ffbf4e4c8d4 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackaged_rules_schema.ts @@ -51,6 +51,7 @@ import { threat_query, threat_filters, threat_mapping, + threat_language, } from '../types/threat_mapping'; import { @@ -128,6 +129,7 @@ export const addPrepackagedRulesSchema = t.intersection([ threat_mapping, // defaults to "undefined" if not set during decode threat_query, // defaults to "undefined" if not set during decode threat_index, // defaults to "undefined" if not set during decode + threat_language, // defaults "undefined" if not set during decode }) ), ]); diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.mock.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.mock.ts index 32299be500b4..94dd1215d802 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.mock.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.mock.ts @@ -66,7 +66,7 @@ export const getCreateThreatMatchRulesSchemaMock = (ruleId = 'rule-1'): CreateRu language: 'kuery', rule_id: ruleId, threat_query: '*:*', - threat_index: 'list-index', + threat_index: ['list-index'], threat_mapping: [ { entries: [ @@ -124,7 +124,7 @@ export const getCreateThreatMatchRulesSchemaDecodedMock = (): CreateRulesSchemaD exceptions_list: [], rule_id: 'rule-1', threat_query: '*:*', - threat_index: 'list-index', + threat_index: ['list-index'], threat_mapping: [ { entries: [ diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.ts index 2489210a26c8..d8e7614fcb84 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema.ts @@ -52,6 +52,7 @@ import { threat_query, threat_filters, threat_mapping, + threat_language, } from '../types/threat_mapping'; import { @@ -124,6 +125,7 @@ export const createRulesSchema = t.intersection([ threat_query, // defaults to "undefined" if not set during decode threat_filters, // defaults to "undefined" if not set during decode threat_index, // defaults to "undefined" if not set during decode + threat_language, // defaults "undefined" if not set during decode }) ), ]); diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.mock.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.mock.ts index 160dbb92b74c..2eea9ac0f30c 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.mock.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.mock.ts @@ -86,7 +86,7 @@ export const getImportThreatMatchRulesSchemaMock = (ruleId = 'rule-1'): ImportRu risk_score: 55, language: 'kuery', rule_id: ruleId, - threat_index: 'index-123', + threat_index: ['index-123'], threat_mapping: [{ entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] }], threat_query: '*:*', threat_filters: [ @@ -136,7 +136,7 @@ export const getImportThreatMatchRulesSchemaDecodedMock = (): ImportRulesSchemaD rule_id: 'rule-1', immutable: false, threat_query: '*:*', - threat_index: 'index-123', + threat_index: ['index-123'], threat_mapping: [ { entries: [ diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.ts index a411b3d439a1..852394b74767 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.ts @@ -58,6 +58,7 @@ import { threat_query, threat_filters, threat_mapping, + threat_language, } from '../types/threat_mapping'; import { @@ -147,6 +148,7 @@ export const importRulesSchema = t.intersection([ threat_mapping, // defaults to "undefined" if not set during decode threat_query, // defaults to "undefined" if not set during decode threat_index, // defaults to "undefined" if not set during decode + threat_language, // defaults "undefined" if not set during decode }) ), ]); diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/patch_rules_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/patch_rules_schema.ts index 40e79d96a9e6..f4dce5c7ac05 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/patch_rules_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/patch_rules_schema.ts @@ -48,6 +48,13 @@ import { severity_mapping, event_category_override, } from '../common/schemas'; +import { + threat_index, + threat_query, + threat_filters, + threat_mapping, + threat_language, +} from '../types/threat_mapping'; import { listArrayOrUndefined } from '../types/lists'; /** @@ -97,6 +104,11 @@ export const patchRulesSchema = t.exact( note, version, exceptions_list: listArrayOrUndefined, + threat_index, + threat_query, + threat_filters, + threat_mapping, + threat_language, }) ); diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_schema.ts index 8a13dd2f4e90..b0cd8b1c5368 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_schema.ts @@ -49,6 +49,13 @@ import { SeverityMapping, event_category_override, } from '../common/schemas'; +import { + threat_index, + threat_query, + threat_filters, + threat_mapping, + threat_language, +} from '../types/threat_mapping'; import { DefaultStringArray, @@ -122,6 +129,11 @@ export const updateRulesSchema = t.intersection([ note, // defaults to "undefined" if not set during decode version, // defaults to "undefined" if not set during decode exceptions_list: DefaultListArray, // defaults to empty array if not set during decode + threat_mapping, // defaults to "undefined" if not set during decode + threat_query, // defaults to "undefined" if not set during decode + threat_filters, // defaults to "undefined" if not set during decode + threat_index, // defaults to "undefined" if not set during decode + threat_language, // defaults "undefined" if not set during decode }) ), ]); diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.mocks.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.mocks.ts index aaa246c82d9d..340f93150ce5 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.mocks.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.mocks.ts @@ -87,7 +87,7 @@ export const getThreatMatchingSchemaMock = (anchorDate: string = ANCHOR_DATE): R return { ...getRulesSchemaMock(anchorDate), type: 'threat_match', - threat_index: 'index-123', + threat_index: ['index-123'], threat_mapping: [{ entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] }], threat_query: '*:*', threat_filters: [ diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.test.ts index c5bad3c55066..82675768a11b 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.test.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.test.ts @@ -626,7 +626,7 @@ describe('rules_schema', () => { const message = pipe(checked, foldLeftRight); expect(getPaths(left(message.errors))).toEqual([ - 'invalid keys "threat_index,threat_mapping,[{"entries":[{"field":"host.name","type":"mapping","value":"host.name"}]}],threat_query,threat_filters,[{"bool":{"must":[{"query_string":{"query":"host.name: linux","analyze_wildcard":true,"time_zone":"Zulu"}}],"filter":[],"should":[],"must_not":[]}}]"', + 'invalid keys "threat_index,["index-123"],threat_mapping,[{"entries":[{"field":"host.name","type":"mapping","value":"host.name"}]}],threat_query,threat_filters,[{"bool":{"must":[{"query_string":{"query":"host.name: linux","analyze_wildcard":true,"time_zone":"Zulu"}}],"filter":[],"should":[],"must_not":[]}}]"', ]); expect(message.schema).toEqual({}); }); @@ -764,7 +764,7 @@ describe('rules_schema', () => { test('should return 5 fields for a rule of type "threat_match"', () => { const fields = addThreatMatchFields({ type: 'threat_match' }); - expect(fields.length).toEqual(5); + expect(fields.length).toEqual(6); }); }); diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.ts index 908425a7496d..e85beddf0e51 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_schema.ts @@ -66,6 +66,7 @@ import { threat_query, threat_filters, threat_mapping, + threat_language, } from '../types/threat_mapping'; import { DefaultListArray } from '../types/lists_default_array'; @@ -144,6 +145,7 @@ export const dependentRulesSchema = t.partial({ threat_index, threat_query, threat_mapping, + threat_language, }); /** @@ -277,6 +279,7 @@ export const addThreatMatchFields = (typeAndTimelineOnly: TypeAndTimelineOnly): t.exact(t.type({ threat_query: dependentRulesSchema.props.threat_query })), t.exact(t.type({ threat_index: dependentRulesSchema.props.threat_index })), t.exact(t.type({ threat_mapping: dependentRulesSchema.props.threat_mapping })), + t.exact(t.partial({ threat_language: dependentRulesSchema.props.threat_language })), t.exact(t.partial({ threat_filters: dependentRulesSchema.props.threat_filters })), t.exact(t.partial({ saved_id: dependentRulesSchema.props.saved_id })), ]; diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/index.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/index.ts index aab9a550d25e..28a66d2948a9 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/index.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/index.ts @@ -33,4 +33,5 @@ export * from './positive_integer'; export * from './positive_integer_greater_than_zero'; export * from './references_default_array'; export * from './risk_score'; +export * from './threat_mapping'; export * from './uuid'; diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/threat_mapping.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/threat_mapping.ts index f2b4754c2d11..a1be6485f596 100644 --- a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/threat_mapping.ts +++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/threat_mapping.ts @@ -7,6 +7,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import * as t from 'io-ts'; +import { language } from '../common/schemas'; import { NonEmptyString } from './non_empty_string'; export const threat_query = t.string; @@ -19,29 +20,38 @@ export type ThreatFilters = t.TypeOf; export const threatFiltersOrUndefined = t.union([threat_filters, t.undefined]); export type ThreatFiltersOrUndefined = t.TypeOf; -export const threatMappingEntries = t.array( - t.exact( - t.type({ - field: NonEmptyString, - type: t.keyof({ mapping: null }), - value: NonEmptyString, - }) - ) +export const threatMapEntry = t.exact( + t.type({ + field: NonEmptyString, + type: t.keyof({ mapping: null }), + value: NonEmptyString, + }) ); + +export type ThreatMapEntry = t.TypeOf; + +export const threatMappingEntries = t.array(threatMapEntry); export type ThreatMappingEntries = t.TypeOf; -export const threat_mapping = t.array( - t.exact( - t.type({ - entries: threatMappingEntries, - }) - ) +export const threatMap = t.exact( + t.type({ + entries: threatMappingEntries, + }) ); +export type ThreatMap = t.TypeOf; + +export const threat_mapping = t.array(threatMap); export type ThreatMapping = t.TypeOf; export const threatMappingOrUndefined = t.union([threat_mapping, t.undefined]); export type ThreatMappingOrUndefined = t.TypeOf; -export const threat_index = t.string; +export const threat_index = t.array(t.string); +export type ThreatIndex = t.TypeOf; export const threatIndexOrUndefined = t.union([threat_index, t.undefined]); export type ThreatIndexOrUndefined = t.TypeOf; + +export const threat_language = t.union([language, t.undefined]); +export type ThreatLanguage = t.TypeOf; +export const threatLanguageOrUndefined = t.union([threat_language, t.undefined]); +export type ThreatLanguageOrUndefined = t.TypeOf; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.test.tsx new file mode 100644 index 000000000000..87d2b5ede7d6 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.test.tsx @@ -0,0 +1,46 @@ +/* + * 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 React from 'react'; +import { ThemeProvider } from 'styled-components'; +import { mount } from 'enzyme'; +import euiLightVars from '@elastic/eui/dist/eui_theme_light.json'; + +import { AndBadgeComponent } from './and_badge'; + +describe('AndBadgeComponent', () => { + test('it renders entryItemIndexItemEntryFirstRowAndBadge for very first item', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists()).toBeTruthy(); + }); + + test('it renders entryItemEntryInvisibleAndBadge if "entriesLength" is 1 or less', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect( + wrapper.find('[data-test-subj="entryItemEntryInvisibleAndBadge"]').exists() + ).toBeTruthy(); + }); + + test('it renders regular "and" badge if item is not the first one and includes more than one entry', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('[data-test-subj="entryItemEntryAndBadge"]').exists()).toBeTruthy(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.tsx new file mode 100644 index 000000000000..fd8d3f08e5de --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/and_badge.tsx @@ -0,0 +1,50 @@ +/* + * 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 React from 'react'; +import { EuiFlexItem } from '@elastic/eui'; +import styled from 'styled-components'; + +import { AndOrBadge } from '../and_or_badge'; + +const MyInvisibleAndBadge = styled(EuiFlexItem)` + visibility: hidden; +`; + +const MyFirstRowContainer = styled(EuiFlexItem)` + padding-top: 20px; +`; + +interface AndBadgeProps { + entriesLength: number; + entryItemIndex: number; +} + +export const AndBadgeComponent = React.memo(({ entriesLength, entryItemIndex }) => { + const badge = ; + + if (entriesLength > 1 && entryItemIndex === 0) { + return ( + + {badge} + + ); + } else if (entriesLength <= 1) { + return ( + + {badge} + + ); + } else { + return ( + + {badge} + + ); + } +}); + +AndBadgeComponent.displayName = 'AndBadge'; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.test.tsx new file mode 100644 index 000000000000..063499902094 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.test.tsx @@ -0,0 +1,123 @@ +/* + * 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 { mount } from 'enzyme'; +import React from 'react'; +import { ThreatMappingEntries } from '../../../../common/detection_engine/schemas/types'; + +import { EntryDeleteButtonComponent } from './entry_delete_button'; + +const entries: ThreatMappingEntries = [ + { + field: 'field.one', + type: 'mapping', + value: 'field.one', + }, +]; + +describe('EntryDeleteButtonComponent', () => { + test('it renders firstRowDeleteButton for very first entry', () => { + const wrapper = mount( + + ); + + expect(wrapper.find('[data-test-subj="firstRowDeleteButton"] button')).toHaveLength(1); + }); + + test('it does not render firstRowDeleteButton if entryIndex is not 0', () => { + const wrapper = mount( + + ); + + expect(wrapper.find('[data-test-subj="firstRowDeleteButton"]')).toHaveLength(0); + expect(wrapper.find('[data-test-subj="deleteButton"] button')).toHaveLength(1); + }); + + test('it does not render firstRowDeleteButton if itemIndex is not 0', () => { + const wrapper = mount( + + ); + + expect(wrapper.find('[data-test-subj="firstRowDeleteButton"]')).toHaveLength(0); + expect(wrapper.find('[data-test-subj="deleteButton"] button')).toHaveLength(1); + }); + + test('it invokes "onDelete" when button is clicked', () => { + const onDelete = jest.fn(); + + const wrapper = mount( + + ); + wrapper.find('[data-test-subj="deleteButton"] button').simulate('click'); + + expect(onDelete).toHaveBeenCalledTimes(1); + expect(onDelete).toHaveBeenCalledWith(0); + }); + + test('it disables button if it is the only entry left and no field has been selected', () => { + const emptyEntries: ThreatMappingEntries = [ + { + field: '', + type: 'mapping', + value: 'field.one', + }, + ]; + + const wrapper = mount( + + ); + + const button = wrapper.find('[data-test-subj="firstRowDeleteButton"] button').at(0); + + expect(button.prop('disabled')).toBeTruthy(); + }); + + test('it does not disable button if it is the only entry left and field has been selected', () => { + const wrapper = mount( + + ); + + const button = wrapper.find('[data-test-subj="deleteButton"] button').at(0); + + expect(button.prop('disabled')).toBeFalsy(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.tsx new file mode 100644 index 000000000000..10a82855bb0a --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_delete_button.tsx @@ -0,0 +1,67 @@ +/* + * 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 React, { useCallback } from 'react'; +import { EuiButtonIcon, EuiFlexItem } from '@elastic/eui'; +import styled from 'styled-components'; + +import { Entry } from './types'; + +const MyFirstRowContainer = styled(EuiFlexItem)` + padding-top: 20px; +`; + +interface EntryDeleteButtonProps { + entries: Entry[]; + isOnlyItem: boolean; + entryIndex: number; + itemIndex: number; + onDelete: (item: number) => void; +} + +export const EntryDeleteButtonComponent = React.memo( + ({ entries, isOnlyItem, entryIndex, itemIndex, onDelete }) => { + const isDisabled: boolean = + isOnlyItem && + entries.length === 1 && + itemIndex === 0 && + (entries[0].field == null || entries[0].field === ''); + + const handleDelete = useCallback((): void => { + onDelete(entryIndex); + }, [onDelete, entryIndex]); + + const button = ( + + ); + + if (entryIndex === 0 && itemIndex === 0) { + // This logic was added to work around it including the field + // labels in centering the delete icon for the first row + return ( + + {button} + + ); + } else { + return ( + + {button} + + ); + } + } +); + +EntryDeleteButtonComponent.displayName = 'EntryDeleteButton'; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx new file mode 100644 index 000000000000..36033c358766 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.test.tsx @@ -0,0 +1,130 @@ +/* + * 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 { mount } from 'enzyme'; +import React from 'react'; +import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui'; + +import { EntryItem } from './entry_item'; +import { + fields, + getField, +} from '../../../../../../../src/plugins/data/common/index_patterns/fields/fields.mocks'; +import { IndexPattern } from 'src/plugins/data/public'; + +jest.mock('../../../common/lib/kibana'); + +describe('EntryItem', () => { + test('it renders field labels if "showLabel" is "true"', () => { + const wrapper = mount( + + ); + + expect(wrapper.find('[data-test-subj="threatFieldInputFormRow"]')).not.toEqual(0); + }); + + test('it invokes "onChange" when new field is selected and resets value fields', () => { + const mockOnChange = jest.fn(); + const wrapper = mount( + + ); + + ((wrapper.find(EuiComboBox).at(0).props() as unknown) as { + onChange: (a: EuiComboBoxOptionOption[]) => void; + }).onChange([{ label: 'machine.os' }]); + + expect(mockOnChange).toHaveBeenCalledWith( + { + field: 'machine.os', + type: 'mapping', + value: 'ip', + }, + 0 + ); + }); + + test('it invokes "onChange" when new value is selected', () => { + const mockOnChange = jest.fn(); + const wrapper = mount( + + ); + + ((wrapper.find(EuiComboBox).at(1).props() as unknown) as { + onChange: (a: EuiComboBoxOptionOption[]) => void; + }).onChange([{ label: 'is not' }]); + + expect(mockOnChange).toHaveBeenCalledWith({ field: 'ip', type: 'mapping', value: '' }, 0); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.tsx new file mode 100644 index 000000000000..c99e63ff4eda --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/entry_item.tsx @@ -0,0 +1,131 @@ +/* + * 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 React, { useCallback, useMemo } from 'react'; +import { EuiFormRow, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import styled from 'styled-components'; + +import { IFieldType, IndexPattern } from '../../../../../../../src/plugins/data/common'; +import { FieldComponent } from '../autocomplete/field'; +import { FormattedEntry, Entry } from './types'; +import * as i18n from './translations'; +import { getEntryOnFieldChange, getEntryOnThreatFieldChange } from './helpers'; + +interface EntryItemProps { + entry: FormattedEntry; + indexPattern: IndexPattern; + threatIndexPatterns: IndexPattern; + showLabel: boolean; + onChange: (arg: Entry, i: number) => void; +} + +const FlexItemWithLabel = styled(EuiFlexItem)` + padding-top: 20px; + text-align: center; +`; + +const FlexItemWithoutLabel = styled(EuiFlexItem)` + text-align: center; +`; + +export const EntryItem: React.FC = ({ + entry, + indexPattern, + threatIndexPatterns, + showLabel, + onChange, +}): JSX.Element => { + const handleFieldChange = useCallback( + ([newField]: IFieldType[]): void => { + const { updatedEntry, index } = getEntryOnFieldChange(entry, newField); + onChange(updatedEntry, index); + }, + [onChange, entry] + ); + + const handleThreatFieldChange = useCallback( + ([newField]: IFieldType[]): void => { + const { updatedEntry, index } = getEntryOnThreatFieldChange(entry, newField); + onChange(updatedEntry, index); + }, + [onChange, entry] + ); + + const renderFieldInput = useMemo(() => { + const comboBox = ( + + ); + + if (showLabel) { + return ( + + {comboBox} + + ); + } else { + return comboBox; + } + }, [handleFieldChange, indexPattern, entry, showLabel]); + + const renderThreatFieldInput = useMemo(() => { + const comboBox = ( + + ); + + if (showLabel) { + return ( + + {comboBox} + + ); + } else { + return comboBox; + } + }, [handleThreatFieldChange, threatIndexPatterns, entry, showLabel]); + + return ( + + {renderFieldInput} + + + {showLabel ? ( + {i18n.MATCHES} + ) : ( + {i18n.MATCHES} + )} + + + {renderThreatFieldInput} + + ); +}; + +EntryItem.displayName = 'EntryItem'; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx new file mode 100644 index 000000000000..7bab8e93ea9d --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.test.tsx @@ -0,0 +1,225 @@ +/* + * 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 { + fields, + getField, +} from '../../../../../../../src/plugins/data/common/index_patterns/fields/fields.mocks'; +import { Entry, EmptyEntry, ThreatMapEntries, FormattedEntry } from './types'; +import { IndexPattern } from '../../../../../../../src/plugins/data/common'; +import moment from 'moment-timezone'; + +import { + filterItems, + getEntryOnFieldChange, + getFormattedEntries, + getFormattedEntry, + getUpdatedEntriesOnDelete, +} from './helpers'; +import { ThreatMapEntry } from '../../../../common/detection_engine/schemas/types'; + +const getMockIndexPattern = (): IndexPattern => + ({ + id: '1234', + title: 'logstash-*', + fields, + } as IndexPattern); + +const getMockEntry = (): FormattedEntry => ({ + field: getField('ip'), + value: getField('ip'), + type: 'mapping', + entryIndex: 0, +}); + +describe('Helpers', () => { + beforeEach(() => { + moment.tz.setDefault('UTC'); + }); + + afterEach(() => { + moment.tz.setDefault('Browser'); + }); + + describe('#getFormattedEntry', () => { + test('it returns entry with a value when "item.field" is of type "text" and matching keyword field exists', () => { + const payloadIndexPattern: IndexPattern = { + ...getMockIndexPattern(), + fields: [ + ...fields, + { + name: 'machine.os.raw.text', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: false, + aggregatable: false, + readFromDocValues: true, + }, + ], + } as IndexPattern; + const payloadItem: Entry = { + field: 'machine.os.raw.text', + type: 'mapping', + value: 'some os', + }; + const output = getFormattedEntry(payloadIndexPattern, payloadItem, 0); + const expected: FormattedEntry = { + entryIndex: 0, + field: { + name: 'machine.os.raw.text', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: false, + aggregatable: false, + readFromDocValues: true, + }, + type: 'mapping', + value: undefined, + }; + expect(output).toEqual(expected); + }); + }); + + describe('#getFormattedEntries', () => { + test('it returns formatted entry with fields undefined if it unable to find a matching index pattern field', () => { + const payloadIndexPattern: IndexPattern = getMockIndexPattern(); + const payloadItems: Entry[] = [{ field: 'field.one', type: 'mapping', value: 'field.one' }]; + const output = getFormattedEntries(payloadIndexPattern, payloadItems); + const expected: FormattedEntry[] = [ + { + entryIndex: 0, + field: undefined, + value: undefined, + type: 'mapping', + }, + ]; + expect(output).toEqual(expected); + }); + + test('it returns formatted entries', () => { + const payloadIndexPattern: IndexPattern = getMockIndexPattern(); + const payloadItems: Entry[] = [ + { field: 'machine.os', type: 'mapping', value: 'machine.os' }, + { field: 'ip', type: 'mapping', value: 'ip' }, + ]; + const output = getFormattedEntries(payloadIndexPattern, payloadItems); + const expected: FormattedEntry[] = [ + { + field: { + name: 'machine.os', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + type: 'mapping', + value: { + name: 'machine.os', + type: 'string', + esTypes: ['text'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: false, + }, + entryIndex: 0, + }, + { + field: { + name: 'ip', + type: 'ip', + esTypes: ['ip'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + type: 'mapping', + value: { + name: 'ip', + type: 'ip', + esTypes: ['ip'], + count: 0, + scripted: false, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }, + entryIndex: 1, + }, + ]; + expect(output).toEqual(expected); + }); + }); + + describe('#getUpdatedEntriesOnDelete', () => { + test('it removes entry corresponding to "entryIndex"', () => { + const payloadItem: ThreatMapEntries = { + entries: [ + { field: 'field.one', type: 'mapping', value: 'field.one' }, + { field: 'field.two', type: 'mapping', value: 'field.two' }, + ], + }; + const output = getUpdatedEntriesOnDelete(payloadItem, 0); + const expected: ThreatMapEntries = { + entries: [ + { + field: 'field.two', + type: 'mapping', + value: 'field.two', + }, + ], + }; + expect(output).toEqual(expected); + }); + }); + + describe('#getEntryOnFieldChange', () => { + test('it returns field of type "match" with updated field', () => { + const payloadItem = getMockEntry(); + const payloadIFieldType = getField('ip'); + const output = getEntryOnFieldChange(payloadItem, payloadIFieldType); + const expected: { updatedEntry: Entry; index: number } = { + index: 0, + updatedEntry: { + field: 'ip', + type: 'mapping', + value: 'ip', + }, + }; + expect(output).toEqual(expected); + }); + }); + + describe('#filterItems', () => { + test('it removes entry items with "value" of "undefined"', () => { + const entry: ThreatMapEntry = { field: 'host.name', type: 'mapping', value: 'host.name' }; + const mockEmpty: EmptyEntry = { + field: 'host.name', + type: 'mapping', + value: undefined, + }; + const items = filterItems([ + { + entries: [entry], + }, + { + entries: [mockEmpty], + }, + ]); + expect(items).toEqual([{ entries: [entry] }]); + }); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx new file mode 100644 index 000000000000..9b155e1d568a --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/helpers.tsx @@ -0,0 +1,171 @@ +/* + * 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 { + ThreatMap, + threatMap, + ThreatMapping, +} from '../../../../common/detection_engine/schemas/types'; + +import { IndexPattern, IFieldType } from '../../../../../../../src/plugins/data/common'; +import { Entry, FormattedEntry, ThreatMapEntries, EmptyEntry } from './types'; + +/** + * Formats the entry into one that is easily usable for the UI. + * + * @param patterns IndexPattern containing available fields on rule index + * @param item item entry + * @param itemIndex entry index + */ +export const getFormattedEntry = ( + indexPattern: IndexPattern, + item: Entry, + itemIndex: number +): FormattedEntry => { + const { fields } = indexPattern; + const field = item.field; + const threatField = item.value; + const [foundField] = fields.filter(({ name }) => field != null && field === name); + const [threatFoundField] = fields.filter( + ({ name }) => threatField != null && threatField === name + ); + return { + field: foundField, + type: 'mapping', + value: threatFoundField, + entryIndex: itemIndex, + }; +}; + +/** + * Formats the entries to be easily usable for the UI + * + * @param patterns IndexPattern containing available fields on rule index + * @param entries item entries + */ +export const getFormattedEntries = ( + indexPattern: IndexPattern, + entries: Entry[] +): FormattedEntry[] => { + return entries.reduce((acc, item, index) => { + const newItemEntry = getFormattedEntry(indexPattern, item, index); + return [...acc, newItemEntry]; + }, []); +}; + +/** + * Determines whether an entire entry or item need to be removed + * + * @param item + * @param entryIndex index of given entry + * + */ +export const getUpdatedEntriesOnDelete = ( + item: ThreatMapEntries, + entryIndex: number +): ThreatMapEntries => { + return { + ...item, + entries: [...item.entries.slice(0, entryIndex), ...item.entries.slice(entryIndex + 1)], + }; +}; + +/** + * Determines proper entry update when user selects new field + * + * @param item - current item entry values + * @param newField - newly selected field + * + */ +export const getEntryOnFieldChange = ( + item: FormattedEntry, + newField: IFieldType +): { updatedEntry: Entry; index: number } => { + const { entryIndex } = item; + return { + updatedEntry: { + field: newField != null ? newField.name : '', + type: 'mapping', + value: item.value != null ? item.value.name : '', + }, + index: entryIndex, + }; +}; + +/** + * Determines proper entry update when user selects new field + * + * @param item - current item entry values + * @param newField - newly selected field + * + */ +export const getEntryOnThreatFieldChange = ( + item: FormattedEntry, + newField: IFieldType +): { updatedEntry: Entry; index: number } => { + const { entryIndex } = item; + return { + updatedEntry: { + field: item.field != null ? item.field.name : '', + type: 'mapping', + value: newField != null ? newField.name : '', + }, + index: entryIndex, + }; +}; + +export const getDefaultEmptyEntry = (): EmptyEntry => ({ + field: '', + type: 'mapping', + value: '', +}); + +export const getNewItem = (): ThreatMap => { + return { + entries: [ + { + field: '', + type: 'mapping', + value: '', + }, + ], + }; +}; + +export const filterItems = (items: ThreatMapEntries[]): ThreatMapping => { + return items.reduce((acc, item) => { + const newItem = { ...item, entries: item.entries }; + if (threatMap.is(newItem)) { + return [...acc, newItem]; + } else { + return acc; + } + }, []); +}; + +/** + * Given a list of items checks each one to see if any of them have an empty field + * or an empty value. + * @param items The items to check if we have an empty entries. + */ +export const containsInvalidItems = (items: ThreatMapEntries[]): boolean => { + return items.some((item) => + item.entries.some((subEntry) => subEntry.field === '' || subEntry.value === '') + ); +}; + +/** + * Given a list of items checks if we have a single empty entry and if we do returns true. + * @param items The items to check if we have a single empty entry. + */ +export const singleEntryThreat = (items: ThreatMapEntries[]): boolean => { + return ( + items.length === 1 && + items[0].entries.length === 1 && + items[0].entries[0].field === '' && + items[0].entries[0].value === '' + ); +}; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx new file mode 100644 index 000000000000..14bc64c90a66 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/index.test.tsx @@ -0,0 +1,304 @@ +/* + * 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 React from 'react'; +import { ThemeProvider } from 'styled-components'; +import { mount } from 'enzyme'; +import euiLightVars from '@elastic/eui/dist/eui_theme_light.json'; +import { waitFor } from '@testing-library/react'; + +import { fields } from '../../../../../../../src/plugins/data/common/index_patterns/fields/fields.mocks'; + +import { useKibana } from '../../../common/lib/kibana'; + +import { ThreatMatchComponent } from './'; +import { ThreatMapEntries } from './types'; +import { IndexPattern } from 'src/plugins/data/public'; + +jest.mock('../../../common/lib/kibana'); + +const getPayLoad = (): ThreatMapEntries[] => [ + { entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] }, +]; + +const getDoublePayLoad = (): ThreatMapEntries[] => [ + { entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] }, + { entries: [{ field: 'host.name', type: 'mapping', value: 'host.name' }] }, +]; + +describe('ThreatMatchComponent', () => { + const getValueSuggestionsMock = jest.fn().mockResolvedValue(['value 1', 'value 2']); + + beforeEach(() => { + (useKibana as jest.Mock).mockReturnValue({ + services: { + data: { + autocomplete: { + getValueSuggestions: getValueSuggestionsMock, + }, + }, + }, + }); + }); + + afterEach(() => { + getValueSuggestionsMock.mockClear(); + }); + + test('it displays empty entry if no "listItems" are passed in', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('EuiFlexGroup[data-test-subj="itemEntryContainer"]')).toHaveLength(1); + expect(wrapper.find('[data-test-subj="entryField"]').text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="threatEntryField"]').text()).toEqual('Search'); + }); + + test('it displays "Search" for "listItems" that are passed in', async () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + expect(wrapper.find('EuiFlexGroup[data-test-subj="itemEntryContainer"]')).toHaveLength(1); + expect(wrapper.find('[data-test-subj="entryField"]').at(0).text()).toEqual('Search'); + + wrapper.unmount(); + }); + + test('it displays "or", "and" enabled', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('[data-test-subj="andButton"] button').prop('disabled')).toBeFalsy(); + expect(wrapper.find('[data-test-subj="orButton"] button').prop('disabled')).toBeFalsy(); + }); + + test('it adds an entry when "and" clicked', async () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('EuiFlexGroup[data-test-subj="itemEntryContainer"]')).toHaveLength(1); + + wrapper.find('[data-test-subj="andButton"] button').simulate('click'); + + await waitFor(() => { + expect(wrapper.find('EuiFlexGroup[data-test-subj="itemEntryContainer"]')).toHaveLength(2); + expect(wrapper.find('[data-test-subj="entryField"]').at(0).text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="threatEntryField"]').at(0).text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="entryField"]').at(1).text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="threatEntryField"]').at(1).text()).toEqual('Search'); + }); + }); + + test('it adds an item when "or" clicked', async () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('EuiFlexGroup[data-test-subj="entriesContainer"]')).toHaveLength(1); + + wrapper.find('[data-test-subj="orButton"] button').simulate('click'); + + await waitFor(() => { + expect(wrapper.find('EuiFlexGroup[data-test-subj="entriesContainer"]')).toHaveLength(2); + expect(wrapper.find('[data-test-subj="entryField"]').at(0).text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="threatEntryField"]').at(0).text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="entryField"]').at(1).text()).toEqual('Search'); + expect(wrapper.find('[data-test-subj="threatEntryField"]').at(1).text()).toEqual('Search'); + }); + }); + + test('it removes one row if user deletes a row', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('[data-test-subj="entriesContainer"]').length).toEqual(4); + wrapper.find('[data-test-subj="firstRowDeleteButton"] button').simulate('click'); + expect(wrapper.find('[data-test-subj="entriesContainer"]').length).toEqual(2); + wrapper.unmount(); + }); + + test('it displays "and" badge if at least one item includes more than one entry', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists()).toBeFalsy(); + + wrapper.find('[data-test-subj="andButton"] button').simulate('click'); + + expect(wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists()).toBeTruthy(); + }); + + test('it does not display "and" badge if none of the items include more than one entry', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + wrapper.find('[data-test-subj="orButton"] button').simulate('click'); + + expect(wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists()).toBeFalsy(); + + wrapper.find('[data-test-subj="orButton"] button').simulate('click'); + + expect(wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists()).toBeFalsy(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/index.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/index.tsx new file mode 100644 index 000000000000..d3936e10bd87 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/index.tsx @@ -0,0 +1,220 @@ +/* + * 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 React, { useCallback, useEffect, useReducer } from 'react'; +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import styled from 'styled-components'; + +import { ThreatMapping } from '../../../../common/detection_engine/schemas/types'; +import { ListItemComponent } from './list_item'; +import { IndexPattern } from '../../../../../../../src/plugins/data/common'; +import { AndOrBadge } from '../and_or_badge'; +import { LogicButtons } from './logic_buttons'; +import { ThreatMapEntries } from './types'; +import { State, reducer } from './reducer'; +import { getDefaultEmptyEntry, getNewItem, filterItems } from './helpers'; + +const MyInvisibleAndBadge = styled(EuiFlexItem)` + visibility: hidden; +`; + +const MyAndBadge = styled(AndOrBadge)` + & > .euiFlexItem { + margin: 0; + } +`; + +const MyButtonsContainer = styled(EuiFlexItem)` + margin: 16px 0; +`; + +const initialState: State = { + andLogicIncluded: false, + entries: [], + entriesToDelete: [], +}; + +interface OnChangeProps { + entryItems: ThreatMapping; + entriesToDelete: ThreatMapEntries[]; +} + +interface ThreatMatchComponentProps { + listItems: ThreatMapEntries[]; + indexPatterns: IndexPattern; + threatIndexPatterns: IndexPattern; + onChange: (arg: OnChangeProps) => void; +} + +export const ThreatMatchComponent = ({ + listItems, + indexPatterns, + threatIndexPatterns, + onChange, +}: ThreatMatchComponentProps) => { + const [{ entries, entriesToDelete, andLogicIncluded }, dispatch] = useReducer(reducer(), { + ...initialState, + }); + + const setUpdateEntries = useCallback( + (items: ThreatMapEntries[]): void => { + dispatch({ + type: 'setEntries', + entries: items, + }); + }, + [dispatch] + ); + + const setDefaultEntries = useCallback( + (item: ThreatMapEntries): void => { + dispatch({ + type: 'setDefault', + initialState, + lastEntry: item, + }); + }, + [dispatch] + ); + + const handleEntryItemChange = useCallback( + (item: ThreatMapEntries, index: number): void => { + const updatedEntries = [ + ...entries.slice(0, index), + { + ...item, + }, + ...entries.slice(index + 1), + ]; + + setUpdateEntries(updatedEntries); + }, + [setUpdateEntries, entries] + ); + + const handleDeleteEntryItem = useCallback( + (item: ThreatMapEntries, itemIndex: number): void => { + if (item.entries.length === 0) { + const updatedEntries = [...entries.slice(0, itemIndex), ...entries.slice(itemIndex + 1)]; + // if it's the only item left, don't delete it just add a default entry to it + if (updatedEntries.length === 0) { + setDefaultEntries(item); + } else { + setUpdateEntries([...entries.slice(0, itemIndex), ...entries.slice(itemIndex + 1)]); + } + } else { + handleEntryItemChange(item, itemIndex); + } + }, + [handleEntryItemChange, setUpdateEntries, entries, setDefaultEntries] + ); + + const handleAddNewEntryItemEntry = useCallback((): void => { + const lastEntry = entries[entries.length - 1]; + const { entries: innerEntries } = lastEntry; + + const updatedEntry: ThreatMapEntries = { + ...lastEntry, + entries: [...innerEntries, getDefaultEmptyEntry()], + }; + + setUpdateEntries([...entries.slice(0, entries.length - 1), { ...updatedEntry }]); + }, [setUpdateEntries, entries]); + + const handleAddNewEntryItem = useCallback((): void => { + // There is a case where there are numerous list items, all with + // empty `entries` array. + const newItem = getNewItem(); + setUpdateEntries([...entries, { ...newItem }]); + }, [setUpdateEntries, entries]); + + const handleAddClick = useCallback((): void => { + handleAddNewEntryItemEntry(); + }, [handleAddNewEntryItemEntry]); + + // Bubble up changes to parent + useEffect(() => { + onChange({ entryItems: filterItems(entries), entriesToDelete }); + }, [onChange, entriesToDelete, entries]); + + // Defaults to never be sans entry, instead + // always falls back to an empty entry if user deletes all + useEffect(() => { + if ( + entries.length === 0 || + (entries.length === 1 && entries[0].entries != null && entries[0].entries.length === 0) + ) { + handleAddNewEntryItem(); + } + }, [entries, handleAddNewEntryItem]); + + useEffect(() => { + if (listItems.length > 0) { + setUpdateEntries(listItems); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + return ( + + {entries.map((entryListItem, index) => ( + + + {index !== 0 && + (andLogicIncluded ? ( + + + + + + + + + + + ) : ( + + + + ))} + + + + + + ))} + + + + {andLogicIncluded && ( + + + + )} + + + + + + + ); +}; + +ThreatMatchComponent.displayName = 'ThreatMatch'; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx new file mode 100644 index 000000000000..90492bc46e2b --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.test.tsx @@ -0,0 +1,382 @@ +/* + * 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 React from 'react'; +import { ThemeProvider } from 'styled-components'; +import { mount } from 'enzyme'; +import euiLightVars from '@elastic/eui/dist/eui_theme_light.json'; + +import { useKibana } from '../../../common/lib/kibana'; +import { fields } from '../../../../../../../src/plugins/data/common/index_patterns/fields/fields.mocks'; + +import { ListItemComponent } from './list_item'; +import { ThreatMapEntries } from './types'; +import { IndexPattern } from 'src/plugins/data/public'; + +jest.mock('../../../common/lib/kibana'); + +const singlePayload = (): ThreatMapEntries => ({ + entries: [ + { + field: 'field.one', + type: 'mapping', + value: 'field.one', + }, + ], +}); + +const doublePayload = (): ThreatMapEntries => ({ + entries: [ + { + field: 'field.one', + type: 'mapping', + value: 'field.one', + }, + { + field: 'field.two', + type: 'mapping', + value: 'field.two', + }, + ], +}); + +describe('ListItemComponent', () => { + const getValueSuggestionsMock = jest.fn().mockResolvedValue(['field.one', 'field.two']); + + beforeAll(() => { + (useKibana as jest.Mock).mockReturnValue({ + services: { + data: { + autocomplete: { + getValueSuggestions: getValueSuggestionsMock, + }, + }, + }, + }); + }); + + afterEach(() => { + getValueSuggestionsMock.mockClear(); + }); + + describe('and badge logic', () => { + test('it renders "and" badge with extra top padding for the first item when "andLogicIncluded" is "true"', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect( + wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists() + ).toBeTruthy(); + }); + + test('it renders "and" badge when more than one item entry exists and it is not the first item', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect(wrapper.find('[data-test-subj="entryItemEntryAndBadge"]').exists()).toBeTruthy(); + }); + + test('it renders indented "and" badge when "andLogicIncluded" is "true" and only one entry exists', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect( + wrapper.find('[data-test-subj="entryItemEntryInvisibleAndBadge"]').exists() + ).toBeTruthy(); + }); + + test('it renders no "and" badge when "andLogicIncluded" is "false"', () => { + const wrapper = mount( + ({ eui: euiLightVars, darkMode: false })}> + + + ); + + expect( + wrapper.find('[data-test-subj="entryItemEntryInvisibleAndBadge"]').exists() + ).toBeFalsy(); + expect(wrapper.find('[data-test-subj="entryItemEntryAndBadge"]').exists()).toBeFalsy(); + expect( + wrapper.find('[data-test-subj="entryItemEntryFirstRowAndBadge"]').exists() + ).toBeFalsy(); + }); + }); + + describe('delete button logic', () => { + test('it renders delete button disabled when it is only entry left', () => { + const item: ThreatMapEntries = { + entries: [{ ...singlePayload(), field: '', type: 'mapping', value: '' }], + }; + const wrapper = mount( + + ); + + expect( + wrapper.find('[data-test-subj="itemEntryDeleteButton"] button').props().disabled + ).toBeTruthy(); + }); + + test('it does not render delete button disabled when it is not the only entry left', () => { + const wrapper = mount( + + ); + + expect( + wrapper.find('[data-test-subj="itemEntryDeleteButton"] button').props().disabled + ).toBeFalsy(); + }); + + test('it does not render delete button disabled when "entryItemIndex" is not "0"', () => { + const wrapper = mount( + + ); + + expect( + wrapper.find('[data-test-subj="itemEntryDeleteButton"] button').props().disabled + ).toBeFalsy(); + }); + + test('it does not render delete button disabled when more than one entry exists', () => { + const wrapper = mount( + + ); + + expect( + wrapper.find('[data-test-subj="itemEntryDeleteButton"] button').at(0).props().disabled + ).toBeFalsy(); + }); + + test('it invokes "onChangeEntryItem" when delete button clicked', () => { + const mockOnDeleteEntryItem = jest.fn(); + const wrapper = mount( + + ); + + wrapper.find('[data-test-subj="itemEntryDeleteButton"] button').at(0).simulate('click'); + + const expected: ThreatMapEntries = { + entries: [ + { + field: 'field.two', + type: 'mapping', + value: 'field.two', + }, + ], + }; + + expect(mockOnDeleteEntryItem).toHaveBeenCalledWith(expected, 0); + }); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.tsx new file mode 100644 index 000000000000..578986ccf17e --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/list_item.tsx @@ -0,0 +1,120 @@ +/* + * 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 React, { useMemo, useCallback } from 'react'; +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import styled from 'styled-components'; + +import { IndexPattern } from '../../../../../../../src/plugins/data/common'; +import { getFormattedEntries, getUpdatedEntriesOnDelete } from './helpers'; +import { FormattedEntry, ThreatMapEntries, Entry } from './types'; +import { EntryItem } from './entry_item'; +import { EntryDeleteButtonComponent } from './entry_delete_button'; +import { AndBadgeComponent } from './and_badge'; + +const MyOverflowContainer = styled(EuiFlexItem)` + overflow: hidden; + width: 100%; +`; + +interface ListItemProps { + listItem: ThreatMapEntries; + listId: string; + listItemIndex: number; + indexPattern: IndexPattern; + threatIndexPatterns: IndexPattern; + andLogicIncluded: boolean; + isOnlyItem: boolean; + onDeleteEntryItem: (item: ThreatMapEntries, index: number) => void; + onChangeEntryItem: (item: ThreatMapEntries, index: number) => void; +} + +export const ListItemComponent = React.memo( + ({ + listItem, + listId, + listItemIndex, + indexPattern, + threatIndexPatterns, + isOnlyItem, + andLogicIncluded, + onDeleteEntryItem, + onChangeEntryItem, + }) => { + const handleEntryChange = useCallback( + (entry: Entry, entryIndex: number): void => { + const updatedEntries: Entry[] = [ + ...listItem.entries.slice(0, entryIndex), + { ...entry }, + ...listItem.entries.slice(entryIndex + 1), + ]; + const updatedEntryItem: ThreatMapEntries = { + ...listItem, + entries: updatedEntries, + }; + onChangeEntryItem(updatedEntryItem, listItemIndex); + }, + [onChangeEntryItem, listItem, listItemIndex] + ); + + const handleDeleteEntry = useCallback( + (entryIndex: number): void => { + const updatedEntryItem = getUpdatedEntriesOnDelete(listItem, entryIndex); + + onDeleteEntryItem(updatedEntryItem, listItemIndex); + }, + [listItem, onDeleteEntryItem, listItemIndex] + ); + + const entries = useMemo( + (): FormattedEntry[] => + indexPattern != null && listItem.entries.length > 0 + ? getFormattedEntries(indexPattern, listItem.entries) + : [], + [listItem.entries, indexPattern] + ); + return ( + + + {andLogicIncluded && ( + + )} + + + {entries.map((item, index) => ( + + + + + + + + + ))} + + + + + ); + } +); + +ListItemComponent.displayName = 'ListItem'; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.stories.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.stories.tsx new file mode 100644 index 000000000000..dc2fa79a7b8c --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.stories.tsx @@ -0,0 +1,49 @@ +/* + * 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 { storiesOf, addDecorator } from '@storybook/react'; +import { action } from '@storybook/addon-actions'; +import React from 'react'; +import { ThemeProvider } from 'styled-components'; +import euiLightVars from '@elastic/eui/dist/eui_theme_light.json'; + +import { LogicButtons } from './logic_buttons'; + +addDecorator((storyFn) => ( + ({ eui: euiLightVars, darkMode: false })}>{storyFn()} +)); + +storiesOf('ThreatMatching|LogicButtons', module) + .add('and/or buttons', () => { + return ( + + ); + }) + .add('and disabled', () => { + return ( + + ); + }) + .add('or disabled', () => { + return ( + + ); + }); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.test.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.test.tsx new file mode 100644 index 000000000000..cd2fe3dc8f55 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.test.tsx @@ -0,0 +1,90 @@ +/* + * 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 { mount } from 'enzyme'; +import React from 'react'; + +import { LogicButtons } from './logic_buttons'; + +describe('LogicButtons', () => { + test('it renders "and" and "or" buttons', () => { + const wrapper = mount( + + ); + + expect(wrapper.find('[data-test-subj="andButton"] button')).toHaveLength(1); + expect(wrapper.find('[data-test-subj="orButton"] button')).toHaveLength(1); + }); + + test('it invokes "onOrClicked" when "or" button is clicked', () => { + const onOrClicked = jest.fn(); + + const wrapper = mount( + + ); + + wrapper.find('[data-test-subj="orButton"] button').simulate('click'); + + expect(onOrClicked).toHaveBeenCalledTimes(1); + }); + + test('it invokes "onAndClicked" when "and" button is clicked', () => { + const onAndClicked = jest.fn(); + + const wrapper = mount( + + ); + + wrapper.find('[data-test-subj="andButton"] button').simulate('click'); + + expect(onAndClicked).toHaveBeenCalledTimes(1); + }); + + test('it disables "and" button if "isAndDisabled" is true', () => { + const wrapper = mount( + + ); + + const andButton = wrapper.find('[data-test-subj="andButton"] button').at(0); + + expect(andButton.prop('disabled')).toBeTruthy(); + }); + + test('it disables "or" button if "isOrDisabled" is "true"', () => { + const wrapper = mount( + + ); + + const orButton = wrapper.find('[data-test-subj="orButton"] button').at(0); + + expect(orButton.prop('disabled')).toBeTruthy(); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.tsx b/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.tsx new file mode 100644 index 000000000000..abfbfecdb1ba --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/logic_buttons.tsx @@ -0,0 +1,55 @@ +/* + * 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 React from 'react'; +import { EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui'; +import styled from 'styled-components'; + +import * as i18n from './translations'; + +const MyEuiButton = styled(EuiButton)` + min-width: 95px; +`; + +interface LogicButtonsProps { + isOrDisabled: boolean; + isAndDisabled: boolean; + onAndClicked: () => void; + onOrClicked: () => void; +} + +export const LogicButtons: React.FC = ({ + isOrDisabled = false, + isAndDisabled = false, + onAndClicked, + onOrClicked, +}) => ( + + + + {i18n.AND} + + + + + {i18n.OR} + + + +); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/reducer.test.ts b/x-pack/plugins/security_solution/public/common/components/threat_match/reducer.test.ts new file mode 100644 index 000000000000..6b2a443ec45a --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/reducer.test.ts @@ -0,0 +1,101 @@ +/* + * 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 { ThreatMapEntries } from './types'; +import { State, reducer } from './reducer'; +import { getDefaultEmptyEntry } from './helpers'; +import { ThreatMapEntry } from '../../../../common/detection_engine/schemas/types'; + +const initialState: State = { + andLogicIncluded: false, + entries: [], + entriesToDelete: [], +}; + +const getEntry = (): ThreatMapEntry => ({ + field: 'host.name', + type: 'mapping', + value: 'host.name', +}); + +describe('reducer', () => { + describe('#setEntries', () => { + test('should return "andLogicIncluded" ', () => { + const update = reducer()(initialState, { + type: 'setEntries', + entries: [], + }); + const expected: State = { + andLogicIncluded: false, + entries: [], + entriesToDelete: [], + }; + expect(update).toEqual(expected); + }); + + test('should set "andLogicIncluded" to true if any of the entries include entries with length greater than 1 ', () => { + const entries: ThreatMapEntries[] = [ + { + entries: [getEntry(), getEntry()], + }, + ]; + const { andLogicIncluded } = reducer()(initialState, { + type: 'setEntries', + entries, + }); + + expect(andLogicIncluded).toBeTruthy(); + }); + + test('should set "andLogicIncluded" to false if any of the entries include entries with length greater than 1 ', () => { + const entries: ThreatMapEntries[] = [ + { + entries: [getEntry()], + }, + ]; + const { andLogicIncluded } = reducer()(initialState, { + type: 'setEntries', + entries, + }); + + expect(andLogicIncluded).toBeFalsy(); + }); + }); + + describe('#setDefault', () => { + test('should restore initial state and add default empty entry to item" ', () => { + const entries: ThreatMapEntries[] = [ + { + entries: [getEntry()], + }, + ]; + + const update = reducer()( + { + andLogicIncluded: true, + entries, + entriesToDelete: [], + }, + { + type: 'setDefault', + initialState, + lastEntry: { + entries: [], + }, + } + ); + + expect(update).toEqual({ + ...initialState, + entries: [ + { + entries: [getDefaultEmptyEntry()], + }, + ], + }); + }); + }); +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/reducer.ts b/x-pack/plugins/security_solution/public/common/components/threat_match/reducer.ts new file mode 100644 index 000000000000..3fd19d40afa5 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/reducer.ts @@ -0,0 +1,51 @@ +/* + * 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 { ThreatMapEntries } from './types'; +import { getDefaultEmptyEntry } from './helpers'; + +export type ViewerModalName = 'addModal' | 'editModal' | null; + +export interface State { + andLogicIncluded: boolean; + entries: ThreatMapEntries[]; + entriesToDelete: ThreatMapEntries[]; +} + +export type Action = + | { + type: 'setEntries'; + entries: ThreatMapEntries[]; + } + | { + type: 'setDefault'; + initialState: State; + lastEntry: ThreatMapEntries; + }; + +export const reducer = () => (state: State, action: Action): State => { + switch (action.type) { + case 'setEntries': { + const isAndLogicIncluded = + action.entries.filter(({ entries }) => entries.length > 1).length > 0; + + const returnState = { + ...state, + andLogicIncluded: isAndLogicIncluded, + entries: action.entries, + }; + return returnState; + } + case 'setDefault': { + return { + ...state, + ...action.initialState, + entries: [{ ...action.lastEntry, entries: [getDefaultEmptyEntry()] }], + }; + } + default: + return state; + } +}; diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/translations.ts b/x-pack/plugins/security_solution/public/common/components/threat_match/translations.ts new file mode 100644 index 000000000000..ca9f6a13856c --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/translations.ts @@ -0,0 +1,37 @@ +/* + * 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 { i18n } from '@kbn/i18n'; + +export const FIELD = i18n.translate('xpack.securitySolution.threatMatch.fieldDescription', { + defaultMessage: 'Field', +}); + +export const THREAT_FIELD = i18n.translate( + 'xpack.securitySolution.threatMatch.threatFieldDescription', + { + defaultMessage: 'Threat index field', + } +); + +export const FIELD_PLACEHOLDER = i18n.translate( + 'xpack.securitySolution.threatMatch.fieldPlaceholderDescription', + { + defaultMessage: 'Search', + } +); + +export const MATCHES = i18n.translate('xpack.securitySolution.threatMatch.matchesLabel', { + defaultMessage: 'MATCHES', +}); + +export const AND = i18n.translate('xpack.securitySolution.threatMatch.andDescription', { + defaultMessage: 'AND', +}); + +export const OR = i18n.translate('xpack.securitySolution.threatMatch.orDescription', { + defaultMessage: 'OR', +}); diff --git a/x-pack/plugins/security_solution/public/common/components/threat_match/types.ts b/x-pack/plugins/security_solution/public/common/components/threat_match/types.ts new file mode 100644 index 000000000000..0cbd885db2d5 --- /dev/null +++ b/x-pack/plugins/security_solution/public/common/components/threat_match/types.ts @@ -0,0 +1,26 @@ +/* + * 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 { ThreatMap, ThreatMapEntry } from '../../../../common/detection_engine/schemas/types'; +import { IFieldType } from '../../../../../../../src/plugins/data/common'; + +export interface FormattedEntry { + field: IFieldType | undefined; + type: 'mapping'; + value: IFieldType | undefined; + entryIndex: number; +} + +export interface EmptyEntry { + field: string | undefined; + type: 'mapping'; + value: string | undefined; +} + +export type Entry = ThreatMapEntry | EmptyEntry; + +export type ThreatMapEntries = Omit & { + entries: Entry[]; +}; diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx index 4d46d4dc8684..9ef1dd2bcb20 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx @@ -21,6 +21,8 @@ import { isEmpty } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; +import { MATCHES, AND, OR } from '../../../../common/components/threat_match/translations'; +import { ThreatMapping } from '../../../../../common/detection_engine/schemas/types'; import { assertUnreachable } from '../../../../../common/utility_types'; import * as i18nSeverity from '../severity_mapping/translations'; import * as i18nRiskScore from '../risk_score_mapping/translations'; @@ -56,6 +58,7 @@ export const buildQueryBarDescription = ({ query, savedId, indexPatterns, + queryLabel, }: BuildQueryBarDescription): ListItems[] => { let items: ListItems[] = []; if (!isEmpty(filters)) { @@ -89,7 +92,7 @@ export const buildQueryBarDescription = ({ items = [ ...items, { - title: <>{i18n.QUERY_LABEL} , + title: <>{queryLabel ?? i18n.QUERY_LABEL} , description: <>{query} , }, ]; @@ -416,3 +419,40 @@ export const buildThresholdDescription = (label: string, threshold: Threshold): ), }, ]; + +export const buildThreatMappingDescription = ( + title: string, + threatMapping: ThreatMapping +): ListItems[] => { + const description = threatMapping.reduce( + (accumThreatMaps, threatMap, threatMapIndex, { length: threatMappingLength }) => { + const matches = threatMap.entries.reduce( + (accumItems, item, itemsIndex, { length: threatMapLength }) => { + if (threatMapLength === 1) { + return `${item.field} ${MATCHES} ${item.value}`; + } else if (itemsIndex === 0) { + return `(${item.field} ${MATCHES} ${item.value})`; + } else { + return `${accumItems} ${AND} (${item.field} ${MATCHES} ${item.value})`; + } + }, + '' + ); + + if (threatMappingLength === 1) { + return `${matches}`; + } else if (threatMapIndex === 0) { + return `(${matches})`; + } else { + return `${accumThreatMaps} ${OR} (${matches})`; + } + }, + '' + ); + return [ + { + title, + description, + }, + ]; +}; diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx index 99e36669f78b..83d087e60bc7 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx @@ -9,6 +9,7 @@ import { isEmpty, chunk, get, pick, isNumber } from 'lodash/fp'; import React, { memo, useState } from 'react'; import styled from 'styled-components'; +import { ThreatMapping } from '../../../../../common/detection_engine/schemas/types'; import { IIndexPattern, Filter, @@ -36,11 +37,13 @@ import { buildRiskScoreDescription, buildRuleTypeDescription, buildThresholdDescription, + buildThreatMappingDescription, } from './helpers'; import { buildMlJobDescription } from './ml_job_description'; import { buildActionsDescription } from './actions_description'; import { buildThrottleDescription } from './throttle_description'; import { Type } from '../../../../../common/detection_engine/schemas/common/schemas'; +import { THREAT_QUERY_LABEL } from './translations'; const DescriptionListContainer = styled(EuiDescriptionList)` &.euiDescriptionList--column .euiDescriptionList__title { @@ -156,6 +159,7 @@ export const addFilterStateIfNotThere = (filters: Filter[]): Filter[] => { }); }; +/* eslint complexity: ["error", 21]*/ export const getDescriptionItem = ( field: string, label: string, @@ -189,7 +193,7 @@ export const getDescriptionItem = ( } else if (field === 'falsePositives') { const values: string[] = get(field, data); return buildUnorderedListArrayDescription(label, field, values); - } else if (Array.isArray(get(field, data))) { + } else if (Array.isArray(get(field, data)) && field !== 'threatMapping') { const values: string[] = get(field, data); return buildStringArrayDescription(label, field, values); } else if (field === 'riskScore') { @@ -214,6 +218,22 @@ export const getDescriptionItem = ( return buildRuleTypeDescription(label, ruleType); } else if (field === 'kibanaSiemAppUrl') { return []; + } else if (field === 'threatQueryBar') { + const filters = addFilterStateIfNotThere(get('threatQueryBar.filters', data) ?? []); + const query = get('threatQueryBar.query.query', data); + const savedId = get('threatQueryBar.saved_id', data); + return buildQueryBarDescription({ + field, + filters, + filterManager, + query, + savedId, + indexPatterns, + queryLabel: THREAT_QUERY_LABEL, + }); + } else if (field === 'threatMapping') { + const threatMap: ThreatMapping = get(field, data); + return buildThreatMappingDescription(label, threatMap); } const description: string = get(field, data); diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx index d714f04f519d..d9186c2da722 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/translations.tsx @@ -20,6 +20,13 @@ export const QUERY_LABEL = i18n.translate( } ); +export const THREAT_QUERY_LABEL = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.threatQueryLabel', + { + defaultMessage: 'Threat query', + } +); + export const SAVED_ID_LABEL = i18n.translate( 'xpack.securitySolution.detectionEngine.createRule.savedIdLabel', { diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts index bcda5ff67a9a..719c38689b72 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts +++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts @@ -24,6 +24,7 @@ export interface BuildQueryBarDescription { query: string; savedId: string; indexPatterns?: IIndexPattern; + queryLabel?: string; } export interface BuildThreatDescription { diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx index 169e4f81d349..9a1d11a2dfe4 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx @@ -12,6 +12,7 @@ import { isThresholdRule, isEqlRule, isQueryRule, + isThreatMatchRule, } from '../../../../../common/detection_engine/utils'; import { FieldHook } from '../../../../shared_imports'; import { useKibana } from '../../../../common/lib/kibana'; @@ -45,6 +46,7 @@ export const SelectRuleType: React.FC = ({ const setMl = useCallback(() => setType('machine_learning'), [setType]); const setQuery = useCallback(() => setType('query'), [setType]); const setThreshold = useCallback(() => setType('threshold'), [setType]); + const setThreatMatch = useCallback(() => setType('threat_match'), [setType]); const mlCardDisabled = isReadOnly || !hasValidLicense || !isMlAdmin; const licensingUrl = useKibana().services.application.getUrlForApp('kibana', { path: '#/management/stack/license_management', @@ -86,6 +88,15 @@ export const SelectRuleType: React.FC = ({ [isReadOnly, ruleType, setThreshold] ); + const threatMatchSelectableConfig = useMemo( + () => ({ + isDisabled: isReadOnly, + onClick: setThreatMatch, + isSelected: isThreatMatchRule(ruleType), + }), + [isReadOnly, ruleType, setThreatMatch] + ); + return ( = ({ selectable={eqlSelectableConfig} /> + + } + isDisabled={ + threatMatchSelectableConfig.isDisabled && !threatMatchSelectableConfig.isSelected + } + selectable={threatMatchSelectableConfig} + /> + ); diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/translations.ts index e7b231ca7495..7043aa2d2f95 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/translations.ts +++ b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/translations.ts @@ -62,3 +62,17 @@ export const THRESHOLD_TYPE_DESCRIPTION = i18n.translate( defaultMessage: 'Aggregate query results to detect when number of matches exceeds threshold.', } ); + +export const THREAT_MATCH_TYPE_TITLE = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.ruleTypeField.threatMatchTitle', + { + defaultMessage: 'Threat Match', + } +); + +export const THREAT_MATCH_TYPE_DESCRIPTION = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.ruleTypeField.threatMatchDescription', + { + defaultMessage: 'Upload value lists to write rules around a list of known bad attributes', + } +); diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx index dc31db76c391..f728a508fef8 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/index.tsx @@ -11,6 +11,7 @@ import styled from 'styled-components'; // eslint-disable-next-line no-restricted-imports import isEqual from 'lodash/isEqual'; +import { IndexPattern } from 'src/plugins/data/public'; import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations'; import { isMlRule } from '../../../../../common/machine_learning/helpers'; @@ -47,8 +48,13 @@ import { } from '../../../../shared_imports'; import { schema } from './schema'; import * as i18n from './translations'; -import { isEqlRule, isThresholdRule } from '../../../../../common/detection_engine/utils'; +import { + isEqlRule, + isThreatMatchRule, + isThresholdRule, +} from '../../../../../common/detection_engine/utils'; import { EqlQueryBar } from '../eql_query_bar'; +import { ThreatMatchInput } from '../threatmatch_input'; import { useFetchIndex } from '../../../../common/containers/source'; const CommonUseField = getUseField({ component: Field }); @@ -62,11 +68,18 @@ const stepDefineDefaultValue: DefineStepRule = { index: [], machineLearningJobId: '', ruleType: 'query', + threatIndex: [], queryBar: { query: { query: '', language: 'kuery' }, filters: [], saved_id: undefined, }, + threatQueryBar: { + query: { query: '*:*', language: 'kuery' }, + filters: [], + saved_id: undefined, + }, + threatMapping: [], threshold: { field: [], value: '200', @@ -121,14 +134,22 @@ const StepDefineRuleComponent: FC = ({ schema, }); const { getFields, getFormData, reset, submit } = form; - const [{ index: formIndex, ruleType: formRuleType }] = (useFormData({ - form, - watch: ['index', 'ruleType'], - }) as unknown) as [Partial]; + const [{ index: formIndex, ruleType: formRuleType, threatIndex: formThreatIndex }] = (useFormData( + { + form, + watch: ['index', 'ruleType', 'threatIndex'], + } + ) as unknown) as [Partial]; const index = formIndex || initialState.index; + const threatIndex = formThreatIndex || initialState.threatIndex; const ruleType = formRuleType || initialState.ruleType; const [indexPatternsLoading, { browserFields, indexPatterns }] = useFetchIndex(index); + const [ + threatIndexPatternsLoading, + { browserFields: threatBrowserFields, indexPatterns: threatIndexPatterns }, + ] = useFetchIndex(threatIndex); + // reset form when rule type changes useEffect(() => { reset({ resetValues: false }); @@ -146,7 +167,7 @@ const StepDefineRuleComponent: FC = ({ const getData = useCallback(async () => { const result = await submit(); - return result?.isValid + return result.isValid ? result : { isValid: false, @@ -184,6 +205,19 @@ const StepDefineRuleComponent: FC = ({ [browserFields] ); + const ThreatMatchInputChildren = useCallback( + ({ threatMapping }) => ( + + ), + [threatBrowserFields, threatIndexPatternsLoading, threatIndexPatterns, indexPatterns] + ); + return isReadOnlyView ? ( = ({ + + <> + + {ThreatMatchInputChildren} + + + = { index: { @@ -219,4 +231,126 @@ export const schema: FormSchema = { ], }, }, + threatIndex: { + type: FIELD_TYPES.COMBO_BOX, + label: i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldThreatIndexPatternsLabel', + { + defaultMessage: 'Threat index patterns', + } + ), + helpText: {THREAT_MATCH_INDEX_HELPER_TEXT}, + validations: [ + { + validator: ( + ...args: Parameters + ): ReturnType> | undefined => { + const [{ formData }] = args; + const needsValidation = isThreatMatchRule(formData.ruleType); + if (!needsValidation) { + return; + } + return fieldValidators.emptyField( + i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.threatMatchoutputIndiceNameFieldRequiredError', + { + defaultMessage: 'A minimum of one index pattern is required.', + } + ) + )(...args); + }, + }, + ], + }, + threatMapping: { + label: i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldThreatMappingLabel', + { + defaultMessage: 'Threat Mapping', + } + ), + validations: [ + { + validator: ( + ...args: Parameters + ): ReturnType> | undefined => { + const [{ path, formData }] = args; + const needsValidation = isThreatMatchRule(formData.ruleType); + if (!needsValidation) { + return; + } + if (singleEntryThreat(formData.threatMapping)) { + return { + code: 'ERR_FIELD_MISSING', + path, + message: THREAT_MATCH_REQUIRED, + }; + } else if (containsInvalidItems(formData.threatMapping)) { + return { + code: 'ERR_FIELD_MISSING', + path, + message: THREAT_MATCH_EMPTIES, + }; + } else { + return undefined; + } + }, + }, + ], + }, + threatQueryBar: { + label: i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.fieldThreatQueryBarLabel', + { + defaultMessage: 'Threat index query', + } + ), + validations: [ + { + validator: ( + ...args: Parameters + ): ReturnType> | undefined => { + const [{ value, path, formData }] = args; + const needsValidation = isThreatMatchRule(formData.ruleType); + if (!needsValidation) { + return; + } + + const { query, filters } = value as FieldValueQueryBar; + + return isEmpty(query.query as string) && isEmpty(filters) + ? { + code: 'ERR_FIELD_MISSING', + path, + message: CUSTOM_QUERY_REQUIRED, + } + : undefined; + }, + }, + { + validator: ( + ...args: Parameters + ): ReturnType> | undefined => { + const [{ value, path, formData }] = args; + const needsValidation = isThreatMatchRule(formData.ruleType); + if (!needsValidation) { + return; + } + const { query } = value as FieldValueQueryBar; + + if (!isEmpty(query.query as string) && query.language === 'kuery') { + try { + esKuery.fromKueryExpression(query.query); + } catch (err) { + return { + code: 'ERR_FIELD_FORMAT', + path, + message: INVALID_CUSTOM_QUERY, + }; + } + } + }, + }, + ], + }, }; diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx index 860ed1831fdc..8e0a3f9b8659 100644 --- a/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx +++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_define_rule/translations.tsx @@ -70,3 +70,24 @@ export const ENABLE_ML_JOB_WARNING = i18n.translate( 'This ML job is not currently running. Please set this job to run via "ML job settings" before activating this rule.', } ); + +export const THREAT_MATCH_INDEX_HELPER_TEXT = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.threatMatchingIcesHelperDescription', + { + defaultMessage: 'Select threat indices', + } +); + +export const THREAT_MATCH_REQUIRED = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.customThreatQueryFieldRequiredError', + { + defaultMessage: 'At least one threat match is required.', + } +); + +export const THREAT_MATCH_EMPTIES = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.customThreatQueryFieldRequiredEmptyError', + { + defaultMessage: 'All matches require both a field and threat index field.', + } +); diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/index.tsx new file mode 100644 index 000000000000..2a4609a2f5e9 --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/index.tsx @@ -0,0 +1,114 @@ +/* + * 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 React, { useCallback } from 'react'; +import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiFormRow } from '@elastic/eui'; + +import { ThreatMapEntries } from '../../../../common/components/threat_match/types'; +import { ThreatMatchComponent } from '../../../../common/components/threat_match'; +import { BrowserField } from '../../../../common/containers/source'; +import { + FieldHook, + Field, + getUseField, + UseField, + getFieldValidityAndErrorMessage, +} from '../../../../shared_imports'; +import { schema } from '../step_define_rule/schema'; +import { QueryBarDefineRule } from '../query_bar'; +import { IndexPattern } from '../../../../../../../../src/plugins/data/public'; + +const CommonUseField = getUseField({ component: Field }); + +interface ThreatMatchInputProps { + threatMapping: FieldHook; + threatBrowserFields: Readonly>>; + threatIndexPatterns: IndexPattern; + indexPatterns: IndexPattern; + threatIndexPatternsLoading: boolean; +} + +const ThreatMatchInputComponent: React.FC = ({ + threatMapping, + indexPatterns, + threatIndexPatterns, + threatIndexPatternsLoading, + threatBrowserFields, +}: ThreatMatchInputProps) => { + const { setValue, value: threatItems } = threatMapping; + const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(threatMapping); + const handleBuilderOnChange = useCallback( + ({ entryItems }: { entryItems: ThreatMapEntries[] }): void => { + setValue(entryItems); + }, + [setValue] + ); + return ( + <> + + + + + + + + + + + + + + + + ); +}; + +export const ThreatMatchInput = React.memo(ThreatMatchInputComponent); diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/translations.ts b/x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/translations.ts new file mode 100644 index 000000000000..0aa268ae24ae --- /dev/null +++ b/x-pack/plugins/security_solution/public/detections/components/rules/threatmatch_input/translations.ts @@ -0,0 +1,14 @@ +/* + * 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 { i18n } from '@kbn/i18n'; + +export const THREAT_MATCH_FIELD_PLACEHOLDER = i18n.translate( + 'xpack.securitySolution.detectionEngine.createRule.stepDefineRule.threatMatchField.threatMatchFieldPlaceholderText', + { + defaultMessage: 'All results', + } +); diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts index 49579e893029..e9c89130736c 100644 --- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts +++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts @@ -18,7 +18,14 @@ import { threshold, type, } from '../../../../../common/detection_engine/schemas/common/schemas'; -import { listArray } from '../../../../../common/detection_engine/schemas/types'; +import { + listArray, + threat_query, + threat_index, + threat_mapping, + threat_language, + threat_filters, +} from '../../../../../common/detection_engine/schemas/types'; import { CreateRulesSchema, PatchRulesSchema, @@ -110,6 +117,11 @@ export const RuleSchema = t.intersection([ status: t.string, status_date: t.string, threshold, + threat_query, + threat_filters, + threat_index, + threat_mapping, + threat_language, timeline_id: t.string, timeline_title: t.string, timestamp_override, diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts index 5a626ce0ff00..5851177a4e4a 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/__mocks__/mock.ts @@ -212,10 +212,13 @@ export const mockDefineStepRule = (): DefineStepRule => ({ machineLearningJobId: '', index: ['filebeat-'], queryBar: mockQueryBar, + threatQueryBar: mockQueryBar, + threatMapping: [], timeline: { id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2', title: 'Titled timeline', }, + threatIndex: [], threshold: { field: [''], value: '100', diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts index 65a5c6aca005..160809a2ba3c 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts @@ -73,28 +73,77 @@ export interface RuleFields { index: unknown; ruleType: unknown; threshold?: unknown; + threatIndex?: unknown; + threatQueryBar?: unknown; + threatMapping?: unknown; + threatLanguage?: unknown; } -type QueryRuleFields = Omit; -type ThresholdRuleFields = Omit; -type MlRuleFields = Omit; + +type QueryRuleFields = Omit< + T, + | 'anomalyThreshold' + | 'machineLearningJobId' + | 'threshold' + | 'threatIndex' + | 'threatQueryBar' + | 'threatMapping' +>; +type ThresholdRuleFields = Omit< + T, + 'anomalyThreshold' | 'machineLearningJobId' | 'threatIndex' | 'threatQueryBar' | 'threatMapping' +>; +type MlRuleFields = Omit< + T, + 'queryBar' | 'index' | 'threshold' | 'threatIndex' | 'threatQueryBar' | 'threatMapping' +>; +type ThreatMatchRuleFields = Omit; const isMlFields = ( - fields: QueryRuleFields | MlRuleFields | ThresholdRuleFields + fields: QueryRuleFields | MlRuleFields | ThresholdRuleFields | ThreatMatchRuleFields ): fields is MlRuleFields => has('anomalyThreshold', fields); const isThresholdFields = ( - fields: QueryRuleFields | MlRuleFields | ThresholdRuleFields + fields: QueryRuleFields | MlRuleFields | ThresholdRuleFields | ThreatMatchRuleFields ): fields is ThresholdRuleFields => has('threshold', fields); -export const filterRuleFieldsForType = (fields: T, type: Type) => { +const isThreatMatchFields = ( + fields: QueryRuleFields | MlRuleFields | ThresholdRuleFields | ThreatMatchRuleFields +): fields is ThreatMatchRuleFields => has('threatIndex', fields); + +export const filterRuleFieldsForType = ( + fields: T, + type: Type +): QueryRuleFields | MlRuleFields | ThresholdRuleFields | ThreatMatchRuleFields => { switch (type) { case 'machine_learning': - const { index, queryBar, threshold, ...mlRuleFields } = fields; + const { + index, + queryBar, + threshold, + threatIndex, + threatQueryBar, + threatMapping, + ...mlRuleFields + } = fields; return mlRuleFields; case 'threshold': - const { anomalyThreshold, machineLearningJobId, ...thresholdRuleFields } = fields; + const { + anomalyThreshold, + machineLearningJobId, + threatIndex: _removedThreatIndex, + threatQueryBar: _removedThreatQueryBar, + threatMapping: _removedThreatMapping, + ...thresholdRuleFields + } = fields; return thresholdRuleFields; case 'threat_match': + const { + anomalyThreshold: _removedAnomalyThreshold, + machineLearningJobId: _removedMachineLearningJobId, + threshold: _removedThreshold, + ...threatMatchRuleFields + } = fields; + return threatMatchRuleFields; case 'query': case 'saved_query': case 'eql': @@ -102,6 +151,9 @@ export const filterRuleFieldsForType = (fields: T, type: T anomalyThreshold: _a, machineLearningJobId: _m, threshold: _t, + threatIndex: __removedThreatIndex, + threatQueryBar: __removedThreatQueryBar, + threatMapping: __removedThreatMapping, ...queryRuleFields } = fields; return queryRuleFields; @@ -140,6 +192,18 @@ export const formatDefineStepData = (defineStepData: DefineStepRule): DefineStep }, }), } + : isThreatMatchFields(ruleFields) + ? { + index: ruleFields.index, + filters: ruleFields.queryBar?.filters, + language: ruleFields.queryBar?.query?.language, + query: ruleFields.queryBar?.query?.query as string, + saved_id: ruleFields.queryBar?.saved_id, + threat_index: ruleFields.threatIndex, + threat_query: ruleFields.threatQueryBar?.query?.query as string, + threat_mapping: ruleFields.threatMapping, + threat_language: ruleFields.threatQueryBar?.query?.language, + } : { index: ruleFields.index, filters: ruleFields.queryBar?.filters, diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx index 48247392dfe7..542b7b1b84c3 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx @@ -183,10 +183,10 @@ const CreateRulePageComponent: React.FC = () => { if (nextStep != null) { goToStep(nextStep); } else { - const defineStep = await stepsData.current[RuleStep.defineRule]; - const aboutStep = await stepsData.current[RuleStep.aboutRule]; - const scheduleStep = await stepsData.current[RuleStep.scheduleRule]; - const actionsStep = await stepsData.current[RuleStep.ruleActions]; + const defineStep = stepsData.current[RuleStep.defineRule]; + const aboutStep = stepsData.current[RuleStep.aboutRule]; + const scheduleStep = stepsData.current[RuleStep.scheduleRule]; + const actionsStep = stepsData.current[RuleStep.ruleActions]; if ( stepIsValid(defineStep) && diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx index 8545e5da512b..0cd75506fa9f 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx @@ -82,6 +82,16 @@ describe('rule helpers', () => { field: ['host.name'], value: '50', }, + threatIndex: [], + threatMapping: [], + threatQueryBar: { + query: { + query: '', + language: '', + }, + filters: [], + saved_id: undefined, + }, timeline: { id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2', title: 'Titled timeline', @@ -217,6 +227,16 @@ describe('rule helpers', () => { field: [], value: '100', }, + threatIndex: [], + threatMapping: [], + threatQueryBar: { + query: { + query: '', + language: '', + }, + filters: [], + saved_id: undefined, + }, timeline: { id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2', title: 'Untitled timeline', @@ -249,6 +269,16 @@ describe('rule helpers', () => { field: [], value: '100', }, + threatIndex: [], + threatMapping: [], + threatQueryBar: { + query: { + query: '', + language: '', + }, + filters: [], + saved_id: undefined, + }, timeline: { id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2', title: 'Untitled timeline', diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx index 42fbe40d690e..456bf8419a1f 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx @@ -79,6 +79,13 @@ export const getDefineStepsData = (rule: Rule): DefineStepRule => ({ anomalyThreshold: rule.anomaly_threshold ?? 50, machineLearningJobId: rule.machine_learning_job_id ?? '', index: rule.index ?? [], + threatIndex: rule.threat_index ?? [], + threatQueryBar: { + query: { query: rule.threat_query ?? '', language: rule.threat_language ?? '' }, + filters: (rule.threat_filters ?? []) as Filter[], + saved_id: undefined, + }, + threatMapping: rule.threat_mapping ?? [], queryBar: { query: { query: rule.query ?? '', language: rule.language ?? '' }, filters: (rule.filters ?? []) as Filter[], @@ -341,7 +348,6 @@ export const getActionMessageRuleParams = (ruleType: Type): string[] => { 'threat', 'type', 'version', - // 'lists', ]; const ruleParamsKeys = [ diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts index e3d0ea123872..f2afe32b1e12 100644 --- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts +++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts @@ -22,7 +22,11 @@ import { Type, Severity, } from '../../../../../common/detection_engine/schemas/common/schemas'; -import { List } from '../../../../../common/detection_engine/schemas/types'; +import { + List, + ThreatIndex, + ThreatMapping, +} from '../../../../../common/detection_engine/schemas/types'; export interface EuiBasicTableSortTypes { field: string; @@ -124,6 +128,9 @@ export interface DefineStepRule { ruleType: Type; timeline: FieldValueTimeline; threshold: FieldValueThreshold; + threatIndex: ThreatIndex; + threatQueryBar: FieldValueQueryBar; + threatMapping: ThreatMapping; } export interface ScheduleStepRule { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts index 9081831c4549..894ac2e0bb70 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts @@ -399,6 +399,7 @@ export const getResult = (): RuleAlertType => ({ timestampOverride: undefined, threatFilters: undefined, threatMapping: undefined, + threatLanguage: undefined, threatIndex: undefined, threatQuery: undefined, references: ['http://www.example.com', 'https://ww.example.com'], 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 067a4352e108..09e161166ddd 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 @@ -96,6 +96,7 @@ export const createRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => threat_index: threatIndex, threat_mapping: threatMapping, threat_query: threatQuery, + threat_language: threatLanguage, threshold, throttle, timestamp_override: timestampOverride, @@ -186,6 +187,7 @@ export const createRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => threatMapping, threatQuery, threatIndex, + threatLanguage, threshold, timestampOverride, references, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts index 54df87ca1778..9940a56988c7 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.ts @@ -84,6 +84,7 @@ export const createRulesRoute = (router: IRouter, ml: SetupPlugins['ml']): void threat_index: threatIndex, threat_query: threatQuery, threat_mapping: threatMapping, + threat_language: threatLanguage, throttle, timestamp_override: timestampOverride, to, @@ -175,6 +176,7 @@ export const createRulesRoute = (router: IRouter, ml: SetupPlugins['ml']): void threatIndex, threatQuery, threatMapping, + threatLanguage, timestampOverride, references, note, 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 4dbca5df0041..fb9d9c4ea72c 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 @@ -163,6 +163,7 @@ export const importRulesRoute = (router: IRouter, config: ConfigType, ml: SetupP threat_index: threatIndex, threat_query: threatQuery, threat_mapping: threatMapping, + threat_language: threatLanguage, threshold, timestamp_override: timestampOverride, to, @@ -223,11 +224,12 @@ export const importRulesRoute = (router: IRouter, config: ConfigType, ml: SetupP to, type, threat, + threshold, threatFilters, threatIndex, threatQuery, - threshold, threatMapping, + threatLanguage, timestampOverride, references, note, @@ -272,6 +274,11 @@ export const importRulesRoute = (router: IRouter, config: ConfigType, ml: SetupP type, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, references, note, version, 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 39bbe9ee686a..081e804cf735 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 @@ -87,6 +87,11 @@ export const patchRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => type, threat, threshold, + threat_filters: threatFilters, + threat_index: threatIndex, + threat_query: threatQuery, + threat_mapping: threatMapping, + threat_language: threatLanguage, timestamp_override: timestampOverride, throttle, references, @@ -147,6 +152,11 @@ export const patchRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => type, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, references, note, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts index 879bd8d5b8a1..baa5468f862c 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts @@ -78,6 +78,11 @@ export const patchRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => { type, threat, threshold, + threat_filters: threatFilters, + threat_index: threatIndex, + threat_query: threatQuery, + threat_mapping: threatMapping, + threat_language: threatLanguage, timestamp_override: timestampOverride, throttle, references, @@ -146,6 +151,11 @@ export const patchRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => { type, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, references, note, 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 4df0773f8631..8828bbe6c982 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 @@ -91,6 +91,11 @@ export const updateRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => type, threat, threshold, + threat_filters: threatFilters, + threat_index: threatIndex, + threat_query: threatQuery, + threat_mapping: threatMapping, + threat_language: threatLanguage, throttle, timestamp_override: timestampOverride, references, @@ -158,6 +163,11 @@ export const updateRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => type, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, references, note, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts index ef698db008d8..1fa3bb8c9bc8 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.ts @@ -81,6 +81,11 @@ export const updateRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => { type, threat, threshold, + threat_filters: threatFilters, + threat_index: threatIndex, + threat_query: threatQuery, + threat_mapping: threatMapping, + threat_language: threatLanguage, throttle, timestamp_override: timestampOverride, references, @@ -148,6 +153,11 @@ export const updateRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => { type, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, references, note, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts index 2159245f2f73..13eb7495a898 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts @@ -156,7 +156,7 @@ describe('utils', () => { ], }, ]; - threatRule.params.threatIndex = 'index-123'; + threatRule.params.threatIndex = ['index-123']; threatRule.params.threatFilters = threatFilters; threatRule.params.threatMapping = threatMapping; threatRule.params.threatQuery = '*:*'; @@ -164,7 +164,7 @@ describe('utils', () => { const rule = transformAlertToRule(threatRule); expect(rule).toEqual( expect.objectContaining({ - threat_index: 'index-123', + threat_index: ['index-123'], threat_filters: threatFilters, threat_mapping: threatMapping, threat_query: '*:*', diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts index c75b32b614e0..fb4ba855f653 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.ts @@ -150,6 +150,7 @@ export const transformAlertToRule = ( threat_index: alert.params.threatIndex, threat_query: alert.params.threatQuery, threat_mapping: alert.params.threatMapping, + threat_language: alert.params.threatLanguage, throttle: ruleActions?.ruleThrottle || 'no_actions', timestamp_override: alert.params.timestampOverride, note: alert.params.note, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts index a6034f3d7b7b..271b1043ea56 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.mock.ts @@ -42,6 +42,7 @@ export const getCreateRulesOptionsMock = (): CreateRulesOptions => ({ threat: [], threatFilters: undefined, threatMapping: undefined, + threatLanguage: undefined, threatQuery: undefined, threatIndex: undefined, threshold: undefined, @@ -92,6 +93,7 @@ export const getCreateMlRulesOptionsMock = (): CreateRulesOptions => ({ threatIndex: undefined, threatMapping: undefined, threatQuery: undefined, + threatLanguage: undefined, threshold: undefined, timestampOverride: undefined, to: 'now', diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts index 3a311d03e3c8..776882d0f849 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules.ts @@ -45,6 +45,7 @@ export const createRules = async ({ threat, threatFilters, threatIndex, + threatLanguage, threatQuery, threatMapping, threshold, @@ -96,6 +97,7 @@ export const createRules = async ({ threatIndex, threatQuery, threatMapping, + threatLanguage, timestampOverride, to, type, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts index 38adc03c00d5..0a43c652234d 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/install_prepacked_rules.ts @@ -50,6 +50,7 @@ export const installPrepackagedRules = ( threat, threat_filters: threatFilters, threat_mapping: threatMapping, + threat_language: threatLanguage, threat_query: threatQuery, threat_index: threatIndex, threshold, @@ -101,6 +102,7 @@ export const installPrepackagedRules = ( threat, threatFilters, threatMapping, + threatLanguage, threatQuery, threatIndex, threshold, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts index 8672c85f9842..ef7cd35f28f1 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts @@ -149,6 +149,11 @@ export const getPatchRulesOptionsMock = (): PatchRulesOptions => ({ tags: [], threat: [], threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, timestampOverride: undefined, to: 'now', type: 'query', @@ -193,6 +198,11 @@ export const getPatchMlRulesOptionsMock = (): PatchRulesOptions => ({ tags: [], threat: [], threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, timestampOverride: undefined, to: 'now', type: 'machine_learning', diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts index 852ff06bdc73..1982dcf9dd9b 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts @@ -44,6 +44,11 @@ export const patchRules = async ({ tags, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, to, type, @@ -87,6 +92,11 @@ export const patchRules = async ({ tags, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, to, type, @@ -126,6 +136,11 @@ export const patchRules = async ({ severityMapping, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, to, type, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts index d688e1b338e2..8af622e6a128 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts @@ -91,6 +91,7 @@ import { ThreatQueryOrUndefined, ThreatMappingOrUndefined, ThreatFiltersOrUndefined, + ThreatLanguageOrUndefined, } from '../../../../common/detection_engine/schemas/types/threat_mapping'; import { AlertsClient, PartialAlert } from '../../../../../alerts/server'; @@ -219,6 +220,7 @@ export interface CreateRulesOptions { threatIndex: ThreatIndexOrUndefined; threatQuery: ThreatQueryOrUndefined; threatMapping: ThreatMappingOrUndefined; + threatLanguage: ThreatLanguageOrUndefined; timestampOverride: TimestampOverrideOrUndefined; to: To; type: Type; @@ -264,6 +266,11 @@ export interface UpdateRulesOptions { tags: Tags; threat: Threat; threshold: ThresholdOrUndefined; + threatFilters: ThreatFiltersOrUndefined; + threatIndex: ThreatIndexOrUndefined; + threatQuery: ThreatQueryOrUndefined; + threatMapping: ThreatMappingOrUndefined; + threatLanguage: ThreatLanguageOrUndefined; timestampOverride: TimestampOverrideOrUndefined; to: To; type: Type; @@ -307,6 +314,11 @@ export interface PatchRulesOptions { tags: TagsOrUndefined; threat: ThreatOrUndefined; threshold: ThresholdOrUndefined; + threatFilters: ThreatFiltersOrUndefined; + threatIndex: ThreatIndexOrUndefined; + threatQuery: ThreatQueryOrUndefined; + threatMapping: ThreatMappingOrUndefined; + threatLanguage: ThreatLanguageOrUndefined; timestampOverride: TimestampOverrideOrUndefined; to: ToOrUndefined; type: TypeOrUndefined; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts index 01a481ed7b2d..c685c4198c11 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts @@ -47,6 +47,11 @@ export const updatePrepackagedRules = async ( type, threat, threshold, + threat_filters: threatFilters, + threat_index: threatIndex, + threat_query: threatQuery, + threat_mapping: threatMapping, + threat_language: threatLanguage, timestamp_override: timestampOverride, references, version, @@ -97,6 +102,11 @@ export const updatePrepackagedRules = async ( type, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, references, version, note, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts index 8cdc904a861c..a33651580ef2 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.mock.ts @@ -43,6 +43,11 @@ export const getUpdateRulesOptionsMock = (): UpdateRulesOptions => ({ tags: [], threat: [], threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, timestampOverride: undefined, to: 'now', type: 'query', @@ -88,6 +93,11 @@ export const getUpdateMlRulesOptionsMock = (): UpdateRulesOptions => ({ tags: [], threat: [], threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, timestampOverride: undefined, to: 'now', type: 'machine_learning', diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts index 08df785884b7..3da921ed47f2 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_rules.ts @@ -45,6 +45,11 @@ export const updateRules = async ({ tags, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, to, type, @@ -89,6 +94,11 @@ export const updateRules = async ({ tags, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, to, type, @@ -134,6 +144,11 @@ export const updateRules = async ({ severityMapping, threat, threshold, + threatFilters, + threatIndex, + threatQuery, + threatMapping, + threatLanguage, timestampOverride, to, type, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts index 227f574bc4e4..654383ff97c7 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts @@ -55,6 +55,11 @@ describe('utils', () => { tags: undefined, threat: undefined, threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, to: undefined, timestampOverride: undefined, type: undefined, @@ -98,6 +103,11 @@ describe('utils', () => { tags: undefined, threat: undefined, threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, to: undefined, timestampOverride: undefined, type: undefined, @@ -141,6 +151,11 @@ describe('utils', () => { tags: undefined, threat: undefined, threshold: undefined, + threatFilters: undefined, + threatIndex: undefined, + threatQuery: undefined, + threatMapping: undefined, + threatLanguage: undefined, to: undefined, timestampOverride: undefined, type: undefined, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts index d9f953f2803a..a9a100543b52 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts @@ -42,7 +42,14 @@ import { EventCategoryOverrideOrUndefined, } from '../../../../common/detection_engine/schemas/common/schemas'; import { PartialFilter } from '../types'; -import { ListArrayOrUndefined } from '../../../../common/detection_engine/schemas/types'; +import { + ListArrayOrUndefined, + ThreatFiltersOrUndefined, + ThreatIndexOrUndefined, + ThreatLanguageOrUndefined, + ThreatMappingOrUndefined, + ThreatQueryOrUndefined, +} from '../../../../common/detection_engine/schemas/types'; export const calculateInterval = ( interval: string | undefined, @@ -86,6 +93,11 @@ export interface UpdateProperties { tags: TagsOrUndefined; threat: ThreatOrUndefined; threshold: ThresholdOrUndefined; + threatFilters: ThreatFiltersOrUndefined; + threatIndex: ThreatIndexOrUndefined; + threatQuery: ThreatQueryOrUndefined; + threatMapping: ThreatMappingOrUndefined; + threatLanguage: ThreatLanguageOrUndefined; timestampOverride: TimestampOverrideOrUndefined; to: ToOrUndefined; type: TypeOrUndefined; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/queries/query_with_threat_mapping.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/queries/query_with_threat_mapping.json index c914e568048a..1e2f217751e9 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/queries/query_with_threat_mapping.json +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/queries/query_with_threat_mapping.json @@ -7,7 +7,7 @@ "type": "threat_match", "query": "*:*", "tags": ["tag_1", "tag_2"], - "threat_index": "mock-threat-list", + "threat_index": ["mock-threat-list"], "threat_query": "*:*", "threat_mapping": [ { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts index 501cd1fa6ecf..cbf70f3119b3 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts @@ -60,6 +60,7 @@ export const sampleRuleAlertParams = ( threatQuery: undefined, threatMapping: undefined, threatIndex: undefined, + threatLanguage: undefined, timelineId: undefined, timelineTitle: undefined, timestampOverride: undefined, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.ts index 344f705c4af2..6a76c7842e45 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.ts @@ -168,6 +168,7 @@ export const buildRuleWithoutOverrides = ( threat_index: ruleParams.threatIndex, threat_query: ruleParams.threatQuery, threat_mapping: ruleParams.threatMapping, + threat_language: ruleParams.threatLanguage, }; return removeInternalTagsFromRule(rule); }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_params_schema.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_params_schema.ts index 4006345b2438..cfe71f66395b 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_params_schema.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_params_schema.ts @@ -50,9 +50,10 @@ const signalSchema = schema.object({ exceptions_list: schema.maybe(schema.arrayOf(schema.object({}, { unknowns: 'allow' }))), // For backwards compatibility with customers that had a data bug in 7.8. Once we use a migration script please remove this. exceptionsList: schema.maybe(schema.arrayOf(schema.object({}, { unknowns: 'allow' }))), threatFilters: schema.nullable(schema.arrayOf(schema.object({}, { unknowns: 'allow' }))), - threatIndex: schema.maybe(schema.string()), + threatIndex: schema.maybe(schema.arrayOf(schema.string())), threatQuery: schema.maybe(schema.string()), threatMapping: schema.maybe(schema.arrayOf(schema.object({}, { unknowns: 'allow' }))), + threatLanguage: schema.maybe(schema.string()), }); /** diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts index 95348808bb58..9436dc9cf8a8 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts @@ -112,6 +112,7 @@ export const signalRulesAlertType = ({ threatQuery, threatIndex, threatMapping, + threatLanguage, type, exceptionsList, } = params; @@ -389,6 +390,7 @@ export const signalRulesAlertType = ({ throttle, threatFilters: threatFilters ?? [], threatQuery, + threatLanguage, buildRuleMessage, threatIndex, }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts index 560e7ad7fe2c..09ddfb342496 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signal.ts @@ -45,6 +45,7 @@ export const createThreatSignal = async ({ throttle, threatFilters, threatQuery, + threatLanguage, buildRuleMessage, threatIndex, name, @@ -105,8 +106,9 @@ export const createThreatSignal = async ({ callCluster: services.callCluster, exceptionItems, query: threatQuery, + language: threatLanguage, threatFilters, - index: [threatIndex], + index: threatIndex, searchAfter, sortField: undefined, sortOrder: undefined, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts index f44c7a968445..eeace508c9bf 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts @@ -41,6 +41,7 @@ export const createThreatSignals = async ({ throttle, threatFilters, threatQuery, + threatLanguage, buildRuleMessage, threatIndex, name, @@ -59,7 +60,8 @@ export const createThreatSignals = async ({ exceptionItems, threatFilters, query: threatQuery, - index: [threatIndex], + language: threatLanguage, + index: threatIndex, searchAfter: undefined, sortField: undefined, sortOrder: undefined, @@ -99,6 +101,7 @@ export const createThreatSignals = async ({ threatQuery, buildRuleMessage, threatIndex, + threatLanguage, name, currentThreatList: threatList, currentResult: results, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts index 8b381ca0d96d..3c3f5b544bb1 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts @@ -21,6 +21,7 @@ export const MAX_PER_PAGE = 9000; export const getThreatList = async ({ callCluster, query, + language, index, perPage, searchAfter, @@ -33,7 +34,13 @@ export const getThreatList = async ({ if (calculatedPerPage > 10000) { throw new TypeError('perPage cannot exceed the size of 10000'); } - const queryFilter = getQueryFilter(query, 'kuery', threatFilters, index, exceptionItems); + const queryFilter = getQueryFilter( + query, + language ?? 'kuery', + threatFilters, + index, + exceptionItems + ); const response: SearchResponse = await callCluster('search', { body: { query: queryFilter, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts index 7cd6e5196ea6..06c9c4c13c5f 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/types.ts @@ -15,6 +15,8 @@ import { ThreatQuery, ThreatMapping, ThreatMappingEntries, + ThreatIndex, + ThreatLanguageOrUndefined, } from '../../../../../common/detection_engine/schemas/types/threat_mapping'; import { PartialFilter, RuleTypeParams } from '../../types'; import { AlertServices } from '../../../../../../alerts/server'; @@ -57,7 +59,8 @@ export interface CreateThreatSignalsOptions { threatFilters: PartialFilter[]; threatQuery: ThreatQuery; buildRuleMessage: BuildRuleMessage; - threatIndex: string; + threatIndex: ThreatIndex; + threatLanguage: ThreatLanguageOrUndefined; name: string; } @@ -93,7 +96,8 @@ export interface CreateThreatSignalOptions { threatFilters: PartialFilter[]; threatQuery: ThreatQuery; buildRuleMessage: BuildRuleMessage; - threatIndex: string; + threatIndex: ThreatIndex; + threatLanguage: ThreatLanguageOrUndefined; name: string; currentThreatList: SearchResponse; currentResult: SearchAfterAndBulkCreateReturnType; @@ -138,6 +142,7 @@ export interface BooleanFilter { export interface GetThreatListOptions { callCluster: ILegacyScopedClusterClient['callAsCurrentUser']; query: string; + language: ThreatLanguageOrUndefined; index: string[]; perPage?: number; searchAfter: string[] | undefined; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts index 728f5b1dd867..cf4d989c1f4c 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts @@ -43,6 +43,7 @@ import { ThreatIndexOrUndefined, ThreatQueryOrUndefined, ThreatMappingOrUndefined, + ThreatLanguageOrUndefined, } from '../../../common/detection_engine/schemas/types/threat_mapping'; import { LegacyCallAPIOptions } from '../../../../../../src/core/server'; @@ -85,6 +86,7 @@ export interface RuleTypeParams { threatIndex: ThreatIndexOrUndefined; threatQuery: ThreatQueryOrUndefined; threatMapping: ThreatMappingOrUndefined; + threatLanguage: ThreatLanguageOrUndefined; timestampOverride: TimestampOverrideOrUndefined; to: To; type: Type; From 0ee253e9e016b776e45387e3e30c0cec0721d372 Mon Sep 17 00:00:00 2001 From: Spencer Date: Thu, 1 Oct 2020 16:43:13 -0700 Subject: [PATCH 09/73] [optimizer] strip proptypes from plugin bundles in production (#79221) Co-authored-by: spalger --- packages/kbn-babel-preset/package.json | 1 + packages/kbn-babel-preset/webpack_preset.js | 13 +++++++++++++ packages/kbn-optimizer/src/worker/webpack.config.ts | 1 + yarn.lock | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json index d6d1a78dd4a2..bc4e0ec338f9 100644 --- a/packages/kbn-babel-preset/package.json +++ b/packages/kbn-babel-preset/package.json @@ -15,6 +15,7 @@ "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-styled-components": "^1.10.7", "babel-plugin-transform-define": "^1.3.1", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "react-is": "^16.8.0", "styled-components": "^5.1.0" } diff --git a/packages/kbn-babel-preset/webpack_preset.js b/packages/kbn-babel-preset/webpack_preset.js index a43d607edb17..503b99d3c3e8 100644 --- a/packages/kbn-babel-preset/webpack_preset.js +++ b/packages/kbn-babel-preset/webpack_preset.js @@ -40,5 +40,18 @@ module.exports = () => { }, ], ], + env: { + production: { + plugins: [ + [ + require.resolve('babel-plugin-transform-react-remove-prop-types'), + { + mode: 'remove', + removeImport: true, + }, + ], + ], + }, + }, }; }; diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts index 2edf1c999888..9678dd5de868 100644 --- a/packages/kbn-optimizer/src/worker/webpack.config.ts +++ b/packages/kbn-optimizer/src/worker/webpack.config.ts @@ -200,6 +200,7 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker: loader: 'babel-loader', options: { babelrc: false, + envName: worker.dist ? 'production' : 'development', presets: IS_CODE_COVERAGE ? [ISTANBUL_PRESET_PATH, BABEL_PRESET_PATH] : [BABEL_PRESET_PATH], diff --git a/yarn.lock b/yarn.lock index 77e3a399c431..d795a174cfaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7612,6 +7612,11 @@ babel-plugin-transform-property-literals@^6.9.4: dependencies: esutils "^2.0.2" +babel-plugin-transform-react-remove-prop-types@^0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a" + integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA== + babel-plugin-transform-regexp-constructors@^0.4.3: version "0.4.3" resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965" From e5d8d49164a8d993bdd314dd6c800f9186092148 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Fri, 2 Oct 2020 00:46:00 +0100 Subject: [PATCH 10/73] chore(NA): assures a single version for the same dependency across the entire project (#78825) * chore(NA): script to check for multiple version of same dependency * chore(NA): remove multiple versions for the same dependency * chore(NA): hook single_version_dependencies script into the CI * chore(NA): remove grunt from the CI hook integration * chore(NA): update kbn pm dist * chore(NA): fix typechecking * chore(NA): update code to run under last extract-zip version * fix(NA): multiple versions of the same type dependency * move validation to bootstrap (#13) Co-authored-by: spalger * chore(NA): todo to remove logic to validate single version deps once we move into a single package.json * chore(NA): remove verify dependency versions jenkins task * chore(NA): update kbn pm dist file * chore(NA): remove last mention to verify_dependency_versions.sh fom tasks.groovy Co-authored-by: Spencer Co-authored-by: spalger Co-authored-by: Elastic Machine --- package.json | 10 +- packages/kbn-apm-config-loader/package.json | 2 +- packages/kbn-es/package.json | 2 +- packages/kbn-plugin-helpers/package.json | 2 +- packages/kbn-pm/dist/index.js | 4764 +++++++++-------- packages/kbn-pm/package.json | 6 +- .../kbn-pm/src/utils/validate_yarn_lock.ts | 62 + packages/kbn-release-notes/package.json | 2 +- packages/kbn-storybook/package.json | 4 +- packages/kbn-storybook/webpack.config.ts | 4 - packages/kbn-test/package.json | 2 +- packages/kbn-ui-framework/package.json | 6 +- tasks/config/run.js | 4 - tasks/jenkins.js | 1 - tasks/verify_dependency_versions.js | 53 - .../checks/verify_dependency_versions.sh | 5 - vars/tasks.groovy | 1 - x-pack/package.json | 12 +- x-pack/plugins/apm/e2e/package.json | 2 +- x-pack/plugins/apm/scripts/package.json | 2 +- .../server/browsers/extract/unzip.js | 16 +- .../public/common/mock/timeline_results.ts | 2 +- .../scripts/beat_docs/build.js | 38 +- yarn.lock | 363 +- 24 files changed, 2667 insertions(+), 2698 deletions(-) delete mode 100644 tasks/verify_dependency_versions.js delete mode 100755 test/scripts/checks/verify_dependency_versions.sh diff --git a/package.json b/package.json index 0eda8dd9f411..ff98d7f85dce 100644 --- a/package.json +++ b/package.json @@ -151,7 +151,7 @@ "angular-sanitize": "^1.8.0", "bluebird": "3.5.5", "boom": "^7.2.0", - "chalk": "^2.4.2", + "chalk": "^4.1.0", "check-disk-space": "^2.1.0", "chokidar": "^3.4.2", "color": "1.0.3", @@ -331,7 +331,7 @@ "@types/selenium-webdriver": "^4.0.9", "@types/semver": "^5.5.0", "@types/sinon": "^7.0.13", - "@types/strip-ansi": "^3.0.0", + "@types/strip-ansi": "^5.2.1", "@types/styled-components": "^5.1.0", "@types/supertest": "^2.0.5", "@types/supertest-as-promised": "^2.0.38", @@ -343,7 +343,7 @@ "@types/uuid": "^3.4.4", "@types/vinyl": "^2.0.4", "@types/vinyl-fs": "^2.4.11", - "@types/webpack": "^4.41.21", + "@types/webpack": "^4.41.3", "@types/webpack-env": "^1.15.2", "@types/zen-observable": "^0.8.0", "@typescript-eslint/eslint-plugin": "^3.10.0", @@ -470,10 +470,10 @@ "selenium-webdriver": "^4.0.0-alpha.7", "simple-git": "1.116.0", "sinon": "^7.4.2", - "strip-ansi": "^3.0.1", + "strip-ansi": "^6.0.0", "supertest": "^3.1.0", "supertest-as-promised": "^4.0.2", - "tape": "^4.13.0", + "tape": "^5.0.1", "topojson-client": "3.0.0", "tree-kill": "^1.2.2", "typescript": "4.0.2", diff --git a/packages/kbn-apm-config-loader/package.json b/packages/kbn-apm-config-loader/package.json index 1982ccdeda0f..c570fdc0218b 100644 --- a/packages/kbn-apm-config-loader/package.json +++ b/packages/kbn-apm-config-loader/package.json @@ -18,6 +18,6 @@ }, "devDependencies": { "typescript": "4.0.2", - "tsd": "^0.7.4" + "tsd": "^0.13.1" } } diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json index 40d34c5d710b..c3733094350b 100644 --- a/packages/kbn-es/package.json +++ b/packages/kbn-es/package.json @@ -9,7 +9,7 @@ "kbn:watch": "node scripts/build --watch" }, "dependencies": { - "@elastic/elasticsearch": "7.9.0-rc.1", + "@elastic/elasticsearch": "7.9.1", "@kbn/dev-utils": "1.0.0", "abort-controller": "^3.0.0", "chalk": "^4.1.0", diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json index 65b44b696504..a2c4e1e2134e 100644 --- a/packages/kbn-plugin-helpers/package.json +++ b/packages/kbn-plugin-helpers/package.json @@ -18,7 +18,7 @@ "del": "^5.1.0", "execa": "^4.0.2", "gulp-zip": "^5.0.2", - "inquirer": "^1.2.2", + "inquirer": "^7.3.3", "load-json-file": "^6.2.0", "vinyl-fs": "^3.0.3" }, diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 7dcfc1d778ea..2882a72b3ac9 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -94,7 +94,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; }); -/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(496); +/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(500); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; }); /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(145); @@ -103,10 +103,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(163); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return _utils_project__WEBPACK_IMPORTED_MODULE_3__["Project"]; }); -/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(275); +/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(270); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__["copyWorkspacePackages"]; }); -/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(276); +/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(271); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; }); /* @@ -150,7 +150,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(5); /* harmony import */ var _kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_tooling_log__WEBPACK_IMPORTED_MODULE_3__); /* harmony import */ var _commands__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(127); -/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(489); +/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(493); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(143); /* * Licensed to Elasticsearch B.V. under one or more contributor @@ -8763,9 +8763,9 @@ exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commands", function() { return commands; }); /* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(128); -/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(388); -/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(389); +/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(279); +/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(392); +/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(393); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -8806,10 +8806,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(143); /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(144); /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(145); -/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(277); -/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(282); -/* harmony import */ var _utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(279); -/* harmony import */ var _utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(283); +/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(272); +/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(277); +/* harmony import */ var _utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(274); +/* harmony import */ var _utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(278); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -10831,7 +10831,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__); /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(162); /* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(163); -/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(275); +/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(270); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -23648,11 +23648,11 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawnStreaming", function() { return spawnStreaming; }); /* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(137); /* harmony import */ var stream__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(stream__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227); +/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(112); /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(232); +/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(227); /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(267); +/* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(262); /* harmony import */ var strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(strong_log_transformer__WEBPACK_IMPORTED_MODULE_3__); /* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(143); function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } @@ -23743,602 +23743,18 @@ function spawnStreaming(command, args, opts, { "use strict"; -const ansiStyles = __webpack_require__(113); -const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(228); -const { - stringReplaceAll, - stringEncaseCRLFWithFirstIndex -} = __webpack_require__(230); - -const {isArray} = Array; - -// `supportsColor.level` → `ansiStyles.color[name]` mapping -const levelMapping = [ - 'ansi', - 'ansi', - 'ansi256', - 'ansi16m' -]; - -const styles = Object.create(null); - -const applyOptions = (object, options = {}) => { - if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) { - throw new Error('The `level` option should be an integer from 0 to 3'); - } - - // Detect level if not set manually - const colorLevel = stdoutColor ? stdoutColor.level : 0; - object.level = options.level === undefined ? colorLevel : options.level; -}; - -class ChalkClass { - constructor(options) { - // eslint-disable-next-line no-constructor-return - return chalkFactory(options); - } -} - -const chalkFactory = options => { - const chalk = {}; - applyOptions(chalk, options); - - chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_); - - Object.setPrototypeOf(chalk, Chalk.prototype); - Object.setPrototypeOf(chalk.template, chalk); - - chalk.template.constructor = () => { - throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.'); - }; - - chalk.template.Instance = ChalkClass; - - return chalk.template; -}; - -function Chalk(options) { - return chalkFactory(options); -} - -for (const [styleName, style] of Object.entries(ansiStyles)) { - styles[styleName] = { - get() { - const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty); - Object.defineProperty(this, styleName, {value: builder}); - return builder; - } - }; -} - -styles.visible = { - get() { - const builder = createBuilder(this, this._styler, true); - Object.defineProperty(this, 'visible', {value: builder}); - return builder; - } -}; - -const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256']; - -for (const model of usedModels) { - styles[model] = { - get() { - const {level} = this; - return function (...arguments_) { - const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler); - return createBuilder(this, styler, this._isEmpty); - }; - } - }; -} - -for (const model of usedModels) { - const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1); - styles[bgModel] = { - get() { - const {level} = this; - return function (...arguments_) { - const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler); - return createBuilder(this, styler, this._isEmpty); - }; - } - }; -} - -const proto = Object.defineProperties(() => {}, { - ...styles, - level: { - enumerable: true, - get() { - return this._generator.level; - }, - set(level) { - this._generator.level = level; - } - } -}); - -const createStyler = (open, close, parent) => { - let openAll; - let closeAll; - if (parent === undefined) { - openAll = open; - closeAll = close; - } else { - openAll = parent.openAll + open; - closeAll = close + parent.closeAll; - } - - return { - open, - close, - openAll, - closeAll, - parent - }; -}; - -const createBuilder = (self, _styler, _isEmpty) => { - const builder = (...arguments_) => { - if (isArray(arguments_[0]) && isArray(arguments_[0].raw)) { - // Called as a template literal, for example: chalk.red`2 + 3 = {bold ${2+3}}` - return applyStyle(builder, chalkTag(builder, ...arguments_)); - } - - // Single argument is hot path, implicit coercion is faster than anything - // eslint-disable-next-line no-implicit-coercion - return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' ')); - }; - - // We alter the prototype because we must return a function, but there is - // no way to create a function with a different prototype - Object.setPrototypeOf(builder, proto); - - builder._generator = self; - builder._styler = _styler; - builder._isEmpty = _isEmpty; - - return builder; -}; - -const applyStyle = (self, string) => { - if (self.level <= 0 || !string) { - return self._isEmpty ? '' : string; - } - - let styler = self._styler; - - if (styler === undefined) { - return string; - } - - const {openAll, closeAll} = styler; - if (string.indexOf('\u001B') !== -1) { - while (styler !== undefined) { - // Replace any instances already present with a re-opening code - // otherwise only the part of the string until said closing code - // will be colored, and the rest will simply be 'plain'. - string = stringReplaceAll(string, styler.close, styler.open); - - styler = styler.parent; - } - } - - // We can move both next actions out of loop, because remaining actions in loop won't have - // any/visible effect on parts we add here. Close the styling before a linebreak and reopen - // after next line to fix a bleed issue on macOS: https://github.com/chalk/chalk/pull/92 - const lfIndex = string.indexOf('\n'); - if (lfIndex !== -1) { - string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex); - } - - return openAll + string + closeAll; -}; - -let template; -const chalkTag = (chalk, ...strings) => { - const [firstString] = strings; - - if (!isArray(firstString) || !isArray(firstString.raw)) { - // If chalk() was called by itself or with a string, - // return the string itself as a string. - return strings.join(' '); - } - - const arguments_ = strings.slice(1); - const parts = [firstString.raw[0]]; - - for (let i = 1; i < firstString.length; i++) { - parts.push( - String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'), - String(firstString.raw[i]) - ); - } - - if (template === undefined) { - template = __webpack_require__(231); - } - - return template(chalk, parts.join('')); -}; - -Object.defineProperties(Chalk.prototype, styles); - -const chalk = Chalk(); // eslint-disable-line new-cap -chalk.supportsColor = stdoutColor; -chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap -chalk.stderr.supportsColor = stderrColor; - -module.exports = chalk; - - -/***/ }), -/* 228 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -const os = __webpack_require__(120); -const tty = __webpack_require__(121); -const hasFlag = __webpack_require__(229); - -const {env} = process; - -let forceColor; -if (hasFlag('no-color') || - hasFlag('no-colors') || - hasFlag('color=false') || - hasFlag('color=never')) { - forceColor = 0; -} else if (hasFlag('color') || - hasFlag('colors') || - hasFlag('color=true') || - hasFlag('color=always')) { - forceColor = 1; -} - -if ('FORCE_COLOR' in env) { - if (env.FORCE_COLOR === 'true') { - forceColor = 1; - } else if (env.FORCE_COLOR === 'false') { - forceColor = 0; - } else { - forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3); - } -} - -function translateLevel(level) { - if (level === 0) { - return false; - } - - return { - level, - hasBasic: true, - has256: level >= 2, - has16m: level >= 3 - }; -} - -function supportsColor(haveStream, streamIsTTY) { - if (forceColor === 0) { - return 0; - } - - if (hasFlag('color=16m') || - hasFlag('color=full') || - hasFlag('color=truecolor')) { - return 3; - } - - if (hasFlag('color=256')) { - return 2; - } - - if (haveStream && !streamIsTTY && forceColor === undefined) { - return 0; - } - - const min = forceColor || 0; - - if (env.TERM === 'dumb') { - return min; - } - - if (process.platform === 'win32') { - // Windows 10 build 10586 is the first Windows release that supports 256 colors. - // Windows 10 build 14931 is the first release that supports 16m/TrueColor. - const osRelease = os.release().split('.'); - if ( - Number(osRelease[0]) >= 10 && - Number(osRelease[2]) >= 10586 - ) { - return Number(osRelease[2]) >= 14931 ? 3 : 2; - } - - return 1; - } - - if ('CI' in env) { - if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') { - return 1; - } - - return min; - } - - if ('TEAMCITY_VERSION' in env) { - return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0; - } - - if ('GITHUB_ACTIONS' in env) { - return 1; - } - - if (env.COLORTERM === 'truecolor') { - return 3; - } - - if ('TERM_PROGRAM' in env) { - const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10); - - switch (env.TERM_PROGRAM) { - case 'iTerm.app': - return version >= 3 ? 3 : 2; - case 'Apple_Terminal': - return 2; - // No default - } - } - - if (/-256(color)?$/i.test(env.TERM)) { - return 2; - } - - if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) { - return 1; - } - - if ('COLORTERM' in env) { - return 1; - } - - return min; -} - -function getSupportLevel(stream) { - const level = supportsColor(stream, stream && stream.isTTY); - return translateLevel(level); -} - -module.exports = { - supportsColor: getSupportLevel, - stdout: translateLevel(supportsColor(true, tty.isatty(1))), - stderr: translateLevel(supportsColor(true, tty.isatty(2))) -}; - - -/***/ }), -/* 229 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -module.exports = (flag, argv = process.argv) => { - const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); - const position = argv.indexOf(prefix + flag); - const terminatorPosition = argv.indexOf('--'); - return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition); -}; - - -/***/ }), -/* 230 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -const stringReplaceAll = (string, substring, replacer) => { - let index = string.indexOf(substring); - if (index === -1) { - return string; - } - - const substringLength = substring.length; - let endIndex = 0; - let returnValue = ''; - do { - returnValue += string.substr(endIndex, index - endIndex) + substring + replacer; - endIndex = index + substringLength; - index = string.indexOf(substring, endIndex); - } while (index !== -1); - - returnValue += string.substr(endIndex); - return returnValue; -}; - -const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => { - let endIndex = 0; - let returnValue = ''; - do { - const gotCR = string[index - 1] === '\r'; - returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix; - endIndex = index + 1; - index = string.indexOf('\n', endIndex); - } while (index !== -1); - - returnValue += string.substr(endIndex); - return returnValue; -}; - -module.exports = { - stringReplaceAll, - stringEncaseCRLFWithFirstIndex -}; - - -/***/ }), -/* 231 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi; -const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g; -const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/; -const ESCAPE_REGEX = /\\(u(?:[a-f\d]{4}|{[a-f\d]{1,6}})|x[a-f\d]{2}|.)|([^\\])/gi; - -const ESCAPES = new Map([ - ['n', '\n'], - ['r', '\r'], - ['t', '\t'], - ['b', '\b'], - ['f', '\f'], - ['v', '\v'], - ['0', '\0'], - ['\\', '\\'], - ['e', '\u001B'], - ['a', '\u0007'] -]); - -function unescape(c) { - const u = c[0] === 'u'; - const bracket = c[1] === '{'; - - if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) { - return String.fromCharCode(parseInt(c.slice(1), 16)); - } - - if (u && bracket) { - return String.fromCodePoint(parseInt(c.slice(2, -1), 16)); - } - - return ESCAPES.get(c) || c; -} - -function parseArguments(name, arguments_) { - const results = []; - const chunks = arguments_.trim().split(/\s*,\s*/g); - let matches; - - for (const chunk of chunks) { - const number = Number(chunk); - if (!Number.isNaN(number)) { - results.push(number); - } else if ((matches = chunk.match(STRING_REGEX))) { - results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character)); - } else { - throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`); - } - } - - return results; -} - -function parseStyle(style) { - STYLE_REGEX.lastIndex = 0; - - const results = []; - let matches; - - while ((matches = STYLE_REGEX.exec(style)) !== null) { - const name = matches[1]; - - if (matches[2]) { - const args = parseArguments(name, matches[2]); - results.push([name].concat(args)); - } else { - results.push([name]); - } - } - - return results; -} - -function buildStyle(chalk, styles) { - const enabled = {}; - - for (const layer of styles) { - for (const style of layer.styles) { - enabled[style[0]] = layer.inverse ? null : style.slice(1); - } - } - - let current = chalk; - for (const [styleName, styles] of Object.entries(enabled)) { - if (!Array.isArray(styles)) { - continue; - } - - if (!(styleName in current)) { - throw new Error(`Unknown Chalk style: ${styleName}`); - } - - current = styles.length > 0 ? current[styleName](...styles) : current[styleName]; - } - - return current; -} - -module.exports = (chalk, temporary) => { - const styles = []; - const chunks = []; - let chunk = []; - - // eslint-disable-next-line max-params - temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => { - if (escapeCharacter) { - chunk.push(unescape(escapeCharacter)); - } else if (style) { - const string = chunk.join(''); - chunk = []; - chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string)); - styles.push({inverse, styles: parseStyle(style)}); - } else if (close) { - if (styles.length === 0) { - throw new Error('Found extraneous } in Chalk template literal'); - } - - chunks.push(buildStyle(chalk, styles)(chunk.join(''))); - chunk = []; - styles.pop(); - } else { - chunk.push(character); - } - }); - - chunks.push(chunk.join('')); - - if (styles.length > 0) { - const errMessage = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`; - throw new Error(errMessage); - } - - return chunks.join(''); -}; - - -/***/ }), -/* 232 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - const path = __webpack_require__(4); -const childProcess = __webpack_require__(233); -const crossSpawn = __webpack_require__(234); -const stripFinalNewline = __webpack_require__(247); -const npmRunPath = __webpack_require__(248); -const onetime = __webpack_require__(249); -const makeError = __webpack_require__(251); -const normalizeStdio = __webpack_require__(256); -const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(257); -const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(258); -const {mergePromise, getSpawnedPromise} = __webpack_require__(265); -const {joinCommand, parseCommand} = __webpack_require__(266); +const childProcess = __webpack_require__(228); +const crossSpawn = __webpack_require__(229); +const stripFinalNewline = __webpack_require__(242); +const npmRunPath = __webpack_require__(243); +const onetime = __webpack_require__(244); +const makeError = __webpack_require__(246); +const normalizeStdio = __webpack_require__(251); +const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(252); +const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(253); +const {mergePromise, getSpawnedPromise} = __webpack_require__(260); +const {joinCommand, parseCommand} = __webpack_require__(261); const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100; @@ -24585,21 +24001,21 @@ module.exports.node = (scriptPath, args, options = {}) => { /***/ }), -/* 233 */ +/* 228 */ /***/ (function(module, exports) { module.exports = require("child_process"); /***/ }), -/* 234 */ +/* 229 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const cp = __webpack_require__(233); -const parse = __webpack_require__(235); -const enoent = __webpack_require__(246); +const cp = __webpack_require__(228); +const parse = __webpack_require__(230); +const enoent = __webpack_require__(241); function spawn(command, args, options) { // Parse the arguments @@ -24637,16 +24053,16 @@ module.exports._enoent = enoent; /***/ }), -/* 235 */ +/* 230 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const resolveCommand = __webpack_require__(236); -const escape = __webpack_require__(242); -const readShebang = __webpack_require__(243); +const resolveCommand = __webpack_require__(231); +const escape = __webpack_require__(237); +const readShebang = __webpack_require__(238); const isWin = process.platform === 'win32'; const isExecutableRegExp = /\.(?:com|exe)$/i; @@ -24735,15 +24151,15 @@ module.exports = parse; /***/ }), -/* 236 */ +/* 231 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const which = __webpack_require__(237); -const pathKey = __webpack_require__(241)(); +const which = __webpack_require__(232); +const pathKey = __webpack_require__(236)(); function resolveCommandAttempt(parsed, withoutPathExt) { const cwd = process.cwd(); @@ -24793,7 +24209,7 @@ module.exports = resolveCommand; /***/ }), -/* 237 */ +/* 232 */ /***/ (function(module, exports, __webpack_require__) { const isWindows = process.platform === 'win32' || @@ -24802,7 +24218,7 @@ const isWindows = process.platform === 'win32' || const path = __webpack_require__(4) const COLON = isWindows ? ';' : ':' -const isexe = __webpack_require__(238) +const isexe = __webpack_require__(233) const getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' }) @@ -24924,15 +24340,15 @@ which.sync = whichSync /***/ }), -/* 238 */ +/* 233 */ /***/ (function(module, exports, __webpack_require__) { var fs = __webpack_require__(133) var core if (process.platform === 'win32' || global.TESTING_WINDOWS) { - core = __webpack_require__(239) + core = __webpack_require__(234) } else { - core = __webpack_require__(240) + core = __webpack_require__(235) } module.exports = isexe @@ -24987,7 +24403,7 @@ function sync (path, options) { /***/ }), -/* 239 */ +/* 234 */ /***/ (function(module, exports, __webpack_require__) { module.exports = isexe @@ -25035,7 +24451,7 @@ function sync (path, options) { /***/ }), -/* 240 */ +/* 235 */ /***/ (function(module, exports, __webpack_require__) { module.exports = isexe @@ -25082,7 +24498,7 @@ function checkMode (stat, options) { /***/ }), -/* 241 */ +/* 236 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25105,7 +24521,7 @@ module.exports.default = pathKey; /***/ }), -/* 242 */ +/* 237 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25157,14 +24573,14 @@ module.exports.argument = escapeArgument; /***/ }), -/* 243 */ +/* 238 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(133); -const shebangCommand = __webpack_require__(244); +const shebangCommand = __webpack_require__(239); function readShebang(command) { // Read the first 150 bytes from the file @@ -25187,12 +24603,12 @@ module.exports = readShebang; /***/ }), -/* 244 */ +/* 239 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const shebangRegex = __webpack_require__(245); +const shebangRegex = __webpack_require__(240); module.exports = (string = '') => { const match = string.match(shebangRegex); @@ -25213,7 +24629,7 @@ module.exports = (string = '') => { /***/ }), -/* 245 */ +/* 240 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25222,7 +24638,7 @@ module.exports = /^#!(.*)/; /***/ }), -/* 246 */ +/* 241 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25288,7 +24704,7 @@ module.exports = { /***/ }), -/* 247 */ +/* 242 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25311,13 +24727,13 @@ module.exports = input => { /***/ }), -/* 248 */ +/* 243 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const pathKey = __webpack_require__(241); +const pathKey = __webpack_require__(236); const npmRunPath = options => { options = { @@ -25365,12 +24781,12 @@ module.exports.env = options => { /***/ }), -/* 249 */ +/* 244 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const mimicFn = __webpack_require__(250); +const mimicFn = __webpack_require__(245); const calledFunctions = new WeakMap(); @@ -25422,7 +24838,7 @@ module.exports.callCount = fn => { /***/ }), -/* 250 */ +/* 245 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25442,12 +24858,12 @@ module.exports.default = mimicFn; /***/ }), -/* 251 */ +/* 246 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const {signalsByName} = __webpack_require__(252); +const {signalsByName} = __webpack_require__(247); const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => { if (timedOut) { @@ -25535,14 +24951,14 @@ module.exports = makeError; /***/ }), -/* 252 */ +/* 247 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(120); -var _signals=__webpack_require__(253); -var _realtime=__webpack_require__(255); +var _signals=__webpack_require__(248); +var _realtime=__webpack_require__(250); @@ -25612,14 +25028,14 @@ const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumb //# sourceMappingURL=main.js.map /***/ }), -/* 253 */ +/* 248 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(120); -var _core=__webpack_require__(254); -var _realtime=__webpack_require__(255); +var _core=__webpack_require__(249); +var _realtime=__webpack_require__(250); @@ -25653,7 +25069,7 @@ return{name,number,description,supported,action,forced,standard}; //# sourceMappingURL=signals.js.map /***/ }), -/* 254 */ +/* 249 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25932,7 +25348,7 @@ standard:"other"}];exports.SIGNALS=SIGNALS; //# sourceMappingURL=core.js.map /***/ }), -/* 255 */ +/* 250 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25957,7 +25373,7 @@ const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX; //# sourceMappingURL=realtime.js.map /***/ }), -/* 256 */ +/* 251 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26016,7 +25432,7 @@ module.exports.node = opts => { /***/ }), -/* 257 */ +/* 252 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26135,14 +25551,14 @@ module.exports = { /***/ }), -/* 258 */ +/* 253 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const isStream = __webpack_require__(259); -const getStream = __webpack_require__(260); -const mergeStream = __webpack_require__(264); +const isStream = __webpack_require__(254); +const getStream = __webpack_require__(255); +const mergeStream = __webpack_require__(259); // `input` option const handleInput = (spawned, input) => { @@ -26239,7 +25655,7 @@ module.exports = { /***/ }), -/* 259 */ +/* 254 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26275,13 +25691,13 @@ module.exports = isStream; /***/ }), -/* 260 */ +/* 255 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const pump = __webpack_require__(261); -const bufferStream = __webpack_require__(263); +const pump = __webpack_require__(256); +const bufferStream = __webpack_require__(258); class MaxBufferError extends Error { constructor() { @@ -26340,11 +25756,11 @@ module.exports.MaxBufferError = MaxBufferError; /***/ }), -/* 261 */ +/* 256 */ /***/ (function(module, exports, __webpack_require__) { var once = __webpack_require__(161) -var eos = __webpack_require__(262) +var eos = __webpack_require__(257) var fs = __webpack_require__(133) // we only need fs to get the ReadStream and WriteStream prototypes var noop = function () {} @@ -26428,7 +25844,7 @@ module.exports = pump /***/ }), -/* 262 */ +/* 257 */ /***/ (function(module, exports, __webpack_require__) { var once = __webpack_require__(161); @@ -26528,7 +25944,7 @@ module.exports = eos; /***/ }), -/* 263 */ +/* 258 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26587,7 +26003,7 @@ module.exports = options => { /***/ }), -/* 264 */ +/* 259 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26635,7 +26051,7 @@ module.exports = function (/*streams...*/) { /***/ }), -/* 265 */ +/* 260 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26688,7 +26104,7 @@ module.exports = { /***/ }), -/* 266 */ +/* 261 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26733,7 +26149,7 @@ module.exports = { /***/ }), -/* 267 */ +/* 262 */ /***/ (function(module, exports, __webpack_require__) { // Copyright IBM Corp. 2014,2018. All Rights Reserved. @@ -26741,12 +26157,12 @@ module.exports = { // This file is licensed under the Apache License 2.0. // License text available at https://opensource.org/licenses/Apache-2.0 -module.exports = __webpack_require__(268); -module.exports.cli = __webpack_require__(272); +module.exports = __webpack_require__(263); +module.exports.cli = __webpack_require__(267); /***/ }), -/* 268 */ +/* 263 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -26761,9 +26177,9 @@ var stream = __webpack_require__(137); var util = __webpack_require__(111); var fs = __webpack_require__(133); -var through = __webpack_require__(269); -var duplexer = __webpack_require__(270); -var StringDecoder = __webpack_require__(271).StringDecoder; +var through = __webpack_require__(264); +var duplexer = __webpack_require__(265); +var StringDecoder = __webpack_require__(266).StringDecoder; module.exports = Logger; @@ -26952,7 +26368,7 @@ function lineMerger(host) { /***/ }), -/* 269 */ +/* 264 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(137) @@ -27066,7 +26482,7 @@ function through (write, end, opts) { /***/ }), -/* 270 */ +/* 265 */ /***/ (function(module, exports, __webpack_require__) { var Stream = __webpack_require__(137) @@ -27159,13 +26575,13 @@ function duplex(writer, reader) { /***/ }), -/* 271 */ +/* 266 */ /***/ (function(module, exports) { module.exports = require("string_decoder"); /***/ }), -/* 272 */ +/* 267 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -27176,11 +26592,11 @@ module.exports = require("string_decoder"); -var minimist = __webpack_require__(273); +var minimist = __webpack_require__(268); var path = __webpack_require__(4); -var Logger = __webpack_require__(268); -var pkg = __webpack_require__(274); +var Logger = __webpack_require__(263); +var pkg = __webpack_require__(269); module.exports = cli; @@ -27234,7 +26650,7 @@ function usage($0, p) { /***/ }), -/* 273 */ +/* 268 */ /***/ (function(module, exports) { module.exports = function (args, opts) { @@ -27485,13 +26901,13 @@ function isNumber (x) { /***/ }), -/* 274 */ +/* 269 */ /***/ (function(module) { module.exports = JSON.parse("{\"name\":\"strong-log-transformer\",\"version\":\"2.1.0\",\"description\":\"Stream transformer that prefixes lines with timestamps and other things.\",\"author\":\"Ryan Graham \",\"license\":\"Apache-2.0\",\"repository\":{\"type\":\"git\",\"url\":\"git://github.com/strongloop/strong-log-transformer\"},\"keywords\":[\"logging\",\"streams\"],\"bugs\":{\"url\":\"https://github.com/strongloop/strong-log-transformer/issues\"},\"homepage\":\"https://github.com/strongloop/strong-log-transformer\",\"directories\":{\"test\":\"test\"},\"bin\":{\"sl-log-transformer\":\"bin/sl-log-transformer.js\"},\"main\":\"index.js\",\"scripts\":{\"test\":\"tap --100 test/test-*\"},\"dependencies\":{\"duplexer\":\"^0.1.1\",\"minimist\":\"^1.2.0\",\"through\":\"^2.3.4\"},\"devDependencies\":{\"tap\":\"^12.0.1\"},\"engines\":{\"node\":\">=4\"}}"); /***/ }), -/* 275 */ +/* 270 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -27504,7 +26920,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(111); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(276); +/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(271); /* harmony import */ var _fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(130); /* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(164); /* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(145); @@ -27599,7 +27015,7 @@ function packagesFromGlobPattern({ } /***/ }), -/* 276 */ +/* 271 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -27669,7 +27085,7 @@ function getProjectPaths({ } /***/ }), -/* 277 */ +/* 272 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -27677,13 +27093,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllChecksums", function() { return getAllChecksums; }); /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(133); /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278); +/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(273); /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(111); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(232); +/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(227); /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__); -/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(279); +/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(274); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -27882,20 +27298,20 @@ async function getAllChecksums(kbn, log, yarnLock) { } /***/ }), -/* 278 */ +/* 273 */ /***/ (function(module, exports) { module.exports = require("crypto"); /***/ }), -/* 279 */ +/* 274 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "resolveDepsForProject", function() { return resolveDepsForProject; }); -/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(280); +/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275); /* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(130); /* @@ -28008,7 +27424,7 @@ function resolveDepsForProject({ } /***/ }), -/* 280 */ +/* 275 */ /***/ (function(module, exports, __webpack_require__) { module.exports = @@ -29567,7 +28983,7 @@ module.exports = invariant; /* 9 */ /***/ (function(module, exports) { -module.exports = __webpack_require__(278); +module.exports = __webpack_require__(273); /***/ }), /* 10 */, @@ -31891,7 +31307,7 @@ function onceStrict (fn) { /* 63 */ /***/ (function(module, exports) { -module.exports = __webpack_require__(281); +module.exports = __webpack_require__(276); /***/ }), /* 64 */, @@ -38286,13 +37702,13 @@ module.exports = process && support(supportLevel); /******/ ]); /***/ }), -/* 281 */ +/* 276 */ /***/ (function(module, exports) { module.exports = require("buffer"); /***/ }), -/* 282 */ +/* 277 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -38389,13 +37805,13 @@ class BootstrapCacheFile { } /***/ }), -/* 283 */ +/* 278 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "validateYarnLock", function() { return validateYarnLock; }); -/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(280); +/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275); /* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2); /* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_1__); @@ -38490,21 +37906,73 @@ async function validateYarnLock(kbn, yarnLock) { `); process.exit(1); + } // TODO: remove this once we move into a single package.json + // look through all the package.json files to find packages which have mismatched version ranges + + + const depRanges = new Map(); + + for (const project of kbn.getAllProjects().values()) { + for (const [dep, range] of Object.entries(project.allDependencies)) { + const existingDep = depRanges.get(dep); + + if (!existingDep) { + depRanges.set(dep, [{ + range, + projects: [project] + }]); + continue; + } + + const existingRange = existingDep.find(existing => existing.range === range); + + if (!existingRange) { + existingDep.push({ + range, + projects: [project] + }); + continue; + } + + existingRange.projects.push(project); + } + } + + const duplicateRanges = Array.from(depRanges.entries()).filter(([, ranges]) => ranges.length > 1).reduce((acc, [dep, ranges]) => [...acc, dep, ...ranges.map(({ + range, + projects + }) => ` ${range} => ${projects.map(p => p.name).join(', ')}`)], []).join('\n '); + + if (duplicateRanges) { + _log__WEBPACK_IMPORTED_MODULE_3__["log"].error(dedent__WEBPACK_IMPORTED_MODULE_1___default.a` + + [single_version_dependencies] Multiple version ranges for the same dependency + were found declared across different package.json files. Please consolidate + those to match across all package.json files. Different versions for the + same dependency is not supported. + + If you have questions about this please reach out to the operations team. + + The conflicting dependencies are: + + ${duplicateRanges} + `); + process.exit(1); } _log__WEBPACK_IMPORTED_MODULE_3__["log"].success('yarn.lock analysis completed without any issues'); } /***/ }), -/* 284 */ +/* 279 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CleanCommand", function() { return CleanCommand; }); -/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(285); +/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(280); /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(372); +/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(367); /* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__); @@ -38604,21 +38072,21 @@ const CleanCommand = { }; /***/ }), -/* 285 */ +/* 280 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const {promisify} = __webpack_require__(111); const path = __webpack_require__(4); -const globby = __webpack_require__(286); -const isGlob = __webpack_require__(364); -const slash = __webpack_require__(362); +const globby = __webpack_require__(281); +const isGlob = __webpack_require__(359); +const slash = __webpack_require__(357); const gracefulFs = __webpack_require__(132); -const isPathCwd = __webpack_require__(365); -const isPathInside = __webpack_require__(366); -const rimraf = __webpack_require__(367); -const pMap = __webpack_require__(368); +const isPathCwd = __webpack_require__(360); +const isPathInside = __webpack_require__(361); +const rimraf = __webpack_require__(362); +const pMap = __webpack_require__(363); const rimrafP = promisify(rimraf); @@ -38732,19 +38200,19 @@ module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options /***/ }), -/* 286 */ +/* 281 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(133); -const arrayUnion = __webpack_require__(287); -const merge2 = __webpack_require__(288); +const arrayUnion = __webpack_require__(282); +const merge2 = __webpack_require__(283); const glob = __webpack_require__(146); -const fastGlob = __webpack_require__(289); -const dirGlob = __webpack_require__(358); -const gitignore = __webpack_require__(360); -const {FilterStream, UniqueStream} = __webpack_require__(363); +const fastGlob = __webpack_require__(284); +const dirGlob = __webpack_require__(353); +const gitignore = __webpack_require__(355); +const {FilterStream, UniqueStream} = __webpack_require__(358); const DEFAULT_FILTER = () => false; @@ -38917,7 +38385,7 @@ module.exports.gitignore = gitignore; /***/ }), -/* 287 */ +/* 282 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -38929,7 +38397,7 @@ module.exports = (...arguments_) => { /***/ }), -/* 288 */ +/* 283 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39080,17 +38548,17 @@ function pauseStreams (streams, options) { /***/ }), -/* 289 */ +/* 284 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const taskManager = __webpack_require__(290); -const async_1 = __webpack_require__(319); -const stream_1 = __webpack_require__(354); -const sync_1 = __webpack_require__(355); -const settings_1 = __webpack_require__(357); -const utils = __webpack_require__(291); +const taskManager = __webpack_require__(285); +const async_1 = __webpack_require__(314); +const stream_1 = __webpack_require__(349); +const sync_1 = __webpack_require__(350); +const settings_1 = __webpack_require__(352); +const utils = __webpack_require__(286); async function FastGlob(source, options) { assertPatternsInput(source); const works = getWorks(source, async_1.default, options); @@ -39154,13 +38622,13 @@ module.exports = FastGlob; /***/ }), -/* 290 */ +/* 285 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const utils = __webpack_require__(291); +const utils = __webpack_require__(286); function generate(patterns, settings) { const positivePatterns = getPositivePatterns(patterns); const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore); @@ -39225,30 +38693,30 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask; /***/ }), -/* 291 */ +/* 286 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const array = __webpack_require__(292); +const array = __webpack_require__(287); exports.array = array; -const errno = __webpack_require__(293); +const errno = __webpack_require__(288); exports.errno = errno; -const fs = __webpack_require__(294); +const fs = __webpack_require__(289); exports.fs = fs; -const path = __webpack_require__(295); +const path = __webpack_require__(290); exports.path = path; -const pattern = __webpack_require__(296); +const pattern = __webpack_require__(291); exports.pattern = pattern; -const stream = __webpack_require__(317); +const stream = __webpack_require__(312); exports.stream = stream; -const string = __webpack_require__(318); +const string = __webpack_require__(313); exports.string = string; /***/ }), -/* 292 */ +/* 287 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39276,7 +38744,7 @@ exports.splitWhen = splitWhen; /***/ }), -/* 293 */ +/* 288 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39289,7 +38757,7 @@ exports.isEnoentCodeError = isEnoentCodeError; /***/ }), -/* 294 */ +/* 289 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39314,7 +38782,7 @@ exports.createDirentFromStats = createDirentFromStats; /***/ }), -/* 295 */ +/* 290 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39353,16 +38821,16 @@ exports.removeLeadingDotSegment = removeLeadingDotSegment; /***/ }), -/* 296 */ +/* 291 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const path = __webpack_require__(4); -const globParent = __webpack_require__(297); -const micromatch = __webpack_require__(300); -const picomatch = __webpack_require__(311); +const globParent = __webpack_require__(292); +const micromatch = __webpack_require__(295); +const picomatch = __webpack_require__(306); const GLOBSTAR = '**'; const ESCAPE_SYMBOL = '\\'; const COMMON_GLOB_SYMBOLS_RE = /[*?]|^!/; @@ -39472,13 +38940,13 @@ exports.matchAny = matchAny; /***/ }), -/* 297 */ +/* 292 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isGlob = __webpack_require__(298); +var isGlob = __webpack_require__(293); var pathPosixDirname = __webpack_require__(4).posix.dirname; var isWin32 = __webpack_require__(120).platform() === 'win32'; @@ -39520,7 +38988,7 @@ module.exports = function globParent(str, opts) { /***/ }), -/* 298 */ +/* 293 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -39530,7 +38998,7 @@ module.exports = function globParent(str, opts) { * Released under the MIT License. */ -var isExtglob = __webpack_require__(299); +var isExtglob = __webpack_require__(294); var chars = { '{': '}', '(': ')', '[': ']'}; var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/; var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/; @@ -39574,7 +39042,7 @@ module.exports = function isGlob(str, options) { /***/ }), -/* 299 */ +/* 294 */ /***/ (function(module, exports) { /*! @@ -39600,16 +39068,16 @@ module.exports = function isExtglob(str) { /***/ }), -/* 300 */ +/* 295 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const util = __webpack_require__(111); -const braces = __webpack_require__(301); -const picomatch = __webpack_require__(311); -const utils = __webpack_require__(314); +const braces = __webpack_require__(296); +const picomatch = __webpack_require__(306); +const utils = __webpack_require__(309); const isEmptyString = val => typeof val === 'string' && (val === '' || val === './'); /** @@ -40074,16 +39542,16 @@ module.exports = micromatch; /***/ }), -/* 301 */ +/* 296 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stringify = __webpack_require__(302); -const compile = __webpack_require__(304); -const expand = __webpack_require__(308); -const parse = __webpack_require__(309); +const stringify = __webpack_require__(297); +const compile = __webpack_require__(299); +const expand = __webpack_require__(303); +const parse = __webpack_require__(304); /** * Expand the given pattern or create a regex-compatible string. @@ -40251,13 +39719,13 @@ module.exports = braces; /***/ }), -/* 302 */ +/* 297 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const utils = __webpack_require__(303); +const utils = __webpack_require__(298); module.exports = (ast, options = {}) => { let stringify = (node, parent = {}) => { @@ -40290,7 +39758,7 @@ module.exports = (ast, options = {}) => { /***/ }), -/* 303 */ +/* 298 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40409,14 +39877,14 @@ exports.flatten = (...args) => { /***/ }), -/* 304 */ +/* 299 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const fill = __webpack_require__(305); -const utils = __webpack_require__(303); +const fill = __webpack_require__(300); +const utils = __webpack_require__(298); const compile = (ast, options = {}) => { let walk = (node, parent = {}) => { @@ -40473,7 +39941,7 @@ module.exports = compile; /***/ }), -/* 305 */ +/* 300 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40487,7 +39955,7 @@ module.exports = compile; const util = __webpack_require__(111); -const toRegexRange = __webpack_require__(306); +const toRegexRange = __webpack_require__(301); const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val); @@ -40729,7 +40197,7 @@ module.exports = fill; /***/ }), -/* 306 */ +/* 301 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40742,7 +40210,7 @@ module.exports = fill; -const isNumber = __webpack_require__(307); +const isNumber = __webpack_require__(302); const toRegexRange = (min, max, options) => { if (isNumber(min) === false) { @@ -41024,7 +40492,7 @@ module.exports = toRegexRange; /***/ }), -/* 307 */ +/* 302 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -41049,15 +40517,15 @@ module.exports = function(num) { /***/ }), -/* 308 */ +/* 303 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const fill = __webpack_require__(305); -const stringify = __webpack_require__(302); -const utils = __webpack_require__(303); +const fill = __webpack_require__(300); +const stringify = __webpack_require__(297); +const utils = __webpack_require__(298); const append = (queue = '', stash = '', enclose = false) => { let result = []; @@ -41169,13 +40637,13 @@ module.exports = expand; /***/ }), -/* 309 */ +/* 304 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stringify = __webpack_require__(302); +const stringify = __webpack_require__(297); /** * Constants @@ -41197,7 +40665,7 @@ const { CHAR_SINGLE_QUOTE, /* ' */ CHAR_NO_BREAK_SPACE, CHAR_ZERO_WIDTH_NOBREAK_SPACE -} = __webpack_require__(310); +} = __webpack_require__(305); /** * parse @@ -41509,7 +40977,7 @@ module.exports = parse; /***/ }), -/* 310 */ +/* 305 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -41573,27 +41041,27 @@ module.exports = { /***/ }), -/* 311 */ +/* 306 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -module.exports = __webpack_require__(312); +module.exports = __webpack_require__(307); /***/ }), -/* 312 */ +/* 307 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const scan = __webpack_require__(313); -const parse = __webpack_require__(316); -const utils = __webpack_require__(314); -const constants = __webpack_require__(315); +const scan = __webpack_require__(308); +const parse = __webpack_require__(311); +const utils = __webpack_require__(309); +const constants = __webpack_require__(310); const isObject = val => val && typeof val === 'object' && !Array.isArray(val); /** @@ -41929,13 +41397,13 @@ module.exports = picomatch; /***/ }), -/* 313 */ +/* 308 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const utils = __webpack_require__(314); +const utils = __webpack_require__(309); const { CHAR_ASTERISK, /* * */ CHAR_AT, /* @ */ @@ -41952,7 +41420,7 @@ const { CHAR_RIGHT_CURLY_BRACE, /* } */ CHAR_RIGHT_PARENTHESES, /* ) */ CHAR_RIGHT_SQUARE_BRACKET /* ] */ -} = __webpack_require__(315); +} = __webpack_require__(310); const isPathSeparator = code => { return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH; @@ -42319,7 +41787,7 @@ module.exports = scan; /***/ }), -/* 314 */ +/* 309 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -42332,7 +41800,7 @@ const { REGEX_REMOVE_BACKSLASH, REGEX_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_GLOBAL -} = __webpack_require__(315); +} = __webpack_require__(310); exports.isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val); exports.hasRegexChars = str => REGEX_SPECIAL_CHARS.test(str); @@ -42390,7 +41858,7 @@ exports.wrapOutput = (input, state = {}, options = {}) => { /***/ }), -/* 315 */ +/* 310 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -42576,14 +42044,14 @@ module.exports = { /***/ }), -/* 316 */ +/* 311 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const constants = __webpack_require__(315); -const utils = __webpack_require__(314); +const constants = __webpack_require__(310); +const utils = __webpack_require__(309); /** * Constants @@ -43661,13 +43129,13 @@ module.exports = parse; /***/ }), -/* 317 */ +/* 312 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const merge2 = __webpack_require__(288); +const merge2 = __webpack_require__(283); function merge(streams) { const mergedStream = merge2(streams); streams.forEach((stream) => { @@ -43684,7 +43152,7 @@ function propagateCloseEventToSources(streams) { /***/ }), -/* 318 */ +/* 313 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43701,14 +43169,14 @@ exports.isEmpty = isEmpty; /***/ }), -/* 319 */ +/* 314 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const stream_1 = __webpack_require__(320); -const provider_1 = __webpack_require__(347); +const stream_1 = __webpack_require__(315); +const provider_1 = __webpack_require__(342); class ProviderAsync extends provider_1.default { constructor() { super(...arguments); @@ -43736,16 +43204,16 @@ exports.default = ProviderAsync; /***/ }), -/* 320 */ +/* 315 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const stream_1 = __webpack_require__(137); -const fsStat = __webpack_require__(321); -const fsWalk = __webpack_require__(326); -const reader_1 = __webpack_require__(346); +const fsStat = __webpack_require__(316); +const fsWalk = __webpack_require__(321); +const reader_1 = __webpack_require__(341); class ReaderStream extends reader_1.default { constructor() { super(...arguments); @@ -43798,15 +43266,15 @@ exports.default = ReaderStream; /***/ }), -/* 321 */ +/* 316 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const async = __webpack_require__(322); -const sync = __webpack_require__(323); -const settings_1 = __webpack_require__(324); +const async = __webpack_require__(317); +const sync = __webpack_require__(318); +const settings_1 = __webpack_require__(319); exports.Settings = settings_1.default; function stat(path, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === 'function') { @@ -43829,7 +43297,7 @@ function getSettings(settingsOrOptions = {}) { /***/ }), -/* 322 */ +/* 317 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43867,7 +43335,7 @@ function callSuccessCallback(callback, result) { /***/ }), -/* 323 */ +/* 318 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43896,13 +43364,13 @@ exports.read = read; /***/ }), -/* 324 */ +/* 319 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fs = __webpack_require__(325); +const fs = __webpack_require__(320); class Settings { constructor(_options = {}) { this._options = _options; @@ -43919,7 +43387,7 @@ exports.default = Settings; /***/ }), -/* 325 */ +/* 320 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -43942,16 +43410,16 @@ exports.createFileSystemAdapter = createFileSystemAdapter; /***/ }), -/* 326 */ +/* 321 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const async_1 = __webpack_require__(327); -const stream_1 = __webpack_require__(342); -const sync_1 = __webpack_require__(343); -const settings_1 = __webpack_require__(345); +const async_1 = __webpack_require__(322); +const stream_1 = __webpack_require__(337); +const sync_1 = __webpack_require__(338); +const settings_1 = __webpack_require__(340); exports.Settings = settings_1.default; function walk(directory, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === 'function') { @@ -43981,13 +43449,13 @@ function getSettings(settingsOrOptions = {}) { /***/ }), -/* 327 */ +/* 322 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const async_1 = __webpack_require__(328); +const async_1 = __webpack_require__(323); class AsyncProvider { constructor(_root, _settings) { this._root = _root; @@ -44018,17 +43486,17 @@ function callSuccessCallback(callback, entries) { /***/ }), -/* 328 */ +/* 323 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const events_1 = __webpack_require__(155); -const fsScandir = __webpack_require__(329); -const fastq = __webpack_require__(338); -const common = __webpack_require__(340); -const reader_1 = __webpack_require__(341); +const fsScandir = __webpack_require__(324); +const fastq = __webpack_require__(333); +const common = __webpack_require__(335); +const reader_1 = __webpack_require__(336); class AsyncReader extends reader_1.default { constructor(_root, _settings) { super(_root, _settings); @@ -44118,15 +43586,15 @@ exports.default = AsyncReader; /***/ }), -/* 329 */ +/* 324 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const async = __webpack_require__(330); -const sync = __webpack_require__(335); -const settings_1 = __webpack_require__(336); +const async = __webpack_require__(325); +const sync = __webpack_require__(330); +const settings_1 = __webpack_require__(331); exports.Settings = settings_1.default; function scandir(path, optionsOrSettingsOrCallback, callback) { if (typeof optionsOrSettingsOrCallback === 'function') { @@ -44149,16 +43617,16 @@ function getSettings(settingsOrOptions = {}) { /***/ }), -/* 330 */ +/* 325 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fsStat = __webpack_require__(321); -const rpl = __webpack_require__(331); -const constants_1 = __webpack_require__(332); -const utils = __webpack_require__(333); +const fsStat = __webpack_require__(316); +const rpl = __webpack_require__(326); +const constants_1 = __webpack_require__(327); +const utils = __webpack_require__(328); function read(directory, settings, callback) { if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) { return readdirWithFileTypes(directory, settings, callback); @@ -44246,7 +43714,7 @@ function callSuccessCallback(callback, result) { /***/ }), -/* 331 */ +/* 326 */ /***/ (function(module, exports) { module.exports = runParallel @@ -44300,7 +43768,7 @@ function runParallel (tasks, cb) { /***/ }), -/* 332 */ +/* 327 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -44320,18 +43788,18 @@ exports.IS_SUPPORT_READDIR_WITH_FILE_TYPES = IS_MATCHED_BY_MAJOR || IS_MATCHED_B /***/ }), -/* 333 */ +/* 328 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fs = __webpack_require__(334); +const fs = __webpack_require__(329); exports.fs = fs; /***/ }), -/* 334 */ +/* 329 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -44356,15 +43824,15 @@ exports.createDirentFromStats = createDirentFromStats; /***/ }), -/* 335 */ +/* 330 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fsStat = __webpack_require__(321); -const constants_1 = __webpack_require__(332); -const utils = __webpack_require__(333); +const fsStat = __webpack_require__(316); +const constants_1 = __webpack_require__(327); +const utils = __webpack_require__(328); function read(directory, settings) { if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) { return readdirWithFileTypes(directory, settings); @@ -44415,15 +43883,15 @@ exports.readdir = readdir; /***/ }), -/* 336 */ +/* 331 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const path = __webpack_require__(4); -const fsStat = __webpack_require__(321); -const fs = __webpack_require__(337); +const fsStat = __webpack_require__(316); +const fs = __webpack_require__(332); class Settings { constructor(_options = {}) { this._options = _options; @@ -44446,7 +43914,7 @@ exports.default = Settings; /***/ }), -/* 337 */ +/* 332 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -44471,13 +43939,13 @@ exports.createFileSystemAdapter = createFileSystemAdapter; /***/ }), -/* 338 */ +/* 333 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var reusify = __webpack_require__(339) +var reusify = __webpack_require__(334) function fastqueue (context, worker, concurrency) { if (typeof context === 'function') { @@ -44651,7 +44119,7 @@ module.exports = fastqueue /***/ }), -/* 339 */ +/* 334 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -44691,7 +44159,7 @@ module.exports = reusify /***/ }), -/* 340 */ +/* 335 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -44722,13 +44190,13 @@ exports.joinPathSegments = joinPathSegments; /***/ }), -/* 341 */ +/* 336 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const common = __webpack_require__(340); +const common = __webpack_require__(335); class Reader { constructor(_root, _settings) { this._root = _root; @@ -44740,14 +44208,14 @@ exports.default = Reader; /***/ }), -/* 342 */ +/* 337 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const stream_1 = __webpack_require__(137); -const async_1 = __webpack_require__(328); +const async_1 = __webpack_require__(323); class StreamProvider { constructor(_root, _settings) { this._root = _root; @@ -44777,13 +44245,13 @@ exports.default = StreamProvider; /***/ }), -/* 343 */ +/* 338 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const sync_1 = __webpack_require__(344); +const sync_1 = __webpack_require__(339); class SyncProvider { constructor(_root, _settings) { this._root = _root; @@ -44798,15 +44266,15 @@ exports.default = SyncProvider; /***/ }), -/* 344 */ +/* 339 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fsScandir = __webpack_require__(329); -const common = __webpack_require__(340); -const reader_1 = __webpack_require__(341); +const fsScandir = __webpack_require__(324); +const common = __webpack_require__(335); +const reader_1 = __webpack_require__(336); class SyncReader extends reader_1.default { constructor() { super(...arguments); @@ -44864,14 +44332,14 @@ exports.default = SyncReader; /***/ }), -/* 345 */ +/* 340 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const path = __webpack_require__(4); -const fsScandir = __webpack_require__(329); +const fsScandir = __webpack_require__(324); class Settings { constructor(_options = {}) { this._options = _options; @@ -44897,15 +44365,15 @@ exports.default = Settings; /***/ }), -/* 346 */ +/* 341 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const path = __webpack_require__(4); -const fsStat = __webpack_require__(321); -const utils = __webpack_require__(291); +const fsStat = __webpack_require__(316); +const utils = __webpack_require__(286); class Reader { constructor(_settings) { this._settings = _settings; @@ -44937,17 +44405,17 @@ exports.default = Reader; /***/ }), -/* 347 */ +/* 342 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const path = __webpack_require__(4); -const deep_1 = __webpack_require__(348); -const entry_1 = __webpack_require__(351); -const error_1 = __webpack_require__(352); -const entry_2 = __webpack_require__(353); +const deep_1 = __webpack_require__(343); +const entry_1 = __webpack_require__(346); +const error_1 = __webpack_require__(347); +const entry_2 = __webpack_require__(348); class Provider { constructor(_settings) { this._settings = _settings; @@ -44992,14 +44460,14 @@ exports.default = Provider; /***/ }), -/* 348 */ +/* 343 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const utils = __webpack_require__(291); -const partial_1 = __webpack_require__(349); +const utils = __webpack_require__(286); +const partial_1 = __webpack_require__(344); class DeepFilter { constructor(_settings, _micromatchOptions) { this._settings = _settings; @@ -45053,13 +44521,13 @@ exports.default = DeepFilter; /***/ }), -/* 349 */ +/* 344 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const matcher_1 = __webpack_require__(350); +const matcher_1 = __webpack_require__(345); class PartialMatcher extends matcher_1.default { match(filepath) { const parts = filepath.split('/'); @@ -45098,13 +44566,13 @@ exports.default = PartialMatcher; /***/ }), -/* 350 */ +/* 345 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const utils = __webpack_require__(291); +const utils = __webpack_require__(286); class Matcher { constructor(_patterns, _settings, _micromatchOptions) { this._patterns = _patterns; @@ -45155,13 +44623,13 @@ exports.default = Matcher; /***/ }), -/* 351 */ +/* 346 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const utils = __webpack_require__(291); +const utils = __webpack_require__(286); class EntryFilter { constructor(_settings, _micromatchOptions) { this._settings = _settings; @@ -45217,13 +44685,13 @@ exports.default = EntryFilter; /***/ }), -/* 352 */ +/* 347 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const utils = __webpack_require__(291); +const utils = __webpack_require__(286); class ErrorFilter { constructor(_settings) { this._settings = _settings; @@ -45239,13 +44707,13 @@ exports.default = ErrorFilter; /***/ }), -/* 353 */ +/* 348 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const utils = __webpack_require__(291); +const utils = __webpack_require__(286); class EntryTransformer { constructor(_settings) { this._settings = _settings; @@ -45272,15 +44740,15 @@ exports.default = EntryTransformer; /***/ }), -/* 354 */ +/* 349 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const stream_1 = __webpack_require__(137); -const stream_2 = __webpack_require__(320); -const provider_1 = __webpack_require__(347); +const stream_2 = __webpack_require__(315); +const provider_1 = __webpack_require__(342); class ProviderStream extends provider_1.default { constructor() { super(...arguments); @@ -45310,14 +44778,14 @@ exports.default = ProviderStream; /***/ }), -/* 355 */ +/* 350 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const sync_1 = __webpack_require__(356); -const provider_1 = __webpack_require__(347); +const sync_1 = __webpack_require__(351); +const provider_1 = __webpack_require__(342); class ProviderSync extends provider_1.default { constructor() { super(...arguments); @@ -45340,15 +44808,15 @@ exports.default = ProviderSync; /***/ }), -/* 356 */ +/* 351 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fsStat = __webpack_require__(321); -const fsWalk = __webpack_require__(326); -const reader_1 = __webpack_require__(346); +const fsStat = __webpack_require__(316); +const fsWalk = __webpack_require__(321); +const reader_1 = __webpack_require__(341); class ReaderSync extends reader_1.default { constructor() { super(...arguments); @@ -45390,7 +44858,7 @@ exports.default = ReaderSync; /***/ }), -/* 357 */ +/* 352 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45449,13 +44917,13 @@ exports.default = Settings; /***/ }), -/* 358 */ +/* 353 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const pathType = __webpack_require__(359); +const pathType = __webpack_require__(354); const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0]; @@ -45531,7 +44999,7 @@ module.exports.sync = (input, options) => { /***/ }), -/* 359 */ +/* 354 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45581,7 +45049,7 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink'); /***/ }), -/* 360 */ +/* 355 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -45589,9 +45057,9 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink'); const {promisify} = __webpack_require__(111); const fs = __webpack_require__(133); const path = __webpack_require__(4); -const fastGlob = __webpack_require__(289); -const gitIgnore = __webpack_require__(361); -const slash = __webpack_require__(362); +const fastGlob = __webpack_require__(284); +const gitIgnore = __webpack_require__(356); +const slash = __webpack_require__(357); const DEFAULT_IGNORE = [ '**/node_modules/**', @@ -45705,7 +45173,7 @@ module.exports.sync = options => { /***/ }), -/* 361 */ +/* 356 */ /***/ (function(module, exports) { // A simple implementation of make-array @@ -46308,7 +45776,7 @@ if ( /***/ }), -/* 362 */ +/* 357 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46326,7 +45794,7 @@ module.exports = path => { /***/ }), -/* 363 */ +/* 358 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46379,7 +45847,7 @@ module.exports = { /***/ }), -/* 364 */ +/* 359 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -46389,7 +45857,7 @@ module.exports = { * Released under the MIT License. */ -var isExtglob = __webpack_require__(299); +var isExtglob = __webpack_require__(294); var chars = { '{': '}', '(': ')', '[': ']'}; var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/; var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/; @@ -46433,7 +45901,7 @@ module.exports = function isGlob(str, options) { /***/ }), -/* 365 */ +/* 360 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46455,7 +45923,7 @@ module.exports = path_ => { /***/ }), -/* 366 */ +/* 361 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -46483,7 +45951,7 @@ module.exports = (childPath, parentPath) => { /***/ }), -/* 367 */ +/* 362 */ /***/ (function(module, exports, __webpack_require__) { const assert = __webpack_require__(139) @@ -46849,12 +46317,12 @@ rimraf.sync = rimrafSync /***/ }), -/* 368 */ +/* 363 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const AggregateError = __webpack_require__(369); +const AggregateError = __webpack_require__(364); module.exports = async ( iterable, @@ -46937,13 +46405,13 @@ module.exports = async ( /***/ }), -/* 369 */ +/* 364 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const indentString = __webpack_require__(370); -const cleanStack = __webpack_require__(371); +const indentString = __webpack_require__(365); +const cleanStack = __webpack_require__(366); const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, ''); @@ -46991,7 +46459,7 @@ module.exports = AggregateError; /***/ }), -/* 370 */ +/* 365 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -47033,7 +46501,7 @@ module.exports = (string, count = 1, options) => { /***/ }), -/* 371 */ +/* 366 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -47080,47 +46548,221 @@ module.exports = (stack, options) => { /***/ }), -/* 372 */ +/* 367 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const chalk = __webpack_require__(373); -const cliCursor = __webpack_require__(378); -const cliSpinners = __webpack_require__(382); -const logSymbols = __webpack_require__(384); +const readline = __webpack_require__(368); +const chalk = __webpack_require__(369); +const cliCursor = __webpack_require__(374); +const cliSpinners = __webpack_require__(376); +const logSymbols = __webpack_require__(378); +const stripAnsi = __webpack_require__(384); +const wcwidth = __webpack_require__(386); +const isInteractive = __webpack_require__(390); +const MuteStream = __webpack_require__(391); + +const TEXT = Symbol('text'); +const PREFIX_TEXT = Symbol('prefixText'); + +const ASCII_ETX_CODE = 0x03; // Ctrl+C emits this code + +class StdinDiscarder { + constructor() { + this.requests = 0; + + this.mutedStream = new MuteStream(); + this.mutedStream.pipe(process.stdout); + this.mutedStream.mute(); + + const self = this; + this.ourEmit = function (event, data, ...args) { + const {stdin} = process; + if (self.requests > 0 || stdin.emit === self.ourEmit) { + if (event === 'keypress') { // Fixes readline behavior + return; + } + + if (event === 'data' && data.includes(ASCII_ETX_CODE)) { + process.emit('SIGINT'); + } + + Reflect.apply(self.oldEmit, this, [event, data, ...args]); + } else { + Reflect.apply(process.stdin.emit, this, [event, data, ...args]); + } + }; + } + + start() { + this.requests++; + + if (this.requests === 1) { + this.realStart(); + } + } + + stop() { + if (this.requests <= 0) { + throw new Error('`stop` called more times than `start`'); + } + + this.requests--; + + if (this.requests === 0) { + this.realStop(); + } + } + + realStart() { + // No known way to make it work reliably on Windows + if (process.platform === 'win32') { + return; + } + + this.rl = readline.createInterface({ + input: process.stdin, + output: this.mutedStream + }); + + this.rl.on('SIGINT', () => { + if (process.listenerCount('SIGINT') === 0) { + process.emit('SIGINT'); + } else { + this.rl.close(); + process.kill(process.pid, 'SIGINT'); + } + }); + } + + realStop() { + if (process.platform === 'win32') { + return; + } + + this.rl.close(); + this.rl = undefined; + } +} + +let stdinDiscarder; class Ora { constructor(options) { + if (!stdinDiscarder) { + stdinDiscarder = new StdinDiscarder(); + } + if (typeof options === 'string') { options = { text: options }; } - this.options = Object.assign({ + this.options = { text: '', color: 'cyan', - stream: process.stderr - }, options); - - const sp = this.options.spinner; - this.spinner = typeof sp === 'object' ? sp : (process.platform === 'win32' ? cliSpinners.line : (cliSpinners[sp] || cliSpinners.dots)); // eslint-disable-line no-nested-ternary + stream: process.stderr, + discardStdin: true, + ...options + }; - if (this.spinner.frames === undefined) { - throw new Error('Spinner must define `frames`'); - } + this.spinner = this.options.spinner; - this.text = this.options.text; this.color = this.options.color; + this.hideCursor = this.options.hideCursor !== false; this.interval = this.options.interval || this.spinner.interval || 100; this.stream = this.options.stream; - this.id = null; + this.id = undefined; + this.isEnabled = typeof this.options.isEnabled === 'boolean' ? this.options.isEnabled : isInteractive({stream: this.stream}); + + // Set *after* `this.stream` + this.text = this.options.text; + this.prefixText = this.options.prefixText; + this.linesToClear = 0; + this.indent = this.options.indent; + this.discardStdin = this.options.discardStdin; + this.isDiscardingStdin = false; + } + + get indent() { + return this._indent; + } + + set indent(indent = 0) { + if (!(indent >= 0 && Number.isInteger(indent))) { + throw new Error('The `indent` option must be an integer from 0 and up'); + } + + this._indent = indent; + } + + _updateInterval(interval) { + if (interval !== undefined) { + this.interval = interval; + } + } + + get spinner() { + return this._spinner; + } + + set spinner(spinner) { this.frameIndex = 0; - this.enabled = typeof this.options.enabled === 'boolean' ? this.options.enabled : ((this.stream && this.stream.isTTY) && !process.env.CI); + + if (typeof spinner === 'object') { + if (spinner.frames === undefined) { + throw new Error('The given spinner must have a `frames` property'); + } + + this._spinner = spinner; + } else if (process.platform === 'win32') { + this._spinner = cliSpinners.line; + } else if (spinner === undefined) { + // Set default spinner + this._spinner = cliSpinners.dots; + } else if (cliSpinners[spinner]) { + this._spinner = cliSpinners[spinner]; + } else { + throw new Error(`There is no built-in spinner named '${spinner}'. See https://github.com/sindresorhus/cli-spinners/blob/master/spinners.json for a full list.`); + } + + this._updateInterval(this._spinner.interval); + } + + get text() { + return this[TEXT]; + } + + get prefixText() { + return this[PREFIX_TEXT]; + } + + get isSpinning() { + return this.id !== undefined; } + + updateLineCount() { + const columns = this.stream.columns || 80; + const fullPrefixText = (typeof this[PREFIX_TEXT] === 'string') ? this[PREFIX_TEXT] + '-' : ''; + this.lineCount = stripAnsi(fullPrefixText + '--' + this[TEXT]).split('\n').reduce((count, line) => { + return count + Math.max(1, Math.ceil(wcwidth(line) / columns)); + }, 0); + } + + set text(value) { + this[TEXT] = value; + this.updateLineCount(); + } + + set prefixText(value) { + this[PREFIX_TEXT] = value; + this.updateLineCount(); + } + frame() { - const frames = this.spinner.frames; + const {frames} = this.spinner; let frame = frames[this.frameIndex]; if (this.color) { @@ -47128,92 +46770,129 @@ class Ora { } this.frameIndex = ++this.frameIndex % frames.length; + const fullPrefixText = (typeof this.prefixText === 'string' && this.prefixText !== '') ? this.prefixText + ' ' : ''; + const fullText = typeof this.text === 'string' ? ' ' + this.text : ''; - return frame + ' ' + this.text; + return fullPrefixText + frame + fullText; } + clear() { - if (!this.enabled) { + if (!this.isEnabled || !this.stream.isTTY) { return this; } - this.stream.clearLine(); - this.stream.cursorTo(0); + for (let i = 0; i < this.linesToClear; i++) { + if (i > 0) { + this.stream.moveCursor(0, -1); + } + + this.stream.clearLine(); + this.stream.cursorTo(this.indent); + } + + this.linesToClear = 0; return this; } + render() { this.clear(); this.stream.write(this.frame()); + this.linesToClear = this.lineCount; return this; } + start(text) { if (text) { this.text = text; } - if (!this.enabled || this.id) { + if (!this.isEnabled) { + if (this.text) { + this.stream.write(`- ${this.text}\n`); + } + + return this; + } + + if (this.isSpinning) { return this; } - cliCursor.hide(this.stream); + if (this.hideCursor) { + cliCursor.hide(this.stream); + } + + if (this.discardStdin && process.stdin.isTTY) { + this.isDiscardingStdin = true; + stdinDiscarder.start(); + } + this.render(); this.id = setInterval(this.render.bind(this), this.interval); return this; } + stop() { - if (!this.enabled) { + if (!this.isEnabled) { return this; } clearInterval(this.id); - this.id = null; + this.id = undefined; this.frameIndex = 0; this.clear(); - cliCursor.show(this.stream); + if (this.hideCursor) { + cliCursor.show(this.stream); + } + + if (this.discardStdin && process.stdin.isTTY && this.isDiscardingStdin) { + stdinDiscarder.stop(); + this.isDiscardingStdin = false; + } return this; } + succeed(text) { return this.stopAndPersist({symbol: logSymbols.success, text}); } + fail(text) { return this.stopAndPersist({symbol: logSymbols.error, text}); } + warn(text) { return this.stopAndPersist({symbol: logSymbols.warning, text}); } - info(text) { - return this.stopAndPersist({symbol: logSymbols.info, text}); - } - stopAndPersist(options) { - if (!this.enabled) { - return this; - } - // Legacy argument - // TODO: Deprecate sometime in the future - if (typeof options === 'string') { - options = { - symbol: options - }; - } + info(text) { + return this.stopAndPersist({symbol: logSymbols.info, text}); + } - options = options || {}; + stopAndPersist(options = {}) { + const prefixText = options.prefixText || this.prefixText; + const fullPrefixText = (typeof prefixText === 'string' && prefixText !== '') ? prefixText + ' ' : ''; + const text = options.text || this.text; + const fullText = (typeof text === 'string') ? ' ' + text : ''; this.stop(); - this.stream.write(`${options.symbol || ' '} ${options.text || this.text}\n`); + this.stream.write(`${fullPrefixText}${options.symbol || ' '}${fullText}\n`); return this; } } -module.exports = function (opts) { - return new Ora(opts); +const oraFactory = function (options) { + return new Ora(options); }; +module.exports = oraFactory; + module.exports.promise = (action, options) => { + // eslint-disable-next-line promise/prefer-await-to-then if (typeof action.then !== 'function') { throw new TypeError('Parameter `action` must be a Promise'); } @@ -47221,451 +46900,298 @@ module.exports.promise = (action, options) => { const spinner = new Ora(options); spinner.start(); - action.then( - () => { + (async () => { + try { + await action; spinner.succeed(); - }, - () => { + } catch (_) { spinner.fail(); } - ); + })(); return spinner; }; /***/ }), -/* 373 */ -/***/ (function(module, exports, __webpack_require__) { +/* 368 */ +/***/ (function(module, exports) { -"use strict"; +module.exports = require("readline"); -const escapeStringRegexp = __webpack_require__(178); -const ansiStyles = __webpack_require__(374); -const stdoutColor = __webpack_require__(375).stdout; +/***/ }), +/* 369 */ +/***/ (function(module, exports, __webpack_require__) { -const template = __webpack_require__(377); +"use strict"; -const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); +const ansiStyles = __webpack_require__(113); +const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(370); +const { + stringReplaceAll, + stringEncaseCRLFWithFirstIndex +} = __webpack_require__(372); // `supportsColor.level` → `ansiStyles.color[name]` mapping -const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m']; - -// `color-convert` models to exclude from the Chalk API due to conflicts and such -const skipModels = new Set(['gray']); +const levelMapping = [ + 'ansi', + 'ansi', + 'ansi256', + 'ansi16m' +]; const styles = Object.create(null); -function applyOptions(obj, options) { - options = options || {}; +const applyOptions = (object, options = {}) => { + if (options.level > 3 || options.level < 0) { + throw new Error('The `level` option should be an integer from 0 to 3'); + } // Detect level if not set manually - const scLevel = stdoutColor ? stdoutColor.level : 0; - obj.level = options.level === undefined ? scLevel : options.level; - obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0; + const colorLevel = stdoutColor ? stdoutColor.level : 0; + object.level = options.level === undefined ? colorLevel : options.level; +}; + +class ChalkClass { + constructor(options) { + return chalkFactory(options); + } } -function Chalk(options) { - // We check for this.template here since calling `chalk.constructor()` - // by itself will have a `this` of a previously constructed chalk object - if (!this || !(this instanceof Chalk) || this.template) { - const chalk = {}; - applyOptions(chalk, options); +const chalkFactory = options => { + const chalk = {}; + applyOptions(chalk, options); - chalk.template = function () { - const args = [].slice.call(arguments); - return chalkTag.apply(null, [chalk.template].concat(args)); - }; + chalk.template = (...arguments_) => chalkTag(chalk.template, ...arguments_); - Object.setPrototypeOf(chalk, Chalk.prototype); - Object.setPrototypeOf(chalk.template, chalk); + Object.setPrototypeOf(chalk, Chalk.prototype); + Object.setPrototypeOf(chalk.template, chalk); - chalk.template.constructor = Chalk; + chalk.template.constructor = () => { + throw new Error('`chalk.constructor()` is deprecated. Use `new chalk.Instance()` instead.'); + }; - return chalk.template; - } + chalk.template.Instance = ChalkClass; - applyOptions(this, options); -} + return chalk.template; +}; -// Use bright blue on Windows as the normal blue color is illegible -if (isSimpleWindowsTerm) { - ansiStyles.blue.open = '\u001B[94m'; +function Chalk(options) { + return chalkFactory(options); } -for (const key of Object.keys(ansiStyles)) { - ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g'); - - styles[key] = { +for (const [styleName, style] of Object.entries(ansiStyles)) { + styles[styleName] = { get() { - const codes = ansiStyles[key]; - return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key); + const builder = createBuilder(this, createStyler(style.open, style.close, this._styler), this._isEmpty); + Object.defineProperty(this, styleName, {value: builder}); + return builder; } }; } styles.visible = { get() { - return build.call(this, this._styles || [], true, 'visible'); + const builder = createBuilder(this, this._styler, true); + Object.defineProperty(this, 'visible', {value: builder}); + return builder; } }; -ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g'); -for (const model of Object.keys(ansiStyles.color.ansi)) { - if (skipModels.has(model)) { - continue; - } +const usedModels = ['rgb', 'hex', 'keyword', 'hsl', 'hsv', 'hwb', 'ansi', 'ansi256']; +for (const model of usedModels) { styles[model] = { get() { - const level = this.level; - return function () { - const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments); - const codes = { - open, - close: ansiStyles.color.close, - closeRe: ansiStyles.color.closeRe - }; - return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); + const {level} = this; + return function (...arguments_) { + const styler = createStyler(ansiStyles.color[levelMapping[level]][model](...arguments_), ansiStyles.color.close, this._styler); + return createBuilder(this, styler, this._isEmpty); }; } }; } -ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g'); -for (const model of Object.keys(ansiStyles.bgColor.ansi)) { - if (skipModels.has(model)) { - continue; - } - +for (const model of usedModels) { const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1); styles[bgModel] = { get() { - const level = this.level; - return function () { - const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments); - const codes = { - open, - close: ansiStyles.bgColor.close, - closeRe: ansiStyles.bgColor.closeRe - }; - return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); + const {level} = this; + return function (...arguments_) { + const styler = createStyler(ansiStyles.bgColor[levelMapping[level]][model](...arguments_), ansiStyles.bgColor.close, this._styler); + return createBuilder(this, styler, this._isEmpty); }; } }; } -const proto = Object.defineProperties(() => {}, styles); - -function build(_styles, _empty, key) { - const builder = function () { - return applyStyle.apply(builder, arguments); - }; - - builder._styles = _styles; - builder._empty = _empty; - - const self = this; - - Object.defineProperty(builder, 'level', { +const proto = Object.defineProperties(() => {}, { + ...styles, + level: { enumerable: true, get() { - return self.level; + return this._generator.level; }, set(level) { - self.level = level; + this._generator.level = level; } - }); + } +}); - Object.defineProperty(builder, 'enabled', { - enumerable: true, - get() { - return self.enabled; - }, - set(enabled) { - self.enabled = enabled; - } - }); +const createStyler = (open, close, parent) => { + let openAll; + let closeAll; + if (parent === undefined) { + openAll = open; + closeAll = close; + } else { + openAll = parent.openAll + open; + closeAll = close + parent.closeAll; + } - // See below for fix regarding invisible grey/dim combination on Windows - builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey'; + return { + open, + close, + openAll, + closeAll, + parent + }; +}; + +const createBuilder = (self, _styler, _isEmpty) => { + const builder = (...arguments_) => { + // Single argument is hot path, implicit coercion is faster than anything + // eslint-disable-next-line no-implicit-coercion + return applyStyle(builder, (arguments_.length === 1) ? ('' + arguments_[0]) : arguments_.join(' ')); + }; // `__proto__` is used because we must return a function, but there is // no way to create a function with a different prototype builder.__proto__ = proto; // eslint-disable-line no-proto - return builder; -} + builder._generator = self; + builder._styler = _styler; + builder._isEmpty = _isEmpty; -function applyStyle() { - // Support varags, but simply cast to string in case there's only one arg - const args = arguments; - const argsLen = args.length; - let str = String(arguments[0]); + return builder; +}; - if (argsLen === 0) { - return ''; +const applyStyle = (self, string) => { + if (self.level <= 0 || !string) { + return self._isEmpty ? '' : string; } - if (argsLen > 1) { - // Don't slice `arguments`, it prevents V8 optimizations - for (let a = 1; a < argsLen; a++) { - str += ' ' + args[a]; - } - } + let styler = self._styler; - if (!this.enabled || this.level <= 0 || !str) { - return this._empty ? '' : str; + if (styler === undefined) { + return string; } - // Turns out that on Windows dimmed gray text becomes invisible in cmd.exe, - // see https://github.com/chalk/chalk/issues/58 - // If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop. - const originalDim = ansiStyles.dim.open; - if (isSimpleWindowsTerm && this.hasGrey) { - ansiStyles.dim.open = ''; - } + const {openAll, closeAll} = styler; + if (string.indexOf('\u001B') !== -1) { + while (styler !== undefined) { + // Replace any instances already present with a re-opening code + // otherwise only the part of the string until said closing code + // will be colored, and the rest will simply be 'plain'. + string = stringReplaceAll(string, styler.close, styler.open); - for (const code of this._styles.slice().reverse()) { - // Replace any instances already present with a re-opening code - // otherwise only the part of the string until said closing code - // will be colored, and the rest will simply be 'plain'. - str = code.open + str.replace(code.closeRe, code.open) + code.close; + styler = styler.parent; + } + } - // Close the styling before a linebreak and reopen - // after next line to fix a bleed issue on macOS - // https://github.com/chalk/chalk/pull/92 - str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`); + // We can move both next actions out of loop, because remaining actions in loop won't have + // any/visible effect on parts we add here. Close the styling before a linebreak and reopen + // after next line to fix a bleed issue on macOS: https://github.com/chalk/chalk/pull/92 + const lfIndex = string.indexOf('\n'); + if (lfIndex !== -1) { + string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex); } - // Reset the original `dim` if we changed it to work around the Windows dimmed gray issue - ansiStyles.dim.open = originalDim; + return openAll + string + closeAll; +}; - return str; -} +let template; +const chalkTag = (chalk, ...strings) => { + const [firstString] = strings; -function chalkTag(chalk, strings) { - if (!Array.isArray(strings)) { + if (!Array.isArray(firstString)) { // If chalk() was called by itself or with a string, // return the string itself as a string. - return [].slice.call(arguments, 1).join(' '); + return strings.join(' '); } - const args = [].slice.call(arguments, 2); - const parts = [strings.raw[0]]; + const arguments_ = strings.slice(1); + const parts = [firstString.raw[0]]; - for (let i = 1; i < strings.length; i++) { - parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&')); - parts.push(String(strings.raw[i])); + for (let i = 1; i < firstString.length; i++) { + parts.push( + String(arguments_[i - 1]).replace(/[{}\\]/g, '\\$&'), + String(firstString.raw[i]) + ); + } + + if (template === undefined) { + template = __webpack_require__(373); } return template(chalk, parts.join('')); -} +}; Object.defineProperties(Chalk.prototype, styles); -module.exports = Chalk(); // eslint-disable-line new-cap -module.exports.supportsColor = stdoutColor; -module.exports.default = module.exports; // For TypeScript - - -/***/ }), -/* 374 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; -/* WEBPACK VAR INJECTION */(function(module) { -const colorConvert = __webpack_require__(180); - -const wrapAnsi16 = (fn, offset) => function () { - const code = fn.apply(colorConvert, arguments); - return `\u001B[${code + offset}m`; -}; - -const wrapAnsi256 = (fn, offset) => function () { - const code = fn.apply(colorConvert, arguments); - return `\u001B[${38 + offset};5;${code}m`; -}; +const chalk = Chalk(); // eslint-disable-line new-cap +chalk.supportsColor = stdoutColor; +chalk.stderr = Chalk({level: stderrColor ? stderrColor.level : 0}); // eslint-disable-line new-cap +chalk.stderr.supportsColor = stderrColor; -const wrapAnsi16m = (fn, offset) => function () { - const rgb = fn.apply(colorConvert, arguments); - return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`; +// For TypeScript +chalk.Level = { + None: 0, + Basic: 1, + Ansi256: 2, + TrueColor: 3, + 0: 'None', + 1: 'Basic', + 2: 'Ansi256', + 3: 'TrueColor' }; -function assembleStyles() { - const codes = new Map(); - const styles = { - modifier: { - reset: [0, 0], - // 21 isn't widely supported and 22 does the same thing - bold: [1, 22], - dim: [2, 22], - italic: [3, 23], - underline: [4, 24], - inverse: [7, 27], - hidden: [8, 28], - strikethrough: [9, 29] - }, - color: { - black: [30, 39], - red: [31, 39], - green: [32, 39], - yellow: [33, 39], - blue: [34, 39], - magenta: [35, 39], - cyan: [36, 39], - white: [37, 39], - gray: [90, 39], - - // Bright color - redBright: [91, 39], - greenBright: [92, 39], - yellowBright: [93, 39], - blueBright: [94, 39], - magentaBright: [95, 39], - cyanBright: [96, 39], - whiteBright: [97, 39] - }, - bgColor: { - bgBlack: [40, 49], - bgRed: [41, 49], - bgGreen: [42, 49], - bgYellow: [43, 49], - bgBlue: [44, 49], - bgMagenta: [45, 49], - bgCyan: [46, 49], - bgWhite: [47, 49], - - // Bright color - bgBlackBright: [100, 49], - bgRedBright: [101, 49], - bgGreenBright: [102, 49], - bgYellowBright: [103, 49], - bgBlueBright: [104, 49], - bgMagentaBright: [105, 49], - bgCyanBright: [106, 49], - bgWhiteBright: [107, 49] - } - }; - - // Fix humans - styles.color.grey = styles.color.gray; - - for (const groupName of Object.keys(styles)) { - const group = styles[groupName]; - - for (const styleName of Object.keys(group)) { - const style = group[styleName]; - - styles[styleName] = { - open: `\u001B[${style[0]}m`, - close: `\u001B[${style[1]}m` - }; - - group[styleName] = styles[styleName]; - - codes.set(style[0], style[1]); - } - - Object.defineProperty(styles, groupName, { - value: group, - enumerable: false - }); - - Object.defineProperty(styles, 'codes', { - value: codes, - enumerable: false - }); - } - - const ansi2ansi = n => n; - const rgb2rgb = (r, g, b) => [r, g, b]; - - styles.color.close = '\u001B[39m'; - styles.bgColor.close = '\u001B[49m'; - - styles.color.ansi = { - ansi: wrapAnsi16(ansi2ansi, 0) - }; - styles.color.ansi256 = { - ansi256: wrapAnsi256(ansi2ansi, 0) - }; - styles.color.ansi16m = { - rgb: wrapAnsi16m(rgb2rgb, 0) - }; - - styles.bgColor.ansi = { - ansi: wrapAnsi16(ansi2ansi, 10) - }; - styles.bgColor.ansi256 = { - ansi256: wrapAnsi256(ansi2ansi, 10) - }; - styles.bgColor.ansi16m = { - rgb: wrapAnsi16m(rgb2rgb, 10) - }; - - for (let key of Object.keys(colorConvert)) { - if (typeof colorConvert[key] !== 'object') { - continue; - } - - const suite = colorConvert[key]; - - if (key === 'ansi16') { - key = 'ansi'; - } - - if ('ansi16' in suite) { - styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0); - styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10); - } - - if ('ansi256' in suite) { - styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0); - styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10); - } - - if ('rgb' in suite) { - styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0); - styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10); - } - } - - return styles; -} - -// Make the export immutable -Object.defineProperty(module, 'exports', { - enumerable: true, - get: assembleStyles -}); +module.exports = chalk; -/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module))) /***/ }), -/* 375 */ +/* 370 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const os = __webpack_require__(120); -const hasFlag = __webpack_require__(376); +const tty = __webpack_require__(121); +const hasFlag = __webpack_require__(371); -const env = process.env; +const {env} = process; let forceColor; if (hasFlag('no-color') || hasFlag('no-colors') || - hasFlag('color=false')) { - forceColor = false; + hasFlag('color=false') || + hasFlag('color=never')) { + forceColor = 0; } else if (hasFlag('color') || hasFlag('colors') || hasFlag('color=true') || hasFlag('color=always')) { - forceColor = true; + forceColor = 1; } + if ('FORCE_COLOR' in env) { - forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0; + if (env.FORCE_COLOR === 'true') { + forceColor = 1; + } else if (env.FORCE_COLOR === 'false') { + forceColor = 0; + } else { + forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3); + } } function translateLevel(level) { @@ -47681,8 +47207,8 @@ function translateLevel(level) { }; } -function supportsColor(stream) { - if (forceColor === false) { +function supportsColor(haveStream, streamIsTTY) { + if (forceColor === 0) { return 0; } @@ -47696,22 +47222,21 @@ function supportsColor(stream) { return 2; } - if (stream && !stream.isTTY && forceColor !== true) { + if (haveStream && !streamIsTTY && forceColor === undefined) { return 0; } - const min = forceColor ? 1 : 0; + const min = forceColor || 0; + + if (env.TERM === 'dumb') { + return min; + } if (process.platform === 'win32') { - // Node.js 7.5.0 is the first version of Node.js to include a patch to - // libuv that enables 256 color output on Windows. Anything earlier and it - // won't work. However, here we target Node.js 8 at minimum as it is an LTS - // release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows - // release that supports 256 colors. Windows 10 build 14931 is the first release - // that supports 16m/TrueColor. + // Windows 10 build 10586 is the first Windows release that supports 256 colors. + // Windows 10 build 14931 is the first release that supports 16m/TrueColor. const osRelease = os.release().split('.'); if ( - Number(process.versions.node.split('.')[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586 ) { @@ -47733,6 +47258,10 @@ function supportsColor(stream) { return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0; } + if ('GITHUB_ACTIONS' in env) { + return 1; + } + if (env.COLORTERM === 'truecolor') { return 3; } @@ -47761,50 +47290,92 @@ function supportsColor(stream) { return 1; } - if (env.TERM === 'dumb') { - return min; - } - return min; } function getSupportLevel(stream) { - const level = supportsColor(stream); + const level = supportsColor(stream, stream && stream.isTTY); return translateLevel(level); } module.exports = { supportsColor: getSupportLevel, - stdout: getSupportLevel(process.stdout), - stderr: getSupportLevel(process.stderr) + stdout: translateLevel(supportsColor(true, tty.isatty(1))), + stderr: translateLevel(supportsColor(true, tty.isatty(2))) }; /***/ }), -/* 376 */ +/* 371 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -module.exports = (flag, argv) => { - argv = argv || process.argv; + +module.exports = (flag, argv = process.argv) => { const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); - const pos = argv.indexOf(prefix + flag); - const terminatorPos = argv.indexOf('--'); - return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos); + const position = argv.indexOf(prefix + flag); + const terminatorPosition = argv.indexOf('--'); + return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition); }; /***/ }), -/* 377 */ +/* 372 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi; + +const stringReplaceAll = (string, substring, replacer) => { + let index = string.indexOf(substring); + if (index === -1) { + return string; + } + + const substringLength = substring.length; + let endIndex = 0; + let returnValue = ''; + do { + returnValue += string.substr(endIndex, index - endIndex) + substring + replacer; + endIndex = index + substringLength; + index = string.indexOf(substring, endIndex); + } while (index !== -1); + + returnValue += string.substr(endIndex); + return returnValue; +}; + +const stringEncaseCRLFWithFirstIndex = (string, prefix, postfix, index) => { + let endIndex = 0; + let returnValue = ''; + do { + const gotCR = string[index - 1] === '\r'; + returnValue += string.substr(endIndex, (gotCR ? index - 1 : index) - endIndex) + prefix + (gotCR ? '\r\n' : '\n') + postfix; + endIndex = index + 1; + index = string.indexOf('\n', endIndex); + } while (index !== -1); + + returnValue += string.substr(endIndex); + return returnValue; +}; + +module.exports = { + stringReplaceAll, + stringEncaseCRLFWithFirstIndex +}; + + +/***/ }), +/* 373 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi; const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g; const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/; -const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi; +const ESCAPE_REGEX = /\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.)|([^\\])/gi; const ESCAPES = new Map([ ['n', '\n'], @@ -47820,23 +47391,31 @@ const ESCAPES = new Map([ ]); function unescape(c) { - if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) { + const u = c[0] === 'u'; + const bracket = c[1] === '{'; + + if ((u && !bracket && c.length === 5) || (c[0] === 'x' && c.length === 3)) { return String.fromCharCode(parseInt(c.slice(1), 16)); } + if (u && bracket) { + return String.fromCodePoint(parseInt(c.slice(2, -1), 16)); + } + return ESCAPES.get(c) || c; } -function parseArguments(name, args) { +function parseArguments(name, arguments_) { const results = []; - const chunks = args.trim().split(/\s*,\s*/g); + const chunks = arguments_.trim().split(/\s*,\s*/g); let matches; for (const chunk of chunks) { - if (!isNaN(chunk)) { - results.push(Number(chunk)); + const number = Number(chunk); + if (!Number.isNaN(number)) { + results.push(number); } else if ((matches = chunk.match(STRING_REGEX))) { - results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr)); + results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, character) => escape ? unescape(escape) : character)); } else { throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`); } @@ -47875,36 +47454,34 @@ function buildStyle(chalk, styles) { } let current = chalk; - for (const styleName of Object.keys(enabled)) { - if (Array.isArray(enabled[styleName])) { - if (!(styleName in current)) { - throw new Error(`Unknown Chalk style: ${styleName}`); - } + for (const [styleName, styles] of Object.entries(enabled)) { + if (!Array.isArray(styles)) { + continue; + } - if (enabled[styleName].length > 0) { - current = current[styleName].apply(current, enabled[styleName]); - } else { - current = current[styleName]; - } + if (!(styleName in current)) { + throw new Error(`Unknown Chalk style: ${styleName}`); } + + current = styles.length > 0 ? current[styleName](...styles) : current[styleName]; } return current; } -module.exports = (chalk, tmp) => { +module.exports = (chalk, temporary) => { const styles = []; const chunks = []; let chunk = []; // eslint-disable-next-line max-params - tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => { - if (escapeChar) { - chunk.push(unescape(escapeChar)); + temporary.replace(TEMPLATE_REGEX, (m, escapeCharacter, inverse, style, close, character) => { + if (escapeCharacter) { + chunk.push(unescape(escapeCharacter)); } else if (style) { - const str = chunk.join(''); + const string = chunk.join(''); chunk = []; - chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str)); + chunks.push(styles.length === 0 ? string : buildStyle(chalk, styles)(string)); styles.push({inverse, styles: parseStyle(style)}); } else if (close) { if (styles.length === 0) { @@ -47915,7 +47492,7 @@ module.exports = (chalk, tmp) => { chunk = []; styles.pop(); } else { - chunk.push(chr); + chunk.push(character); } }); @@ -47931,151 +47508,100 @@ module.exports = (chalk, tmp) => { /***/ }), -/* 378 */ +/* 374 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const restoreCursor = __webpack_require__(379); - -let hidden = false; +const restoreCursor = __webpack_require__(375); -exports.show = stream => { - const s = stream || process.stderr; +let isHidden = false; - if (!s.isTTY) { +exports.show = (writableStream = process.stderr) => { + if (!writableStream.isTTY) { return; } - hidden = false; - s.write('\u001b[?25h'); + isHidden = false; + writableStream.write('\u001B[?25h'); }; -exports.hide = stream => { - const s = stream || process.stderr; - - if (!s.isTTY) { +exports.hide = (writableStream = process.stderr) => { + if (!writableStream.isTTY) { return; } restoreCursor(); - hidden = true; - s.write('\u001b[?25l'); + isHidden = true; + writableStream.write('\u001B[?25l'); }; -exports.toggle = (force, stream) => { +exports.toggle = (force, writableStream) => { if (force !== undefined) { - hidden = force; + isHidden = force; } - if (hidden) { - exports.show(stream); + if (isHidden) { + exports.show(writableStream); } else { - exports.hide(stream); + exports.hide(writableStream); } }; /***/ }), -/* 379 */ +/* 375 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const onetime = __webpack_require__(380); +const onetime = __webpack_require__(244); const signalExit = __webpack_require__(217); module.exports = onetime(() => { signalExit(() => { - process.stderr.write('\u001b[?25h'); + process.stderr.write('\u001B[?25h'); }, {alwaysLast: true}); }); /***/ }), -/* 380 */ +/* 376 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const mimicFn = __webpack_require__(381); - -module.exports = (fn, opts) => { - // TODO: Remove this in v3 - if (opts === true) { - throw new TypeError('The second argument is now an options object'); - } - - if (typeof fn !== 'function') { - throw new TypeError('Expected a function'); - } - - opts = opts || {}; - - let ret; - let called = false; - const fnName = fn.displayName || fn.name || ''; - - const onetime = function () { - if (called) { - if (opts.throw === true) { - throw new Error(`Function \`${fnName}\` can only be called once`); - } - - return ret; - } - - called = true; - ret = fn.apply(this, arguments); - fn = null; - return ret; - }; +const spinners = Object.assign({}, __webpack_require__(377)); - mimicFn(onetime, fn); +const spinnersList = Object.keys(spinners); - return onetime; -}; - - -/***/ }), -/* 381 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -module.exports = (to, from) => { - // TODO: use `Reflect.ownKeys()` when targeting Node.js 6 - for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) { - Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop)); +Object.defineProperty(spinners, 'random', { + get() { + const randomIndex = Math.floor(Math.random() * spinnersList.length); + const spinnerName = spinnersList[randomIndex]; + return spinners[spinnerName]; } +}); - return to; -}; - - -/***/ }), -/* 382 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -module.exports = __webpack_require__(383); +module.exports = spinners; +// TODO: Remove this for the next major release +module.exports.default = spinners; /***/ }), -/* 383 */ +/* 377 */ /***/ (function(module) { -module.exports = JSON.parse("{\"dots\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠹\",\"⠸\",\"⠼\",\"⠴\",\"⠦\",\"⠧\",\"⠇\",\"⠏\"]},\"dots2\":{\"interval\":80,\"frames\":[\"⣾\",\"⣽\",\"⣻\",\"⢿\",\"⡿\",\"⣟\",\"⣯\",\"⣷\"]},\"dots3\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠞\",\"⠖\",\"⠦\",\"⠴\",\"⠲\",\"⠳\",\"⠓\"]},\"dots4\":{\"interval\":80,\"frames\":[\"⠄\",\"⠆\",\"⠇\",\"⠋\",\"⠙\",\"⠸\",\"⠰\",\"⠠\",\"⠰\",\"⠸\",\"⠙\",\"⠋\",\"⠇\",\"⠆\"]},\"dots5\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\"]},\"dots6\":{\"interval\":80,\"frames\":[\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠴\",\"⠲\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠚\",\"⠙\",\"⠉\",\"⠁\"]},\"dots7\":{\"interval\":80,\"frames\":[\"⠈\",\"⠉\",\"⠋\",\"⠓\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠖\",\"⠦\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\"]},\"dots8\":{\"interval\":80,\"frames\":[\"⠁\",\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\",\"⠈\"]},\"dots9\":{\"interval\":80,\"frames\":[\"⢹\",\"⢺\",\"⢼\",\"⣸\",\"⣇\",\"⡧\",\"⡗\",\"⡏\"]},\"dots10\":{\"interval\":80,\"frames\":[\"⢄\",\"⢂\",\"⢁\",\"⡁\",\"⡈\",\"⡐\",\"⡠\"]},\"dots11\":{\"interval\":100,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⡀\",\"⢀\",\"⠠\",\"⠐\",\"⠈\"]},\"dots12\":{\"interval\":80,\"frames\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"line\":{\"interval\":130,\"frames\":[\"-\",\"\\\\\",\"|\",\"/\"]},\"line2\":{\"interval\":100,\"frames\":[\"⠂\",\"-\",\"–\",\"—\",\"–\",\"-\"]},\"pipe\":{\"interval\":100,\"frames\":[\"┤\",\"┘\",\"┴\",\"└\",\"├\",\"┌\",\"┬\",\"┐\"]},\"simpleDots\":{\"interval\":400,\"frames\":[\". \",\".. \",\"...\",\" \"]},\"simpleDotsScrolling\":{\"interval\":200,\"frames\":[\". \",\".. \",\"...\",\" ..\",\" .\",\" \"]},\"star\":{\"interval\":70,\"frames\":[\"✶\",\"✸\",\"✹\",\"✺\",\"✹\",\"✷\"]},\"star2\":{\"interval\":80,\"frames\":[\"+\",\"x\",\"*\"]},\"flip\":{\"interval\":70,\"frames\":[\"_\",\"_\",\"_\",\"-\",\"`\",\"`\",\"'\",\"´\",\"-\",\"_\",\"_\",\"_\"]},\"hamburger\":{\"interval\":100,\"frames\":[\"☱\",\"☲\",\"☴\"]},\"growVertical\":{\"interval\":120,\"frames\":[\"▁\",\"▃\",\"▄\",\"▅\",\"▆\",\"▇\",\"▆\",\"▅\",\"▄\",\"▃\"]},\"growHorizontal\":{\"interval\":120,\"frames\":[\"▏\",\"▎\",\"▍\",\"▌\",\"▋\",\"▊\",\"▉\",\"▊\",\"▋\",\"▌\",\"▍\",\"▎\"]},\"balloon\":{\"interval\":140,\"frames\":[\" \",\".\",\"o\",\"O\",\"@\",\"*\",\" \"]},\"balloon2\":{\"interval\":120,\"frames\":[\".\",\"o\",\"O\",\"°\",\"O\",\"o\",\".\"]},\"noise\":{\"interval\":100,\"frames\":[\"▓\",\"▒\",\"░\"]},\"bounce\":{\"interval\":120,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⠂\"]},\"boxBounce\":{\"interval\":120,\"frames\":[\"▖\",\"▘\",\"▝\",\"▗\"]},\"boxBounce2\":{\"interval\":100,\"frames\":[\"▌\",\"▀\",\"▐\",\"▄\"]},\"triangle\":{\"interval\":50,\"frames\":[\"◢\",\"◣\",\"◤\",\"◥\"]},\"arc\":{\"interval\":100,\"frames\":[\"◜\",\"◠\",\"◝\",\"◞\",\"◡\",\"◟\"]},\"circle\":{\"interval\":120,\"frames\":[\"◡\",\"⊙\",\"◠\"]},\"squareCorners\":{\"interval\":180,\"frames\":[\"◰\",\"◳\",\"◲\",\"◱\"]},\"circleQuarters\":{\"interval\":120,\"frames\":[\"◴\",\"◷\",\"◶\",\"◵\"]},\"circleHalves\":{\"interval\":50,\"frames\":[\"◐\",\"◓\",\"◑\",\"◒\"]},\"squish\":{\"interval\":100,\"frames\":[\"╫\",\"╪\"]},\"toggle\":{\"interval\":250,\"frames\":[\"⊶\",\"⊷\"]},\"toggle2\":{\"interval\":80,\"frames\":[\"▫\",\"▪\"]},\"toggle3\":{\"interval\":120,\"frames\":[\"□\",\"■\"]},\"toggle4\":{\"interval\":100,\"frames\":[\"■\",\"□\",\"▪\",\"▫\"]},\"toggle5\":{\"interval\":100,\"frames\":[\"▮\",\"▯\"]},\"toggle6\":{\"interval\":300,\"frames\":[\"ဝ\",\"၀\"]},\"toggle7\":{\"interval\":80,\"frames\":[\"⦾\",\"⦿\"]},\"toggle8\":{\"interval\":100,\"frames\":[\"◍\",\"◌\"]},\"toggle9\":{\"interval\":100,\"frames\":[\"◉\",\"◎\"]},\"toggle10\":{\"interval\":100,\"frames\":[\"㊂\",\"㊀\",\"㊁\"]},\"toggle11\":{\"interval\":50,\"frames\":[\"⧇\",\"⧆\"]},\"toggle12\":{\"interval\":120,\"frames\":[\"☗\",\"☖\"]},\"toggle13\":{\"interval\":80,\"frames\":[\"=\",\"*\",\"-\"]},\"arrow\":{\"interval\":100,\"frames\":[\"←\",\"↖\",\"↑\",\"↗\",\"→\",\"↘\",\"↓\",\"↙\"]},\"arrow2\":{\"interval\":80,\"frames\":[\"⬆️ \",\"↗️ \",\"➡️ \",\"↘️ \",\"⬇️ \",\"↙️ \",\"⬅️ \",\"↖️ \"]},\"arrow3\":{\"interval\":120,\"frames\":[\"▹▹▹▹▹\",\"▸▹▹▹▹\",\"▹▸▹▹▹\",\"▹▹▸▹▹\",\"▹▹▹▸▹\",\"▹▹▹▹▸\"]},\"bouncingBar\":{\"interval\":80,\"frames\":[\"[ ]\",\"[= ]\",\"[== ]\",\"[=== ]\",\"[ ===]\",\"[ ==]\",\"[ =]\",\"[ ]\",\"[ =]\",\"[ ==]\",\"[ ===]\",\"[====]\",\"[=== ]\",\"[== ]\",\"[= ]\"]},\"bouncingBall\":{\"interval\":80,\"frames\":[\"( ● )\",\"( ● )\",\"( ● )\",\"( ● )\",\"( ●)\",\"( ● )\",\"( ● )\",\"( ● )\",\"( ● )\",\"(● )\"]},\"smiley\":{\"interval\":200,\"frames\":[\"😄 \",\"😝 \"]},\"monkey\":{\"interval\":300,\"frames\":[\"🙈 \",\"🙈 \",\"🙉 \",\"🙊 \"]},\"hearts\":{\"interval\":100,\"frames\":[\"💛 \",\"💙 \",\"💜 \",\"💚 \",\"❤️ \"]},\"clock\":{\"interval\":100,\"frames\":[\"🕐 \",\"🕑 \",\"🕒 \",\"🕓 \",\"🕔 \",\"🕕 \",\"🕖 \",\"🕗 \",\"🕘 \",\"🕙 \",\"🕚 \"]},\"earth\":{\"interval\":180,\"frames\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"moon\":{\"interval\":80,\"frames\":[\"🌑 \",\"🌒 \",\"🌓 \",\"🌔 \",\"🌕 \",\"🌖 \",\"🌗 \",\"🌘 \"]},\"runner\":{\"interval\":140,\"frames\":[\"🚶 \",\"🏃 \"]},\"pong\":{\"interval\":80,\"frames\":[\"▐⠂ ▌\",\"▐⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂▌\",\"▐ ⠠▌\",\"▐ ⡀▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐⠠ ▌\"]},\"shark\":{\"interval\":120,\"frames\":[\"▐|\\\\____________▌\",\"▐_|\\\\___________▌\",\"▐__|\\\\__________▌\",\"▐___|\\\\_________▌\",\"▐____|\\\\________▌\",\"▐_____|\\\\_______▌\",\"▐______|\\\\______▌\",\"▐_______|\\\\_____▌\",\"▐________|\\\\____▌\",\"▐_________|\\\\___▌\",\"▐__________|\\\\__▌\",\"▐___________|\\\\_▌\",\"▐____________|\\\\▌\",\"▐____________/|▌\",\"▐___________/|_▌\",\"▐__________/|__▌\",\"▐_________/|___▌\",\"▐________/|____▌\",\"▐_______/|_____▌\",\"▐______/|______▌\",\"▐_____/|_______▌\",\"▐____/|________▌\",\"▐___/|_________▌\",\"▐__/|__________▌\",\"▐_/|___________▌\",\"▐/|____________▌\"]},\"dqpb\":{\"interval\":100,\"frames\":[\"d\",\"q\",\"p\",\"b\"]},\"weather\":{\"interval\":100,\"frames\":[\"☀️ \",\"☀️ \",\"☀️ \",\"🌤 \",\"⛅️ \",\"🌥 \",\"☁️ \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"⛈ \",\"🌨 \",\"🌧 \",\"🌨 \",\"☁️ \",\"🌥 \",\"⛅️ \",\"🌤 \",\"☀️ \",\"☀️ \"]},\"christmas\":{\"interval\":400,\"frames\":[\"🌲\",\"🎄\"]}}"); +module.exports = JSON.parse("{\"dots\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠹\",\"⠸\",\"⠼\",\"⠴\",\"⠦\",\"⠧\",\"⠇\",\"⠏\"]},\"dots2\":{\"interval\":80,\"frames\":[\"⣾\",\"⣽\",\"⣻\",\"⢿\",\"⡿\",\"⣟\",\"⣯\",\"⣷\"]},\"dots3\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠞\",\"⠖\",\"⠦\",\"⠴\",\"⠲\",\"⠳\",\"⠓\"]},\"dots4\":{\"interval\":80,\"frames\":[\"⠄\",\"⠆\",\"⠇\",\"⠋\",\"⠙\",\"⠸\",\"⠰\",\"⠠\",\"⠰\",\"⠸\",\"⠙\",\"⠋\",\"⠇\",\"⠆\"]},\"dots5\":{\"interval\":80,\"frames\":[\"⠋\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\"]},\"dots6\":{\"interval\":80,\"frames\":[\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠴\",\"⠲\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠚\",\"⠙\",\"⠉\",\"⠁\"]},\"dots7\":{\"interval\":80,\"frames\":[\"⠈\",\"⠉\",\"⠋\",\"⠓\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠖\",\"⠦\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\"]},\"dots8\":{\"interval\":80,\"frames\":[\"⠁\",\"⠁\",\"⠉\",\"⠙\",\"⠚\",\"⠒\",\"⠂\",\"⠂\",\"⠒\",\"⠲\",\"⠴\",\"⠤\",\"⠄\",\"⠄\",\"⠤\",\"⠠\",\"⠠\",\"⠤\",\"⠦\",\"⠖\",\"⠒\",\"⠐\",\"⠐\",\"⠒\",\"⠓\",\"⠋\",\"⠉\",\"⠈\",\"⠈\"]},\"dots9\":{\"interval\":80,\"frames\":[\"⢹\",\"⢺\",\"⢼\",\"⣸\",\"⣇\",\"⡧\",\"⡗\",\"⡏\"]},\"dots10\":{\"interval\":80,\"frames\":[\"⢄\",\"⢂\",\"⢁\",\"⡁\",\"⡈\",\"⡐\",\"⡠\"]},\"dots11\":{\"interval\":100,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⡀\",\"⢀\",\"⠠\",\"⠐\",\"⠈\"]},\"dots12\":{\"interval\":80,\"frames\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"dots8Bit\":{\"interval\":80,\"frames\":[\"⠀\",\"⠁\",\"⠂\",\"⠃\",\"⠄\",\"⠅\",\"⠆\",\"⠇\",\"⡀\",\"⡁\",\"⡂\",\"⡃\",\"⡄\",\"⡅\",\"⡆\",\"⡇\",\"⠈\",\"⠉\",\"⠊\",\"⠋\",\"⠌\",\"⠍\",\"⠎\",\"⠏\",\"⡈\",\"⡉\",\"⡊\",\"⡋\",\"⡌\",\"⡍\",\"⡎\",\"⡏\",\"⠐\",\"⠑\",\"⠒\",\"⠓\",\"⠔\",\"⠕\",\"⠖\",\"⠗\",\"⡐\",\"⡑\",\"⡒\",\"⡓\",\"⡔\",\"⡕\",\"⡖\",\"⡗\",\"⠘\",\"⠙\",\"⠚\",\"⠛\",\"⠜\",\"⠝\",\"⠞\",\"⠟\",\"⡘\",\"⡙\",\"⡚\",\"⡛\",\"⡜\",\"⡝\",\"⡞\",\"⡟\",\"⠠\",\"⠡\",\"⠢\",\"⠣\",\"⠤\",\"⠥\",\"⠦\",\"⠧\",\"⡠\",\"⡡\",\"⡢\",\"⡣\",\"⡤\",\"⡥\",\"⡦\",\"⡧\",\"⠨\",\"⠩\",\"⠪\",\"⠫\",\"⠬\",\"⠭\",\"⠮\",\"⠯\",\"⡨\",\"⡩\",\"⡪\",\"⡫\",\"⡬\",\"⡭\",\"⡮\",\"⡯\",\"⠰\",\"⠱\",\"⠲\",\"⠳\",\"⠴\",\"⠵\",\"⠶\",\"⠷\",\"⡰\",\"⡱\",\"⡲\",\"⡳\",\"⡴\",\"⡵\",\"⡶\",\"⡷\",\"⠸\",\"⠹\",\"⠺\",\"⠻\",\"⠼\",\"⠽\",\"⠾\",\"⠿\",\"⡸\",\"⡹\",\"⡺\",\"⡻\",\"⡼\",\"⡽\",\"⡾\",\"⡿\",\"⢀\",\"⢁\",\"⢂\",\"⢃\",\"⢄\",\"⢅\",\"⢆\",\"⢇\",\"⣀\",\"⣁\",\"⣂\",\"⣃\",\"⣄\",\"⣅\",\"⣆\",\"⣇\",\"⢈\",\"⢉\",\"⢊\",\"⢋\",\"⢌\",\"⢍\",\"⢎\",\"⢏\",\"⣈\",\"⣉\",\"⣊\",\"⣋\",\"⣌\",\"⣍\",\"⣎\",\"⣏\",\"⢐\",\"⢑\",\"⢒\",\"⢓\",\"⢔\",\"⢕\",\"⢖\",\"⢗\",\"⣐\",\"⣑\",\"⣒\",\"⣓\",\"⣔\",\"⣕\",\"⣖\",\"⣗\",\"⢘\",\"⢙\",\"⢚\",\"⢛\",\"⢜\",\"⢝\",\"⢞\",\"⢟\",\"⣘\",\"⣙\",\"⣚\",\"⣛\",\"⣜\",\"⣝\",\"⣞\",\"⣟\",\"⢠\",\"⢡\",\"⢢\",\"⢣\",\"⢤\",\"⢥\",\"⢦\",\"⢧\",\"⣠\",\"⣡\",\"⣢\",\"⣣\",\"⣤\",\"⣥\",\"⣦\",\"⣧\",\"⢨\",\"⢩\",\"⢪\",\"⢫\",\"⢬\",\"⢭\",\"⢮\",\"⢯\",\"⣨\",\"⣩\",\"⣪\",\"⣫\",\"⣬\",\"⣭\",\"⣮\",\"⣯\",\"⢰\",\"⢱\",\"⢲\",\"⢳\",\"⢴\",\"⢵\",\"⢶\",\"⢷\",\"⣰\",\"⣱\",\"⣲\",\"⣳\",\"⣴\",\"⣵\",\"⣶\",\"⣷\",\"⢸\",\"⢹\",\"⢺\",\"⢻\",\"⢼\",\"⢽\",\"⢾\",\"⢿\",\"⣸\",\"⣹\",\"⣺\",\"⣻\",\"⣼\",\"⣽\",\"⣾\",\"⣿\"]},\"line\":{\"interval\":130,\"frames\":[\"-\",\"\\\\\",\"|\",\"/\"]},\"line2\":{\"interval\":100,\"frames\":[\"⠂\",\"-\",\"–\",\"—\",\"–\",\"-\"]},\"pipe\":{\"interval\":100,\"frames\":[\"┤\",\"┘\",\"┴\",\"└\",\"├\",\"┌\",\"┬\",\"┐\"]},\"simpleDots\":{\"interval\":400,\"frames\":[\". \",\".. \",\"...\",\" \"]},\"simpleDotsScrolling\":{\"interval\":200,\"frames\":[\". \",\".. \",\"...\",\" ..\",\" .\",\" \"]},\"star\":{\"interval\":70,\"frames\":[\"✶\",\"✸\",\"✹\",\"✺\",\"✹\",\"✷\"]},\"star2\":{\"interval\":80,\"frames\":[\"+\",\"x\",\"*\"]},\"flip\":{\"interval\":70,\"frames\":[\"_\",\"_\",\"_\",\"-\",\"`\",\"`\",\"'\",\"´\",\"-\",\"_\",\"_\",\"_\"]},\"hamburger\":{\"interval\":100,\"frames\":[\"☱\",\"☲\",\"☴\"]},\"growVertical\":{\"interval\":120,\"frames\":[\"▁\",\"▃\",\"▄\",\"▅\",\"▆\",\"▇\",\"▆\",\"▅\",\"▄\",\"▃\"]},\"growHorizontal\":{\"interval\":120,\"frames\":[\"▏\",\"▎\",\"▍\",\"▌\",\"▋\",\"▊\",\"▉\",\"▊\",\"▋\",\"▌\",\"▍\",\"▎\"]},\"balloon\":{\"interval\":140,\"frames\":[\" \",\".\",\"o\",\"O\",\"@\",\"*\",\" \"]},\"balloon2\":{\"interval\":120,\"frames\":[\".\",\"o\",\"O\",\"°\",\"O\",\"o\",\".\"]},\"noise\":{\"interval\":100,\"frames\":[\"▓\",\"▒\",\"░\"]},\"bounce\":{\"interval\":120,\"frames\":[\"⠁\",\"⠂\",\"⠄\",\"⠂\"]},\"boxBounce\":{\"interval\":120,\"frames\":[\"▖\",\"▘\",\"▝\",\"▗\"]},\"boxBounce2\":{\"interval\":100,\"frames\":[\"▌\",\"▀\",\"▐\",\"▄\"]},\"triangle\":{\"interval\":50,\"frames\":[\"◢\",\"◣\",\"◤\",\"◥\"]},\"arc\":{\"interval\":100,\"frames\":[\"◜\",\"◠\",\"◝\",\"◞\",\"◡\",\"◟\"]},\"circle\":{\"interval\":120,\"frames\":[\"◡\",\"⊙\",\"◠\"]},\"squareCorners\":{\"interval\":180,\"frames\":[\"◰\",\"◳\",\"◲\",\"◱\"]},\"circleQuarters\":{\"interval\":120,\"frames\":[\"◴\",\"◷\",\"◶\",\"◵\"]},\"circleHalves\":{\"interval\":50,\"frames\":[\"◐\",\"◓\",\"◑\",\"◒\"]},\"squish\":{\"interval\":100,\"frames\":[\"╫\",\"╪\"]},\"toggle\":{\"interval\":250,\"frames\":[\"⊶\",\"⊷\"]},\"toggle2\":{\"interval\":80,\"frames\":[\"▫\",\"▪\"]},\"toggle3\":{\"interval\":120,\"frames\":[\"□\",\"■\"]},\"toggle4\":{\"interval\":100,\"frames\":[\"■\",\"□\",\"▪\",\"▫\"]},\"toggle5\":{\"interval\":100,\"frames\":[\"▮\",\"▯\"]},\"toggle6\":{\"interval\":300,\"frames\":[\"ဝ\",\"၀\"]},\"toggle7\":{\"interval\":80,\"frames\":[\"⦾\",\"⦿\"]},\"toggle8\":{\"interval\":100,\"frames\":[\"◍\",\"◌\"]},\"toggle9\":{\"interval\":100,\"frames\":[\"◉\",\"◎\"]},\"toggle10\":{\"interval\":100,\"frames\":[\"㊂\",\"㊀\",\"㊁\"]},\"toggle11\":{\"interval\":50,\"frames\":[\"⧇\",\"⧆\"]},\"toggle12\":{\"interval\":120,\"frames\":[\"☗\",\"☖\"]},\"toggle13\":{\"interval\":80,\"frames\":[\"=\",\"*\",\"-\"]},\"arrow\":{\"interval\":100,\"frames\":[\"←\",\"↖\",\"↑\",\"↗\",\"→\",\"↘\",\"↓\",\"↙\"]},\"arrow2\":{\"interval\":80,\"frames\":[\"⬆️ \",\"↗️ \",\"➡️ \",\"↘️ \",\"⬇️ \",\"↙️ \",\"⬅️ \",\"↖️ \"]},\"arrow3\":{\"interval\":120,\"frames\":[\"▹▹▹▹▹\",\"▸▹▹▹▹\",\"▹▸▹▹▹\",\"▹▹▸▹▹\",\"▹▹▹▸▹\",\"▹▹▹▹▸\"]},\"bouncingBar\":{\"interval\":80,\"frames\":[\"[ ]\",\"[= ]\",\"[== ]\",\"[=== ]\",\"[ ===]\",\"[ ==]\",\"[ =]\",\"[ ]\",\"[ =]\",\"[ ==]\",\"[ ===]\",\"[====]\",\"[=== ]\",\"[== ]\",\"[= ]\"]},\"bouncingBall\":{\"interval\":80,\"frames\":[\"( ● )\",\"( ● )\",\"( ● )\",\"( ● )\",\"( ●)\",\"( ● )\",\"( ● )\",\"( ● )\",\"( ● )\",\"(● )\"]},\"smiley\":{\"interval\":200,\"frames\":[\"😄 \",\"😝 \"]},\"monkey\":{\"interval\":300,\"frames\":[\"🙈 \",\"🙈 \",\"🙉 \",\"🙊 \"]},\"hearts\":{\"interval\":100,\"frames\":[\"💛 \",\"💙 \",\"💜 \",\"💚 \",\"❤️ \"]},\"clock\":{\"interval\":100,\"frames\":[\"🕛 \",\"🕐 \",\"🕑 \",\"🕒 \",\"🕓 \",\"🕔 \",\"🕕 \",\"🕖 \",\"🕗 \",\"🕘 \",\"🕙 \",\"🕚 \"]},\"earth\":{\"interval\":180,\"frames\":[\"🌍 \",\"🌎 \",\"🌏 \"]},\"material\":{\"interval\":17,\"frames\":[\"█▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"██▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"███▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"████▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"██████▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"██████▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"███████▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"████████▁▁▁▁▁▁▁▁▁▁▁▁\",\"█████████▁▁▁▁▁▁▁▁▁▁▁\",\"█████████▁▁▁▁▁▁▁▁▁▁▁\",\"██████████▁▁▁▁▁▁▁▁▁▁\",\"███████████▁▁▁▁▁▁▁▁▁\",\"█████████████▁▁▁▁▁▁▁\",\"██████████████▁▁▁▁▁▁\",\"██████████████▁▁▁▁▁▁\",\"▁██████████████▁▁▁▁▁\",\"▁██████████████▁▁▁▁▁\",\"▁██████████████▁▁▁▁▁\",\"▁▁██████████████▁▁▁▁\",\"▁▁▁██████████████▁▁▁\",\"▁▁▁▁█████████████▁▁▁\",\"▁▁▁▁██████████████▁▁\",\"▁▁▁▁██████████████▁▁\",\"▁▁▁▁▁██████████████▁\",\"▁▁▁▁▁██████████████▁\",\"▁▁▁▁▁██████████████▁\",\"▁▁▁▁▁▁██████████████\",\"▁▁▁▁▁▁██████████████\",\"▁▁▁▁▁▁▁█████████████\",\"▁▁▁▁▁▁▁█████████████\",\"▁▁▁▁▁▁▁▁████████████\",\"▁▁▁▁▁▁▁▁████████████\",\"▁▁▁▁▁▁▁▁▁███████████\",\"▁▁▁▁▁▁▁▁▁███████████\",\"▁▁▁▁▁▁▁▁▁▁██████████\",\"▁▁▁▁▁▁▁▁▁▁██████████\",\"▁▁▁▁▁▁▁▁▁▁▁▁████████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁███████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁██████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁█████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁█████\",\"█▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁████\",\"██▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁███\",\"██▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁███\",\"███▁▁▁▁▁▁▁▁▁▁▁▁▁▁███\",\"████▁▁▁▁▁▁▁▁▁▁▁▁▁▁██\",\"█████▁▁▁▁▁▁▁▁▁▁▁▁▁▁█\",\"█████▁▁▁▁▁▁▁▁▁▁▁▁▁▁█\",\"██████▁▁▁▁▁▁▁▁▁▁▁▁▁█\",\"████████▁▁▁▁▁▁▁▁▁▁▁▁\",\"█████████▁▁▁▁▁▁▁▁▁▁▁\",\"█████████▁▁▁▁▁▁▁▁▁▁▁\",\"█████████▁▁▁▁▁▁▁▁▁▁▁\",\"█████████▁▁▁▁▁▁▁▁▁▁▁\",\"███████████▁▁▁▁▁▁▁▁▁\",\"████████████▁▁▁▁▁▁▁▁\",\"████████████▁▁▁▁▁▁▁▁\",\"██████████████▁▁▁▁▁▁\",\"██████████████▁▁▁▁▁▁\",\"▁██████████████▁▁▁▁▁\",\"▁██████████████▁▁▁▁▁\",\"▁▁▁█████████████▁▁▁▁\",\"▁▁▁▁▁████████████▁▁▁\",\"▁▁▁▁▁████████████▁▁▁\",\"▁▁▁▁▁▁███████████▁▁▁\",\"▁▁▁▁▁▁▁▁█████████▁▁▁\",\"▁▁▁▁▁▁▁▁█████████▁▁▁\",\"▁▁▁▁▁▁▁▁▁█████████▁▁\",\"▁▁▁▁▁▁▁▁▁█████████▁▁\",\"▁▁▁▁▁▁▁▁▁▁█████████▁\",\"▁▁▁▁▁▁▁▁▁▁▁████████▁\",\"▁▁▁▁▁▁▁▁▁▁▁████████▁\",\"▁▁▁▁▁▁▁▁▁▁▁▁███████▁\",\"▁▁▁▁▁▁▁▁▁▁▁▁███████▁\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁███████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁███████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁█████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁████\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁███\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁███\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁██\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁██\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁██\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁█\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁█\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁█\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\",\"▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁▁\"]},\"moon\":{\"interval\":80,\"frames\":[\"🌑 \",\"🌒 \",\"🌓 \",\"🌔 \",\"🌕 \",\"🌖 \",\"🌗 \",\"🌘 \"]},\"runner\":{\"interval\":140,\"frames\":[\"🚶 \",\"🏃 \"]},\"pong\":{\"interval\":80,\"frames\":[\"▐⠂ ▌\",\"▐⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂▌\",\"▐ ⠠▌\",\"▐ ⡀▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐ ⠠ ▌\",\"▐ ⠂ ▌\",\"▐ ⠈ ▌\",\"▐ ⠂ ▌\",\"▐ ⠠ ▌\",\"▐ ⡀ ▌\",\"▐⠠ ▌\"]},\"shark\":{\"interval\":120,\"frames\":[\"▐|\\\\____________▌\",\"▐_|\\\\___________▌\",\"▐__|\\\\__________▌\",\"▐___|\\\\_________▌\",\"▐____|\\\\________▌\",\"▐_____|\\\\_______▌\",\"▐______|\\\\______▌\",\"▐_______|\\\\_____▌\",\"▐________|\\\\____▌\",\"▐_________|\\\\___▌\",\"▐__________|\\\\__▌\",\"▐___________|\\\\_▌\",\"▐____________|\\\\▌\",\"▐____________/|▌\",\"▐___________/|_▌\",\"▐__________/|__▌\",\"▐_________/|___▌\",\"▐________/|____▌\",\"▐_______/|_____▌\",\"▐______/|______▌\",\"▐_____/|_______▌\",\"▐____/|________▌\",\"▐___/|_________▌\",\"▐__/|__________▌\",\"▐_/|___________▌\",\"▐/|____________▌\"]},\"dqpb\":{\"interval\":100,\"frames\":[\"d\",\"q\",\"p\",\"b\"]},\"weather\":{\"interval\":100,\"frames\":[\"☀️ \",\"☀️ \",\"☀️ \",\"🌤 \",\"⛅️ \",\"🌥 \",\"☁️ \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"🌧 \",\"🌨 \",\"⛈ \",\"🌨 \",\"🌧 \",\"🌨 \",\"☁️ \",\"🌥 \",\"⛅️ \",\"🌤 \",\"☀️ \",\"☀️ \"]},\"christmas\":{\"interval\":400,\"frames\":[\"🌲\",\"🎄\"]},\"grenade\":{\"interval\":80,\"frames\":[\"، \",\"′ \",\" ´ \",\" ‾ \",\" ⸌\",\" ⸊\",\" |\",\" ⁎\",\" ⁕\",\" ෴ \",\" ⁓\",\" \",\" \",\" \"]},\"point\":{\"interval\":125,\"frames\":[\"∙∙∙\",\"●∙∙\",\"∙●∙\",\"∙∙●\",\"∙∙∙\"]},\"layer\":{\"interval\":150,\"frames\":[\"-\",\"=\",\"≡\"]},\"betaWave\":{\"interval\":80,\"frames\":[\"ρββββββ\",\"βρβββββ\",\"ββρββββ\",\"βββρβββ\",\"ββββρββ\",\"βββββρβ\",\"ββββββρ\"]}}"); /***/ }), -/* 384 */ +/* 378 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const chalk = __webpack_require__(385); +const chalk = __webpack_require__(379); const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color'; @@ -48097,16 +47623,16 @@ module.exports = isSupported ? main : fallbacks; /***/ }), -/* 385 */ +/* 379 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const escapeStringRegexp = __webpack_require__(178); -const ansiStyles = __webpack_require__(386); -const stdoutColor = __webpack_require__(184).stdout; +const ansiStyles = __webpack_require__(380); +const stdoutColor = __webpack_require__(381).stdout; -const template = __webpack_require__(387); +const template = __webpack_require__(383); const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); @@ -48332,7 +47858,7 @@ module.exports.default = module.exports; // For TypeScript /***/ }), -/* 386 */ +/* 380 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48505,7 +48031,160 @@ Object.defineProperty(module, 'exports', { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(114)(module))) /***/ }), -/* 387 */ +/* 381 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const os = __webpack_require__(120); +const hasFlag = __webpack_require__(382); + +const env = process.env; + +let forceColor; +if (hasFlag('no-color') || + hasFlag('no-colors') || + hasFlag('color=false')) { + forceColor = false; +} else if (hasFlag('color') || + hasFlag('colors') || + hasFlag('color=true') || + hasFlag('color=always')) { + forceColor = true; +} +if ('FORCE_COLOR' in env) { + forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0; +} + +function translateLevel(level) { + if (level === 0) { + return false; + } + + return { + level, + hasBasic: true, + has256: level >= 2, + has16m: level >= 3 + }; +} + +function supportsColor(stream) { + if (forceColor === false) { + return 0; + } + + if (hasFlag('color=16m') || + hasFlag('color=full') || + hasFlag('color=truecolor')) { + return 3; + } + + if (hasFlag('color=256')) { + return 2; + } + + if (stream && !stream.isTTY && forceColor !== true) { + return 0; + } + + const min = forceColor ? 1 : 0; + + if (process.platform === 'win32') { + // Node.js 7.5.0 is the first version of Node.js to include a patch to + // libuv that enables 256 color output on Windows. Anything earlier and it + // won't work. However, here we target Node.js 8 at minimum as it is an LTS + // release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows + // release that supports 256 colors. Windows 10 build 14931 is the first release + // that supports 16m/TrueColor. + const osRelease = os.release().split('.'); + if ( + Number(process.versions.node.split('.')[0]) >= 8 && + Number(osRelease[0]) >= 10 && + Number(osRelease[2]) >= 10586 + ) { + return Number(osRelease[2]) >= 14931 ? 3 : 2; + } + + return 1; + } + + if ('CI' in env) { + if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') { + return 1; + } + + return min; + } + + if ('TEAMCITY_VERSION' in env) { + return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0; + } + + if (env.COLORTERM === 'truecolor') { + return 3; + } + + if ('TERM_PROGRAM' in env) { + const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10); + + switch (env.TERM_PROGRAM) { + case 'iTerm.app': + return version >= 3 ? 3 : 2; + case 'Apple_Terminal': + return 2; + // No default + } + } + + if (/-256(color)?$/i.test(env.TERM)) { + return 2; + } + + if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) { + return 1; + } + + if ('COLORTERM' in env) { + return 1; + } + + if (env.TERM === 'dumb') { + return min; + } + + return min; +} + +function getSupportLevel(stream) { + const level = supportsColor(stream); + return translateLevel(level); +} + +module.exports = { + supportsColor: getSupportLevel, + stdout: getSupportLevel(process.stdout), + stderr: getSupportLevel(process.stderr) +}; + + +/***/ }), +/* 382 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +module.exports = (flag, argv) => { + argv = argv || process.argv; + const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); + const pos = argv.indexOf(prefix + flag); + const terminatorPos = argv.indexOf('--'); + return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos); +}; + + +/***/ }), +/* 383 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48639,8 +48318,555 @@ module.exports = (chalk, tmp) => { }; +/***/ }), +/* 384 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const ansiRegex = __webpack_require__(385); + +module.exports = string => typeof string === 'string' ? string.replace(ansiRegex(), '') : string; + + +/***/ }), +/* 385 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +module.exports = ({onlyFirst = false} = {}) => { + const pattern = [ + '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)', + '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))' + ].join('|'); + + return new RegExp(pattern, onlyFirst ? undefined : 'g'); +}; + + +/***/ }), +/* 386 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var defaults = __webpack_require__(387) +var combining = __webpack_require__(389) + +var DEFAULTS = { + nul: 0, + control: 0 +} + +module.exports = function wcwidth(str) { + return wcswidth(str, DEFAULTS) +} + +module.exports.config = function(opts) { + opts = defaults(opts || {}, DEFAULTS) + return function wcwidth(str) { + return wcswidth(str, opts) + } +} + +/* + * The following functions define the column width of an ISO 10646 + * character as follows: + * - The null character (U+0000) has a column width of 0. + * - Other C0/C1 control characters and DEL will lead to a return value + * of -1. + * - Non-spacing and enclosing combining characters (general category + * code Mn or Me in the + * Unicode database) have a column width of 0. + * - SOFT HYPHEN (U+00AD) has a column width of 1. + * - Other format characters (general category code Cf in the Unicode + * database) and ZERO WIDTH + * SPACE (U+200B) have a column width of 0. + * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF) + * have a column width of 0. + * - Spacing characters in the East Asian Wide (W) or East Asian + * Full-width (F) category as + * defined in Unicode Technical Report #11 have a column width of 2. + * - All remaining characters (including all printable ISO 8859-1 and + * WGL4 characters, Unicode control characters, etc.) have a column + * width of 1. + * This implementation assumes that characters are encoded in ISO 10646. +*/ + +function wcswidth(str, opts) { + if (typeof str !== 'string') return wcwidth(str, opts) + + var s = 0 + for (var i = 0; i < str.length; i++) { + var n = wcwidth(str.charCodeAt(i), opts) + if (n < 0) return -1 + s += n + } + + return s +} + +function wcwidth(ucs, opts) { + // test for 8-bit control characters + if (ucs === 0) return opts.nul + if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) return opts.control + + // binary search in table of non-spacing characters + if (bisearch(ucs)) return 0 + + // if we arrive here, ucs is not a combining or C0/C1 control character + return 1 + + (ucs >= 0x1100 && + (ucs <= 0x115f || // Hangul Jamo init. consonants + ucs == 0x2329 || ucs == 0x232a || + (ucs >= 0x2e80 && ucs <= 0xa4cf && + ucs != 0x303f) || // CJK ... Yi + (ucs >= 0xac00 && ucs <= 0xd7a3) || // Hangul Syllables + (ucs >= 0xf900 && ucs <= 0xfaff) || // CJK Compatibility Ideographs + (ucs >= 0xfe10 && ucs <= 0xfe19) || // Vertical forms + (ucs >= 0xfe30 && ucs <= 0xfe6f) || // CJK Compatibility Forms + (ucs >= 0xff00 && ucs <= 0xff60) || // Fullwidth Forms + (ucs >= 0xffe0 && ucs <= 0xffe6) || + (ucs >= 0x20000 && ucs <= 0x2fffd) || + (ucs >= 0x30000 && ucs <= 0x3fffd))); +} + +function bisearch(ucs) { + var min = 0 + var max = combining.length - 1 + var mid + + if (ucs < combining[0][0] || ucs > combining[max][1]) return false + + while (max >= min) { + mid = Math.floor((min + max) / 2) + if (ucs > combining[mid][1]) min = mid + 1 + else if (ucs < combining[mid][0]) max = mid - 1 + else return true + } + + return false +} + + +/***/ }), +/* 387 */ +/***/ (function(module, exports, __webpack_require__) { + +var clone = __webpack_require__(388); + +module.exports = function(options, defaults) { + options = options || {}; + + Object.keys(defaults).forEach(function(key) { + if (typeof options[key] === 'undefined') { + options[key] = clone(defaults[key]); + } + }); + + return options; +}; + /***/ }), /* 388 */ +/***/ (function(module, exports, __webpack_require__) { + +var clone = (function() { +'use strict'; + +/** + * Clones (copies) an Object using deep copying. + * + * This function supports circular references by default, but if you are certain + * there are no circular references in your object, you can save some CPU time + * by calling clone(obj, false). + * + * Caution: if `circular` is false and `parent` contains circular references, + * your program may enter an infinite loop and crash. + * + * @param `parent` - the object to be cloned + * @param `circular` - set to true if the object to be cloned may contain + * circular references. (optional - true by default) + * @param `depth` - set to a number if the object is only to be cloned to + * a particular depth. (optional - defaults to Infinity) + * @param `prototype` - sets the prototype to be used when cloning an object. + * (optional - defaults to parent prototype). +*/ +function clone(parent, circular, depth, prototype) { + var filter; + if (typeof circular === 'object') { + depth = circular.depth; + prototype = circular.prototype; + filter = circular.filter; + circular = circular.circular + } + // maintain two arrays for circular references, where corresponding parents + // and children have the same index + var allParents = []; + var allChildren = []; + + var useBuffer = typeof Buffer != 'undefined'; + + if (typeof circular == 'undefined') + circular = true; + + if (typeof depth == 'undefined') + depth = Infinity; + + // recurse this function so we don't reset allParents and allChildren + function _clone(parent, depth) { + // cloning null always returns null + if (parent === null) + return null; + + if (depth == 0) + return parent; + + var child; + var proto; + if (typeof parent != 'object') { + return parent; + } + + if (clone.__isArray(parent)) { + child = []; + } else if (clone.__isRegExp(parent)) { + child = new RegExp(parent.source, __getRegExpFlags(parent)); + if (parent.lastIndex) child.lastIndex = parent.lastIndex; + } else if (clone.__isDate(parent)) { + child = new Date(parent.getTime()); + } else if (useBuffer && Buffer.isBuffer(parent)) { + if (Buffer.allocUnsafe) { + // Node.js >= 4.5.0 + child = Buffer.allocUnsafe(parent.length); + } else { + // Older Node.js versions + child = new Buffer(parent.length); + } + parent.copy(child); + return child; + } else { + if (typeof prototype == 'undefined') { + proto = Object.getPrototypeOf(parent); + child = Object.create(proto); + } + else { + child = Object.create(prototype); + proto = prototype; + } + } + + if (circular) { + var index = allParents.indexOf(parent); + + if (index != -1) { + return allChildren[index]; + } + allParents.push(parent); + allChildren.push(child); + } + + for (var i in parent) { + var attrs; + if (proto) { + attrs = Object.getOwnPropertyDescriptor(proto, i); + } + + if (attrs && attrs.set == null) { + continue; + } + child[i] = _clone(parent[i], depth - 1); + } + + return child; + } + + return _clone(parent, depth); +} + +/** + * Simple flat clone using prototype, accepts only objects, usefull for property + * override on FLAT configuration object (no nested props). + * + * USE WITH CAUTION! This may not behave as you wish if you do not know how this + * works. + */ +clone.clonePrototype = function clonePrototype(parent) { + if (parent === null) + return null; + + var c = function () {}; + c.prototype = parent; + return new c(); +}; + +// private utility functions + +function __objToStr(o) { + return Object.prototype.toString.call(o); +}; +clone.__objToStr = __objToStr; + +function __isDate(o) { + return typeof o === 'object' && __objToStr(o) === '[object Date]'; +}; +clone.__isDate = __isDate; + +function __isArray(o) { + return typeof o === 'object' && __objToStr(o) === '[object Array]'; +}; +clone.__isArray = __isArray; + +function __isRegExp(o) { + return typeof o === 'object' && __objToStr(o) === '[object RegExp]'; +}; +clone.__isRegExp = __isRegExp; + +function __getRegExpFlags(re) { + var flags = ''; + if (re.global) flags += 'g'; + if (re.ignoreCase) flags += 'i'; + if (re.multiline) flags += 'm'; + return flags; +}; +clone.__getRegExpFlags = __getRegExpFlags; + +return clone; +})(); + +if ( true && module.exports) { + module.exports = clone; +} + + +/***/ }), +/* 389 */ +/***/ (function(module, exports) { + +module.exports = [ + [ 0x0300, 0x036F ], [ 0x0483, 0x0486 ], [ 0x0488, 0x0489 ], + [ 0x0591, 0x05BD ], [ 0x05BF, 0x05BF ], [ 0x05C1, 0x05C2 ], + [ 0x05C4, 0x05C5 ], [ 0x05C7, 0x05C7 ], [ 0x0600, 0x0603 ], + [ 0x0610, 0x0615 ], [ 0x064B, 0x065E ], [ 0x0670, 0x0670 ], + [ 0x06D6, 0x06E4 ], [ 0x06E7, 0x06E8 ], [ 0x06EA, 0x06ED ], + [ 0x070F, 0x070F ], [ 0x0711, 0x0711 ], [ 0x0730, 0x074A ], + [ 0x07A6, 0x07B0 ], [ 0x07EB, 0x07F3 ], [ 0x0901, 0x0902 ], + [ 0x093C, 0x093C ], [ 0x0941, 0x0948 ], [ 0x094D, 0x094D ], + [ 0x0951, 0x0954 ], [ 0x0962, 0x0963 ], [ 0x0981, 0x0981 ], + [ 0x09BC, 0x09BC ], [ 0x09C1, 0x09C4 ], [ 0x09CD, 0x09CD ], + [ 0x09E2, 0x09E3 ], [ 0x0A01, 0x0A02 ], [ 0x0A3C, 0x0A3C ], + [ 0x0A41, 0x0A42 ], [ 0x0A47, 0x0A48 ], [ 0x0A4B, 0x0A4D ], + [ 0x0A70, 0x0A71 ], [ 0x0A81, 0x0A82 ], [ 0x0ABC, 0x0ABC ], + [ 0x0AC1, 0x0AC5 ], [ 0x0AC7, 0x0AC8 ], [ 0x0ACD, 0x0ACD ], + [ 0x0AE2, 0x0AE3 ], [ 0x0B01, 0x0B01 ], [ 0x0B3C, 0x0B3C ], + [ 0x0B3F, 0x0B3F ], [ 0x0B41, 0x0B43 ], [ 0x0B4D, 0x0B4D ], + [ 0x0B56, 0x0B56 ], [ 0x0B82, 0x0B82 ], [ 0x0BC0, 0x0BC0 ], + [ 0x0BCD, 0x0BCD ], [ 0x0C3E, 0x0C40 ], [ 0x0C46, 0x0C48 ], + [ 0x0C4A, 0x0C4D ], [ 0x0C55, 0x0C56 ], [ 0x0CBC, 0x0CBC ], + [ 0x0CBF, 0x0CBF ], [ 0x0CC6, 0x0CC6 ], [ 0x0CCC, 0x0CCD ], + [ 0x0CE2, 0x0CE3 ], [ 0x0D41, 0x0D43 ], [ 0x0D4D, 0x0D4D ], + [ 0x0DCA, 0x0DCA ], [ 0x0DD2, 0x0DD4 ], [ 0x0DD6, 0x0DD6 ], + [ 0x0E31, 0x0E31 ], [ 0x0E34, 0x0E3A ], [ 0x0E47, 0x0E4E ], + [ 0x0EB1, 0x0EB1 ], [ 0x0EB4, 0x0EB9 ], [ 0x0EBB, 0x0EBC ], + [ 0x0EC8, 0x0ECD ], [ 0x0F18, 0x0F19 ], [ 0x0F35, 0x0F35 ], + [ 0x0F37, 0x0F37 ], [ 0x0F39, 0x0F39 ], [ 0x0F71, 0x0F7E ], + [ 0x0F80, 0x0F84 ], [ 0x0F86, 0x0F87 ], [ 0x0F90, 0x0F97 ], + [ 0x0F99, 0x0FBC ], [ 0x0FC6, 0x0FC6 ], [ 0x102D, 0x1030 ], + [ 0x1032, 0x1032 ], [ 0x1036, 0x1037 ], [ 0x1039, 0x1039 ], + [ 0x1058, 0x1059 ], [ 0x1160, 0x11FF ], [ 0x135F, 0x135F ], + [ 0x1712, 0x1714 ], [ 0x1732, 0x1734 ], [ 0x1752, 0x1753 ], + [ 0x1772, 0x1773 ], [ 0x17B4, 0x17B5 ], [ 0x17B7, 0x17BD ], + [ 0x17C6, 0x17C6 ], [ 0x17C9, 0x17D3 ], [ 0x17DD, 0x17DD ], + [ 0x180B, 0x180D ], [ 0x18A9, 0x18A9 ], [ 0x1920, 0x1922 ], + [ 0x1927, 0x1928 ], [ 0x1932, 0x1932 ], [ 0x1939, 0x193B ], + [ 0x1A17, 0x1A18 ], [ 0x1B00, 0x1B03 ], [ 0x1B34, 0x1B34 ], + [ 0x1B36, 0x1B3A ], [ 0x1B3C, 0x1B3C ], [ 0x1B42, 0x1B42 ], + [ 0x1B6B, 0x1B73 ], [ 0x1DC0, 0x1DCA ], [ 0x1DFE, 0x1DFF ], + [ 0x200B, 0x200F ], [ 0x202A, 0x202E ], [ 0x2060, 0x2063 ], + [ 0x206A, 0x206F ], [ 0x20D0, 0x20EF ], [ 0x302A, 0x302F ], + [ 0x3099, 0x309A ], [ 0xA806, 0xA806 ], [ 0xA80B, 0xA80B ], + [ 0xA825, 0xA826 ], [ 0xFB1E, 0xFB1E ], [ 0xFE00, 0xFE0F ], + [ 0xFE20, 0xFE23 ], [ 0xFEFF, 0xFEFF ], [ 0xFFF9, 0xFFFB ], + [ 0x10A01, 0x10A03 ], [ 0x10A05, 0x10A06 ], [ 0x10A0C, 0x10A0F ], + [ 0x10A38, 0x10A3A ], [ 0x10A3F, 0x10A3F ], [ 0x1D167, 0x1D169 ], + [ 0x1D173, 0x1D182 ], [ 0x1D185, 0x1D18B ], [ 0x1D1AA, 0x1D1AD ], + [ 0x1D242, 0x1D244 ], [ 0xE0001, 0xE0001 ], [ 0xE0020, 0xE007F ], + [ 0xE0100, 0xE01EF ] +] + + +/***/ }), +/* 390 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +module.exports = ({stream = process.stdout} = {}) => { + return Boolean( + stream && stream.isTTY && + process.env.TERM !== 'dumb' && + !('CI' in process.env) + ); +}; + + +/***/ }), +/* 391 */ +/***/ (function(module, exports, __webpack_require__) { + +var Stream = __webpack_require__(137) + +module.exports = MuteStream + +// var out = new MuteStream(process.stdout) +// argument auto-pipes +function MuteStream (opts) { + Stream.apply(this) + opts = opts || {} + this.writable = this.readable = true + this.muted = false + this.on('pipe', this._onpipe) + this.replace = opts.replace + + // For readline-type situations + // This much at the start of a line being redrawn after a ctrl char + // is seen (such as backspace) won't be redrawn as the replacement + this._prompt = opts.prompt || null + this._hadControl = false +} + +MuteStream.prototype = Object.create(Stream.prototype) + +Object.defineProperty(MuteStream.prototype, 'constructor', { + value: MuteStream, + enumerable: false +}) + +MuteStream.prototype.mute = function () { + this.muted = true +} + +MuteStream.prototype.unmute = function () { + this.muted = false +} + +Object.defineProperty(MuteStream.prototype, '_onpipe', { + value: onPipe, + enumerable: false, + writable: true, + configurable: true +}) + +function onPipe (src) { + this._src = src +} + +Object.defineProperty(MuteStream.prototype, 'isTTY', { + get: getIsTTY, + set: setIsTTY, + enumerable: true, + configurable: true +}) + +function getIsTTY () { + return( (this._dest) ? this._dest.isTTY + : (this._src) ? this._src.isTTY + : false + ) +} + +// basically just get replace the getter/setter with a regular value +function setIsTTY (isTTY) { + Object.defineProperty(this, 'isTTY', { + value: isTTY, + enumerable: true, + writable: true, + configurable: true + }) +} + +Object.defineProperty(MuteStream.prototype, 'rows', { + get: function () { + return( this._dest ? this._dest.rows + : this._src ? this._src.rows + : undefined ) + }, enumerable: true, configurable: true }) + +Object.defineProperty(MuteStream.prototype, 'columns', { + get: function () { + return( this._dest ? this._dest.columns + : this._src ? this._src.columns + : undefined ) + }, enumerable: true, configurable: true }) + + +MuteStream.prototype.pipe = function (dest, options) { + this._dest = dest + return Stream.prototype.pipe.call(this, dest, options) +} + +MuteStream.prototype.pause = function () { + if (this._src) return this._src.pause() +} + +MuteStream.prototype.resume = function () { + if (this._src) return this._src.resume() +} + +MuteStream.prototype.write = function (c) { + if (this.muted) { + if (!this.replace) return true + if (c.match(/^\u001b/)) { + if(c.indexOf(this._prompt) === 0) { + c = c.substr(this._prompt.length); + c = c.replace(/./g, this.replace); + c = this._prompt + c; + } + this._hadControl = true + return this.emit('data', c) + } else { + if (this._prompt && this._hadControl && + c.indexOf(this._prompt) === 0) { + this._hadControl = false + this.emit('data', this._prompt) + c = c.substr(this._prompt.length) + } + c = c.toString().replace(/./g, this.replace) + } + } + this.emit('data', c) +} + +MuteStream.prototype.end = function (c) { + if (this.muted) { + if (c && this.replace) { + c = c.toString().replace(/./g, this.replace) + } else { + c = null + } + } + if (c) this.emit('data', c) + this.emit('end') +} + +function proxy (fn) { return function () { + var d = this._dest + var s = this._src + if (d && d[fn]) d[fn].apply(d, arguments) + if (s && s[fn]) s[fn].apply(s, arguments) +}} + +MuteStream.prototype.destroy = proxy('destroy') +MuteStream.prototype.destroySoon = proxy('destroySoon') +MuteStream.prototype.close = proxy('close') + + +/***/ }), +/* 392 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -48701,7 +48927,7 @@ const RunCommand = { }; /***/ }), -/* 389 */ +/* 393 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -48711,7 +48937,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(143); /* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(144); /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(145); -/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(390); +/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(394); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -48796,14 +49022,14 @@ const WatchCommand = { }; /***/ }), -/* 390 */ +/* 394 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waitUntilWatchIsReady", function() { return waitUntilWatchIsReady; }); /* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8); -/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(391); +/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(395); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -48870,141 +49096,141 @@ function waitUntilWatchIsReady(stream, opts = {}) { } /***/ }), -/* 391 */ +/* 395 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(392); +/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(396); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; }); -/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(393); +/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(397); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; }); -/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(394); +/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(398); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; }); -/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(395); +/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(399); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; }); -/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(396); +/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(400); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; }); -/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(397); +/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(401); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; }); -/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(398); +/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(402); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; }); -/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(399); +/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(403); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; }); -/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(400); +/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(404); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; }); -/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(401); +/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(405); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; }); -/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(402); +/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(406); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; }); /* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(80); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; }); -/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(403); +/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(407); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; }); -/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(404); +/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(408); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; }); -/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(405); +/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(409); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; }); -/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(406); +/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(410); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; }); -/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(407); +/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(411); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; }); -/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(408); +/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(412); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; }); -/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(409); +/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(413); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; }); -/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(411); +/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(415); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; }); -/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(412); +/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(416); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; }); -/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(413); +/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(417); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; }); -/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(414); +/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(418); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; }); -/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(415); +/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(419); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; }); -/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(416); +/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(420); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; }); -/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(419); +/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(423); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; }); -/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(420); +/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(424); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; }); -/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(421); +/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(425); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; }); -/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(422); +/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(426); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; }); -/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(423); +/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(427); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; }); /* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(104); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; }); -/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(424); +/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(428); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; }); -/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(425); +/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(429); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; }); -/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(426); +/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(430); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; }); -/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(427); +/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(431); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; }); /* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(31); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; }); -/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(428); +/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(432); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; }); -/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(429); +/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(433); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; }); -/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(430); +/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(434); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; }); /* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(66); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; }); -/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(432); +/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(436); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; }); -/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(433); +/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(437); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; }); -/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(434); +/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(438); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; }); -/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(437); +/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(441); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; }); /* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(81); @@ -49015,175 +49241,175 @@ __webpack_require__.r(__webpack_exports__); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); -/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(438); +/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(442); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; }); -/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(439); +/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(443); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; }); -/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(440); +/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(444); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; }); -/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(441); +/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(445); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; }); /* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(41); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; }); -/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(442); +/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(446); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; }); -/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(443); +/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(447); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; }); -/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(444); +/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(448); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; }); -/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(445); +/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(449); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__["pluck"]; }); -/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(446); +/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(450); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; }); -/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(447); +/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(451); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__["publishBehavior"]; }); -/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(448); +/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(452); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__["publishLast"]; }); -/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(449); +/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(453); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; }); -/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(450); +/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(454); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; }); -/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(435); +/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(439); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; }); -/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(451); +/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(455); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; }); -/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(452); +/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(456); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__["repeatWhen"]; }); -/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(453); +/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(457); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__["retry"]; }); -/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(454); +/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(458); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; }); /* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(30); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; }); -/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(455); +/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(459); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__["sample"]; }); -/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(456); +/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(460); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; }); -/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(436); +/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(440); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; }); -/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(457); +/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(461); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__["sequenceEqual"]; }); -/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(458); +/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(462); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; }); -/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(459); +/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(463); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__["shareReplay"]; }); -/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(460); +/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(464); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__["single"]; }); -/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(461); +/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(465); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__["skip"]; }); -/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(462); +/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(466); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__["skipLast"]; }); -/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(463); +/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(467); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__["skipUntil"]; }); -/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(464); +/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(468); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__["skipWhile"]; }); -/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(465); +/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(469); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__["startWith"]; }); -/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(466); +/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(470); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__["subscribeOn"]; }); -/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(468); +/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(472); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; }); -/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(469); +/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(473); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__["switchMap"]; }); -/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(470); +/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(474); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; }); -/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(418); +/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(422); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; }); -/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(431); +/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(435); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; }); -/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(471); +/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(475); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__["takeUntil"]; }); -/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(472); +/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(476); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; }); -/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(473); +/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(477); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; }); -/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(474); +/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(478); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; }); -/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(475); +/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(479); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; }); -/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(417); +/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(421); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; }); -/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(476); +/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(480); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; }); -/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(477); +/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(481); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; }); -/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(478); +/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(482); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; }); -/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(479); +/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(483); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; }); -/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(480); +/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(484); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; }); -/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(481); +/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(485); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; }); -/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(482); +/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(486); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; }); -/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(483); +/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(487); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; }); -/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(484); +/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(488); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; }); -/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(485); +/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(489); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; }); -/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(486); +/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(490); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; }); -/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(487); +/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(491); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; }); -/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(488); +/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(492); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ @@ -49295,7 +49521,7 @@ __webpack_require__.r(__webpack_exports__); /***/ }), -/* 392 */ +/* 396 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49376,14 +49602,14 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 393 */ +/* 397 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return auditTime; }); /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55); -/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(392); +/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(396); /* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(107); /** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */ @@ -49399,7 +49625,7 @@ function auditTime(duration, scheduler) { /***/ }), -/* 394 */ +/* 398 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49448,7 +49674,7 @@ var BufferSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 395 */ +/* 399 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49549,7 +49775,7 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 396 */ +/* 400 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49710,7 +49936,7 @@ function dispatchBufferClose(arg) { /***/ }), -/* 397 */ +/* 401 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49830,7 +50056,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 398 */ +/* 402 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49925,7 +50151,7 @@ var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 399 */ +/* 403 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49989,7 +50215,7 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 400 */ +/* 404 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50005,7 +50231,7 @@ function combineAll(project) { /***/ }), -/* 401 */ +/* 405 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50037,7 +50263,7 @@ function combineLatest() { /***/ }), -/* 402 */ +/* 406 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50057,7 +50283,7 @@ function concat() { /***/ }), -/* 403 */ +/* 407 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50073,13 +50299,13 @@ function concatMap(project, resultSelector) { /***/ }), -/* 404 */ +/* 408 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return concatMapTo; }); -/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(403); +/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(407); /** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */ function concatMapTo(innerObservable, resultSelector) { @@ -50089,7 +50315,7 @@ function concatMapTo(innerObservable, resultSelector) { /***/ }), -/* 405 */ +/* 409 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50154,7 +50380,7 @@ var CountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 406 */ +/* 410 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50242,7 +50468,7 @@ var DebounceSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 407 */ +/* 411 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50318,7 +50544,7 @@ function dispatchNext(subscriber) { /***/ }), -/* 408 */ +/* 412 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50368,7 +50594,7 @@ var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 409 */ +/* 413 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50376,7 +50602,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return delay; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12); /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55); -/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(410); +/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(414); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11); /* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42); /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -50475,7 +50701,7 @@ var DelayMessage = /*@__PURE__*/ (function () { /***/ }), -/* 410 */ +/* 414 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50489,7 +50715,7 @@ function isDate(value) { /***/ }), -/* 411 */ +/* 415 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50635,7 +50861,7 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 412 */ +/* 416 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50673,7 +50899,7 @@ var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 413 */ +/* 417 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50751,7 +50977,7 @@ var DistinctSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 414 */ +/* 418 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50822,13 +51048,13 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 415 */ +/* 419 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return distinctUntilKeyChanged; }); -/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(414); +/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(418); /** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */ function distinctUntilKeyChanged(key, compare) { @@ -50838,7 +51064,7 @@ function distinctUntilKeyChanged(key, compare) { /***/ }), -/* 416 */ +/* 420 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50846,9 +51072,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return elementAt; }); /* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(62); /* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(104); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(417); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(408); -/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(418); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(421); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(412); +/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(422); /** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */ @@ -50870,7 +51096,7 @@ function elementAt(index, defaultValue) { /***/ }), -/* 417 */ +/* 421 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50936,7 +51162,7 @@ function defaultErrorFactory() { /***/ }), -/* 418 */ +/* 422 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50998,7 +51224,7 @@ var TakeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 419 */ +/* 423 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51020,7 +51246,7 @@ function endWith() { /***/ }), -/* 420 */ +/* 424 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51082,7 +51308,7 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 421 */ +/* 425 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51139,7 +51365,7 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 422 */ +/* 426 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51239,7 +51465,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 423 */ +/* 427 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51358,7 +51584,7 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 424 */ +/* 428 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51396,7 +51622,7 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 425 */ +/* 429 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51468,13 +51694,13 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 426 */ +/* 430 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; }); -/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(425); +/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(429); /** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */ function findIndex(predicate, thisArg) { @@ -51484,7 +51710,7 @@ function findIndex(predicate, thisArg) { /***/ }), -/* 427 */ +/* 431 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51492,9 +51718,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return first; }); /* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(63); /* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(104); -/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(418); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(408); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(417); +/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(422); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(412); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(421); /* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25); /** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */ @@ -51511,7 +51737,7 @@ function first(predicate, defaultValue) { /***/ }), -/* 428 */ +/* 432 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51548,7 +51774,7 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 429 */ +/* 433 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51592,7 +51818,7 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 430 */ +/* 434 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51600,9 +51826,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return last; }); /* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(63); /* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(104); -/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(431); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(417); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(408); +/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(435); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(421); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(412); /* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25); /** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */ @@ -51619,7 +51845,7 @@ function last(predicate, defaultValue) { /***/ }), -/* 431 */ +/* 435 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51696,7 +51922,7 @@ var TakeLastSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 432 */ +/* 436 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51735,7 +51961,7 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 433 */ +/* 437 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51785,13 +52011,13 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 434 */ +/* 438 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return max; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(435); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(439); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function max(comparer) { @@ -51804,15 +52030,15 @@ function max(comparer) { /***/ }), -/* 435 */ +/* 439 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return reduce; }); -/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(436); -/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(431); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(408); +/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(440); +/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(435); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(412); /* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(24); /** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */ @@ -51833,7 +52059,7 @@ function reduce(accumulator, seed) { /***/ }), -/* 436 */ +/* 440 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51915,7 +52141,7 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 437 */ +/* 441 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51935,7 +52161,7 @@ function merge() { /***/ }), -/* 438 */ +/* 442 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51960,7 +52186,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) { /***/ }), -/* 439 */ +/* 443 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52075,13 +52301,13 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 440 */ +/* 444 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return min; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(435); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(439); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function min(comparer) { @@ -52094,7 +52320,7 @@ function min(comparer) { /***/ }), -/* 441 */ +/* 445 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52143,7 +52369,7 @@ var MulticastOperator = /*@__PURE__*/ (function () { /***/ }), -/* 442 */ +/* 446 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52237,7 +52463,7 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 443 */ +/* 447 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52285,7 +52511,7 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 444 */ +/* 448 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52308,7 +52534,7 @@ function partition(predicate, thisArg) { /***/ }), -/* 445 */ +/* 449 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52348,14 +52574,14 @@ function plucker(props, length) { /***/ }), -/* 446 */ +/* 450 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return publish; }); /* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(27); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(441); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(445); /** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */ @@ -52368,14 +52594,14 @@ function publish(selector) { /***/ }), -/* 447 */ +/* 451 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return publishBehavior; }); /* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(441); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(445); /** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */ @@ -52386,14 +52612,14 @@ function publishBehavior(value) { /***/ }), -/* 448 */ +/* 452 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return publishLast; }); /* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(50); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(441); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(445); /** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */ @@ -52404,14 +52630,14 @@ function publishLast() { /***/ }), -/* 449 */ +/* 453 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return publishReplay; }); /* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(33); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(441); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(445); /** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */ @@ -52427,7 +52653,7 @@ function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) { /***/ }), -/* 450 */ +/* 454 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52454,7 +52680,7 @@ function race() { /***/ }), -/* 451 */ +/* 455 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52519,7 +52745,7 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 452 */ +/* 456 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52615,7 +52841,7 @@ var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 453 */ +/* 457 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52668,7 +52894,7 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 454 */ +/* 458 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52756,7 +52982,7 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 455 */ +/* 459 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52813,7 +53039,7 @@ var SampleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 456 */ +/* 460 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52873,7 +53099,7 @@ function dispatchNotification(state) { /***/ }), -/* 457 */ +/* 461 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -52996,13 +53222,13 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 458 */ +/* 462 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return share; }); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(441); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(445); /* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30); /* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(27); /** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */ @@ -53019,7 +53245,7 @@ function share() { /***/ }), -/* 459 */ +/* 463 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53084,7 +53310,7 @@ function shareReplayOperator(_a) { /***/ }), -/* 460 */ +/* 464 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53164,7 +53390,7 @@ var SingleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 461 */ +/* 465 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53206,7 +53432,7 @@ var SkipSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 462 */ +/* 466 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53268,7 +53494,7 @@ var SkipLastSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 463 */ +/* 467 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53329,7 +53555,7 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 464 */ +/* 468 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53385,7 +53611,7 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 465 */ +/* 469 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53414,13 +53640,13 @@ function startWith() { /***/ }), -/* 466 */ +/* 470 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return subscribeOn; }); -/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(467); +/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(471); /** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */ function subscribeOn(scheduler, delay) { @@ -53445,7 +53671,7 @@ var SubscribeOnOperator = /*@__PURE__*/ (function () { /***/ }), -/* 467 */ +/* 471 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53509,13 +53735,13 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) { /***/ }), -/* 468 */ +/* 472 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return switchAll; }); -/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(469); +/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(473); /* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(25); /** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */ @@ -53527,7 +53753,7 @@ function switchAll() { /***/ }), -/* 469 */ +/* 473 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53621,13 +53847,13 @@ var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 470 */ +/* 474 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return switchMapTo; }); -/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(469); +/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(473); /** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */ function switchMapTo(innerObservable, resultSelector) { @@ -53637,7 +53863,7 @@ function switchMapTo(innerObservable, resultSelector) { /***/ }), -/* 471 */ +/* 475 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53687,7 +53913,7 @@ var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 472 */ +/* 476 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53755,7 +53981,7 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 473 */ +/* 477 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53843,7 +54069,7 @@ var TapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 474 */ +/* 478 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53947,7 +54173,7 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 475 */ +/* 479 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -53956,7 +54182,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11); /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(55); -/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(474); +/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(478); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */ @@ -54045,7 +54271,7 @@ function dispatchNext(arg) { /***/ }), -/* 476 */ +/* 480 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54053,7 +54279,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return timeInterval; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeInterval", function() { return TimeInterval; }); /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55); -/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(436); +/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(440); /* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(90); /* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(66); /** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */ @@ -54089,7 +54315,7 @@ var TimeInterval = /*@__PURE__*/ (function () { /***/ }), -/* 477 */ +/* 481 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54097,7 +54323,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; }); /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55); /* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(64); -/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(478); +/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(482); /* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49); /** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */ @@ -54114,7 +54340,7 @@ function timeout(due, scheduler) { /***/ }), -/* 478 */ +/* 482 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54122,7 +54348,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12); /* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(55); -/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(410); +/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(414); /* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(69); /* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(70); /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -54196,7 +54422,7 @@ var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 479 */ +/* 483 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54226,13 +54452,13 @@ var Timestamp = /*@__PURE__*/ (function () { /***/ }), -/* 480 */ +/* 484 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return toArray; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(435); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(439); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function toArrayReducer(arr, item, index) { @@ -54249,7 +54475,7 @@ function toArray() { /***/ }), -/* 481 */ +/* 485 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54329,7 +54555,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 482 */ +/* 486 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54419,7 +54645,7 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 483 */ +/* 487 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54589,7 +54815,7 @@ function dispatchWindowClose(state) { /***/ }), -/* 484 */ +/* 488 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54732,7 +54958,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 485 */ +/* 489 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54829,7 +55055,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 486 */ +/* 490 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54924,7 +55150,7 @@ var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 487 */ +/* 491 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54946,7 +55172,7 @@ function zip() { /***/ }), -/* 488 */ +/* 492 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54962,7 +55188,7 @@ function zipAll(project) { /***/ }), -/* 489 */ +/* 493 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -54971,8 +55197,8 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(162); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(143); /* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(145); -/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(490); -/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(491); +/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(494); +/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(495); function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } @@ -55054,13 +55280,13 @@ function toArray(value) { } /***/ }), -/* 490 */ +/* 494 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "renderProjectsTree", function() { return renderProjectsTree; }); -/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(227); +/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(112); /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__); @@ -55207,7 +55433,7 @@ function addProjectToTree(tree, pathParts, project) { } /***/ }), -/* 491 */ +/* 495 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -55215,13 +55441,13 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kibana", function() { return Kibana; }); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(492); +/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(496); /* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(366); +/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(361); /* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(279); +/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(274); /* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(145); -/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(276); +/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(271); function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } @@ -55383,15 +55609,15 @@ class Kibana { } /***/ }), -/* 492 */ +/* 496 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const minimatch = __webpack_require__(149); -const arrayUnion = __webpack_require__(493); -const arrayDiffer = __webpack_require__(494); -const arrify = __webpack_require__(495); +const arrayUnion = __webpack_require__(497); +const arrayDiffer = __webpack_require__(498); +const arrify = __webpack_require__(499); module.exports = (list, patterns, options = {}) => { list = arrify(list); @@ -55415,7 +55641,7 @@ module.exports = (list, patterns, options = {}) => { /***/ }), -/* 493 */ +/* 497 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55427,7 +55653,7 @@ module.exports = (...arguments_) => { /***/ }), -/* 494 */ +/* 498 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55442,7 +55668,7 @@ module.exports = arrayDiffer; /***/ }), -/* 495 */ +/* 499 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55472,12 +55698,12 @@ module.exports = arrify; /***/ }), -/* 496 */ +/* 500 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(497); +/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(501); /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; }); /* @@ -55501,19 +55727,19 @@ __webpack_require__.r(__webpack_exports__); /***/ }), -/* 497 */ +/* 501 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; }); -/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(498); +/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(502); /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(285); +/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(280); /* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4); /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(276); +/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(271); /* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(130); /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(143); /* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(164); @@ -55649,7 +55875,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { } /***/ }), -/* 498 */ +/* 502 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55657,13 +55883,13 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { const EventEmitter = __webpack_require__(155); const path = __webpack_require__(4); const os = __webpack_require__(120); -const pAll = __webpack_require__(499); -const arrify = __webpack_require__(501); -const globby = __webpack_require__(502); -const isGlob = __webpack_require__(700); -const cpFile = __webpack_require__(701); -const junk = __webpack_require__(713); -const CpyError = __webpack_require__(714); +const pAll = __webpack_require__(503); +const arrify = __webpack_require__(505); +const globby = __webpack_require__(506); +const isGlob = __webpack_require__(704); +const cpFile = __webpack_require__(705); +const junk = __webpack_require__(717); +const CpyError = __webpack_require__(718); const defaultOptions = { ignoreJunk: true @@ -55782,12 +56008,12 @@ module.exports = (source, destination, { /***/ }), -/* 499 */ +/* 503 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const pMap = __webpack_require__(500); +const pMap = __webpack_require__(504); module.exports = (iterable, options) => pMap(iterable, element => element(), options); // TODO: Remove this for the next major release @@ -55795,7 +56021,7 @@ module.exports.default = module.exports; /***/ }), -/* 500 */ +/* 504 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55874,7 +56100,7 @@ module.exports.default = pMap; /***/ }), -/* 501 */ +/* 505 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -55904,17 +56130,17 @@ module.exports = arrify; /***/ }), -/* 502 */ +/* 506 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(133); -const arrayUnion = __webpack_require__(503); +const arrayUnion = __webpack_require__(507); const glob = __webpack_require__(146); -const fastGlob = __webpack_require__(505); -const dirGlob = __webpack_require__(693); -const gitignore = __webpack_require__(696); +const fastGlob = __webpack_require__(509); +const dirGlob = __webpack_require__(697); +const gitignore = __webpack_require__(700); const DEFAULT_FILTER = () => false; @@ -56059,12 +56285,12 @@ module.exports.gitignore = gitignore; /***/ }), -/* 503 */ +/* 507 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var arrayUniq = __webpack_require__(504); +var arrayUniq = __webpack_require__(508); module.exports = function () { return arrayUniq([].concat.apply([], arguments)); @@ -56072,7 +56298,7 @@ module.exports = function () { /***/ }), -/* 504 */ +/* 508 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56141,10 +56367,10 @@ if ('Set' in global) { /***/ }), -/* 505 */ +/* 509 */ /***/ (function(module, exports, __webpack_require__) { -const pkg = __webpack_require__(506); +const pkg = __webpack_require__(510); module.exports = pkg.async; module.exports.default = pkg.async; @@ -56157,19 +56383,19 @@ module.exports.generateTasks = pkg.generateTasks; /***/ }), -/* 506 */ +/* 510 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var optionsManager = __webpack_require__(507); -var taskManager = __webpack_require__(508); -var reader_async_1 = __webpack_require__(664); -var reader_stream_1 = __webpack_require__(688); -var reader_sync_1 = __webpack_require__(689); -var arrayUtils = __webpack_require__(691); -var streamUtils = __webpack_require__(692); +var optionsManager = __webpack_require__(511); +var taskManager = __webpack_require__(512); +var reader_async_1 = __webpack_require__(668); +var reader_stream_1 = __webpack_require__(692); +var reader_sync_1 = __webpack_require__(693); +var arrayUtils = __webpack_require__(695); +var streamUtils = __webpack_require__(696); /** * Synchronous API. */ @@ -56235,7 +56461,7 @@ function isString(source) { /***/ }), -/* 507 */ +/* 511 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56273,13 +56499,13 @@ exports.prepare = prepare; /***/ }), -/* 508 */ +/* 512 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var patternUtils = __webpack_require__(509); +var patternUtils = __webpack_require__(513); /** * Generate tasks based on parent directory of each pattern. */ @@ -56370,16 +56596,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask; /***/ }), -/* 509 */ +/* 513 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var path = __webpack_require__(4); -var globParent = __webpack_require__(510); -var isGlob = __webpack_require__(513); -var micromatch = __webpack_require__(514); +var globParent = __webpack_require__(514); +var isGlob = __webpack_require__(517); +var micromatch = __webpack_require__(518); var GLOBSTAR = '**'; /** * Return true for static pattern. @@ -56525,15 +56751,15 @@ exports.matchAny = matchAny; /***/ }), -/* 510 */ +/* 514 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var path = __webpack_require__(4); -var isglob = __webpack_require__(511); -var pathDirname = __webpack_require__(512); +var isglob = __webpack_require__(515); +var pathDirname = __webpack_require__(516); var isWin32 = __webpack_require__(120).platform() === 'win32'; module.exports = function globParent(str) { @@ -56556,7 +56782,7 @@ module.exports = function globParent(str) { /***/ }), -/* 511 */ +/* 515 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -56566,7 +56792,7 @@ module.exports = function globParent(str) { * Licensed under the MIT License. */ -var isExtglob = __webpack_require__(299); +var isExtglob = __webpack_require__(294); module.exports = function isGlob(str) { if (typeof str !== 'string' || str === '') { @@ -56587,7 +56813,7 @@ module.exports = function isGlob(str) { /***/ }), -/* 512 */ +/* 516 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56737,7 +56963,7 @@ module.exports.win32 = win32; /***/ }), -/* 513 */ +/* 517 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -56747,7 +56973,7 @@ module.exports.win32 = win32; * Released under the MIT License. */ -var isExtglob = __webpack_require__(299); +var isExtglob = __webpack_require__(294); var chars = { '{': '}', '(': ')', '[': ']'}; module.exports = function isGlob(str, options) { @@ -56789,7 +57015,7 @@ module.exports = function isGlob(str, options) { /***/ }), -/* 514 */ +/* 518 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -56800,18 +57026,18 @@ module.exports = function isGlob(str, options) { */ var util = __webpack_require__(111); -var braces = __webpack_require__(515); -var toRegex = __webpack_require__(617); -var extend = __webpack_require__(625); +var braces = __webpack_require__(519); +var toRegex = __webpack_require__(621); +var extend = __webpack_require__(629); /** * Local dependencies */ -var compilers = __webpack_require__(628); -var parsers = __webpack_require__(660); -var cache = __webpack_require__(661); -var utils = __webpack_require__(662); +var compilers = __webpack_require__(632); +var parsers = __webpack_require__(664); +var cache = __webpack_require__(665); +var utils = __webpack_require__(666); var MAX_LENGTH = 1024 * 64; /** @@ -57673,7 +57899,7 @@ module.exports = micromatch; /***/ }), -/* 515 */ +/* 519 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -57683,18 +57909,18 @@ module.exports = micromatch; * Module dependencies */ -var toRegex = __webpack_require__(516); -var unique = __webpack_require__(528); -var extend = __webpack_require__(525); +var toRegex = __webpack_require__(520); +var unique = __webpack_require__(532); +var extend = __webpack_require__(529); /** * Local dependencies */ -var compilers = __webpack_require__(529); -var parsers = __webpack_require__(544); -var Braces = __webpack_require__(554); -var utils = __webpack_require__(530); +var compilers = __webpack_require__(533); +var parsers = __webpack_require__(548); +var Braces = __webpack_require__(558); +var utils = __webpack_require__(534); var MAX_LENGTH = 1024 * 64; var cache = {}; @@ -57998,15 +58224,15 @@ module.exports = braces; /***/ }), -/* 516 */ +/* 520 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var define = __webpack_require__(517); -var extend = __webpack_require__(525); -var not = __webpack_require__(527); +var define = __webpack_require__(521); +var extend = __webpack_require__(529); +var not = __webpack_require__(531); var MAX_LENGTH = 1024 * 64; /** @@ -58153,7 +58379,7 @@ module.exports.makeRe = makeRe; /***/ }), -/* 517 */ +/* 521 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58166,7 +58392,7 @@ module.exports.makeRe = makeRe; -var isDescriptor = __webpack_require__(518); +var isDescriptor = __webpack_require__(522); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -58191,7 +58417,7 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 518 */ +/* 522 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58204,9 +58430,9 @@ module.exports = function defineProperty(obj, prop, val) { -var typeOf = __webpack_require__(519); -var isAccessor = __webpack_require__(520); -var isData = __webpack_require__(523); +var typeOf = __webpack_require__(523); +var isAccessor = __webpack_require__(524); +var isData = __webpack_require__(527); module.exports = function isDescriptor(obj, key) { if (typeOf(obj) !== 'object') { @@ -58220,7 +58446,7 @@ module.exports = function isDescriptor(obj, key) { /***/ }), -/* 519 */ +/* 523 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -58373,7 +58599,7 @@ function isBuffer(val) { /***/ }), -/* 520 */ +/* 524 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58386,7 +58612,7 @@ function isBuffer(val) { -var typeOf = __webpack_require__(521); +var typeOf = __webpack_require__(525); // accessor descriptor properties var accessor = { @@ -58449,10 +58675,10 @@ module.exports = isAccessorDescriptor; /***/ }), -/* 521 */ +/* 525 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(522); +var isBuffer = __webpack_require__(526); var toString = Object.prototype.toString; /** @@ -58571,7 +58797,7 @@ module.exports = function kindOf(val) { /***/ }), -/* 522 */ +/* 526 */ /***/ (function(module, exports) { /*! @@ -58598,7 +58824,7 @@ function isSlowBuffer (obj) { /***/ }), -/* 523 */ +/* 527 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58611,7 +58837,7 @@ function isSlowBuffer (obj) { -var typeOf = __webpack_require__(524); +var typeOf = __webpack_require__(528); // data descriptor properties var data = { @@ -58660,10 +58886,10 @@ module.exports = isDataDescriptor; /***/ }), -/* 524 */ +/* 528 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(522); +var isBuffer = __webpack_require__(526); var toString = Object.prototype.toString; /** @@ -58782,13 +59008,13 @@ module.exports = function kindOf(val) { /***/ }), -/* 525 */ +/* 529 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(526); +var isObject = __webpack_require__(530); module.exports = function extend(o/*, objects*/) { if (!isObject(o)) { o = {}; } @@ -58822,7 +59048,7 @@ function hasOwn(obj, key) { /***/ }), -/* 526 */ +/* 530 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58842,13 +59068,13 @@ module.exports = function isExtendable(val) { /***/ }), -/* 527 */ +/* 531 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extend = __webpack_require__(525); +var extend = __webpack_require__(529); /** * The main export is a function that takes a `pattern` string and an `options` object. @@ -58915,7 +59141,7 @@ module.exports = toRegex; /***/ }), -/* 528 */ +/* 532 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -58965,13 +59191,13 @@ module.exports.immutable = function uniqueImmutable(arr) { /***/ }), -/* 529 */ +/* 533 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var utils = __webpack_require__(530); +var utils = __webpack_require__(534); module.exports = function(braces, options) { braces.compiler @@ -59254,25 +59480,25 @@ function hasQueue(node) { /***/ }), -/* 530 */ +/* 534 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var splitString = __webpack_require__(531); +var splitString = __webpack_require__(535); var utils = module.exports; /** * Module dependencies */ -utils.extend = __webpack_require__(525); -utils.flatten = __webpack_require__(537); -utils.isObject = __webpack_require__(535); -utils.fillRange = __webpack_require__(538); -utils.repeat = __webpack_require__(543); -utils.unique = __webpack_require__(528); +utils.extend = __webpack_require__(529); +utils.flatten = __webpack_require__(541); +utils.isObject = __webpack_require__(539); +utils.fillRange = __webpack_require__(542); +utils.repeat = __webpack_require__(547); +utils.unique = __webpack_require__(532); utils.define = function(obj, key, val) { Object.defineProperty(obj, key, { @@ -59604,7 +59830,7 @@ utils.escapeRegex = function(str) { /***/ }), -/* 531 */ +/* 535 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59617,7 +59843,7 @@ utils.escapeRegex = function(str) { -var extend = __webpack_require__(532); +var extend = __webpack_require__(536); module.exports = function(str, options, fn) { if (typeof str !== 'string') { @@ -59782,14 +60008,14 @@ function keepEscaping(opts, str, idx) { /***/ }), -/* 532 */ +/* 536 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(533); -var assignSymbols = __webpack_require__(536); +var isExtendable = __webpack_require__(537); +var assignSymbols = __webpack_require__(540); module.exports = Object.assign || function(obj/*, objects*/) { if (obj === null || typeof obj === 'undefined') { @@ -59849,7 +60075,7 @@ function isEnum(obj, key) { /***/ }), -/* 533 */ +/* 537 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59862,7 +60088,7 @@ function isEnum(obj, key) { -var isPlainObject = __webpack_require__(534); +var isPlainObject = __webpack_require__(538); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -59870,7 +60096,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 534 */ +/* 538 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59883,7 +60109,7 @@ module.exports = function isExtendable(val) { -var isObject = __webpack_require__(535); +var isObject = __webpack_require__(539); function isObjectObject(o) { return isObject(o) === true @@ -59914,7 +60140,7 @@ module.exports = function isPlainObject(o) { /***/ }), -/* 535 */ +/* 539 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59933,7 +60159,7 @@ module.exports = function isObject(val) { /***/ }), -/* 536 */ +/* 540 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -59980,7 +60206,7 @@ module.exports = function(receiver, objects) { /***/ }), -/* 537 */ +/* 541 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60009,7 +60235,7 @@ function flat(arr, res) { /***/ }), -/* 538 */ +/* 542 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60023,10 +60249,10 @@ function flat(arr, res) { var util = __webpack_require__(111); -var isNumber = __webpack_require__(539); -var extend = __webpack_require__(525); -var repeat = __webpack_require__(541); -var toRegex = __webpack_require__(542); +var isNumber = __webpack_require__(543); +var extend = __webpack_require__(529); +var repeat = __webpack_require__(545); +var toRegex = __webpack_require__(546); /** * Return a range of numbers or letters. @@ -60224,7 +60450,7 @@ module.exports = fillRange; /***/ }), -/* 539 */ +/* 543 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60237,7 +60463,7 @@ module.exports = fillRange; -var typeOf = __webpack_require__(540); +var typeOf = __webpack_require__(544); module.exports = function isNumber(num) { var type = typeOf(num); @@ -60253,10 +60479,10 @@ module.exports = function isNumber(num) { /***/ }), -/* 540 */ +/* 544 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(522); +var isBuffer = __webpack_require__(526); var toString = Object.prototype.toString; /** @@ -60375,7 +60601,7 @@ module.exports = function kindOf(val) { /***/ }), -/* 541 */ +/* 545 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60452,7 +60678,7 @@ function repeat(str, num) { /***/ }), -/* 542 */ +/* 546 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60465,8 +60691,8 @@ function repeat(str, num) { -var repeat = __webpack_require__(541); -var isNumber = __webpack_require__(539); +var repeat = __webpack_require__(545); +var isNumber = __webpack_require__(543); var cache = {}; function toRegexRange(min, max, options) { @@ -60753,7 +60979,7 @@ module.exports = toRegexRange; /***/ }), -/* 543 */ +/* 547 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -60778,14 +61004,14 @@ module.exports = function repeat(ele, num) { /***/ }), -/* 544 */ +/* 548 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var Node = __webpack_require__(545); -var utils = __webpack_require__(530); +var Node = __webpack_require__(549); +var utils = __webpack_require__(534); /** * Braces parsers @@ -61145,15 +61371,15 @@ function concatNodes(pos, node, parent, options) { /***/ }), -/* 545 */ +/* 549 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(535); -var define = __webpack_require__(546); -var utils = __webpack_require__(553); +var isObject = __webpack_require__(539); +var define = __webpack_require__(550); +var utils = __webpack_require__(557); var ownNames; /** @@ -61644,7 +61870,7 @@ exports = module.exports = Node; /***/ }), -/* 546 */ +/* 550 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61657,7 +61883,7 @@ exports = module.exports = Node; -var isDescriptor = __webpack_require__(547); +var isDescriptor = __webpack_require__(551); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -61682,7 +61908,7 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 547 */ +/* 551 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61695,9 +61921,9 @@ module.exports = function defineProperty(obj, prop, val) { -var typeOf = __webpack_require__(548); -var isAccessor = __webpack_require__(549); -var isData = __webpack_require__(551); +var typeOf = __webpack_require__(552); +var isAccessor = __webpack_require__(553); +var isData = __webpack_require__(555); module.exports = function isDescriptor(obj, key) { if (typeOf(obj) !== 'object') { @@ -61711,7 +61937,7 @@ module.exports = function isDescriptor(obj, key) { /***/ }), -/* 548 */ +/* 552 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -61846,7 +62072,7 @@ function isBuffer(val) { /***/ }), -/* 549 */ +/* 553 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -61859,7 +62085,7 @@ function isBuffer(val) { -var typeOf = __webpack_require__(550); +var typeOf = __webpack_require__(554); // accessor descriptor properties var accessor = { @@ -61922,7 +62148,7 @@ module.exports = isAccessorDescriptor; /***/ }), -/* 550 */ +/* 554 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -62057,7 +62283,7 @@ function isBuffer(val) { /***/ }), -/* 551 */ +/* 555 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -62070,7 +62296,7 @@ function isBuffer(val) { -var typeOf = __webpack_require__(552); +var typeOf = __webpack_require__(556); module.exports = function isDataDescriptor(obj, prop) { // data descriptor properties @@ -62113,7 +62339,7 @@ module.exports = function isDataDescriptor(obj, prop) { /***/ }), -/* 552 */ +/* 556 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -62248,13 +62474,13 @@ function isBuffer(val) { /***/ }), -/* 553 */ +/* 557 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var typeOf = __webpack_require__(540); +var typeOf = __webpack_require__(544); var utils = module.exports; /** @@ -63274,17 +63500,17 @@ function assert(val, message) { /***/ }), -/* 554 */ +/* 558 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extend = __webpack_require__(525); -var Snapdragon = __webpack_require__(555); -var compilers = __webpack_require__(529); -var parsers = __webpack_require__(544); -var utils = __webpack_require__(530); +var extend = __webpack_require__(529); +var Snapdragon = __webpack_require__(559); +var compilers = __webpack_require__(533); +var parsers = __webpack_require__(548); +var utils = __webpack_require__(534); /** * Customize Snapdragon parser and renderer @@ -63385,17 +63611,17 @@ module.exports = Braces; /***/ }), -/* 555 */ +/* 559 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var Base = __webpack_require__(556); -var define = __webpack_require__(517); -var Compiler = __webpack_require__(585); -var Parser = __webpack_require__(614); -var utils = __webpack_require__(594); +var Base = __webpack_require__(560); +var define = __webpack_require__(521); +var Compiler = __webpack_require__(589); +var Parser = __webpack_require__(618); +var utils = __webpack_require__(598); var regexCache = {}; var cache = {}; @@ -63566,20 +63792,20 @@ module.exports.Parser = Parser; /***/ }), -/* 556 */ +/* 560 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(111); -var define = __webpack_require__(557); -var CacheBase = __webpack_require__(558); -var Emitter = __webpack_require__(559); -var isObject = __webpack_require__(535); -var merge = __webpack_require__(576); -var pascal = __webpack_require__(579); -var cu = __webpack_require__(580); +var define = __webpack_require__(561); +var CacheBase = __webpack_require__(562); +var Emitter = __webpack_require__(563); +var isObject = __webpack_require__(539); +var merge = __webpack_require__(580); +var pascal = __webpack_require__(583); +var cu = __webpack_require__(584); /** * Optionally define a custom `cache` namespace to use. @@ -64008,7 +64234,7 @@ module.exports.namespace = namespace; /***/ }), -/* 557 */ +/* 561 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64021,7 +64247,7 @@ module.exports.namespace = namespace; -var isDescriptor = __webpack_require__(547); +var isDescriptor = __webpack_require__(551); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -64046,21 +64272,21 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 558 */ +/* 562 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(535); -var Emitter = __webpack_require__(559); -var visit = __webpack_require__(560); -var toPath = __webpack_require__(563); -var union = __webpack_require__(564); -var del = __webpack_require__(568); -var get = __webpack_require__(566); -var has = __webpack_require__(573); -var set = __webpack_require__(567); +var isObject = __webpack_require__(539); +var Emitter = __webpack_require__(563); +var visit = __webpack_require__(564); +var toPath = __webpack_require__(567); +var union = __webpack_require__(568); +var del = __webpack_require__(572); +var get = __webpack_require__(570); +var has = __webpack_require__(577); +var set = __webpack_require__(571); /** * Create a `Cache` constructor that when instantiated will @@ -64314,7 +64540,7 @@ module.exports.namespace = namespace; /***/ }), -/* 559 */ +/* 563 */ /***/ (function(module, exports, __webpack_require__) { @@ -64483,7 +64709,7 @@ Emitter.prototype.hasListeners = function(event){ /***/ }), -/* 560 */ +/* 564 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64496,8 +64722,8 @@ Emitter.prototype.hasListeners = function(event){ -var visit = __webpack_require__(561); -var mapVisit = __webpack_require__(562); +var visit = __webpack_require__(565); +var mapVisit = __webpack_require__(566); module.exports = function(collection, method, val) { var result; @@ -64520,7 +64746,7 @@ module.exports = function(collection, method, val) { /***/ }), -/* 561 */ +/* 565 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64533,7 +64759,7 @@ module.exports = function(collection, method, val) { -var isObject = __webpack_require__(535); +var isObject = __webpack_require__(539); module.exports = function visit(thisArg, method, target, val) { if (!isObject(thisArg) && typeof thisArg !== 'function') { @@ -64560,14 +64786,14 @@ module.exports = function visit(thisArg, method, target, val) { /***/ }), -/* 562 */ +/* 566 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(111); -var visit = __webpack_require__(561); +var visit = __webpack_require__(565); /** * Map `visit` over an array of objects. @@ -64604,7 +64830,7 @@ function isObject(val) { /***/ }), -/* 563 */ +/* 567 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64617,7 +64843,7 @@ function isObject(val) { -var typeOf = __webpack_require__(540); +var typeOf = __webpack_require__(544); module.exports = function toPath(args) { if (typeOf(args) !== 'arguments') { @@ -64644,16 +64870,16 @@ function filter(arr) { /***/ }), -/* 564 */ +/* 568 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isObject = __webpack_require__(526); -var union = __webpack_require__(565); -var get = __webpack_require__(566); -var set = __webpack_require__(567); +var isObject = __webpack_require__(530); +var union = __webpack_require__(569); +var get = __webpack_require__(570); +var set = __webpack_require__(571); module.exports = function unionValue(obj, prop, value) { if (!isObject(obj)) { @@ -64681,7 +64907,7 @@ function arrayify(val) { /***/ }), -/* 565 */ +/* 569 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64717,7 +64943,7 @@ module.exports = function union(init) { /***/ }), -/* 566 */ +/* 570 */ /***/ (function(module, exports) { /*! @@ -64773,7 +64999,7 @@ function toString(val) { /***/ }), -/* 567 */ +/* 571 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64786,10 +65012,10 @@ function toString(val) { -var split = __webpack_require__(531); -var extend = __webpack_require__(525); -var isPlainObject = __webpack_require__(534); -var isObject = __webpack_require__(526); +var split = __webpack_require__(535); +var extend = __webpack_require__(529); +var isPlainObject = __webpack_require__(538); +var isObject = __webpack_require__(530); module.exports = function(obj, prop, val) { if (!isObject(obj)) { @@ -64835,7 +65061,7 @@ function isValidKey(key) { /***/ }), -/* 568 */ +/* 572 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64848,8 +65074,8 @@ function isValidKey(key) { -var isObject = __webpack_require__(535); -var has = __webpack_require__(569); +var isObject = __webpack_require__(539); +var has = __webpack_require__(573); module.exports = function unset(obj, prop) { if (!isObject(obj)) { @@ -64874,7 +65100,7 @@ module.exports = function unset(obj, prop) { /***/ }), -/* 569 */ +/* 573 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64887,9 +65113,9 @@ module.exports = function unset(obj, prop) { -var isObject = __webpack_require__(570); -var hasValues = __webpack_require__(572); -var get = __webpack_require__(566); +var isObject = __webpack_require__(574); +var hasValues = __webpack_require__(576); +var get = __webpack_require__(570); module.exports = function(obj, prop, noZero) { if (isObject(obj)) { @@ -64900,7 +65126,7 @@ module.exports = function(obj, prop, noZero) { /***/ }), -/* 570 */ +/* 574 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64913,7 +65139,7 @@ module.exports = function(obj, prop, noZero) { -var isArray = __webpack_require__(571); +var isArray = __webpack_require__(575); module.exports = function isObject(val) { return val != null && typeof val === 'object' && isArray(val) === false; @@ -64921,7 +65147,7 @@ module.exports = function isObject(val) { /***/ }), -/* 571 */ +/* 575 */ /***/ (function(module, exports) { var toString = {}.toString; @@ -64932,7 +65158,7 @@ module.exports = Array.isArray || function (arr) { /***/ }), -/* 572 */ +/* 576 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64975,7 +65201,7 @@ module.exports = function hasValue(o, noZero) { /***/ }), -/* 573 */ +/* 577 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -64988,9 +65214,9 @@ module.exports = function hasValue(o, noZero) { -var isObject = __webpack_require__(535); -var hasValues = __webpack_require__(574); -var get = __webpack_require__(566); +var isObject = __webpack_require__(539); +var hasValues = __webpack_require__(578); +var get = __webpack_require__(570); module.exports = function(val, prop) { return hasValues(isObject(val) && prop ? get(val, prop) : val); @@ -64998,7 +65224,7 @@ module.exports = function(val, prop) { /***/ }), -/* 574 */ +/* 578 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65011,8 +65237,8 @@ module.exports = function(val, prop) { -var typeOf = __webpack_require__(575); -var isNumber = __webpack_require__(539); +var typeOf = __webpack_require__(579); +var isNumber = __webpack_require__(543); module.exports = function hasValue(val) { // is-number checks for NaN and other edge cases @@ -65065,10 +65291,10 @@ module.exports = function hasValue(val) { /***/ }), -/* 575 */ +/* 579 */ /***/ (function(module, exports, __webpack_require__) { -var isBuffer = __webpack_require__(522); +var isBuffer = __webpack_require__(526); var toString = Object.prototype.toString; /** @@ -65190,14 +65416,14 @@ module.exports = function kindOf(val) { /***/ }), -/* 576 */ +/* 580 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(577); -var forIn = __webpack_require__(578); +var isExtendable = __webpack_require__(581); +var forIn = __webpack_require__(582); function mixinDeep(target, objects) { var len = arguments.length, i = 0; @@ -65261,7 +65487,7 @@ module.exports = mixinDeep; /***/ }), -/* 577 */ +/* 581 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65274,7 +65500,7 @@ module.exports = mixinDeep; -var isPlainObject = __webpack_require__(534); +var isPlainObject = __webpack_require__(538); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -65282,7 +65508,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 578 */ +/* 582 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65305,7 +65531,7 @@ module.exports = function forIn(obj, fn, thisArg) { /***/ }), -/* 579 */ +/* 583 */ /***/ (function(module, exports) { /*! @@ -65332,14 +65558,14 @@ module.exports = pascalcase; /***/ }), -/* 580 */ +/* 584 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var util = __webpack_require__(111); -var utils = __webpack_require__(581); +var utils = __webpack_require__(585); /** * Expose class utils @@ -65704,7 +65930,7 @@ cu.bubble = function(Parent, events) { /***/ }), -/* 581 */ +/* 585 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65718,10 +65944,10 @@ var utils = {}; * Lazily required module dependencies */ -utils.union = __webpack_require__(565); -utils.define = __webpack_require__(517); -utils.isObj = __webpack_require__(535); -utils.staticExtend = __webpack_require__(582); +utils.union = __webpack_require__(569); +utils.define = __webpack_require__(521); +utils.isObj = __webpack_require__(539); +utils.staticExtend = __webpack_require__(586); /** @@ -65732,7 +65958,7 @@ module.exports = utils; /***/ }), -/* 582 */ +/* 586 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -65745,8 +65971,8 @@ module.exports = utils; -var copy = __webpack_require__(583); -var define = __webpack_require__(517); +var copy = __webpack_require__(587); +var define = __webpack_require__(521); var util = __webpack_require__(111); /** @@ -65829,15 +66055,15 @@ module.exports = extend; /***/ }), -/* 583 */ +/* 587 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var typeOf = __webpack_require__(540); -var copyDescriptor = __webpack_require__(584); -var define = __webpack_require__(517); +var typeOf = __webpack_require__(544); +var copyDescriptor = __webpack_require__(588); +var define = __webpack_require__(521); /** * Copy static properties, prototype properties, and descriptors from one object to another. @@ -66010,7 +66236,7 @@ module.exports.has = has; /***/ }), -/* 584 */ +/* 588 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66098,16 +66324,16 @@ function isObject(val) { /***/ }), -/* 585 */ +/* 589 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var use = __webpack_require__(586); -var define = __webpack_require__(517); -var debug = __webpack_require__(588)('snapdragon:compiler'); -var utils = __webpack_require__(594); +var use = __webpack_require__(590); +var define = __webpack_require__(521); +var debug = __webpack_require__(592)('snapdragon:compiler'); +var utils = __webpack_require__(598); /** * Create a new `Compiler` with the given `options`. @@ -66261,7 +66487,7 @@ Compiler.prototype = { // source map support if (opts.sourcemap) { - var sourcemaps = __webpack_require__(613); + var sourcemaps = __webpack_require__(617); sourcemaps(this); this.mapVisit(this.ast.nodes); this.applySourceMaps(); @@ -66282,7 +66508,7 @@ module.exports = Compiler; /***/ }), -/* 586 */ +/* 590 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66295,7 +66521,7 @@ module.exports = Compiler; -var utils = __webpack_require__(587); +var utils = __webpack_require__(591); module.exports = function base(app, opts) { if (!utils.isObject(app) && typeof app !== 'function') { @@ -66410,7 +66636,7 @@ module.exports = function base(app, opts) { /***/ }), -/* 587 */ +/* 591 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -66424,8 +66650,8 @@ var utils = {}; * Lazily required module dependencies */ -utils.define = __webpack_require__(517); -utils.isObject = __webpack_require__(535); +utils.define = __webpack_require__(521); +utils.isObject = __webpack_require__(539); utils.isString = function(val) { @@ -66440,7 +66666,7 @@ module.exports = utils; /***/ }), -/* 588 */ +/* 592 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -66449,14 +66675,14 @@ module.exports = utils; */ if (typeof process !== 'undefined' && process.type === 'renderer') { - module.exports = __webpack_require__(589); + module.exports = __webpack_require__(593); } else { - module.exports = __webpack_require__(592); + module.exports = __webpack_require__(596); } /***/ }), -/* 589 */ +/* 593 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -66465,7 +66691,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') { * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(590); +exports = module.exports = __webpack_require__(594); exports.log = log; exports.formatArgs = formatArgs; exports.save = save; @@ -66647,7 +66873,7 @@ function localstorage() { /***/ }), -/* 590 */ +/* 594 */ /***/ (function(module, exports, __webpack_require__) { @@ -66663,7 +66889,7 @@ exports.coerce = coerce; exports.disable = disable; exports.enable = enable; exports.enabled = enabled; -exports.humanize = __webpack_require__(591); +exports.humanize = __webpack_require__(595); /** * The currently active debug mode names, and names to skip. @@ -66855,7 +67081,7 @@ function coerce(val) { /***/ }), -/* 591 */ +/* 595 */ /***/ (function(module, exports) { /** @@ -67013,7 +67239,7 @@ function plural(ms, n, name) { /***/ }), -/* 592 */ +/* 596 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -67029,7 +67255,7 @@ var util = __webpack_require__(111); * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(590); +exports = module.exports = __webpack_require__(594); exports.init = init; exports.log = log; exports.formatArgs = formatArgs; @@ -67208,7 +67434,7 @@ function createWritableStdioStream (fd) { case 'PIPE': case 'TCP': - var net = __webpack_require__(593); + var net = __webpack_require__(597); stream = new net.Socket({ fd: fd, readable: false, @@ -67267,13 +67493,13 @@ exports.enable(load()); /***/ }), -/* 593 */ +/* 597 */ /***/ (function(module, exports) { module.exports = require("net"); /***/ }), -/* 594 */ +/* 598 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -67283,9 +67509,9 @@ module.exports = require("net"); * Module dependencies */ -exports.extend = __webpack_require__(525); -exports.SourceMap = __webpack_require__(595); -exports.sourceMapResolve = __webpack_require__(606); +exports.extend = __webpack_require__(529); +exports.SourceMap = __webpack_require__(599); +exports.sourceMapResolve = __webpack_require__(610); /** * Convert backslash in the given string to forward slashes @@ -67328,7 +67554,7 @@ exports.last = function(arr, n) { /***/ }), -/* 595 */ +/* 599 */ /***/ (function(module, exports, __webpack_require__) { /* @@ -67336,13 +67562,13 @@ exports.last = function(arr, n) { * Licensed under the New BSD license. See LICENSE.txt or: * http://opensource.org/licenses/BSD-3-Clause */ -exports.SourceMapGenerator = __webpack_require__(596).SourceMapGenerator; -exports.SourceMapConsumer = __webpack_require__(602).SourceMapConsumer; -exports.SourceNode = __webpack_require__(605).SourceNode; +exports.SourceMapGenerator = __webpack_require__(600).SourceMapGenerator; +exports.SourceMapConsumer = __webpack_require__(606).SourceMapConsumer; +exports.SourceNode = __webpack_require__(609).SourceNode; /***/ }), -/* 596 */ +/* 600 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -67352,10 +67578,10 @@ exports.SourceNode = __webpack_require__(605).SourceNode; * http://opensource.org/licenses/BSD-3-Clause */ -var base64VLQ = __webpack_require__(597); -var util = __webpack_require__(599); -var ArraySet = __webpack_require__(600).ArraySet; -var MappingList = __webpack_require__(601).MappingList; +var base64VLQ = __webpack_require__(601); +var util = __webpack_require__(603); +var ArraySet = __webpack_require__(604).ArraySet; +var MappingList = __webpack_require__(605).MappingList; /** * An instance of the SourceMapGenerator represents a source map which is @@ -67764,7 +67990,7 @@ exports.SourceMapGenerator = SourceMapGenerator; /***/ }), -/* 597 */ +/* 601 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -67804,7 +68030,7 @@ exports.SourceMapGenerator = SourceMapGenerator; * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -var base64 = __webpack_require__(598); +var base64 = __webpack_require__(602); // A single base 64 digit can contain 6 bits of data. For the base 64 variable // length quantities we use in the source map spec, the first bit is the sign, @@ -67910,7 +68136,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) { /***/ }), -/* 598 */ +/* 602 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -67983,7 +68209,7 @@ exports.decode = function (charCode) { /***/ }), -/* 599 */ +/* 603 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -68406,7 +68632,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate /***/ }), -/* 600 */ +/* 604 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -68416,7 +68642,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate * http://opensource.org/licenses/BSD-3-Clause */ -var util = __webpack_require__(599); +var util = __webpack_require__(603); var has = Object.prototype.hasOwnProperty; var hasNativeMap = typeof Map !== "undefined"; @@ -68533,7 +68759,7 @@ exports.ArraySet = ArraySet; /***/ }), -/* 601 */ +/* 605 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -68543,7 +68769,7 @@ exports.ArraySet = ArraySet; * http://opensource.org/licenses/BSD-3-Clause */ -var util = __webpack_require__(599); +var util = __webpack_require__(603); /** * Determine whether mappingB is after mappingA with respect to generated @@ -68618,7 +68844,7 @@ exports.MappingList = MappingList; /***/ }), -/* 602 */ +/* 606 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -68628,11 +68854,11 @@ exports.MappingList = MappingList; * http://opensource.org/licenses/BSD-3-Clause */ -var util = __webpack_require__(599); -var binarySearch = __webpack_require__(603); -var ArraySet = __webpack_require__(600).ArraySet; -var base64VLQ = __webpack_require__(597); -var quickSort = __webpack_require__(604).quickSort; +var util = __webpack_require__(603); +var binarySearch = __webpack_require__(607); +var ArraySet = __webpack_require__(604).ArraySet; +var base64VLQ = __webpack_require__(601); +var quickSort = __webpack_require__(608).quickSort; function SourceMapConsumer(aSourceMap) { var sourceMap = aSourceMap; @@ -69706,7 +69932,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer; /***/ }), -/* 603 */ +/* 607 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -69823,7 +70049,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) { /***/ }), -/* 604 */ +/* 608 */ /***/ (function(module, exports) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -69943,7 +70169,7 @@ exports.quickSort = function (ary, comparator) { /***/ }), -/* 605 */ +/* 609 */ /***/ (function(module, exports, __webpack_require__) { /* -*- Mode: js; js-indent-level: 2; -*- */ @@ -69953,8 +70179,8 @@ exports.quickSort = function (ary, comparator) { * http://opensource.org/licenses/BSD-3-Clause */ -var SourceMapGenerator = __webpack_require__(596).SourceMapGenerator; -var util = __webpack_require__(599); +var SourceMapGenerator = __webpack_require__(600).SourceMapGenerator; +var util = __webpack_require__(603); // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other // operating systems these days (capturing the result). @@ -70362,17 +70588,17 @@ exports.SourceNode = SourceNode; /***/ }), -/* 606 */ +/* 610 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2014, 2015, 2016, 2017 Simon Lydell // X11 (“MIT”) Licensed. (See LICENSE.) -var sourceMappingURL = __webpack_require__(607) -var resolveUrl = __webpack_require__(608) -var decodeUriComponent = __webpack_require__(609) -var urix = __webpack_require__(611) -var atob = __webpack_require__(612) +var sourceMappingURL = __webpack_require__(611) +var resolveUrl = __webpack_require__(612) +var decodeUriComponent = __webpack_require__(613) +var urix = __webpack_require__(615) +var atob = __webpack_require__(616) @@ -70670,7 +70896,7 @@ module.exports = { /***/ }), -/* 607 */ +/* 611 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell @@ -70733,7 +70959,7 @@ void (function(root, factory) { /***/ }), -/* 608 */ +/* 612 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2014 Simon Lydell @@ -70751,13 +70977,13 @@ module.exports = resolveUrl /***/ }), -/* 609 */ +/* 613 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2017 Simon Lydell // X11 (“MIT”) Licensed. (See LICENSE.) -var decodeUriComponent = __webpack_require__(610) +var decodeUriComponent = __webpack_require__(614) function customDecodeUriComponent(string) { // `decodeUriComponent` turns `+` into ` `, but that's not wanted. @@ -70768,7 +70994,7 @@ module.exports = customDecodeUriComponent /***/ }), -/* 610 */ +/* 614 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70869,7 +71095,7 @@ module.exports = function (encodedURI) { /***/ }), -/* 611 */ +/* 615 */ /***/ (function(module, exports, __webpack_require__) { // Copyright 2014 Simon Lydell @@ -70892,7 +71118,7 @@ module.exports = urix /***/ }), -/* 612 */ +/* 616 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70906,7 +71132,7 @@ module.exports = atob.atob = atob; /***/ }), -/* 613 */ +/* 617 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -70914,8 +71140,8 @@ module.exports = atob.atob = atob; var fs = __webpack_require__(133); var path = __webpack_require__(4); -var define = __webpack_require__(517); -var utils = __webpack_require__(594); +var define = __webpack_require__(521); +var utils = __webpack_require__(598); /** * Expose `mixin()`. @@ -71058,19 +71284,19 @@ exports.comment = function(node) { /***/ }), -/* 614 */ +/* 618 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var use = __webpack_require__(586); +var use = __webpack_require__(590); var util = __webpack_require__(111); -var Cache = __webpack_require__(615); -var define = __webpack_require__(517); -var debug = __webpack_require__(588)('snapdragon:parser'); -var Position = __webpack_require__(616); -var utils = __webpack_require__(594); +var Cache = __webpack_require__(619); +var define = __webpack_require__(521); +var debug = __webpack_require__(592)('snapdragon:parser'); +var Position = __webpack_require__(620); +var utils = __webpack_require__(598); /** * Create a new `Parser` with the given `input` and `options`. @@ -71598,7 +71824,7 @@ module.exports = Parser; /***/ }), -/* 615 */ +/* 619 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -71705,13 +71931,13 @@ MapCache.prototype.del = function mapDelete(key) { /***/ }), -/* 616 */ +/* 620 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var define = __webpack_require__(517); +var define = __webpack_require__(521); /** * Store position for a node @@ -71726,16 +71952,16 @@ module.exports = function Position(start, parser) { /***/ }), -/* 617 */ +/* 621 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var safe = __webpack_require__(618); -var define = __webpack_require__(624); -var extend = __webpack_require__(625); -var not = __webpack_require__(627); +var safe = __webpack_require__(622); +var define = __webpack_require__(628); +var extend = __webpack_require__(629); +var not = __webpack_require__(631); var MAX_LENGTH = 1024 * 64; /** @@ -71888,10 +72114,10 @@ module.exports.makeRe = makeRe; /***/ }), -/* 618 */ +/* 622 */ /***/ (function(module, exports, __webpack_require__) { -var parse = __webpack_require__(619); +var parse = __webpack_require__(623); var types = parse.types; module.exports = function (re, opts) { @@ -71937,13 +72163,13 @@ function isRegExp (x) { /***/ }), -/* 619 */ +/* 623 */ /***/ (function(module, exports, __webpack_require__) { -var util = __webpack_require__(620); -var types = __webpack_require__(621); -var sets = __webpack_require__(622); -var positions = __webpack_require__(623); +var util = __webpack_require__(624); +var types = __webpack_require__(625); +var sets = __webpack_require__(626); +var positions = __webpack_require__(627); module.exports = function(regexpStr) { @@ -72225,11 +72451,11 @@ module.exports.types = types; /***/ }), -/* 620 */ +/* 624 */ /***/ (function(module, exports, __webpack_require__) { -var types = __webpack_require__(621); -var sets = __webpack_require__(622); +var types = __webpack_require__(625); +var sets = __webpack_require__(626); // All of these are private and only used by randexp. @@ -72342,7 +72568,7 @@ exports.error = function(regexp, msg) { /***/ }), -/* 621 */ +/* 625 */ /***/ (function(module, exports) { module.exports = { @@ -72358,10 +72584,10 @@ module.exports = { /***/ }), -/* 622 */ +/* 626 */ /***/ (function(module, exports, __webpack_require__) { -var types = __webpack_require__(621); +var types = __webpack_require__(625); var INTS = function() { return [{ type: types.RANGE , from: 48, to: 57 }]; @@ -72446,10 +72672,10 @@ exports.anyChar = function() { /***/ }), -/* 623 */ +/* 627 */ /***/ (function(module, exports, __webpack_require__) { -var types = __webpack_require__(621); +var types = __webpack_require__(625); exports.wordBoundary = function() { return { type: types.POSITION, value: 'b' }; @@ -72469,7 +72695,7 @@ exports.end = function() { /***/ }), -/* 624 */ +/* 628 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -72482,8 +72708,8 @@ exports.end = function() { -var isobject = __webpack_require__(535); -var isDescriptor = __webpack_require__(547); +var isobject = __webpack_require__(539); +var isDescriptor = __webpack_require__(551); var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty) ? Reflect.defineProperty : Object.defineProperty; @@ -72514,14 +72740,14 @@ module.exports = function defineProperty(obj, key, val) { /***/ }), -/* 625 */ +/* 629 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(626); -var assignSymbols = __webpack_require__(536); +var isExtendable = __webpack_require__(630); +var assignSymbols = __webpack_require__(540); module.exports = Object.assign || function(obj/*, objects*/) { if (obj === null || typeof obj === 'undefined') { @@ -72581,7 +72807,7 @@ function isEnum(obj, key) { /***/ }), -/* 626 */ +/* 630 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -72594,7 +72820,7 @@ function isEnum(obj, key) { -var isPlainObject = __webpack_require__(534); +var isPlainObject = __webpack_require__(538); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -72602,14 +72828,14 @@ module.exports = function isExtendable(val) { /***/ }), -/* 627 */ +/* 631 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extend = __webpack_require__(625); -var safe = __webpack_require__(618); +var extend = __webpack_require__(629); +var safe = __webpack_require__(622); /** * The main export is a function that takes a `pattern` string and an `options` object. @@ -72681,14 +72907,14 @@ module.exports = toRegex; /***/ }), -/* 628 */ +/* 632 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var nanomatch = __webpack_require__(629); -var extglob = __webpack_require__(644); +var nanomatch = __webpack_require__(633); +var extglob = __webpack_require__(648); module.exports = function(snapdragon) { var compilers = snapdragon.compiler.compilers; @@ -72765,7 +72991,7 @@ function escapeExtglobs(compiler) { /***/ }), -/* 629 */ +/* 633 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -72776,17 +73002,17 @@ function escapeExtglobs(compiler) { */ var util = __webpack_require__(111); -var toRegex = __webpack_require__(516); -var extend = __webpack_require__(630); +var toRegex = __webpack_require__(520); +var extend = __webpack_require__(634); /** * Local dependencies */ -var compilers = __webpack_require__(632); -var parsers = __webpack_require__(633); -var cache = __webpack_require__(636); -var utils = __webpack_require__(638); +var compilers = __webpack_require__(636); +var parsers = __webpack_require__(637); +var cache = __webpack_require__(640); +var utils = __webpack_require__(642); var MAX_LENGTH = 1024 * 64; /** @@ -73610,14 +73836,14 @@ module.exports = nanomatch; /***/ }), -/* 630 */ +/* 634 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isExtendable = __webpack_require__(631); -var assignSymbols = __webpack_require__(536); +var isExtendable = __webpack_require__(635); +var assignSymbols = __webpack_require__(540); module.exports = Object.assign || function(obj/*, objects*/) { if (obj === null || typeof obj === 'undefined') { @@ -73677,7 +73903,7 @@ function isEnum(obj, key) { /***/ }), -/* 631 */ +/* 635 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -73690,7 +73916,7 @@ function isEnum(obj, key) { -var isPlainObject = __webpack_require__(534); +var isPlainObject = __webpack_require__(538); module.exports = function isExtendable(val) { return isPlainObject(val) || typeof val === 'function' || Array.isArray(val); @@ -73698,7 +73924,7 @@ module.exports = function isExtendable(val) { /***/ }), -/* 632 */ +/* 636 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -74044,15 +74270,15 @@ module.exports = function(nanomatch, options) { /***/ }), -/* 633 */ +/* 637 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var regexNot = __webpack_require__(527); -var toRegex = __webpack_require__(516); -var isOdd = __webpack_require__(634); +var regexNot = __webpack_require__(531); +var toRegex = __webpack_require__(520); +var isOdd = __webpack_require__(638); /** * Characters to use in negation regex (we want to "not" match @@ -74438,7 +74664,7 @@ module.exports.not = NOT_REGEX; /***/ }), -/* 634 */ +/* 638 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -74451,7 +74677,7 @@ module.exports.not = NOT_REGEX; -var isNumber = __webpack_require__(635); +var isNumber = __webpack_require__(639); module.exports = function isOdd(i) { if (!isNumber(i)) { @@ -74465,7 +74691,7 @@ module.exports = function isOdd(i) { /***/ }), -/* 635 */ +/* 639 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -74493,14 +74719,14 @@ module.exports = function isNumber(num) { /***/ }), -/* 636 */ +/* 640 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = new (__webpack_require__(637))(); +module.exports = new (__webpack_require__(641))(); /***/ }), -/* 637 */ +/* 641 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -74513,7 +74739,7 @@ module.exports = new (__webpack_require__(637))(); -var MapCache = __webpack_require__(615); +var MapCache = __webpack_require__(619); /** * Create a new `FragmentCache` with an optional object to use for `caches`. @@ -74635,7 +74861,7 @@ exports = module.exports = FragmentCache; /***/ }), -/* 638 */ +/* 642 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -74648,14 +74874,14 @@ var path = __webpack_require__(4); * Module dependencies */ -var isWindows = __webpack_require__(639)(); -var Snapdragon = __webpack_require__(555); -utils.define = __webpack_require__(640); -utils.diff = __webpack_require__(641); -utils.extend = __webpack_require__(630); -utils.pick = __webpack_require__(642); -utils.typeOf = __webpack_require__(643); -utils.unique = __webpack_require__(528); +var isWindows = __webpack_require__(643)(); +var Snapdragon = __webpack_require__(559); +utils.define = __webpack_require__(644); +utils.diff = __webpack_require__(645); +utils.extend = __webpack_require__(634); +utils.pick = __webpack_require__(646); +utils.typeOf = __webpack_require__(647); +utils.unique = __webpack_require__(532); /** * Returns true if the given value is effectively an empty string @@ -75021,7 +75247,7 @@ utils.unixify = function(options) { /***/ }), -/* 639 */ +/* 643 */ /***/ (function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*! @@ -75049,7 +75275,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ /***/ }), -/* 640 */ +/* 644 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -75062,8 +75288,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ -var isobject = __webpack_require__(535); -var isDescriptor = __webpack_require__(547); +var isobject = __webpack_require__(539); +var isDescriptor = __webpack_require__(551); var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty) ? Reflect.defineProperty : Object.defineProperty; @@ -75094,7 +75320,7 @@ module.exports = function defineProperty(obj, key, val) { /***/ }), -/* 641 */ +/* 645 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -75148,7 +75374,7 @@ function diffArray(one, two) { /***/ }), -/* 642 */ +/* 646 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -75161,7 +75387,7 @@ function diffArray(one, two) { -var isObject = __webpack_require__(535); +var isObject = __webpack_require__(539); module.exports = function pick(obj, keys) { if (!isObject(obj) && typeof obj !== 'function') { @@ -75190,7 +75416,7 @@ module.exports = function pick(obj, keys) { /***/ }), -/* 643 */ +/* 647 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -75325,7 +75551,7 @@ function isBuffer(val) { /***/ }), -/* 644 */ +/* 648 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -75335,18 +75561,18 @@ function isBuffer(val) { * Module dependencies */ -var extend = __webpack_require__(525); -var unique = __webpack_require__(528); -var toRegex = __webpack_require__(516); +var extend = __webpack_require__(529); +var unique = __webpack_require__(532); +var toRegex = __webpack_require__(520); /** * Local dependencies */ -var compilers = __webpack_require__(645); -var parsers = __webpack_require__(656); -var Extglob = __webpack_require__(659); -var utils = __webpack_require__(658); +var compilers = __webpack_require__(649); +var parsers = __webpack_require__(660); +var Extglob = __webpack_require__(663); +var utils = __webpack_require__(662); var MAX_LENGTH = 1024 * 64; /** @@ -75663,13 +75889,13 @@ module.exports = extglob; /***/ }), -/* 645 */ +/* 649 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var brackets = __webpack_require__(646); +var brackets = __webpack_require__(650); /** * Extglob compilers @@ -75839,7 +76065,7 @@ module.exports = function(extglob) { /***/ }), -/* 646 */ +/* 650 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -75849,17 +76075,17 @@ module.exports = function(extglob) { * Local dependencies */ -var compilers = __webpack_require__(647); -var parsers = __webpack_require__(649); +var compilers = __webpack_require__(651); +var parsers = __webpack_require__(653); /** * Module dependencies */ -var debug = __webpack_require__(651)('expand-brackets'); -var extend = __webpack_require__(525); -var Snapdragon = __webpack_require__(555); -var toRegex = __webpack_require__(516); +var debug = __webpack_require__(655)('expand-brackets'); +var extend = __webpack_require__(529); +var Snapdragon = __webpack_require__(559); +var toRegex = __webpack_require__(520); /** * Parses the given POSIX character class `pattern` and returns a @@ -76057,13 +76283,13 @@ module.exports = brackets; /***/ }), -/* 647 */ +/* 651 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var posix = __webpack_require__(648); +var posix = __webpack_require__(652); module.exports = function(brackets) { brackets.compiler @@ -76151,7 +76377,7 @@ module.exports = function(brackets) { /***/ }), -/* 648 */ +/* 652 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -76180,14 +76406,14 @@ module.exports = { /***/ }), -/* 649 */ +/* 653 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var utils = __webpack_require__(650); -var define = __webpack_require__(517); +var utils = __webpack_require__(654); +var define = __webpack_require__(521); /** * Text regex @@ -76406,14 +76632,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX; /***/ }), -/* 650 */ +/* 654 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var toRegex = __webpack_require__(516); -var regexNot = __webpack_require__(527); +var toRegex = __webpack_require__(520); +var regexNot = __webpack_require__(531); var cached; /** @@ -76447,7 +76673,7 @@ exports.createRegex = function(pattern, include) { /***/ }), -/* 651 */ +/* 655 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -76456,14 +76682,14 @@ exports.createRegex = function(pattern, include) { */ if (typeof process !== 'undefined' && process.type === 'renderer') { - module.exports = __webpack_require__(652); + module.exports = __webpack_require__(656); } else { - module.exports = __webpack_require__(655); + module.exports = __webpack_require__(659); } /***/ }), -/* 652 */ +/* 656 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -76472,7 +76698,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') { * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(653); +exports = module.exports = __webpack_require__(657); exports.log = log; exports.formatArgs = formatArgs; exports.save = save; @@ -76654,7 +76880,7 @@ function localstorage() { /***/ }), -/* 653 */ +/* 657 */ /***/ (function(module, exports, __webpack_require__) { @@ -76670,7 +76896,7 @@ exports.coerce = coerce; exports.disable = disable; exports.enable = enable; exports.enabled = enabled; -exports.humanize = __webpack_require__(654); +exports.humanize = __webpack_require__(658); /** * The currently active debug mode names, and names to skip. @@ -76862,7 +77088,7 @@ function coerce(val) { /***/ }), -/* 654 */ +/* 658 */ /***/ (function(module, exports) { /** @@ -77020,7 +77246,7 @@ function plural(ms, n, name) { /***/ }), -/* 655 */ +/* 659 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -77036,7 +77262,7 @@ var util = __webpack_require__(111); * Expose `debug()` as the module. */ -exports = module.exports = __webpack_require__(653); +exports = module.exports = __webpack_require__(657); exports.init = init; exports.log = log; exports.formatArgs = formatArgs; @@ -77215,7 +77441,7 @@ function createWritableStdioStream (fd) { case 'PIPE': case 'TCP': - var net = __webpack_require__(593); + var net = __webpack_require__(597); stream = new net.Socket({ fd: fd, readable: false, @@ -77274,15 +77500,15 @@ exports.enable(load()); /***/ }), -/* 656 */ +/* 660 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var brackets = __webpack_require__(646); -var define = __webpack_require__(657); -var utils = __webpack_require__(658); +var brackets = __webpack_require__(650); +var define = __webpack_require__(661); +var utils = __webpack_require__(662); /** * Characters to use in text regex (we want to "not" match @@ -77437,7 +77663,7 @@ module.exports = parsers; /***/ }), -/* 657 */ +/* 661 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -77450,7 +77676,7 @@ module.exports = parsers; -var isDescriptor = __webpack_require__(547); +var isDescriptor = __webpack_require__(551); module.exports = function defineProperty(obj, prop, val) { if (typeof obj !== 'object' && typeof obj !== 'function') { @@ -77475,14 +77701,14 @@ module.exports = function defineProperty(obj, prop, val) { /***/ }), -/* 658 */ +/* 662 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var regex = __webpack_require__(527); -var Cache = __webpack_require__(637); +var regex = __webpack_require__(531); +var Cache = __webpack_require__(641); /** * Utils @@ -77551,7 +77777,7 @@ utils.createRegex = function(str) { /***/ }), -/* 659 */ +/* 663 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -77561,16 +77787,16 @@ utils.createRegex = function(str) { * Module dependencies */ -var Snapdragon = __webpack_require__(555); -var define = __webpack_require__(657); -var extend = __webpack_require__(525); +var Snapdragon = __webpack_require__(559); +var define = __webpack_require__(661); +var extend = __webpack_require__(529); /** * Local dependencies */ -var compilers = __webpack_require__(645); -var parsers = __webpack_require__(656); +var compilers = __webpack_require__(649); +var parsers = __webpack_require__(660); /** * Customize Snapdragon parser and renderer @@ -77636,16 +77862,16 @@ module.exports = Extglob; /***/ }), -/* 660 */ +/* 664 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var extglob = __webpack_require__(644); -var nanomatch = __webpack_require__(629); -var regexNot = __webpack_require__(527); -var toRegex = __webpack_require__(617); +var extglob = __webpack_require__(648); +var nanomatch = __webpack_require__(633); +var regexNot = __webpack_require__(531); +var toRegex = __webpack_require__(621); var not; /** @@ -77726,14 +77952,14 @@ function textRegex(pattern) { /***/ }), -/* 661 */ +/* 665 */ /***/ (function(module, exports, __webpack_require__) { -module.exports = new (__webpack_require__(637))(); +module.exports = new (__webpack_require__(641))(); /***/ }), -/* 662 */ +/* 666 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -77746,13 +77972,13 @@ var path = __webpack_require__(4); * Module dependencies */ -var Snapdragon = __webpack_require__(555); -utils.define = __webpack_require__(624); -utils.diff = __webpack_require__(641); -utils.extend = __webpack_require__(625); -utils.pick = __webpack_require__(642); -utils.typeOf = __webpack_require__(663); -utils.unique = __webpack_require__(528); +var Snapdragon = __webpack_require__(559); +utils.define = __webpack_require__(628); +utils.diff = __webpack_require__(645); +utils.extend = __webpack_require__(629); +utils.pick = __webpack_require__(646); +utils.typeOf = __webpack_require__(667); +utils.unique = __webpack_require__(532); /** * Returns true if the platform is windows, or `path.sep` is `\\`. @@ -78049,7 +78275,7 @@ utils.unixify = function(options) { /***/ }), -/* 663 */ +/* 667 */ /***/ (function(module, exports) { var toString = Object.prototype.toString; @@ -78184,7 +78410,7 @@ function isBuffer(val) { /***/ }), -/* 664 */ +/* 668 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -78203,9 +78429,9 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var readdir = __webpack_require__(665); -var reader_1 = __webpack_require__(678); -var fs_stream_1 = __webpack_require__(682); +var readdir = __webpack_require__(669); +var reader_1 = __webpack_require__(682); +var fs_stream_1 = __webpack_require__(686); var ReaderAsync = /** @class */ (function (_super) { __extends(ReaderAsync, _super); function ReaderAsync() { @@ -78266,15 +78492,15 @@ exports.default = ReaderAsync; /***/ }), -/* 665 */ +/* 669 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const readdirSync = __webpack_require__(666); -const readdirAsync = __webpack_require__(674); -const readdirStream = __webpack_require__(677); +const readdirSync = __webpack_require__(670); +const readdirAsync = __webpack_require__(678); +const readdirStream = __webpack_require__(681); module.exports = exports = readdirAsyncPath; exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath; @@ -78358,7 +78584,7 @@ function readdirStreamStat (dir, options) { /***/ }), -/* 666 */ +/* 670 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -78366,11 +78592,11 @@ function readdirStreamStat (dir, options) { module.exports = readdirSync; -const DirectoryReader = __webpack_require__(667); +const DirectoryReader = __webpack_require__(671); let syncFacade = { - fs: __webpack_require__(672), - forEach: __webpack_require__(673), + fs: __webpack_require__(676), + forEach: __webpack_require__(677), sync: true }; @@ -78399,7 +78625,7 @@ function readdirSync (dir, options, internalOptions) { /***/ }), -/* 667 */ +/* 671 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -78408,9 +78634,9 @@ function readdirSync (dir, options, internalOptions) { const Readable = __webpack_require__(137).Readable; const EventEmitter = __webpack_require__(155).EventEmitter; const path = __webpack_require__(4); -const normalizeOptions = __webpack_require__(668); -const stat = __webpack_require__(670); -const call = __webpack_require__(671); +const normalizeOptions = __webpack_require__(672); +const stat = __webpack_require__(674); +const call = __webpack_require__(675); /** * Asynchronously reads the contents of a directory and streams the results @@ -78786,14 +79012,14 @@ module.exports = DirectoryReader; /***/ }), -/* 668 */ +/* 672 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const globToRegExp = __webpack_require__(669); +const globToRegExp = __webpack_require__(673); module.exports = normalizeOptions; @@ -78970,7 +79196,7 @@ function normalizeOptions (options, internalOptions) { /***/ }), -/* 669 */ +/* 673 */ /***/ (function(module, exports) { module.exports = function (glob, opts) { @@ -79107,13 +79333,13 @@ module.exports = function (glob, opts) { /***/ }), -/* 670 */ +/* 674 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const call = __webpack_require__(671); +const call = __webpack_require__(675); module.exports = stat; @@ -79188,7 +79414,7 @@ function symlinkStat (fs, path, lstats, callback) { /***/ }), -/* 671 */ +/* 675 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79249,14 +79475,14 @@ function callOnce (fn) { /***/ }), -/* 672 */ +/* 676 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(133); -const call = __webpack_require__(671); +const call = __webpack_require__(675); /** * A facade around {@link fs.readdirSync} that allows it to be called @@ -79320,7 +79546,7 @@ exports.lstat = function (path, callback) { /***/ }), -/* 673 */ +/* 677 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79349,7 +79575,7 @@ function syncForEach (array, iterator, done) { /***/ }), -/* 674 */ +/* 678 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79357,12 +79583,12 @@ function syncForEach (array, iterator, done) { module.exports = readdirAsync; -const maybe = __webpack_require__(675); -const DirectoryReader = __webpack_require__(667); +const maybe = __webpack_require__(679); +const DirectoryReader = __webpack_require__(671); let asyncFacade = { fs: __webpack_require__(133), - forEach: __webpack_require__(676), + forEach: __webpack_require__(680), async: true }; @@ -79404,7 +79630,7 @@ function readdirAsync (dir, options, callback, internalOptions) { /***/ }), -/* 675 */ +/* 679 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79431,7 +79657,7 @@ module.exports = function maybe (cb, promise) { /***/ }), -/* 676 */ +/* 680 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79467,7 +79693,7 @@ function asyncForEach (array, iterator, done) { /***/ }), -/* 677 */ +/* 681 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79475,11 +79701,11 @@ function asyncForEach (array, iterator, done) { module.exports = readdirStream; -const DirectoryReader = __webpack_require__(667); +const DirectoryReader = __webpack_require__(671); let streamFacade = { fs: __webpack_require__(133), - forEach: __webpack_require__(676), + forEach: __webpack_require__(680), async: true }; @@ -79499,16 +79725,16 @@ function readdirStream (dir, options, internalOptions) { /***/ }), -/* 678 */ +/* 682 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var path = __webpack_require__(4); -var deep_1 = __webpack_require__(679); -var entry_1 = __webpack_require__(681); -var pathUtil = __webpack_require__(680); +var deep_1 = __webpack_require__(683); +var entry_1 = __webpack_require__(685); +var pathUtil = __webpack_require__(684); var Reader = /** @class */ (function () { function Reader(options) { this.options = options; @@ -79574,14 +79800,14 @@ exports.default = Reader; /***/ }), -/* 679 */ +/* 683 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var pathUtils = __webpack_require__(680); -var patternUtils = __webpack_require__(509); +var pathUtils = __webpack_require__(684); +var patternUtils = __webpack_require__(513); var DeepFilter = /** @class */ (function () { function DeepFilter(options, micromatchOptions) { this.options = options; @@ -79664,7 +79890,7 @@ exports.default = DeepFilter; /***/ }), -/* 680 */ +/* 684 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79695,14 +79921,14 @@ exports.makeAbsolute = makeAbsolute; /***/ }), -/* 681 */ +/* 685 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var pathUtils = __webpack_require__(680); -var patternUtils = __webpack_require__(509); +var pathUtils = __webpack_require__(684); +var patternUtils = __webpack_require__(513); var EntryFilter = /** @class */ (function () { function EntryFilter(options, micromatchOptions) { this.options = options; @@ -79787,7 +80013,7 @@ exports.default = EntryFilter; /***/ }), -/* 682 */ +/* 686 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79807,8 +80033,8 @@ var __extends = (this && this.__extends) || (function () { })(); Object.defineProperty(exports, "__esModule", { value: true }); var stream = __webpack_require__(137); -var fsStat = __webpack_require__(683); -var fs_1 = __webpack_require__(687); +var fsStat = __webpack_require__(687); +var fs_1 = __webpack_require__(691); var FileSystemStream = /** @class */ (function (_super) { __extends(FileSystemStream, _super); function FileSystemStream() { @@ -79858,14 +80084,14 @@ exports.default = FileSystemStream; /***/ }), -/* 683 */ +/* 687 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const optionsManager = __webpack_require__(684); -const statProvider = __webpack_require__(686); +const optionsManager = __webpack_require__(688); +const statProvider = __webpack_require__(690); /** * Asynchronous API. */ @@ -79896,13 +80122,13 @@ exports.statSync = statSync; /***/ }), -/* 684 */ +/* 688 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const fsAdapter = __webpack_require__(685); +const fsAdapter = __webpack_require__(689); function prepare(opts) { const options = Object.assign({ fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined), @@ -79915,7 +80141,7 @@ exports.prepare = prepare; /***/ }), -/* 685 */ +/* 689 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79938,7 +80164,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter; /***/ }), -/* 686 */ +/* 690 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -79990,7 +80216,7 @@ exports.isFollowedSymlink = isFollowedSymlink; /***/ }), -/* 687 */ +/* 691 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80021,7 +80247,7 @@ exports.default = FileSystem; /***/ }), -/* 688 */ +/* 692 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80041,9 +80267,9 @@ var __extends = (this && this.__extends) || (function () { })(); Object.defineProperty(exports, "__esModule", { value: true }); var stream = __webpack_require__(137); -var readdir = __webpack_require__(665); -var reader_1 = __webpack_require__(678); -var fs_stream_1 = __webpack_require__(682); +var readdir = __webpack_require__(669); +var reader_1 = __webpack_require__(682); +var fs_stream_1 = __webpack_require__(686); var TransformStream = /** @class */ (function (_super) { __extends(TransformStream, _super); function TransformStream(reader) { @@ -80111,7 +80337,7 @@ exports.default = ReaderStream; /***/ }), -/* 689 */ +/* 693 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80130,9 +80356,9 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var readdir = __webpack_require__(665); -var reader_1 = __webpack_require__(678); -var fs_sync_1 = __webpack_require__(690); +var readdir = __webpack_require__(669); +var reader_1 = __webpack_require__(682); +var fs_sync_1 = __webpack_require__(694); var ReaderSync = /** @class */ (function (_super) { __extends(ReaderSync, _super); function ReaderSync() { @@ -80192,7 +80418,7 @@ exports.default = ReaderSync; /***/ }), -/* 690 */ +/* 694 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80211,8 +80437,8 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var fsStat = __webpack_require__(683); -var fs_1 = __webpack_require__(687); +var fsStat = __webpack_require__(687); +var fs_1 = __webpack_require__(691); var FileSystemSync = /** @class */ (function (_super) { __extends(FileSystemSync, _super); function FileSystemSync() { @@ -80258,7 +80484,7 @@ exports.default = FileSystemSync; /***/ }), -/* 691 */ +/* 695 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80274,13 +80500,13 @@ exports.flatten = flatten; /***/ }), -/* 692 */ +/* 696 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -var merge2 = __webpack_require__(288); +var merge2 = __webpack_require__(283); /** * Merge multiple streams and propagate their errors into one stream in parallel. */ @@ -80295,13 +80521,13 @@ exports.merge = merge; /***/ }), -/* 693 */ +/* 697 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); -const pathType = __webpack_require__(694); +const pathType = __webpack_require__(698); const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0]; @@ -80367,13 +80593,13 @@ module.exports.sync = (input, opts) => { /***/ }), -/* 694 */ +/* 698 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(133); -const pify = __webpack_require__(695); +const pify = __webpack_require__(699); function type(fn, fn2, fp) { if (typeof fp !== 'string') { @@ -80416,7 +80642,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink'); /***/ }), -/* 695 */ +/* 699 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -80507,17 +80733,17 @@ module.exports = (obj, opts) => { /***/ }), -/* 696 */ +/* 700 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const fs = __webpack_require__(133); const path = __webpack_require__(4); -const fastGlob = __webpack_require__(505); -const gitIgnore = __webpack_require__(697); -const pify = __webpack_require__(698); -const slash = __webpack_require__(699); +const fastGlob = __webpack_require__(509); +const gitIgnore = __webpack_require__(701); +const pify = __webpack_require__(702); +const slash = __webpack_require__(703); const DEFAULT_IGNORE = [ '**/node_modules/**', @@ -80615,7 +80841,7 @@ module.exports.sync = options => { /***/ }), -/* 697 */ +/* 701 */ /***/ (function(module, exports) { // A simple implementation of make-array @@ -81084,7 +81310,7 @@ module.exports = options => new IgnoreBase(options) /***/ }), -/* 698 */ +/* 702 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81159,7 +81385,7 @@ module.exports = (input, options) => { /***/ }), -/* 699 */ +/* 703 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81177,7 +81403,7 @@ module.exports = input => { /***/ }), -/* 700 */ +/* 704 */ /***/ (function(module, exports, __webpack_require__) { /*! @@ -81187,7 +81413,7 @@ module.exports = input => { * Released under the MIT License. */ -var isExtglob = __webpack_require__(299); +var isExtglob = __webpack_require__(294); var chars = { '{': '}', '(': ')', '[': ']'}; var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/; var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/; @@ -81231,17 +81457,17 @@ module.exports = function isGlob(str, options) { /***/ }), -/* 701 */ +/* 705 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(4); const {constants: fsConstants} = __webpack_require__(133); -const pEvent = __webpack_require__(702); -const CpFileError = __webpack_require__(705); -const fs = __webpack_require__(709); -const ProgressEmitter = __webpack_require__(712); +const pEvent = __webpack_require__(706); +const CpFileError = __webpack_require__(709); +const fs = __webpack_require__(713); +const ProgressEmitter = __webpack_require__(716); const cpFileAsync = async (source, destination, options, progressEmitter) => { let readError; @@ -81355,12 +81581,12 @@ module.exports.sync = (source, destination, options) => { /***/ }), -/* 702 */ +/* 706 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const pTimeout = __webpack_require__(703); +const pTimeout = __webpack_require__(707); const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator'; @@ -81651,12 +81877,12 @@ module.exports.iterator = (emitter, event, options) => { /***/ }), -/* 703 */ +/* 707 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const pFinally = __webpack_require__(704); +const pFinally = __webpack_require__(708); class TimeoutError extends Error { constructor(message) { @@ -81702,7 +81928,7 @@ module.exports.TimeoutError = TimeoutError; /***/ }), -/* 704 */ +/* 708 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81724,12 +81950,12 @@ module.exports = (promise, onFinally) => { /***/ }), -/* 705 */ +/* 709 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const NestedError = __webpack_require__(706); +const NestedError = __webpack_require__(710); class CpFileError extends NestedError { constructor(message, nested) { @@ -81743,10 +81969,10 @@ module.exports = CpFileError; /***/ }), -/* 706 */ +/* 710 */ /***/ (function(module, exports, __webpack_require__) { -var inherits = __webpack_require__(707); +var inherits = __webpack_require__(711); var NestedError = function (message, nested) { this.nested = nested; @@ -81797,7 +82023,7 @@ module.exports = NestedError; /***/ }), -/* 707 */ +/* 711 */ /***/ (function(module, exports, __webpack_require__) { try { @@ -81805,12 +82031,12 @@ try { if (typeof util.inherits !== 'function') throw ''; module.exports = util.inherits; } catch (e) { - module.exports = __webpack_require__(708); + module.exports = __webpack_require__(712); } /***/ }), -/* 708 */ +/* 712 */ /***/ (function(module, exports) { if (typeof Object.create === 'function') { @@ -81839,16 +82065,16 @@ if (typeof Object.create === 'function') { /***/ }), -/* 709 */ +/* 713 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const {promisify} = __webpack_require__(111); const fs = __webpack_require__(132); -const makeDir = __webpack_require__(710); -const pEvent = __webpack_require__(702); -const CpFileError = __webpack_require__(705); +const makeDir = __webpack_require__(714); +const pEvent = __webpack_require__(706); +const CpFileError = __webpack_require__(709); const stat = promisify(fs.stat); const lstat = promisify(fs.lstat); @@ -81945,7 +82171,7 @@ exports.copyFileSync = (source, destination, flags) => { /***/ }), -/* 710 */ +/* 714 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -81953,7 +82179,7 @@ exports.copyFileSync = (source, destination, flags) => { const fs = __webpack_require__(133); const path = __webpack_require__(4); const {promisify} = __webpack_require__(111); -const semver = __webpack_require__(711); +const semver = __webpack_require__(715); const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0'); @@ -82108,7 +82334,7 @@ module.exports.sync = (input, options) => { /***/ }), -/* 711 */ +/* 715 */ /***/ (function(module, exports) { exports = module.exports = SemVer @@ -83710,7 +83936,7 @@ function coerce (version, options) { /***/ }), -/* 712 */ +/* 716 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -83751,7 +83977,7 @@ module.exports = ProgressEmitter; /***/ }), -/* 713 */ +/* 717 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -83797,12 +84023,12 @@ exports.default = module.exports; /***/ }), -/* 714 */ +/* 718 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const NestedError = __webpack_require__(715); +const NestedError = __webpack_require__(719); class CpyError extends NestedError { constructor(message, nested) { @@ -83816,7 +84042,7 @@ module.exports = CpyError; /***/ }), -/* 715 */ +/* 719 */ /***/ (function(module, exports, __webpack_require__) { var inherits = __webpack_require__(111).inherits; diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json index c2f9236d9e79..f4e9ee824990 100644 --- a/packages/kbn-pm/package.json +++ b/packages/kbn-pm/package.json @@ -28,7 +28,7 @@ "@types/node": ">=10.17.17 <10.20.0", "@types/ora": "^1.3.5", "@types/read-pkg": "^4.0.0", - "@types/strip-ansi": "^3.0.0", + "@types/strip-ansi": "^5.2.1", "@types/strong-log-transformer": "^1.0.0", "@types/tempy": "^0.2.0", "@types/write-pkg": "^3.1.0", @@ -50,13 +50,13 @@ "log-symbols": "^2.2.0", "multimatch": "^4.0.0", "ncp": "^2.0.0", - "ora": "^1.4.0", + "ora": "^4.0.4", "prettier": "^2.1.1", "read-pkg": "^5.2.0", "rxjs": "^6.5.5", "spawn-sync": "^1.0.15", "string-replace-loader": "^2.2.0", - "strip-ansi": "^4.0.0", + "strip-ansi": "^6.0.0", "strong-log-transformer": "^2.1.0", "tempy": "^0.3.0", "typescript": "4.0.2", diff --git a/packages/kbn-pm/src/utils/validate_yarn_lock.ts b/packages/kbn-pm/src/utils/validate_yarn_lock.ts index e110dc4d921c..ec853a3a958f 100644 --- a/packages/kbn-pm/src/utils/validate_yarn_lock.ts +++ b/packages/kbn-pm/src/utils/validate_yarn_lock.ts @@ -25,6 +25,7 @@ import { writeFile } from './fs'; import { Kibana } from './kibana'; import { YarnLock } from './yarn_lock'; import { log } from './log'; +import { Project } from './project'; export async function validateYarnLock(kbn: Kibana, yarnLock: YarnLock) { // look through all of the packages in the yarn.lock file to see if @@ -95,5 +96,66 @@ export async function validateYarnLock(kbn: Kibana, yarnLock: YarnLock) { process.exit(1); } + // TODO: remove this once we move into a single package.json + // look through all the package.json files to find packages which have mismatched version ranges + const depRanges = new Map>(); + for (const project of kbn.getAllProjects().values()) { + for (const [dep, range] of Object.entries(project.allDependencies)) { + const existingDep = depRanges.get(dep); + if (!existingDep) { + depRanges.set(dep, [ + { + range, + projects: [project], + }, + ]); + continue; + } + + const existingRange = existingDep.find((existing) => existing.range === range); + if (!existingRange) { + existingDep.push({ + range, + projects: [project], + }); + continue; + } + + existingRange.projects.push(project); + } + } + + const duplicateRanges = Array.from(depRanges.entries()) + .filter(([, ranges]) => ranges.length > 1) + .reduce( + (acc: string[], [dep, ranges]) => [ + ...acc, + dep, + ...ranges.map( + ({ range, projects }) => ` ${range} => ${projects.map((p) => p.name).join(', ')}` + ), + ], + [] + ) + .join('\n '); + + if (duplicateRanges) { + log.error(dedent` + + [single_version_dependencies] Multiple version ranges for the same dependency + were found declared across different package.json files. Please consolidate + those to match across all package.json files. Different versions for the + same dependency is not supported. + + If you have questions about this please reach out to the operations team. + + The conflicting dependencies are: + + ${duplicateRanges} + `); + + process.exit(1); + } + log.success('yarn.lock analysis completed without any issues'); } diff --git a/packages/kbn-release-notes/package.json b/packages/kbn-release-notes/package.json index f8971fa02aa8..268530c22399 100644 --- a/packages/kbn-release-notes/package.json +++ b/packages/kbn-release-notes/package.json @@ -13,7 +13,7 @@ "axios": "^0.19.2", "cheerio": "0.22.0", "dedent": "^0.7.0", - "graphql": "^14.0.0", + "graphql": "^0.13.2", "graphql-tag": "^2.10.3", "terminal-link": "^2.1.1" }, diff --git a/packages/kbn-storybook/package.json b/packages/kbn-storybook/package.json index 05fdb8489a1c..58359159e950 100644 --- a/packages/kbn-storybook/package.json +++ b/packages/kbn-storybook/package.json @@ -13,8 +13,8 @@ "@storybook/core": "^6.0.16", "@storybook/react": "^6.0.16", "@storybook/theming": "^6.0.16", - "@types/loader-utils": "^2.0.1", - "@types/webpack": "^4.41.5", + "@types/loader-utils": "^1.1.3", + "@types/webpack": "^4.41.3", "@types/webpack-env": "^1.15.2", "@types/webpack-merge": "^4.1.5", "@kbn/utils": "1.0.0", diff --git a/packages/kbn-storybook/webpack.config.ts b/packages/kbn-storybook/webpack.config.ts index 98fca597ffd7..84f8cfaefd66 100644 --- a/packages/kbn-storybook/webpack.config.ts +++ b/packages/kbn-storybook/webpack.config.ts @@ -100,9 +100,5 @@ export default function ({ config: storybookConfig }: { config: Configuration }) if (htmlWebpackPlugin) { htmlWebpackPlugin.options.template = require.resolve('../lib/templates/index.ejs'); } - - // @ts-expect-error There's a long error here about the types of the - // incompatibility of Configuration, but it looks like it just may be Webpack - // type definition related. return webpackMerge(storybookConfig, config); } diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json index c616c836d5ff..4e86ec4bd72e 100644 --- a/packages/kbn-test/package.json +++ b/packages/kbn-test/package.json @@ -32,7 +32,7 @@ "lodash": "^4.17.20", "parse-link-header": "^1.0.1", "rxjs": "^6.5.5", - "strip-ansi": "^5.2.0", + "strip-ansi": "^6.0.0", "tar-fs": "^2.1.0", "xml2js": "^0.4.22", "zlib": "^1.0.5" diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json index be18b7cfc0d0..676985fa2474 100644 --- a/packages/kbn-ui-framework/package.json +++ b/packages/kbn-ui-framework/package.json @@ -58,10 +58,10 @@ "postcss-loader": "^3.0.0", "raw-loader": "^3.1.0", "react-dom": "^16.12.0", - "react-redux": "^5.1.2", - "react-router": "^3.2.0", + "react-redux": "^7.2.0", + "react-router": "^5.2.0", "react-router-redux": "^4.0.8", - "redux": "3.7.2", + "redux": "^4.0.5", "redux-thunk": "^2.3.0", "regenerator-runtime": "^0.13.3", "sass-loader": "^8.0.2", diff --git a/tasks/config/run.js b/tasks/config/run.js index 148be6ea8afa..eddcb0bdd59d 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -240,10 +240,6 @@ module.exports = function () { args: ['scripts/check_licenses', '--dev'], }), - verifyDependencyVersions: gruntTaskWithGithubChecks( - 'Verify dependency versions', - 'verifyDependencyVersions' - ), test_jest: gruntTaskWithGithubChecks('Jest tests', 'test:jest'), test_jest_integration: gruntTaskWithGithubChecks( 'Jest integration tests', diff --git a/tasks/jenkins.js b/tasks/jenkins.js index 90efadf41c43..4e3358ce81bb 100644 --- a/tasks/jenkins.js +++ b/tasks/jenkins.js @@ -31,7 +31,6 @@ module.exports = function (grunt) { 'run:checkFileCasing', 'run:checkLockfileSymlinks', 'run:licenses', - 'run:verifyDependencyVersions', 'run:verifyNotice', 'run:mocha', 'run:test_jest', diff --git a/tasks/verify_dependency_versions.js b/tasks/verify_dependency_versions.js deleted file mode 100644 index 14ecbb9ba860..000000000000 --- a/tasks/verify_dependency_versions.js +++ /dev/null @@ -1,53 +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 { size } from 'lodash'; -import kibana from '../package.json'; -import xpack from '../x-pack/package.json'; - -function getMismatches(depType) { - return Object.keys(kibana[depType]) - .map((key) => { - const xpackValue = xpack[depType][key]; - const kibanaValue = kibana[depType][key]; - if (xpackValue && kibanaValue && xpackValue !== kibanaValue && !key.includes('@kbn/')) { - return { - key, - xpack: xpackValue, - kibana: kibanaValue, - }; - } - }) - .filter((key) => !!key); -} - -export default function verifyDependencyVersions(grunt) { - grunt.registerTask('verifyDependencyVersions', 'Checks dependency versions', () => { - const devDependenciesMismatches = getMismatches('devDependencies'); - if (size(devDependenciesMismatches) > 0) { - grunt.log.error( - 'The following devDependencies do not match:', - JSON.stringify(devDependenciesMismatches, null, 4) - ); - return false; - } else { - grunt.log.writeln('devDependencies match!'); - } - }); -} diff --git a/test/scripts/checks/verify_dependency_versions.sh b/test/scripts/checks/verify_dependency_versions.sh deleted file mode 100755 index b73a71e7ff7f..000000000000 --- a/test/scripts/checks/verify_dependency_versions.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -source src/dev/ci_setup/setup_env.sh - -yarn run grunt run:verifyDependencyVersions diff --git a/vars/tasks.groovy b/vars/tasks.groovy index edd2c0aa4740..09ff1b0a7d95 100644 --- a/vars/tasks.groovy +++ b/vars/tasks.groovy @@ -12,7 +12,6 @@ def check() { kibanaPipeline.scriptTask('Check File Casing', 'test/scripts/checks/file_casing.sh'), kibanaPipeline.scriptTask('Check Lockfile Symlinks', 'test/scripts/checks/lock_file_symlinks.sh'), kibanaPipeline.scriptTask('Check Licenses', 'test/scripts/checks/licenses.sh'), - kibanaPipeline.scriptTask('Verify Dependency Versions', 'test/scripts/checks/verify_dependency_versions.sh'), kibanaPipeline.scriptTask('Verify NOTICE', 'test/scripts/checks/verify_notice.sh'), kibanaPipeline.scriptTask('Test Projects', 'test/scripts/checks/test_projects.sh'), kibanaPipeline.scriptTask('Test Hardening', 'test/scripts/checks/test_hardening.sh'), diff --git a/x-pack/package.json b/x-pack/package.json index f9b193bb4da0..5742200b55d9 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -29,7 +29,7 @@ "**/@types/node": ">=10.17.17 <10.20.0" }, "devDependencies": { - "@cypress/webpack-preprocessor": "^4.1.0", + "@cypress/webpack-preprocessor": "^5.4.1", "@elastic/apm-rum-react": "^1.2.5", "@elastic/maki": "6.3.0", "@kbn/dev-utils": "1.0.0", @@ -159,7 +159,7 @@ "copy-to-clipboard": "^3.0.8", "copy-webpack-plugin": "^6.0.2", "cronstrue": "^1.51.0", - "cypress": "5.0.0", + "cypress": "^5.0.0", "cypress-multi-reporters": "^1.2.3", "cypress-promise": "^1.1.0", "d3": "3.5.17", @@ -257,7 +257,7 @@ "tinycolor2": "1.4.1", "topojson-client": "3.0.0", "tree-kill": "^1.2.2", - "ts-loader": "^6.0.4", + "ts-loader": "^7.0.5", "typescript": "4.0.2", "typescript-fsa": "^3.0.0", "typescript-fsa-reducers": "^1.2.1", @@ -309,7 +309,7 @@ "dedent": "^0.7.0", "del": "^5.1.0", "elasticsearch": "^16.7.0", - "extract-zip": "^1.7.0", + "extract-zip": "^2.0.1", "file-type": "^10.9.0", "font-awesome": "4.7.0", "fp-ts": "^2.3.1", @@ -321,7 +321,7 @@ "glob": "^7.1.2", "graphql": "^0.13.2", "graphql-fields": "^1.0.2", - "graphql-tag": "^2.9.2", + "graphql-tag": "^2.10.3", "graphql-tools": "^3.0.2", "h2o2": "^8.1.2", "handlebars": "4.7.6", @@ -372,7 +372,7 @@ "redux-observable": "^1.2.0", "redux-thunk": "^2.3.0", "request": "^2.88.0", - "rison-node": "0.3.1", + "rison-node": "1.0.2", "rxjs": "^6.5.5", "semver": "^5.7.0", "set-value": "^3.0.2", diff --git a/x-pack/plugins/apm/e2e/package.json b/x-pack/plugins/apm/e2e/package.json index 649198b7eae1..041f9ea7f21c 100644 --- a/x-pack/plugins/apm/e2e/package.json +++ b/x-pack/plugins/apm/e2e/package.json @@ -14,7 +14,7 @@ "@types/node": ">=10.17.17 <10.20.0", "axios": "^0.19.2", "cypress-cucumber-preprocessor": "^2.5.2", - "cypress": "^4.9.0", + "cypress": "^5.0.0", "ora": "^4.0.4", "p-limit": "^3.0.1", "p-retry": "^4.2.0", diff --git a/x-pack/plugins/apm/scripts/package.json b/x-pack/plugins/apm/scripts/package.json index d3e2d42f972a..c68dc49cd937 100644 --- a/x-pack/plugins/apm/scripts/package.json +++ b/x-pack/plugins/apm/scripts/package.json @@ -4,7 +4,7 @@ "main": "index.js", "license": "MIT", "dependencies": { - "@elastic/elasticsearch": "7.9.0-rc.1", + "@elastic/elasticsearch": "7.9.1", "@octokit/rest": "^16.35.0", "console-stamp": "^0.2.9", "hdr-histogram-js": "^1.2.0" diff --git a/x-pack/plugins/reporting/server/browsers/extract/unzip.js b/x-pack/plugins/reporting/server/browsers/extract/unzip.js index d57d04a52f46..d5166f149372 100644 --- a/x-pack/plugins/reporting/server/browsers/extract/unzip.js +++ b/x-pack/plugins/reporting/server/browsers/extract/unzip.js @@ -7,14 +7,10 @@ import extractZip from 'extract-zip'; import { ExtractError } from './extract_error'; -export function unzip(filepath, target) { - return new Promise(function (resolve, reject) { - extractZip(filepath, { dir: target }, (err) => { - if (err) { - return reject(new ExtractError(err)); - } - - resolve(); - }); - }); +export async function unzip(filepath, target) { + try { + await extractZip(filepath, { dir: target }); + } catch (err) { + throw new ExtractError(err); + } } diff --git a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts index 9f26fc22ede5..ed226fb0c984 100644 --- a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts +++ b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts @@ -32,7 +32,7 @@ export interface MockedProvidedQuery { export const mockOpenTimelineQueryResults: MockedProvidedQuery[] = [ { request: { - query: allTimelinesQuery, + query: (allTimelinesQuery as unknown) as GetAllTimeline.Query, variables: { onlyUserFavorite: false, pageInfo: { diff --git a/x-pack/plugins/security_solution/scripts/beat_docs/build.js b/x-pack/plugins/security_solution/scripts/beat_docs/build.js index 9b3607593a5d..3dbfb75fbe32 100644 --- a/x-pack/plugins/security_solution/scripts/beat_docs/build.js +++ b/x-pack/plugins/security_solution/scripts/beat_docs/build.js @@ -135,25 +135,25 @@ const convertSchemaToHash = (schema, beatFields) => { }, beatFields); }; -const manageZipFields = async (beat, filePath, beatFields) => - new Promise((resolve, reject) => { - extract(filePath, { dir: beat.outputDir }, (err) => { - if (err) { - return reject(new Error(err)); - } - console.log('building fields', beat.index); - const obj = yaml.load( - fs.readFileSync(`${beat.outputDir}/winlogbeat-7.9.0-windows-x86_64/fields.yml`, { - encoding: 'utf-8', - }) - ); - const eBeatFields = convertSchemaToHash(obj, beatFields); - console.log('deleting files', beat.index); - rimraf.sync(`${beat.outputDir}/winlogbeat-7.9.0-windows-x86_64`); - rimraf.sync(beat.filePath); - resolve(eBeatFields); - }); - }); +const manageZipFields = async (beat, filePath, beatFields) => { + try { + await extract(filePath, { dir: beat.outputDir }); + console.log('building fields', beat.index); + const obj = yaml.load( + fs.readFileSync(`${beat.outputDir}/winlogbeat-7.9.0-windows-x86_64/fields.yml`, { + encoding: 'utf-8', + }) + ); + const eBeatFields = convertSchemaToHash(obj, beatFields); + console.log('deleting files', beat.index); + rimraf.sync(`${beat.outputDir}/winlogbeat-7.9.0-windows-x86_64`); + rimraf.sync(beat.filePath); + + return eBeatFields; + } catch (err) { + throw new Error(err); + } +}; const manageTarFields = async (beat, filePath, beatFields) => new Promise((resolve, reject) => { diff --git a/yarn.lock b/yarn.lock index d795a174cfaa..2d72b6d6c3bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -63,7 +63,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.0.1", "@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.7.5", "@babel/core@^7.9.0": +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.7.5", "@babel/core@^7.9.0": version "7.11.1" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643" integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ== @@ -926,7 +926,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.10.4" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.11.0", "@babel/preset-env@^7.9.5", "@babel/preset-env@^7.9.6": +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.9.5", "@babel/preset-env@^7.9.6": version "7.11.0" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796" integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg== @@ -1168,17 +1168,14 @@ tunnel-agent "^0.6.0" uuid "^3.3.2" -"@cypress/webpack-preprocessor@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.0.tgz#8c4debc0b1abf045b62524d1996dd9aeaf7e86a8" - integrity sha512-LbxsdYVpHGoC2fMOdW0aQvuvVRD7aZx8p8DrP53HISpl7bD1PqLGWKzhHn7cGG24UHycBJrbaEeKEosW29W1dg== +"@cypress/webpack-preprocessor@^5.4.1": + version "5.4.6" + resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.4.6.tgz#667f8007cbe6ee219ce7e45a7f1400d3e2401032" + integrity sha512-78hWoTUUEncv647badwVbyszvmwI1r9GaY/xy7V0sz0VVC90ByuDkLpvN+J0VP6enthob4dIPXcm0f9Tb1UKQQ== dependencies: - bluebird "3.5.0" - debug "3.1.0" - optionalDependencies: - "@babel/core" "^7.0.1" - "@babel/preset-env" "^7.0.0" - babel-loader "^8.0.2" + bluebird "^3.7.1" + debug "^4.1.1" + lodash "^4.17.20" "@cypress/xvfb@^1.2.4": version "1.2.4" @@ -1246,17 +1243,6 @@ utility-types "^3.10.0" uuid "^3.3.2" -"@elastic/elasticsearch@7.9.0-rc.1": - version "7.9.0-rc.1" - resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-7.9.0-rc.1.tgz#50205507ec84ccb95cb7a6d36e5570808749fee9" - integrity sha512-rVjiVj7VPLCusJPfywpb3gvcaA99uylYSum1Frcq4vi2Iqg118KXgYW6GOis2Y70oDZ6w6XRlT0ze5NA6SBa+g== - dependencies: - debug "^4.1.1" - decompress-response "^4.2.0" - ms "^2.1.1" - pump "^3.0.0" - secure-json-parse "^2.1.0" - "@elastic/elasticsearch@7.9.1": version "7.9.1" resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-7.9.1.tgz#40f1c38e8f70d783851c13be78a7cb346891c15e" @@ -4487,14 +4473,6 @@ "@types/node" "*" "@types/webpack" "*" -"@types/loader-utils@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-2.0.1.tgz#4073425aca25762099823f7b922e86599c2b85ec" - integrity sha512-X3jTNi/I2AEd2WrHdSqRppPkYzWkRMNGxJzeMwS0o3hVi8ZB6JCnf/XyQmqpUuCidld5lC/1VxVgTktEweRK+w== - dependencies: - "@types/node" "*" - "@types/webpack" "*" - "@types/lodash.difference@^4.5.6": version "4.5.6" resolved "https://registry.yarnpkg.com/@types/lodash.difference/-/lodash.difference-4.5.6.tgz#41ec5c4e684eeacf543848a9a1b2a4856ccf9853" @@ -5085,11 +5063,6 @@ resolved "https://registry.yarnpkg.com/@types/stats-lite/-/stats-lite-2.2.0.tgz#bc8190bf9dfa1e16b89eaa2b433c99dff0804de9" integrity sha512-YV6SS4QC+pbzqjMIV8qVSTDOOazgKBLTVaN+7PfuxELjz/eyzc20KwDVGPrbHt2OcYMA7K2ezLB45Cp6DpNOSQ== -"@types/strip-ansi@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-3.0.0.tgz#9b63d453a6b54aa849182207711a08be8eea48ae" - integrity sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= - "@types/strip-ansi@^5.2.1": version "5.2.1" resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-5.2.1.tgz#acd97f1f091e332bb7ce697c4609eb2370fa2a92" @@ -5339,7 +5312,7 @@ "@types/webpack-sources" "*" source-map "^0.6.0" -"@types/webpack@^4.41.21", "@types/webpack@^4.41.5", "@types/webpack@^4.41.8": +"@types/webpack@^4.41.8": version "4.41.21" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.21.tgz#cc685b332c33f153bb2f5fc1fa3ac8adeb592dee" integrity sha512-2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA== @@ -6283,11 +6256,6 @@ ansi-escapes@^1.0.0, ansi-escapes@^1.1.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= -ansi-escapes@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b" - integrity sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs= - ansi-escapes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" @@ -7348,7 +7316,7 @@ babel-jest@^26.3.0: graceful-fs "^4.2.4" slash "^3.0.0" -babel-loader@^8.0.2, babel-loader@^8.0.6: +babel-loader@^8.0.6: version "8.0.6" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb" integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw== @@ -7985,17 +7953,12 @@ bluebird-retry@^0.11.0: resolved "https://registry.yarnpkg.com/bluebird-retry/-/bluebird-retry-0.11.0.tgz#1289ab22cbbc3a02587baad35595351dd0c1c047" integrity sha1-EomrIsu8OgJYe6rTVZU1HdDBwEc= -bluebird@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" - integrity sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw= - bluebird@3.5.5, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.5: version "3.5.5" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== -bluebird@3.7.2, bluebird@^3.7.2: +bluebird@3.7.2, bluebird@^3.7.1, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== @@ -8672,15 +8635,6 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" -camelcase-keys@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" - integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= - dependencies: - camelcase "^4.1.0" - map-obj "^2.0.0" - quick-lru "^1.0.0" - camelcase-keys@^6.2.2: version "6.2.2" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" @@ -8705,7 +8659,7 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^4.0.0, camelcase@^4.1.0: +camelcase@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= @@ -9245,17 +9199,12 @@ cli-spinners@^0.1.2: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" integrity sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw= -cli-spinners@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" - integrity sha1-8YR7FohE2RemceudFH499JfJDQY= - cli-spinners@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.1.0.tgz#22c34b4d51f573240885b201efda4e4ec9fff3c7" integrity sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA== -cli-spinners@^2.4.0: +cli-spinners@^2.2.0, cli-spinners@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f" integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA== @@ -10219,7 +10168,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.5.1, create-react-class@^15.5.2: +create-react-class@^15.5.2: version "15.6.3" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg== @@ -10586,10 +10535,10 @@ cypress-promise@^1.1.0: resolved "https://registry.yarnpkg.com/cypress-promise/-/cypress-promise-1.1.0.tgz#f2d66965945fe198431aaf692d5157cea9d47b25" integrity sha512-DhIf5PJ/a0iY+Yii6n7Rbwq+9TJxU4pupXYzf9mZd8nPG0AzQrj9i+pqINv4xbI2EV1p+PKW3maCkR7oPG4GrA== -cypress@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.0.0.tgz#6957e299b790af8b1cd7bea68261b8935646f72e" - integrity sha512-jhPd0PMO1dPSBNpx6pHVLkmnnaTfMy3wCoacHAKJ9LJG06y16zqUNSFri64N4BjuGe8y6mNMt8TdgKnmy9muCg== +cypress@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-5.2.0.tgz#6902efd90703242a2539f0623c6e1118aff01f95" + integrity sha512-9S2spcrpIXrQ+CQIKHsjRoLQyRc2ehB06clJXPXXp1zyOL/uZMM3Qc20ipNki4CcNwY0nBTQZffPbRpODeGYQg== dependencies: "@cypress/listr-verbose-renderer" "^0.4.1" "@cypress/request" "^2.88.5" @@ -11042,7 +10991,7 @@ debuglog@^1.0.1: resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= -decamelize-keys@^1.0.0, decamelize-keys@^1.1.0: +decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= @@ -11098,7 +11047,7 @@ deep-eql@^0.1.3: dependencies: type-detect "0.1.1" -deep-equal@^1.0.0, deep-equal@^1.1.1, deep-equal@~1.1.1: +deep-equal@^1.0.0, deep-equal@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== @@ -11843,7 +11792,7 @@ dotenv@^8.1.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== -dotignore@^0.1.2, dotignore@~0.1.2: +dotignore@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/dotignore/-/dotignore-0.1.2.tgz#f942f2200d28c3a76fbdd6f0ee9f3257c8a2e905" integrity sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw== @@ -12640,17 +12589,6 @@ eslint-config-prettier@^6.11.0: dependencies: get-stdin "^6.0.0" -eslint-formatter-pretty@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-1.3.0.tgz#985d9e41c1f8475f4a090c5dbd2dfcf2821d607e" - integrity sha512-5DY64Y1rYCm7cfFDHEGUn54bvCnK+wSUVF07N8oXeqUJFSd+gnYOTXbzelQ1HurESluY6gnEQPmXOIkB4Wa+gA== - dependencies: - ansi-escapes "^2.0.0" - chalk "^2.1.0" - log-symbols "^2.0.0" - plur "^2.1.2" - string-width "^2.0.0" - eslint-formatter-pretty@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.0.0.tgz#dc15f3bf4fb51b7ba5fbedb77f57ba8841140ce2" @@ -14801,7 +14739,7 @@ glob@^6.0.1, glob@^6.0.4: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1, glob@~7.1.4, glob@~7.1.6: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1, glob@~7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -15015,7 +14953,7 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globby@^9.1.0, globby@^9.2.0: +globby@^9.2.0: version "9.2.0" resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== @@ -15383,7 +15321,7 @@ graphql-tag-pluck@0.6.0: source-map-support "^0.5.9" typescript "^3.2.2" -graphql-tag@2.10.1, graphql-tag@^2.9.2: +graphql-tag@2.10.1: version "2.10.1" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02" integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg== @@ -15439,13 +15377,6 @@ graphql@^0.13.2: dependencies: iterall "^1.2.1" -graphql@^14.0.0: - version "14.6.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.6.0.tgz#57822297111e874ea12f5cd4419616930cd83e49" - integrity sha512-VKzfvHEKybTKjQVpTFrA5yUq2S9ihcZvfJAtsDBBCuV6wauPu1xl/f9ehgVf0FcEJJs4vz6ysb/ZMkGigQZseg== - dependencies: - iterall "^1.2.2" - graphviz@^0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/graphviz/-/graphviz-0.0.8.tgz#e599e40733ef80e1653bfe89a5f031ecf2aa4aaa" @@ -16102,16 +16033,6 @@ history-extra@^5.0.1: resolved "https://registry.yarnpkg.com/history-extra/-/history-extra-5.0.1.tgz#95a2e59dda526c4241d0ae1b124a77a5e4675ce8" integrity sha512-6XV1L1lHgporVWgppa/Kq+Fnz4lhBew7iMxYCTfzVmoEywsAKJnTjdw1zOd+EGLHGYp0/V8jSVMEgqx4QbHLTw== -history@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" - integrity sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw= - dependencies: - invariant "^2.2.1" - loose-envify "^1.2.0" - query-string "^4.2.2" - warning "^3.0.0" - history@^4.9.0: version "4.9.0" resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca" @@ -16773,7 +16694,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -16870,7 +16791,7 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -inquirer@^1.0.2, inquirer@^1.2.2: +inquirer@^1.0.2: version "1.2.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" integrity sha1-TexvMvN+97sLLtPx0aXD9UUHSRg= @@ -17038,7 +16959,7 @@ invariant@2.2.4, invariant@^2.1.0, invariant@^2.1.1, invariant@^2.2.3, invariant dependencies: loose-envify "^1.0.0" -invariant@^2.2.1, invariant@^2.2.2: +invariant@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" integrity sha1-nh9WrArNtr8wMwbzOL47IErmA2A= @@ -17089,11 +17010,6 @@ iron@5.x.x: cryptiles "4.x.x" hoek "5.x.x" -irregular-plurals@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766" - integrity sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y= - irregular-plurals@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-3.2.0.tgz#b19c490a0723798db51b235d7e39add44dab0822" @@ -17637,7 +17553,7 @@ is-redirect@^1.0.0: resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= -is-regex@^1.0.4, is-regex@^1.0.5, is-regex@~1.0.5: +is-regex@^1.0.4, is-regex@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== @@ -18066,11 +17982,6 @@ iterall@^1.1.3, iterall@^1.2.1: resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA== -iterall@^1.2.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" - integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== - iterate-iterator@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6" @@ -19737,7 +19648,7 @@ locutus@^2.0.5: resolved "https://registry.yarnpkg.com/locutus/-/locutus-2.0.10.tgz#f903619466a98a4ab76e8b87a5854b55a743b917" integrity sha512-AZg2kCqrquMJ5FehDsBidV0qHl98NrsYtseUClzjAQ3HFnsDBJTCwGVplSQ82t9/QfgahqvTjaKcZqZkHmS0wQ== -lodash-es@^4.17.11, lodash-es@^4.2.1: +lodash-es@^4.17.11: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== @@ -19997,7 +19908,7 @@ lodash.uniq@4.5.0, 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.15.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.19, lodash@^4.17.2, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5: +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.15.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.19, lodash@^4.17.2, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10, lodash@~4.17.15, lodash@~4.17.5: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -20010,14 +19921,14 @@ log-ok@^0.1.1: ansi-green "^0.1.1" success-symbol "^0.1.0" -log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0: +log-symbols@2.2.0, log-symbols@^2.1.0, log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg== dependencies: chalk "^2.0.1" -log-symbols@3.0.0: +log-symbols@3.0.0, log-symbols@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== @@ -20326,11 +20237,6 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= -map-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" - integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk= - map-obj@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5" @@ -20647,21 +20553,6 @@ meow@^3.0.0, meow@^3.3.0, meow@^3.7.0: redent "^1.0.0" trim-newlines "^1.0.0" -meow@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" - integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig== - dependencies: - camelcase-keys "^4.0.0" - decamelize-keys "^1.0.0" - loud-rejection "^1.0.0" - minimist-options "^3.0.1" - normalize-package-data "^2.3.4" - read-pkg-up "^3.0.0" - redent "^2.0.0" - trim-newlines "^2.0.0" - yargs-parser "^10.0.0" - meow@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/meow/-/meow-6.1.1.tgz#1ad64c4b76b2a24dfb2f635fddcadf320d251467" @@ -20927,14 +20818,6 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: dependencies: brace-expansion "^1.1.7" -minimist-options@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" - integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -22161,7 +22044,7 @@ object-identity-map@^1.0.2: dependencies: object.entries "^1.1.0" -object-inspect@^1.6.0, object-inspect@^1.7.0, object-inspect@~1.7.0: +object-inspect@^1.6.0, object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== @@ -22485,16 +22368,6 @@ ora@^0.2.3: cli-spinners "^0.1.2" object-assign "^4.0.1" -ora@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5" - integrity sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw== - dependencies: - chalk "^2.1.0" - cli-cursor "^2.1.0" - cli-spinners "^1.0.1" - log-symbols "^2.1.0" - ora@^3.0.0: version "3.4.0" resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318" @@ -22507,6 +22380,20 @@ ora@^3.0.0: strip-ansi "^5.2.0" wcwidth "^1.0.1" +ora@^4.0.4: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-4.1.1.tgz#566cc0348a15c36f5f0e979612842e02ba9dddbc" + integrity sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A== + dependencies: + chalk "^3.0.0" + cli-cursor "^3.1.0" + cli-spinners "^2.2.0" + is-interactive "^1.0.0" + log-symbols "^3.0.0" + mute-stream "0.0.8" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + ora@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8" @@ -23450,13 +23337,6 @@ plugin-error@^1.0.1: arr-union "^3.1.0" extend-shallow "^3.0.2" -plur@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a" - integrity sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo= - dependencies: - irregular-plurals "^1.0.0" - plur@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/plur/-/plur-4.0.0.tgz#729aedb08f452645fe8c58ef115bf16b0a73ef84" @@ -23911,7 +23791,7 @@ prop-types-exact@^1.2.0: object.assign "^4.1.0" reflect.ownkeys "^0.2.0" -prop-types@15.7.2, prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@15.7.2, prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -24149,7 +24029,7 @@ qs@^6.6.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.8.0.tgz#87b763f0d37ca54200334cd57bb2ef8f68a1d081" integrity sha512-tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w== -query-string@^4.1.0, query-string@^4.2.2: +query-string@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= @@ -24197,11 +24077,6 @@ queue@6.0.1: dependencies: inherits "~2.0.3" -quick-lru@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" - integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= - quick-lru@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" @@ -24706,7 +24581,7 @@ react-lib-adler32@^1.0.3: resolved "https://registry.yarnpkg.com/react-lib-adler32/-/react-lib-adler32-1.0.3.tgz#63df1aed274eabcc1c5067077ea281ec30888ba7" integrity sha512-AqFqdt4cP0RPffHNjVHZ7tyIgnoSzNxgFhG8XKMXCtA1dZ72gTPO4iYFwWDKHqvE8sHS14rhltQTdbXU5G4BFA== -react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== @@ -24783,19 +24658,6 @@ react-portal@^3.2.0: dependencies: prop-types "^15.5.8" -react-redux@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57" - integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q== - dependencies: - "@babel/runtime" "^7.1.2" - hoist-non-react-statics "^3.3.0" - invariant "^2.2.4" - loose-envify "^1.1.0" - prop-types "^15.6.1" - react-is "^16.6.0" - react-lifecycles-compat "^3.0.0" - 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" @@ -24884,19 +24746,6 @@ react-router@5.2.0, react-router@^5.2.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.2.1.tgz#b9a3279962bdfbe684c8bd0482b81ef288f0f244" - integrity sha512-SXkhC0nr3G0ltzVU07IN8jYl0bB6FsrDIqlLC9dK3SITXqyTJyM7yhXlUqs89w3Nqi5OkXsfRUeHX+P874HQrg== - dependencies: - create-react-class "^15.5.1" - history "^3.0.0" - hoist-non-react-statics "^2.3.1" - invariant "^2.2.1" - loose-envify "^1.2.0" - prop-types "^15.5.6" - warning "^3.0.0" - react-select@^3.0.8: version "3.1.0" resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.0.tgz#ab098720b2e9fe275047c993f0d0caf5ded17c27" @@ -25174,14 +25023,6 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= - dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" - read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" @@ -25389,14 +25230,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -redent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" - integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= - dependencies: - indent-string "^3.0.0" - strip-indent "^2.0.0" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -25460,16 +25293,6 @@ redux-thunks@^1.0.0: resolved "https://registry.yarnpkg.com/redux-thunks/-/redux-thunks-1.0.0.tgz#56e03b86d281a2664c884ab05c543d9ab1673658" integrity sha1-VuA7htKBomZMiEqwXFQ9mrFnNlg= -redux@3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" - integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== - dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" - loose-envify "^1.1.0" - symbol-observable "^1.0.3" - redux@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03" @@ -26216,13 +26039,6 @@ resolve@~1.10.1: dependencies: path-parse "^1.0.6" -resolve@~1.14.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" - integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== - dependencies: - path-parse "^1.0.6" - responselike@1.0.2, responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" @@ -26352,11 +26168,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rison-node@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/rison-node/-/rison-node-0.3.1.tgz#fc540015500fc146f3b27d8d25dd5742122552a6" - integrity sha1-/FQAFVAPwUbzsn2NJd1XQhIlUqY= - rison-node@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/rison-node/-/rison-node-1.0.2.tgz#b7b5f37f39f5ae2a51a973a33c9aa17239a33e4b" @@ -27877,7 +27688,7 @@ string.prototype.padstart@^3.0.0: es-abstract "^1.4.3" function-bind "^1.0.2" -string.prototype.trim@^1.2.1, string.prototype.trim@~1.2.1: +string.prototype.trim@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782" integrity sha512-MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw== @@ -28053,11 +27864,6 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-indent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" - integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= - strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -28358,7 +28164,7 @@ symbol-observable@1.0.1: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= -symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0: +symbol-observable@^1.0.2, symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== @@ -28452,27 +28258,6 @@ tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tape@^4.13.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/tape/-/tape-4.13.0.tgz#e2f581ff5f12a7cbd787e9f83c76c2851782fce2" - integrity sha512-J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw== - dependencies: - deep-equal "~1.1.1" - defined "~1.0.0" - dotignore "~0.1.2" - for-each "~0.3.3" - function-bind "~1.1.1" - glob "~7.1.6" - has "~1.0.3" - inherits "~2.0.4" - is-regex "~1.0.5" - minimist "~1.2.0" - object-inspect "~1.7.0" - resolve "~1.14.2" - resumer "~0.0.0" - string.prototype.trim "~1.2.1" - through "~2.3.8" - tape@^4.5.1: version "4.10.2" resolved "https://registry.yarnpkg.com/tape/-/tape-4.10.2.tgz#129fcf62f86df92687036a52cce7b8ddcaffd7a6" @@ -29176,11 +28961,6 @@ trim-newlines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= -trim-newlines@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" - integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - trim-newlines@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30" @@ -29259,10 +29039,10 @@ ts-invariant@^0.4.0: dependencies: tslib "^1.9.3" -ts-loader@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.0.4.tgz#bc331ad91a887a60632d94c9f79448666f2c4b63" - integrity sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g== +ts-loader@^7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.5.tgz#789338fb01cb5dc0a33c54e50558b34a73c9c4c5" + integrity sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig== dependencies: chalk "^2.3.0" enhanced-resolve "^4.0.0" @@ -29292,19 +29072,6 @@ tsd@^0.13.1: read-pkg-up "^7.0.0" update-notifier "^4.1.0" -tsd@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/tsd/-/tsd-0.7.4.tgz#d9aba567f1394641821a6800dcee60746c87bd03" - integrity sha512-cqr1s2GHtVkU3L/4BXDaeJOjFEuZ7iOVC+hwmyx4G7Eo26mSXCFNnwFm4EasK/MW2HdY3AQWux+AjYzDYLzZow== - dependencies: - eslint-formatter-pretty "^1.3.0" - globby "^9.1.0" - meow "^5.0.0" - path-exists "^3.0.0" - read-pkg-up "^4.0.0" - typescript "^3.0.1" - update-notifier "^2.5.0" - tslib@^1, tslib@^1.0.0, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" @@ -29476,7 +29243,7 @@ typescript-tuple@^2.2.1: dependencies: typescript-compare "^0.0.2" -typescript@4.0.2, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.7.2: +typescript@4.0.2, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.7.2: version "4.0.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== @@ -30982,13 +30749,6 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" -warning@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" - integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w= - dependencies: - loose-envify "^1.0.0" - warning@^4.0.2, warning@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" @@ -31868,13 +31628,6 @@ yargs-parser@5.0.0-security.0: camelcase "^3.0.0" object.assign "^4.1.0" -yargs-parser@^10.0.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" - integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== - dependencies: - camelcase "^4.1.0" - yargs-parser@^18.1.2, yargs-parser@^18.1.3: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" From 1841495322d4abe63c3985e9c7456bda01652292 Mon Sep 17 00:00:00 2001 From: Phillip Burch Date: Thu, 1 Oct 2020 18:54:46 -0500 Subject: [PATCH 11/73] [Metrics UI] Override anomaly detection partition field (#79214) * Add ability to override datafeeds and job config for partition field * Remove debug * UX cleanup * Fix types, delete dead code * Fix types --- .../containers/ml/infra_ml_module_types.ts | 4 +- .../containers/ml/infra_ml_setup_state.ts | 289 ------------------ .../metrics_hosts/module_descriptor.ts | 135 +++++--- .../modules/metrics_k8s/module_descriptor.ts | 143 ++++++--- .../anomoly_detection_flyout.tsx | 4 +- .../ml/anomaly_detection/flyout_home.tsx | 113 +++---- .../ml/anomaly_detection/job_setup_screen.tsx | 3 +- 7 files changed, 247 insertions(+), 444 deletions(-) delete mode 100644 x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts index a9f2671de825..e36f38add641 100644 --- a/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts +++ b/x-pack/plugins/infra/public/containers/ml/infra_ml_module_types.ts @@ -33,11 +33,11 @@ export interface ModuleDescriptor { partitionField?: string ) => Promise; cleanUpModule: (spaceId: string, sourceId: string) => Promise; - validateSetupIndices: ( + validateSetupIndices?: ( indices: string[], timestampField: string ) => Promise; - validateSetupDatasets: ( + validateSetupDatasets?: ( indices: string[], timestampField: string, startTime: number, diff --git a/x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts b/x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts deleted file mode 100644 index 0dfe3b301f24..000000000000 --- a/x-pack/plugins/infra/public/containers/ml/infra_ml_setup_state.ts +++ /dev/null @@ -1,289 +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 { isEqual } from 'lodash'; -import { useCallback, useEffect, useMemo, useState } from 'react'; -import { usePrevious } from 'react-use'; -import { - combineDatasetFilters, - DatasetFilter, - filterDatasetFilter, - isExampleDataIndex, -} from '../../../common/infra_ml'; -import { - AvailableIndex, - ValidationIndicesError, - ValidationUIError, -} from '../../components/logging/log_analysis_setup/initial_configuration_step'; -import { useTrackedPromise } from '../../utils/use_tracked_promise'; -import { ModuleDescriptor, ModuleSourceConfiguration } from './infra_ml_module_types'; - -type SetupHandler = ( - indices: string[], - startTime: number | undefined, - endTime: number | undefined, - datasetFilter: DatasetFilter -) => void; - -interface AnalysisSetupStateArguments { - cleanUpAndSetUpModule: SetupHandler; - moduleDescriptor: ModuleDescriptor; - setUpModule: SetupHandler; - sourceConfiguration: ModuleSourceConfiguration; -} - -const fourWeeksInMs = 86400000 * 7 * 4; - -export const useAnalysisSetupState = ({ - cleanUpAndSetUpModule, - moduleDescriptor: { validateSetupDatasets, validateSetupIndices }, - setUpModule, - sourceConfiguration, -}: AnalysisSetupStateArguments) => { - const [startTime, setStartTime] = useState(Date.now() - fourWeeksInMs); - const [endTime, setEndTime] = useState(undefined); - - const isTimeRangeValid = useMemo( - () => (startTime != null && endTime != null ? startTime < endTime : true), - [endTime, startTime] - ); - - const [validatedIndices, setValidatedIndices] = useState( - sourceConfiguration.indices.map((indexName) => ({ - name: indexName, - validity: 'unknown' as const, - })) - ); - - const updateIndicesWithValidationErrors = useCallback( - (validationErrors: ValidationIndicesError[]) => - setValidatedIndices((availableIndices) => - availableIndices.map((previousAvailableIndex) => { - const indexValiationErrors = validationErrors.filter( - ({ index }) => index === previousAvailableIndex.name - ); - - if (indexValiationErrors.length > 0) { - return { - validity: 'invalid', - name: previousAvailableIndex.name, - errors: indexValiationErrors, - }; - } else if (previousAvailableIndex.validity === 'valid') { - return { - ...previousAvailableIndex, - validity: 'valid', - errors: [], - }; - } else { - return { - validity: 'valid', - name: previousAvailableIndex.name, - isSelected: !isExampleDataIndex(previousAvailableIndex.name), - availableDatasets: [], - datasetFilter: { - type: 'includeAll' as const, - }, - }; - } - }) - ), - [] - ); - - const updateIndicesWithAvailableDatasets = useCallback( - (availableDatasets: Array<{ indexName: string; datasets: string[] }>) => - setValidatedIndices((availableIndices) => - availableIndices.map((previousAvailableIndex) => { - if (previousAvailableIndex.validity !== 'valid') { - return previousAvailableIndex; - } - - const availableDatasetsForIndex = availableDatasets.filter( - ({ indexName }) => indexName === previousAvailableIndex.name - ); - const newAvailableDatasets = availableDatasetsForIndex.flatMap( - ({ datasets }) => datasets - ); - - // filter out datasets that have disappeared if this index' datasets were updated - const newDatasetFilter: DatasetFilter = - availableDatasetsForIndex.length > 0 - ? filterDatasetFilter(previousAvailableIndex.datasetFilter, (dataset) => - newAvailableDatasets.includes(dataset) - ) - : previousAvailableIndex.datasetFilter; - - return { - ...previousAvailableIndex, - availableDatasets: newAvailableDatasets, - datasetFilter: newDatasetFilter, - }; - }) - ), - [] - ); - - const validIndexNames = useMemo( - () => validatedIndices.filter((index) => index.validity === 'valid').map((index) => index.name), - [validatedIndices] - ); - - const selectedIndexNames = useMemo( - () => - validatedIndices - .filter((index) => index.validity === 'valid' && index.isSelected) - .map((i) => i.name), - [validatedIndices] - ); - - const datasetFilter = useMemo( - () => - validatedIndices - .flatMap((validatedIndex) => - validatedIndex.validity === 'valid' - ? validatedIndex.datasetFilter - : { type: 'includeAll' as const } - ) - .reduce(combineDatasetFilters, { type: 'includeAll' as const }), - [validatedIndices] - ); - - const [validateIndicesRequest, validateIndices] = useTrackedPromise( - { - cancelPreviousOn: 'resolution', - createPromise: async () => { - return await validateSetupIndices( - sourceConfiguration.indices, - sourceConfiguration.timestampField - ); - }, - onResolve: ({ data: { errors } }) => { - updateIndicesWithValidationErrors(errors); - }, - onReject: () => { - setValidatedIndices([]); - }, - }, - [sourceConfiguration.indices, sourceConfiguration.timestampField] - ); - - const [validateDatasetsRequest, validateDatasets] = useTrackedPromise( - { - cancelPreviousOn: 'resolution', - createPromise: async () => { - if (validIndexNames.length === 0) { - return { data: { datasets: [] } }; - } - - return await validateSetupDatasets( - validIndexNames, - sourceConfiguration.timestampField, - startTime ?? 0, - endTime ?? Date.now() - ); - }, - onResolve: ({ data: { datasets } }) => { - updateIndicesWithAvailableDatasets(datasets); - }, - }, - [validIndexNames, sourceConfiguration.timestampField, startTime, endTime] - ); - - const setUp = useCallback(() => { - return setUpModule(selectedIndexNames, startTime, endTime, datasetFilter); - }, [setUpModule, selectedIndexNames, startTime, endTime, datasetFilter]); - - const cleanUpAndSetUp = useCallback(() => { - return cleanUpAndSetUpModule(selectedIndexNames, startTime, endTime, datasetFilter); - }, [cleanUpAndSetUpModule, selectedIndexNames, startTime, endTime, datasetFilter]); - - const isValidating = useMemo( - () => validateIndicesRequest.state === 'pending' || validateDatasetsRequest.state === 'pending', - [validateDatasetsRequest.state, validateIndicesRequest.state] - ); - - const validationErrors = useMemo(() => { - if (isValidating) { - return []; - } - - return [ - // validate request status - ...(validateIndicesRequest.state === 'rejected' || - validateDatasetsRequest.state === 'rejected' - ? [{ error: 'NETWORK_ERROR' as const }] - : []), - // validation request results - ...validatedIndices.reduce((errors, index) => { - return index.validity === 'invalid' && selectedIndexNames.includes(index.name) - ? [...errors, ...index.errors] - : errors; - }, []), - // index count - ...(selectedIndexNames.length === 0 ? [{ error: 'TOO_FEW_SELECTED_INDICES' as const }] : []), - // time range - ...(!isTimeRangeValid ? [{ error: 'INVALID_TIME_RANGE' as const }] : []), - ]; - }, [ - isValidating, - validateIndicesRequest.state, - validateDatasetsRequest.state, - validatedIndices, - selectedIndexNames, - isTimeRangeValid, - ]); - - const prevStartTime = usePrevious(startTime); - const prevEndTime = usePrevious(endTime); - const prevValidIndexNames = usePrevious(validIndexNames); - - useEffect(() => { - if (!isTimeRangeValid) { - return; - } - - validateIndices(); - }, [isTimeRangeValid, validateIndices]); - - useEffect(() => { - if (!isTimeRangeValid) { - return; - } - - if ( - startTime !== prevStartTime || - endTime !== prevEndTime || - !isEqual(validIndexNames, prevValidIndexNames) - ) { - validateDatasets(); - } - }, [ - endTime, - isTimeRangeValid, - prevEndTime, - prevStartTime, - prevValidIndexNames, - startTime, - validIndexNames, - validateDatasets, - ]); - - return { - cleanUpAndSetUp, - datasetFilter, - endTime, - isValidating, - selectedIndexNames, - setEndTime, - setStartTime, - setUp, - startTime, - validatedIndices, - setValidatedIndices, - validationErrors, - }; -}; diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts index cec87fb1144e..7ea87c3d2132 100644 --- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts +++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_hosts/module_descriptor.ts @@ -10,17 +10,27 @@ import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup'; import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api'; import { callGetMlModuleAPI } from '../../api/ml_get_module'; import { callSetupMlModuleAPI } from '../../api/ml_setup_module_api'; -import { callValidateIndicesAPI } from '../../../logs/log_analysis/api/validate_indices'; -import { callValidateDatasetsAPI } from '../../../logs/log_analysis/api/validate_datasets'; import { metricsHostsJobTypes, getJobId, MetricsHostsJobType, DatasetFilter, bucketSpan, - partitionField, } from '../../../../../common/infra_ml'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_memory_usage.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_memory_usage.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_in.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_in.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/hosts_network_out.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_hosts/ml/datafeed_hosts_network_out.json'; +type JobType = 'hosts_memory_usage' | 'hosts_network_in' | 'hosts_network_out'; const moduleId = 'metrics_ui_hosts'; const moduleName = i18n.translate('xpack.infra.ml.metricsModuleName', { defaultMessage: 'Metrics anomanly detection', @@ -54,23 +64,68 @@ const setUpModule = async ( end: number | undefined, datasetFilter: DatasetFilter, { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration, - pField?: string + partitionField?: string ) => { const indexNamePattern = indices.join(','); - const jobIds = ['hosts_memory_usage', 'hosts_network_in', 'hosts_network_out']; - const jobOverrides = jobIds.map((id) => ({ - job_id: id, - data_description: { - time_field: timestampField, - }, - custom_settings: { - metrics_source_config: { - indexPattern: indexNamePattern, - timestampField, - bucketSpan, + const jobIds: JobType[] = ['hosts_memory_usage', 'hosts_network_in', 'hosts_network_out']; + + const jobOverrides = jobIds.map((id) => { + const { job: defaultJobConfig } = getDefaultJobConfigs(id); + + // eslint-disable-next-line @typescript-eslint/naming-convention + const analysis_config: any = { + ...defaultJobConfig.analysis_config, + }; + + if (partitionField) { + analysis_config.detectors[0].partition_field_name = partitionField; + if (analysis_config.influencers.indexOf(partitionField) === -1) { + analysis_config.influencers.push(partitionField); + } + } + + return { + job_id: id, + data_description: { + time_field: timestampField, + }, + analysis_config, + custom_settings: { + metrics_source_config: { + indexPattern: indexNamePattern, + timestampField, + bucketSpan, + }, + }, + }; + }); + + const datafeedOverrides = jobIds.map((id) => { + const { datafeed: defaultDatafeedConfig } = getDefaultJobConfigs(id); + + if (!partitionField || id === 'hosts_memory_usage') { + // Since the host memory usage doesn't have custom aggs, we don't need to do anything to add a partition field + return defaultDatafeedConfig; + } + + // If we have a partition field, we need to change the aggregation to do a terms agg at the top level + const aggregations = { + [partitionField]: { + terms: { + field: partitionField, + }, + aggregations: { + ...defaultDatafeedConfig.aggregations, + }, }, - }, - })); + }; + + return { + ...defaultDatafeedConfig, + job_id: id, + aggregations, + }; + }); return callSetupMlModuleAPI( moduleId, @@ -80,34 +135,32 @@ const setUpModule = async ( sourceId, indexNamePattern, jobOverrides, - [] + datafeedOverrides ); }; -const cleanUpModule = async (spaceId: string, sourceId: string) => { - return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsHostsJobTypes); -}; - -const validateSetupIndices = async (indices: string[], timestampField: string) => { - return await callValidateIndicesAPI(indices, [ - { - name: timestampField, - validTypes: ['date'], - }, - { - name: partitionField, - validTypes: ['keyword'], - }, - ]); +const getDefaultJobConfigs = (jobId: JobType): { datafeed: any; job: any } => { + switch (jobId) { + case 'hosts_memory_usage': + return { + datafeed: MemoryDatafeed, + job: MemoryJob, + }; + case 'hosts_network_in': + return { + datafeed: NetworkInDatafeed, + job: NetworkInJob, + }; + case 'hosts_network_out': + return { + datafeed: NetworkOutDatafeed, + job: NetworkOutJob, + }; + } }; -const validateSetupDatasets = async ( - indices: string[], - timestampField: string, - startTime: number, - endTime: number -) => { - return await callValidateDatasetsAPI(indices, timestampField, startTime, endTime); +const cleanUpModule = async (spaceId: string, sourceId: string) => { + return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsHostsJobTypes); }; export const metricHostsModule: ModuleDescriptor = { @@ -121,6 +174,4 @@ export const metricHostsModule: ModuleDescriptor = { getModuleDefinition, setUpModule, cleanUpModule, - validateSetupDatasets, - validateSetupIndices, }; diff --git a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts index cbcff1c307af..eaf7489c84eb 100644 --- a/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts +++ b/x-pack/plugins/infra/public/containers/ml/modules/metrics_k8s/module_descriptor.ts @@ -10,17 +10,28 @@ import { cleanUpJobsAndDatafeeds } from '../../infra_ml_cleanup'; import { callJobsSummaryAPI } from '../../api/ml_get_jobs_summary_api'; import { callGetMlModuleAPI } from '../../api/ml_get_module'; import { callSetupMlModuleAPI } from '../../api/ml_setup_module_api'; -import { callValidateIndicesAPI } from '../../../logs/log_analysis/api/validate_indices'; -import { callValidateDatasetsAPI } from '../../../logs/log_analysis/api/validate_datasets'; import { metricsK8SJobTypes, getJobId, MetricK8sJobType, DatasetFilter, bucketSpan, - partitionField, } from '../../../../../common/infra_ml'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import MemoryJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_memory_usage.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import MemoryDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_memory_usage.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkInJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_in.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkInDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_in.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkOutJob from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/k8s_network_out.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import NetworkOutDatafeed from '../../../../../../ml/server/models/data_recognizer/modules/metrics_ui_k8s/ml/datafeed_k8s_network_out.json'; +type JobType = 'k8s_memory_usage' | 'k8s_network_in' | 'k8s_network_out'; +export const DEFAULT_K8S_PARTITION_FIELD = 'kubernetes.namespace'; const moduleId = 'metrics_ui_k8s'; const moduleName = i18n.translate('xpack.infra.ml.metricsModuleName', { defaultMessage: 'Metrics anomanly detection', @@ -54,26 +65,72 @@ const setUpModule = async ( end: number | undefined, datasetFilter: DatasetFilter, { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration, - pField?: string + partitionField?: string ) => { const indexNamePattern = indices.join(','); - const jobIds = ['k8s_memory_usage', 'k8s_network_in', 'k8s_network_out']; - const jobOverrides = jobIds.map((id) => ({ - job_id: id, - analysis_config: { - bucket_span: `${bucketSpan}ms`, - }, - data_description: { - time_field: timestampField, - }, - custom_settings: { - metrics_source_config: { - indexPattern: indexNamePattern, - timestampField, - bucketSpan, + const jobIds: JobType[] = ['k8s_memory_usage', 'k8s_network_in', 'k8s_network_out']; + const jobOverrides = jobIds.map((id) => { + const { job: defaultJobConfig } = getDefaultJobConfigs(id); + + // eslint-disable-next-line @typescript-eslint/naming-convention + const analysis_config: any = { + ...defaultJobConfig.analysis_config, + }; + + if (partitionField) { + analysis_config.detectors[0].partition_field_name = partitionField; + if (analysis_config.influencers.indexOf(partitionField) === -1) { + analysis_config.influencers.push(partitionField); + } + } + + return { + job_id: id, + data_description: { + time_field: timestampField, + }, + analysis_config, + custom_settings: { + metrics_source_config: { + indexPattern: indexNamePattern, + timestampField, + bucketSpan, + }, + }, + }; + }); + + const datafeedOverrides = jobIds.map((id) => { + const { datafeed: defaultDatafeedConfig } = getDefaultJobConfigs(id); + + if (!partitionField || id === 'k8s_memory_usage') { + // Since the host memory usage doesn't have custom aggs, we don't need to do anything to add a partition field + return defaultDatafeedConfig; + } + + // Because the ML K8s jobs ship with a default partition field of {kubernetes.namespace}, ignore that agg and wrap it in our own agg. + const innerAggregation = + defaultDatafeedConfig.aggregations[DEFAULT_K8S_PARTITION_FIELD].aggregations; + + // If we have a partition field, we need to change the aggregation to do a terms agg to partition the data at the top level + const aggregations = { + [partitionField]: { + terms: { + field: partitionField, + size: 25, // 25 is arbitratry and only used to keep the number of buckets to a managable level in the event that the user choose a high cardinality partition field. + }, + aggregations: { + ...innerAggregation, + }, }, - }, - })); + }; + + return { + ...defaultDatafeedConfig, + job_id: id, + aggregations, + }; + }); return callSetupMlModuleAPI( moduleId, @@ -83,34 +140,32 @@ const setUpModule = async ( sourceId, indexNamePattern, jobOverrides, - [] + datafeedOverrides ); }; -const cleanUpModule = async (spaceId: string, sourceId: string) => { - return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsK8SJobTypes); -}; - -const validateSetupIndices = async (indices: string[], timestampField: string) => { - return await callValidateIndicesAPI(indices, [ - { - name: timestampField, - validTypes: ['date'], - }, - { - name: partitionField, - validTypes: ['keyword'], - }, - ]); +const getDefaultJobConfigs = (jobId: JobType): { datafeed: any; job: any } => { + switch (jobId) { + case 'k8s_memory_usage': + return { + datafeed: MemoryDatafeed, + job: MemoryJob, + }; + case 'k8s_network_in': + return { + datafeed: NetworkInDatafeed, + job: NetworkInJob, + }; + case 'k8s_network_out': + return { + datafeed: NetworkOutDatafeed, + job: NetworkOutJob, + }; + } }; -const validateSetupDatasets = async ( - indices: string[], - timestampField: string, - startTime: number, - endTime: number -) => { - return await callValidateDatasetsAPI(indices, timestampField, startTime, endTime); +const cleanUpModule = async (spaceId: string, sourceId: string) => { + return await cleanUpJobsAndDatafeeds(spaceId, sourceId, metricsK8SJobTypes); }; export const metricHostsModule: ModuleDescriptor = { @@ -124,6 +179,4 @@ export const metricHostsModule: ModuleDescriptor = { getModuleDefinition, setUpModule, cleanUpModule, - validateSetupDatasets, - validateSetupIndices, }; diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx index b063713fa2c9..b5d224910e81 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/anomoly_detection_flyout.tsx @@ -50,10 +50,10 @@ export const AnomalyDetectionFlyout = () => { return ( <> - + {showFlyout && ( diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx index 801dff9c4a17..5b520084ebb7 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/flyout_home.tsx @@ -5,7 +5,7 @@ */ import React, { useState, useCallback, useEffect } from 'react'; -import { EuiFlyoutHeader, EuiTitle, EuiFlyoutBody, EuiTabs, EuiTab, EuiSpacer } from '@elastic/eui'; +import { EuiFlyoutHeader, EuiTitle, EuiFlyoutBody, EuiSpacer } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiText, EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; @@ -30,7 +30,7 @@ interface Props { } export const FlyoutHome = (props: Props) => { - const [tab, setTab] = useState<'jobs' | 'anomalies'>('jobs'); + const [tab] = useState<'jobs' | 'anomalies'>('jobs'); const { goToSetup } = props; const { fetchJobStatus: fetchHostJobStatus, @@ -56,18 +56,10 @@ export const FlyoutHome = (props: Props) => { goToSetup('kubernetes'); }, [goToSetup]); - const goToJobs = useCallback(() => { - setTab('jobs'); - }, []); - const jobIds = [ ...(k8sJobSummaries || []).map((k) => k.id), ...(hostJobSummaries || []).map((h) => h.id), ]; - const anomaliesUrl = useLinkProps({ - app: 'ml', - pathname: `/explorer?_g=${createResultsUrl(jobIds)}`, - }); useEffect(() => { if (hasInfraMLReadCapabilities) { @@ -105,30 +97,24 @@ export const FlyoutHome = (props: Props) => { - - - - - - - - +
+ +

+ +

+ +
+ {hostJobSummaries.length > 0 && ( <> 0} hasK8sJobs={k8sJobSummaries.length > 0} + jobIds={jobIds} /> @@ -151,6 +137,7 @@ export const FlyoutHome = (props: Props) => { interface CalloutProps { hasHostJobs: boolean; hasK8sJobs: boolean; + jobIds: string[]; } const JobsEnabledCallout = (props: CalloutProps) => { let target = ''; @@ -175,8 +162,34 @@ const JobsEnabledCallout = (props: CalloutProps) => { pathname: '/jobs', }); + const anomaliesUrl = useLinkProps({ + app: 'ml', + pathname: `/explorer?_g=${createResultsUrl(props.jobIds)}`, + }); + return ( <> + + + + + + + + + + + + + + + { } iconType="check" /> - - - - ); }; @@ -211,30 +217,11 @@ interface CreateJobTab { const CreateJobTab = (props: CreateJobTab) => { return ( <> -
- -

- -

- - -

- -

- -
- - + {/* */} } // title="Hosts" title={ @@ -245,7 +232,7 @@ const CreateJobTab = (props: CreateJobTab) => { } description={ } @@ -254,7 +241,7 @@ const CreateJobTab = (props: CreateJobTab) => { {props.hasHostJobs && ( @@ -262,7 +249,7 @@ const CreateJobTab = (props: CreateJobTab) => { {!props.hasHostJobs && ( @@ -273,7 +260,7 @@ const CreateJobTab = (props: CreateJobTab) => { } title={ { } description={ } @@ -292,7 +279,7 @@ const CreateJobTab = (props: CreateJobTab) => { {props.hasK8sJobs && ( @@ -300,7 +287,7 @@ const CreateJobTab = (props: CreateJobTab) => { {!props.hasK8sJobs && ( diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx index 428c002da638..c327d187f6bc 100644 --- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/ml/anomaly_detection/job_setup_screen.tsx @@ -20,6 +20,7 @@ import { useSourceViaHttp } from '../../../../../../containers/source/use_source import { useMetricK8sModuleContext } from '../../../../../../containers/ml/modules/metrics_k8s/module'; import { useMetricHostsModuleContext } from '../../../../../../containers/ml/modules/metrics_hosts/module'; import { FixedDatePicker } from '../../../../../../components/fixed_datepicker'; +import { DEFAULT_K8S_PARTITION_FIELD } from '../../../../../../containers/ml/modules/metrics_k8s/module_descriptor'; interface Props { jobType: 'hosts' | 'kubernetes'; @@ -107,7 +108,7 @@ export const JobSetupScreen = (props: Props) => { useEffect(() => { if (props.jobType === 'kubernetes') { - setPartitionField(['kubernetes.namespace']); + setPartitionField([DEFAULT_K8S_PARTITION_FIELD]); } }, [props.jobType]); From 6c015cfbef12189eb5aec8fa42f5ea2743be2971 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Thu, 1 Oct 2020 19:04:26 -0600 Subject: [PATCH 12/73] Convert VectorLayer to typescript (#78490) * [maps] convert VectorLayer to TS * more tslint fixes * clean up * more tslint fixes * more tslint fixes * remove unneeded casts * remove unneeded VectorStyle casts * revert changes to layer.getQuery * fix * update tile layer constructor * review feedback Co-authored-by: Elastic Machine --- .../data_request_descriptor_types.ts | 19 +- .../common/descriptor_types/map_descriptor.ts | 2 +- .../common/elasticsearch_util/es_agg_utils.ts | 4 +- .../public/actions/data_request_actions.ts | 2 +- .../maps/public/classes/joins/inner_join.d.ts | 23 +- .../plugins/maps/public/classes/joins/join.ts | 32 +- .../blended_vector_layer.ts | 11 +- .../layers/heatmap_layer/heatmap_layer.js | 12 + .../maps/public/classes/layers/layer.test.ts | 6 - .../maps/public/classes/layers/layer.tsx | 19 +- .../classes/layers/tile_layer/tile_layer.js | 15 +- .../tiled_vector_layer/tiled_vector_layer.tsx | 43 +-- .../layers/vector_layer/vector_layer.d.ts | 85 ----- .../{vector_layer.js => vector_layer.tsx} | 291 ++++++++++++------ .../sources/es_agg_source/es_agg_source.ts | 2 +- .../es_geo_grid_source.d.ts | 9 +- .../es_geo_grid_source.test.ts | 3 +- .../classes/sources/es_source/es_source.d.ts | 48 ++- .../classes/sources/es_source/es_source.js | 15 +- .../es_term_source/es_term_source.d.ts | 13 +- .../sources/es_term_source/es_term_source.js | 4 +- .../kibana_regionmap_source.js | 1 + .../mvt_single_layer_vector_source.tsx | 14 +- .../sources/vector_source/vector_source.d.ts | 28 +- .../classes/styles/vector/vector_style.tsx | 55 +++- .../toc_entry_actions_popover.test.tsx | 14 +- 26 files changed, 478 insertions(+), 292 deletions(-) delete mode 100644 x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts rename x-pack/plugins/maps/public/classes/layers/vector_layer/{vector_layer.js => vector_layer.tsx} (78%) diff --git a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts index f3521cca2e45..16b60492c9b7 100644 --- a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts +++ b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts @@ -38,15 +38,21 @@ export type VectorSourceRequestMeta = MapFilters & { applyGlobalQuery: boolean; fieldNames: string[]; geogridPrecision?: number; - sourceQuery: MapQuery; + sourceQuery?: MapQuery; sourceMeta: VectorSourceSyncMeta; }; +export type VectorJoinSourceRequestMeta = MapFilters & { + applyGlobalQuery: boolean; + fieldNames: string[]; + sourceQuery: MapQuery; +}; + export type VectorStyleRequestMeta = MapFilters & { dynamicStyleFields: string[]; isTimeAware: boolean; sourceQuery: MapQuery; - timeFilters: unknown; + timeFilters: TimeRange; }; export type ESSearchSourceResponseMeta = { @@ -59,9 +65,12 @@ export type ESSearchSourceResponseMeta = { }; // Partial because objects are justified downstream in constructors -export type DataMeta = Partial & - Partial & - Partial; +export type DataMeta = Partial< + VectorSourceRequestMeta & + VectorJoinSourceRequestMeta & + VectorStyleRequestMeta & + ESSearchSourceResponseMeta +>; type NumericalStyleFieldData = { avg: number; diff --git a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts index d064dfb1c4a3..b769b125cf0f 100644 --- a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts +++ b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts @@ -17,7 +17,7 @@ export type MapExtent = { }; export type MapQuery = Query & { - queryLastTriggeredAt: string; + queryLastTriggeredAt?: string; }; export type MapRefreshConfig = { diff --git a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts index 7828c3cc6410..f157ffe9f1c8 100644 --- a/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts +++ b/x-pack/plugins/maps/common/elasticsearch_util/es_agg_utils.ts @@ -33,8 +33,10 @@ export function addFieldToDSL(dsl: object, field: IFieldType) { }; } +export type BucketProperties = Record; + export function extractPropertiesFromBucket(bucket: any, ignoreKeys: string[] = []) { - const properties: Record = {}; + const properties: BucketProperties = {}; for (const key in bucket) { if (ignoreKeys.includes(key) || !bucket.hasOwnProperty(key)) { continue; diff --git a/x-pack/plugins/maps/public/actions/data_request_actions.ts b/x-pack/plugins/maps/public/actions/data_request_actions.ts index 14d819690050..d7d9259e1539 100644 --- a/x-pack/plugins/maps/public/actions/data_request_actions.ts +++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts @@ -47,7 +47,7 @@ const FIT_TO_BOUNDS_SCALE_FACTOR = 0.1; export type DataRequestContext = { startLoading(dataId: string, requestToken: symbol, meta: DataMeta): void; - stopLoading(dataId: string, requestToken: symbol, data: object, meta: DataMeta): void; + stopLoading(dataId: string, requestToken: symbol, data: object, meta?: DataMeta): void; onLoadError(dataId: string, requestToken: symbol, errorMessage: string): void; updateSourceData(newData: unknown): void; isRequestStillActive(dataId: string, requestToken: symbol): boolean; diff --git a/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts b/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts index befff0965fb7..3e2ceac4971c 100644 --- a/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts +++ b/x-pack/plugins/maps/public/classes/joins/inner_join.d.ts @@ -4,19 +4,40 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Feature, GeoJsonProperties } from 'geojson'; import { IESTermSource } from '../sources/es_term_source'; -import { IJoin } from './join'; +import { IJoin, PropertiesMap } from './join'; import { JoinDescriptor } from '../../../common/descriptor_types'; import { ISource } from '../sources/source'; +import { ITooltipProperty } from '../tooltips/tooltip_property'; +import { IField } from '../fields/field'; export class InnerJoin implements IJoin { constructor(joinDescriptor: JoinDescriptor, leftSource: ISource); + destroy: () => void; + getRightJoinSource(): IESTermSource; toDescriptor(): JoinDescriptor; + getJoinFields: () => IField[]; + + getLeftField: () => IField; + + getIndexPatternIds: () => string[]; + + getQueryableIndexPatternIds: () => string[]; + + getSourceDataRequestId: () => string; + getSourceMetaDataRequestId(): string; getSourceFormattersDataRequestId(): string; + + getTooltipProperties(properties: GeoJsonProperties): Promise; + + hasCompleteConfig: () => boolean; + + joinPropertiesToFeature: (feature: Feature, propertiesMap?: PropertiesMap) => boolean; } diff --git a/x-pack/plugins/maps/public/classes/joins/join.ts b/x-pack/plugins/maps/public/classes/joins/join.ts index 5bcc4bfdec87..df6f6f684f4d 100644 --- a/x-pack/plugins/maps/public/classes/joins/join.ts +++ b/x-pack/plugins/maps/public/classes/joins/join.ts @@ -4,15 +4,39 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Feature, GeoJsonProperties } from 'geojson'; import { IESTermSource } from '../sources/es_term_source'; import { JoinDescriptor } from '../../../common/descriptor_types'; +import { ITooltipProperty } from '../tooltips/tooltip_property'; +import { IField } from '../fields/field'; +import { BucketProperties } from '../../../common/elasticsearch_util'; + +export type PropertiesMap = Map; export interface IJoin { - getRightJoinSource(): IESTermSource; + destroy: () => void; + + getRightJoinSource: () => IESTermSource; + + toDescriptor: () => JoinDescriptor; + + getJoinFields: () => IField[]; + + getLeftField: () => IField; + + getIndexPatternIds: () => string[]; + + getQueryableIndexPatternIds: () => string[]; + + getSourceDataRequestId: () => string; + + getSourceMetaDataRequestId: () => string; + + getSourceFormattersDataRequestId: () => string; - toDescriptor(): JoinDescriptor; + getTooltipProperties: (properties: GeoJsonProperties) => Promise; - getSourceMetaDataRequestId(): string; + hasCompleteConfig: () => boolean; - getSourceFormattersDataRequestId(): string; + joinPropertiesToFeature: (feature: Feature, propertiesMap?: PropertiesMap) => boolean; } diff --git a/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts b/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts index 90e8d25a7795..9b6a67ac28ad 100644 --- a/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts +++ b/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts @@ -37,7 +37,6 @@ import { LayerDescriptor, VectorLayerDescriptor, } from '../../../../common/descriptor_types'; -import { IStyle } from '../../styles/style'; import { IVectorSource } from '../../sources/vector_source'; const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID'; @@ -257,7 +256,7 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer { return clonedDescriptor; } - getSource() { + getSource(): IVectorSource { return this._isClustered ? this._clusterSource : this._documentSource; } @@ -268,11 +267,11 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer { return this._documentSource; } - getCurrentStyle(): IStyle { + getCurrentStyle(): IVectorStyle { return this._isClustered ? this._clusterStyle : this._documentStyle; } - getStyleForEditing(): IStyle { + getStyleForEditing(): IVectorStyle { return this._documentStyle; } @@ -281,8 +280,8 @@ export class BlendedVectorLayer extends VectorLayer implements IVectorLayer { const requestToken = Symbol(`layer-active-count:${this.getId()}`); const searchFilters = this._getSearchFilters( syncContext.dataFilters, - this.getSource() as IVectorSource, - this.getCurrentStyle() as IVectorStyle + this.getSource(), + this.getCurrentStyle() ); const canSkipFetch = await canSkipSourceUpdate({ source: this.getSource(), diff --git a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js index adcc86b9d154..33e82db79f3c 100644 --- a/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js @@ -31,6 +31,18 @@ export class HeatmapLayer extends VectorLayer { } } + getStyleForEditing() { + return this._style; + } + + getStyle() { + return this._style; + } + + getCurrentStyle() { + return this._style; + } + _getPropKeyOfSelectedMetric() { const metricfields = this.getSource().getMetricFields(); return metricfields[0].getName(); diff --git a/x-pack/plugins/maps/public/classes/layers/layer.test.ts b/x-pack/plugins/maps/public/classes/layers/layer.test.ts index 7bc91d71f83e..76df7c2af840 100644 --- a/x-pack/plugins/maps/public/classes/layers/layer.test.ts +++ b/x-pack/plugins/maps/public/classes/layers/layer.test.ts @@ -7,7 +7,6 @@ import { AbstractLayer } from './layer'; import { ISource } from '../sources/source'; -import { IStyle } from '../styles/style'; import { AGG_TYPE, FIELD_ORIGIN, LAYER_STYLE_TYPE, VECTOR_STYLES } from '../../../common/constants'; import { ESTermSourceDescriptor, VectorStyleDescriptor } from '../../../common/descriptor_types'; import { getDefaultDynamicProperties } from '../styles/vector/vector_style_defaults'; @@ -38,8 +37,6 @@ class MockSource { } } -class MockStyle {} - describe('cloneDescriptor', () => { describe('with joins', () => { const styleDescriptor = { @@ -84,7 +81,6 @@ describe('cloneDescriptor', () => { const layer = new MockLayer({ layerDescriptor, source: (new MockSource() as unknown) as ISource, - style: (new MockStyle() as unknown) as IStyle, }); const clonedDescriptor = await layer.cloneDescriptor(); const clonedStyleProps = (clonedDescriptor.style as VectorStyleDescriptor).properties; @@ -122,7 +118,6 @@ describe('cloneDescriptor', () => { const layer = new MockLayer({ layerDescriptor, source: (new MockSource() as unknown) as ISource, - style: (new MockStyle() as unknown) as IStyle, }); const clonedDescriptor = await layer.cloneDescriptor(); const clonedStyleProps = (clonedDescriptor.style as VectorStyleDescriptor).properties; @@ -165,7 +160,6 @@ describe('isFittable', () => { const layer = new MockLayer({ layerDescriptor, source: (new MockSource({ fitToBounds: test.fitToBounds }) as unknown) as ISource, - style: (new MockStyle() as unknown) as IStyle, }); expect(await layer.isFittable()).toBe(test.canFit); }); diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx index cd720063c670..d6bd5180375c 100644 --- a/x-pack/plugins/maps/public/classes/layers/layer.tsx +++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx @@ -110,13 +110,11 @@ export type CustomIconAndTooltipContent = { export interface ILayerArguments { layerDescriptor: LayerDescriptor; source: ISource; - style: IStyle; } export class AbstractLayer implements ILayer { protected readonly _descriptor: LayerDescriptor; protected readonly _source: ISource; - protected readonly _style: IStyle; protected readonly _dataRequests: DataRequest[]; static createDescriptor(options: Partial): LayerDescriptor { @@ -140,10 +138,9 @@ export class AbstractLayer implements ILayer { } } - constructor({ layerDescriptor, source, style }: ILayerArguments) { + constructor({ layerDescriptor, source }: ILayerArguments) { this._descriptor = AbstractLayer.createDescriptor(layerDescriptor); this._source = source; - this._style = style; if (this._descriptor.__dataRequests) { this._dataRequests = this._descriptor.__dataRequests.map( (dataRequest) => new DataRequest(dataRequest) @@ -257,11 +254,15 @@ export class AbstractLayer implements ILayer { } getStyleForEditing(): IStyle { - return this._style; + throw new Error('Should implement AbstractLayer#getStyleForEditing'); } - getStyle() { - return this._style; + getStyle(): IStyle { + throw new Error('Should implement AbstractLayer#getStyle'); + } + + getCurrentStyle(): IStyle { + throw new Error('Should implement AbstractLayer#getCurrentStyle'); } getLabel(): string { @@ -412,10 +413,6 @@ export class AbstractLayer implements ILayer { return this._descriptor.query ? this._descriptor.query : null; } - getCurrentStyle(): IStyle { - return this._style; - } - async getImmutableSourceProperties() { const source = this.getSource(); return await source.getImmutableProperties(); diff --git a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js index 3e2009c24a2e..fa60017f0eaf 100644 --- a/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js @@ -21,7 +21,20 @@ export class TileLayer extends AbstractLayer { } constructor({ source, layerDescriptor }) { - super({ source, layerDescriptor, style: new TileStyle() }); + super({ source, layerDescriptor }); + this._style = new TileStyle(); + } + + getStyleForEditing() { + return this._style; + } + + getStyle() { + return this._style; + } + + getCurrentStyle() { + return this._style; } async syncData({ startLoading, stopLoading, onLoadError, dataFilters }) { diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx index 70bf8ea3883b..68b9f2931f39 100644 --- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx +++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx @@ -5,9 +5,14 @@ */ import React from 'react'; +import { + Map as MbMap, + GeoJSONSource as MbGeoJSONSource, + VectorSource as MbVectorSource, +} from 'mapbox-gl'; import { EuiIcon } from '@elastic/eui'; import { Feature } from 'geojson'; -import { VectorStyle } from '../../styles/vector/vector_style'; +import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style'; import { SOURCE_DATA_REQUEST_ID, LAYER_TYPE } from '../../../../common/constants'; import { VectorLayer, VectorLayerArguments } from '../vector_layer/vector_layer'; import { ITiledSingleLayerVectorSource } from '../../sources/vector_source'; @@ -59,7 +64,7 @@ export class TiledVectorLayer extends VectorLayer { const searchFilters: VectorSourceRequestMeta = this._getSearchFilters( dataFilters, this.getSource(), - this._style + this._style as IVectorStyle ); const prevDataRequest = this.getSourceDataRequest(); @@ -88,13 +93,12 @@ export class TiledVectorLayer extends VectorLayer { } async syncData(syncContext: DataRequestContext) { - await this._syncSourceStyleMeta(syncContext, this._source, this._style); - await this._syncSourceFormatters(syncContext, this._source, this._style); + await this._syncSourceStyleMeta(syncContext, this._source, this._style as IVectorStyle); + await this._syncSourceFormatters(syncContext, this._source, this._style as IVectorStyle); await this._syncMVTUrlTemplate(syncContext); } - _syncSourceBindingWithMb(mbMap: unknown) { - // @ts-expect-error + _syncSourceBindingWithMb(mbMap: MbMap) { const mbSource = mbMap.getSource(this._getMbSourceId()); if (mbSource) { return; @@ -113,7 +117,6 @@ export class TiledVectorLayer extends VectorLayer { } const mbSourceId = this._getMbSourceId(); - // @ts-expect-error mbMap.addSource(mbSourceId, { type: 'vector', tiles: [sourceMeta.urlTemplate], @@ -126,7 +129,7 @@ export class TiledVectorLayer extends VectorLayer { return this._getMbSourceId() === mbSourceId; } - _syncStylePropertiesWithMb(mbMap: unknown) { + _syncStylePropertiesWithMb(mbMap: MbMap) { // @ts-ignore const mbSource = mbMap.getSource(this._getMbSourceId()); if (!mbSource) { @@ -146,12 +149,16 @@ export class TiledVectorLayer extends VectorLayer { this._setMbLinePolygonProperties(mbMap, sourceMeta.layerName); } - _requiresPrevSourceCleanup(mbMap: unknown): boolean { - // @ts-expect-error - const mbTileSource = mbMap.getSource(this._getMbSourceId()); - if (!mbTileSource) { + _requiresPrevSourceCleanup(mbMap: MbMap): boolean { + const mbSource = mbMap.getSource(this._getMbSourceId()) as MbVectorSource | MbGeoJSONSource; + if (!mbSource) { return false; } + if (!('tiles' in mbSource)) { + // Expected source is not compatible, so remove. + return true; + } + const mbTileSource = mbSource as MbVectorSource; const dataRequest = this.getSourceDataRequest(); if (!dataRequest) { @@ -163,13 +170,8 @@ export class TiledVectorLayer extends VectorLayer { return false; } - if (!mbTileSource.tiles) { - // Expected source is not compatible, so remove. - return true; - } - const isSourceDifferent = - mbTileSource.tiles[0] !== tiledSourceMeta.urlTemplate || + mbTileSource.tiles?.[0] !== tiledSourceMeta.urlTemplate || mbTileSource.minzoom !== tiledSourceMeta.minSourceZoom || mbTileSource.maxzoom !== tiledSourceMeta.maxSourceZoom; @@ -179,9 +181,8 @@ export class TiledVectorLayer extends VectorLayer { const layerIds = this.getMbLayerIds(); for (let i = 0; i < layerIds.length; i++) { - // @ts-expect-error const mbLayer = mbMap.getLayer(layerIds[i]); - if (mbLayer && mbLayer.sourceLayer !== tiledSourceMeta.layerName) { + if (mbLayer && mbLayer['source-layer'] !== tiledSourceMeta.layerName) { // If the source-pointer of one of the layers is stale, they will all be stale. // In this case, all the mb-layers need to be removed and re-added. return true; @@ -191,7 +192,7 @@ export class TiledVectorLayer extends VectorLayer { return false; } - syncLayerWithMB(mbMap: unknown) { + syncLayerWithMB(mbMap: MbMap) { this._removeStaleMbSourcesAndLayers(mbMap); this._syncSourceBindingWithMb(mbMap); this._syncStylePropertiesWithMb(mbMap); diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts deleted file mode 100644 index fa614ae87b29..000000000000 --- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts +++ /dev/null @@ -1,85 +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. - */ -/* eslint-disable @typescript-eslint/consistent-type-definitions */ - -import { Feature, GeoJsonProperties } from 'geojson'; -import { AbstractLayer } from '../layer'; -import { IVectorSource } from '../../sources/vector_source'; -import { - MapFilters, - VectorLayerDescriptor, - VectorSourceRequestMeta, -} from '../../../../common/descriptor_types'; -import { ILayer } from '../layer'; -import { IJoin } from '../../joins/join'; -import { IVectorStyle } from '../../styles/vector/vector_style'; -import { IField } from '../../fields/field'; -import { DataRequestContext } from '../../../actions'; -import { ITooltipProperty } from '../../tooltips/tooltip_property'; - -export type VectorLayerArguments = { - source: IVectorSource; - joins?: IJoin[]; - layerDescriptor: VectorLayerDescriptor; -}; - -export interface IVectorLayer extends ILayer { - getFields(): Promise; - getStyleEditorFields(): Promise; - getJoins(): IJoin[]; - getValidJoins(): IJoin[]; - getSource(): IVectorSource; - getFeatureById(id: string | number): Feature | null; - getPropertiesForTooltip(properties: GeoJsonProperties): Promise; - hasJoins(): boolean; -} - -export class VectorLayer extends AbstractLayer implements IVectorLayer { - static type: string; - - protected readonly _style: IVectorStyle; - static createDescriptor( - options: Partial, - mapColors?: string[] - ): VectorLayerDescriptor; - - constructor(options: VectorLayerArguments); - getLayerTypeIconName(): string; - getFields(): Promise; - getStyleEditorFields(): Promise; - getJoins(): IJoin[]; - getValidJoins(): IJoin[]; - _syncSourceStyleMeta( - syncContext: DataRequestContext, - source: IVectorSource, - style: IVectorStyle - ): Promise; - _syncSourceFormatters( - syncContext: DataRequestContext, - source: IVectorSource, - style: IVectorStyle - ): Promise; - syncLayerWithMB(mbMap: unknown): void; - _getSearchFilters( - dataFilters: MapFilters, - source: IVectorSource, - style: IVectorStyle - ): VectorSourceRequestMeta; - _syncData( - syncContext: DataRequestContext, - source: IVectorSource, - style: IVectorStyle - ): Promise; - ownsMbSourceId(sourceId: string): boolean; - ownsMbLayerId(sourceId: string): boolean; - _setMbPointsProperties(mbMap: unknown, mvtSourceLayer?: string): void; - _setMbLinePolygonProperties(mbMap: unknown, mvtSourceLayer?: string): void; - getSource(): IVectorSource; - getFeatureById(id: string | number): Feature | null; - getPropertiesForTooltip(properties: GeoJsonProperties): Promise; - hasJoins(): boolean; - isFittable(): Promise; -} diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx similarity index 78% rename from x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js rename to x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx index 27c344b713a6..a2532d4e7b10 100644 --- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.tsx @@ -5,8 +5,13 @@ */ import React from 'react'; +import { Map as MbMap, Layer as MbLayer, GeoJSONSource as MbGeoJSONSource } from 'mapbox-gl'; +import { Feature, FeatureCollection, GeoJsonProperties } from 'geojson'; +import _ from 'lodash'; +import { EuiIcon } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; import { AbstractLayer } from '../layer'; -import { VectorStyle } from '../../styles/vector/vector_style'; +import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style'; import { FEATURE_ID_PROPERTY_NAME, SOURCE_DATA_REQUEST_ID, @@ -20,11 +25,9 @@ import { FIELD_ORIGIN, LAYER_STYLE_TYPE, KBN_TOO_MANY_FEATURES_IMAGE_ID, + FieldFormatter, } from '../../../../common/constants'; -import _ from 'lodash'; import { JoinTooltipProperty } from '../../tooltips/join_tooltip_property'; -import { EuiIcon } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; import { DataRequestAbortError } from '../../util/data_request'; import { canSkipSourceUpdate, @@ -39,15 +42,66 @@ import { getPointFilterExpression, } from '../../util/mb_filter_expressions'; +import { + DynamicStylePropertyOptions, + MapFilters, + MapQuery, + VectorLayerDescriptor, + VectorSourceRequestMeta, + VectorStyleRequestMeta, +} from '../../../../common/descriptor_types'; +import { IVectorSource } from '../../sources/vector_source'; +import { CustomIconAndTooltipContent, ILayer } from '../layer'; +import { IJoin, PropertiesMap } from '../../joins/join'; +import { IField } from '../../fields/field'; +import { DataRequestContext } from '../../../actions'; +import { ITooltipProperty } from '../../tooltips/tooltip_property'; +import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property'; +import { IESSource } from '../../sources/es_source'; + +interface SourceResult { + refreshed: boolean; + featureCollection?: FeatureCollection; +} + +interface JoinState { + dataHasChanged: boolean; + join: IJoin; + propertiesMap?: PropertiesMap; +} + +export interface VectorLayerArguments { + source: IVectorSource; + joins?: IJoin[]; + layerDescriptor: VectorLayerDescriptor; +} + +export interface IVectorLayer extends ILayer { + getFields(): Promise; + getStyleEditorFields(): Promise; + getJoins(): IJoin[]; + getValidJoins(): IJoin[]; + getSource(): IVectorSource; + getFeatureById(id: string | number): Feature | null; + getPropertiesForTooltip(properties: GeoJsonProperties): Promise; + hasJoins(): boolean; +} + export class VectorLayer extends AbstractLayer { static type = LAYER_TYPE.VECTOR; - static createDescriptor(options, mapColors) { + protected readonly _style: IVectorStyle; + private readonly _joins: IJoin[]; + + static createDescriptor( + options: Partial, + mapColors?: string[] + ): VectorLayerDescriptor { const layerDescriptor = super.createDescriptor(options); layerDescriptor.type = VectorLayer.type; if (!options.style) { - const styleProperties = VectorStyle.createDefaultStyleProperties(mapColors); + const styleProperties = VectorStyle.createDefaultStyleProperties(mapColors ? mapColors : []); layerDescriptor.style = VectorStyle.createDescriptor(styleProperties); } @@ -55,16 +109,31 @@ export class VectorLayer extends AbstractLayer { layerDescriptor.joins = []; } - return layerDescriptor; + return layerDescriptor as VectorLayerDescriptor; } - constructor({ layerDescriptor, source, joins = [] }) { - super({ layerDescriptor, source }); + constructor({ layerDescriptor, source, joins = [] }: VectorLayerArguments) { + super({ + layerDescriptor, + source, + }); this._joins = joins; - this._style = new VectorStyle(this._descriptor.style, source, this); + this._style = new VectorStyle(layerDescriptor.style, source, this); + } + + getSource(): IVectorSource { + return super.getSource() as IVectorSource; + } + + getStyleForEditing(): IVectorStyle { + return this._style; + } + + getStyle(): IVectorStyle { + return this._style; } - getStyle() { + getCurrentStyle(): IVectorStyle { return this._style; } @@ -108,7 +177,7 @@ export class VectorLayer extends AbstractLayer { return true; } - getCustomIconAndTooltipContent() { + getCustomIconAndTooltipContent(): CustomIconAndTooltipContent { const featureCollection = this._getSourceFeatureCollection(); const noResultsIcon = ; @@ -124,7 +193,7 @@ export class VectorLayer extends AbstractLayer { if ( this.getJoins().length && !featureCollection.features.some( - (feature) => feature.properties[FEATURE_VISIBLE_PROPERTY_NAME] + (feature) => feature.properties?.[FEATURE_VISIBLE_PROPERTY_NAME] ) ) { return { @@ -141,8 +210,8 @@ export class VectorLayer extends AbstractLayer { ); return { icon: this.getCurrentStyle().getIcon(), - tooltipContent: tooltipContent, - areResultsTrimmed: areResultsTrimmed, + tooltipContent, + areResultsTrimmed, }; } @@ -158,7 +227,12 @@ export class VectorLayer extends AbstractLayer { return this.getCurrentStyle().renderLegendDetails(); } - async getBounds({ startLoading, stopLoading, registerCancelCallback, dataFilters }) { + async getBounds({ + startLoading, + stopLoading, + registerCancelCallback, + dataFilters, + }: DataRequestContext) { const isStaticLayer = !this.getSource().isBoundsAware(); if (isStaticLayer || this.hasJoins()) { return getFeatureCollectionBounds(this._getSourceFeatureCollection(), this.hasJoins()); @@ -190,7 +264,7 @@ export class VectorLayer extends AbstractLayer { } finally { // Use stopLoading callback instead of onLoadError callback. // Function is loading bounds and not feature data. - stopLoading(SOURCE_BOUNDS_DATA_REQUEST_ID, requestToken, bounds, boundsFilters); + stopLoading(SOURCE_BOUNDS_DATA_REQUEST_ID, requestToken, bounds ? bounds : {}, boundsFilters); } return bounds; } @@ -205,7 +279,7 @@ export class VectorLayer extends AbstractLayer { } _getJoinFields() { - const joinFields = []; + const joinFields: IField[] = []; this.getValidJoins().forEach((join) => { const fields = join.getJoinFields(); joinFields.push(...fields); @@ -219,7 +293,7 @@ export class VectorLayer extends AbstractLayer { } async getStyleEditorFields() { - const sourceFields = await this.getSourceForEditing().getFields(); + const sourceFields = await (this.getSourceForEditing() as IVectorSource).getFields(); return [...sourceFields, ...this._getJoinFields()]; } @@ -246,7 +320,7 @@ export class VectorLayer extends AbstractLayer { onLoadError, registerCancelCallback, dataFilters, - }) { + }: { join: IJoin } & DataRequestContext): Promise { const joinSource = join.getRightJoinSource(); const sourceDataId = join.getSourceDataRequestId(); const requestToken = Symbol(`layer-join-refresh:${this.getId()} - ${sourceDataId}`); @@ -266,15 +340,15 @@ export class VectorLayer extends AbstractLayer { if (canSkipFetch) { return { dataHasChanged: false, - join: join, - propertiesMap: prevDataRequest.getData(), + join, + propertiesMap: prevDataRequest?.getData() as PropertiesMap, }; } try { startLoading(sourceDataId, requestToken, searchFilters); const leftSourceName = await this._source.getDisplayName(); - const { propertiesMap } = await joinSource.getPropertiesMap( + const propertiesMap = await joinSource.getPropertiesMap( searchFilters, leftSourceName, join.getLeftField().getName(), @@ -283,8 +357,8 @@ export class VectorLayer extends AbstractLayer { stopLoading(sourceDataId, requestToken, propertiesMap); return { dataHasChanged: true, - join: join, - propertiesMap: propertiesMap, + join, + propertiesMap, }; } catch (e) { if (!(e instanceof DataRequestAbortError)) { @@ -292,13 +366,12 @@ export class VectorLayer extends AbstractLayer { } return { dataHasChanged: true, - join: join, - propertiesMap: null, + join, }; } } - async _syncJoins(syncContext, style) { + async _syncJoins(syncContext: DataRequestContext, style: IVectorStyle) { const joinSyncs = this.getValidJoins().map(async (join) => { await this._syncJoinStyleMeta(syncContext, join, style); await this._syncJoinFormatters(syncContext, join, style); @@ -308,28 +381,37 @@ export class VectorLayer extends AbstractLayer { return await Promise.all(joinSyncs); } - _getSearchFilters(dataFilters, source, style) { + _getSearchFilters( + dataFilters: MapFilters, + source: IVectorSource, + style: IVectorStyle + ): VectorSourceRequestMeta { const fieldNames = [ ...source.getFieldNames(), ...(style.getType() === LAYER_STYLE_TYPE.VECTOR ? style.getSourceFieldNames() : []), ...this.getValidJoins().map((join) => join.getLeftField().getName()), ]; + const sourceQuery = this.getQuery() as MapQuery; return { ...dataFilters, fieldNames: _.uniq(fieldNames).sort(), geogridPrecision: source.getGeoGridPrecision(dataFilters.zoom), - sourceQuery: this.getQuery(), + sourceQuery: sourceQuery ? sourceQuery : undefined, applyGlobalQuery: source.getApplyGlobalQuery(), sourceMeta: source.getSyncMeta(), }; } - async _performInnerJoins(sourceResult, joinStates, updateSourceData) { - //should update the store if - //-- source result was refreshed - //-- any of the join configurations changed (joinState changed) - //-- visibility of any of the features has changed + async _performInnerJoins( + sourceResult: SourceResult, + joinStates: JoinState[], + updateSourceData: DataRequestContext['updateSourceData'] + ) { + // should update the store if + // -- source result was refreshed + // -- any of the join configurations changed (joinState changed) + // -- visibility of any of the features has changed let shouldUpdateStore = sourceResult.refreshed || joinStates.some((joinState) => joinState.dataHasChanged); @@ -338,8 +420,11 @@ export class VectorLayer extends AbstractLayer { return; } - for (let i = 0; i < sourceResult.featureCollection.features.length; i++) { - const feature = sourceResult.featureCollection.features[i]; + for (let i = 0; i < sourceResult.featureCollection!.features.length; i++) { + const feature = sourceResult.featureCollection!.features[i]; + if (!feature.properties) { + feature.properties = {}; + } const oldVisbility = feature.properties[FEATURE_VISIBLE_PROPERTY_NAME]; let isFeatureVisible = true; for (let j = 0; j < joinStates.length; j++) { @@ -364,7 +449,11 @@ export class VectorLayer extends AbstractLayer { } } - async _syncSource(syncContext, source, style) { + async _syncSource( + syncContext: DataRequestContext, + source: IVectorSource, + style: IVectorStyle + ): Promise { const { startLoading, stopLoading, @@ -385,7 +474,9 @@ export class VectorLayer extends AbstractLayer { if (canSkipFetch) { return { refreshed: false, - featureCollection: prevDataRequest.getData(), + featureCollection: prevDataRequest + ? (prevDataRequest.getData() as FeatureCollection) + : EMPTY_FEATURE_COLLECTION, }; } @@ -416,15 +507,20 @@ export class VectorLayer extends AbstractLayer { } } - async _syncSourceStyleMeta(syncContext, source, style) { + async _syncSourceStyleMeta( + syncContext: DataRequestContext, + source: IVectorSource, + style: IVectorStyle + ) { if (this.getCurrentStyle().getType() !== LAYER_STYLE_TYPE.VECTOR) { return; } + const sourceQuery = this.getQuery() as MapQuery; return this._syncStyleMeta({ source, style, - sourceQuery: this.getQuery(), + sourceQuery: sourceQuery ? sourceQuery : undefined, dataRequestId: SOURCE_META_DATA_REQUEST_ID, dynamicStyleProps: style.getDynamicPropertiesArray().filter((dynamicStyleProp) => { return ( @@ -436,7 +532,7 @@ export class VectorLayer extends AbstractLayer { }); } - async _syncJoinStyleMeta(syncContext, join, style) { + async _syncJoinStyleMeta(syncContext: DataRequestContext, join: IJoin, style: IVectorStyle) { const joinSource = join.getRightJoinSource(); return this._syncStyleMeta({ source: joinSource, @@ -446,9 +542,7 @@ export class VectorLayer extends AbstractLayer { dynamicStyleProps: this.getCurrentStyle() .getDynamicPropertiesArray() .filter((dynamicStyleProp) => { - const matchingField = joinSource.getMetricFieldForName( - dynamicStyleProp.getField().getName() - ); + const matchingField = joinSource.getMetricFieldForName(dynamicStyleProp.getFieldName()); return ( dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN && !!matchingField && @@ -470,13 +564,19 @@ export class VectorLayer extends AbstractLayer { stopLoading, onLoadError, registerCancelCallback, - }) { + }: { + dataRequestId: string; + dynamicStyleProps: Array>; + source: IVectorSource; + sourceQuery?: MapQuery; + style: IVectorStyle; + } & DataRequestContext) { if (!source.isESSource() || dynamicStyleProps.length === 0) { return; } const dynamicStyleFields = dynamicStyleProps.map((dynamicStyleProp) => { - return `${dynamicStyleProp.getField().getName()}${dynamicStyleProp.getNumberOfCategories()}`; + return `${dynamicStyleProp.getFieldName()}${dynamicStyleProp.getNumberOfCategories()}`; }); const nextMeta = { @@ -484,7 +584,7 @@ export class VectorLayer extends AbstractLayer { sourceQuery, isTimeAware: this.getCurrentStyle().isTimeAware() && (await source.isTimeAware()), timeFilters: dataFilters.timeFilters, - }; + } as VectorStyleRequestMeta; const prevDataRequest = this.getDataRequest(dataRequestId); const canSkipFetch = canSkipStyleMetaUpdate({ prevDataRequest, nextMeta }); if (canSkipFetch) { @@ -496,14 +596,14 @@ export class VectorLayer extends AbstractLayer { startLoading(dataRequestId, requestToken, nextMeta); const layerName = await this.getDisplayName(source); - //todo: cast source to ESSource when migrating to TS - const styleMeta = await source.loadStylePropsMeta( + const styleMeta = await (source as IESSource).loadStylePropsMeta({ layerName, style, dynamicStyleProps, - registerCancelCallback.bind(null, requestToken), - nextMeta - ); + registerCancelCallback: registerCancelCallback.bind(null, requestToken), + sourceQuery: nextMeta.sourceQuery, + timeFilters: nextMeta.timeFilters, + }); stopLoading(dataRequestId, requestToken, styleMeta, nextMeta); } catch (error) { if (!(error instanceof DataRequestAbortError)) { @@ -512,7 +612,11 @@ export class VectorLayer extends AbstractLayer { } } - async _syncSourceFormatters(syncContext, source, style) { + async _syncSourceFormatters( + syncContext: DataRequestContext, + source: IVectorSource, + style: IVectorStyle + ) { if (style.getType() !== LAYER_STYLE_TYPE.VECTOR) { return; } @@ -526,13 +630,13 @@ export class VectorLayer extends AbstractLayer { return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.SOURCE; }) .map((dynamicStyleProp) => { - return dynamicStyleProp.getField(); + return dynamicStyleProp.getField()!; }), ...syncContext, }); } - async _syncJoinFormatters(syncContext, join, style) { + async _syncJoinFormatters(syncContext: DataRequestContext, join: IJoin, style: IVectorStyle) { const joinSource = join.getRightJoinSource(); return this._syncFormatters({ source: joinSource, @@ -540,19 +644,28 @@ export class VectorLayer extends AbstractLayer { fields: style .getDynamicPropertiesArray() .filter((dynamicStyleProp) => { - const matchingField = joinSource.getMetricFieldForName( - dynamicStyleProp.getField().getName() - ); + const matchingField = joinSource.getMetricFieldForName(dynamicStyleProp.getFieldName()); return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN && !!matchingField; }) .map((dynamicStyleProp) => { - return dynamicStyleProp.getField(); + return dynamicStyleProp.getField()!; }), ...syncContext, }); } - async _syncFormatters({ source, dataRequestId, fields, startLoading, stopLoading, onLoadError }) { + async _syncFormatters({ + source, + dataRequestId, + fields, + startLoading, + stopLoading, + onLoadError, + }: { + dataRequestId: string; + fields: IField[]; + source: IVectorSource; + } & DataRequestContext) { if (fields.length === 0) { return; } @@ -573,7 +686,7 @@ export class VectorLayer extends AbstractLayer { try { startLoading(dataRequestId, requestToken, nextMeta); - const formatters = {}; + const formatters: { [key: string]: FieldFormatter | null } = {}; const promises = fields .filter((field) => { return field.canValueBeFormatted(); @@ -589,7 +702,7 @@ export class VectorLayer extends AbstractLayer { } } - async syncData(syncContext) { + async syncData(syncContext: DataRequestContext) { await this._syncData(syncContext, this.getSource(), this.getCurrentStyle()); } @@ -603,7 +716,7 @@ export class VectorLayer extends AbstractLayer { // Given 1 above, which source/style to use can not be stored in Layer instance state. // Given 2 above, which source/style to use can not be pulled from data request state. // Therefore, source and style are provided as arugments and must be used instead of calling getSource or getCurrentStyle. - async _syncData(syncContext, source, style) { + async _syncData(syncContext: DataRequestContext, source: IVectorSource, style: IVectorStyle) { if (this.isLoadingBounds()) { return; } @@ -624,11 +737,11 @@ export class VectorLayer extends AbstractLayer { _getSourceFeatureCollection() { const sourceDataRequest = this.getSourceDataRequest(); - return sourceDataRequest ? sourceDataRequest.getData() : null; + return sourceDataRequest ? (sourceDataRequest.getData() as FeatureCollection) : null; } - _syncFeatureCollectionWithMb(mbMap) { - const mbGeoJSONSource = mbMap.getSource(this.getId()); + _syncFeatureCollectionWithMb(mbMap: MbMap) { + const mbGeoJSONSource = mbMap.getSource(this.getId()) as MbGeoJSONSource; const featureCollection = this._getSourceFeatureCollection(); const featureCollectionOnMap = AbstractLayer.getBoundDataForSource(mbMap, this.getId()); @@ -653,7 +766,7 @@ export class VectorLayer extends AbstractLayer { } } - _setMbPointsProperties(mbMap, mvtSourceLayer) { + _setMbPointsProperties(mbMap: MbMap, mvtSourceLayer?: string) { const pointLayerId = this._getMbPointLayerId(); const symbolLayerId = this._getMbSymbolLayerId(); const pointLayer = mbMap.getLayer(pointLayerId); @@ -689,12 +802,12 @@ export class VectorLayer extends AbstractLayer { } } - _setMbCircleProperties(mbMap, mvtSourceLayer) { + _setMbCircleProperties(mbMap: MbMap, mvtSourceLayer?: string) { const sourceId = this.getId(); const pointLayerId = this._getMbPointLayerId(); const pointLayer = mbMap.getLayer(pointLayerId); if (!pointLayer) { - const mbLayer = { + const mbLayer: MbLayer = { id: pointLayerId, type: 'circle', source: sourceId, @@ -710,7 +823,7 @@ export class VectorLayer extends AbstractLayer { const textLayerId = this._getMbTextLayerId(); const textLayer = mbMap.getLayer(textLayerId); if (!textLayer) { - const mbLayer = { + const mbLayer: MbLayer = { id: textLayerId, type: 'symbol', source: sourceId, @@ -740,13 +853,13 @@ export class VectorLayer extends AbstractLayer { }); } - _setMbSymbolProperties(mbMap, mvtSourceLayer) { + _setMbSymbolProperties(mbMap: MbMap, mvtSourceLayer?: string) { const sourceId = this.getId(); const symbolLayerId = this._getMbSymbolLayerId(); const symbolLayer = mbMap.getLayer(symbolLayerId); if (!symbolLayer) { - const mbLayer = { + const mbLayer: MbLayer = { id: symbolLayerId, type: 'symbol', source: sourceId, @@ -775,7 +888,7 @@ export class VectorLayer extends AbstractLayer { }); } - _setMbLinePolygonProperties(mbMap, mvtSourceLayer) { + _setMbLinePolygonProperties(mbMap: MbMap, mvtSourceLayer?: string) { const sourceId = this.getId(); const fillLayerId = this._getMbPolygonLayerId(); const lineLayerId = this._getMbLineLayerId(); @@ -783,7 +896,7 @@ export class VectorLayer extends AbstractLayer { const hasJoins = this.hasJoins(); if (!mbMap.getLayer(fillLayerId)) { - const mbLayer = { + const mbLayer: MbLayer = { id: fillLayerId, type: 'fill', source: sourceId, @@ -795,7 +908,7 @@ export class VectorLayer extends AbstractLayer { mbMap.addLayer(mbLayer); } if (!mbMap.getLayer(lineLayerId)) { - const mbLayer = { + const mbLayer: MbLayer = { id: lineLayerId, type: 'line', source: sourceId, @@ -807,7 +920,7 @@ export class VectorLayer extends AbstractLayer { mbMap.addLayer(mbLayer); } if (!mbMap.getLayer(tooManyFeaturesLayerId)) { - const mbLayer = { + const mbLayer: MbLayer = { id: tooManyFeaturesLayerId, type: 'fill', source: sourceId, @@ -855,12 +968,12 @@ export class VectorLayer extends AbstractLayer { mbMap.setLayerZoomRange(tooManyFeaturesLayerId, this.getMinZoom(), this.getMaxZoom()); } - _syncStylePropertiesWithMb(mbMap) { + _syncStylePropertiesWithMb(mbMap: MbMap) { this._setMbPointsProperties(mbMap); this._setMbLinePolygonProperties(mbMap); } - _syncSourceBindingWithMb(mbMap) { + _syncSourceBindingWithMb(mbMap: MbMap) { const mbSource = mbMap.getSource(this._getMbSourceId()); if (!mbSource) { mbMap.addSource(this._getMbSourceId(), { @@ -883,7 +996,7 @@ export class VectorLayer extends AbstractLayer { } } - syncLayerWithMB(mbMap) { + syncLayerWithMB(mbMap: MbMap) { this._syncSourceBindingWithMb(mbMap); this._syncFeatureCollectionWithMb(mbMap); this._syncStylePropertiesWithMb(mbMap); @@ -924,15 +1037,15 @@ export class VectorLayer extends AbstractLayer { ]; } - ownsMbLayerId(mbLayerId) { + ownsMbLayerId(mbLayerId: string) { return this.getMbLayerIds().includes(mbLayerId); } - ownsMbSourceId(mbSourceId) { + ownsMbSourceId(mbSourceId: string) { return this.getId() === mbSourceId; } - _addJoinsToSourceTooltips(tooltipsFromSource) { + _addJoinsToSourceTooltips(tooltipsFromSource: ITooltipProperty[]) { for (let i = 0; i < tooltipsFromSource.length; i++) { const tooltipProperty = tooltipsFromSource[i]; const matchingJoins = []; @@ -947,7 +1060,7 @@ export class VectorLayer extends AbstractLayer { } } - async getPropertiesForTooltip(properties) { + async getPropertiesForTooltip(properties: GeoJsonProperties) { const vectorSource = this.getSource(); let allProperties = await vectorSource.getTooltipProperties(properties); this._addJoinsToSourceTooltips(allProperties); @@ -961,18 +1074,20 @@ export class VectorLayer extends AbstractLayer { canShowTooltip() { return ( - this.isVisible() && (this.getSource().canFormatFeatureProperties() || this.getJoins().length) + this.isVisible() && + (this.getSource().canFormatFeatureProperties() || this.getJoins().length > 0) ); } - getFeatureById(id) { + getFeatureById(id: string | number) { const featureCollection = this._getSourceFeatureCollection(); if (!featureCollection) { return null; } - return featureCollection.features.find((feature) => { - return feature.properties[FEATURE_ID_PROPERTY_NAME] === id; + const targetFeature = featureCollection.features.find((feature) => { + return feature.properties?.[FEATURE_ID_PROPERTY_NAME] === id; }); + return targetFeature ? targetFeature : null; } } diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts index be947d79f4e3..5c062f3419e2 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts +++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.ts @@ -29,7 +29,7 @@ export interface IESAggSource extends IESSource { getValueAggsDsl(indexPattern: IndexPattern): { [key: string]: unknown }; } -export class AbstractESAggSource extends AbstractESSource { +export abstract class AbstractESAggSource extends AbstractESSource { private readonly _metricFields: IESAggField[]; private readonly _canReadFromGeoJson: boolean; diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts index ada76b8e4e67..b221d13bb0f8 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts @@ -10,6 +10,7 @@ import { MapFilters, MapQuery, VectorSourceSyncMeta, + VectorSourceRequestMeta, } from '../../../../common/descriptor_types'; import { GRID_RESOLUTION } from '../../../../common/constants'; import { IField } from '../../fields/field'; @@ -35,13 +36,7 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle getLayerName(): string; getUrlTemplateWithMeta( - searchFilters: MapFilters & { - applyGlobalQuery: boolean; - fieldNames: string[]; - geogridPrecision?: number; - sourceQuery: MapQuery; - sourceMeta: VectorSourceSyncMeta; - } + searchFilters: VectorSourceRequestMeta ): Promise<{ layerName: string; urlTemplate: string; diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts index 189e7dea1b0c..06df68283c43 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts @@ -160,7 +160,8 @@ describe('ESGeoGridSource', () => { const { data, meta } = await geogridSource.getGeoJsonWithMeta( 'foobarLayer', vectorSourceRequestMeta, - () => {} + () => {}, + () => true ); expect(meta && meta.areResultsTrimmed).toEqual(false); diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts index 01fde589dcb8..c11b6f0853cc 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts +++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts @@ -6,12 +6,14 @@ import { AbstractVectorSource } from '../vector_source'; import { IVectorSource } from '../vector_source'; +import { TimeRange } from '../../../../../../../src/plugins/data/common'; import { IndexPattern, ISearchSource } from '../../../../../../../src/plugins/data/public'; import { DynamicStylePropertyOptions, + MapQuery, VectorSourceRequestMeta, } from '../../../../common/descriptor_types'; -import { VectorStyle } from '../../styles/vector/vector_style'; +import { IVectorStyle } from '../../styles/vector/vector_style'; import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property'; export interface IESSource extends IVectorSource { @@ -25,13 +27,21 @@ export interface IESSource extends IVectorSource { limit: number, initialSearchContext?: object ): Promise; - loadStylePropsMeta( - layerName: string, - style: VectorStyle, - dynamicStyleProps: Array>, - registerCancelCallback: (requestToken: symbol, callback: () => void) => void, - searchFilters: VectorSourceRequestMeta - ): Promise; + loadStylePropsMeta({ + layerName, + style, + dynamicStyleProps, + registerCancelCallback, + sourceQuery, + timeFilters, + }: { + layerName: string; + style: IVectorStyle; + dynamicStyleProps: Array>; + registerCancelCallback: (callback: () => void) => void; + sourceQuery?: MapQuery; + timeFilters: TimeRange; + }): Promise; } export class AbstractESSource extends AbstractVectorSource implements IESSource { @@ -45,13 +55,21 @@ export class AbstractESSource extends AbstractVectorSource implements IESSource limit: number, initialSearchContext?: object ): Promise; - loadStylePropsMeta( - layerName: string, - style: VectorStyle, - dynamicStyleProps: Array>, - registerCancelCallback: (requestToken: symbol, callback: () => void) => void, - searchFilters: VectorSourceRequestMeta - ): Promise; + loadStylePropsMeta({ + layerName, + style, + dynamicStyleProps, + registerCancelCallback, + sourceQuery, + timeFilters, + }: { + layerName: string; + style: IVectorStyle; + dynamicStyleProps: Array>; + registerCancelCallback: (callback: () => void) => void; + sourceQuery?: MapQuery; + timeFilters: TimeRange; + }): Promise; _runEsQuery: ({ requestId, requestName, diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js index ab56ceeab4e7..0c8cb5f51424 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js +++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js @@ -284,13 +284,14 @@ export class AbstractESSource extends AbstractVectorSource { return indexPattern.getFormatterForField(fieldFromIndexPattern).getConverterFor('text'); } - async loadStylePropsMeta( + async loadStylePropsMeta({ layerName, style, dynamicStyleProps, registerCancelCallback, - searchFilters - ) { + sourceQuery, + timeFilters, + }) { const promises = dynamicStyleProps.map((dynamicStyleProp) => { return dynamicStyleProp.getFieldMetaRequest(); }); @@ -307,13 +308,11 @@ export class AbstractESSource extends AbstractVectorSource { searchSource.setField('index', indexPattern); searchSource.setField('size', 0); searchSource.setField('aggs', aggs); - if (searchFilters.sourceQuery) { - searchSource.setField('query', searchFilters.sourceQuery); + if (sourceQuery) { + searchSource.setField('query', sourceQuery); } if (style.isTimeAware() && (await this.isTimeAware())) { - searchSource.setField('filter', [ - getTimeFilter().createFilter(indexPattern, searchFilters.timeFilters), - ]); + searchSource.setField('filter', [getTimeFilter().createFilter(indexPattern, timeFilters)]); } const resp = await this._runEsQuery({ diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts index 248ca2b9212b..ef1ada8da828 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts +++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts @@ -4,10 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ +import { MapQuery, VectorJoinSourceRequestMeta } from '../../../../common/descriptor_types'; import { IField } from '../../fields/field'; import { IESAggSource } from '../es_agg_source'; +import { PropertiesMap } from '../../joins/join'; export interface IESTermSource extends IESAggSource { - getTermField(): IField; - hasCompleteConfig(): boolean; + getTermField: () => IField; + hasCompleteConfig: () => boolean; + getWhereQuery: () => MapQuery; + getPropertiesMap: ( + searchFilters: VectorJoinSourceRequestMeta, + leftSourceName: string, + leftFieldName: string, + registerCancelCallback: (callback: () => void) => void + ) => PropertiesMap; } diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js index 359d22d2c44c..ff52dccdd2ef 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js +++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js @@ -119,9 +119,7 @@ export class ESTermSource extends AbstractESAggSource { }); const countPropertyName = this.getAggKey(AGG_TYPE.COUNT); - return { - propertiesMap: extractPropertiesMap(rawEsData, countPropertyName), - }; + return extractPropertiesMap(rawEsData, countPropertyName); } isFilterByMapBounds() { diff --git a/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js index eeb34ed67222..d937edb4ed36 100644 --- a/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js +++ b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js @@ -74,6 +74,7 @@ export class KibanaRegionmapSource extends AbstractVectorSource { }); return { data: featureCollection, + meta: {}, }; } diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx index 3e515613b3fd..440f0cb4457e 100644 --- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx +++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx @@ -179,7 +179,7 @@ export class MVTSingleLayerVectorSource getBoundsForFilters( boundsFilters: BoundsFilters, - registerCancelCallback: (requestToken: symbol, callback: () => void) => void + registerCancelCallback: (callback: () => void) => void ): MapExtent | null { return null; } @@ -192,6 +192,18 @@ export class MVTSingleLayerVectorSource return false; } + isBoundsAware() { + return false; + } + + getSourceTooltipContent() { + return { tooltipContent: null, areResultsTrimmed: false }; + } + + async getLeftJoinFields() { + return []; + } + async getTooltipProperties( properties: GeoJsonProperties, featureId?: string | number diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts index a481e273bc33..7bf1db43c287 100644 --- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts +++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts @@ -19,6 +19,12 @@ import { } from '../../../../common/descriptor_types'; import { VECTOR_SHAPE_TYPE } from '../../../../common/constants'; import { ITooltipProperty } from '../../tooltips/tooltip_property'; +import { DataRequest } from '../../util/data_request'; + +export interface SourceTooltipConfig { + tooltipContent: string | null; + areResultsTrimmed: boolean; +} export type GeoJsonFetchMeta = ESSearchSourceResponseMeta; @@ -30,8 +36,8 @@ export type GeoJsonWithMeta = { export type BoundsFilters = { applyGlobalQuery: boolean; filters: Filter[]; - query: MapQuery; - sourceQuery: MapQuery; + query?: MapQuery; + sourceQuery?: MapQuery; timeFilters: TimeRange; }; @@ -39,44 +45,52 @@ export interface IVectorSource extends ISource { getTooltipProperties(properties: GeoJsonProperties): Promise; getBoundsForFilters( boundsFilters: BoundsFilters, - registerCancelCallback: (requestToken: symbol, callback: () => void) => void + registerCancelCallback: (callback: () => void) => void ): MapExtent | null; getGeoJsonWithMeta( - layerName: 'string', + layerName: string, searchFilters: MapFilters, - registerCancelCallback: (callback: () => void) => void + registerCancelCallback: (callback: () => void) => void, + isRequestStillActive: () => boolean ): Promise; getFields(): Promise; getFieldByName(fieldName: string): IField | null; + getLeftJoinFields(): Promise; getSyncMeta(): VectorSourceSyncMeta; getFieldNames(): string[]; getApplyGlobalQuery(): boolean; createField({ fieldName }: { fieldName: string }): IField; canFormatFeatureProperties(): boolean; getSupportedShapeTypes(): Promise; + isBoundsAware(): boolean; + getSourceTooltipContent(sourceDataRequest?: DataRequest): SourceTooltipConfig; } export class AbstractVectorSource extends AbstractSource implements IVectorSource { getTooltipProperties(properties: GeoJsonProperties): Promise; getBoundsForFilters( boundsFilters: BoundsFilters, - registerCancelCallback: (requestToken: symbol, callback: () => void) => void + registerCancelCallback: (callback: () => void) => void ): MapExtent | null; getGeoJsonWithMeta( layerName: string, searchFilters: VectorSourceRequestMeta, - registerCancelCallback: (callback: () => void) => void + registerCancelCallback: (callback: () => void) => void, + isRequestStillActive: () => boolean ): Promise; getFields(): Promise; getFieldByName(fieldName: string): IField | null; + getLeftJoinFields(): Promise; getSyncMeta(): VectorSourceSyncMeta; getSupportedShapeTypes(): Promise; canFormatFeatureProperties(): boolean; getApplyGlobalQuery(): boolean; getFieldNames(): string[]; createField({ fieldName }: { fieldName: string }): IField; + isBoundsAware(): boolean; + getSourceTooltipContent(sourceDataRequest?: DataRequest): SourceTooltipConfig; } export interface ITiledSingleLayerVectorSource extends IVectorSource { diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx index 1244c53afe9a..5d0d9712ef98 100644 --- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx +++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.tsx @@ -5,7 +5,7 @@ */ import _ from 'lodash'; -import React from 'react'; +import React, { ReactElement } from 'react'; import { Map as MbMap, FeatureIdentifier } from 'mapbox-gl'; import { FeatureCollection } from 'geojson'; // @ts-expect-error @@ -92,6 +92,55 @@ export interface IVectorStyle extends IStyle { mapColors: string[] ): { hasChanges: boolean; nextStyleDescriptor?: VectorStyleDescriptor }; pluckStyleMetaFromSourceDataRequest(sourceDataRequest: DataRequest): Promise; + isTimeAware: () => boolean; + getIcon: () => ReactElement; + hasLegendDetails: () => Promise; + renderLegendDetails: () => ReactElement; + clearFeatureState: (featureCollection: FeatureCollection, mbMap: MbMap, sourceId: string) => void; + setFeatureStateAndStyleProps: ( + featureCollection: FeatureCollection, + mbMap: MbMap, + mbSourceId: string + ) => boolean; + arePointsSymbolizedAsCircles: () => boolean; + setMBPaintProperties: ({ + alpha, + mbMap, + fillLayerId, + lineLayerId, + }: { + alpha: number; + mbMap: MbMap; + fillLayerId: string; + lineLayerId: string; + }) => void; + setMBPaintPropertiesForPoints: ({ + alpha, + mbMap, + pointLayerId, + }: { + alpha: number; + mbMap: MbMap; + pointLayerId: string; + }) => void; + setMBPropertiesForLabelText: ({ + alpha, + mbMap, + textLayerId, + }: { + alpha: number; + mbMap: MbMap; + textLayerId: string; + }) => void; + setMBSymbolPropertiesForPoints: ({ + mbMap, + symbolLayerId, + alpha, + }: { + alpha: number; + mbMap: MbMap; + symbolLayerId: string; + }) => void; } export class VectorStyle implements IVectorStyle { @@ -594,12 +643,12 @@ export class VectorStyle implements IVectorStyle { mbSourceId: string ) { if (!featureCollection) { - return; + return false; } const dynamicStyleProps = this.getDynamicPropertiesArray(); if (dynamicStyleProps.length === 0) { - return; + return false; } const tmpFeatureIdentifier: FeatureIdentifier = { diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx index 6c6cb6ba143c..24728465de3b 100644 --- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx +++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx @@ -9,7 +9,6 @@ import React from 'react'; import { shallow } from 'enzyme'; import { AbstractLayer, ILayer } from '../../../../../../classes/layers/layer'; import { AbstractSource, ISource } from '../../../../../../classes/sources/source'; -import { IStyle } from '../../../../../../classes/styles/style'; import { TOCEntryActionsPopover } from './toc_entry_actions_popover'; @@ -17,28 +16,17 @@ let supportsFitToBounds: boolean; class MockSource extends AbstractSource implements ISource {} -class MockStyle implements IStyle { - renderEditor() { - return null; - } - - getType() { - return 'mockStyle'; - } -} - class LayerMock extends AbstractLayer implements ILayer { constructor() { const sourceDescriptor = { type: 'mySourceType', }; const source = new MockSource(sourceDescriptor); - const style = new MockStyle(); const layerDescriptor = { id: 'testLayer', sourceDescriptor, }; - super({ layerDescriptor, source, style }); + super({ layerDescriptor, source }); } async supportsFitToBounds(): Promise { From e92a4ab4bf5ec175fc572f4d14b5da173de266a7 Mon Sep 17 00:00:00 2001 From: Ashik Meerankutty Date: Fri, 2 Oct 2020 07:34:22 +0530 Subject: [PATCH 13/73] [APM] Service Inventory Updated the `EuiBadge` to use the `behind_text` vars instead of the base colors for the health status badges (#77844) * Use behind_text colors in health status * Separated badge color usage from getSeverityColor --- .../plugins/apm/common/service_health_status.ts | 16 ++++++++++++++++ .../ServiceOverview/ServiceList/HealthBadge.tsx | 4 ++-- .../__snapshots__/ServiceOverview.test.tsx.snap | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/apm/common/service_health_status.ts index 1d4bcfb3b0e0..f66e03a9733a 100644 --- a/x-pack/plugins/apm/common/service_health_status.ts +++ b/x-pack/plugins/apm/common/service_health_status.ts @@ -54,6 +54,22 @@ export function getServiceHealthStatusColor( } } +export function getServiceHealthStatusBadgeColor( + theme: EuiTheme, + status: ServiceHealthStatus +) { + switch (status) { + case ServiceHealthStatus.healthy: + return theme.eui.euiColorVis0_behindText; + case ServiceHealthStatus.warning: + return theme.eui.euiColorVis5_behindText; + case ServiceHealthStatus.critical: + return theme.eui.euiColorVis9_behindText; + case ServiceHealthStatus.unknown: + return theme.eui.euiColorMediumShade; + } +} + export function getServiceHealthStatusLabel(status: ServiceHealthStatus) { switch (status) { case ServiceHealthStatus.critical: diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx b/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx index c6be0a352ef6..e8ad3e65b1a4 100644 --- a/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx +++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/ServiceList/HealthBadge.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { EuiBadge } from '@elastic/eui'; import { - getServiceHealthStatusColor, + getServiceHealthStatusBadgeColor, getServiceHealthStatusLabel, ServiceHealthStatus, } from '../../../../../common/service_health_status'; @@ -20,7 +20,7 @@ export function HealthBadge({ const theme = useTheme(); return ( - + {getServiceHealthStatusLabel(healthStatus)} ); diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap index 40a2b6a5fa81..ee3a4fce0dba 100644 --- a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap +++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap @@ -153,7 +153,7 @@ NodeList [ > Date: Fri, 2 Oct 2020 09:03:08 +0300 Subject: [PATCH 14/73] [Functional] Add retry on custom formatter test (#78729) Co-authored-by: Elastic Machine --- test/functional/apps/visualize/_tsvb_time_series.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts index 0b2a52b367a2..d4a079a38c81 100644 --- a/test/functional/apps/visualize/_tsvb_time_series.ts +++ b/test/functional/apps/visualize/_tsvb_time_series.ts @@ -84,8 +84,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { await visualBuilder.clickSeriesOption(); await visualBuilder.enterSeriesTemplate('$ {{value}}'); - const actualCount = await visualBuilder.getRhythmChartLegendValue(); - expect(actualCount).to.be(expectedLegendValue); + await retry.try(async () => { + const actualCount = await visualBuilder.getRhythmChartLegendValue(); + expect(actualCount).to.be(expectedLegendValue); + }); }); it('should show the correct count in the legend with percent formatter', async () => { From 4ddcd1d2a6bf3ffbec37844468c4e4af827f739f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= Date: Fri, 2 Oct 2020 09:45:50 +0200 Subject: [PATCH 15/73] [APM] Fix anomalies not showing up on transaction charts (#76930) * [APM] Fix anomalies not showing up on transaction charts * Added API tests to check transaction groups charts for anomaly data * Improve test names and assertions from PR feedback * Updated the transaction groups chart API to make `environment` a required param while making `uiFilters` optional * updates the basic API tests for transaction_groups/charts with the required `environment` param * makes uiFIltersES default to [] on core setup and removes SetupUIFilters type * fixes vertical shade * - replaces uiFiltersES with esFilter & uiFilters and cleans up related code around these - deduplicates the required environment in the transaction_groups/charts API * updates basic apm_api_integration tests * pr feedback * updates api test snapshots with correct anomaly data * removed environment query param from useTransactionCharts and ensures it's included in uiFilters returned from useUrlParams Co-authored-by: Oliver Gupte --- .../example_response_opbeans_beats.json | 42 ++--- .../public/context/UrlParamsContext/index.tsx | 7 +- .../plugins/apm/public/utils/testHelpers.tsx | 7 +- .../errors/__snapshots__/queries.test.ts.snap | 6 +- .../__snapshots__/queries.test.ts.snap | 4 +- .../__tests__/get_buckets.test.ts | 5 +- .../lib/errors/distribution/get_buckets.ts | 12 +- .../errors/distribution/get_distribution.ts | 8 +- .../apm/server/lib/errors/get_error_group.ts | 12 +- .../apm/server/lib/errors/get_error_groups.ts | 8 +- ...{get_ui_filters_es.ts => get_es_filter.ts} | 2 +- .../get_parsed_ui_filters.ts | 23 --- .../apm/server/lib/helpers/setup_request.ts | 41 ++--- .../__snapshots__/queries.test.ts.snap | 54 +++--- .../server/lib/metrics/by_agent/default.ts | 8 +- .../java/gc/fetch_and_transform_gc_metrics.ts | 8 +- .../by_agent/java/gc/get_gc_rate_chart.ts | 8 +- .../by_agent/java/gc/get_gc_time_chart.ts | 8 +- .../by_agent/java/heap_memory/index.ts | 8 +- .../server/lib/metrics/by_agent/java/index.ts | 8 +- .../by_agent/java/non_heap_memory/index.ts | 8 +- .../by_agent/java/thread_count/index.ts | 8 +- .../lib/metrics/by_agent/shared/cpu/index.ts | 8 +- .../metrics/by_agent/shared/memory/index.ts | 10 +- .../metrics/fetch_and_transform_metrics.ts | 8 +- .../get_metrics_chart_data_by_agent.ts | 8 +- .../__snapshots__/queries.test.ts.snap | 14 +- .../lib/rum_client/get_client_metrics.ts | 8 +- .../server/lib/rum_client/get_js_errors.ts | 8 +- .../lib/rum_client/get_long_task_metrics.ts | 8 +- .../rum_client/get_page_load_distribution.ts | 10 +- .../lib/rum_client/get_page_view_trends.ts | 8 +- .../lib/rum_client/get_pl_dist_breakdown.ts | 8 +- .../server/lib/rum_client/get_rum_services.ts | 8 +- .../server/lib/rum_client/get_url_search.ts | 8 +- .../lib/rum_client/get_visitor_breakdown.ts | 8 +- .../lib/rum_client/get_web_core_vitals.ts | 8 +- .../server/lib/service_map/get_service_map.ts | 2 +- .../get_service_map_service_node_info.test.ts | 6 +- .../get_service_map_service_node_info.ts | 9 +- .../group_resource_nodes_grouped.json | 4 +- .../group_resource_nodes_pregrouped.json | 4 +- .../__snapshots__/queries.test.ts.snap | 6 +- .../apm/server/lib/service_nodes/index.ts | 8 +- .../__snapshots__/queries.test.ts.snap | 10 +- .../lib/services/get_service_node_metadata.ts | 8 +- .../get_services/get_services_items.ts | 12 +- .../server/lib/services/get_services/index.ts | 11 +- .../__snapshots__/queries.test.ts.snap | 14 +- .../server/lib/transaction_groups/fetcher.ts | 8 +- .../lib/transaction_groups/get_error_rate.ts | 12 +- .../get_transaction_sample_for_group.ts | 12 +- .../server/lib/transaction_groups/index.ts | 8 +- .../__snapshots__/queries.test.ts.snap | 12 +- .../lib/transactions/breakdown/index.test.ts | 3 +- .../lib/transactions/breakdown/index.ts | 12 +- .../charts/get_anomaly_data/fetcher.ts | 11 +- .../charts/get_anomaly_data/index.ts | 40 ++--- .../get_timeseries_data/fetcher.test.ts | 5 +- .../charts/get_timeseries_data/fetcher.ts | 12 +- .../charts/get_timeseries_data/index.ts | 8 +- .../server/lib/transactions/charts/index.ts | 10 +- .../distribution/get_buckets/index.ts | 12 +- .../distribution/get_distribution_max.ts | 12 +- .../lib/transactions/distribution/index.ts | 8 +- .../lib/transactions/get_transaction/index.ts | 8 +- .../server/lib/transactions/queries.test.ts | 3 - .../__snapshots__/queries.test.ts.snap | 2 +- .../get_local_filter_query.ts | 4 +- .../local_ui_filters/queries.test.ts | 2 +- .../plugins/apm/server/projections/errors.ts | 12 +- .../plugins/apm/server/projections/metrics.ts | 12 +- .../projections/rum_page_load_transactions.ts | 18 +- .../apm/server/projections/service_nodes.ts | 8 +- .../apm/server/projections/services.ts | 12 +- .../server/projections/transaction_groups.ts | 8 +- .../apm/server/projections/transactions.ts | 12 +- .../plugins/apm/server/routes/service_map.ts | 5 - x-pack/plugins/apm/server/routes/services.ts | 12 +- .../apm/server/routes/transaction_groups.ts | 21 +-- .../plugins/apm/server/routes/ui_filters.ts | 13 +- .../plugins/apm/server/utils/test_helpers.tsx | 7 +- .../basic/tests/feature_controls.ts | 6 +- .../transaction_groups/transaction_charts.ts | 2 +- .../apm_api_integration/trial/tests/index.ts | 1 + .../transaction_groups_charts.snap | 43 +++++ .../services/transaction_groups_charts.ts | 161 ++++++++++++++++++ 87 files changed, 528 insertions(+), 548 deletions(-) rename x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/{get_ui_filters_es.ts => get_es_filter.ts} (96%) delete mode 100644 x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts create mode 100644 x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap create mode 100644 x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json index 153fa57bb05e..cfd905f145fe 100644 --- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json +++ b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json @@ -83,7 +83,7 @@ "id": "opbeans-go~>postgresql", "sourceData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, @@ -103,7 +103,7 @@ "id": "opbeans-go~opbeans-java", "sourceData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, @@ -123,13 +123,13 @@ "id": "opbeans-go~opbeans-node", "sourceData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, "targetData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -143,7 +143,7 @@ "id": "opbeans-go~opbeans-ruby", "sourceData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, @@ -189,7 +189,7 @@ }, "targetData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, @@ -209,7 +209,7 @@ }, "targetData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" } @@ -242,7 +242,7 @@ "id": "opbeans-node~>postgresql", "sourceData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -262,7 +262,7 @@ "id": "opbeans-node~>redis", "sourceData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -282,13 +282,13 @@ "id": "opbeans-node~opbeans-go", "sourceData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, "targetData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, @@ -302,7 +302,7 @@ "id": "opbeans-node~opbeans-python", "sourceData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -322,7 +322,7 @@ "id": "opbeans-node~opbeans-ruby", "sourceData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -408,7 +408,7 @@ }, "targetData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" } @@ -427,7 +427,7 @@ }, "targetData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -487,7 +487,7 @@ }, "targetData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" }, @@ -527,7 +527,7 @@ }, "targetData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" }, @@ -566,7 +566,7 @@ }, "targetData": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go" } @@ -602,7 +602,7 @@ }, "targetData": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" } @@ -673,7 +673,7 @@ { "data": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs", "anomaly_score": 41.31593099784474, @@ -733,7 +733,7 @@ { "data": { "id": "opbeans-go", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-go", "agent.name": "go", "anomaly_score": 0.2633884161762746, diff --git a/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx b/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx index 9eb4704a2ca2..5682009019d7 100644 --- a/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx +++ b/x-pack/plugins/apm/public/context/UrlParamsContext/index.tsx @@ -25,6 +25,7 @@ import { import { pickKeys } from '../../../common/utils/pick_keys'; import { useDeepObjectIdentity } from '../../hooks/useDeepObjectIdentity'; import { LocalUIFilterName } from '../../../common/ui_filter'; +import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values'; interface TimeRange { rangeFrom: string; @@ -38,7 +39,11 @@ function useUiFilters(params: IUrlParams): UIFilters { (val) => (val ? val.split(',') : []) ) as Partial>; - return useDeepObjectIdentity({ kuery, environment, ...localUiFilters }); + return useDeepObjectIdentity({ + kuery, + environment: environment || ENVIRONMENT_ALL.value, + ...localUiFilters, + }); } const defaultRefresh = (_time: TimeRange) => {}; diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx index 971455fde394..7826e9672a3b 100644 --- a/x-pack/plugins/apm/public/utils/testHelpers.tsx +++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx @@ -25,6 +25,7 @@ import { } from '../../typings/elasticsearch'; import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext'; import { UrlParamsProvider } from '../context/UrlParamsContext'; +import { UIFilters } from '../../typings/ui_filters'; const originalConsoleWarn = console.warn; // eslint-disable-line no-console /** @@ -118,7 +119,8 @@ interface MockSetup { apmEventClient: any; internalClient: any; config: APMConfig; - uiFiltersES: ESFilter[]; + uiFilters: UIFilters; + esFilter: ESFilter[]; indices: { /* eslint-disable @typescript-eslint/naming-convention */ 'apm_oss.sourcemapIndices': string; @@ -179,7 +181,8 @@ export async function inspectSearchParams( }, } ) as APMConfig, - uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }], + uiFilters: { environment: 'test' }, + esFilter: [{ term: { 'service.environment': 'test' } }], indices: { /* eslint-disable @typescript-eslint/naming-convention */ 'apm_oss.sourcemapIndices': 'myIndex', diff --git a/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap index 63b6c9cde4d0..632232ffb075 100644 --- a/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap @@ -32,7 +32,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -119,7 +119,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -194,7 +194,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap index ea142ca2acc0..b329499c8b04 100644 --- a/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/errors/distribution/__snapshots__/queries.test.ts.snap @@ -40,7 +40,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -91,7 +91,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts index 1a83113de35f..50da1f9c20d1 100644 --- a/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts +++ b/x-pack/plugins/apm/server/lib/errors/distribution/__tests__/get_buckets.test.ts @@ -41,7 +41,10 @@ describe('timeseriesFetcher', () => { get: () => 'myIndex', } ) as APMConfig, - uiFiltersES: [ + uiFilters: { + environment: 'prod', + }, + esFilter: [ { term: { 'service.environment': 'prod' }, }, diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts index de6df15354e7..a42710947a79 100644 --- a/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts +++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_buckets.ts @@ -11,11 +11,7 @@ import { SERVICE_NAME, } from '../../../../common/elasticsearch_fieldnames'; import { rangeFilter } from '../../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; export async function getBuckets({ serviceName, @@ -26,13 +22,13 @@ export async function getBuckets({ serviceName: string; groupId?: string; bucketSize: number; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { - const { start, end, uiFiltersES, apmEventClient } = setup; + const { start, end, esFilter, apmEventClient } = setup; const filter: ESFilter[] = [ { term: { [SERVICE_NAME]: serviceName } }, { range: rangeFilter(start, end) }, - ...uiFiltersES, + ...esFilter, ]; if (groupId) { diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts index 3b48b6c5be59..dea518cad8e4 100644 --- a/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts +++ b/x-pack/plugins/apm/server/lib/errors/distribution/get_distribution.ts @@ -5,11 +5,7 @@ */ import { PromiseReturnType } from '../../../../typings/common'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { getBuckets } from './get_buckets'; import { BUCKET_TARGET_COUNT } from '../../transactions/constants'; @@ -28,7 +24,7 @@ export async function getErrorDistribution({ }: { serviceName: string; groupId?: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { const bucketSize = getBucketSize({ start: setup.start, end: setup.end }); const { buckets, noHits } = await getBuckets({ diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_group.ts b/x-pack/plugins/apm/server/lib/errors/get_error_group.ts index b23c955b5718..0fbc7720f711 100644 --- a/x-pack/plugins/apm/server/lib/errors/get_error_group.ts +++ b/x-pack/plugins/apm/server/lib/errors/get_error_group.ts @@ -12,11 +12,7 @@ import { } from '../../../common/elasticsearch_fieldnames'; import { PromiseReturnType } from '../../../typings/common'; import { rangeFilter } from '../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getTransaction } from '../transactions/get_transaction'; export type ErrorGroupAPIResponse = PromiseReturnType; @@ -29,9 +25,9 @@ export async function getErrorGroup({ }: { serviceName: string; groupId: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { - const { start, end, uiFiltersES, apmEventClient } = setup; + const { start, end, esFilter, apmEventClient } = setup; const params = { apm: { @@ -45,7 +41,7 @@ export async function getErrorGroup({ { term: { [SERVICE_NAME]: serviceName } }, { term: { [ERROR_GROUP_ID]: groupId } }, { range: rangeFilter(start, end) }, - ...uiFiltersES, + ...esFilter, ], should: [{ term: { [TRANSACTION_SAMPLED]: true } }], }, diff --git a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts index ab1c2149be34..006d2fae3d4f 100644 --- a/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts +++ b/x-pack/plugins/apm/server/lib/errors/get_error_groups.ts @@ -13,11 +13,7 @@ import { ERROR_LOG_MESSAGE, } from '../../../common/elasticsearch_fieldnames'; import { PromiseReturnType } from '../../../typings/common'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getErrorGroupsProjection } from '../../projections/errors'; import { mergeProjection } from '../../projections/util/merge_projection'; import { SortOptions } from '../../../typings/elasticsearch/aggregations'; @@ -35,7 +31,7 @@ export async function getErrorGroups({ serviceName: string; sortField?: string; sortDirection?: 'asc' | 'desc'; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { const { apmEventClient } = setup; diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts similarity index 96% rename from x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts rename to x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts index c1405b44f2a8..1b8f32d4de8b 100644 --- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts +++ b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_es_filter.ts @@ -13,7 +13,7 @@ import { } from '../../ui_filters/local_ui_filters/config'; import { esKuery } from '../../../../../../../src/plugins/data/server'; -export function getUiFiltersES(uiFilters: UIFilters) { +export function getEsFilter(uiFilters: UIFilters) { const { kuery, environment, ...localFilterValues } = uiFilters; const mappedFilters = localUIFilterNames .filter((name) => name in localFilterValues) diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts deleted file mode 100644 index 324da199807c..000000000000 --- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_parsed_ui_filters.ts +++ /dev/null @@ -1,23 +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 { Logger } from 'src/core/server'; -import { UIFilters } from '../../../../typings/ui_filters'; - -export function getParsedUiFilters({ - uiFilters, - logger, -}: { - uiFilters: string; - logger: Logger; -}): UIFilters { - try { - return JSON.parse(uiFilters); - } catch (error) { - logger.error(error); - } - return {}; -} diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts index eba75433a514..26896a050dd8 100644 --- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts +++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts @@ -5,6 +5,7 @@ */ import moment from 'moment'; +import { Logger } from 'kibana/server'; import { isActivePlatinumLicense } from '../../../common/service_map'; import { UI_SETTINGS } from '../../../../../../src/plugins/data/common'; import { KibanaRequest } from '../../../../../../src/core/server'; @@ -14,7 +15,7 @@ import { ApmIndicesConfig, } from '../settings/apm_indices/get_apm_indices'; import { ESFilter } from '../../../typings/elasticsearch'; -import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es'; +import { getEsFilter } from './convert_ui_filters/get_es_filter'; import { APMRequestHandlerContext } from '../../routes/typings'; import { ProcessorEvent } from '../../../common/processor_event'; import { @@ -25,14 +26,8 @@ import { APMInternalClient, createInternalESClient, } from './create_es_client/create_internal_es_client'; +import { UIFilters } from '../../../typings/ui_filters'; -function decodeUiFilters(uiFiltersEncoded?: string) { - if (!uiFiltersEncoded) { - return []; - } - const uiFilters = JSON.parse(uiFiltersEncoded); - return getUiFiltersES(uiFilters); -} // Explicitly type Setup to prevent TS initialization errors // https://github.com/microsoft/TypeScript/issues/34933 @@ -42,6 +37,8 @@ export interface Setup { ml?: ReturnType; config: APMConfig; indices: ApmIndicesConfig; + uiFilters: UIFilters; + esFilter: ESFilter[]; } export interface SetupTimeRange { @@ -49,10 +46,6 @@ export interface SetupTimeRange { end: number; } -export interface SetupUIFilters { - uiFiltersES: ESFilter[]; -} - interface SetupRequestParams { query?: { _debug?: boolean; @@ -65,16 +58,13 @@ interface SetupRequestParams { type InferSetup = Setup & (TParams extends { query: { start: string } } ? { start: number } : {}) & - (TParams extends { query: { end: string } } ? { end: number } : {}) & - (TParams extends { query: { uiFilters: string } } - ? { uiFiltersES: ESFilter[] } - : {}); + (TParams extends { query: { end: string } } ? { end: number } : {}); export async function setupRequest( context: APMRequestHandlerContext, request: KibanaRequest ): Promise> { - const { config } = context; + const { config, logger } = context; const { query } = context.params; const [indices, includeFrozen] = await Promise.all([ @@ -85,7 +75,7 @@ export async function setupRequest( context.core.uiSettings.client.get(UI_SETTINGS.SEARCH_INCLUDE_FROZEN), ]); - const uiFiltersES = decodeUiFilters(query.uiFilters); + const uiFilters = decodeUiFilters(logger, query.uiFilters); const coreSetupRequest = { indices, @@ -108,12 +98,13 @@ export async function setupRequest( ) : undefined, config, + uiFilters, + esFilter: getEsFilter(uiFilters), }; return { ...('start' in query ? { start: moment.utc(query.start).valueOf() } : {}), ...('end' in query ? { end: moment.utc(query.end).valueOf() } : {}), - ...('uiFilters' in query ? { uiFiltersES } : {}), ...coreSetupRequest, } as InferSetup; } @@ -129,3 +120,15 @@ function getMlSetup( modules: ml.modulesProvider(request, savedObjectsClient), }; } + +function decodeUiFilters(logger: Logger, uiFiltersEncoded?: string): UIFilters { + if (!uiFiltersEncoded) { + return {}; + } + try { + return JSON.parse(uiFiltersEncoded); + } catch (error) { + logger.error(error); + return {}; + } +} diff --git a/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap index 2868dcfda97b..961a1eee61d1 100644 --- a/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/metrics/__snapshots__/queries.test.ts.snap @@ -87,7 +87,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -175,7 +175,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -206,7 +206,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -231,7 +231,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -258,7 +258,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -283,7 +283,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -338,7 +338,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -431,7 +431,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -514,7 +514,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -623,7 +623,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -717,7 +717,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -748,7 +748,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -773,7 +773,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -800,7 +800,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -825,7 +825,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -886,7 +886,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -985,7 +985,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -1074,7 +1074,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -1172,7 +1172,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -1255,7 +1255,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -1286,7 +1286,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -1311,7 +1311,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -1338,7 +1338,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -1363,7 +1363,7 @@ Object { "lang": "painless", "source": " /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -1413,7 +1413,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -1501,7 +1501,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -1579,7 +1579,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts index 6ee507d7b9bb..fbcbc9f12791 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/default.ts @@ -4,16 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { getCPUChartData } from './shared/cpu'; import { getMemoryChartData } from './shared/memory'; export async function getDefaultMetricsCharts( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string ) { const charts = await Promise.all([ diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts index d7e64bdcacd1..2ed11480a758 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts @@ -11,11 +11,7 @@ import { sum, round } from 'lodash'; import theme from '@elastic/eui/dist/eui_theme_light.json'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { getMetricsDateHistogramParams } from '../../../../helpers/metrics'; import { ChartBase } from '../../../types'; import { getMetricsProjection } from '../../../../../projections/metrics'; @@ -36,7 +32,7 @@ export async function fetchAndTransformGcMetrics({ chartBase, fieldName, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; serviceNodeName?: string; chartBase: ChartBase; diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts index 6e562b9a8ee8..7cedeb828e3b 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_rate_chart.ts @@ -7,11 +7,7 @@ import theme from '@elastic/eui/dist/eui_theme_light.json'; import { i18n } from '@kbn/i18n'; import { METRIC_JAVA_GC_COUNT } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { fetchAndTransformGcMetrics } from './fetch_and_transform_gc_metrics'; import { ChartBase } from '../../../types'; @@ -35,7 +31,7 @@ const chartBase: ChartBase = { }; const getGcRateChart = ( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) => { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts index 0b9d6240fc1c..f21d3d8e7c05 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/get_gc_time_chart.ts @@ -7,11 +7,7 @@ import theme from '@elastic/eui/dist/eui_theme_light.json'; import { i18n } from '@kbn/i18n'; import { METRIC_JAVA_GC_TIME } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { fetchAndTransformGcMetrics } from './fetch_and_transform_gc_metrics'; import { ChartBase } from '../../../types'; @@ -35,7 +31,7 @@ const chartBase: ChartBase = { }; const getGcTimeChart = ( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) => { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts index ba3183c0fa7d..eb79897f9f05 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts @@ -12,11 +12,7 @@ import { METRIC_JAVA_HEAP_MEMORY_USED, AGENT_NAME, } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics'; import { ChartBase } from '../../../types'; @@ -55,7 +51,7 @@ const chartBase: ChartBase = { }; export async function getHeapMemoryChart( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts index 21caab6590fc..d4084701f0f4 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/index.ts @@ -5,11 +5,7 @@ */ import { getHeapMemoryChart } from './heap_memory'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../helpers/setup_request'; import { getNonHeapMemoryChart } from './non_heap_memory'; import { getThreadCountChart } from './thread_count'; import { getCPUChartData } from '../shared/cpu'; @@ -18,7 +14,7 @@ import { getGcRateChart } from './gc/get_gc_rate_chart'; import { getGcTimeChart } from './gc/get_gc_time_chart'; export async function getJavaMetricsCharts( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts index 1a2d5bd0b0e6..50cc449da3c1 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts @@ -12,11 +12,7 @@ import { METRIC_JAVA_NON_HEAP_MEMORY_USED, AGENT_NAME, } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { ChartBase } from '../../../types'; import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics'; @@ -52,7 +48,7 @@ const chartBase: ChartBase = { }; export async function getNonHeapMemoryChart( - setup: Setup & SetupUIFilters & SetupTimeRange, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts index 01cc6d849524..0062f0a42397 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts @@ -10,11 +10,7 @@ import { METRIC_JAVA_THREAD_COUNT, AGENT_NAME, } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { ChartBase } from '../../../types'; import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics'; @@ -44,7 +40,7 @@ const chartBase: ChartBase = { }; export async function getThreadCountChart( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts index 066ef40b4ab6..ca642aa12fff 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts @@ -10,11 +10,7 @@ import { METRIC_SYSTEM_CPU_PERCENT, METRIC_PROCESS_CPU_PERCENT, } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { ChartBase } from '../../../types'; import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics'; @@ -56,7 +52,7 @@ const chartBase: ChartBase = { }; export async function getCPUChartData( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) { diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts index a60576ca0c17..e6ee47cc815e 100644 --- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts +++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts @@ -11,11 +11,7 @@ import { METRIC_SYSTEM_FREE_MEMORY, METRIC_SYSTEM_TOTAL_MEMORY, } from '../../../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../../helpers/setup_request'; import { fetchAndTransformMetrics } from '../../../fetch_and_transform_metrics'; import { ChartBase } from '../../../types'; @@ -54,7 +50,7 @@ export const percentCgroupMemoryUsedScript = { lang: 'painless', source: ` /* - When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. + When no limit is specified in the container, docker allows the app as much memory / swap memory as it wants. This number represents the max possible value for the limit field. */ double CGROUP_LIMIT_MAX_VALUE = 9223372036854771712L; @@ -73,7 +69,7 @@ export const percentCgroupMemoryUsedScript = { }; export async function getMemoryChartData( - setup: Setup & SetupTimeRange & SetupUIFilters, + setup: Setup & SetupTimeRange, serviceName: string, serviceNodeName?: string ) { diff --git a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts index a42a10d6518a..3ccba8c7586d 100644 --- a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts +++ b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts @@ -5,11 +5,7 @@ */ import { Unionize, Overwrite } from 'utility-types'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getMetricsDateHistogramParams } from '../helpers/metrics'; import { ChartBase } from './types'; import { transformDataToMetricsChart } from './transform_metrics_chart'; @@ -58,7 +54,7 @@ export async function fetchAndTransformMetrics({ aggs, additionalFilters = [], }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; serviceNodeName?: string; chartBase: ChartBase; diff --git a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts index 059e1ce48c83..72cd65deebff 100644 --- a/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts +++ b/x-pack/plugins/apm/server/lib/metrics/get_metrics_chart_data_by_agent.ts @@ -3,11 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getJavaMetricsCharts } from './by_agent/java'; import { getDefaultMetricsCharts } from './by_agent/default'; import { GenericMetricsChart } from './transform_metrics_chart'; @@ -22,7 +18,7 @@ export async function getMetricsChartDataByAgent({ serviceNodeName, agentName, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; serviceNodeName?: string; agentName: string; diff --git a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap index dcafe0922116..1fafa0808244 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap @@ -61,7 +61,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -151,7 +151,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -230,7 +230,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -500,7 +500,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -552,7 +552,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -667,7 +667,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -723,7 +723,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts b/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts index 6566ea4f5e29..6d596246d6af 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts @@ -7,11 +7,7 @@ import { TRANSACTION_DURATION } from '../../../common/elasticsearch_fieldnames'; import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { TRANSACTION_DOM_INTERACTIVE, TRANSACTION_TIME_TO_FIRST_BYTE, @@ -22,7 +18,7 @@ export async function getClientMetrics({ urlQuery, percentile = 50, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; urlQuery?: string; percentile?: number; }) { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts b/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts index 0540ea4bf09d..a8a4e2714c86 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_js_errors.ts @@ -5,11 +5,7 @@ */ import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getRumErrorsProjection } from '../../projections/rum_page_load_transactions'; import { ERROR_EXC_MESSAGE, @@ -23,7 +19,7 @@ export async function getJSErrors({ pageSize, pageIndex, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; pageSize: number; pageIndex: number; }) { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts b/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts index c2c86ae05d57..dfb31de8f10f 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_long_task_metrics.ts @@ -6,11 +6,7 @@ import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; const LONG_TASK_SUM_FIELD = 'transaction.experience.longtask.sum'; const LONG_TASK_COUNT_FIELD = 'transaction.experience.longtask.count'; @@ -21,7 +17,7 @@ export async function getLongTaskMetrics({ urlQuery, percentile = 50, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; urlQuery?: string; percentile?: number; }) { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts index 5f666feb8a18..225afff2818a 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_load_distribution.ts @@ -7,11 +7,7 @@ import { TRANSACTION_DURATION } from '../../../common/elasticsearch_fieldnames'; import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; export const MICRO_TO_SEC = 1000000; @@ -56,7 +52,7 @@ export async function getPageLoadDistribution({ maxPercentile, urlQuery, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; minPercentile?: string; maxPercentile?: string; urlQuery?: string; @@ -168,7 +164,7 @@ const getPercentilesDistribution = async ({ minDuration, maxDuration, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; minDuration: number; maxDuration: number; }) => { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts index 40f8a8bc58a5..c1a602c33fea 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_page_view_trends.ts @@ -5,11 +5,7 @@ */ import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { BreakdownItem } from '../../../typings/ui_filters'; export async function getPageViewTrends({ @@ -17,7 +13,7 @@ export async function getPageViewTrends({ breakdowns, urlQuery, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; breakdowns?: string; urlQuery?: string; }) { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts b/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts index bebf9c0bc99c..e2ec59d232b2 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_pl_dist_breakdown.ts @@ -7,11 +7,7 @@ import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { ProcessorEvent } from '../../../common/processor_event'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { CLIENT_GEO_COUNTRY_ISO_CODE, USER_AGENT_DEVICE, @@ -46,7 +42,7 @@ export const getPageLoadDistBreakdown = async ({ breakdown, urlQuery, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; minPercentile: number; maxPercentile: number; breakdown: string; diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts b/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts index 3adad0868ed4..e9bd203e354c 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_rum_services.ts @@ -5,18 +5,14 @@ */ import { SERVICE_NAME } from '../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; export async function getRumServices({ setup, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { const projection = getRumPageLoadTransactionsProjection({ setup, diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts b/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts index 6aa39c7ef961..febfd66897e1 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_url_search.ts @@ -5,11 +5,7 @@ */ import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { TRANSACTION_DURATION, @@ -21,7 +17,7 @@ export async function getUrlSearch({ urlQuery, percentile, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; urlQuery?: string; percentile: number; }) { diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts b/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts index 52d089e4e29c..6350bc2c0701 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_visitor_breakdown.ts @@ -6,11 +6,7 @@ import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { USER_AGENT_NAME, USER_AGENT_OS, @@ -20,7 +16,7 @@ export async function getVisitorBreakdown({ setup, urlQuery, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; urlQuery?: string; }) { const projection = getRumPageLoadTransactionsProjection({ diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts b/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts index 676b3506397a..c5baf0b529eb 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/get_web_core_vitals.ts @@ -6,11 +6,7 @@ import { getRumPageLoadTransactionsProjection } from '../../projections/rum_page_load_transactions'; import { mergeProjection } from '../../projections/util/merge_projection'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { CLS_FIELD, FCP_FIELD, @@ -25,7 +21,7 @@ export async function getWebCoreVitals({ urlQuery, percentile = 50, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; urlQuery?: string; percentile?: number; }) { diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts index 75acebe7ed56..330bb936c9e8 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts @@ -82,7 +82,7 @@ async function getServicesData(options: IEnvOptions) { const { setup, searchAggregatedTransactions } = options; const projection = getServicesProjection({ - setup: { ...setup, uiFiltersES: [] }, + setup: { ...setup, esFilter: [] }, searchAggregatedTransactions, }); diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts index 7af1607697ef..eb2ddbf38b27 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.test.ts @@ -19,11 +19,10 @@ describe('getServiceMapServiceNodeInfo', () => { }), }, indices: {}, + uiFilters: { environment: 'test environment' }, } as unknown) as Setup & SetupTimeRange; - const environment = 'test environment'; const serviceName = 'test service name'; const result = await getServiceMapServiceNodeInfo({ - uiFilters: { environment }, setup, serviceName, searchAggregatedTransactions: false, @@ -67,11 +66,10 @@ describe('getServiceMapServiceNodeInfo', () => { config: { 'xpack.apm.metricsInterval': 30, }, + uiFilters: { environment: 'test environment' }, } as unknown) as Setup & SetupTimeRange; - const environment = 'test environment'; const serviceName = 'test service name'; const result = await getServiceMapServiceNodeInfo({ - uiFilters: { environment }, setup, serviceName, searchAggregatedTransactions: false, diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts index 7c2137ce65d8..37b34641435f 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts @@ -8,7 +8,6 @@ import { TRANSACTION_REQUEST, TRANSACTION_PAGE_LOAD, } from '../../../common/transaction_types'; -import { UIFilters } from '../../../typings/ui_filters'; import { SERVICE_NAME, METRIC_SYSTEM_CPU_PERCENT, @@ -53,9 +52,8 @@ export async function getServiceMapServiceNodeInfo({ serviceName, setup, searchAggregatedTransactions, - uiFilters, -}: Options & { serviceName: string; uiFilters: UIFilters }) { - const { start, end } = setup; +}: Options & { serviceName: string }) { + const { start, end, uiFilters } = setup; const filter: ESFilter[] = [ { range: rangeFilter(start, end) }, @@ -105,7 +103,8 @@ async function getErrorStats({ }) { const setupWithBlankUiFilters = { ...setup, - uiFiltersES: getEnvironmentUiFilterES(environment), + uiFilters: { environment }, + esFilter: getEnvironmentUiFilterES(environment), }; const { noHits, average } = await getErrorRate({ setup: setupWithBlankUiFilters, diff --git a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json index e7bba585de18..94c508fe9023 100644 --- a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json +++ b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_grouped.json @@ -3,7 +3,7 @@ { "data": { "id": "opbeans-rum", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-rum", "agent.name": "rum-js" } @@ -18,7 +18,7 @@ { "data": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" } diff --git a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json index 22c5c50de747..58469f607ac1 100644 --- a/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json +++ b/x-pack/plugins/apm/server/lib/service_map/mock_responses/group_resource_nodes_pregrouped.json @@ -3,7 +3,7 @@ { "data": { "id": "opbeans-rum", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-rum", "agent.name": "rum-js" } @@ -18,7 +18,7 @@ { "data": { "id": "opbeans-node", - "service.environment": "testing", + "service.environment": "test", "service.name": "opbeans-node", "agent.name": "nodejs" } diff --git a/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap index 87aca0d05690..d83e558775be 100644 --- a/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/service_nodes/__snapshots__/queries.test.ts.snap @@ -51,7 +51,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -119,7 +119,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -188,7 +188,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/service_nodes/index.ts b/x-pack/plugins/apm/server/lib/service_nodes/index.ts index a83aba192dba..d5e29532e3d7 100644 --- a/x-pack/plugins/apm/server/lib/service_nodes/index.ts +++ b/x-pack/plugins/apm/server/lib/service_nodes/index.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getServiceNodesProjection } from '../../projections/service_nodes'; import { mergeProjection } from '../../projections/util/merge_projection'; import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes'; @@ -23,7 +19,7 @@ const getServiceNodes = async ({ setup, serviceName, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; }) => { const { apmEventClient } = setup; diff --git a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap index 431f11066aaf..3a38f80c87b3 100644 --- a/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/services/__snapshots__/queries.test.ts.snap @@ -144,7 +144,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -194,7 +194,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -257,7 +257,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -334,7 +334,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -389,7 +389,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts b/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts index fca472b0ce8c..d6ba9f5447ba 100644 --- a/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts +++ b/x-pack/plugins/apm/server/lib/services/get_service_node_metadata.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { HOST_NAME, CONTAINER_ID, @@ -24,7 +20,7 @@ export async function getServiceNodeMetadata({ }: { serviceName: string; serviceNodeName: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { const { apmEventClient } = setup; diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts index c09be7aacc78..092485c46fb0 100644 --- a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts +++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts @@ -5,11 +5,7 @@ */ import { joinByKey } from '../../../../common/utils/join_by_key'; import { PromiseReturnType } from '../../../../typings/common'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { getServicesProjection } from '../../../projections/services'; import { getTransactionDurationAverages, @@ -21,17 +17,15 @@ import { } from './get_services_items_stats'; export type ServiceListAPIResponse = PromiseReturnType; -export type ServicesItemsSetup = Setup & SetupTimeRange & SetupUIFilters; +export type ServicesItemsSetup = Setup & SetupTimeRange; export type ServicesItemsProjection = ReturnType; export async function getServicesItems({ setup, searchAggregatedTransactions, - mlAnomaliesEnvironment, }: { setup: ServicesItemsSetup; searchAggregatedTransactions: boolean; - mlAnomaliesEnvironment?: string; }) { const params = { projection: getServicesProjection({ @@ -55,7 +49,7 @@ export async function getServicesItems({ getTransactionRates(params), getTransactionErrorRates(params), getEnvironments(params), - getHealthStatuses(params, mlAnomaliesEnvironment), + getHealthStatuses(params, setup.uiFilters.environment), ]); const allMetrics = [ diff --git a/x-pack/plugins/apm/server/lib/services/get_services/index.ts b/x-pack/plugins/apm/server/lib/services/get_services/index.ts index 351457b2a815..04744a9c791b 100644 --- a/x-pack/plugins/apm/server/lib/services/get_services/index.ts +++ b/x-pack/plugins/apm/server/lib/services/get_services/index.ts @@ -6,11 +6,7 @@ import { isEmpty } from 'lodash'; import { PromiseReturnType } from '../../../../typings/common'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { hasHistoricalAgentData } from './has_historical_agent_data'; import { getLegacyDataStatus } from './get_legacy_data_status'; import { getServicesItems } from './get_services_items'; @@ -20,17 +16,14 @@ export type ServiceListAPIResponse = PromiseReturnType; export async function getServices({ setup, searchAggregatedTransactions, - mlAnomaliesEnvironment, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; - mlAnomaliesEnvironment?: string; }) { const [items, hasLegacyData] = await Promise.all([ getServicesItems({ setup, searchAggregatedTransactions, - mlAnomaliesEnvironment, }), getLegacyDataStatus(setup), ]); diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap index bd6cefa79346..c678e7db711b 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/transaction_groups/__snapshots__/queries.test.ts.snap @@ -61,7 +61,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -128,7 +128,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -195,7 +195,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -270,7 +270,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -325,7 +325,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -380,7 +380,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -441,7 +441,7 @@ Array [ }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts index 5d581149db66..0a4d9748f259 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts @@ -15,11 +15,7 @@ import { getTransactionGroupsProjection } from '../../projections/transaction_gr import { mergeProjection } from '../../projections/util/merge_projection'; import { PromiseReturnType } from '../../../../observability/typings/common'; import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getAverages, getSums, @@ -57,7 +53,7 @@ export type TransactionGroupRequestBase = ReturnType< }; }; -export type TransactionGroupSetup = Setup & SetupTimeRange & SetupUIFilters; +export type TransactionGroupSetup = Setup & SetupTimeRange; function getItemsWithRelativeImpact( setup: TransactionGroupSetup, diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts index 3dc126c45d32..d5289430b269 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts @@ -12,11 +12,7 @@ import { EVENT_OUTCOME, } from '../../../common/elasticsearch_fieldnames'; import { rangeFilter } from '../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { getBucketSize } from '../helpers/get_bucket_size'; import { getProcessorEventForAggregatedTransactions, @@ -33,10 +29,10 @@ export async function getErrorRate({ serviceName: string; transactionType?: string; transactionName?: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { - const { start, end, uiFiltersES, apmEventClient } = setup; + const { start, end, esFilter, apmEventClient } = setup; const transactionNamefilter = transactionName ? [{ term: { [TRANSACTION_NAME]: transactionName } }] @@ -53,7 +49,7 @@ export async function getErrorRate({ }, ...transactionNamefilter, ...transactionTypefilter, - ...uiFiltersES, + ...esFilter, ]; const params = { diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts index 6c9b23b3dc07..7e1aad075fb1 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_sample_for_group.ts @@ -12,11 +12,7 @@ import { } from '../../../common/elasticsearch_fieldnames'; import { ProcessorEvent } from '../../../common/processor_event'; import { rangeFilter } from '../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; export async function getTransactionSampleForGroup({ serviceName, @@ -25,9 +21,9 @@ export async function getTransactionSampleForGroup({ }: { serviceName: string; transactionName: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { - const { apmEventClient, start, end, uiFiltersES } = setup; + const { apmEventClient, start, end, esFilter } = setup; const filter = [ { @@ -43,7 +39,7 @@ export async function getTransactionSampleForGroup({ [TRANSACTION_NAME]: transactionName, }, }, - ...uiFiltersES, + ...esFilter, ]; const getSampledTransaction = async () => { diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/index.ts b/x-pack/plugins/apm/server/lib/transaction_groups/index.ts index 6e0d619268d4..379651102924 100644 --- a/x-pack/plugins/apm/server/lib/transaction_groups/index.ts +++ b/x-pack/plugins/apm/server/lib/transaction_groups/index.ts @@ -4,16 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; import { transactionGroupsFetcher, Options } from './fetcher'; export async function getTransactionGroupList( options: Options, - setup: Setup & SetupTimeRange & SetupUIFilters + setup: Setup & SetupTimeRange ) { const bucketSize = setup.config['xpack.apm.ui.transactionGroupBucketSize']; return await transactionGroupsFetcher(options, setup, bucketSize); diff --git a/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap index c63dfcc0c0ec..3e0a7317afd7 100644 --- a/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/transactions/__snapshots__/queries.test.ts.snap @@ -161,7 +161,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -295,7 +295,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -401,7 +401,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], @@ -502,7 +502,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -608,7 +608,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, Object { @@ -673,7 +673,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts index 34863c64f980..8bbcaebe0651 100644 --- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts +++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts @@ -36,7 +36,8 @@ function getMockSetup(esResponse: any) { get: () => 'myIndex', } ) as APMConfig, - uiFiltersES: [], + uiFilters: {}, + esFilter: [], indices: mockIndices, dynamicIndexPattern: null as any, }; diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts index 9730ddbbf38d..8febdc898ab9 100644 --- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts @@ -16,11 +16,7 @@ import { TRANSACTION_NAME, TRANSACTION_BREAKDOWN_COUNT, } from '../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { rangeFilter } from '../../../../common/utils/range_filter'; import { getMetricsDateHistogramParams } from '../../helpers/metrics'; import { MAX_KPIS } from './constants'; @@ -32,12 +28,12 @@ export async function getTransactionBreakdown({ transactionName, transactionType, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; transactionName?: string; transactionType: string; }) { - const { uiFiltersES, apmEventClient, start, end, config } = setup; + const { esFilter, apmEventClient, start, end, config } = setup; const subAggs = { sum_all_self_times: { @@ -84,7 +80,7 @@ export async function getTransactionBreakdown({ { term: { [SERVICE_NAME]: serviceName } }, { term: { [TRANSACTION_TYPE]: transactionType } }, { range: rangeFilter(start, end) }, - ...uiFiltersES, + ...esFilter, ]; if (transactionName) { diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts index 3cf9a54e3fe9..287c7bc2c47f 100644 --- a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts +++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/fetcher.ts @@ -5,6 +5,7 @@ */ import { Logger } from 'kibana/server'; +import { ESSearchResponse } from '../../../../../typings/elasticsearch'; import { PromiseReturnType } from '../../../../../../observability/typings/common'; import { Setup, SetupTimeRange } from '../../../helpers/setup_request'; @@ -47,7 +48,7 @@ export async function anomalySeriesFetcher({ filter: [ { term: { job_id: jobId } }, { exists: { field: 'bucket_span' } }, - { term: { result_type: 'model_plot' } }, + { terms: { result_type: ['model_plot', 'record'] } }, { term: { partition_field_value: serviceName } }, { term: { by_field_value: transactionType } }, { @@ -67,7 +68,7 @@ export async function anomalySeriesFetcher({ extended_bounds: { min: newStart, max: end }, }, aggs: { - anomaly_score: { max: { field: 'anomaly_score' } }, + anomaly_score: { max: { field: 'record_score' } }, lower: { min: { field: 'model_lower' } }, upper: { max: { field: 'model_upper' } }, }, @@ -77,7 +78,11 @@ export async function anomalySeriesFetcher({ }; try { - const response = await ml.mlSystem.mlAnomalySearch(params); + const response: ESSearchResponse< + unknown, + typeof params + > = (await ml.mlSystem.mlAnomalySearch(params)) as any; + return response; } catch (err) { const isHttpError = 'statusCode' in err; diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts index d8865f0049d3..f11623eaa2da 100644 --- a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts @@ -5,17 +5,13 @@ */ import { Logger } from 'kibana/server'; import { isNumber } from 'lodash'; +import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values'; import { getBucketSize } from '../../../helpers/get_bucket_size'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../helpers/setup_request'; import { anomalySeriesFetcher } from './fetcher'; import { getMlBucketSize } from './get_ml_bucket_size'; import { anomalySeriesTransform } from './transform'; import { getMLJobIds } from '../../../service_map/get_service_anomalies'; -import { UIFilters } from '../../../../../typings/ui_filters'; export async function getAnomalySeries({ serviceName, @@ -24,15 +20,13 @@ export async function getAnomalySeries({ timeSeriesDates, setup, logger, - uiFilters, }: { serviceName: string; transactionType: string | undefined; transactionName: string | undefined; timeSeriesDates: number[]; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; logger: Logger; - uiFilters: UIFilters; }) { // don't fetch anomalies for transaction details page if (transactionName) { @@ -44,12 +38,22 @@ export async function getAnomalySeries({ return; } + const { uiFilters, start, end } = setup; + const { environment } = uiFilters; + + // don't fetch anomalies when no specific environment is selected + if (environment === ENVIRONMENT_ALL.value) { + return; + } + // don't fetch anomalies if unknown uiFilters are applied const knownFilters = ['environment', 'serviceName']; - const uiFilterNames = Object.keys(uiFilters); - if ( - uiFilterNames.some((uiFilterName) => !knownFilters.includes(uiFilterName)) - ) { + const hasUnknownFiltersApplied = Object.entries(setup.uiFilters) + .filter(([key, value]) => !!value) + .map(([key]) => key) + .some((uiFilterName) => !knownFilters.includes(uiFilterName)); + + if (hasUnknownFiltersApplied) { return; } @@ -64,15 +68,8 @@ export async function getAnomalySeries({ return; } - const mlJobIds = await getMLJobIds( - setup.ml.anomalyDetectors, - uiFilters.environment - ); + const mlJobIds = await getMLJobIds(setup.ml.anomalyDetectors, environment); - // don't fetch anomalies if there are isn't exaclty 1 ML job match for the given environment - if (mlJobIds.length !== 1) { - return; - } const jobId = mlJobIds[0]; const mlBucketSize = await getMlBucketSize({ setup, jobId, logger }); @@ -80,7 +77,6 @@ export async function getAnomalySeries({ return; } - const { start, end } = setup; const { intervalString, bucketSize } = getBucketSize(start, end); const esResponse = await anomalySeriesFetcher({ diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts index fdbd99bf274d..75dfae3e7375 100644 --- a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts +++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.test.ts @@ -29,7 +29,10 @@ describe('timeseriesFetcher', () => { get: () => 'myIndex', } ) as APMConfig, - uiFiltersES: [ + uiFilters: { + environment: 'test', + }, + esFilter: [ { term: { 'service.environment': 'test' }, }, diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts index 5a3948f57743..e2edbbec63d4 100644 --- a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts +++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts @@ -14,11 +14,7 @@ import { import { PromiseReturnType } from '../../../../../../observability/typings/common'; import { getBucketSize } from '../../../helpers/get_bucket_size'; import { rangeFilter } from '../../../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../helpers/setup_request'; import { getProcessorEventForAggregatedTransactions, getTransactionDurationFieldForAggregatedTransactions, @@ -36,10 +32,10 @@ export function timeseriesFetcher({ serviceName: string; transactionType: string | undefined; transactionName: string | undefined; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { - const { start, end, uiFiltersES, apmEventClient } = setup; + const { start, end, apmEventClient } = setup; const { intervalString } = getBucketSize(start, end); const filter: ESFilter[] = [ @@ -48,7 +44,7 @@ export function timeseriesFetcher({ ...getDocumentTypeFilterForAggregatedTransactions( searchAggregatedTransactions ), - ...uiFiltersES, + ...setup.esFilter, ]; if (transactionName) { diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts index 81dca447f16c..c0421005dd06 100644 --- a/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/index.ts @@ -5,11 +5,7 @@ */ import { getBucketSize } from '../../../helpers/get_bucket_size'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../helpers/setup_request'; import { timeseriesFetcher } from './fetcher'; import { timeseriesTransformer } from './transform'; @@ -17,7 +13,7 @@ export async function getApmTimeseriesData(options: { serviceName: string; transactionType: string | undefined; transactionName: string | undefined; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { const { start, end } = options.setup; diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/index.ts index 43abf0b1a1d3..d8593612c058 100644 --- a/x-pack/plugins/apm/server/lib/transactions/charts/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/charts/index.ts @@ -6,15 +6,10 @@ import { Logger } from 'kibana/server'; import { PromiseReturnType } from '../../../../../observability/typings/common'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { getAnomalySeries } from './get_anomaly_data'; import { getApmTimeseriesData } from './get_timeseries_data'; import { ApmTimeSeriesResponse } from './get_timeseries_data/transform'; -import { UIFilters } from '../../../../typings/ui_filters'; function getDates(apmTimeseries: ApmTimeSeriesResponse) { return apmTimeseries.responseTimes.avg.map((p) => p.x); @@ -27,10 +22,9 @@ export async function getTransactionCharts(options: { serviceName: string; transactionType: string | undefined; transactionName: string | undefined; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; logger: Logger; - uiFilters: UIFilters; }) { const apmTimeseries = await getApmTimeseriesData(options); const anomalyTimeseries = await getAnomalySeries({ diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts index 6e2fe34a5f5e..34d01627a286 100644 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts @@ -17,11 +17,7 @@ import { TRANSACTION_TYPE, } from '../../../../../common/elasticsearch_fieldnames'; import { rangeFilter } from '../../../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../../helpers/setup_request'; import { getDocumentTypeFilterForAggregatedTransactions, getProcessorEventForAggregatedTransactions, @@ -66,17 +62,17 @@ export async function getBuckets({ traceId: string; distributionMax: number; bucketSize: number; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { - const { start, end, uiFiltersES, apmEventClient } = setup; + const { start, end, esFilter, apmEventClient } = setup; const commonFilters = [ { term: { [SERVICE_NAME]: serviceName } }, { term: { [TRANSACTION_TYPE]: transactionType } }, { term: { [TRANSACTION_NAME]: transactionName } }, { range: rangeFilter(start, end) }, - ...uiFiltersES, + ...esFilter, ]; async function getSamplesForDistributionBuckets() { diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts index 24ca2a4a07b6..249b1c4fbb20 100644 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution_max.ts @@ -9,11 +9,7 @@ import { TRANSACTION_NAME, TRANSACTION_TYPE, } from '../../../../common/elasticsearch_fieldnames'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { getProcessorEventForAggregatedTransactions, getTransactionDurationFieldForAggregatedTransactions, @@ -29,10 +25,10 @@ export async function getDistributionMax({ serviceName: string; transactionName: string; transactionType: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { - const { start, end, uiFiltersES, apmEventClient } = setup; + const { start, end, esFilter, apmEventClient } = setup; const params = { apm: { @@ -59,7 +55,7 @@ export async function getDistributionMax({ }, }, }, - ...uiFiltersES, + ...esFilter, ], }, }, diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts index b9ab36fb08d4..deafc37ee42e 100644 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/index.ts @@ -5,11 +5,7 @@ */ import { PromiseReturnType } from '../../../../../observability/typings/common'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { getBuckets } from './get_buckets'; import { getDistributionMax } from './get_distribution_max'; import { roundToNearestFiveOrTen } from '../../helpers/round_to_nearest_five_or_ten'; @@ -39,7 +35,7 @@ export async function getTransactionDistribution({ transactionType: string; transactionId: string; traceId: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { const distributionMax = await getDistributionMax({ diff --git a/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts index 9aa1a8f4de87..8958be081961 100644 --- a/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts +++ b/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts @@ -9,11 +9,7 @@ import { TRANSACTION_ID, } from '../../../../common/elasticsearch_fieldnames'; import { rangeFilter } from '../../../../common/utils/range_filter'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../helpers/setup_request'; import { ProcessorEvent } from '../../../../common/processor_event'; export async function getTransaction({ @@ -23,7 +19,7 @@ export async function getTransaction({ }: { transactionId: string; traceId: string; - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { const { start, end, apmEventClient } = setup; diff --git a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts index 87b8bc7c4ae9..eff9451c9e1c 100644 --- a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts +++ b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts @@ -56,7 +56,6 @@ describe('transaction queries', () => { setup, searchAggregatedTransactions: false, logger: loggerMock.create(), - uiFilters: {}, }) ); expect(mock.params).toMatchSnapshot(); @@ -71,7 +70,6 @@ describe('transaction queries', () => { setup, searchAggregatedTransactions: false, logger: loggerMock.create(), - uiFilters: {}, }) ); expect(mock.params).toMatchSnapshot(); @@ -86,7 +84,6 @@ describe('transaction queries', () => { setup, searchAggregatedTransactions: false, logger: loggerMock.create(), - uiFilters: {}, }) ); diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap index 5f3843271928..e7ca65eb740b 100644 --- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap +++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap @@ -46,7 +46,7 @@ Object { }, Object { "term": Object { - "my.custom.ui.filter": "foo-bar", + "service.environment": "test", }, }, ], diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts index 10f6e93c1cfc..9fbdba679b66 100644 --- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts +++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts @@ -8,7 +8,7 @@ import { omit } from 'lodash'; import { mergeProjection } from '../../../projections/util/merge_projection'; import { Projection } from '../../../projections/typings'; import { UIFilters } from '../../../../typings/ui_filters'; -import { getUiFiltersES } from '../../helpers/convert_ui_filters/get_ui_filters_es'; +import { getEsFilter } from '../../helpers/convert_ui_filters/get_es_filter'; import { localUIFilters } from './config'; import { LocalUIFilterName } from '../../../../common/ui_filter'; @@ -22,7 +22,7 @@ export const getLocalFilterQuery = ({ localUIFilterName: LocalUIFilterName; }) => { const field = localUIFilters[localUIFilterName]; - const filter = getUiFiltersES(omit(uiFilters, field.name)); + const filter = getEsFilter(omit(uiFilters, field.name)); const bucketCountAggregation = projection.body.aggs ? { diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts index 22fa20e255f6..f4e8aafc1bcf 100644 --- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts +++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts @@ -15,7 +15,7 @@ describe('local ui filter queries', () => { let mock: SearchParamsMock; beforeEach(() => { - jest.mock('../../helpers/convert_ui_filters/get_ui_filters_es', () => { + jest.mock('../../helpers/convert_ui_filters/get_es_filter', () => { return []; }); }); diff --git a/x-pack/plugins/apm/server/projections/errors.ts b/x-pack/plugins/apm/server/projections/errors.ts index 49a0e9f479d2..173dc94a0840 100644 --- a/x-pack/plugins/apm/server/projections/errors.ts +++ b/x-pack/plugins/apm/server/projections/errors.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { SERVICE_NAME, ERROR_GROUP_ID, @@ -20,10 +16,10 @@ export function getErrorGroupsProjection({ setup, serviceName, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; }) { - const { start, end, uiFiltersES } = setup; + const { start, end, esFilter } = setup; return { apm: { @@ -35,7 +31,7 @@ export function getErrorGroupsProjection({ filter: [ { term: { [SERVICE_NAME]: serviceName } }, { range: rangeFilter(start, end) }, - ...uiFiltersES, + ...esFilter, ], }, }, diff --git a/x-pack/plugins/apm/server/projections/metrics.ts b/x-pack/plugins/apm/server/projections/metrics.ts index eb80a6bc7324..c3b5db5be6af 100644 --- a/x-pack/plugins/apm/server/projections/metrics.ts +++ b/x-pack/plugins/apm/server/projections/metrics.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { SERVICE_NAME, SERVICE_NODE_NAME, @@ -34,17 +30,17 @@ export function getMetricsProjection({ serviceName, serviceNodeName, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; serviceNodeName?: string; }) { - const { start, end, uiFiltersES } = setup; + const { start, end, esFilter } = setup; const filter = [ { term: { [SERVICE_NAME]: serviceName } }, { range: rangeFilter(start, end) }, ...getServiceNodeNameFilters(serviceNodeName), - ...uiFiltersES, + ...esFilter, ]; return { diff --git a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts index c27314923f6b..96ee26c6e65f 100644 --- a/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts +++ b/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { AGENT_NAME, TRANSACTION_TYPE, @@ -22,10 +18,10 @@ export function getRumPageLoadTransactionsProjection({ setup, urlQuery, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; urlQuery?: string; }) { - const { start, end, uiFiltersES } = setup; + const { start, end, esFilter } = setup; const bool = { filter: [ @@ -49,7 +45,7 @@ export function getRumPageLoadTransactionsProjection({ }, ] : []), - ...uiFiltersES, + ...esFilter, ], }; @@ -68,9 +64,9 @@ export function getRumPageLoadTransactionsProjection({ export function getRumErrorsProjection({ setup, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; }) { - const { start, end, uiFiltersES } = setup; + const { start, end, esFilter: esFilter } = setup; const bool = { filter: [ @@ -82,7 +78,7 @@ export function getRumErrorsProjection({ [SERVICE_LANGUAGE_NAME]: 'javascript', }, }, - ...uiFiltersES, + ...esFilter, ], }; diff --git a/x-pack/plugins/apm/server/projections/service_nodes.ts b/x-pack/plugins/apm/server/projections/service_nodes.ts index 87fe815a12d0..ed8d4c7409ed 100644 --- a/x-pack/plugins/apm/server/projections/service_nodes.ts +++ b/x-pack/plugins/apm/server/projections/service_nodes.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { SERVICE_NODE_NAME } from '../../common/elasticsearch_fieldnames'; import { mergeProjection } from './util/merge_projection'; import { getMetricsProjection } from './metrics'; @@ -18,7 +14,7 @@ export function getServiceNodesProjection({ serviceName, serviceNodeName, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName: string; serviceNodeName?: string; }) { diff --git a/x-pack/plugins/apm/server/projections/services.ts b/x-pack/plugins/apm/server/projections/services.ts index ba61f72519a2..d912a9554651 100644 --- a/x-pack/plugins/apm/server/projections/services.ts +++ b/x-pack/plugins/apm/server/projections/services.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupUIFilters, - SetupTimeRange, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { SERVICE_NAME } from '../../common/elasticsearch_fieldnames'; import { rangeFilter } from '../../common/utils/range_filter'; import { ProcessorEvent } from '../../common/processor_event'; @@ -18,10 +14,10 @@ export function getServicesProjection({ setup, searchAggregatedTransactions, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; searchAggregatedTransactions: boolean; }) { - const { start, end, uiFiltersES } = setup; + const { start, end, esFilter } = setup; return { apm: { @@ -37,7 +33,7 @@ export function getServicesProjection({ size: 0, query: { bool: { - filter: [{ range: rangeFilter(start, end) }, ...uiFiltersES], + filter: [{ range: rangeFilter(start, end) }, ...esFilter], }, }, aggs: { diff --git a/x-pack/plugins/apm/server/projections/transaction_groups.ts b/x-pack/plugins/apm/server/projections/transaction_groups.ts index 0cc3a7a35d21..2ce720eb1216 100644 --- a/x-pack/plugins/apm/server/projections/transaction_groups.ts +++ b/x-pack/plugins/apm/server/projections/transaction_groups.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ import { omit } from 'lodash'; -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { TRANSACTION_NAME, PARENT_ID, @@ -22,7 +18,7 @@ export function getTransactionGroupsProjection({ setup, options, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; options: Options; }) { const transactionsProjection = getTransactionsProjection({ diff --git a/x-pack/plugins/apm/server/projections/transactions.ts b/x-pack/plugins/apm/server/projections/transactions.ts index 8e9bb3bf321f..548e77b5d2cd 100644 --- a/x-pack/plugins/apm/server/projections/transactions.ts +++ b/x-pack/plugins/apm/server/projections/transactions.ts @@ -4,11 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { - Setup, - SetupTimeRange, - SetupUIFilters, -} from '../../server/lib/helpers/setup_request'; +import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request'; import { SERVICE_NAME, TRANSACTION_TYPE, @@ -27,13 +23,13 @@ export function getTransactionsProjection({ transactionType, searchAggregatedTransactions, }: { - setup: Setup & SetupTimeRange & SetupUIFilters; + setup: Setup & SetupTimeRange; serviceName?: string; transactionName?: string; transactionType?: string; searchAggregatedTransactions: boolean; }) { - const { start, end, uiFiltersES } = setup; + const { start, end, esFilter } = setup; const transactionNameFilter = transactionName ? [{ term: { [TRANSACTION_NAME]: transactionName } }] @@ -51,7 +47,7 @@ export function getTransactionsProjection({ ...transactionNameFilter, ...transactionTypeFilter, ...serviceNameFilter, - ...uiFiltersES, + ...esFilter, ...getDocumentTypeFilterForAggregatedTransactions( searchAggregatedTransactions ), diff --git a/x-pack/plugins/apm/server/routes/service_map.ts b/x-pack/plugins/apm/server/routes/service_map.ts index 1996d4d4a262..6e86ececd1bf 100644 --- a/x-pack/plugins/apm/server/routes/service_map.ts +++ b/x-pack/plugins/apm/server/routes/service_map.ts @@ -17,7 +17,6 @@ import { createRoute } from './create_route'; import { rangeRt, uiFiltersRt } from './default_api_types'; import { notifyFeatureUsage } from '../feature'; import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions'; -import { getParsedUiFilters } from '../lib/helpers/convert_ui_filters/get_parsed_ui_filters'; export const serviceMapRoute = createRoute(() => ({ path: '/api/apm/service-map', @@ -77,24 +76,20 @@ export const serviceMapServiceNodeRoute = createRoute(() => ({ if (!isActivePlatinumLicense(context.licensing.license)) { throw Boom.forbidden(invalidLicenseMessage); } - const logger = context.logger; const setup = await setupRequest(context, request); const { - query: { uiFilters: uiFiltersJson }, path: { serviceName }, } = context.params; const searchAggregatedTransactions = await getSearchAggregatedTransactions( setup ); - const uiFilters = getParsedUiFilters({ uiFilters: uiFiltersJson, logger }); return getServiceMapServiceNodeInfo({ setup, serviceName, searchAggregatedTransactions, - uiFilters, }); }, })); diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts index 4bb10f31ba6a..538ba3926c79 100644 --- a/x-pack/plugins/apm/server/routes/services.ts +++ b/x-pack/plugins/apm/server/routes/services.ts @@ -17,7 +17,6 @@ import { uiFiltersRt, rangeRt } from './default_api_types'; import { getServiceAnnotations } from '../lib/services/annotations'; import { dateAsStringRt } from '../../common/runtime_types/date_as_string_rt'; import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions'; -import { getParsedUiFilters } from '../lib/helpers/convert_ui_filters/get_parsed_ui_filters'; export const servicesRoute = createRoute(() => ({ path: '/api/apm/services', @@ -25,22 +24,13 @@ export const servicesRoute = createRoute(() => ({ query: t.intersection([uiFiltersRt, rangeRt]), }, handler: async ({ context, request }) => { - const { environment } = getParsedUiFilters({ - uiFilters: context.params.query.uiFilters, - logger: context.logger, - }); - const setup = await setupRequest(context, request); const searchAggregatedTransactions = await getSearchAggregatedTransactions( setup ); - const services = await getServices({ - setup, - searchAggregatedTransactions, - mlAnomaliesEnvironment: environment, - }); + const services = await getServices({ setup, searchAggregatedTransactions }); return services; }, diff --git a/x-pack/plugins/apm/server/routes/transaction_groups.ts b/x-pack/plugins/apm/server/routes/transaction_groups.ts index dd1335fb2c2a..18fc73b468cd 100644 --- a/x-pack/plugins/apm/server/routes/transaction_groups.ts +++ b/x-pack/plugins/apm/server/routes/transaction_groups.ts @@ -5,6 +5,7 @@ */ import * as t from 'io-ts'; +import Boom from 'boom'; import { setupRequest } from '../lib/helpers/setup_request'; import { getTransactionCharts } from '../lib/transactions/charts'; import { getTransactionDistribution } from '../lib/transactions/distribution'; @@ -15,7 +16,6 @@ import { uiFiltersRt, rangeRt } from './default_api_types'; import { getTransactionSampleForGroup } from '../lib/transaction_groups/get_transaction_sample_for_group'; import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions'; import { getErrorRate } from '../lib/transaction_groups/get_error_rate'; -import { getParsedUiFilters } from '../lib/helpers/convert_ui_filters/get_parsed_ui_filters'; export const transactionGroupsRoute = createRoute(() => ({ path: '/api/apm/services/{serviceName}/transaction_groups', @@ -71,27 +71,28 @@ export const transactionGroupsChartsRoute = createRoute(() => ({ const setup = await setupRequest(context, request); const logger = context.logger; const { serviceName } = context.params.path; - const { - transactionType, - transactionName, - uiFilters: uiFiltersJson, - } = context.params.query; + const { transactionType, transactionName } = context.params.query; - const uiFilters = getParsedUiFilters({ uiFilters: uiFiltersJson, logger }); + if (!setup.uiFilters.environment) { + throw Boom.badRequest( + `environment is a required property of the ?uiFilters JSON for transaction_groups/charts.` + ); + } const searchAggregatedTransactions = await getSearchAggregatedTransactions( setup ); - return getTransactionCharts({ + const options = { serviceName, transactionType, transactionName, setup, searchAggregatedTransactions, logger, - uiFilters, - }); + }; + + return getTransactionCharts(options); }, })); diff --git a/x-pack/plugins/apm/server/routes/ui_filters.ts b/x-pack/plugins/apm/server/routes/ui_filters.ts index 936d460102dc..26fe0118c02e 100644 --- a/x-pack/plugins/apm/server/routes/ui_filters.ts +++ b/x-pack/plugins/apm/server/routes/ui_filters.ts @@ -9,13 +9,12 @@ import { omit } from 'lodash'; import { setupRequest, Setup, - SetupUIFilters, SetupTimeRange, } from '../lib/helpers/setup_request'; import { getEnvironments } from '../lib/ui_filters/get_environments'; import { Projection } from '../projections/typings'; import { localUIFilterNames } from '../lib/ui_filters/local_ui_filters/config'; -import { getUiFiltersES } from '../lib/helpers/convert_ui_filters/get_ui_filters_es'; +import { getEsFilter } from '../lib/helpers/convert_ui_filters/get_es_filter'; import { getLocalUIFilters } from '../lib/ui_filters/local_ui_filters'; import { getServicesProjection } from '../projections/services'; import { getTransactionGroupsProjection } from '../projections/transaction_groups'; @@ -97,23 +96,23 @@ function createLocalFiltersRoute< }, handler: async ({ context, request }) => { const setup = await setupRequest(context, request); + const { uiFilters } = setup; const { query } = context.params; - const { uiFilters, filterNames } = query; - const parsedUiFilters = JSON.parse(uiFilters); + const { filterNames } = query; const projection = await getProjection({ query, context, setup: { ...setup, - uiFiltersES: getUiFiltersES(omit(parsedUiFilters, filterNames)), + esFilter: getEsFilter(omit(uiFilters, filterNames)), }, }); return getLocalUIFilters({ projection, setup, - uiFilters: parsedUiFilters, + uiFilters, localFilterNames: filterNames, }); }, @@ -271,6 +270,6 @@ type GetProjection< context, }: { query: t.TypeOf; - setup: Setup & SetupUIFilters & SetupTimeRange; + setup: Setup & SetupTimeRange; context: APMRequestHandlerContext; }) => Promise | TProjection; diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx index 98c1436b2b9b..18b990b35b5a 100644 --- a/x-pack/plugins/apm/server/utils/test_helpers.tsx +++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx @@ -9,6 +9,7 @@ import { ESSearchRequest, } from '../../typings/elasticsearch'; import { PromiseReturnType } from '../../typings/common'; +import { UIFilters } from '../../typings/ui_filters'; import { APMConfig } from '..'; interface Options { @@ -23,7 +24,8 @@ interface MockSetup { apmEventClient: any; internalClient: any; config: APMConfig; - uiFiltersES: ESFilter[]; + uiFilters: UIFilters; + esFilter: ESFilter[]; indices: { /* eslint-disable @typescript-eslint/naming-convention */ 'apm_oss.sourcemapIndices': string; @@ -78,7 +80,8 @@ export async function inspectSearchParams( }, } ) as APMConfig, - uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }], + uiFilters: { environment: 'test' }, + esFilter: [{ term: { 'service.environment': 'test' } }], indices: { /* eslint-disable @typescript-eslint/naming-convention */ 'apm_oss.sourcemapIndices': 'myIndex', diff --git a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts b/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts index e0e13b7b7fb9..a2223e556028 100644 --- a/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts +++ b/x-pack/test/apm_api_integration/basic/tests/feature_controls.ts @@ -107,21 +107,21 @@ export default function featureControlsTests({ getService }: FtrProviderContext) }, { req: { - url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&uiFilters=%7B%7D`, + url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&uiFilters=%7B%22environment%22%3A%22testing%22%7D`, }, expectForbidden: expect404, expectResponse: expect200, }, { req: { - url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&uiFilters=%7B%7D`, + url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&uiFilters=%7B%22environment%22%3A%22testing%22%7D`, }, expectForbidden: expect404, expectResponse: expect200, }, { req: { - url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&transactionName=baz&uiFilters=%7B%7D`, + url: `/api/apm/services/foo/transaction_groups/charts?start=${start}&end=${end}&transactionType=bar&transactionName=baz&uiFilters=%7B%22environment%22%3A%22testing%22%7D`, }, expectForbidden: expect404, expectResponse: expect200, diff --git a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts index c9581079b995..d7d6d613281e 100644 --- a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts +++ b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/transaction_charts.ts @@ -19,7 +19,7 @@ export default function ApiTest({ getService }: FtrProviderContext) { // url parameters const start = encodeURIComponent(metadata.start); const end = encodeURIComponent(metadata.end); - const uiFilters = encodeURIComponent(JSON.stringify({})); + const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'testing' })); describe('Transaction charts', () => { describe('when data is not loaded ', () => { diff --git a/x-pack/test/apm_api_integration/trial/tests/index.ts b/x-pack/test/apm_api_integration/trial/tests/index.ts index a6a031def34e..e60927936639 100644 --- a/x-pack/test/apm_api_integration/trial/tests/index.ts +++ b/x-pack/test/apm_api_integration/trial/tests/index.ts @@ -16,6 +16,7 @@ export default function observabilityApiIntegrationTests({ loadTestFile }: FtrPr describe('Services', function () { loadTestFile(require.resolve('./services/annotations')); loadTestFile(require.resolve('./services/top_services.ts')); + loadTestFile(require.resolve('./services/transaction_groups_charts')); }); describe('Settings', function () { diff --git a/x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap b/x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap new file mode 100644 index 000000000000..8169e73202fb --- /dev/null +++ b/x-pack/test/apm_api_integration/trial/tests/services/__snapshots__/transaction_groups_charts.snap @@ -0,0 +1,43 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`APM Transaction Overview when data is loaded and fetching transaction groups charts with uiFilters when not defined environments selected should return the correct anomaly boundaries 1`] = `Array []`; + +exports[`APM Transaction Overview when data is loaded and fetching transaction groups charts with uiFilters with environment selected and empty kuery filter should return a non-empty anomaly series 1`] = ` +Array [ + Object { + "x": 1601389800000, + "y": 1206111.33487531, + "y0": 10555.1290143587, + }, + Object { + "x": 1601390700000, + "y": 1223987.49321778, + "y0": 10177.4677901726, + }, + Object { + "x": 1601391600000, + "y": 1223987.49321778, + "y0": 10177.4677901726, + }, +] +`; + +exports[`APM Transaction Overview when data is loaded and fetching transaction groups charts with uiFilters with environment selected in uiFilters should return a non-empty anomaly series 1`] = ` +Array [ + Object { + "x": 1601389800000, + "y": 1206111.33487531, + "y0": 10555.1290143587, + }, + Object { + "x": 1601390700000, + "y": 1223987.49321778, + "y0": 10177.4677901726, + }, + Object { + "x": 1601391600000, + "y": 1223987.49321778, + "y0": 10177.4677901726, + }, +] +`; diff --git a/x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts b/x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts new file mode 100644 index 000000000000..c35dfcc3817a --- /dev/null +++ b/x-pack/test/apm_api_integration/trial/tests/services/transaction_groups_charts.ts @@ -0,0 +1,161 @@ +/* + * 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 { expectSnapshot } from '../../../common/match_snapshot'; +import { PromiseReturnType } from '../../../../../plugins/apm/typings/common'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; +import archives_metadata from '../../../common/archives_metadata'; + +export default function ApiTest({ getService }: FtrProviderContext) { + const supertest = getService('supertest'); + const esArchiver = getService('esArchiver'); + + const archiveName = 'apm_8.0.0'; + + const range = archives_metadata[archiveName]; + + // url parameters + const start = encodeURIComponent(range.start); + const end = encodeURIComponent(range.end); + const transactionType = 'request'; + + describe('APM Transaction Overview', () => { + describe('when data is loaded', () => { + before(() => esArchiver.load(archiveName)); + after(() => esArchiver.unload(archiveName)); + + describe('and fetching transaction groups charts with uiFilters', () => { + const serviceName = 'opbeans-java'; + let response: PromiseReturnType; + + describe('without environment', () => { + const uiFilters = encodeURIComponent(JSON.stringify({})); + before(async () => { + response = await supertest.get( + `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}` + ); + }); + it('should return an error response', () => { + expect(response.status).to.eql(400); + }); + }); + + describe('without uiFilters', () => { + before(async () => { + response = await supertest.get( + `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}` + ); + }); + it('should return an error response', () => { + expect(response.status).to.eql(400); + }); + }); + + describe('with environment selected in uiFilters', () => { + const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'production' })); + before(async () => { + response = await supertest.get( + `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}` + ); + }); + + it('should have a successful response', () => { + expect(response.status).to.eql(200); + }); + + it('should return the ML job id for anomalies of the selected environment', () => { + expect(response.body).to.have.property('anomalyTimeseries'); + expect(response.body.anomalyTimeseries).to.have.property('jobId'); + expectSnapshot(response.body.anomalyTimeseries.jobId).toMatchInline( + `"apm-production-229a-high_mean_transaction_duration"` + ); + }); + + it('should return a non-empty anomaly series', () => { + expect(response.body).to.have.property('anomalyTimeseries'); + expect(response.body.anomalyTimeseries.anomalyBoundaries?.length).to.be.greaterThan(0); + expectSnapshot(response.body.anomalyTimeseries.anomalyBoundaries).toMatch(); + }); + }); + + describe('when not defined environments selected', () => { + const uiFilters = encodeURIComponent( + JSON.stringify({ environment: 'ENVIRONMENT_NOT_DEFINED' }) + ); + before(async () => { + response = await supertest.get( + `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}` + ); + }); + + it('should have a successful response', () => { + expect(response.status).to.eql(200); + }); + + it('should return the ML job id for anomalies with no defined environment', () => { + expect(response.body).to.have.property('anomalyTimeseries'); + expect(response.body.anomalyTimeseries).to.have.property('jobId'); + expectSnapshot(response.body.anomalyTimeseries.jobId).toMatchInline( + `"apm-environment_not_defined-7ed6-high_mean_transaction_duration"` + ); + }); + + it('should return the correct anomaly boundaries', () => { + expect(response.body).to.have.property('anomalyTimeseries'); + expectSnapshot(response.body.anomalyTimeseries.anomalyBoundaries).toMatch(); + }); + }); + + describe('with all environments selected', () => { + const uiFilters = encodeURIComponent(JSON.stringify({ environment: 'ENVIRONMENT_ALL' })); + before(async () => { + response = await supertest.get( + `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}` + ); + }); + + it('should have a successful response', () => { + expect(response.status).to.eql(200); + }); + + it('should not return anomaly timeseries data', () => { + expect(response.body).to.not.have.property('anomalyTimeseries'); + }); + }); + + describe('with environment selected and empty kuery filter', () => { + const uiFilters = encodeURIComponent( + JSON.stringify({ kuery: '', environment: 'production' }) + ); + before(async () => { + response = await supertest.get( + `/api/apm/services/${serviceName}/transaction_groups/charts?start=${start}&end=${end}&transactionType=${transactionType}&uiFilters=${uiFilters}` + ); + }); + + it('should have a successful response', () => { + expect(response.status).to.eql(200); + }); + + it('should return the ML job id for anomalies of the selected environment', () => { + expect(response.body).to.have.property('anomalyTimeseries'); + expect(response.body.anomalyTimeseries).to.have.property('jobId'); + expectSnapshot(response.body.anomalyTimeseries.jobId).toMatchInline( + `"apm-production-229a-high_mean_transaction_duration"` + ); + }); + + it('should return a non-empty anomaly series', () => { + expect(response.body).to.have.property('anomalyTimeseries'); + expect(response.body.anomalyTimeseries.anomalyBoundaries?.length).to.be.greaterThan(0); + expectSnapshot(response.body.anomalyTimeseries.anomalyBoundaries).toMatch(); + }); + }); + }); + }); + }); +} From bd9a9a7a2bf65c465dd805815a2b1a6eea03bc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= Date: Fri, 2 Oct 2020 10:45:53 +0200 Subject: [PATCH 16/73] [Security Solution] Refactor react-beautiful-dnd render props (#78128) --- .../timeline/events/all/index.ts | 7 +- .../common/search_strategy/timeline/index.ts | 18 +- .../add_filter_to_global_search_bar/index.tsx | 56 +- .../drag_drop_context_wrapper.tsx | 13 +- .../drag_and_drop/draggable_wrapper.tsx | 131 +- .../drag_and_drop/droppable_wrapper.tsx | 33 +- .../common/components/draggables/index.tsx | 2 +- .../events_viewer/events_viewer.tsx | 28 +- .../common/components/events_viewer/mock.ts | 2 +- .../common/components/ml/entity_draggable.tsx | 67 +- .../components/ml/score/draggable_score.tsx | 76 +- .../recent_timelines/recent_timelines.tsx | 160 +- .../components/flyout/button/index.tsx | 34 +- .../components/formatted_ip/index.tsx | 157 +- .../__snapshots__/timeline.test.tsx.snap | 34 +- .../timeline/auto_save_warning/index.tsx | 121 +- .../body/column_headers/actions/index.tsx | 29 +- .../body/column_headers/column_header.tsx | 43 +- .../timeline/body/column_headers/index.tsx | 29 +- .../body/events/event_column_view.tsx | 18 +- .../timeline/body/events/stateful_event.tsx | 228 +- .../renderers/suricata/suricata_signature.tsx | 82 +- .../body/renderers/zeek/zeek_signature.tsx | 76 +- .../data_providers.test.tsx.snap | 5 - .../__snapshots__/providers.test.tsx.snap | 2243 +++++++++++++---- .../data_providers/data_providers.test.tsx | 27 +- .../timeline/data_providers/index.tsx | 80 +- .../data_providers/provider_badge.tsx | 4 +- .../data_providers/provider_item_badge.tsx | 47 +- .../data_providers/providers.test.tsx | 264 +- .../timeline/data_providers/providers.tsx | 460 ++-- .../timelines/components/timeline/events.ts | 32 +- .../footer/__snapshots__/index.test.tsx.snap | 2 +- .../components/timeline/footer/index.test.tsx | 39 +- .../components/timeline/footer/index.tsx | 90 +- .../header/__snapshots__/index.test.tsx.snap | 5 - .../components/timeline/header/index.tsx | 27 - .../timelines/components/timeline/index.tsx | 78 +- .../timeline/properties/helpers.tsx | 42 +- .../components/timeline/timeline.test.tsx | 210 -- .../components/timeline/timeline.tsx | 26 +- .../public/timelines/containers/index.tsx | 20 +- .../timeline/epic_local_storage.test.tsx | 5 - .../timelines/store/timeline/helpers.ts | 15 +- .../timeline/factory/events/all/index.ts | 9 +- 45 files changed, 3039 insertions(+), 2135 deletions(-) diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts index 0503a9c32746..f673fca290a2 100644 --- a/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts +++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/events/all/index.ts @@ -6,7 +6,7 @@ import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common'; import { Ecs } from '../../../../ecs'; -import { CursorType, Inspect, Maybe } from '../../../common'; +import { CursorType, Inspect, Maybe, PageInfoPaginated } from '../../../common'; import { TimelineRequestOptionsPaginated } from '../..'; export interface TimelineEdges { @@ -29,10 +29,7 @@ export interface TimelineNonEcsData { export interface TimelineEventsAllStrategyResponse extends IEsSearchResponse { edges: TimelineEdges[]; totalCount: number; - pageInfo: { - activePage: number; - totalPages: number; - }; + pageInfo: PageInfoPaginated; inspect?: Maybe; } diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts index 773ee6085588..6b96783adc25 100644 --- a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts +++ b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts @@ -14,7 +14,13 @@ import { TimelineEventsLastEventTimeRequestOptions, TimelineEventsLastEventTimeStrategyResponse, } from './events'; -import { DocValueFields, TimerangeInput, SortField } from '../common'; +import { + DocValueFields, + PaginationInput, + PaginationInputPaginated, + TimerangeInput, + SortField, +} from '../common'; export * from './events'; @@ -29,19 +35,13 @@ export interface TimelineRequestBasicOptions extends IEsSearchRequest { } export interface TimelineRequestOptions extends TimelineRequestBasicOptions { - pagination: { - activePage: number; - querySize: number; - }; + pagination: PaginationInput; sort: SortField; } export interface TimelineRequestOptionsPaginated extends TimelineRequestBasicOptions { - pagination: { - activePage: number; - querySize: number; - }; + pagination: PaginationInputPaginated; sort: SortField; } diff --git a/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx index 8a294ec1b71f..9f273b4f293b 100644 --- a/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/add_filter_to_global_search_bar/index.tsx @@ -5,7 +5,7 @@ */ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui'; -import React, { useCallback } from 'react'; +import React, { useCallback, useMemo } from 'react'; import { Filter } from '../../../../../../../src/plugins/data/public'; import { WithHoverActions } from '../with_hover_actions'; @@ -47,34 +47,36 @@ export const AddFilterToGlobalSearchBar = React.memo( } }, [filterManager, filter, onFilterAdded]); - return ( - - - - + const HoverContent = useMemo( + () => ( +
+ + + - - - -
- } - render={() => children} - /> + + + + + ), + [filterForValue, filterOutValue] ); + + const render = useCallback(() => children, [children]); + + return ; } ); diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx index 74efe2d34fcc..4efb662a4aab 100644 --- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx +++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx @@ -9,6 +9,7 @@ import React, { useCallback } from 'react'; import { DropResult, DragDropContext } from 'react-beautiful-dnd'; import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; +import deepEqual from 'fast-deep-equal'; import { BeforeCapture } from './drag_drop_context'; import { BrowserFields } from '../../containers/source'; @@ -134,13 +135,11 @@ export const DragDropContextWrapperComponent = React.memo ); }, - (prevProps, nextProps) => { - return ( - prevProps.children === nextProps.children && - prevProps.dataProviders === nextProps.dataProviders && - prevProps.activeTimelineDataProviders === nextProps.activeTimelineDataProviders - ); // prevent re-renders when data providers are added or removed, but all other props are the same - } + // prevent re-renders when data providers are added or removed, but all other props are the same + (prevProps, nextProps) => + prevProps.children === nextProps.children && + deepEqual(prevProps.dataProviders, nextProps.dataProviders) && + prevProps.activeTimelineDataProviders === nextProps.activeTimelineDataProviders ); DragDropContextWrapperComponent.displayName = 'DragDropContextWrapperComponent'; diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx index 64f6699d21da..bd22811612a6 100644 --- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx +++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper.tsx @@ -196,76 +196,93 @@ const DraggableWrapperComponent: React.FC = ({ ] ); - const renderContent = useCallback( + const RenderClone = useCallback( + (provided, snapshot) => ( + +
+ + {render(dataProvider, provided, snapshot)} + +
+ + ), + [dataProvider, registerProvider, render] + ); + + const DraggableContent = useCallback( + (provided, snapshot) => ( + { + provided.innerRef(e); + draggableRef.current = e; + }} + data-test-subj="providerContainer" + isDragging={snapshot.isDragging} + registerProvider={registerProvider} + > + {truncate && !snapshot.isDragging ? ( + + {render(dataProvider, provided, snapshot)} + + ) : ( + + {render(dataProvider, provided, snapshot)} + + )} + + ), + [dataProvider, registerProvider, render, truncate] + ); + + const DroppableContent = useCallback( + (droppableProvided) => ( +
+ + {DraggableContent} + + {droppableProvided.placeholder} +
+ ), + [DraggableContent, dataProvider.id, isDisabled] + ); + + const content = useMemo( () => ( ( - -
- - {render(dataProvider, provided, snapshot)} - -
- - )} + renderClone={RenderClone} > - {(droppableProvided) => ( -
- - {(provided, snapshot) => ( - { - provided.innerRef(e); - draggableRef.current = e; - }} - data-test-subj="providerContainer" - isDragging={snapshot.isDragging} - registerProvider={registerProvider} - > - {truncate && !snapshot.isDragging ? ( - - {render(dataProvider, provided, snapshot)} - - ) : ( - - {render(dataProvider, provided, snapshot)} - - )} - - )} - - {droppableProvided.placeholder} -
- )} + {DroppableContent} ), - [dataProvider, registerProvider, render, isDisabled, truncate] + [DroppableContent, RenderClone, dataProvider.id, isDisabled] ); - if (isDisabled) return <>{renderContent()}; + const renderContent = useCallback(() => content, [content]); + + if (isDisabled) return <>{content}; return ( ( type, render = null, renderClone, - }) => ( - - {(provided, snapshot) => ( + }) => { + const DroppableContent = useCallback( + (provided, snapshot) => ( ( {render == null ? children : render({ isDraggingOver: snapshot.isDraggingOver })} {provided.placeholder} - )} - - ) + ), + [children, height, render] + ); + + return ( + + {DroppableContent} + + ); + } ); DroppableWrapper.displayName = 'DroppableWrapper'; diff --git a/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx b/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx index 4dc3c6fcbe44..d37de2cd3ec3 100644 --- a/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx +++ b/x-pack/plugins/security_solution/public/common/components/draggables/index.tsx @@ -135,7 +135,7 @@ DefaultDraggable.displayName = 'DefaultDraggable'; export const Badge = styled(EuiBadge)` vertical-align: top; -` as any; // eslint-disable-line @typescript-eslint/no-explicit-any +`; Badge.displayName = 'Badge'; diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx index 2c8c8136a473..7859f5584b0e 100644 --- a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx +++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx @@ -5,7 +5,7 @@ */ import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui'; -import { getOr, isEmpty, union } from 'lodash/fp'; +import { isEmpty, union } from 'lodash/fp'; import React, { useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; import deepEqual from 'fast-deep-equal'; @@ -239,6 +239,19 @@ const EventsViewerComponent: React.FC = ({ events, ]); + const HeaderSectionContent = useMemo( + () => + headerFilterGroup && ( + + {headerFilterGroup} + + ), + [graphEventId, headerFilterGroup] + ); + useEffect(() => { setIsQueryLoading(loading); }, [loading]); @@ -257,14 +270,7 @@ const EventsViewerComponent: React.FC = ({ subtitle={utilityBar ? undefined : subtitle} title={inspect ? justTitle : titleWithExitFullScreen} > - {headerFilterGroup && ( - - {headerFilterGroup} - - )} + {HeaderSectionContent} {utilityBar && !resolverIsShowing(graphEventId) && ( {utilityBar?.(refetch, totalCountMinusDeleted)} @@ -293,7 +299,7 @@ const EventsViewerComponent: React.FC = ({ /** Hide the footer if Resolver is showing. */ !graphEventId && (