= {
| Property | Type | Description |
| --- | --- | --- |
| [deprecations?](./kibana-plugin-core-server.pluginconfigdescriptor.deprecations.md) | ConfigDeprecationProvider | (Optional) Provider for the to apply to the plugin configuration. |
-| [exposeToBrowser?](./kibana-plugin-core-server.pluginconfigdescriptor.exposetobrowser.md) | { \[P in keyof T\]?: boolean; } | (Optional) List of configuration properties that will be available on the client-side plugin. |
+| [exposeToBrowser?](./kibana-plugin-core-server.pluginconfigdescriptor.exposetobrowser.md) | ExposedToBrowserDescriptor<T> | (Optional) List of configuration properties that will be available on the client-side plugin. |
| [exposeToUsage?](./kibana-plugin-core-server.pluginconfigdescriptor.exposetousage.md) | MakeUsageFromSchema<T> | (Optional) Expose non-default configs to usage collection to be sent via telemetry. set a config to true to report the actual changed config value. set a config to false to report the changed config value as \[redacted\].All changed configs except booleans and numbers will be reported as \[redacted\] unless otherwise specified.[MakeUsageFromSchema](./kibana-plugin-core-server.makeusagefromschema.md) |
| [schema](./kibana-plugin-core-server.pluginconfigdescriptor.schema.md) | PluginConfigSchema<T> | Schema to use to validate the plugin configuration.[PluginConfigSchema](./kibana-plugin-core-server.pluginconfigschema.md) |
diff --git a/docs/index-extra-title-page.html b/docs/index-extra-title-page.html
index 7917f8bfbf8c3..799303ff4b4b3 100644
--- a/docs/index-extra-title-page.html
+++ b/docs/index-extra-title-page.html
@@ -4,9 +4,9 @@
get the most of your data.
- What's newWhat's new Release notes "` format. See the https://nodemailer.com/message/addresses/[Nodemailer address documentation] for more information.
+Sender:: The from address for all emails sent with this connector. This must be specified in `user@host-name` format. See the https://nodemailer.com/message/addresses/[Nodemailer address documentation] for more information.
Service:: The name of the email service. If `service` is one of Nodemailer's https://nodemailer.com/smtp/well-known/[well-known email service providers], the `host`, `port`, and `secure` properties are defined with the default values and disabled for modification. If `service` is `MS Exchange Server`, the `host`, `port`, and `secure` properties are ignored and `tenantId`, `clientId`, `clientSecret` are required instead. If `service` is `other`, the `host` and `port` properties must be defined.
Host:: Host name of the service provider. If you are using the <> setting, make sure this hostname is added to the allowed hosts.
Port:: The port to connect to on the service provider.
diff --git a/docs/management/connectors/action-types/servicenow-sir.asciidoc b/docs/management/connectors/action-types/servicenow-sir.asciidoc
index 70500b26c16e6..81db72be0fb38 100644
--- a/docs/management/connectors/action-types/servicenow-sir.asciidoc
+++ b/docs/management/connectors/action-types/servicenow-sir.asciidoc
@@ -5,7 +5,7 @@
ServiceNow SecOps
++++
-The {sn} SecOps connector uses the https://docs.servicenow.com/bundle/orlando-application-development/page/integrate/inbound-rest/concept/c_TableAPI.html[V2 Table API] to create {sn} security incidents.
+The {sn} SecOps connector uses the https://developer.servicenow.com/dev.do#!/reference/api/sandiego/rest/c_ImportSetAPI[Import Set API] to create {sn} security incidents.
[float]
[[servicenow-sir-connector-prerequisites]]
diff --git a/docs/management/connectors/action-types/servicenow.asciidoc b/docs/management/connectors/action-types/servicenow.asciidoc
index 73e3baaca2ad1..333a26c075c49 100644
--- a/docs/management/connectors/action-types/servicenow.asciidoc
+++ b/docs/management/connectors/action-types/servicenow.asciidoc
@@ -5,7 +5,7 @@
ServiceNow ITSM
++++
-The {sn} ITSM connector uses the https://docs.servicenow.com/bundle/orlando-application-development/page/integrate/inbound-rest/concept/c_TableAPI.html[V2 Table API] to create {sn} incidents.
+The {sn} ITSM connector uses the https://developer.servicenow.com/dev.do#!/reference/api/sandiego/rest/c_ImportSetAPI[Import Set API] to create {sn} incidents.
[float]
[[servicenow-itsm-connector-prerequisites]]
diff --git a/docs/management/connectors/action-types/slack.asciidoc b/docs/management/connectors/action-types/slack.asciidoc
index 6dffebd9d9354..19abf9119b837 100644
--- a/docs/management/connectors/action-types/slack.asciidoc
+++ b/docs/management/connectors/action-types/slack.asciidoc
@@ -76,5 +76,3 @@ URL, set up an an **Incoming Webhook Integration** through the Slack console:
image::images/slack-add-webhook-integration.png[]
. Click *Add Incoming Webhook Integration*.
. Copy the generated webhook URL so you can paste it into your Slack connector form.
-+
-image::images/slack-copy-webhook-url.png[]
diff --git a/docs/management/connectors/images/slack-copy-webhook-url.png b/docs/management/connectors/images/slack-copy-webhook-url.png
deleted file mode 100644
index 805f5719980da..0000000000000
Binary files a/docs/management/connectors/images/slack-copy-webhook-url.png and /dev/null differ
diff --git a/docs/management/connectors/pre-configured-connectors.asciidoc b/docs/management/connectors/pre-configured-connectors.asciidoc
index 4d304cdd6c5a2..aaef1b673d0b6 100644
--- a/docs/management/connectors/pre-configured-connectors.asciidoc
+++ b/docs/management/connectors/pre-configured-connectors.asciidoc
@@ -11,6 +11,8 @@ action are predefined, including the connector name and ID.
- Appear in all spaces because they are not saved objects.
- Cannot be edited or deleted.
+NOTE: Preconfigured connectors cannot be used with cases.
+
[float]
[[preconfigured-connector-example]]
==== Preconfigured connectors example
@@ -70,4 +72,4 @@ image::images/pre-configured-connectors-managing.png[Connectors managing tab wit
Clicking a preconfigured connector shows the description, but not the configuration. A message indicates that this is a preconfigured connector.
[role="screenshot"]
-image::images/pre-configured-connectors-view-screen.png[Pre-configured connector view details]
\ No newline at end of file
+image::images/pre-configured-connectors-view-screen.png[Pre-configured connector view details]
diff --git a/docs/management/upgrade-assistant/index.asciidoc b/docs/management/upgrade-assistant/index.asciidoc
index 57c146fe5e4dd..304bec04407ce 100644
--- a/docs/management/upgrade-assistant/index.asciidoc
+++ b/docs/management/upgrade-assistant/index.asciidoc
@@ -10,12 +10,11 @@ The assistant identifies deprecated settings in your configuration,
enables you to see if you are using deprecated features,
and guides you through the process of resolving issues.
+IMPORTANT: To upgrade to 8.0 or later, **you must first upgrade to {version}**.
+
If you have indices that were created prior to 7.0,
you can use the assistant to reindex them so they can be accessed from 8.0.
-IMPORTANT: To see the most up-to-date deprecation information before
-upgrading to 8.0, upgrade to the latest 7.n release.
-
[discrete]
=== Required permissions
diff --git a/docs/management/watcher-ui/index.asciidoc b/docs/management/watcher-ui/index.asciidoc
index 4f68ac83d9622..4e874c362606f 100644
--- a/docs/management/watcher-ui/index.asciidoc
+++ b/docs/management/watcher-ui/index.asciidoc
@@ -8,7 +8,7 @@ Watches are helpful for analyzing mission-critical and business-critical
streaming data. For example, you might watch application logs for performance
outages or audit access logs for security threats.
-To get started, open then main menu,
+To get started, open the main menu,
then click *Stack Management > Watcher*.
With this UI, you can:
@@ -43,7 +43,7 @@ and either of these watcher roles:
* `watcher_admin`. You can perform all Watcher actions, including create and edit watches.
* `watcher_user`. You can view watches, but not create or edit them.
-To manage roles, open then main menu, then click *Stack Management > Roles*, or use the
+To manage roles, open the main menu, then click *Stack Management > Roles*, or use the
<>. Watches are shared between
all users with the same role.
diff --git a/docs/maps/images/drawing_layer.png b/docs/maps/images/drawing_layer.png
new file mode 100644
index 0000000000000..5e6a6d5c33b89
Binary files /dev/null and b/docs/maps/images/drawing_layer.png differ
diff --git a/docs/maps/import-geospatial-data.asciidoc b/docs/maps/import-geospatial-data.asciidoc
index 58d9ca2255dd3..fae479b45c4e7 100644
--- a/docs/maps/import-geospatial-data.asciidoc
+++ b/docs/maps/import-geospatial-data.asciidoc
@@ -19,7 +19,7 @@ spaces in **{stack-manage-app}** in {kib}. For more information, see
{ref}/security-privileges.html[Security privileges],
<>, and <>.
-To upload GeoJSON files in {kib} with *Maps*, you must have:
+To upload GeoJSON files and draw features in {kib} with *Maps*, you must have:
* The `all` {kib} privilege for *Maps*
* The `all` {kib} privilege for *{ipm-app}*
@@ -58,6 +58,55 @@ On the {kib} home page, you can upload a file and import it into an {es} index w
. Use the file chooser to select a GeoJSON file.
. Click *Import file*.
+[discrete]
+=== Draw features in a map
+
+Upload features into {es} by drawing lines, polygons, circles, bounding boxes, and points in a map.
+
+To create a new index for drawing:
+
+. <>.
+. Click *Add layer*.
+. Select *Create index*.
+. Set *Index name*.
+. Click *Create index*.
+
+To open an existing index for drawing:
+
+. <>.
+
+. Click *Add layer*.
+
+. Select *Documents*.
+
+. Select the index pattern that points to your index. A <> can point to one or more indices. For feature editing, the data view must point to a single index.
+
+. Click *Add layer*.
+
+. Set *Scaling* to *Limit results to 10,000*.
+
+. In **Filtering**:
+** Clear the *Apply global search to layer data* checkbox.
+** If your data view contains a default time field, clear the *Apply global time to layer data* checkbox.
+
+. Click *Save & close*.
+
+. In the legend, click the layer name and select *Edit features*.
+
+When feature editing is open, a feature editing toolbox is displayed on the left side of the map.
+
+[role="screenshot"]
+image::maps/images/drawing_layer.png[]
+
+To draw features:
+
+. Click on the line, polygon, circle, bounding box, or point icon.
+. Move the mouse cursor over the map and follow the on screen instructions to draw a feature.
++
+When a feature is complete, the feature is added to the index as a new document.
+. Repeat to draw additional features.
+. When you are finished adding features, go to the legend, and click *Exit* under the layer name.
+
[discrete]
=== Upload data with IP addresses
diff --git a/docs/maps/search.asciidoc b/docs/maps/search.asciidoc
index af6939eb8ae11..91de36e119f3e 100644
--- a/docs/maps/search.asciidoc
+++ b/docs/maps/search.asciidoc
@@ -133,7 +133,7 @@ If the map is a dashboard panel with drilldowns, you can apply a phrase filter t
You can apply a search request to individual layers by setting `Filters` in the layer details panel.
Click the *Add filter* button to add a filter to a layer.
-NOTE: Layer filters are not applied to *term joins*. You can apply a search request to *term joins* by setting the *where* clause in the join definition.
+NOTE: Layer filters are not applied to the right side of *term joins*. You can apply a search request to the right side of *term joins* by setting the *where* clause in the join definition. For example, suppose you have a layer with a term join where the left side is roads and the right side is traffic volume measurements. A layer filter of `roadType is "highway"` is applied to the roads index, but not to the traffic volume measurements index.
[role="screenshot"]
image::maps/images/layer_search.png[]
diff --git a/docs/osquery/images/live-query-check-results.png b/docs/osquery/images/live-query-check-results.png
index df292309e0853..33e31f0ce54f0 100644
Binary files a/docs/osquery/images/live-query-check-results.png and b/docs/osquery/images/live-query-check-results.png differ
diff --git a/docs/osquery/osquery.asciidoc b/docs/osquery/osquery.asciidoc
index 500dc6959fc00..c82f1fb9bdb67 100644
--- a/docs/osquery/osquery.asciidoc
+++ b/docs/osquery/osquery.asciidoc
@@ -121,11 +121,18 @@ image::images/scheduled-pack.png[Shows queries in the pack and details about eac
[float]
[[osquery-manage-query]]
-== Edit saved queries
+== Save queries
-Add or edit saved queries from the *Saved queries* tab.
+You can save queries in two ways:
-. Go to the saved queries, then click **Add saved query** or the edit icon.
+* After running a live query, click the *Save for later* link.
+* From the *Saved queries* tab, click the **Add saved query** button.
+
+Once you save a query, you can only edit it from the *Saved queries* tab.
+
+To add or edit saved queries from the *Saved queries* tab:
+
+. Go to *Saved queries*, and then click **Add saved query** or the edit icon.
. Provide the following fields:
* The unique identifier.
@@ -148,7 +155,7 @@ Add or edit saved queries from the *Saved queries* tab.
* From the *Test query* panel, select agents or groups to test the query, then click *Submit* to run a live query. Result columns with the image:images/mapped-icon.png[mapping] icon are mapped. Hover over the icon to see the mapped ECS field.
-. Click **Save query**.
+. Click *Save* or *Update*.
[float]
[[osquery-map-fields]]
@@ -175,11 +182,7 @@ and the mapped ECS fields. For example, if you update a query to map `osquery.na
** **Static value**: Enter a static value. When the query runs, the ECS field is set to the value entered. For example, static fields can be used to apply `tags` or your preferred `event.category` to the query results.
-. Map more fields, as needed.
-
-** To add a new row for additional fields to map, click the plus icon.
-
-** To remove any mapped rows, click the trash icon.
+. Map more fields, as needed. To remove any mapped rows, click the delete icon.
. Save your changes.
@@ -270,12 +273,18 @@ for an agent policy through Fleet.
This integration supports x64 architecture on Windows, MacOS, and Linux platforms,
and ARM64 architecture on Linux.
-NOTE: The original {filebeat-ref}/filebeat-module-osquery.html[Filebeat Osquery module]
+[NOTE]
+=========================
+
+* The original {filebeat-ref}/filebeat-module-osquery.html[Filebeat Osquery module]
and the https://docs.elastic.co/en/integrations/osquery[Osquery]
integration collect logs from self-managed Osquery deployments.
The *Osquery Manager* integration manages Osquery deployments
and supports running and scheduling queries from {kib}.
+* *Osquery Manager* cannot be integrated with an Elastic Agent in standalone mode.
+=========================
+
[float]
=== Customize Osquery sub-feature privileges
@@ -314,7 +323,7 @@ While this allows you to use advanced Osquery functionality like pack discovery
. Edit the *Osquery config* JSON field to apply your preferred Osquery configuration. Note the following:
-* The field may already have content if you have scheduled packs for this agent policy. To keep these packs scheduled, do not edit the `packs` section.
+* The field may already have content if you have scheduled packs for this agent policy. To keep these packs scheduled, do not remove the `packs` section.
* Refer to the https://osquery.readthedocs.io/en/stable/[Osquery documentation] for configuration options.
@@ -344,14 +353,12 @@ https://www.elastic.co/guide/en/fleet/master/upgrade-elastic-agent.html[upgrade
[float]
=== Debug issues
-If you encounter issues with *Osquery Manager*, find the relevant logs for the {elastic-agent}
-and Osquerybeat in the installed agent directory, then adjust the agent path for your setup.
-
-The relevant logs look similar to the following example paths:
+If you encounter issues with *Osquery Manager*, find the relevant logs for {elastic-agent}
+and Osquerybeat in the agent directory. Refer to the {fleet-guide}/installation-layout.html[Fleet Installation layout] to find the log file location for your OS.
```ts
-`/data/elastic-agent-054e22/logs/elastic-agent-json.log-*`
-`/data/elastic-agent-054e22/logs/default/osquerybeat-json.log`
+../data/elastic-agent-*/logs/elastic-agent-json.log-*
+../data/elastic-agent-*/logs/default/osquerybeat-json.log
```
To get more details in the logs, change the agent logging level to debug:
diff --git a/docs/settings/fleet-settings.asciidoc b/docs/settings/fleet-settings.asciidoc
index c96c5f57a00cd..cad5c423d1b89 100644
--- a/docs/settings/fleet-settings.asciidoc
+++ b/docs/settings/fleet-settings.asciidoc
@@ -10,7 +10,7 @@
In {ecloud}, {fleet} flags are already configured.
====
-You can configure `xpack.fleet` settings in your `kibana.yml`.
+You can configure `xpack.fleet` settings in your `kibana.yml`.
By default, {fleet} is enabled. To use {fleet}, you also need to configure {kib} and {es} hosts.
See the {fleet-guide}/index.html[{fleet}] docs for more information.
@@ -24,7 +24,7 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
| deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
Set to `true` (default) to enable {fleet}.
| `xpack.fleet.agents.enabled` {ess-icon}
- | Set to `true` (default) to enable {fleet}.
+ | Set to `true` (default) to enable {fleet}.
|===
[[fleet-data-visualizer-settings]]
@@ -36,7 +36,8 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
| `xpack.fleet.registryUrl`
| The address to use to reach the {package-manager} registry.
| `xpack.fleet.registryProxyUrl`
- | The proxy address to use to reach the {package-manager} registry.
+ | The proxy address to use to reach the {package-manager} registry if an internet connection is not directly available.
+ Refer to {fleet-guide}/air-gapped.html[Air-gapped environments] for details.
|===
@@ -65,7 +66,7 @@ want {fleet} to load up by default.
| `xpack.fleet.packages`
| List of integrations that are installed when the {fleet} app starts
up for the first time. Required properties are:
-
+
`name`:: Name of the integration from the package registry.
`version`:: Either an exact semantic version, or the keyword `latest` to fetch
the latest integration version.
@@ -78,12 +79,12 @@ Required properties are:
`name`:: Policy name.
Optional properties are:
-
+
`description`:: Text description of this policy.
`namespace`:: String identifying this policy's namespace.
`monitoring_enabled`:: List of keywords that specify the monitoring data to collect.
Valid values include `['logs']`, `['metrics']`, and `['logs', 'metrics']`.
- `is_managed`:: If `true`, this policy is editable by the user and can only
+ `is_managed`:: If `true`, this policy is not editable by the user and can only
be changed by updating the {kib} config.
`is_default`:: If `true`, this policy is the default agent policy.
`is_default_fleet_server`:: If `true`, this policy is the default {fleet-server} agent policy.
diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
index 7ce15be9f74bd..57b2757f21d89 100644
--- a/docs/settings/monitoring-settings.asciidoc
+++ b/docs/settings/monitoring-settings.asciidoc
@@ -29,61 +29,68 @@ For more information, see
[[monitoring-general-settings]]
==== General monitoring settings
-[cols="2*<"]
-|===
-| `monitoring.enabled`
- | deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
- Set to `true` (default) to enable the {monitor-features} in {kib}. Unlike the
- <> setting, when this setting is `false`, the
- monitoring back-end does not run and {kib} stats are not sent to the monitoring
- cluster.
-
-| `monitoring.ui.ccs.enabled`
- | Set to `true` (default) to enable {ref}/modules-cross-cluster-search.html[cross-cluster search] of your monitoring data. The {ref}/modules-remote-clusters.html#remote-cluster-settings[`remote_cluster_client`] role must exist on each node.
-
-
-| `monitoring.ui.elasticsearch.hosts`
- | Specifies the location of the {es} cluster where your monitoring data is stored.
- By default, this is the same as <>. This setting enables
- you to use a single {kib} instance to search and visualize data in your
- production cluster as well as monitor data sent to a dedicated monitoring
- cluster.
-
-| `monitoring.ui.elasticsearch.username`
- | Specifies the username used by {kib} monitoring to establish a persistent connection
- in {kib} to the {es} monitoring cluster and to verify licensing status on the {es}
- monitoring cluster. +
- +
- Every other request performed by *{stack-monitor-app}* to the monitoring {es}
- cluster uses the authenticated user's credentials, which must be the same on
- both the {es} monitoring cluster and the {es} production cluster. +
- +
- If not set, {kib} uses the value of the <> setting.
-
-| `monitoring.ui.elasticsearch.password`
- | Specifies the password used by {kib} monitoring to establish a persistent connection
- in {kib} to the {es} monitoring cluster and to verify licensing status on the {es}
- monitoring cluster. +
- +
- Every other request performed by *{stack-monitor-app}* to the monitoring {es}
- cluster uses the authenticated user's credentials, which must be the same on
- both the {es} monitoring cluster and the {es} production cluster. +
- +
- If not set, {kib} uses the value of the <> setting.
-
-| `monitoring.ui.elasticsearch.pingTimeout`
- | Specifies the time in milliseconds to wait for {es} to respond to internal
- health checks. By default, it matches the <> setting,
- which has a default value of `30000`.
-
-| `monitoring.ui.elasticsearch.ssl`
- | Shares the same configuration as <>. These settings configure encrypted communication between {kib} and the monitoring cluster.
-
-| `monitoring.cluster_alerts.allowedSpaces` {ess-icon}
- | deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
- Specifies the spaces where cluster Stack Monitoring alerts can be created. You must specify all spaces where you want to generate alerts, including the default space. Defaults to `[ "default" ]`.
-
-|===
+`monitoring.cluster_alerts.email_notifications.enabled`::
+deprecated:[7.11.0]
+When enabled, sends email notifications for Watcher alerts to the specified email address. The default is `true`.
+
+`monitoring.cluster_alerts.email_notifications.email_address` {ess-icon}::
+deprecated:[7.11.0]
+When enabled, specifies the email address where you want to receive cluster alert notifications.
+
+`monitoring.enabled`::
+deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
+Set to `true` (default) to enable the {monitor-features} in {kib}. Unlike the
+<> setting, when this setting is `false`, the
+monitoring back-end does not run and {kib} stats are not sent to the monitoring
+cluster.
+
+`monitoring.ui.ccs.enabled`::
+Set to `true` (default) to enable {ref}/modules-cross-cluster-search.html[cross-cluster search] of your monitoring data. The {ref}/modules-remote-clusters.html#remote-cluster-settings[`remote_cluster_client`] role must exist on each node.
+
+`monitoring.ui.elasticsearch.hosts`::
+Specifies the location of the {es} cluster where your monitoring data is stored.
++
+By default, this is the same as <>. This setting enables
+you to use a single {kib} instance to search and visualize data in your
+production cluster as well as monitor data sent to a dedicated monitoring
+cluster.
+
+`monitoring.ui.elasticsearch.username`::
+Specifies the username used by {kib} monitoring to establish a persistent connection
+in {kib} to the {es} monitoring cluster and to verify licensing status on the {es}
+monitoring cluster when using `monitoring.ui.elasticsearch.hosts`.
++
+All other requests performed by *{stack-monitor-app}* to the monitoring {es}
+cluster uses the authenticated user's credentials, which must be the same on
+both the {es} monitoring cluster and the {es} production cluster.
++
+If not set, {kib} uses the value of the <> setting.
+
+`monitoring.ui.elasticsearch.password`::
+Specifies the password used by {kib} monitoring to establish a persistent connection
+in {kib} to the {es} monitoring cluster and to verify licensing status on the {es}
+monitoring cluster when using `monitoring.ui.elasticsearch.hosts`.
++
+All other requests performed by *{stack-monitor-app}* to the monitoring {es}
+cluster use the authenticated user's credentials, which must be the same on
+both the {es} monitoring cluster and the {es} production cluster.
++
+If not set, {kib} uses the value of the <> setting.
+
+`monitoring.ui.elasticsearch.serviceAccountToken`::
+Specifies a {ref}/security-api-create-service-token.html[service account token] for the {es} cluster where your monitoring data is stored when using `monitoring.ui.elasticsearch.hosts`. This setting is an alternative to using `monitoring.ui.elasticsearch.username` and `monitoring.ui.elasticsearch.password`.
+
+`monitoring.ui.elasticsearch.pingTimeout`::
+Specifies the time in milliseconds to wait for {es} to respond to internal
+health checks. By default, it matches the <> setting,
+which has a default value of `30000`.
+
+`monitoring.ui.elasticsearch.ssl`::
+Shares the same configuration as <>. These settings configure encrypted communication between {kib} and the monitoring cluster.
+
+`monitoring.cluster_alerts.allowedSpaces` {ess-icon}::
+deprecated:[7.16.0,"In 8.0 and later, this setting will no longer be supported."]
+Specifies the spaces where cluster Stack Monitoring alerts can be created. You must specify all spaces where you want to generate alerts, including the default space. Defaults to `[ "default" ]`.
[float]
[[monitoring-collection-settings]]
@@ -91,18 +98,14 @@ For more information, see
These settings control how data is collected from {kib}.
-[cols="2*<"]
-|===
-| `monitoring.kibana.collection.enabled`
- | Set to `true` (default) to enable data collection from the {kib} NodeJS server
- for {kib} dashboards to be featured in *{stack-monitor-app}*.
+`monitoring.kibana.collection.enabled`::
+Set to `true` (default) to enable data collection from the {kib} NodeJS server
+for {kib} dashboards to be featured in *{stack-monitor-app}*.
-| `monitoring.kibana.collection.interval` {ess-icon}
- | Specifies the number of milliseconds to wait in between data sampling on the
- {kib} NodeJS server for the metrics that are displayed in the {kib} dashboards.
- Defaults to `10000` (10 seconds).
-
-|===
+`monitoring.kibana.collection.interval` {ess-icon}::
+Specifies the number of milliseconds to wait in between data sampling on the
+{kib} NodeJS server for the metrics that are displayed in the {kib} dashboards.
+Defaults to `10000` (10 seconds).
[float]
[[monitoring-ui-settings]]
@@ -113,36 +116,32 @@ However, the defaults work best in most circumstances. For more information
about configuring {kib}, see
{kibana-ref}/settings.html[Setting {kib} server properties].
-[cols="2*<"]
-|===
-| `monitoring.ui.elasticsearch.logFetchCount`
- | Specifies the number of log entries to display in *{stack-monitor-app}*.
- Defaults to `10`. The maximum value is `50`.
-
-|[[monitoring-ui-enabled]] `monitoring.ui.enabled`
- | Set to `false` to hide *{stack-monitor-app}*. The monitoring back-end
- continues to run as an agent for sending {kib} stats to the monitoring
- cluster. Defaults to `true`.
-
-| `monitoring.ui.logs.index`
- | Specifies the name of the indices that are shown on the
- <> page in *{stack-monitor-app}*. The default value
- is `filebeat-*`.
-
-| `monitoring.ui.max_bucket_size`
- | Specifies the number of term buckets to return out of the overall terms list when
- performing terms aggregations to retrieve index and node metrics. For more
- information about the `size` parameter, see
- {ref}/search-aggregations-bucket-terms-aggregation.html#search-aggregations-bucket-terms-aggregation-size[Terms Aggregation].
- Defaults to `10000`.
-
-| `monitoring.ui.min_interval_seconds` {ess-icon}
- | Specifies the minimum number of seconds that a time bucket in a chart can
- represent. Defaults to 10. If you modify the
- `monitoring.ui.collection.interval` in `elasticsearch.yml`, use the same
- value in this setting.
-
-|===
+`monitoring.ui.elasticsearch.logFetchCount`::
+Specifies the number of log entries to display in *{stack-monitor-app}*.
+Defaults to `10`. The maximum value is `50`.
+
+[[monitoring-ui-enabled]] `monitoring.ui.enabled`::
+Set to `false` to hide *{stack-monitor-app}*. The monitoring back-end
+continues to run as an agent for sending {kib} stats to the monitoring
+cluster. Defaults to `true`.
+
+`monitoring.ui.logs.index`::
+Specifies the name of the indices that are shown on the
+<> page in *{stack-monitor-app}*. The default value
+is `filebeat-*`.
+
+`monitoring.ui.max_bucket_size`::
+Specifies the number of term buckets to return out of the overall terms list when
+performing terms aggregations to retrieve index and node metrics. For more
+information about the `size` parameter, see
+{ref}/search-aggregations-bucket-terms-aggregation.html#search-aggregations-bucket-terms-aggregation-size[Terms Aggregation].
+Defaults to `10000`.
+
+`monitoring.ui.min_interval_seconds` {ess-icon}::
+Specifies the minimum number of seconds that a time bucket in a chart can
+represent. Defaults to 10. If you modify the
+`monitoring.ui.collection.interval` in `elasticsearch.yml`, use the same
+value in this setting.
[float]
[[monitoring-ui-cgroup-settings]]
@@ -153,20 +152,16 @@ better decisions about your container performance, rather than guessing based on
the overall machine performance. If you are not running your applications in a
container, then Cgroup statistics are not useful.
-[cols="2*<"]
-|===
-| `monitoring.ui.container.elasticsearch.enabled` {ess-icon}
- | For {es} clusters that are running in containers, this setting changes the
- *Node Listing* to display the CPU utilization based on the reported Cgroup
- statistics. It also adds the calculated Cgroup CPU utilization to the
- *Node Overview* page instead of the overall operating system's CPU
- utilization. Defaults to `false`.
-
-| `monitoring.ui.container.logstash.enabled`
- | For {ls} nodes that are running in containers, this setting
- changes the {ls} *Node Listing* to display the CPU utilization
- based on the reported Cgroup statistics. It also adds the
- calculated Cgroup CPU utilization to the {ls} node detail
- pages instead of the overall operating system’s CPU utilization. Defaults to `false`.
-
-|===
+`monitoring.ui.container.elasticsearch.enabled` {ess-icon}::
+For {es} clusters that are running in containers, this setting changes the
+*Node Listing* to display the CPU utilization based on the reported Cgroup
+statistics. It also adds the calculated Cgroup CPU utilization to the
+*Node Overview* page instead of the overall operating system's CPU
+utilization. Defaults to `false`.
+
+`monitoring.ui.container.logstash.enabled`::
+For {ls} nodes that are running in containers, this setting
+changes the {ls} *Node Listing* to display the CPU utilization
+based on the reported Cgroup statistics. It also adds the
+calculated Cgroup CPU utilization to the {ls} node detail
+pages instead of the overall operating system’s CPU utilization. Defaults to `false`.
diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc
index 2ea5e4f31bf1b..35c3fce3c009b 100644
--- a/docs/settings/reporting-settings.asciidoc
+++ b/docs/settings/reporting-settings.asciidoc
@@ -12,18 +12,27 @@ You can configure `xpack.reporting` settings in your `kibana.yml` to:
* <>
* <>
* <>
-* <>
* <>
* <>
* <>
* <>
+* <>
[float]
[[general-reporting-settings]]
==== Enable reporting
[[xpack-enable-reporting]]`xpack.reporting.enabled` {ess-icon}::
-When `true`, enables the {report-features}. The {report-features} are automatically enabled in {kib}. The default is `true`.
+When `true`, enables the {report-features}. Set this to `false` to disable {report-features} entirely. The default is `true`.
+
+[NOTE]
+============
+Disabling the {report-features} is discouraged. If you need to turn off the ability to generate reports,
+configure the roles and spaces in the <>.
+
+If needed, you can also prevent a {kib} instance from claiming reporting work by setting
+<>.
+============
[float]
[[encryption-keys]]
@@ -72,44 +81,6 @@ xpack.reporting.encryptionKey: "something_secret"
NOTE: If security is enabled, the `xpack.reporting.index` setting should begin with `.reporting-` for the `kibana_system` role to have the necessary privileges over the index.
-[float]
-[[reporting-kibana-server-settings]]
-==== {kib} server settings
-
-Reporting opens the {kib} web interface in a server process to generate
-screenshots of {kib} visualizations. In most cases, the default settings
-work and you don't need to configure the {report-features} to communicate with {kib}.
-
-If your {kib} instance requires a reverse proxy (such as NGINX, Apache, etc.) for
-access, because of rewrite rules or special headers being added by the proxy,
-you must configure the `xpack.reporting.kibanaServer` settings to make
-the headless browser process connect to the proxy.
-
-[NOTE]
-============
-If a reverse proxy carries encrypted traffic from user
-clients back to a {kib} server, the proxy port, protocol, and hostname
-in `xpack.reporting.kibanaServer` must be valid for the encryption that the Reporting
-browser receives. Encrypted communications fail if there are
-mismatches in the host information between the request and the certificate on the server.
-
-Configuring the `xpack.reporting.kibanaServer` settings to point to a
-proxy host requires that the {kib} server has network access to the proxy.
-============
-
-`xpack.reporting.kibanaServer.port`:: The port for accessing {kib}, if different from the <> value.
-
-`xpack.reporting.kibanaServer.protocol`::
-The protocol for accessing {kib}, typically `http` or `https`.
-
-[[xpack-kibanaServer-hostname]] `xpack.reporting.kibanaServer.hostname`::
-The hostname for accessing {kib}, if different from the <> value.
-
-NOTE: Reporting authenticates requests on the {kib} page only when the hostname matches the
-<> setting. Therefore Reporting fails if the
-set value redirects to another server. For that reason, `"0"` is an invalid setting
-because, in the Reporting browser, it becomes an automatic redirect to `"0.0.0.0"`.
-
[float]
[[reporting-job-queue-settings]]
==== Background job settings
@@ -121,8 +92,11 @@ reports, you might need to change the following settings.
`xpack.reporting.queue.indexInterval`::
How often the index that stores reporting jobs rolls over to a new index. Valid values are `year`, `month`, `week`, `day`, and `hour`. Defaults to `week`.
-`xpack.reporting.queue.pollEnabled` {ess-icon}::
-Set to `true` (default) to enable the {kib} instance to poll the index for pending jobs and claim them for execution. Setting this to `false` allows the {kib} instance to only add new jobs to the reporting queue, list jobs, and provide the downloads to completed report through the UI.
+[[xpack-reportingQueue-pollEnabled]] `xpack.reporting.queue.pollEnabled` {ess-icon}::
+When `true`, enables the {kib} instance to poll {es} for pending jobs and claim them for
+execution. When `false`, allows the {kib} instance to only add new jobs to the reporting queue, list
+jobs, and provide the downloads to completed reports through the UI. This requires a deployment where at least
+one other {kib} instance in the Elastic cluster has this setting to `true`. The default is `true`.
NOTE: Running multiple instances of {kib} in a cluster for load balancing of
reporting requires identical values for <> and, if
@@ -283,7 +257,7 @@ With Security enabled, Reporting has two forms of access control: each user can
[NOTE]
============================================================================
-The `xpack.reporting.roles` settings are for a deprecated system of access control in Reporting. It does not allow API Keys to generate reports, and it doesn't allow {kib} application privileges. We recommend you explicitly turn off reporting's deprecated access control feature by adding `xpack.reporting.roles.enabled: false` in kibana.yml. This will enable you to create custom roles that provide application privileges for reporting, as described in <>.
+The `xpack.reporting.roles` settings are for a deprecated system of access control in Reporting. Turning off this feature allows API Keys to generate reports, and allows reporting access through {kib} application privileges. We recommend you explicitly turn off reporting's deprecated access control feature by adding `xpack.reporting.roles.enabled: false` in kibana.yml. This will enable you to create custom roles that provide application privileges for reporting, as described in <>.
============================================================================
[[xpack-reporting-roles-enabled]] `xpack.reporting.roles.enabled`::
@@ -291,3 +265,26 @@ deprecated:[7.14.0,The default for this setting will be `false` in an upcoming v
`xpack.reporting.roles.allow`::
deprecated:[7.14.0] In addition to superusers, specifies the roles that can generate reports using the {ref}/security-api.html#security-role-apis[{es} role management APIs]. Requires `xpack.reporting.roles.enabled` to be `true`. Defaults to `[ "reporting_user" ]`.
+
+[float]
+[[reporting-kibana-server-settings]]
+==== {kib} server settings
+
+To generate screenshots for PNG and PDF reports, Reporting opens the {kib} web interface using a local
+connection on the server. In most cases, using a local connection to the {kib} server presents no issue. If
+you prefer the headless browser to connect to {kib} using a specific hostname, there are a number of
+settings that allow the headless browser to connect to {kib} through a proxy, rather than directly.
+
+[NOTE]
+============
+The `xpack.reporting.kibanaServer` settings are optional. Take caution when editing these settings. Adding
+these settings can cause the {report-features} to fail. If report fail,
+inspect the server logs. The full {kib} URL that Reporting is attempting to
+ open is logged during report execution.
+============
+
+`xpack.reporting.kibanaServer.port`:: The port for accessing {kib}.port`>> value.
+
+`xpack.reporting.kibanaServer.protocol`:: The protocol for accessing {kib}, typically `http` or `https`.
+
+[[xpack-kibanaServer-hostname]] `xpack.reporting.kibanaServer.hostname`:: The hostname for accessing {kib}.
diff --git a/docs/settings/task-manager-settings.asciidoc b/docs/settings/task-manager-settings.asciidoc
index 32aaaf8a3a071..d0c200db62bd7 100644
--- a/docs/settings/task-manager-settings.asciidoc
+++ b/docs/settings/task-manager-settings.asciidoc
@@ -43,6 +43,11 @@ These non-persisted action tasks have a risk that they won't be run at all if th
`xpack.task_manager.ephemeral_tasks.request_capacity`::
Sets the size of the ephemeral queue defined above. Defaults to 10.
+`xpack.task_manager.event_loop_delay.monitor`::
+Enables event loop delay monitoring, which will log a warning when a task causes an event loop delay which exceeds the `warn_threshold` setting. Defaults to true.
+
+`xpack.task_manager.event_loop_delay.warn_threshold`::
+Sets the amount of event loop delay during a task execution which will cause a warning to be logged. Defaults to 5000 milliseconds (5 seconds).
[float]
[[task-manager-health-settings]]
diff --git a/docs/setup/access.asciidoc b/docs/setup/access.asciidoc
index 3fc1aa43f9f29..77ad6ffb9c602 100644
--- a/docs/setup/access.asciidoc
+++ b/docs/setup/access.asciidoc
@@ -16,7 +16,7 @@ If you are using a self-managed deployment, access {kib} through the web applica
. Point your web browser to the machine where you are running {kib} and specify the port number. For example, `localhost:5601` or `http://YOURDOMAIN.com:5601`.
+
-To remotely connect to {kib}, set > to a non-loopback address.
+To remotely connect to {kib}, set <> to a non-loopback address.
. Log on to your account.
diff --git a/docs/setup/configuring-reporting.asciidoc b/docs/setup/configuring-reporting.asciidoc
index 6d209092d3338..c5ffe9141a72e 100644
--- a/docs/setup/configuring-reporting.asciidoc
+++ b/docs/setup/configuring-reporting.asciidoc
@@ -6,7 +6,16 @@
Configure reporting
++++
-To enable users to manually and automatically generate reports, install the reporting packages, grant users access to the {report-features}, and secure the reporting endpoints.
+For security, you grant users access to the {report-features} and secure the reporting endpoints
+with TLS/SSL encryption. Additionally, you can install graphical packages into the operating system
+to enable the {kib} server to have screenshotting capabilities.
+
+* <>
+* <>
+* <>
+* <>
+* <>
+* <>
[float]
[[install-reporting-packages]]
@@ -30,8 +39,9 @@ If you are using Ubuntu/Debian systems, install the following packages:
* `fonts-liberation`
* `libfontconfig1`
+* `libnss3`
-If the system is missing dependencies, *Reporting* fails in a non-deterministic way. {kib} runs a self-test at server startup, and
+If the system is missing dependencies, a screenshot report job may fail in a non-deterministic way. {kib} runs a self-test at server startup, and
if it encounters errors, logs them in the Console. The error message does not include
information about why Chromium failed to run. The most common error message is `Error: connect ECONNREFUSED`, which indicates
that {kib} could not connect to the Chromium process.
@@ -41,7 +51,7 @@ To troubleshoot the problem, start the {kib} server with environment variables t
[float]
[[grant-user-access]]
=== Grant users access to reporting
-When security is enabled, you grant users access to generate reports with <>, which allow you to create custom roles that control the spaces and applications where users generate reports.
+When security is enabled, you grant users access to {report-features} with <>, which allow you to create custom roles that control the spaces and applications where users generate reports.
. Enable application privileges in Reporting. To enable, turn off the default user access control features in `kibana.yml`:
+
@@ -52,7 +62,7 @@ xpack.reporting.roles.enabled: false
+
NOTE: If you use the default settings, you can still create a custom role that grants reporting privileges. The default role is `reporting_user`. This behavior is being deprecated and does not allow application-level access controls for {report-features}, and does not allow API keys or authentication tokens to authorize report generation. Refer to <> for information and caveats about the deprecated access control features.
-. Create the reporting role.
+. Create the reporting role.
.. Open the main menu, then click *Stack Management*.
@@ -60,7 +70,6 @@ NOTE: If you use the default settings, you can still create a custom role that g
. Specify the role settings.
-
.. Enter the *Role name*. For example, `custom_reporting_user`.
.. Specify the *Indices* and *Privileges*.
@@ -77,9 +86,13 @@ For more information, refer to {ref}/security-privileges.html[Security privilege
.. Click *Customize*, then click *Analytics*.
-.. Next to the applications you want to grant reporting privileges, click *All*.
+.. For each application, select *All*, or to customize the privileges, select *Read* and *Customize sub-feature privileges*.
++
+NOTE: If you have a Basic license, sub-feature privileges are unavailable. For details, check out <>.
+[role="screenshot"]
+image::user/reporting/images/kibana-privileges-with-reporting.png["Kibana privileges with Reporting options, Gold or higher license"]
+
-If the *Reporting* option is unavailable, contact your administrator, or <>.
+NOTE: If the *Reporting* options for application features are unavailable, and the cluster license is higher than Basic, contact your administrator, or <>.
.. Click *Add {kib} privilege*.
@@ -89,7 +102,7 @@ If the *Reporting* option is unavailable, contact your administrator, or <> enabled in Reporting, you can also use the {ref}/security-api-put-role.html[role API] to grant access to the {report-features}. Grant custom reporting roles to users in combination with other roles that grant read access to the data in {es}, and at least read access in the applications where users can generate reports.
+With <> enabled in Reporting, you can also use the {ref}/security-api-put-role.html[role API] to grant access to the {report-features}, using *All* privileges, or sub-feature privileges.
-[source, sh]
+NOTE: If you have a Basic license, sub-feature privileges are unavailable. For details, check out the API command to grant *All* privileges in <>.
+
+Grant users custom Reporting roles, other roles that grant read access to the data in {es}, and at least read access in the applications where users can generate reports.
+
+[source, json]
---------------------------------------------------------------
-POST /_security/role/custom_reporting_user
+PUT localhost:5601/api/security/role/custom_reporting_user
{
- metadata: {},
- elasticsearch: { cluster: [], indices: [], run_as: [] },
- kibana: [
+ "elasticsearch": { "cluster": [], "indices": [], "run_as": [] },
+ "kibana": [
{
- base: [],
- feature: {
- dashboard: [
- 'generate_report', <1>
- 'download_csv_report' <2>
+ "base": [],
+ "feature": {
+ "dashboard": [
+ "minimal_read",
+ "generate_report", <1>
+ "download_csv_report" <2>
+ ],
+ "discover": [
+ "minimal_read",
+ "generate_report" <3>
+ ],
+ "canvas": [
+ "minimal_read",
+ "generate_report" <4>
],
- discover: ['generate_report'], <3>
- canvas: ['generate_report'], <4>
- visualize: ['generate_report'], <5>
+ "visualize": [
+ "minimal_read",
+ "generate_report" <5>
+ ]
},
- spaces: ['*'],
+ "spaces": [ "*" ]
}
- ]
+ ],
+ "metadata": {} // optional
}
---------------------------------------------------------------
// CONSOLE
@@ -134,6 +161,41 @@ POST /_security/role/custom_reporting_user
<5> Grants access to generate PNG and PDF reports in *Visualize Library*.
[float]
+[[grant-user-access-basic]]
+=== Grant users access with a Basic license
+
+With a Basic license, you can grant users access with custom roles to {report-features} with <>. However, with a Basic license, sub-feature privileges are unavailable. <>, then select *All* privileges for the applications where users can create reports.
+
+[role="screenshot"]
+image::user/reporting/images/kibana-privileges-with-reporting-basic.png["Kibana privileges with Reporting options, Basic license"]
+
+With a Basic license, sub-feature application privileges are unavailable, but you can use the {ref}/security-api-put-role.html[role API] to grant access to CSV {report-features}:
+
+[source, sh]
+---------------------------------------------------------------
+PUT localhost:5601/api/security/role/custom_reporting_user
+{
+ "elasticsearch": { "cluster": [], "indices": [], "run_as": [] },
+ "kibana": [
+ {
+ "base": [],
+ "feature": {
+ "dashboard": [ "all" ], <1>
+ "discover": [ "all" ], <2>
+ },
+ "spaces": [ "*" ]
+ }
+ ],
+ "metadata": {} // optional
+}
+---------------------------------------------------------------
+// CONSOLE
+
+<1> Grants access to generate CSV reports from saved searches in *Discover*.
+<2> Grants access to download CSV reports from saved search panels in *Dashboard*.
+
+[float]
+[[grant-user-access-external-provider]]
==== Grant access using an external provider
If you are using an external identity provider, such as LDAP or Active Directory, you can assign roles to individual users or groups of users. Role mappings are configured in {ref}/mapping-roles.html[`config/role_mapping.yml`].
diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
index 3c81a1ff1a4b1..a9450a4269e09 100644
--- a/docs/setup/docker.asciidoc
+++ b/docs/setup/docker.asciidoc
@@ -4,8 +4,8 @@
Install with Docker
++++
-Docker images for Kibana are available from the Elastic Docker registry. The
-base image is https://hub.docker.com/_/centos/[centos:7].
+Docker images for {kib} are available from the Elastic Docker registry. The
+base image is https://hub.docker.com/_/ubuntu[ubuntu:20.04].
A list of all published Docker images and tags is available at
https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index fd28a9f12e759..81828bfbdee29 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -290,7 +290,7 @@ on the {kib} index at startup. {kib} users still need to authenticate with
{es}, which is proxied through the {kib} server.
|[[elasticsearch-service-account-token]] `elasticsearch.serviceAccountToken:`
- | beta[]. If your {es} is protected with basic authentication, this token provides the credentials
+ | If your {es} is protected with basic authentication, this token provides the credentials
that the {kib} server uses to perform maintenance on the {kib} index at startup. This setting
is an alternative to `elasticsearch.username` and `elasticsearch.password`.
diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
index a711b22cb21dc..3f395acd7320b 100644
--- a/docs/setup/upgrade.asciidoc
+++ b/docs/setup/upgrade.asciidoc
@@ -23,7 +23,7 @@ ifeval::[ "{version}" != "{minor-version}.0" ]
|Upgrade to {version}
endif::[]
-|7.0–7.13
+|7.0–7.16
|Upgrade to {version}
|6.8
@@ -49,10 +49,9 @@ a|
. Upgrade to {version}
|====
-[WARNING]
-====
-The upgrade path from 6.8 to 7.0 is *not* supported.
-====
+// tag::7.0-upgrade-warning[]
+WARNING: Upgrading from 6.8 to 7.0 is *not* supported. Upgrade directly to {version} instead.
+// end::7.0-upgrade-warning[]
[float]
[[upgrade-before-you-begin]]
@@ -73,20 +72,19 @@ Before you upgrade {kib}:
the same Elasticseach index is unsupported. Upgrading while older {kib}
instances are running can cause data loss or upgrade failures.
-To identify the changes you need to make to upgrade, and to enable you to
-perform an Elasticsearch rolling upgrade with no downtime, you must upgrade to
-6.7 before you upgrade to 7.0.
-
For a comprehensive overview of the upgrade process, refer to
*{stack-ref}/upgrading-elastic-stack.html[Upgrading the Elastic Stack]*.
[float]
[[upgrade-5x-earlier]]
-=== Upgrade from 5.x or earlier
-{es} can read indices created in the previous major version. Before you upgrade
-to 7.0.0, you must reindex or delete any indices created in 5.x or earlier.
-For more information, refer to
+=== Upgrade from 5.6 or earlier
+To identify the changes you need to make to upgrade, and to enable you to
+perform an Elasticsearch rolling upgrade with no downtime, you must upgrade to
+6.8 before you upgrade to {version}.
+
+{es} {version} can't read indices created in 5.6 or earlier versions. Before you
+upgrade from 6.8 to {version}, you must reindex or delete these indices. For more information, refer to
{stack-ref}/upgrading-elastic-stack.html#oss-stack-upgrade[Upgrading the Elastic Stack].
When your reindex is complete, follow the <>
@@ -94,34 +92,39 @@ instructions.
[float]
[[upgrade-6x]]
-=== Upgrade from 6.x
+=== Upgrade from 6.7 or earlier
-The recommended path is to upgrade to 6.8 before upgrading to 7.0. This makes it
-easier to identify the required changes, and enables you to use the Upgrade
-Assistant to prepare for your upgrade to 7.0.
+The recommended path is to upgrade to 6.8 before upgrading to {version}. This
+makes it easier to identify the required changes and enables you to use the
+Upgrade Assistant to prepare for your upgrade.
-TIP: The ability to import {kib} 6.x saved searches, visualizations, and
-dashboards is supported.
+include::upgrade.asciidoc[tag=7.0-upgrade-warning]
+
+You can import {kib} 6.x saved searches, visualizations, and
+dashboards in {version}.
[float]
[[upgrade-67]]
=== Upgrade from 6.8
-To help you prepare for your upgrade to 7.0, 6.8 includes an https://www.elastic.co/guide/en/kibana/6.8/upgrade-assistant.html[Upgrade Assistant]
-To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
+To help you prepare for your upgrade to {version}, 6.8 includes an
+https://www.elastic.co/guide/en/kibana/6.8/upgrade-assistant.html[Upgrade
+Assistant]. To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
+
+include::upgrade.asciidoc[tag=7.0-upgrade-warning]
After you have addressed any issues that were identified by the Upgrade
-Assistant, <>.
+Assistant, <>.
[float]
=== Known issues
[float]
==== "shard failed" error when viewing {beats} dashboards in {kib}
-After upgrading to {es} 7.0, any indices created by {beats} 6.6 or older will not
+After upgrading to {es} {version}, any indices created by {beats} 6.6 or older will not
work in {kib} dashboards until the `index.query.default_field` setting is added
to each index. Indices created in {beats} 6.7 or later are unaffected.
To add the setting to the index, you can use the 7.0
-{kibana-ref}/upgrade-assistant.html[Upgrade Assistant], or
+{kibana-ref-all}/6.8/upgrade-assistant.html[Upgrade Assistant] before upgrading, or
//{beats-ref}/upgrading.html#dashboard-shard-failed[
add the setting manually
//]
diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc
index cfcca93f7e5fd..04340c422f3c7 100644
--- a/docs/setup/upgrade/upgrade-migrations.asciidoc
+++ b/docs/setup/upgrade/upgrade-migrations.asciidoc
@@ -135,13 +135,13 @@ For {kib} versions prior to 7.5.1, if the task manager index is set to `.tasks`
If {kib} terminates unexpectedly while migrating a saved object index it will automatically attempt to perform the migration again once the process has restarted. Do not delete any saved objects indices to attempt to fix a failed migration. Unlike previous versions, {kib} version 7.12.0 and later does not require deleting any indices to release a failed migration lock.
-If upgrade migrations fail repeatedly, follow the advice in (preventing migration failures)[preventing-migration-failures]. Once the root cause for the migration failure has been addressed, {kib} will automatically retry the migration without any further intervention. If you're unable to resolve a failed migration following these steps, please contact support.
+If upgrade migrations fail repeatedly, follow the advice in <>. Once the root cause for the migration failure has been addressed, {kib} will automatically retry the migration without any further intervention. If you're unable to resolve a failed migration following these steps, please contact support.
[float]
[[upgrade-migrations-rolling-back]]
==== Rolling back to a previous version of {kib}
-If you've followed the advice in (preventing migration failures)[preventing-migration-failures] and (resolving migration failures)[resolve-migrations-failures] and {kib} is still not able to upgrade successfully, you might choose to rollback {kib} until you're able to identify and fix the root cause.
+If you've followed the advice in <> and <> and {kib} is still not able to upgrade successfully, you might choose to rollback {kib} until you're able to identify and fix the root cause.
WARNING: Before rolling back {kib}, ensure that the version you wish to rollback to is compatible with your {es} cluster. If the version you're rolling back to is not compatible, you will have to also rollback {es}. +
Any changes made after an upgrade will be lost when rolling back to a previous version.
diff --git a/docs/user/alerting/rule-types/es-query.asciidoc b/docs/user/alerting/rule-types/es-query.asciidoc
index 65d39ba170c3c..dba8a4878cb26 100644
--- a/docs/user/alerting/rule-types/es-query.asciidoc
+++ b/docs/user/alerting/rule-types/es-query.asciidoc
@@ -2,12 +2,17 @@
[[rule-type-es-query]]
=== {es} query
-The {es} query rule type runs a user-configured {es} query, compares the number of matches to a configured threshold, and schedules actions to run when the threshold condition is met.
+The {es} query rule type runs a user-configured query, compares the number of
+matches to a configured threshold, and schedules actions to run when the
+threshold condition is met.
+
[float]
==== Create the rule
-Fill in the <>, then select *{es} query*.
+Fill in the <>, then select
+*{es} query*.
+
[float]
==== Define the conditions
@@ -17,30 +22,55 @@ Define properties to detect the condition.
[role="screenshot"]
image::user/alerting/images/rule-types-es-query-conditions.png[Five clauses define the condition to detect]
-Index:: This clause requires an *index or index pattern* and a *time field* that will be used for the *time window*.
-Size:: This clause specifies the number of documents to pass to the configured actions when the the threshold condition is met.
-{es} query:: This clause specifies the ES DSL query to execute. The number of documents that match this query will be evaulated against the threshold
-condition. Aggregations are not supported at this time.
-Threshold:: This clause defines a threshold value and a comparison operator (`is above`, `is above or equals`, `is below`, `is below or equals`, or `is between`). The number of documents that match the specified query is compared to this threshold.
-Time window:: This clause determines how far back to search for documents, using the *time field* set in the *index* clause. Generally this value should be set to a value higher than the *check every* value in the <>, to avoid gaps in detection.
+Index:: Specifies an *index or data view* and a *time field* that is used for
+the *time window*.
+Size:: Specifies the number of documents to pass to the configured actions when
+the threshold condition is met.
+{es} query:: Specifies the ES DSL query to execute. The number of documents that
+match this query is evaluated against the threshold condition. Only the `query`
+field is used, other DSL fields are not considered.
+Threshold:: Defines a threshold value and a comparison operator (`is above`,
+`is above or equals`, `is below`, `is below or equals`, or `is between`). The
+number of documents that match the specified query is compared to this
+threshold.
+Time window:: Defines how far back to search for documents, using the
+*time field* set in the *index* clause. Generally this value should be set to a
+value higher than the *check every* value in the
+<>, to avoid gaps in
+detection.
+
[float]
==== Add action variables
-<> to run when the rule condition is met. The following variables are specific to the {es} query rule. You can also specify <>.
+<> to run when the rule condition
+is met. The following variables are specific to the {es} query rule. You can
+also specify
+<>.
+
+`context.title`:: A preconstructed title for the rule. Example:
+`rule term match alert query matched`.
-`context.title`:: A preconstructed title for the rule. Example: `rule term match alert query matched`.
`context.message`:: A preconstructed message for the rule. Example: +
-`rule 'term match alert' is active:` +
-`- Value: 42` +
-`- Conditions Met: count greater than 4 over 5m` +
-`- Timestamp: 2020-01-01T00:00:00.000Z`
+`rule 'my es-query' is active:` +
+`- Value: 2` +
+`- Conditions Met: Number of matching documents is greater than 1 over 5m` +
+`- Timestamp: 2022-02-03T20:29:27.732Z`
+
+`context.group`:: The name of the action group associated with the condition.
+Example: `query matched`.
+
+`context.date`:: The date, in ISO format, that the rule met the condition.
+Example: `2022-02-03T20:29:27.732Z`.
-`context.group`:: The name of the action group associated with the condition. Example: `query matched`.
-`context.date`:: The date, in ISO format, that the rule met the condition. Example: `2020-01-01T00:00:00.000Z`.
`context.value`:: The value of the rule that met the condition.
-`context.conditions`:: A description of the condition. Example: `count greater than 4`.
-`context.hits`:: The most recent ES documents that matched the query. Using the https://mustache.github.io/[Mustache] template array syntax, you can iterate over these hits to get values from the ES documents into your actions.
+
+`context.conditions`:: A description of the condition. Example:
+`count greater than 4`.
+
+`context.hits`:: The most recent documents that matched the query. Using the
+https://mustache.github.io/[Mustache] template array syntax, you can iterate
+over these hits to get values from the ES documents into your actions.
+
[role="screenshot"]
image::images/rule-types-es-query-example-action-variable.png[Iterate over hits using Mustache template syntax]
@@ -51,8 +81,8 @@ image::images/rule-types-es-query-example-action-variable.png[Iterate over hits
Use the *Test query* feature to verify that your query DSL is valid.
-* Valid queries are executed against the configured *index* using the configured *time window*. The number of documents that
-match the query will be displayed.
+* Valid queries are executed against the configured *index* using the configured
+*time window*. The number of documents that match the query is displayed.
+
[role="screenshot"]
image::user/alerting/images/rule-types-es-query-valid.png[Test {es} query returns number of matches when valid]
@@ -63,29 +93,35 @@ image::user/alerting/images/rule-types-es-query-valid.png[Test {es} query return
image::user/alerting/images/rule-types-es-query-invalid.png[Test {es} query shows error when invalid]
[float]
-==== Match de-duplication
+==== Handling multiple matches of the same document
+
+This rule type checks for duplication of document matches across rule
+executions. If you configure the rule with a schedule interval smaller than the
+time window, and a document matches a query in multiple rule executions, it is
+alerted on only once.
-The {es} query rule type performs de-duplication of document matches across rule executions. If you configure the rule with a schedule interval smaller than the time window, and a document matches a query in multiple rule executions, it will be alerted on only once.
+The rule uses the timestamp of the matches to avoid alerting on the same match
+multiple times. The timestamp of the latest match is used for evaluating the
+rule conditions when the rule is executed. Only matches between the latest
+timestamp from the previous execution and the actual rule execution are
+considered.
-Suppose you have a rule configured to run every minute. The rule uses a time window of 1 hour and checks if there are more than 99 matches for the query. The {es} query rule type will do the following:
+Suppose you have a rule configured to run every minute. The rule uses a time
+window of 1 hour and checks if there are more than 99 matches for the query. The
+{es} query rule type does the following:
[cols="3*<"]
|===
-
| `Execution 1 (0:00)`
| Rule finds 113 matches in the last hour: `113 > 99`
-| Rule is active and user will be alerted.
-
+| Rule is active and user is alerted.
| `Execution 2 (0:01)`
-| Rule finds 127 matches in the last hour. 105 of the matches are duplicates that were alerted on in Execution 1, so you actually have 22 matches: `22 !> 99`
+| Rule finds 127 matches in the last hour. 105 of the matches are duplicates that were already alerted on previously, so you actually have 22 matches: `22 !> 99`
| No alert.
-
| `Execution 3 (0:02)`
-| Rule finds 159 matches in the last hour. 88 of the matches are duplicates that were alerted on in Execution 1, so you actually have 71 matches: `71 !> 99`
+| Rule finds 159 matches in the last hour. 88 of the matches are duplicates that were already alerted on previously, so you actually have 71 matches: `71 !> 99`
| No alert.
-
| `Execution 4 (0:03)`
-| Rule finds 190 matches in the last hour. 71 of them are duplicates that were alerted on in Exeuction 1, so you actually have 119 matches: `119 > 99`
-| Rule is active and user will be alerted.
-
+| Rule finds 190 matches in the last hour. 71 of them are duplicates that were already alerted on previously, so you actually have 119 matches: `119 > 99`
+| Rule is active and user is alerted.
|===
\ No newline at end of file
diff --git a/docs/user/api.asciidoc b/docs/user/api.asciidoc
index e17d52675437e..9b1a12daf3ef1 100644
--- a/docs/user/api.asciidoc
+++ b/docs/user/api.asciidoc
@@ -94,6 +94,7 @@ include::{kib-repo-dir}/api/saved-objects.asciidoc[]
include::{kib-repo-dir}/api/index-patterns.asciidoc[]
include::{kib-repo-dir}/api/alerting.asciidoc[]
include::{kib-repo-dir}/api/actions-and-connectors.asciidoc[]
+include::{kib-repo-dir}/api/cases.asciidoc[]
include::{kib-repo-dir}/api/dashboard-api.asciidoc[]
include::{kib-repo-dir}/api/logstash-configuration-management.asciidoc[]
include::{kib-repo-dir}/api/machine-learning.asciidoc[]
diff --git a/docs/user/dashboard/aggregation-based.asciidoc b/docs/user/dashboard/aggregation-based.asciidoc
index 351e1f5d0825a..5f8a40476ba75 100644
--- a/docs/user/dashboard/aggregation-based.asciidoc
+++ b/docs/user/dashboard/aggregation-based.asciidoc
@@ -111,6 +111,8 @@ Choose the type of visualization you want to create, then use the editor to conf
.. Select the visualization type you want to create.
.. Select the data source you want to visualize.
++
+NOTE: There is no performance impact on the data source you select. For example, *Discover* saved searches perform the same as {data-sources}.
. Add the <> you want to visualize using the editor, then click *Update*.
+
diff --git a/docs/user/dashboard/make-dashboards-interactive.asciidoc b/docs/user/dashboard/make-dashboards-interactive.asciidoc
index 54a723f63e253..2c6fff7157b92 100644
--- a/docs/user/dashboard/make-dashboards-interactive.asciidoc
+++ b/docs/user/dashboard/make-dashboards-interactive.asciidoc
@@ -48,7 +48,7 @@ To create *Controls* panels:
. Select the control panel type from the dropdown, then click *Add*.
-. Enter the *Control Label*, then select the *{Data-Source}* and *Field*.
+. Enter the *Control Label*, then select the *{data-source-caps}* and *Field*.
. If you are adding a *Range slider*, enter the *Step Size* and *Decimal Places*.
diff --git a/docs/user/dashboard/vega-reference.asciidoc b/docs/user/dashboard/vega-reference.asciidoc
index 591cc1aad379b..bb8f8ace2b0fd 100644
--- a/docs/user/dashboard/vega-reference.asciidoc
+++ b/docs/user/dashboard/vega-reference.asciidoc
@@ -102,6 +102,8 @@ Tokens include the following:
* `"%dashboard_context-filter_clause%"`: String replaced by an object containing filters
* `"%dashboard_context-must_not_clause%"`: String replaced by an object containing filters
+NOTE: Vega supports the `interval` parameter, which is unsupported {es} 8.0.0 and later. To use intervals, use `fixed_interval` or `calendar_interval` instead.
+
For example, the following query counts the number of documents in a specific index:
[source,yaml]
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index 3327bc763e4ed..849b0f34570b8 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -26,7 +26,8 @@ If {stack-security-features} are enabled, users must have the necessary
privileges to use {ml-features}. Refer to
{ml-docs}/setup.html#setup-privileges[Set up {ml-features}].
-NOTE: There are limitations in {ml-features} that affect {kib}. For more information, refer to {ml-docs}/ml-limitations.html[Machine learning].
+NOTE: There are limitations in {ml-features} that affect {kib}. For more
+information, refer to {ml-docs}/ml-limitations.html[{ml-cap}].
--
@@ -85,8 +86,6 @@ and {ml-docs}/xpack-ml.html[{ml-cap} {anomaly-detect}].
[[xpack-ml-dfanalytics]]
== {dfanalytics-cap}
-experimental[]
-
The Elastic {ml} {dfanalytics} feature enables you to analyze your data using
{classification}, {oldetection}, and {regression} algorithms and generate new
indices that contain the results alongside your source data.
diff --git a/docs/user/monitoring/xpack-monitoring.asciidoc b/docs/user/monitoring/xpack-monitoring.asciidoc
index c3aafe7f90db9..751710d1e74f5 100644
--- a/docs/user/monitoring/xpack-monitoring.asciidoc
+++ b/docs/user/monitoring/xpack-monitoring.asciidoc
@@ -17,9 +17,6 @@ instance, and Beat is considered unique based on its persistent
UUID, which is written to the <> directory when the node
or instance starts.
-NOTE: Watcher must be enabled to view cluster alerts. If you have a Basic
-license, Top Cluster Alerts are not displayed.
-
For more information, see <> and
{ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].
diff --git a/docs/user/production-considerations/production.asciidoc b/docs/user/production-considerations/production.asciidoc
index 43e08f42f12a4..d4dafbab8b6a4 100644
--- a/docs/user/production-considerations/production.asciidoc
+++ b/docs/user/production-considerations/production.asciidoc
@@ -16,6 +16,11 @@ separate from your {es} data or master nodes. To distribute {kib}
traffic across the nodes in your {es} cluster,
you can configure {kib} to use a list of {es} hosts.
+[WARNING]
+====
+{kib} does not support rolling upgrades, and deploying mixed versions of {kib} can result in data loss or upgrade failures. Please shut down all instances of {kib} before performing an upgrade, and ensure all running {kib} instances have matching versions.
+====
+
[float]
[[load-balancing-kibana]]
=== Load balancing across multiple {kib} instances
@@ -59,13 +64,18 @@ bin/kibana -c config/instance2.yml
=== Accessing multiple load-balanced {kib} clusters
To access multiple load-balanced {kib} clusters from the same browser,
-set `xpack.security.cookieName` in the configuration.
+explicitly set `xpack.security.cookieName` to the same value in the {kib} configuration
+of each {kib} instance.
+
+Each {kib} cluster must have a different value of `xpack.security.cookieName`.
+
This avoids conflicts between cookies from the different {kib} instances.
-In each cluster, {kib} instances should have the same `cookieName`
-value. This will achieve seamless high availability and keep the session
+This will achieve seamless high availability and keep the session
active in case of failure from the currently used instance.
+
+
[float]
[[high-availability]]
=== High availability across multiple {es} nodes
diff --git a/docs/user/reporting/images/kibana-privileges-with-reporting-basic.png b/docs/user/reporting/images/kibana-privileges-with-reporting-basic.png
new file mode 100644
index 0000000000000..6d2c3ba645b54
Binary files /dev/null and b/docs/user/reporting/images/kibana-privileges-with-reporting-basic.png differ
diff --git a/docs/user/reporting/images/kibana-privileges-with-reporting.png b/docs/user/reporting/images/kibana-privileges-with-reporting.png
new file mode 100644
index 0000000000000..0675d893e4af9
Binary files /dev/null and b/docs/user/reporting/images/kibana-privileges-with-reporting.png differ
diff --git a/docs/user/reporting/reporting-troubleshooting.asciidoc b/docs/user/reporting/reporting-troubleshooting.asciidoc
index 4b59cad38fd9a..6f525567cc28c 100644
--- a/docs/user/reporting/reporting-troubleshooting.asciidoc
+++ b/docs/user/reporting/reporting-troubleshooting.asciidoc
@@ -1,6 +1,7 @@
[role="xpack"]
[[reporting-troubleshooting]]
== Reporting troubleshooting
+
++++
Troubleshooting
++++
diff --git a/docs/user/security/api-keys/index.asciidoc b/docs/user/security/api-keys/index.asciidoc
index 94301568b6438..e4f71d740a2aa 100644
--- a/docs/user/security/api-keys/index.asciidoc
+++ b/docs/user/security/api-keys/index.asciidoc
@@ -27,11 +27,7 @@ The {es} API key service is automatically enabled when you configure
{ref}/configuring-tls.html#tls-http[TLS on the HTTP interface].
This ensures that clients are unable to send API keys in clear-text.
-When HTTPS connections are not enabled between {kib} and {es},
-you cannot create or manage API keys, and you get an error message.
-For more information, see the
-{ref}/security-api-create-api-key.html[{es} API key documentation],
-or contact your system administrator.
+When TLS on the HTTP interface between {kib} and {es} isn't configured, you must {ref}/security-api-create-api-key.html#security-api-create-api-key-desc[enable the API key service explicitly]. Otherwise, you cannot create or manage API keys, and you will get an error message when trying to use API keys in {kib}.
[float]
[[api-keys-security-privileges]]
diff --git a/docs/user/security/audit-logging.asciidoc b/docs/user/security/audit-logging.asciidoc
index 42900bb87056f..705d876df3e41 100644
--- a/docs/user/security/audit-logging.asciidoc
+++ b/docs/user/security/audit-logging.asciidoc
@@ -55,8 +55,9 @@ For information on how to configure `xpack.security.audit.appender`, refer to
Refer to the table of events that can be logged for auditing purposes.
-Each event is broken down into <>, <>, <> and <> fields
-to make it easy to filter, query and aggregate the resulting logs.
+Each event is broken down into <>, <>, <> and
+<> fields to make it easy to filter, query and aggregate the resulting logs. The <>
+field can be used to correlate multiple events that originate from the same request.
Refer to <> for a table of fields that get logged with audit event.
@@ -81,6 +82,9 @@ Refer to the corresponding {es} logs for potential write errors.
| `success` | User has logged in successfully.
| `failure` | Failed login attempt (e.g. due to invalid credentials).
+| `user_logout`
+| `unknown` | User is logging out.
+
3+a|
===== Category: database
====== Type: creation
@@ -445,7 +449,57 @@ Example: `https`
| *Field*
| *Description*
-| `trace.id`
+| [[field-trace-id]] `trace.id`
| Unique identifier allowing events of the same transaction from {kib} and {es} to be be correlated.
|======
+
+[[xpack-security-ecs-audit-correlation]]
+==== Correlating ECS audit events
+
+Audit events can be correlated in two ways:
+
+1. Multiple {kib} audit events that resulted from the same request can be correlated together.
+2. If {ref}/enable-audit-logging.html[{es} audit logging] is enabled, {kib} audit events from one request can be correlated with backend
+ calls that create {es} audit events.
+
+NOTE: The examples below are simplified, many fields have been omitted and values have been shortened for clarity.
+
+===== Example 1: correlating multiple {kib} audit events
+
+When "thom" creates a new alerting rule, five audit events are written:
+
+[source,json]
+-------------
+{"event":{"action":"http_request","category":["web"],"outcome":"unknown"},"http":{"request":{"method":"post"}},"url":{"domain":"localhost","path":"/api/alerting/rule","port":5601,"scheme":"https"},"user":{"name":"thom","roles":["superuser"]},"kibana":{"space_id":"default","session_id":"3dHCZRB..."},"@timestamp":"2022-01-25T13:05:34.449-05:00","message":"User is requesting [/api/alerting/rule] endpoint","trace":{"id":"e300e06..."}}
+{"event":{"action":"space_get","category":["database"],"type":["access"],"outcome":"success"},"kibana":{"space_id":"default","session_id":"3dHCZRB...","saved_object":{"type":"space","id":"default"}},"user":{"name":"thom","roles":["superuser"]},"@timestamp":"2022-01-25T13:05:34.454-05:00","message":"User has accessed space [id=default]","trace":{"id":"e300e06..."}}
+{"event":{"action":"connector_get","category":["database"],"type":["access"],"outcome":"success"},"kibana":{"space_id":"default","session_id":"3dHCZRB...","saved_object":{"type":"action","id":"5e3b1ae..."}},"user":{"name":"thom","roles":["superuser"]},"@timestamp":"2022-01-25T13:05:34.948-05:00","message":"User has accessed connector [id=5e3b1ae...]","trace":{"id":"e300e06..."}}
+{"event":{"action":"connector_get","category":["database"],"type":["access"],"outcome":"success"},"kibana":{"space_id":"default","session_id":"3dHCZRB...","saved_object":{"type":"action","id":"5e3b1ae..."}},"user":{"name":"thom","roles":["superuser"]},"@timestamp":"2022-01-25T13:05:34.956-05:00","message":"User has accessed connector [id=5e3b1ae...]","trace":{"id":"e300e06..."}}
+{"event":{"action":"rule_create","category":["database"],"type":["creation"],"outcome":"unknown"},"kibana":{"space_id":"default","session_id":"3dHCZRB...","saved_object":{"type":"alert","id":"64517c3..."}},"user":{"name":"thom","roles":["superuser"]},"@timestamp":"2022-01-25T13:05:34.956-05:00","message":"User is creating rule [id=64517c3...]","trace":{"id":"e300e06..."}}
+-------------
+
+All of these audit events can be correlated together by the same `trace.id` value `"e300e06..."`. The first event is the HTTP API call, the
+next audit events are checks to validate the space and the connectors, and the last audit event is the actual rule creation.
+
+===== Example 2: correlating a {kib} audit event with {es} audit events
+
+When "thom" logs in, a "user_login" {kib} audit event is written:
+
+[source,json]
+-------------
+{"event":{"action":"user_login","category":["authentication"],"outcome":"success"},"user":{"name":"thom","roles":["superuser"]},"@timestamp":"2022-01-25T09:40:39.267-05:00","message":"User [thom] has logged in using basic provider [name=basic]","trace":{"id":"818cbf3..."}}
+-------------
+
+The `trace.id` value `"818cbf3..."` in the {kib} audit event can be correlated with the `opaque_id` value in these six {es} audit events:
+
+[source,json]
+-------------
+{"type":"audit", "timestamp":"2022-01-25T09:40:38,604-0500", "event.action":"access_granted", "user.name":"thom", "user.roles":["superuser"], "request.id":"YCx8wxs...", "action":"cluster:admin/xpack/security/user/authenticate", "request.name":"AuthenticateRequest", "opaque_id":"818cbf3..."}
+{"type":"audit", "timestamp":"2022-01-25T09:40:38,613-0500", "event.action":"access_granted", "user.name":"kibana_system", "user.roles":["kibana_system"], "request.id":"Ksx73Ad...", "action":"indices:data/write/index", "request.name":"IndexRequest", "indices":[".kibana_security_session_1"], "opaque_id":"818cbf3..."}
+{"type":"audit", "timestamp":"2022-01-25T09:40:38,613-0500", "event.action":"access_granted", "user.name":"kibana_system", "user.roles":["kibana_system"], "request.id":"Ksx73Ad...", "action":"indices:data/write/bulk", "request.name":"BulkRequest", "opaque_id":"818cbf3..."}
+{"type":"audit", "timestamp":"2022-01-25T09:40:38,613-0500", "event.action":"access_granted", "user.name":"kibana_system", "user.roles":["kibana_system"], "request.id":"Ksx73Ad...", "action":"indices:data/write/bulk[s]", "request.name":"BulkShardRequest", "indices":[".kibana_security_session_1"], "opaque_id":"818cbf3..."}
+{"type":"audit", "timestamp":"2022-01-25T09:40:38,613-0500", "event.action":"access_granted", "user.name":"kibana_system", "user.roles":["kibana_system"], "request.id":"Ksx73Ad...", "action":"indices:data/write/index:op_type/create", "request.name":"BulkItemRequest", "indices":[".kibana_security_session_1"], "opaque_id":"818cbf3..."}
+{"type":"audit", "timestamp":"2022-01-25T09:40:38,613-0500", "event.action":"access_granted", "user.name":"kibana_system", "user.roles":["kibana_system"], "request.id":"Ksx73Ad...", "action":"indices:data/write/bulk[s][p]", "request.name":"BulkShardRequest", "indices":[".kibana_security_session_1"], "opaque_id":"818cbf3..."}
+-------------
+
+The {es} audit events show that "thom" authenticated, then subsequently "kibana_system" created a session for that user.
diff --git a/docs/user/security/authentication/index.asciidoc b/docs/user/security/authentication/index.asciidoc
index 2f2b279389799..446de62326f8e 100644
--- a/docs/user/security/authentication/index.asciidoc
+++ b/docs/user/security/authentication/index.asciidoc
@@ -5,7 +5,7 @@
Authentication
++++
:keywords: administrator, concept, security, authentication
-:description: A list of the supported authentication mechanisms in {kib}.
+:description: A list of the supported authentication mechanisms in {kib}.
{kib} supports the following authentication mechanisms:
@@ -483,4 +483,4 @@ To make this iframe leverage anonymous access automatically, you will need to mo
NOTE: `auth_provider_hint` query string parameter goes *before* the hash URL fragment.
-For more information on how to embed, refer to <>.
+For more information, refer to <>.
diff --git a/docs/user/security/secure-saved-objects.asciidoc b/docs/user/security/secure-saved-objects.asciidoc
index 3b15a576500f1..1093aa1de0d05 100644
--- a/docs/user/security/secure-saved-objects.asciidoc
+++ b/docs/user/security/secure-saved-objects.asciidoc
@@ -16,7 +16,7 @@ xpack.encryptedSavedObjects:
[IMPORTANT]
============================================================================
-If you don't specify an encryption key, {kib} automatically generates a random key at startup. Every time you restart {kib}, it uses a new ephemeral encryption key and is unable to decrypt saved objects encrypted with another key. To prevent data loss, {kib} might disable features that rely on this encryption until you explicitly set an encryption key.
+If you don't specify an encryption key, {kib} might disable features that rely on encrypted saved objects.
============================================================================
[[encryption-key-rotation]]
diff --git a/docs/user/whats-new.asciidoc b/docs/user/whats-new.asciidoc
index a1e0b4c15423e..be1929715fb83 100644
--- a/docs/user/whats-new.asciidoc
+++ b/docs/user/whats-new.asciidoc
@@ -1,128 +1,17 @@
[[whats-new]]
== What's new in {minor-version}
-Here are the highlights of what's new and improved in {minor-version}.
-For detailed information about this release,
-check out the <>.
+{kib} {minor-version} is a compatibility release for the {minor-version} Elastic Stack
+and contains no major features.
+For detailed information about this release, refer to the {kibana-ref}/release-notes.html[release notes].
-Other versions: {kibana-ref-all}/7.15/whats-new.html[7.15] | {kibana-ref-all}/7.14/whats-new.html[7.14] | {kibana-ref-all}/7.13/whats-new.html[7.13] | {kibana-ref-all}/7.12/whats-new.html[7.12] | {kibana-ref-all}/7.11/whats-new.html[7.11] |
+// tag::notable-highlights[]
+
+// end::notable-highlights[]
+
+Previous versions: {kibana-ref-all}/7.16/whats-new.html[7.16] |
+{kibana-ref-all}/7.15/whats-new.html[7.15] | {kibana-ref-all}/7.14/whats-new.html[7.14] | {kibana-ref-all}/7.13/whats-new.html[7.13] | {kibana-ref-all}/7.12/whats-new.html[7.12] | {kibana-ref-all}/7.11/whats-new.html[7.11] |
{kibana-ref-all}/7.10/whats-new.html[7.10] | {kibana-ref-all}/7.9/whats-new.html[7.9] | {kibana-ref-all}/7.8/whats-new.html[7.8] | {kibana-ref-all}/7.7/release-highlights-7.7.0.html[7.7] |
{kibana-ref-all}/7.6/release-highlights-7.6.0.html[7.6] | {kibana-ref-all}/7.5/release-highlights-7.5.0.html[7.5] | {kibana-ref-all}/7.4/release-highlights-7.4.0.html[7.4] |
{kibana-ref-all}/7.3/release-highlights-7.3.0.html[7.3] | {kibana-ref-all}/7.2/release-highlights-7.2.0.html[7.2] | {kibana-ref-all}/7.1/release-highlights-7.1.0.html[7.1] |
{kibana-ref-all}/7.0/release-highlights-7.0.0.html[7.0]
-
-//NOTE: The notable-highlights tagged regions are re-used in the
-//Installation and Upgrade Guide
-
-// tag::notable-highlights[]
-
-[float]
-=== Upgrade Assistant for 8.x
-
-*Upgrade Assistant* is your one-stop shop to help you prepare for upgrading to 8.x.
-Review and address {es} and {kib} deprecation issues, analyze {es} deprecation logs,
-migrate system indices, and back up your data before upgrading, all from this app.
-
-[role="screenshot"]
-image::images/upgrade-assistant-7.16.png[Upgrade Assistant to help you prepare for upgrading to 8.x]
-
-
-[float]
-=== Unified integrations view
-
-All ingest options for Elastic have been moved to a single *Integrations* view.
-This provides a more consistent experience for onboarding to Elastic and increases
-the discoverability of integrations.
-All entry points for adding integrations now route to this page.
-
-[role="screenshot"]
-image::images/integrations-view-7.16.png[View of all ingest options for Elastic]
-
-
-[float]
-=== Reference lines in Lens
-
-Reference lines are now available in *Lens* to help you easily identify
-important values in your visualizations. Create reference lines with static
-values, dynamic data using {es} *Quick Functions*, or define with a
-custom *Formula*. Reference lines can come from separate index patterns,
-such as a goal dataset that is independent of the source data.
-
-With reference lines, you can:
-
-* Track metrics against goals, warning zones, and more.
-* Add display options, such as color, icons, and labels.
-* Apply color to the area above or below the reference line.
-+
-[role="screenshot"]
-image::images/reference-line-7.16.png[View of all ingest options for Elastic]
-
-[float]
-=== Enhancements to visualization editors
-
-{kib} offers even more ways to work with your visualizations:
-
-* *Apply custom field formats in TSVB.*
-Take advantage of the field formatters from your index pattern in
-*TSVB*—or override the format for a specific visualization.
-* *Filter in TSVB.*
-You always had the ability to ignore global filters in *TSVB* layers,
-and now you can also change them. This makes it easier to explore your data
-in *TSVB* without having to edit the filters for each series.
-* *View data and requests in Lens.*
-View the data in visualizations and the requests that collected the data right in the *Lens* editor.
-* *View requests in Console.*
-View the requests that collect the data in visualizations in *Console*.
-* *Auto fit rows to content.*
-Automatically resize *Aggregation-based* data table rows so that text and images are fully visible.
-
-[float]
-=== New and updated connectors in Alerting
-
-Alerting has grown its collection of connectors with the addition of the ServiceNow ITOM
-connector, which allows for easy integration with ServiceNow event management. In addition,
-{kib} provides a more efficient integration for ServiceNow ITSM and SecOps connectors
-with certified applications on the ServiceNow store. Also added
-is the ability to authenticate the email connector with OAuth 2.0
-Client Credentials for the MS Exchange email service.
-
-[float]
-=== Rule duration on display
-
-In *Rules and Connectors*, the *Rules* view now includes the rule duration field, which shows how long a rule is taking to
-complete execution. This helps you identify rules that run longer than you anticipate.
-
-[role="screenshot"]
-image::images/rules-view-7.16.png[View of all ingest options for Elastic]
-
-You can observe the duration for the last 30 executions
-on the rules detail page.
-
-[role="screenshot"]
-image::images/rule-details-7.16.png[View of all ingest options for Elastic]
-
-[float]
-=== Osquery Manager now generally available
-
-With the GA release, *Osquery Manager* is now fully supported and available
-for use in production. In addition, the 7.16 release offers the following new capabilities:
-
-* Customize the osquery configuration.
-* Map saved query results to ECS.
-* Test out queries when editing saved queries.
-* Map static values to ECS.
-* Schedule query packs for one or more agent policies.
-* Set custom namespace values for the integration.
-* Query three new Kubernetes tables.
-
-For more information, refer to {kibana-ref}/osquery.html[Osquery].
-
-[float]
-=== Transform health alerting rules
-
-beta:[] A new rule type notifies you when continuous transforms
-experience operational issues. It enables you to detect when a transform stops
-indexing data or is in a failed state. For more details, refer to
-{ref}/transform-alerts.html[Generating alerts for transforms].
-
-// end::notable-highlights[]
diff --git a/examples/embeddable_examples/public/book/book_embeddable.tsx b/examples/embeddable_examples/public/book/book_embeddable.tsx
index 0f25d564e5580..024d9d90448eb 100644
--- a/examples/embeddable_examples/public/book/book_embeddable.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable.tsx
@@ -92,13 +92,11 @@ export class BookEmbeddable
};
readonly getInputAsValueType = async (): Promise => {
- const input = this.attributeService.getExplicitInputFromEmbeddable(this);
- return this.attributeService.getInputAsValueType(input);
+ return this.attributeService.getInputAsValueType(this.getExplicitInput());
};
readonly getInputAsRefType = async (): Promise => {
- const input = this.attributeService.getExplicitInputFromEmbeddable(this);
- return this.attributeService.getInputAsRefType(input, {
+ return this.attributeService.getInputAsRefType(this.getExplicitInput(), {
showSaveModal: true,
saveModalTitle: this.getTitle(),
});
diff --git a/examples/embeddable_examples/public/book/edit_book_action.tsx b/examples/embeddable_examples/public/book/edit_book_action.tsx
index edf04901e4e0d..ab5694d7782fa 100644
--- a/examples/embeddable_examples/public/book/edit_book_action.tsx
+++ b/examples/embeddable_examples/public/book/edit_book_action.tsx
@@ -71,7 +71,7 @@ export const createEditBookAction = (getStartServices: () => Promise/src',
- '/packages',
- ...Fs.readdirSync(Path.resolve(__dirname, 'x-pack')).flatMap((name) => {
- // create roots for all x-pack/* dirs except for test
- if (name !== 'test' && Fs.statSync(Path.resolve(__dirname, 'x-pack', name)).isDirectory()) {
- return [`/x-pack/${name}`];
- }
-
- return [];
- }),
- ],
-};
diff --git a/jest.config.js b/jest.config.js
deleted file mode 100644
index ae07034c10781..0000000000000
--- a/jest.config.js
+++ /dev/null
@@ -1,24 +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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-module.exports = {
- preset: '@kbn/test',
- rootDir: '.',
- projects: [
- '/packages/*/jest.config.js',
- '/src/*/jest.config.js',
- '/src/plugins/*/jest.config.js',
- '/src/plugins/chart_expressions/*/jest.config.js',
- '/src/plugins/vis_types/*/jest.config.js',
- '/test/*/jest.config.js',
- '/x-pack/plugins/*/jest.config.js',
- '/x-pack/plugins/security_solution/*/jest.config.js',
- '/x-pack/plugins/security_solution/public/*/jest.config.js',
- '/x-pack/plugins/security_solution/server/*/jest.config.js',
- ],
-};
diff --git a/package.json b/package.json
index 07f439ad67bde..418cf8b90ea52 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
"dashboarding"
],
"private": true,
- "version": "7.16.2",
- "branch": "7.16",
+ "version": "7.17.3",
+ "branch": "7.17",
"types": "./kibana.d.ts",
"tsdocMetadata": "./build/tsdoc-metadata.json",
"build": {
@@ -66,30 +66,33 @@
"url": "https://github.com/elastic/kibana.git"
},
"engines": {
- "node": "16.13.0",
+ "node": "16.14.2",
"yarn": "^1.21.1"
},
"resolutions": {
"**/@babel/runtime": "^7.16.3",
- "**/@types/node": "16.10.2",
+ "**/@types/node": "16.11.7",
"**/chokidar": "^3.4.3",
"**/deepmerge": "^4.2.2",
"**/fast-deep-equal": "^3.1.1",
"**/handlebars/uglify-js": "^3.14.3",
"**/hoist-non-react-statics": "^3.3.2",
"**/html-minifier/uglify-js": "^3.14.3",
- "**/isomorphic-fetch/node-fetch": "^2.6.1",
+ "**/isomorphic-fetch/node-fetch": "^2.6.7",
"**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
"**/json-schema": "^0.4.0",
- "**/minimist": "^1.2.5",
- "**/node-jose/node-forge": "^0.10.0",
+ "**/minimatch": "^3.1.2",
+ "**/minimist": "^1.2.6",
+ "**/node-forge": "^1.3.0",
"**/pdfkit/crypto-js": "4.0.0",
"**/react-syntax-highlighter": "^15.3.1",
"**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
+ "**/refractor/prismjs": "~1.27.0",
"**/trim": "1.0.1",
"**/typescript": "4.1.3",
"**/underscore": "^1.13.1",
- "globby/fast-glob": "3.2.5"
+ "globby/fast-glob": "3.2.5",
+ "puppeteer/node-fetch": "^2.6.7"
},
"dependencies": {
"@babel/runtime": "^7.16.3",
@@ -99,7 +102,7 @@
"@elastic/apm-rum": "^5.9.1",
"@elastic/apm-rum-react": "^1.3.1",
"@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
- "@elastic/charts": "38.0.5",
+ "@elastic/charts": "40.3.0",
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^7.16.0-canary.7",
"@elastic/ems-client": "7.16.0",
@@ -110,7 +113,7 @@
"@elastic/node-crypto": "1.2.1",
"@elastic/numeral": "^2.5.1",
"@elastic/react-search-ui": "^1.6.0",
- "@elastic/request-crypto": "1.1.4",
+ "@elastic/request-crypto": "2.0.0",
"@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
"@elastic/search-ui-app-search-connector": "^1.6.0",
"@emotion/react": "^11.4.0",
@@ -193,7 +196,7 @@
"base64-js": "^1.3.1",
"bluebird": "3.5.5",
"brace": "0.11.1",
- "broadcast-channel": "^4.7.1",
+ "broadcast-channel": "^4.10.0",
"chalk": "^4.1.0",
"cheerio": "^1.0.0-rc.10",
"chokidar": "^3.4.3",
@@ -265,7 +268,7 @@
"js-search": "^1.4.3",
"js-sha256": "^0.9.0",
"js-sql-parser": "^1.4.1",
- "js-yaml": "^3.14.0",
+ "js-yaml": "^3.14.1",
"json-stable-stringify": "^1.0.1",
"json-stringify-pretty-compact": "1.2.0",
"json-stringify-safe": "5.0.1",
@@ -283,14 +286,14 @@
"lz-string": "^1.4.4",
"mapbox-gl-draw-rectangle-mode": "1.0.4",
"maplibre-gl": "1.15.2",
- "markdown-it": "^10.0.0",
+ "markdown-it": "^12.3.2",
"md5": "^2.1.0",
"mdast-util-to-hast": "10.0.1",
"memoize-one": "^5.0.0",
"mime": "^2.4.4",
"mime-types": "^2.1.27",
"mini-css-extract-plugin": "1.1.0",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.2",
"moment": "^2.24.0",
"moment-duration-format": "^2.3.2",
"moment-timezone": "^0.5.27",
@@ -298,8 +301,8 @@
"mustache": "^2.3.2",
"ngreact": "^0.5.1",
"nock": "12.0.3",
- "node-fetch": "^2.6.1",
- "node-forge": "^0.10.0",
+ "node-fetch": "^2.6.7",
+ "node-forge": "^1.3.0",
"nodemailer": "^6.6.2",
"normalize-path": "^3.0.0",
"object-hash": "^1.3.1",
@@ -435,7 +438,7 @@
"@babel/register": "^7.16.0",
"@babel/traverse": "^7.16.3",
"@babel/types": "^7.16.0",
- "@bazel/ibazel": "^0.15.10",
+ "@bazel/ibazel": "^0.16.2",
"@bazel/typescript": "^3.8.0",
"@cypress/snapshot": "^2.1.7",
"@cypress/webpack-preprocessor": "^5.6.0",
@@ -447,6 +450,7 @@
"@emotion/babel-preset-css-prop": "^11.2.0",
"@emotion/jest": "^11.3.0",
"@istanbuljs/schema": "^0.1.2",
+ "@jest/console": "^26.6.2",
"@jest/reporters": "^26.6.2",
"@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
"@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
@@ -500,7 +504,7 @@
"@types/bluebird": "^3.1.1",
"@types/chance": "^1.0.0",
"@types/chroma-js": "^1.4.2",
- "@types/chromedriver": "^81.0.0",
+ "@types/chromedriver": "^81.0.1",
"@types/classnames": "^2.2.9",
"@types/cmd-shim": "^2.0.0",
"@types/color": "^3.0.0",
@@ -563,22 +567,22 @@
"@types/lodash": "^4.14.159",
"@types/lru-cache": "^5.1.0",
"@types/lz-string": "^1.3.34",
- "@types/markdown-it": "^0.0.7",
+ "@types/markdown-it": "^12.2.3",
"@types/md5": "^2.2.0",
"@types/memoize-one": "^4.1.0",
"@types/mime": "^2.0.1",
"@types/mime-types": "^2.1.0",
"@types/minimatch": "^2.0.29",
- "@types/minimist": "^1.2.1",
- "@types/mocha": "^8.2.0",
+ "@types/minimist": "^1.2.2",
+ "@types/mocha": "^9.1.0",
"@types/mock-fs": "^4.13.1",
"@types/moment-timezone": "^0.5.12",
"@types/mustache": "^0.8.31",
"@types/ncp": "^2.0.1",
"@types/nock": "^10.0.3",
- "@types/node": "16.10.2",
- "@types/node-fetch": "^2.5.7",
- "@types/node-forge": "^0.10.5",
+ "@types/node": "16.11.7",
+ "@types/node-fetch": "^2.6.0",
+ "@types/node-forge": "^1.0.1",
"@types/nodemailer": "^6.4.0",
"@types/normalize-path": "^3.0.0",
"@types/object-hash": "^1.3.0",
@@ -612,7 +616,7 @@
"@types/redux-actions": "^2.6.1",
"@types/redux-logger": "^3.0.8",
"@types/seedrandom": ">=2.0.0 <4.0.0",
- "@types/selenium-webdriver": "^4.0.15",
+ "@types/selenium-webdriver": "^4.0.18",
"@types/semver": "^7",
"@types/set-value": "^2.0.0",
"@types/sinon": "^7.0.13",
@@ -669,7 +673,7 @@
"callsites": "^3.1.0",
"chai": "3.5.0",
"chance": "1.0.18",
- "chromedriver": "^96.0.0",
+ "chromedriver": "^100.0.0",
"clean-webpack-plugin": "^3.0.0",
"cmd-shim": "^2.1.0",
"compression-webpack-plugin": "^4.0.0",
@@ -705,7 +709,7 @@
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-jest": "^24.5.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
- "eslint-plugin-mocha": "^9.0.0",
+ "eslint-plugin-mocha": "^10.0.3",
"eslint-plugin-no-unsanitized": "^3.1.5",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prefer-object-spread": "^1.2.1",
@@ -721,7 +725,7 @@
"fetch-mock": "^7.3.9",
"file-loader": "^4.2.0",
"form-data": "^4.0.0",
- "geckodriver": "^2.0.4",
+ "geckodriver": "^3.0.1",
"glob-watcher": "5.0.3",
"gulp": "4.0.2",
"gulp-babel": "^8.0.0",
@@ -762,15 +766,15 @@
"lmdb-store": "^1.6.11",
"marge": "^1.0.1",
"micromatch": "3.1.10",
- "minimist": "^1.2.5",
+ "minimist": "^1.2.6",
"mkdirp": "0.5.1",
- "mocha": "^8.2.1",
- "mocha-junit-reporter": "^2.0.0",
- "mochawesome": "^6.2.1",
- "mochawesome-merge": "^4.2.0",
+ "mocha": "^9.1.0",
+ "mocha-junit-reporter": "^2.0.2",
+ "mochawesome": "^7.0.1",
+ "mochawesome-merge": "^4.2.1",
"mock-fs": "^5.1.1",
"mock-http-server": "1.3.0",
- "ms-chromium-edge-driver": "^0.4.2",
+ "ms-chromium-edge-driver": "^0.4.3",
"multimatch": "^4.0.0",
"mutation-observer": "^1.0.3",
"ncp": "^2.0.0",
@@ -783,6 +787,7 @@
"pbf": "3.2.1",
"pirates": "^4.0.1",
"pixelmatch": "^5.1.0",
+ "playwright": "^1.17.1",
"postcss": "^7.0.32",
"postcss-loader": "^3.0.0",
"postcss-prefix-selector": "^1.7.2",
@@ -796,7 +801,7 @@
"rxjs-marbles": "^5.0.6",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.0.1",
- "selenium-webdriver": "^4.0.0",
+ "selenium-webdriver": "^4.1.1",
"serve-static": "1.14.1",
"shelljs": "^0.8.4",
"simple-git": "1.116.0",
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_client.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_client.ts
new file mode 100644
index 0000000000000..77b3769fe62c1
--- /dev/null
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_client.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Axios from 'axios';
+import { ToolingLog } from '../tooling_log';
+
+import { parseConfig, Config } from './ci_stats_config';
+import { CiStatsMetadata } from './ci_stats_metadata';
+
+interface LatestTestGroupStatsOptions {
+ /** The Kibana branch to get stats for, eg "main" */
+ branch: string;
+ /** The CI job names to filter builds by, eg "kibana-hourly" */
+ ciJobNames: string[];
+ /** Filter test groups by group type */
+ testGroupType?: string;
+}
+
+interface CompleteSuccessBuildSource {
+ jobName: string;
+ jobRunner: string;
+ completedAt: string;
+ commit: string;
+ startedAt: string;
+ branch: string;
+ result: 'SUCCESS';
+ jobId: string;
+ targetBranch: string | null;
+ fromKibanaCiProduction: boolean;
+ requiresValidMetrics: boolean | null;
+ jobUrl: string;
+ mergeBase: string | null;
+}
+
+interface TestGroupSource {
+ '@timestamp': string;
+ buildId: string;
+ name: string;
+ type: string;
+ startTime: string;
+ durationMs: number;
+ meta: CiStatsMetadata;
+}
+
+interface LatestTestGroupStatsResp {
+ build: CompleteSuccessBuildSource & { id: string };
+ testGroups: Array;
+}
+
+export class CiStatsClient {
+ /**
+ * Create a CiStatsReporter by inspecting the ENV for the necessary config
+ */
+ static fromEnv(log: ToolingLog) {
+ return new CiStatsClient(parseConfig(log));
+ }
+
+ constructor(private readonly config?: Config) {}
+
+ isEnabled() {
+ return !!this.config?.apiToken;
+ }
+
+ async getLatestTestGroupStats(options: LatestTestGroupStatsOptions) {
+ if (!this.config || !this.config.apiToken) {
+ throw new Error('No ciStats config available, call `isEnabled()` before using the client');
+ }
+
+ const resp = await Axios.request({
+ baseURL: 'https://ci-stats.kibana.dev',
+ url: '/v1/test_group_stats',
+ params: {
+ branch: options.branch,
+ ci_job_name: options.ciJobNames.join(','),
+ test_group_type: options.testGroupType,
+ },
+ headers: {
+ Authentication: `token ${this.config.apiToken}`,
+ },
+ });
+
+ return resp.data;
+ }
+}
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_metadata.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_metadata.ts
new file mode 100644
index 0000000000000..edf78eed64974
--- /dev/null
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_metadata.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/** Container for metadata that can be attached to different ci-stats objects */
+export interface CiStatsMetadata {
+ /**
+ * Arbitrary key-value pairs which can be attached to CiStatsTiming and CiStatsMetric
+ * objects stored in the ci-stats service
+ */
+ [key: string]: string | string[] | number | boolean | undefined;
+}
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
index 3dff5acdc228a..f710f7ec70843 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_reporter.ts
@@ -11,16 +11,20 @@ import Os from 'os';
import Fs from 'fs';
import Path from 'path';
import crypto from 'crypto';
+
import execa from 'execa';
-import Axios from 'axios';
+import Axios, { AxiosRequestConfig } from 'axios';
// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
import httpAdapter from 'axios/lib/adapters/http';
import { ToolingLog } from '../tooling_log';
import { parseConfig, Config } from './ci_stats_config';
+import type { CiStatsTestGroupInfo, CiStatsTestRun } from './ci_stats_test_group_types';
+import { CiStatsMetadata } from './ci_stats_metadata';
const BASE_URL = 'https://ci-stats.kibana.dev';
+/** A ci-stats metric record */
export interface CiStatsMetric {
/** Top-level categorization for the metric, e.g. "page load bundle size" */
group: string;
@@ -40,13 +44,7 @@ export interface CiStatsMetric {
meta?: CiStatsMetadata;
}
-export interface CiStatsMetadata {
- /**
- * Arbitrary key-value pairs which can be attached to CiStatsTiming and CiStatsMetric
- * objects stored in the ci-stats service
- */
- [key: string]: string | string[] | number | boolean | undefined;
-}
+/** A ci-stats timing event */
export interface CiStatsTiming {
/** Top-level categorization for the timing, e.g. "scripts/foo", process type, etc. */
group: string;
@@ -58,13 +56,7 @@ export interface CiStatsTiming {
meta?: CiStatsMetadata;
}
-interface ReqOptions {
- auth: boolean;
- path: string;
- body: any;
- bodyDesc: string;
-}
-
+/** Options for reporting timings to ci-stats */
export interface TimingsOptions {
/** list of timings to record */
timings: CiStatsTiming[];
@@ -74,10 +66,41 @@ export interface TimingsOptions {
kibanaUuid?: string | null;
}
+/** Options for reporting metrics to ci-stats */
export interface MetricsOptions {
/** Default metadata to add to each metric */
defaultMeta?: CiStatsMetadata;
}
+
+/** Options for reporting tests to ci-stats */
+export interface CiStatsReportTestsOptions {
+ /**
+ * Information about the group of tests that were run
+ */
+ group: CiStatsTestGroupInfo;
+ /**
+ * Information about each test that ran, including failure information
+ */
+ testRuns: CiStatsTestRun[];
+}
+
+/* @internal */
+interface ReportTestsResponse {
+ buildId: string;
+ groupId: string;
+ testRunCount: number;
+}
+
+/* @internal */
+interface ReqOptions {
+ auth: boolean;
+ path: string;
+ body: any;
+ bodyDesc: string;
+ query?: AxiosRequestConfig['params'];
+}
+
+/** Object that helps report data to the ci-stats service */
export class CiStatsReporter {
/**
* Create a CiStatsReporter by inspecting the ENV for the necessary config
@@ -86,7 +109,7 @@ export class CiStatsReporter {
return new CiStatsReporter(parseConfig(log), log);
}
- constructor(private config: Config | undefined, private log: ToolingLog) {}
+ constructor(private readonly config: Config | undefined, private readonly log: ToolingLog) {}
/**
* Determine if CI_STATS is explicitly disabled by the environment. To determine
@@ -165,7 +188,7 @@ export class CiStatsReporter {
this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash);
- return await this.req({
+ return !!(await this.req({
auth: !!buildId,
path: '/v1/timings',
body: {
@@ -175,7 +198,7 @@ export class CiStatsReporter {
timings,
},
bodyDesc: timings.length === 1 ? `${timings.length} timing` : `${timings.length} timings`,
- });
+ }));
}
/**
@@ -188,12 +211,11 @@ export class CiStatsReporter {
}
const buildId = this.config?.buildId;
-
if (!buildId) {
- throw new Error(`CiStatsReporter can't be authorized without a buildId`);
+ throw new Error(`metrics can't be reported without a buildId`);
}
- return await this.req({
+ return !!(await this.req({
auth: true,
path: '/v1/metrics',
body: {
@@ -204,6 +226,30 @@ export class CiStatsReporter {
bodyDesc: `metrics: ${metrics
.map(({ group, id, value }) => `[${group}/${id}=${value}]`)
.join(' ')}`,
+ }));
+ }
+
+ /**
+ * Send test reports to ci-stats
+ */
+ async reportTests({ group, testRuns }: CiStatsReportTestsOptions) {
+ if (!this.config?.buildId || !this.config?.apiToken) {
+ throw new Error(
+ 'unable to report tests unless buildId is configured and auth config available'
+ );
+ }
+
+ return await this.req({
+ auth: true,
+ path: '/v1/test_group',
+ query: {
+ buildId: this.config?.buildId,
+ },
+ bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
+ body: [
+ JSON.stringify({ group }),
+ ...testRuns.map((testRun) => JSON.stringify({ testRun })),
+ ].join('\n'),
});
}
@@ -241,7 +287,7 @@ export class CiStatsReporter {
}
}
- private async req({ auth, body, bodyDesc, path }: ReqOptions) {
+ private async req({ auth, body, bodyDesc, path, query }: ReqOptions) {
let attempt = 0;
const maxAttempts = 5;
@@ -251,23 +297,24 @@ export class CiStatsReporter {
Authorization: `token ${this.config.apiToken}`,
};
} else if (auth) {
- throw new Error('this.req() shouldnt be called with auth=true if this.config is defined');
+ throw new Error('this.req() shouldnt be called with auth=true if this.config is not defined');
}
while (true) {
attempt += 1;
try {
- await Axios.request({
+ const resp = await Axios.request({
method: 'POST',
url: path,
baseURL: BASE_URL,
headers,
data: body,
+ params: query,
adapter: httpAdapter,
});
- return true;
+ return resp.data;
} catch (error) {
if (!error?.request) {
// not an axios error, must be a usage error that we should notify user about
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_test_group_types.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_test_group_types.ts
new file mode 100644
index 0000000000000..b786981fb8437
--- /dev/null
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/ci_stats_test_group_types.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { CiStatsMetadata } from './ci_stats_metadata';
+
+export type CiStatsTestResult = 'fail' | 'pass' | 'skip';
+export type CiStatsTestType =
+ | 'after all hook'
+ | 'after each hook'
+ | 'before all hook'
+ | 'before each hook'
+ | 'test';
+
+export interface CiStatsTestRun {
+ /**
+ * ISO-8601 formatted datetime representing when the tests started running
+ */
+ startTime: string;
+ /**
+ * Duration of the tests in milliseconds
+ */
+ durationMs: number;
+ /**
+ * A sequence number, this is used to order the tests in a specific test run
+ */
+ seq: number;
+ /**
+ * The type of this "test run", usually this is just "test" but when reporting issues in hooks it can be set to the type of hook
+ */
+ type: CiStatsTestType;
+ /**
+ * "fail", "pass" or "skip", the result of the tests
+ */
+ result: CiStatsTestResult;
+ /**
+ * The list of suite names containing this test, the first being the outermost suite
+ */
+ suites: string[];
+ /**
+ * The name of this specific test run
+ */
+ name: string;
+ /**
+ * Relative path from the root of the repo contianing this test
+ */
+ file: string;
+ /**
+ * Error message if the test failed
+ */
+ error?: string;
+ /**
+ * Debug output/stdout produced by the test
+ */
+ stdout?: string;
+ /**
+ * Screenshots captured during the test run
+ */
+ screenshots?: Array<{
+ name: string;
+ base64Png: string;
+ }>;
+}
+
+export interface CiStatsTestGroupInfo {
+ /**
+ * ISO-8601 formatted datetime representing when the group of tests started running
+ */
+ startTime: string;
+ /**
+ * The number of miliseconds that the tests ran for
+ */
+ durationMs: number;
+ /**
+ * The type of tests run in this group, any value is valid but test groups are groupped by type in the UI so use something consistent
+ */
+ type: string;
+ /**
+ * The name of this specific group (within the "type")
+ */
+ name: string;
+ /**
+ * Arbitrary metadata associated with this group. We currently look for a ciGroup metadata property for highlighting that when appropriate
+ */
+ meta: CiStatsMetadata;
+}
diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
index 318a2921517f1..fab2e61755a5c 100644
--- a/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
+++ b/packages/kbn-dev-utils/src/ci_stats_reporter/index.ts
@@ -10,3 +10,5 @@ export * from './ci_stats_reporter';
export type { Config } from './ci_stats_config';
export * from './ship_ci_stats_cli';
export { getTimeReporter } from './report_time';
+export * from './ci_stats_test_group_types';
+export * from './ci_stats_client';
diff --git a/packages/kbn-dev-utils/src/serializers/recursive_serializer.ts b/packages/kbn-dev-utils/src/serializers/recursive_serializer.ts
index 6e6572addbc83..15d3f033a85a1 100644
--- a/packages/kbn-dev-utils/src/serializers/recursive_serializer.ts
+++ b/packages/kbn-dev-utils/src/serializers/recursive_serializer.ts
@@ -6,11 +6,26 @@
* Side Public License, v 1.
*/
-export function createRecursiveSerializer(test: (v: any) => boolean, print: (v: any) => string) {
+class RawPrint {
+ static fromString(s: string) {
+ return new RawPrint(s);
+ }
+ constructor(public readonly v: string) {}
+}
+
+export function createRecursiveSerializer(
+ test: (v: any) => boolean,
+ print: (v: any, printRaw: (v: string) => RawPrint) => string | RawPrint
+) {
return {
test: (v: any) => test(v),
serialize: (v: any, ...rest: any[]) => {
- const replacement = print(v);
+ const replacement = print(v, RawPrint.fromString);
+
+ if (replacement instanceof RawPrint) {
+ return replacement.v;
+ }
+
const printer = rest.pop()!;
return printer(replacement, ...rest);
},
diff --git a/packages/kbn-es-archiver/src/actions/load.ts b/packages/kbn-es-archiver/src/actions/load.ts
index 87a844b263123..58cacd399203d 100644
--- a/packages/kbn-es-archiver/src/actions/load.ts
+++ b/packages/kbn-es-archiver/src/actions/load.ts
@@ -85,15 +85,17 @@ export async function loadAction({
progress.deactivate();
const result = stats.toJSON();
+ const indicesWithDocs: string[] = [];
for (const [index, { docs }] of Object.entries(result)) {
if (docs && docs.indexed > 0) {
log.info('[%s] Indexed %d docs into %j', name, docs.indexed, index);
+ indicesWithDocs.push(index);
}
}
await client.indices.refresh(
{
- index: '_all',
+ index: indicesWithDocs.join(','),
allow_no_indices: true,
},
{
diff --git a/packages/kbn-es-archiver/src/cli.ts b/packages/kbn-es-archiver/src/cli.ts
index f7d8f36b0c5ea..235d244babae4 100644
--- a/packages/kbn-es-archiver/src/cli.ts
+++ b/packages/kbn-es-archiver/src/cli.ts
@@ -18,7 +18,7 @@ import readline from 'readline';
import Fs from 'fs';
import { RunWithCommands, createFlagError, CA_CERT_PATH } from '@kbn/dev-utils';
-import { readConfigFile, KbnClient } from '@kbn/test';
+import { readConfigFile, KbnClient, EsVersion } from '@kbn/test';
import { Client } from '@elastic/elasticsearch';
import { EsArchiver } from './es_archiver';
@@ -45,7 +45,7 @@ export function runCli() {
if (typeof configPath !== 'string') {
throw createFlagError('--config must be a string');
}
- const config = await readConfigFile(log, Path.resolve(configPath));
+ const config = await readConfigFile(log, EsVersion.getDefault(), Path.resolve(configPath));
statsMeta.set('ftrConfigPath', configPath);
let esUrl = flags['es-url'];
diff --git a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
index 0a82d8e950583..eea703ddba0d7 100644
--- a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
+++ b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.test.ts
@@ -27,7 +27,6 @@ interface SearchResponses {
total: number;
hits: Array<{
_index: string;
- _type: string;
_id: string;
_source: Record;
}>;
@@ -59,9 +58,9 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
hits: {
total: 5,
hits: [
- { _index: 'foo', _type: '_doc', _id: '0', _source: {} },
- { _index: 'foo', _type: '_doc', _id: '1', _source: {} },
- { _index: 'foo', _type: '_doc', _id: '2', _source: {} },
+ { _index: 'foo', _id: '0', _source: {} },
+ { _index: 'foo', _id: '1', _source: {} },
+ { _index: 'foo', _id: '2', _source: {} },
],
},
},
@@ -71,8 +70,8 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
hits: {
total: 5,
hits: [
- { _index: 'foo', _type: '_doc', _id: '3', _source: {} },
- { _index: 'foo', _type: '_doc', _id: '4', _source: {} },
+ { _index: 'foo', _id: '3', _source: {} },
+ { _index: 'foo', _id: '4', _source: {} },
],
},
},
@@ -84,8 +83,8 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
hits: {
total: 2,
hits: [
- { _index: 'bar', _type: '_doc', _id: '0', _source: {} },
- { _index: 'bar', _type: '_doc', _id: '1', _source: {} },
+ { _index: 'bar', _id: '0', _source: {} },
+ { _index: 'bar', _id: '1', _source: {} },
],
},
},
@@ -108,7 +107,6 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
createMapStream((record: any) => {
expect(record).toHaveProperty('type', 'doc');
expect(record.value.source).toEqual({});
- expect(record.value.type).toBe('_doc');
expect(record.value.index).toMatch(/^(foo|bar)$/);
expect(record.value.id).toMatch(/^\d+$/);
return `${record.value.index}:${record.value.id}`;
@@ -224,7 +222,7 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
describe('keepIndexNames', () => {
it('changes .kibana* index names if keepIndexNames is not enabled', async () => {
- const hits = [{ _index: '.kibana_7.16.0_001', _type: '_doc', _id: '0', _source: {} }];
+ const hits = [{ _index: '.kibana_7.16.0_001', _id: '0', _source: {} }];
const responses = {
['.kibana_7.16.0_001']: [{ body: { hits: { hits, total: hits.length } } }],
};
@@ -248,7 +246,7 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
});
it('does not change non-.kibana* index names if keepIndexNames is not enabled', async () => {
- const hits = [{ _index: '.foo', _type: '_doc', _id: '0', _source: {} }];
+ const hits = [{ _index: '.foo', _id: '0', _source: {} }];
const responses = {
['.foo']: [{ body: { hits: { hits, total: hits.length } } }],
};
@@ -272,7 +270,7 @@ describe('esArchiver: createGenerateDocRecordsStream()', () => {
});
it('does not change .kibana* index names if keepIndexNames is enabled', async () => {
- const hits = [{ _index: '.kibana_7.16.0_001', _type: '_doc', _id: '0', _source: {} }];
+ const hits = [{ _index: '.kibana_7.16.0_001', _id: '0', _source: {} }];
const responses = {
['.kibana_7.16.0_001']: [{ body: { hits: { hits, total: hits.length } } }],
};
diff --git a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts
index c6c8841b64969..f63fb75b4ab34 100644
--- a/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts
+++ b/packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts
@@ -67,7 +67,6 @@ export function createGenerateDocRecordsStream({
// when it is loaded it can skip migration, if possible
index:
hit._index.startsWith('.kibana') && !keepIndexNames ? '.kibana_1' : hit._index,
- type: hit._type,
id: hit._id,
source: hit._source,
},
diff --git a/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts b/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts
index a5a011ad2a9fe..028ff16c9afb2 100644
--- a/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts
+++ b/packages/kbn-es-archiver/src/lib/docs/index_doc_records_stream.ts
@@ -32,7 +32,6 @@ export function createIndexDocRecordsStream(
ops.set(body, {
[operation]: {
_index: doc.index,
- _type: doc.type,
_id: doc.id,
},
});
diff --git a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.test.ts b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.test.ts
index bdeefe30be52b..870466cc8542c 100644
--- a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.test.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.test.ts
@@ -132,7 +132,6 @@ describe('esArchiver: createCreateIndexStream()', () => {
sinon.assert.calledWith(client.indices.create as sinon.SinonSpy, {
index: 'index',
- include_type_name: false,
body: {
settings: undefined,
mappings: undefined,
diff --git a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
index edf9093a57a7f..02c96c9636388 100644
--- a/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/create_index_stream.ts
@@ -56,9 +56,6 @@ export function createCreateIndexStream({
async function handleIndex(record: DocRecord) {
const { index, settings, mappings, aliases } = record.value;
-
- // Determine if the mapping belongs to a pre-7.0 instance, for BWC tests, mainly
- const isPre7Mapping = !!mappings && Object.keys(mappings).length > 0 && !mappings.properties;
const isKibanaTaskManager = index.startsWith('.kibana_task_manager');
const isKibana = index.startsWith('.kibana') && !isKibanaTaskManager;
@@ -79,7 +76,6 @@ export function createCreateIndexStream({
await client.indices.create(
{
index,
- include_type_name: isPre7Mapping,
body: {
settings,
mappings,
diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
index 9374931465903..850f014e250b2 100644
--- a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -114,7 +114,6 @@ export async function cleanKibanaIndices({
bool: {
must_not: {
ids: {
- type: '_doc',
values: ['space:default'],
},
},
@@ -159,7 +158,6 @@ export async function createDefaultSpace({
await client.create(
{
index,
- type: '_doc',
id: 'space:default',
refresh: 'wait_for',
body: {
diff --git a/packages/kbn-es/jest.config.js b/packages/kbn-es/jest.config.js
index 7ca76c8104a64..02aa1ca63facf 100644
--- a/packages/kbn-es/jest.config.js
+++ b/packages/kbn-es/jest.config.js
@@ -7,7 +7,7 @@
*/
module.exports = {
- preset: '@kbn/test',
+ preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['/packages/kbn-es'],
};
diff --git a/packages/kbn-es/jest.integration.config.js b/packages/kbn-es/jest.integration.config.js
new file mode 100644
index 0000000000000..664cee8512fc1
--- /dev/null
+++ b/packages/kbn-es/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration_node',
+ rootDir: '../..',
+ roots: ['/packages/kbn-es'],
+};
diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js
index dd9c17055fb18..ec689e67cefcb 100644
--- a/packages/kbn-es/src/cluster.js
+++ b/packages/kbn-es/src/cluster.js
@@ -18,7 +18,7 @@ const { createCliError } = require('./errors');
const { promisify } = require('util');
const treeKillAsync = promisify(require('tree-kill'));
const { parseSettings, SettingsFilter } = require('./settings');
-const { CA_CERT_PATH, ES_P12_PATH, ES_P12_PASSWORD, extract } = require('@kbn/dev-utils');
+const { CA_CERT_PATH, ES_NOPASSWORD_P12_PATH, extract } = require('@kbn/dev-utils');
const readFile = util.promisify(fs.readFile);
// listen to data on stream until map returns anything but undefined
@@ -252,14 +252,16 @@ exports.Cluster = class Cluster {
const esArgs = [
'action.destructive_requires_name=true',
'ingest.geoip.downloader.enabled=false',
+ 'cluster.routing.allocation.disk.threshold_enabled=false',
].concat(options.esArgs || []);
// Add to esArgs if ssl is enabled
if (this._ssl) {
esArgs.push('xpack.security.http.ssl.enabled=true');
- esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+ esArgs.push(`xpack.security.http.ssl.keystore.path=${ES_NOPASSWORD_P12_PATH}`);
esArgs.push(`xpack.security.http.ssl.keystore.type=PKCS12`);
- esArgs.push(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
+ // We are explicitly using ES_NOPASSWORD_P12_PATH instead of ES_P12_PATH + ES_P12_PASSWORD. The reasoning for this is that setting
+ // the keystore password using environment variables causes Elasticsearch to emit deprecation warnings.
}
const args = parseSettings(extractConfigFiles(esArgs, installPath, { log: this._log }), {
diff --git a/packages/kbn-es/src/index.ts b/packages/kbn-es/src/index.ts
index 68fd931794c0c..d6f82df5d2012 100644
--- a/packages/kbn-es/src/index.ts
+++ b/packages/kbn-es/src/index.ts
@@ -10,3 +10,4 @@
export { run } from './cli';
// @ts-expect-error not typed yet
export { Cluster } from './cluster';
+export { SYSTEM_INDICES_SUPERUSER } from './utils';
diff --git a/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js b/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js
index 7ec57b65d6d98..5ef6145698811 100644
--- a/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js
+++ b/packages/kbn-es/src/integration_tests/__fixtures__/es_bin.js
@@ -69,6 +69,16 @@ const { ES_KEY_PATH, ES_CERT_PATH } = require('@kbn/dev-utils');
});
}
+ if (url.pathname === '/_cluster/health') {
+ return send(
+ 200,
+ {
+ status: 'green',
+ },
+ { 'x-elastic-product': 'Elasticsearch' }
+ );
+ }
+
return send(404, {
error: {
reason: 'not found',
diff --git a/packages/kbn-es/src/integration_tests/cluster.test.js b/packages/kbn-es/src/integration_tests/cluster.test.js
index 0cdbac310bbb1..f3bdd49103614 100644
--- a/packages/kbn-es/src/integration_tests/cluster.test.js
+++ b/packages/kbn-es/src/integration_tests/cluster.test.js
@@ -9,8 +9,7 @@
const {
ToolingLog,
ToolingLogCollectingWriter,
- ES_P12_PATH,
- ES_P12_PASSWORD,
+ ES_NOPASSWORD_P12_PATH,
createAnyInstanceSerializer,
createStripAnsiSerializer,
} = require('@kbn/dev-utils');
@@ -292,9 +291,8 @@ describe('#start(installPath)', () => {
const config = extractConfigFiles.mock.calls[0][0];
expect(config).toContain('xpack.security.http.ssl.enabled=true');
- expect(config).toContain(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+ expect(config).toContain(`xpack.security.http.ssl.keystore.path=${ES_NOPASSWORD_P12_PATH}`);
expect(config).toContain(`xpack.security.http.ssl.keystore.type=PKCS12`);
- expect(config).toContain(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
});
it(`doesn't setup SSL when disabled`, async () => {
@@ -311,6 +309,7 @@ describe('#start(installPath)', () => {
Array [
"action.destructive_requires_name=true",
"ingest.geoip.downloader.enabled=false",
+ "cluster.routing.allocation.disk.threshold_enabled=false",
],
undefined,
Object {
@@ -371,9 +370,8 @@ describe('#run()', () => {
const config = extractConfigFiles.mock.calls[0][0];
expect(config).toContain('xpack.security.http.ssl.enabled=true');
- expect(config).toContain(`xpack.security.http.ssl.keystore.path=${ES_P12_PATH}`);
+ expect(config).toContain(`xpack.security.http.ssl.keystore.path=${ES_NOPASSWORD_P12_PATH}`);
expect(config).toContain(`xpack.security.http.ssl.keystore.type=PKCS12`);
- expect(config).toContain(`xpack.security.http.ssl.keystore.password=${ES_P12_PASSWORD}`);
});
it(`doesn't setup SSL when disabled`, async () => {
@@ -390,6 +388,7 @@ describe('#run()', () => {
Array [
"action.destructive_requires_name=true",
"ingest.geoip.downloader.enabled=false",
+ "cluster.routing.allocation.disk.threshold_enabled=false",
],
undefined,
Object {
diff --git a/packages/kbn-es/src/utils/index.ts b/packages/kbn-es/src/utils/index.ts
index ce0a222dafd3b..4b4ae1bc05259 100644
--- a/packages/kbn-es/src/utils/index.ts
+++ b/packages/kbn-es/src/utils/index.ts
@@ -14,6 +14,6 @@ export { findMostRecentlyChanged } from './find_most_recently_changed';
// @ts-expect-error not typed yet
export { extractConfigFiles } from './extract_config_files';
// @ts-expect-error not typed yet
-export { NativeRealm } from './native_realm';
+export { NativeRealm, SYSTEM_INDICES_SUPERUSER } from './native_realm';
export { buildSnapshot } from './build_snapshot';
export { archiveForPlatform } from './build_snapshot';
diff --git a/packages/kbn-es/src/utils/native_realm.js b/packages/kbn-es/src/utils/native_realm.js
index a5051cdb0d89a..576b50c1dc1aa 100644
--- a/packages/kbn-es/src/utils/native_realm.js
+++ b/packages/kbn-es/src/utils/native_realm.js
@@ -11,6 +11,9 @@ const chalk = require('chalk');
const { log: defaultLog } = require('./log');
+export const SYSTEM_INDICES_SUPERUSER =
+ process.env.TEST_ES_SYSTEM_INDICES_USER || 'system_indices_superuser';
+
exports.NativeRealm = class NativeRealm {
constructor({ elasticPassword, port, log = defaultLog, ssl = false, caCert }) {
this._client = new Client({
@@ -53,18 +56,33 @@ exports.NativeRealm = class NativeRealm {
});
}
+ async clusterReady() {
+ return await this._autoRetry({ maxAttempts: 10 }, async () => {
+ const {
+ body: { status: status },
+ } = await this._client.cluster.health({ wait_for_status: 'yellow' });
+
+ if (status === 'red') {
+ throw new Error(`not ready, cluster health is ${status}`);
+ }
+ });
+ }
+
async setPasswords(options) {
+ await this.clusterReady();
+
if (!(await this.isSecurityEnabled())) {
this._log.info('security is not enabled, unable to set native realm passwords');
return;
}
const reservedUsers = await this.getReservedUsers();
- await Promise.all(
- reservedUsers.map(async (user) => {
+ await Promise.all([
+ ...reservedUsers.map(async (user) => {
await this.setPassword(user, options[`password.${user}`]);
- })
- );
+ }),
+ this._createSystemIndicesUser(),
+ ]);
}
async getReservedUsers(retryOpts = {}) {
@@ -100,7 +118,7 @@ exports.NativeRealm = class NativeRealm {
}
async _autoRetry(opts, fn) {
- const { attempt = 1, maxAttempts = 3 } = opts;
+ const { attempt = 1, maxAttempts = 3, sleep = 1000 } = opts;
try {
return await fn(attempt);
@@ -111,7 +129,7 @@ exports.NativeRealm = class NativeRealm {
const sec = 1.5 * attempt;
this._log.warning(`assuming ES isn't initialized completely, trying again in ${sec} seconds`);
- await new Promise((resolve) => setTimeout(resolve, sec * 1000));
+ await new Promise((resolve) => setTimeout(resolve, sleep));
const nextOpts = {
...opts,
@@ -120,4 +138,43 @@ exports.NativeRealm = class NativeRealm {
return await this._autoRetry(nextOpts, fn);
}
}
+
+ async _createSystemIndicesUser() {
+ if (!(await this.isSecurityEnabled())) {
+ this._log.info('security is not enabled, unable to create role and user');
+ return;
+ }
+
+ await this._client.security.putRole({
+ name: SYSTEM_INDICES_SUPERUSER,
+ refresh: 'wait_for',
+ body: {
+ cluster: ['all'],
+ indices: [
+ {
+ names: ['*'],
+ privileges: ['all'],
+ allow_restricted_indices: true,
+ },
+ ],
+ applications: [
+ {
+ application: '*',
+ privileges: ['*'],
+ resources: ['*'],
+ },
+ ],
+ run_as: ['*'],
+ },
+ });
+
+ await this._client.security.putUser({
+ username: SYSTEM_INDICES_SUPERUSER,
+ refresh: 'wait_for',
+ body: {
+ password: this._elasticPassword,
+ roles: [SYSTEM_INDICES_SUPERUSER],
+ },
+ });
+ }
};
diff --git a/packages/kbn-es/src/utils/native_realm.test.js b/packages/kbn-es/src/utils/native_realm.test.js
index 6d07b1e73b547..0465ed1c8a242 100644
--- a/packages/kbn-es/src/utils/native_realm.test.js
+++ b/packages/kbn-es/src/utils/native_realm.test.js
@@ -18,9 +18,14 @@ const mockClient = {
xpack: {
info: jest.fn(),
},
+ cluster: {
+ health: jest.fn(),
+ },
security: {
changePassword: jest.fn(),
getUser: jest.fn(),
+ putRole: jest.fn(),
+ putUser: jest.fn(),
},
};
Client.mockImplementation(() => mockClient);
@@ -49,6 +54,12 @@ function mockXPackInfo(available, enabled) {
}));
}
+function mockClusterStatus(status) {
+ mockClient.cluster.health.mockImplementation(() => {
+ return { body: status };
+ });
+}
+
describe('isSecurityEnabled', () => {
test('returns true if enabled and available', async () => {
mockXPackInfo(true, true);
@@ -95,6 +106,7 @@ describe('isSecurityEnabled', () => {
describe('setPasswords', () => {
it('uses provided passwords', async () => {
mockXPackInfo(true, true);
+ mockClusterStatus('green');
mockClient.security.getUser.mockImplementation(() => ({
body: {
@@ -127,49 +139,51 @@ describe('setPasswords', () => {
}));
await nativeRealm.setPasswords({
- 'password.kibana_system': 'bar',
+ body: {
+ 'password.kibana_system': 'bar',
+ },
});
expect(mockClient.security.changePassword.mock.calls).toMatchInlineSnapshot(`
-Array [
- Array [
- Object {
- "body": Object {
- "password": "bar",
- },
- "refresh": "wait_for",
- "username": "kibana_system",
- },
- ],
- Array [
- Object {
- "body": Object {
- "password": "changeme",
- },
- "refresh": "wait_for",
- "username": "logstash_system",
- },
- ],
- Array [
- Object {
- "body": Object {
- "password": "changeme",
- },
- "refresh": "wait_for",
- "username": "elastic",
- },
- ],
- Array [
- Object {
- "body": Object {
- "password": "changeme",
- },
- "refresh": "wait_for",
- "username": "beats_system",
- },
- ],
-]
-`);
+ Array [
+ Array [
+ Object {
+ "body": Object {
+ "password": "changeme",
+ },
+ "refresh": "wait_for",
+ "username": "kibana_system",
+ },
+ ],
+ Array [
+ Object {
+ "body": Object {
+ "password": "changeme",
+ },
+ "refresh": "wait_for",
+ "username": "logstash_system",
+ },
+ ],
+ Array [
+ Object {
+ "body": Object {
+ "password": "changeme",
+ },
+ "refresh": "wait_for",
+ "username": "elastic",
+ },
+ ],
+ Array [
+ Object {
+ "body": Object {
+ "password": "changeme",
+ },
+ "refresh": "wait_for",
+ "username": "beats_system",
+ },
+ ],
+ ]
+ `);
});
});
diff --git a/packages/kbn-optimizer/jest.config.js b/packages/kbn-optimizer/jest.config.js
index 91218bf815992..c7e938a072660 100644
--- a/packages/kbn-optimizer/jest.config.js
+++ b/packages/kbn-optimizer/jest.config.js
@@ -7,7 +7,7 @@
*/
module.exports = {
- preset: '@kbn/test',
+ preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['/packages/kbn-optimizer'],
};
diff --git a/packages/kbn-optimizer/jest.integration.config.js b/packages/kbn-optimizer/jest.integration.config.js
new file mode 100644
index 0000000000000..a51f4c588af8c
--- /dev/null
+++ b/packages/kbn-optimizer/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration_node',
+ rootDir: '../..',
+ roots: ['/packages/kbn-optimizer'],
+};
diff --git a/packages/kbn-plugin-generator/jest.config.js b/packages/kbn-plugin-generator/jest.config.js
index 34f1be77b4893..f27dfa6ca42db 100644
--- a/packages/kbn-plugin-generator/jest.config.js
+++ b/packages/kbn-plugin-generator/jest.config.js
@@ -7,7 +7,7 @@
*/
module.exports = {
- preset: '@kbn/test',
+ preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['/packages/kbn-plugin-generator'],
};
diff --git a/packages/kbn-plugin-generator/jest.integration.config.js b/packages/kbn-plugin-generator/jest.integration.config.js
new file mode 100644
index 0000000000000..3031e2c7bd03a
--- /dev/null
+++ b/packages/kbn-plugin-generator/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration_node',
+ rootDir: '../..',
+ roots: ['/packages/kbn-plugin-generator'],
+};
diff --git a/packages/kbn-plugin-helpers/jest.integration.config.js b/packages/kbn-plugin-helpers/jest.integration.config.js
new file mode 100644
index 0000000000000..eb7de8ae1596e
--- /dev/null
+++ b/packages/kbn-plugin-helpers/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration_node',
+ rootDir: '../..',
+ roots: ['/packages/kbn-plugin-helpers'],
+};
diff --git a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
index 65cbdaf88034c..2d7664aa13326 100644
--- a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
+++ b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
@@ -43,8 +43,14 @@ it('builds a generated plugin into a viable archive', async () => {
all: true,
}
);
+ const filterLogs = (logs: string | undefined) => {
+ return logs
+ ?.split('\n')
+ .filter((l) => !l.includes('failed to reach ci-stats service'))
+ .join('\n');
+ };
- expect(generateProc.all).toMatchInlineSnapshot(`
+ expect(filterLogs(generateProc.all)).toMatchInlineSnapshot(`
" succ 🎉
Your plugin has been created in plugins/foo_test_plugin
@@ -60,7 +66,7 @@ it('builds a generated plugin into a viable archive', async () => {
}
);
- expect(buildProc.all).toMatchInlineSnapshot(`
+ expect(filterLogs(buildProc.all)).toMatchInlineSnapshot(`
" info deleting the build and target directories
info running @kbn/optimizer
│ info initialized, 0 bundles cached
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index d4f3dc726d8b5..4ff6cedfbc095 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__(562);
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(563);
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildBazelProductionProjects"]; });
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildNonBazelProductionProjects"]; });
@@ -108,7 +108,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(343);
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "transformDependencies", function() { return _utils_package_json__WEBPACK_IMPORTED_MODULE_4__["transformDependencies"]; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(561);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(562);
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjectPaths", function() { return _config__WEBPACK_IMPORTED_MODULE_5__["getProjectPaths"]; });
/*
@@ -141,7 +141,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__(129);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(556);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(557);
/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(220);
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -8819,11 +8819,11 @@ 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__(130);
-/* harmony import */ var _build__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(527);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(528);
-/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(552);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(553);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(555);
+/* harmony import */ var _build__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(528);
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(529);
+/* harmony import */ var _reset__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(553);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(554);
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(556);
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
@@ -8865,6 +8865,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _utils_sort_package_json__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(411);
/* harmony import */ var _utils_validate_dependencies__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(419);
/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(421);
+/* harmony import */ var _utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(527);
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; }
@@ -8888,6 +8889,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
+
const BootstrapCommand = {
description: 'Install dependencies and crosslink projects',
name: 'bootstrap',
@@ -8908,16 +8910,13 @@ const BootstrapCommand = {
const kibanaProjectPath = ((_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path) || '';
const runOffline = (options === null || options === void 0 ? void 0 : options.offline) === true;
const reporter = _kbn_dev_utils_ci_stats_reporter__WEBPACK_IMPORTED_MODULE_1__["CiStatsReporter"].fromEnv(_utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]);
- const timings = []; // Force install is set in case a flag is passed or
- // if the `.yarn-integrity` file is not found which
- // will be indicated by the return of yarnIntegrityFileExists.
+ const timings = []; // Force install is set in case a flag is passed into yarn kbn bootstrap
- const forceInstall = !!options && options['force-install'] === true || !(await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["yarnIntegrityFileExists"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(kibanaProjectPath, 'node_modules'))); // Ensure we have a `node_modules/.yarn-integrity` file as we depend on it
- // for bazel to know it has to re-install the node_modules after a reset or a clean
+ const forceInstall = !!options && options['force-install'] === true; // Install bazel machinery tools if needed
- await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["ensureYarnIntegrityFileExists"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(kibanaProjectPath, 'node_modules')); // Install bazel machinery tools if needed
+ await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["installBazelTools"])(rootPath); // Setup remote cache settings in .bazelrc.cache if needed
- await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["installBazelTools"])(rootPath); // Bootstrap process for Bazel packages
+ await Object(_utils_bazel_setup_remote_cache__WEBPACK_IMPORTED_MODULE_10__["setupRemoteCache"])(rootPath); // Bootstrap process for Bazel packages
// Bazel is now managing dependencies so yarn install
// will happen as part of this
//
@@ -8929,7 +8928,14 @@ const BootstrapCommand = {
if (forceInstall) {
const forceInstallStartTime = Date.now();
- await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@nodejs//:yarn'], runOffline);
+ await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["removeYarnIntegrityFileIfExists"])(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(kibanaProjectPath, 'node_modules'));
+ await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['clean']);
+ await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["runBazel"])(['run', '@nodejs//:yarn'], runOffline, {
+ env: {
+ SASS_BINARY_SITE: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+ RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2'
+ }
+ });
timings.push({
id: 'force install dependencies',
ms: Date.now() - forceInstallStartTime
@@ -9044,7 +9050,9 @@ var _ci_stats_config = __webpack_require__(218);
*/
// @ts-expect-error not "public", but necessary to prevent Jest shimming from breaking things
const BASE_URL = 'https://ci-stats.kibana.dev';
+/** A ci-stats metric record */
+/** Object that helps report data to the ci-stats service */
class CiStatsReporter {
/**
* Create a CiStatsReporter by inspecting the ENV for the necessary config
@@ -9141,7 +9149,7 @@ class CiStatsReporter {
totalMem: _os.default.totalmem()
};
this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash);
- return await this.req({
+ return !!(await this.req({
auth: !!buildId,
path: '/v1/timings',
body: {
@@ -9151,7 +9159,7 @@ class CiStatsReporter {
timings
},
bodyDesc: timings.length === 1 ? `${timings.length} timing` : `${timings.length} timings`
- });
+ }));
}
/**
* Report metrics data to the ci-stats service. If running outside of CI this method
@@ -9169,10 +9177,10 @@ class CiStatsReporter {
const buildId = (_this$config4 = this.config) === null || _this$config4 === void 0 ? void 0 : _this$config4.buildId;
if (!buildId) {
- throw new Error(`CiStatsReporter can't be authorized without a buildId`);
+ throw new Error(`metrics can't be reported without a buildId`);
}
- return await this.req({
+ return !!(await this.req({
auth: true,
path: '/v1/metrics',
body: {
@@ -9185,6 +9193,35 @@ class CiStatsReporter {
id,
value
}) => `[${group}/${id}=${value}]`).join(' ')}`
+ }));
+ }
+ /**
+ * Send test reports to ci-stats
+ */
+
+
+ async reportTests({
+ group,
+ testRuns
+ }) {
+ var _this$config5, _this$config6, _this$config7;
+
+ if (!((_this$config5 = this.config) !== null && _this$config5 !== void 0 && _this$config5.buildId) || !((_this$config6 = this.config) !== null && _this$config6 !== void 0 && _this$config6.apiToken)) {
+ throw new Error('unable to report tests unless buildId is configured and auth config available');
+ }
+
+ return await this.req({
+ auth: true,
+ path: '/v1/test_group',
+ query: {
+ buildId: (_this$config7 = this.config) === null || _this$config7 === void 0 ? void 0 : _this$config7.buildId
+ },
+ bodyDesc: `[${group.name}/${group.type}] test groups with ${testRuns.length} tests`,
+ body: [JSON.stringify({
+ group
+ }), ...testRuns.map(testRun => JSON.stringify({
+ testRun
+ }))].join('\n')
});
}
/**
@@ -9234,7 +9271,8 @@ class CiStatsReporter {
auth,
body,
bodyDesc,
- path
+ path,
+ query
}) {
let attempt = 0;
const maxAttempts = 5;
@@ -9245,22 +9283,23 @@ class CiStatsReporter {
Authorization: `token ${this.config.apiToken}`
};
} else if (auth) {
- throw new Error('this.req() shouldnt be called with auth=true if this.config is defined');
+ throw new Error('this.req() shouldnt be called with auth=true if this.config is not defined');
}
while (true) {
attempt += 1;
try {
- await _axios.default.request({
+ const resp = await _axios.default.request({
method: 'POST',
url: path,
baseURL: BASE_URL,
headers,
data: body,
+ params: query,
adapter: _http.default
});
- return true;
+ return resp.data;
} catch (error) {
var _error$response;
@@ -10382,50 +10421,44 @@ const mimicFn = __webpack_require__(153);
const calledFunctions = new WeakMap();
-const oneTime = (fn, options = {}) => {
- if (typeof fn !== 'function') {
+const onetime = (function_, options = {}) => {
+ if (typeof function_ !== 'function') {
throw new TypeError('Expected a function');
}
- let ret;
- let isCalled = false;
+ let returnValue;
let callCount = 0;
- const functionName = fn.displayName || fn.name || '';
+ const functionName = function_.displayName || function_.name || '';
- const onetime = function (...args) {
+ const onetime = function (...arguments_) {
calledFunctions.set(onetime, ++callCount);
- if (isCalled) {
- if (options.throw === true) {
- throw new Error(`Function \`${functionName}\` can only be called once`);
- }
-
- return ret;
+ if (callCount === 1) {
+ returnValue = function_.apply(this, arguments_);
+ function_ = null;
+ } else if (options.throw === true) {
+ throw new Error(`Function \`${functionName}\` can only be called once`);
}
- isCalled = true;
- ret = fn.apply(this, args);
- fn = null;
-
- return ret;
+ return returnValue;
};
- mimicFn(onetime, fn);
+ mimicFn(onetime, function_);
calledFunctions.set(onetime, callCount);
return onetime;
};
-module.exports = oneTime;
+module.exports = onetime;
// TODO: Remove this for the next major release
-module.exports.default = oneTime;
+module.exports.default = onetime;
-module.exports.callCount = fn => {
- if (!calledFunctions.has(fn)) {
- throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`);
+module.exports.callCount = function_ => {
+ if (!calledFunctions.has(function_)) {
+ throw new Error(`The given function \`${function_.name}\` is not wrapped by the \`onetime\` package`);
}
- return calledFunctions.get(fn);
+ return calledFunctions.get(function_);
};
@@ -11149,158 +11182,203 @@ module.exports = {
// Note: since nyc uses this module to output coverage, any lines
// that are in the direct sync flow of nyc's outputCoverage are
// ignored, since we can never get coverage for them.
-var assert = __webpack_require__(162)
-var signals = __webpack_require__(163)
-
-var EE = __webpack_require__(164)
+// grab a reference to node's real process object right away
+var process = global.process
+
+const processOk = function (process) {
+ return process &&
+ typeof process === 'object' &&
+ typeof process.removeListener === 'function' &&
+ typeof process.emit === 'function' &&
+ typeof process.reallyExit === 'function' &&
+ typeof process.listeners === 'function' &&
+ typeof process.kill === 'function' &&
+ typeof process.pid === 'number' &&
+ typeof process.on === 'function'
+}
+
+// some kind of non-node environment, just no-op
/* istanbul ignore if */
-if (typeof EE !== 'function') {
- EE = EE.EventEmitter
-}
-
-var emitter
-if (process.__signal_exit_emitter__) {
- emitter = process.__signal_exit_emitter__
+if (!processOk(process)) {
+ module.exports = function () {
+ return function () {}
+ }
} else {
- emitter = process.__signal_exit_emitter__ = new EE()
- emitter.count = 0
- emitter.emitted = {}
-}
-
-// Because this emitter is a global, we have to check to see if a
-// previous version of this library failed to enable infinite listeners.
-// I know what you're about to say. But literally everything about
-// signal-exit is a compromise with evil. Get used to it.
-if (!emitter.infinite) {
- emitter.setMaxListeners(Infinity)
- emitter.infinite = true
-}
+ var assert = __webpack_require__(162)
+ var signals = __webpack_require__(163)
+ var isWin = /^win/i.test(process.platform)
-module.exports = function (cb, opts) {
- assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+ var EE = __webpack_require__(164)
+ /* istanbul ignore if */
+ if (typeof EE !== 'function') {
+ EE = EE.EventEmitter
+ }
- if (loaded === false) {
- load()
+ var emitter
+ if (process.__signal_exit_emitter__) {
+ emitter = process.__signal_exit_emitter__
+ } else {
+ emitter = process.__signal_exit_emitter__ = new EE()
+ emitter.count = 0
+ emitter.emitted = {}
}
- var ev = 'exit'
- if (opts && opts.alwaysLast) {
- ev = 'afterexit'
+ // Because this emitter is a global, we have to check to see if a
+ // previous version of this library failed to enable infinite listeners.
+ // I know what you're about to say. But literally everything about
+ // signal-exit is a compromise with evil. Get used to it.
+ if (!emitter.infinite) {
+ emitter.setMaxListeners(Infinity)
+ emitter.infinite = true
}
- var remove = function () {
- emitter.removeListener(ev, cb)
- if (emitter.listeners('exit').length === 0 &&
- emitter.listeners('afterexit').length === 0) {
- unload()
+ module.exports = function (cb, opts) {
+ /* istanbul ignore if */
+ if (!processOk(global.process)) {
+ return function () {}
}
- }
- emitter.on(ev, cb)
+ assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
- return remove
-}
+ if (loaded === false) {
+ load()
+ }
-module.exports.unload = unload
-function unload () {
- if (!loaded) {
- return
- }
- loaded = false
+ var ev = 'exit'
+ if (opts && opts.alwaysLast) {
+ ev = 'afterexit'
+ }
- signals.forEach(function (sig) {
- try {
- process.removeListener(sig, sigListeners[sig])
- } catch (er) {}
- })
- process.emit = originalProcessEmit
- process.reallyExit = originalProcessReallyExit
- emitter.count -= 1
-}
+ var remove = function () {
+ emitter.removeListener(ev, cb)
+ if (emitter.listeners('exit').length === 0 &&
+ emitter.listeners('afterexit').length === 0) {
+ unload()
+ }
+ }
+ emitter.on(ev, cb)
-function emit (event, code, signal) {
- if (emitter.emitted[event]) {
- return
+ return remove
}
- emitter.emitted[event] = true
- emitter.emit(event, code, signal)
-}
-
-// { : , ... }
-var sigListeners = {}
-signals.forEach(function (sig) {
- sigListeners[sig] = function listener () {
- // If there are no other listeners, an exit is coming!
- // Simplest way: remove us and then re-send the signal.
- // We know that this will kill the process, so we can
- // safely emit now.
- var listeners = process.listeners(sig)
- if (listeners.length === emitter.count) {
- unload()
- emit('exit', null, sig)
- /* istanbul ignore next */
- emit('afterexit', null, sig)
- /* istanbul ignore next */
- process.kill(process.pid, sig)
+
+ var unload = function unload () {
+ if (!loaded || !processOk(global.process)) {
+ return
}
- }
-})
+ loaded = false
-module.exports.signals = function () {
- return signals
-}
+ signals.forEach(function (sig) {
+ try {
+ process.removeListener(sig, sigListeners[sig])
+ } catch (er) {}
+ })
+ process.emit = originalProcessEmit
+ process.reallyExit = originalProcessReallyExit
+ emitter.count -= 1
+ }
+ module.exports.unload = unload
-module.exports.load = load
+ var emit = function emit (event, code, signal) {
+ /* istanbul ignore if */
+ if (emitter.emitted[event]) {
+ return
+ }
+ emitter.emitted[event] = true
+ emitter.emit(event, code, signal)
+ }
-var loaded = false
+ // { : , ... }
+ var sigListeners = {}
+ signals.forEach(function (sig) {
+ sigListeners[sig] = function listener () {
+ /* istanbul ignore if */
+ if (!processOk(global.process)) {
+ return
+ }
+ // If there are no other listeners, an exit is coming!
+ // Simplest way: remove us and then re-send the signal.
+ // We know that this will kill the process, so we can
+ // safely emit now.
+ var listeners = process.listeners(sig)
+ if (listeners.length === emitter.count) {
+ unload()
+ emit('exit', null, sig)
+ /* istanbul ignore next */
+ emit('afterexit', null, sig)
+ /* istanbul ignore next */
+ if (isWin && sig === 'SIGHUP') {
+ // "SIGHUP" throws an `ENOSYS` error on Windows,
+ // so use a supported signal instead
+ sig = 'SIGINT'
+ }
+ /* istanbul ignore next */
+ process.kill(process.pid, sig)
+ }
+ }
+ })
-function load () {
- if (loaded) {
- return
+ module.exports.signals = function () {
+ return signals
}
- loaded = true
- // This is the number of onSignalExit's that are in play.
- // It's important so that we can count the correct number of
- // listeners on signals, and don't wait for the other one to
- // handle it instead of us.
- emitter.count += 1
+ var loaded = false
- signals = signals.filter(function (sig) {
- try {
- process.on(sig, sigListeners[sig])
- return true
- } catch (er) {
- return false
+ var load = function load () {
+ if (loaded || !processOk(global.process)) {
+ return
}
- })
+ loaded = true
- process.emit = processEmit
- process.reallyExit = processReallyExit
-}
+ // This is the number of onSignalExit's that are in play.
+ // It's important so that we can count the correct number of
+ // listeners on signals, and don't wait for the other one to
+ // handle it instead of us.
+ emitter.count += 1
-var originalProcessReallyExit = process.reallyExit
-function processReallyExit (code) {
- process.exitCode = code || 0
- emit('exit', process.exitCode, null)
- /* istanbul ignore next */
- emit('afterexit', process.exitCode, null)
- /* istanbul ignore next */
- originalProcessReallyExit.call(process, process.exitCode)
-}
+ signals = signals.filter(function (sig) {
+ try {
+ process.on(sig, sigListeners[sig])
+ return true
+ } catch (er) {
+ return false
+ }
+ })
-var originalProcessEmit = process.emit
-function processEmit (ev, arg) {
- if (ev === 'exit') {
- if (arg !== undefined) {
- process.exitCode = arg
+ process.emit = processEmit
+ process.reallyExit = processReallyExit
+ }
+ module.exports.load = load
+
+ var originalProcessReallyExit = process.reallyExit
+ var processReallyExit = function processReallyExit (code) {
+ /* istanbul ignore if */
+ if (!processOk(global.process)) {
+ return
}
- var ret = originalProcessEmit.apply(this, arguments)
+ process.exitCode = code || /* istanbul ignore next */ 0
emit('exit', process.exitCode, null)
/* istanbul ignore next */
emit('afterexit', process.exitCode, null)
- return ret
- } else {
- return originalProcessEmit.apply(this, arguments)
+ /* istanbul ignore next */
+ originalProcessReallyExit.call(process, process.exitCode)
+ }
+
+ var originalProcessEmit = process.emit
+ var processEmit = function processEmit (ev, arg) {
+ if (ev === 'exit' && processOk(global.process)) {
+ /* istanbul ignore else */
+ if (arg !== undefined) {
+ process.exitCode = arg
+ }
+ var ret = originalProcessEmit.apply(this, arguments)
+ /* istanbul ignore next */
+ emit('exit', process.exitCode, null)
+ /* istanbul ignore next */
+ emit('afterexit', process.exitCode, null)
+ /* istanbul ignore next */
+ return ret
+ } else {
+ return originalProcessEmit.apply(this, arguments)
+ }
}
}
@@ -13890,8 +13968,9 @@ var assert = __webpack_require__(162);
var debug = __webpack_require__(204);
// Create handlers that pass events from native requests
+var events = ["abort", "aborted", "connect", "error", "socket", "timeout"];
var eventHandlers = Object.create(null);
-["abort", "aborted", "connect", "error", "socket", "timeout"].forEach(function (event) {
+events.forEach(function (event) {
eventHandlers[event] = function (arg1, arg2, arg3) {
this._redirectable.emit(event, arg1, arg2, arg3);
};
@@ -13900,7 +13979,7 @@ var eventHandlers = Object.create(null);
// Error types with codes
var RedirectionError = createErrorType(
"ERR_FR_REDIRECTION_FAILURE",
- ""
+ "Redirected request failed"
);
var TooManyRedirectsError = createErrorType(
"ERR_FR_TOO_MANY_REDIRECTS",
@@ -13944,6 +14023,11 @@ function RedirectableRequest(options, responseCallback) {
}
RedirectableRequest.prototype = Object.create(Writable.prototype);
+RedirectableRequest.prototype.abort = function () {
+ abortRequest(this._currentRequest);
+ this.emit("abort");
+};
+
// Writes buffered data to the current native request
RedirectableRequest.prototype.write = function (data, encoding, callback) {
// Writing is not allowed if end has been called
@@ -14023,40 +14107,72 @@ RedirectableRequest.prototype.removeHeader = function (name) {
// Global timeout for all underlying requests
RedirectableRequest.prototype.setTimeout = function (msecs, callback) {
+ var self = this;
+
+ // Destroys the socket on timeout
+ function destroyOnTimeout(socket) {
+ socket.setTimeout(msecs);
+ socket.removeListener("timeout", socket.destroy);
+ socket.addListener("timeout", socket.destroy);
+ }
+
+ // Sets up a timer to trigger a timeout event
+ function startTimer(socket) {
+ if (self._timeout) {
+ clearTimeout(self._timeout);
+ }
+ self._timeout = setTimeout(function () {
+ self.emit("timeout");
+ clearTimer();
+ }, msecs);
+ destroyOnTimeout(socket);
+ }
+
+ // Stops a timeout from triggering
+ function clearTimer() {
+ // Clear the timeout
+ if (self._timeout) {
+ clearTimeout(self._timeout);
+ self._timeout = null;
+ }
+
+ // Clean up all attached listeners
+ self.removeListener("abort", clearTimer);
+ self.removeListener("error", clearTimer);
+ self.removeListener("response", clearTimer);
+ if (callback) {
+ self.removeListener("timeout", callback);
+ }
+ if (!self.socket) {
+ self._currentRequest.removeListener("socket", startTimer);
+ }
+ }
+
+ // Attach callback if passed
if (callback) {
- this.once("timeout", callback);
+ this.on("timeout", callback);
}
+ // Start the timer if or when the socket is opened
if (this.socket) {
- startTimer(this, msecs);
+ startTimer(this.socket);
}
else {
- var self = this;
- this._currentRequest.once("socket", function () {
- startTimer(self, msecs);
- });
+ this._currentRequest.once("socket", startTimer);
}
- this.once("response", clearTimer);
- this.once("error", clearTimer);
+ // Clean up on events
+ this.on("socket", destroyOnTimeout);
+ this.on("abort", clearTimer);
+ this.on("error", clearTimer);
+ this.on("response", clearTimer);
return this;
};
-function startTimer(request, msecs) {
- clearTimeout(request._timeout);
- request._timeout = setTimeout(function () {
- request.emit("timeout");
- }, msecs);
-}
-
-function clearTimer() {
- clearTimeout(this._timeout);
-}
-
// Proxy all other public ClientRequest methods
[
- "abort", "flushHeaders", "getHeader",
+ "flushHeaders", "getHeader",
"setNoDelay", "setSocketKeepAlive",
].forEach(function (method) {
RedirectableRequest.prototype[method] = function (a, b) {
@@ -14126,11 +14242,8 @@ RedirectableRequest.prototype._performRequest = function () {
// Set up event handlers
request._redirectable = this;
- for (var event in eventHandlers) {
- /* istanbul ignore else */
- if (event) {
- request.on(event, eventHandlers[event]);
- }
+ for (var e = 0; e < events.length; e++) {
+ request.on(events[e], eventHandlers[events[e]]);
}
// End a redirected request
@@ -14184,86 +14297,101 @@ RedirectableRequest.prototype._processResponse = function (response) {
// the user agent MAY automatically redirect its request to the URI
// referenced by the Location field value,
// even if the specific status code is not understood.
+
+ // If the response is not a redirect; return it as-is
var location = response.headers.location;
- if (location && this._options.followRedirects !== false &&
- statusCode >= 300 && statusCode < 400) {
- // Abort the current request
- this._currentRequest.removeAllListeners();
- this._currentRequest.on("error", noop);
- this._currentRequest.abort();
- // Discard the remainder of the response to avoid waiting for data
- response.destroy();
-
- // RFC7231§6.4: A client SHOULD detect and intervene
- // in cyclical redirections (i.e., "infinite" redirection loops).
- if (++this._redirectCount > this._options.maxRedirects) {
- this.emit("error", new TooManyRedirectsError());
- return;
- }
+ if (!location || this._options.followRedirects === false ||
+ statusCode < 300 || statusCode >= 400) {
+ response.responseUrl = this._currentUrl;
+ response.redirects = this._redirects;
+ this.emit("response", response);
- // RFC7231§6.4: Automatic redirection needs to done with
- // care for methods not known to be safe, […]
- // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
- // the request method from POST to GET for the subsequent request.
- if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" ||
- // RFC7231§6.4.4: The 303 (See Other) status code indicates that
- // the server is redirecting the user agent to a different resource […]
- // A user agent can perform a retrieval request targeting that URI
- // (a GET or HEAD request if using HTTP) […]
- (statusCode === 303) && !/^(?:GET|HEAD)$/.test(this._options.method)) {
- this._options.method = "GET";
- // Drop a possible entity and headers related to it
- this._requestBodyBuffers = [];
- removeMatchingHeaders(/^content-/i, this._options.headers);
- }
-
- // Drop the Host header, as the redirect might lead to a different host
- var previousHostName = removeMatchingHeaders(/^host$/i, this._options.headers) ||
- url.parse(this._currentUrl).hostname;
-
- // Create the redirected request
- var redirectUrl = url.resolve(this._currentUrl, location);
- debug("redirecting to", redirectUrl);
- this._isRedirect = true;
- var redirectUrlParts = url.parse(redirectUrl);
- Object.assign(this._options, redirectUrlParts);
-
- // Drop the Authorization header if redirecting to another host
- if (redirectUrlParts.hostname !== previousHostName) {
- removeMatchingHeaders(/^authorization$/i, this._options.headers);
- }
-
- // Evaluate the beforeRedirect callback
- if (typeof this._options.beforeRedirect === "function") {
- var responseDetails = { headers: response.headers };
- try {
- this._options.beforeRedirect.call(null, this._options, responseDetails);
- }
- catch (err) {
- this.emit("error", err);
- return;
- }
- this._sanitizeOptions(this._options);
- }
+ // Clean up
+ this._requestBodyBuffers = [];
+ return;
+ }
+
+ // The response is a redirect, so abort the current request
+ abortRequest(this._currentRequest);
+ // Discard the remainder of the response to avoid waiting for data
+ response.destroy();
- // Perform the redirected request
+ // RFC7231§6.4: A client SHOULD detect and intervene
+ // in cyclical redirections (i.e., "infinite" redirection loops).
+ if (++this._redirectCount > this._options.maxRedirects) {
+ this.emit("error", new TooManyRedirectsError());
+ return;
+ }
+
+ // RFC7231§6.4: Automatic redirection needs to done with
+ // care for methods not known to be safe, […]
+ // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
+ // the request method from POST to GET for the subsequent request.
+ if ((statusCode === 301 || statusCode === 302) && this._options.method === "POST" ||
+ // RFC7231§6.4.4: The 303 (See Other) status code indicates that
+ // the server is redirecting the user agent to a different resource […]
+ // A user agent can perform a retrieval request targeting that URI
+ // (a GET or HEAD request if using HTTP) […]
+ (statusCode === 303) && !/^(?:GET|HEAD)$/.test(this._options.method)) {
+ this._options.method = "GET";
+ // Drop a possible entity and headers related to it
+ this._requestBodyBuffers = [];
+ removeMatchingHeaders(/^content-/i, this._options.headers);
+ }
+
+ // Drop the Host header, as the redirect might lead to a different host
+ var currentHostHeader = removeMatchingHeaders(/^host$/i, this._options.headers);
+
+ // If the redirect is relative, carry over the host of the last request
+ var currentUrlParts = url.parse(this._currentUrl);
+ var currentHost = currentHostHeader || currentUrlParts.host;
+ var currentUrl = /^\w+:/.test(location) ? this._currentUrl :
+ url.format(Object.assign(currentUrlParts, { host: currentHost }));
+
+ // Determine the URL of the redirection
+ var redirectUrl;
+ try {
+ redirectUrl = url.resolve(currentUrl, location);
+ }
+ catch (cause) {
+ this.emit("error", new RedirectionError(cause));
+ return;
+ }
+
+ // Create the redirected request
+ debug("redirecting to", redirectUrl);
+ this._isRedirect = true;
+ var redirectUrlParts = url.parse(redirectUrl);
+ Object.assign(this._options, redirectUrlParts);
+
+ // Drop confidential headers when redirecting to a less secure protocol
+ // or to a different domain that is not a superdomain
+ if (redirectUrlParts.protocol !== currentUrlParts.protocol &&
+ redirectUrlParts.protocol !== "https:" ||
+ redirectUrlParts.host !== currentHost &&
+ !isSubdomain(redirectUrlParts.host, currentHost)) {
+ removeMatchingHeaders(/^(?:authorization|cookie)$/i, this._options.headers);
+ }
+
+ // Evaluate the beforeRedirect callback
+ if (typeof this._options.beforeRedirect === "function") {
+ var responseDetails = { headers: response.headers };
try {
- this._performRequest();
+ this._options.beforeRedirect.call(null, this._options, responseDetails);
}
- catch (cause) {
- var error = new RedirectionError("Redirected request failed: " + cause.message);
- error.cause = cause;
- this.emit("error", error);
+ catch (err) {
+ this.emit("error", err);
+ return;
}
+ this._sanitizeOptions(this._options);
}
- else {
- // The response is not a redirect; return it as-is
- response.responseUrl = this._currentUrl;
- response.redirects = this._redirects;
- this.emit("response", response);
- // Clean up
- this._requestBodyBuffers = [];
+ // Perform the redirected request
+ try {
+ this._performRequest();
+ }
+ catch (cause) {
+ this.emit("error", new RedirectionError(cause));
}
};
@@ -14283,7 +14411,7 @@ function wrap(protocols) {
var wrappedProtocol = exports[scheme] = Object.create(nativeProtocol);
// Executes a request, following redirects
- wrappedProtocol.request = function (input, options, callback) {
+ function request(input, options, callback) {
// Parse parameters
if (typeof input === "string") {
var urlStr = input;
@@ -14318,14 +14446,20 @@ function wrap(protocols) {
assert.equal(options.protocol, protocol, "protocol mismatch");
debug("options", options);
return new RedirectableRequest(options, callback);
- };
+ }
// Executes a GET request, following redirects
- wrappedProtocol.get = function (input, options, callback) {
- var request = wrappedProtocol.request(input, options, callback);
- request.end();
- return request;
- };
+ function get(input, options, callback) {
+ var wrappedRequest = wrappedProtocol.request(input, options, callback);
+ wrappedRequest.end();
+ return wrappedRequest;
+ }
+
+ // Expose the properties on the wrapped protocol
+ Object.defineProperties(wrappedProtocol, {
+ request: { value: request, configurable: true, enumerable: true, writable: true },
+ get: { value: get, configurable: true, enumerable: true, writable: true },
+ });
});
return exports;
}
@@ -14361,13 +14495,20 @@ function removeMatchingHeaders(regex, headers) {
delete headers[header];
}
}
- return lastValue;
+ return (lastValue === null || typeof lastValue === "undefined") ?
+ undefined : String(lastValue).trim();
}
function createErrorType(code, defaultMessage) {
- function CustomError(message) {
+ function CustomError(cause) {
Error.captureStackTrace(this, this.constructor);
- this.message = message || defaultMessage;
+ if (!cause) {
+ this.message = defaultMessage;
+ }
+ else {
+ this.message = defaultMessage + ": " + cause.message;
+ this.cause = cause;
+ }
}
CustomError.prototype = new Error();
CustomError.prototype.constructor = CustomError;
@@ -14376,6 +14517,19 @@ function createErrorType(code, defaultMessage) {
return CustomError;
}
+function abortRequest(request) {
+ for (var e = 0; e < events.length; e++) {
+ request.removeListener(events[e], eventHandlers[events[e]]);
+ }
+ request.on("error", noop);
+ request.abort();
+}
+
+function isSubdomain(subdomain, domain) {
+ const dot = subdomain.length - domain.length - 1;
+ return dot > 0 && subdomain[dot] === "." && subdomain.endsWith(domain);
+}
+
// Exports
module.exports = wrap({ http: http, https: https });
module.exports.wrap = wrap;
@@ -14392,14 +14546,20 @@ module.exports = require("url");
/***/ (function(module, exports, __webpack_require__) {
var debug;
-try {
- /* eslint global-require: off */
- debug = __webpack_require__(205)("follow-redirects");
-}
-catch (error) {
- debug = function () { /* */ };
-}
-module.exports = debug;
+
+module.exports = function () {
+ if (!debug) {
+ try {
+ /* eslint global-require: off */
+ debug = __webpack_require__(205)("follow-redirects");
+ }
+ catch (error) { /* */ }
+ if (typeof debug !== "function") {
+ debug = function () { /* */ };
+ }
+ }
+ debug.apply(null, arguments);
+};
/***/ }),
@@ -16277,7 +16437,7 @@ module.exports = function (args, opts) {
var o = obj;
for (var i = 0; i < keys.length-1; i++) {
var key = keys[i];
- if (key === '__proto__') return;
+ if (isConstructorOrProto(o, key)) return;
if (o[key] === undefined) o[key] = {};
if (o[key] === Object.prototype || o[key] === Number.prototype
|| o[key] === String.prototype) o[key] = {};
@@ -16286,7 +16446,7 @@ module.exports = function (args, opts) {
}
var key = keys[keys.length - 1];
- if (key === '__proto__') return;
+ if (isConstructorOrProto(o, key)) return;
if (o === Object.prototype || o === Number.prototype
|| o === String.prototype) o = {};
if (o === Array.prototype) o = [];
@@ -16451,6 +16611,10 @@ function isNumber (x) {
}
+function isConstructorOrProto (obj, key) {
+ return key === 'constructor' && typeof obj[key] === 'function' || key === '__proto__';
+}
+
/***/ }),
/* 229 */
@@ -18483,7 +18647,6 @@ function pauseStreams (streams, options) {
module.exports = glob
-var fs = __webpack_require__(132)
var rp = __webpack_require__(245)
var minimatch = __webpack_require__(247)
var Minimatch = minimatch.Minimatch
@@ -18494,8 +18657,6 @@ var assert = __webpack_require__(162)
var isAbsolute = __webpack_require__(253)
var globSync = __webpack_require__(254)
var common = __webpack_require__(255)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
var setopts = common.setopts
var ownProp = common.ownProp
var inflight = __webpack_require__(256)
@@ -18946,7 +19107,7 @@ Glob.prototype._readdirInGlobStar = function (abs, cb) {
var lstatcb = inflight(lstatkey, lstatcb_)
if (lstatcb)
- fs.lstat(abs, lstatcb)
+ self.fs.lstat(abs, lstatcb)
function lstatcb_ (er, lstat) {
if (er && er.code === 'ENOENT')
@@ -18987,7 +19148,7 @@ Glob.prototype._readdir = function (abs, inGlobStar, cb) {
}
var self = this
- fs.readdir(abs, readdirCb(this, abs, cb))
+ self.fs.readdir(abs, readdirCb(this, abs, cb))
}
function readdirCb (self, abs, cb) {
@@ -19191,13 +19352,13 @@ Glob.prototype._stat = function (f, cb) {
var self = this
var statcb = inflight('stat\0' + abs, lstatcb_)
if (statcb)
- fs.lstat(abs, statcb)
+ self.fs.lstat(abs, statcb)
function lstatcb_ (er, lstat) {
if (lstat && lstat.isSymbolicLink()) {
// If it's a symlink, then treat it as the target, unless
// the target does not exist, then treat it as a file.
- return fs.stat(abs, function (er, stat) {
+ return self.fs.stat(abs, function (er, stat) {
if (er)
self._stat2(f, abs, null, lstat, cb)
else
@@ -19621,10 +19782,10 @@ exports.realpath = function realpath(p, cache, cb) {
module.exports = minimatch
minimatch.Minimatch = Minimatch
-var path = { sep: '/' }
-try {
- path = __webpack_require__(4)
-} catch (er) {}
+var path = (function () { try { return __webpack_require__(4) } catch (e) {}}()) || {
+ sep: '/'
+}
+minimatch.sep = path.sep
var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
var expand = __webpack_require__(248)
@@ -19676,43 +19837,64 @@ function filter (pattern, options) {
}
function ext (a, b) {
- a = a || {}
b = b || {}
var t = {}
- Object.keys(b).forEach(function (k) {
- t[k] = b[k]
- })
Object.keys(a).forEach(function (k) {
t[k] = a[k]
})
+ Object.keys(b).forEach(function (k) {
+ t[k] = b[k]
+ })
return t
}
minimatch.defaults = function (def) {
- if (!def || !Object.keys(def).length) return minimatch
+ if (!def || typeof def !== 'object' || !Object.keys(def).length) {
+ return minimatch
+ }
var orig = minimatch
var m = function minimatch (p, pattern, options) {
- return orig.minimatch(p, pattern, ext(def, options))
+ return orig(p, pattern, ext(def, options))
}
m.Minimatch = function Minimatch (pattern, options) {
return new orig.Minimatch(pattern, ext(def, options))
}
+ m.Minimatch.defaults = function defaults (options) {
+ return orig.defaults(ext(def, options)).Minimatch
+ }
+
+ m.filter = function filter (pattern, options) {
+ return orig.filter(pattern, ext(def, options))
+ }
+
+ m.defaults = function defaults (options) {
+ return orig.defaults(ext(def, options))
+ }
+
+ m.makeRe = function makeRe (pattern, options) {
+ return orig.makeRe(pattern, ext(def, options))
+ }
+
+ m.braceExpand = function braceExpand (pattern, options) {
+ return orig.braceExpand(pattern, ext(def, options))
+ }
+
+ m.match = function (list, pattern, options) {
+ return orig.match(list, pattern, ext(def, options))
+ }
return m
}
Minimatch.defaults = function (def) {
- if (!def || !Object.keys(def).length) return Minimatch
return minimatch.defaults(def).Minimatch
}
function minimatch (p, pattern, options) {
- if (typeof pattern !== 'string') {
- throw new TypeError('glob pattern string required')
- }
+ assertValidPattern(pattern)
if (!options) options = {}
@@ -19721,9 +19903,6 @@ function minimatch (p, pattern, options) {
return false
}
- // "" only matches ""
- if (pattern.trim() === '') return p === ''
-
return new Minimatch(pattern, options).match(p)
}
@@ -19732,15 +19911,14 @@ function Minimatch (pattern, options) {
return new Minimatch(pattern, options)
}
- if (typeof pattern !== 'string') {
- throw new TypeError('glob pattern string required')
- }
+ assertValidPattern(pattern)
if (!options) options = {}
+
pattern = pattern.trim()
// windows support: need to use /, not \
- if (path.sep !== '/') {
+ if (!options.allowWindowsEscape && path.sep !== '/') {
pattern = pattern.split(path.sep).join('/')
}
@@ -19751,6 +19929,7 @@ function Minimatch (pattern, options) {
this.negate = false
this.comment = false
this.empty = false
+ this.partial = !!options.partial
// make the set of regexps etc.
this.make()
@@ -19760,9 +19939,6 @@ Minimatch.prototype.debug = function () {}
Minimatch.prototype.make = make
function make () {
- // don't do it more than once.
- if (this._made) return
-
var pattern = this.pattern
var options = this.options
@@ -19782,7 +19958,7 @@ function make () {
// step 2: expand braces
var set = this.globSet = this.braceExpand()
- if (options.debug) this.debug = console.error
+ if (options.debug) this.debug = function debug() { console.error.apply(console, arguments) }
this.debug(this.pattern, set)
@@ -19862,12 +20038,11 @@ function braceExpand (pattern, options) {
pattern = typeof pattern === 'undefined'
? this.pattern : pattern
- if (typeof pattern === 'undefined') {
- throw new TypeError('undefined pattern')
- }
+ assertValidPattern(pattern)
- if (options.nobrace ||
- !pattern.match(/\{.*\}/)) {
+ // Thanks to Yeting Li for
+ // improving this regexp to avoid a ReDOS vulnerability.
+ if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
// shortcut. no need to expand.
return [pattern]
}
@@ -19875,6 +20050,17 @@ function braceExpand (pattern, options) {
return expand(pattern)
}
+var MAX_PATTERN_LENGTH = 1024 * 64
+var assertValidPattern = function (pattern) {
+ if (typeof pattern !== 'string') {
+ throw new TypeError('invalid pattern')
+ }
+
+ if (pattern.length > MAX_PATTERN_LENGTH) {
+ throw new TypeError('pattern is too long')
+ }
+}
+
// parse a component of the expanded set.
// At this point, no pattern may contain "/" in it
// so we're going to return a 2d array, where each entry is the full
@@ -19889,14 +20075,17 @@ function braceExpand (pattern, options) {
Minimatch.prototype.parse = parse
var SUBPARSE = {}
function parse (pattern, isSub) {
- if (pattern.length > 1024 * 64) {
- throw new TypeError('pattern is too long')
- }
+ assertValidPattern(pattern)
var options = this.options
// shortcuts
- if (!options.noglobstar && pattern === '**') return GLOBSTAR
+ if (pattern === '**') {
+ if (!options.noglobstar)
+ return GLOBSTAR
+ else
+ pattern = '*'
+ }
if (pattern === '') return ''
var re = ''
@@ -19952,10 +20141,12 @@ function parse (pattern, isSub) {
}
switch (c) {
- case '/':
+ /* istanbul ignore next */
+ case '/': {
// completely not allowed, even escaped.
// Should already be path-split by now.
return false
+ }
case '\\':
clearStateChar()
@@ -20074,25 +20265,23 @@ function parse (pattern, isSub) {
// handle the case where we left a class open.
// "[z-a]" is valid, equivalent to "\[z-a\]"
- if (inClass) {
- // split where the last [ was, make sure we don't have
- // an invalid re. if so, re-walk the contents of the
- // would-be class to re-translate any characters that
- // were passed through as-is
- // TODO: It would probably be faster to determine this
- // without a try/catch and a new RegExp, but it's tricky
- // to do safely. For now, this is safe and works.
- var cs = pattern.substring(classStart + 1, i)
- try {
- RegExp('[' + cs + ']')
- } catch (er) {
- // not a valid class!
- var sp = this.parse(cs, SUBPARSE)
- re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
- hasMagic = hasMagic || sp[1]
- inClass = false
- continue
- }
+ // split where the last [ was, make sure we don't have
+ // an invalid re. if so, re-walk the contents of the
+ // would-be class to re-translate any characters that
+ // were passed through as-is
+ // TODO: It would probably be faster to determine this
+ // without a try/catch and a new RegExp, but it's tricky
+ // to do safely. For now, this is safe and works.
+ var cs = pattern.substring(classStart + 1, i)
+ try {
+ RegExp('[' + cs + ']')
+ } catch (er) {
+ // not a valid class!
+ var sp = this.parse(cs, SUBPARSE)
+ re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+ hasMagic = hasMagic || sp[1]
+ inClass = false
+ continue
}
// finish up the class.
@@ -20176,9 +20365,7 @@ function parse (pattern, isSub) {
// something that could conceivably capture a dot
var addPatternStart = false
switch (re.charAt(0)) {
- case '.':
- case '[':
- case '(': addPatternStart = true
+ case '[': case '.': case '(': addPatternStart = true
}
// Hack to work around lack of negative lookbehind in JS
@@ -20240,7 +20427,7 @@ function parse (pattern, isSub) {
var flags = options.nocase ? 'i' : ''
try {
var regExp = new RegExp('^' + re + '$', flags)
- } catch (er) {
+ } catch (er) /* istanbul ignore next - should be impossible */ {
// If it was an invalid regular expression, then it can't match
// anything. This trick looks for a character after the end of
// the string, which is of course impossible, except in multi-line
@@ -20298,7 +20485,7 @@ function makeRe () {
try {
this.regexp = new RegExp(re, flags)
- } catch (ex) {
+ } catch (ex) /* istanbul ignore next - should be impossible */ {
this.regexp = false
}
return this.regexp
@@ -20316,8 +20503,8 @@ minimatch.match = function (list, pattern, options) {
return list
}
-Minimatch.prototype.match = match
-function match (f, partial) {
+Minimatch.prototype.match = function match (f, partial) {
+ if (typeof partial === 'undefined') partial = this.partial
this.debug('match', f, this.pattern)
// short-circuit in the case of busted things.
// comments, etc.
@@ -20399,6 +20586,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
// should be impossible.
// some invalid regexp stuff in the set.
+ /* istanbul ignore if */
if (p === false) return false
if (p === GLOBSTAR) {
@@ -20472,6 +20660,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
// no match was found.
// However, in partial mode, we can't say this is necessarily over.
// If there's more *pattern* left, then
+ /* istanbul ignore if */
if (partial) {
// ran out of file
this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
@@ -20485,11 +20674,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
// patterns with magic have been turned into regexps.
var hit
if (typeof p === 'string') {
- if (options.nocase) {
- hit = f.toLowerCase() === p.toLowerCase()
- } else {
- hit = f === p
- }
+ hit = f === p
this.debug('string match', p, f, hit)
} else {
hit = f.match(p)
@@ -20520,16 +20705,16 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
// this is ok if we're doing the match as part of
// a glob fs traversal.
return partial
- } else if (pi === pl) {
+ } else /* istanbul ignore else */ if (pi === pl) {
// ran out of pattern, still have file left.
// this is only acceptable if we're on the very last
// empty segment of a file with a trailing slash.
// a/* should match a/b/
- var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
- return emptyFileEnd
+ return (fi === fl - 1) && (file[fi] === '')
}
// should be unreachable.
+ /* istanbul ignore next */
throw new Error('wtf?')
}
@@ -20917,7 +21102,6 @@ module.exports.win32 = win32;
module.exports = globSync
globSync.GlobSync = GlobSync
-var fs = __webpack_require__(132)
var rp = __webpack_require__(245)
var minimatch = __webpack_require__(247)
var Minimatch = minimatch.Minimatch
@@ -20927,8 +21111,6 @@ var path = __webpack_require__(4)
var assert = __webpack_require__(162)
var isAbsolute = __webpack_require__(253)
var common = __webpack_require__(255)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
var setopts = common.setopts
var ownProp = common.ownProp
var childrenIgnored = common.childrenIgnored
@@ -21164,7 +21346,7 @@ GlobSync.prototype._readdirInGlobStar = function (abs) {
var lstat
var stat
try {
- lstat = fs.lstatSync(abs)
+ lstat = this.fs.lstatSync(abs)
} catch (er) {
if (er.code === 'ENOENT') {
// lstat failed, doesn't exist
@@ -21201,7 +21383,7 @@ GlobSync.prototype._readdir = function (abs, inGlobStar) {
}
try {
- return this._readdirEntries(abs, fs.readdirSync(abs))
+ return this._readdirEntries(abs, this.fs.readdirSync(abs))
} catch (er) {
this._readdirError(abs, er)
return null
@@ -21360,7 +21542,7 @@ GlobSync.prototype._stat = function (f) {
if (!stat) {
var lstat
try {
- lstat = fs.lstatSync(abs)
+ lstat = this.fs.lstatSync(abs)
} catch (er) {
if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
this.statCache[abs] = false
@@ -21370,7 +21552,7 @@ GlobSync.prototype._stat = function (f) {
if (lstat && lstat.isSymbolicLink()) {
try {
- stat = fs.statSync(abs)
+ stat = this.fs.statSync(abs)
} catch (er) {
stat = lstat
}
@@ -21406,8 +21588,6 @@ GlobSync.prototype._makeAbs = function (f) {
/* 255 */
/***/ (function(module, exports, __webpack_require__) {
-exports.alphasort = alphasort
-exports.alphasorti = alphasorti
exports.setopts = setopts
exports.ownProp = ownProp
exports.makeAbs = makeAbs
@@ -21420,17 +21600,14 @@ function ownProp (obj, field) {
return Object.prototype.hasOwnProperty.call(obj, field)
}
+var fs = __webpack_require__(132)
var path = __webpack_require__(4)
var minimatch = __webpack_require__(247)
var isAbsolute = __webpack_require__(253)
var Minimatch = minimatch.Minimatch
-function alphasorti (a, b) {
- return a.toLowerCase().localeCompare(b.toLowerCase())
-}
-
function alphasort (a, b) {
- return a.localeCompare(b)
+ return a.localeCompare(b, 'en')
}
function setupIgnores (self, options) {
@@ -21489,6 +21666,7 @@ function setopts (self, pattern, options) {
self.stat = !!options.stat
self.noprocess = !!options.noprocess
self.absolute = !!options.absolute
+ self.fs = options.fs || fs
self.maxLength = options.maxLength || Infinity
self.cache = options.cache || Object.create(null)
@@ -21558,7 +21736,7 @@ function finish (self) {
all = Object.keys(all)
if (!self.nosort)
- all = all.sort(self.nocase ? alphasorti : alphasort)
+ all = all.sort(alphasort)
// at *some* point we statted all of these
if (self.mark) {
@@ -52378,25 +52556,23 @@ function addProjectToTree(tree, pathParts, project) {
"use strict";
__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _yarn_integrity__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(422);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "yarnIntegrityFileExists", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_0__["yarnIntegrityFileExists"]; });
+/* harmony import */ var _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(422);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelDiskCacheFolder"]; });
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ensureYarnIntegrityFileExists", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_0__["ensureYarnIntegrityFileExists"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_0__["getBazelRepositoryCacheFolder"]; });
-/* harmony import */ var _get_cache_folders__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(423);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_1__["getBazelDiskCacheFolder"]; });
+/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(423);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["isBazelBinAvailable"]; });
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getBazelRepositoryCacheFolder", function() { return _get_cache_folders__WEBPACK_IMPORTED_MODULE_1__["getBazelRepositoryCacheFolder"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_1__["installBazelTools"]; });
-/* harmony import */ var _install_tools__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(424);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isBazelBinAvailable", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_2__["isBazelBinAvailable"]; });
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(424);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["runBazel"]; });
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "installBazelTools", function() { return _install_tools__WEBPACK_IMPORTED_MODULE_2__["installBazelTools"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runIBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_2__["runIBazel"]; });
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(425);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_3__["runBazel"]; });
-
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "runIBazel", function() { return _run__WEBPACK_IMPORTED_MODULE_3__["runIBazel"]; });
+/* harmony import */ var _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(526);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "removeYarnIntegrityFileIfExists", function() { return _yarn_integrity__WEBPACK_IMPORTED_MODULE_3__["removeYarnIntegrityFileIfExists"]; });
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -52414,53 +52590,6 @@ __webpack_require__.r(__webpack_exports__);
/* 422 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnIntegrityFileExists", function() { return yarnIntegrityFileExists; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ensureYarnIntegrityFileExists", function() { return ensureYarnIntegrityFileExists; });
-/* 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 _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231);
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-async function yarnIntegrityFileExists(nodeModulesPath) {
- try {
- const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["tryRealpath"])(nodeModulesPath);
- const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // check if the file already exists
-
- if (await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["isFile"])(yarnIntegrityFilePath)) {
- return true;
- }
- } catch {// no-op
- }
-
- return false;
-}
-async function ensureYarnIntegrityFileExists(nodeModulesPath) {
- try {
- const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["tryRealpath"])(nodeModulesPath);
- const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // ensure node_modules folder is created
-
- await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["mkdirp"])(nodeModulesRealPath); // write a blank file in case it doesn't exists
-
- await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["writeFile"])(yarnIntegrityFilePath, '', {
- flag: 'wx'
- });
- } catch {// no-op
- }
-}
-
-/***/ }),
-/* 423 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getBazelDiskCacheFolder", function() { return getBazelDiskCacheFolder; });
@@ -52495,7 +52624,7 @@ async function getBazelRepositoryCacheFolder() {
}
/***/ }),
-/* 424 */
+/* 423 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -52614,7 +52743,7 @@ async function installBazelTools(repoRootPath) {
}
/***/ }),
-/* 425 */
+/* 424 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -52624,8 +52753,8 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(114);
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(426);
-/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(524);
+/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(425);
+/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(523);
/* harmony import */ var _kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils_stdio__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(221);
/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220);
@@ -52670,6 +52799,7 @@ async function runBazelCommandWithRunner(bazelCommandRunner, bazelArgs, offline
try {
await bazelProc;
} catch {
+ _log__WEBPACK_IMPORTED_MODULE_5__["log"].error('HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`');
throw new _errors__WEBPACK_IMPORTED_MODULE_6__["CliError"](`The bazel command that was running failed to complete.`);
}
@@ -52691,141 +52821,141 @@ async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
}
/***/ }),
-/* 426 */
+/* 425 */
/***/ (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__(427);
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(426);
/* 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__(428);
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
/* 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__(429);
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(428);
/* 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__(430);
+/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(429);
/* 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__(431);
+/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(430);
/* 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__(432);
+/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(431);
/* 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__(433);
+/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(432);
/* 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__(434);
+/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(433);
/* 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__(435);
+/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(434);
/* 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__(436);
+/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(435);
/* 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__(437);
+/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(436);
/* 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__(81);
/* 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__(438);
+/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(437);
/* 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__(439);
+/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(438);
/* 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__(440);
+/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(439);
/* 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__(441);
+/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(440);
/* 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__(442);
+/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(441);
/* 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__(443);
+/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(442);
/* 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__(444);
+/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(443);
/* 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__(446);
+/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(445);
/* 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__(447);
+/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(446);
/* 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__(448);
+/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(447);
/* 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__(449);
+/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(448);
/* 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__(450);
+/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(449);
/* 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__(451);
+/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(450);
/* 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__(454);
+/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(453);
/* 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__(455);
+/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(454);
/* 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__(456);
+/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(455);
/* 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__(457);
+/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(456);
/* 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__(458);
+/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(457);
/* 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__(106);
/* 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__(459);
+/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(458);
/* 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__(460);
+/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(459);
/* 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__(461);
+/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(460);
/* 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__(462);
+/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(461);
/* 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__(32);
/* 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__(463);
+/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(462);
/* 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__(464);
+/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(463);
/* 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__(465);
+/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(464);
/* 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__(67);
/* 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__(467);
+/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(466);
/* 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__(468);
+/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(467);
/* 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__(469);
+/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(468);
/* 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__(472);
+/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(471);
/* 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__(82);
@@ -52836,175 +52966,175 @@ __webpack_require__.r(__webpack_exports__);
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["flatMap"]; });
-/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(473);
+/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(472);
/* 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__(474);
+/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(473);
/* 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__(475);
+/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(474);
/* 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__(476);
+/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(475);
/* 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__(42);
/* 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__(477);
+/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(476);
/* 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__(478);
+/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(477);
/* 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__(479);
+/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(478);
/* 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__(480);
+/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(479);
/* 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__(481);
+/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(480);
/* 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__(482);
+/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(481);
/* 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__(483);
+/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(482);
/* 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__(484);
+/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(483);
/* 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__(485);
+/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(484);
/* 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__(470);
+/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(469);
/* 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__(486);
+/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(485);
/* 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__(487);
+/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(486);
/* 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__(488);
+/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(487);
/* 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__(489);
+/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(488);
/* 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__(31);
/* 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__(490);
+/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(489);
/* 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__(491);
+/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(490);
/* 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__(471);
+/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(470);
/* 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__(492);
+/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(491);
/* 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__(493);
+/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(492);
/* 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__(494);
+/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(493);
/* 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__(495);
+/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(494);
/* 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__(496);
+/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(495);
/* 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__(497);
+/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(496);
/* 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__(498);
+/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(497);
/* 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__(499);
+/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(498);
/* 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__(500);
+/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(499);
/* 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__(501);
+/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(500);
/* 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__(503);
+/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(502);
/* 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__(504);
+/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(503);
/* 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__(505);
+/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(504);
/* 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__(453);
+/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(452);
/* 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__(466);
+/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(465);
/* 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__(506);
+/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(505);
/* 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__(507);
+/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(506);
/* 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__(508);
+/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(507);
/* 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__(509);
+/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(508);
/* 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__(510);
+/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(509);
/* 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__(452);
+/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(451);
/* 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__(511);
+/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(510);
/* 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__(512);
+/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(511);
/* 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__(513);
+/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(512);
/* 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__(514);
+/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(513);
/* 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__(515);
+/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(514);
/* 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__(516);
+/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(515);
/* 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__(517);
+/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(516);
/* 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__(518);
+/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(517);
/* 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__(519);
+/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(518);
/* 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__(520);
+/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(519);
/* 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__(521);
+/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(520);
/* 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__(522);
+/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(521);
/* 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__(523);
+/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(522);
/* 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 */
@@ -53115,7 +53245,7 @@ __webpack_require__.r(__webpack_exports__);
/***/ }),
-/* 427 */
+/* 426 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53194,14 +53324,14 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 428 */
+/* 427 */
/***/ (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__(56);
-/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
+/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(426);
/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(109);
/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
@@ -53217,7 +53347,7 @@ function auditTime(duration, scheduler) {
/***/ }),
-/* 429 */
+/* 428 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53264,7 +53394,7 @@ var BufferSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 430 */
+/* 429 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53365,7 +53495,7 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 431 */
+/* 430 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53526,7 +53656,7 @@ function dispatchBufferClose(arg) {
/***/ }),
-/* 432 */
+/* 431 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53645,7 +53775,7 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 433 */
+/* 432 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53738,7 +53868,7 @@ var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 434 */
+/* 433 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53798,7 +53928,7 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 435 */
+/* 434 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53814,7 +53944,7 @@ function combineAll(project) {
/***/ }),
-/* 436 */
+/* 435 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53846,7 +53976,7 @@ function combineLatest() {
/***/ }),
-/* 437 */
+/* 436 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53866,7 +53996,7 @@ function concat() {
/***/ }),
-/* 438 */
+/* 437 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53882,13 +54012,13 @@ function concatMap(project, resultSelector) {
/***/ }),
-/* 439 */
+/* 438 */
/***/ (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__(438);
+/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(437);
/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
function concatMapTo(innerObservable, resultSelector) {
@@ -53898,7 +54028,7 @@ function concatMapTo(innerObservable, resultSelector) {
/***/ }),
-/* 440 */
+/* 439 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -53963,7 +54093,7 @@ var CountSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 441 */
+/* 440 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54048,7 +54178,7 @@ var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 442 */
+/* 441 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54124,7 +54254,7 @@ function dispatchNext(subscriber) {
/***/ }),
-/* 443 */
+/* 442 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54174,7 +54304,7 @@ var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 444 */
+/* 443 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54182,7 +54312,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__(13);
/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(445);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(444);
/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(12);
/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(43);
/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
@@ -54281,7 +54411,7 @@ var DelayMessage = /*@__PURE__*/ (function () {
/***/ }),
-/* 445 */
+/* 444 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54295,7 +54425,7 @@ function isDate(value) {
/***/ }),
-/* 446 */
+/* 445 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54441,7 +54571,7 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 447 */
+/* 446 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54479,7 +54609,7 @@ var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 448 */
+/* 447 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54555,7 +54685,7 @@ var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 449 */
+/* 448 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54626,13 +54756,13 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 450 */
+/* 449 */
/***/ (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__(449);
+/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(448);
/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
function distinctUntilKeyChanged(key, compare) {
@@ -54642,7 +54772,7 @@ function distinctUntilKeyChanged(key, compare) {
/***/ }),
-/* 451 */
+/* 450 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54650,9 +54780,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__(63);
/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(452);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(443);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(453);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(451);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(442);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(452);
/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
@@ -54674,7 +54804,7 @@ function elementAt(index, defaultValue) {
/***/ }),
-/* 452 */
+/* 451 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54740,7 +54870,7 @@ function defaultErrorFactory() {
/***/ }),
-/* 453 */
+/* 452 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54802,7 +54932,7 @@ var TakeSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 454 */
+/* 453 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54824,7 +54954,7 @@ function endWith() {
/***/ }),
-/* 455 */
+/* 454 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54886,7 +55016,7 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 456 */
+/* 455 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -54940,7 +55070,7 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 457 */
+/* 456 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55034,7 +55164,7 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 458 */
+/* 457 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55146,7 +55276,7 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 459 */
+/* 458 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55184,7 +55314,7 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 460 */
+/* 459 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55256,13 +55386,13 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 461 */
+/* 460 */
/***/ (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__(460);
+/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(459);
/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
function findIndex(predicate, thisArg) {
@@ -55272,7 +55402,7 @@ function findIndex(predicate, thisArg) {
/***/ }),
-/* 462 */
+/* 461 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55280,9 +55410,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__(64);
/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(453);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(443);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(452);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(452);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(442);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(451);
/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
@@ -55299,7 +55429,7 @@ function first(predicate, defaultValue) {
/***/ }),
-/* 463 */
+/* 462 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55336,7 +55466,7 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 464 */
+/* 463 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55380,7 +55510,7 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 465 */
+/* 464 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55388,9 +55518,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__(64);
/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(466);
-/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(452);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(443);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(465);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(451);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(442);
/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26);
/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
@@ -55407,7 +55537,7 @@ function last(predicate, defaultValue) {
/***/ }),
-/* 466 */
+/* 465 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55484,7 +55614,7 @@ var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 467 */
+/* 466 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55523,7 +55653,7 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 468 */
+/* 467 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55573,13 +55703,13 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 469 */
+/* 468 */
/***/ (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__(470);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(469);
/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
function max(comparer) {
@@ -55592,15 +55722,15 @@ function max(comparer) {
/***/ }),
-/* 470 */
+/* 469 */
/***/ (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__(471);
-/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(466);
-/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(443);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(470);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(465);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(442);
/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
@@ -55621,7 +55751,7 @@ function reduce(accumulator, seed) {
/***/ }),
-/* 471 */
+/* 470 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55703,7 +55833,7 @@ var ScanSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 472 */
+/* 471 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55723,7 +55853,7 @@ function merge() {
/***/ }),
-/* 473 */
+/* 472 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55748,7 +55878,7 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) {
/***/ }),
-/* 474 */
+/* 473 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55857,13 +55987,13 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 475 */
+/* 474 */
/***/ (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__(470);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(469);
/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
function min(comparer) {
@@ -55876,7 +56006,7 @@ function min(comparer) {
/***/ }),
-/* 476 */
+/* 475 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -55925,7 +56055,7 @@ var MulticastOperator = /*@__PURE__*/ (function () {
/***/ }),
-/* 477 */
+/* 476 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56015,7 +56145,7 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 478 */
+/* 477 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56063,7 +56193,7 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 479 */
+/* 478 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56086,7 +56216,7 @@ function partition(predicate, thisArg) {
/***/ }),
-/* 480 */
+/* 479 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56126,14 +56256,14 @@ function plucker(props, length) {
/***/ }),
-/* 481 */
+/* 480 */
/***/ (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__(28);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(476);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(475);
/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
@@ -56146,14 +56276,14 @@ function publish(selector) {
/***/ }),
-/* 482 */
+/* 481 */
/***/ (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__(33);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(476);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(475);
/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
@@ -56164,14 +56294,14 @@ function publishBehavior(value) {
/***/ }),
-/* 483 */
+/* 482 */
/***/ (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__(51);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(476);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(475);
/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
@@ -56182,14 +56312,14 @@ function publishLast() {
/***/ }),
-/* 484 */
+/* 483 */
/***/ (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__(34);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(476);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(475);
/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
@@ -56205,7 +56335,7 @@ function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
/***/ }),
-/* 485 */
+/* 484 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56232,7 +56362,7 @@ function race() {
/***/ }),
-/* 486 */
+/* 485 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56297,7 +56427,7 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 487 */
+/* 486 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56391,7 +56521,7 @@ var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 488 */
+/* 487 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56444,7 +56574,7 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 489 */
+/* 488 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56530,7 +56660,7 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 490 */
+/* 489 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56585,7 +56715,7 @@ var SampleSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 491 */
+/* 490 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56645,7 +56775,7 @@ function dispatchNotification(state) {
/***/ }),
-/* 492 */
+/* 491 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56768,13 +56898,13 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 493 */
+/* 492 */
/***/ (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__(476);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(475);
/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31);
/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28);
/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
@@ -56791,7 +56921,7 @@ function share() {
/***/ }),
-/* 494 */
+/* 493 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56860,7 +56990,7 @@ function shareReplayOperator(_a) {
/***/ }),
-/* 495 */
+/* 494 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56940,7 +57070,7 @@ var SingleSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 496 */
+/* 495 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -56982,7 +57112,7 @@ var SkipSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 497 */
+/* 496 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57044,7 +57174,7 @@ var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 498 */
+/* 497 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57101,7 +57231,7 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 499 */
+/* 498 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57157,7 +57287,7 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 500 */
+/* 499 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57186,13 +57316,13 @@ function startWith() {
/***/ }),
-/* 501 */
+/* 500 */
/***/ (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__(502);
+/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(501);
/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
function subscribeOn(scheduler, delay) {
@@ -57217,7 +57347,7 @@ var SubscribeOnOperator = /*@__PURE__*/ (function () {
/***/ }),
-/* 502 */
+/* 501 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57281,13 +57411,13 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 503 */
+/* 502 */
/***/ (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__(504);
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(503);
/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26);
/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
@@ -57299,7 +57429,7 @@ function switchAll() {
/***/ }),
-/* 504 */
+/* 503 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57387,13 +57517,13 @@ var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 505 */
+/* 504 */
/***/ (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__(504);
+/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(503);
/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
function switchMapTo(innerObservable, resultSelector) {
@@ -57403,7 +57533,7 @@ function switchMapTo(innerObservable, resultSelector) {
/***/ }),
-/* 506 */
+/* 505 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57451,7 +57581,7 @@ var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 507 */
+/* 506 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57519,7 +57649,7 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 508 */
+/* 507 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57607,7 +57737,7 @@ var TapSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 509 */
+/* 508 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57709,7 +57839,7 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 510 */
+/* 509 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57718,7 +57848,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12);
/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(56);
-/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(509);
+/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(508);
/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
@@ -57807,7 +57937,7 @@ function dispatchNext(arg) {
/***/ }),
-/* 511 */
+/* 510 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57815,7 +57945,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__(56);
-/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(471);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(470);
/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(92);
/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(67);
/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
@@ -57851,7 +57981,7 @@ var TimeInterval = /*@__PURE__*/ (function () {
/***/ }),
-/* 512 */
+/* 511 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57859,7 +57989,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__(56);
/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65);
-/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(513);
+/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(512);
/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(50);
/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
@@ -57876,7 +58006,7 @@ function timeout(due, scheduler) {
/***/ }),
-/* 513 */
+/* 512 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57884,7 +58014,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__(13);
/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56);
-/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(445);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(444);
/* harmony import */ var _innerSubscribe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91);
/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_innerSubscribe PURE_IMPORTS_END */
@@ -57955,7 +58085,7 @@ var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 514 */
+/* 513 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -57985,13 +58115,13 @@ var Timestamp = /*@__PURE__*/ (function () {
/***/ }),
-/* 515 */
+/* 514 */
/***/ (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__(470);
+/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(469);
/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
function toArrayReducer(arr, item, index) {
@@ -58008,7 +58138,7 @@ function toArray() {
/***/ }),
-/* 516 */
+/* 515 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58086,7 +58216,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 517 */
+/* 516 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58176,7 +58306,7 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 518 */
+/* 517 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58346,7 +58476,7 @@ function dispatchWindowClose(state) {
/***/ }),
-/* 519 */
+/* 518 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58489,7 +58619,7 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 520 */
+/* 519 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58586,7 +58716,7 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 521 */
+/* 520 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58681,7 +58811,7 @@ var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
/***/ }),
-/* 522 */
+/* 521 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58703,7 +58833,7 @@ function zip() {
/***/ }),
-/* 523 */
+/* 522 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58719,7 +58849,7 @@ function zipAll(project) {
/***/ }),
-/* 524 */
+/* 523 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -58729,7 +58859,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
-var _observe_lines = __webpack_require__(525);
+var _observe_lines = __webpack_require__(524);
Object.keys(_observe_lines).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
@@ -58742,7 +58872,7 @@ Object.keys(_observe_lines).forEach(function (key) {
});
});
-var _observe_readable = __webpack_require__(526);
+var _observe_readable = __webpack_require__(525);
Object.keys(_observe_readable).forEach(function (key) {
if (key === "default" || key === "__esModule") return;
@@ -58756,7 +58886,7 @@ Object.keys(_observe_readable).forEach(function (key) {
});
/***/ }),
-/* 525 */
+/* 524 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -58769,9 +58899,9 @@ exports.observeLines = observeLines;
var Rx = _interopRequireWildcard(__webpack_require__(9));
-var _operators = __webpack_require__(426);
+var _operators = __webpack_require__(425);
-var _observe_readable = __webpack_require__(526);
+var _observe_readable = __webpack_require__(525);
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -58834,7 +58964,7 @@ function observeLines(readable) {
}
/***/ }),
-/* 526 */
+/* 525 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -58847,7 +58977,7 @@ exports.observeReadable = observeReadable;
var Rx = _interopRequireWildcard(__webpack_require__(9));
-var _operators = __webpack_require__(426);
+var _operators = __webpack_require__(425);
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -58870,10 +59000,144 @@ function observeReadable(readable) {
return Rx.race(Rx.fromEvent(readable, 'end').pipe((0, _operators.first)(), (0, _operators.ignoreElements)()), Rx.fromEvent(readable, 'error').pipe((0, _operators.first)(), (0, _operators.mergeMap)(err => Rx.throwError(err))));
}
+/***/ }),
+/* 526 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "removeYarnIntegrityFileIfExists", function() { return removeYarnIntegrityFileIfExists; });
+/* 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 _fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+async function removeYarnIntegrityFileIfExists(nodeModulesPath) {
+ try {
+ const nodeModulesRealPath = await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["tryRealpath"])(nodeModulesPath);
+ const yarnIntegrityFilePath = Object(path__WEBPACK_IMPORTED_MODULE_0__["join"])(nodeModulesRealPath, '.yarn-integrity'); // check if the file exists and delete it in that case
+
+ if (await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["isFile"])(yarnIntegrityFilePath)) {
+ await Object(_fs__WEBPACK_IMPORTED_MODULE_1__["unlink"])(yarnIntegrityFilePath);
+ }
+ } catch {// no-op
+ }
+}
+
/***/ }),
/* 527 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setupRemoteCache", function() { return setupRemoteCache; });
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
+/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(132);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__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 _child_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(221);
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(220);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+
+
+
+
+
+async function isVaultAvailable() {
+ try {
+ await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('vault', ['--version'], {
+ stdio: 'pipe'
+ });
+ return true;
+ } catch {
+ return false;
+ }
+}
+
+async function isElasticCommitter() {
+ try {
+ const {
+ stdout: email
+ } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('git', ['config', 'user.email'], {
+ stdio: 'pipe'
+ });
+ return email.trim().endsWith('@elastic.co');
+ } catch {
+ return false;
+ }
+}
+
+async function setupRemoteCache(repoRootPath) {
+ // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
+ if (process.env.CI || !(await isElasticCommitter())) {
+ return;
+ }
+
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] setting up remote cache settings if necessary`);
+ const settingsPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(repoRootPath, '.bazelrc.cache');
+
+ if (Object(fs__WEBPACK_IMPORTED_MODULE_1__["existsSync"])(settingsPath)) {
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].debug(`[bazel_tools] remote cache settings already exist, skipping`);
+ return;
+ }
+
+ if (!(await isVaultAvailable())) {
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
+ return;
+ }
+
+ let apiKey = '';
+
+ try {
+ const {
+ stdout
+ } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_3__["spawn"])('vault', ['read', '-field=readonly-key', 'secret/ui-team/kibana-bazel-remote-cache'], {
+ stdio: 'pipe'
+ });
+ apiKey = stdout.trim();
+ } catch (ex) {
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] unable to read bazel remote cache key from vault, are you authenticated?');
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] building packages will work, but will be slower in many cases.');
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info('[bazel_tools] reach out to Operations if you need assistance with this.');
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] ${ex}`);
+ return;
+ }
+
+ const contents = dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
+ # V1 - This file is automatically generated by 'yarn kbn bootstrap'
+ # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
+ build --bes_results_url=https://app.buildbuddy.io/invocation/
+ build --bes_backend=grpcs://cloud.buildbuddy.io
+ build --remote_cache=grpcs://cloud.buildbuddy.io
+ build --remote_timeout=3600
+ build --remote_header=${apiKey}
+ `;
+ Object(fs__WEBPACK_IMPORTED_MODULE_1__["writeFileSync"])(settingsPath, contents);
+ _log__WEBPACK_IMPORTED_MODULE_4__["log"].info(`[bazel_tools] remote cache settings written to ${settingsPath}`);
+}
+
+/***/ }),
+/* 528 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BuildCommand", function() { return BuildCommand; });
@@ -58905,7 +59169,7 @@ const BuildCommand = {
};
/***/ }),
-/* 528 */
+/* 529 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -58915,7 +59179,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(240);
/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(529);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(530);
/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
@@ -58937,7 +59201,7 @@ __webpack_require__.r(__webpack_exports__);
const CleanCommand = {
- description: 'Deletes output directories, node_modules and resets internal caches.',
+ description: 'Deletes output directories and resets internal caches.',
name: 'clean',
reportTiming: {
group: 'scripts/kbn clean',
@@ -58946,20 +59210,15 @@ const CleanCommand = {
async run(projects) {
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
- This command is only necessary for the rare circumstance where you need to recover a consistent
+ This command is only necessary for the circumstance where you need to recover a consistent
state when problems arise. If you need to run this command often, please let us know by
- filling out this form: https://ela.st/yarn-kbn-clean
+ filling out this form: https://ela.st/yarn-kbn-clean.
+ Please not it might not solve problems with node_modules. To solve problems around node_modules
+ you might need to run 'yarn kbn reset'.
`);
const toDelete = [];
for (const project of projects.values()) {
- if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(project.nodeModulesLocation)) {
- toDelete.push({
- cwd: project.path,
- pattern: Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(project.path, project.nodeModulesLocation)
- });
- }
-
if (await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_5__["isDirectory"])(project.targetLocation)) {
toDelete.push({
cwd: project.path,
@@ -59022,20 +59281,20 @@ const CleanCommand = {
};
/***/ }),
-/* 529 */
+/* 530 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const readline = __webpack_require__(530);
-const chalk = __webpack_require__(531);
-const cliCursor = __webpack_require__(534);
-const cliSpinners = __webpack_require__(536);
-const logSymbols = __webpack_require__(538);
-const stripAnsi = __webpack_require__(544);
-const wcwidth = __webpack_require__(546);
-const isInteractive = __webpack_require__(550);
-const MuteStream = __webpack_require__(551);
+const readline = __webpack_require__(531);
+const chalk = __webpack_require__(532);
+const cliCursor = __webpack_require__(535);
+const cliSpinners = __webpack_require__(537);
+const logSymbols = __webpack_require__(539);
+const stripAnsi = __webpack_require__(545);
+const wcwidth = __webpack_require__(547);
+const isInteractive = __webpack_require__(551);
+const MuteStream = __webpack_require__(552);
const TEXT = Symbol('text');
const PREFIX_TEXT = Symbol('prefixText');
@@ -59388,13 +59647,13 @@ module.exports.promise = (action, options) => {
/***/ }),
-/* 530 */
+/* 531 */
/***/ (function(module, exports) {
module.exports = require("readline");
/***/ }),
-/* 531 */
+/* 532 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -59404,7 +59663,7 @@ const {stdout: stdoutColor, stderr: stderrColor} = __webpack_require__(121);
const {
stringReplaceAll,
stringEncaseCRLFWithFirstIndex
-} = __webpack_require__(532);
+} = __webpack_require__(533);
// `supportsColor.level` → `ansiStyles.color[name]` mapping
const levelMapping = [
@@ -59605,7 +59864,7 @@ const chalkTag = (chalk, ...strings) => {
}
if (template === undefined) {
- template = __webpack_require__(533);
+ template = __webpack_require__(534);
}
return template(chalk, parts.join(''));
@@ -59634,7 +59893,7 @@ module.exports = chalk;
/***/ }),
-/* 532 */
+/* 533 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -59680,7 +59939,7 @@ module.exports = {
/***/ }),
-/* 533 */
+/* 534 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -59821,12 +60080,12 @@ module.exports = (chalk, temporary) => {
/***/ }),
-/* 534 */
+/* 535 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const restoreCursor = __webpack_require__(535);
+const restoreCursor = __webpack_require__(536);
let isHidden = false;
@@ -59863,7 +60122,7 @@ exports.toggle = (force, writableStream) => {
/***/ }),
-/* 535 */
+/* 536 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -59879,13 +60138,13 @@ module.exports = onetime(() => {
/***/ }),
-/* 536 */
+/* 537 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const spinners = Object.assign({}, __webpack_require__(537));
+const spinners = Object.assign({}, __webpack_require__(538));
const spinnersList = Object.keys(spinners);
@@ -59903,18 +60162,18 @@ module.exports.default = spinners;
/***/ }),
-/* 537 */
+/* 538 */
/***/ (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\":[\"⢀⠀\",\"⡀⠀\",\"⠄⠀\",\"⢂⠀\",\"⡂⠀\",\"⠅⠀\",\"⢃⠀\",\"⡃⠀\",\"⠍⠀\",\"⢋⠀\",\"⡋⠀\",\"⠍⠁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⢈⠩\",\"⡀⢙\",\"⠄⡙\",\"⢂⠩\",\"⡂⢘\",\"⠅⡘\",\"⢃⠨\",\"⡃⢐\",\"⠍⡐\",\"⢋⠠\",\"⡋⢀\",\"⠍⡁\",\"⢋⠁\",\"⡋⠁\",\"⠍⠉\",\"⠋⠉\",\"⠋⠉\",\"⠉⠙\",\"⠉⠙\",\"⠉⠩\",\"⠈⢙\",\"⠈⡙\",\"⠈⠩\",\"⠀⢙\",\"⠀⡙\",\"⠀⠩\",\"⠀⢘\",\"⠀⡘\",\"⠀⠨\",\"⠀⢐\",\"⠀⡐\",\"⠀⠠\",\"⠀⢀\",\"⠀⡀\"]},\"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\":[\"ρββββββ\",\"βρβββββ\",\"ββρββββ\",\"βββρβββ\",\"ββββρββ\",\"βββββρβ\",\"ββββββρ\"]},\"aesthetic\":{\"interval\":80,\"frames\":[\"▰▱▱▱▱▱▱\",\"▰▰▱▱▱▱▱\",\"▰▰▰▱▱▱▱\",\"▰▰▰▰▱▱▱\",\"▰▰▰▰▰▱▱\",\"▰▰▰▰▰▰▱\",\"▰▰▰▰▰▰▰\",\"▰▱▱▱▱▱▱\"]}}");
/***/ }),
-/* 538 */
+/* 539 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const chalk = __webpack_require__(539);
+const chalk = __webpack_require__(540);
const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
@@ -59936,16 +60195,16 @@ module.exports = isSupported ? main : fallbacks;
/***/ }),
-/* 539 */
+/* 540 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const escapeStringRegexp = __webpack_require__(357);
-const ansiStyles = __webpack_require__(540);
-const stdoutColor = __webpack_require__(541).stdout;
+const ansiStyles = __webpack_require__(541);
+const stdoutColor = __webpack_require__(542).stdout;
-const template = __webpack_require__(543);
+const template = __webpack_require__(544);
const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
@@ -60171,7 +60430,7 @@ module.exports.default = module.exports; // For TypeScript
/***/ }),
-/* 540 */
+/* 541 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -60344,13 +60603,13 @@ Object.defineProperty(module, 'exports', {
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(116)(module)))
/***/ }),
-/* 541 */
+/* 542 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const os = __webpack_require__(122);
-const hasFlag = __webpack_require__(542);
+const hasFlag = __webpack_require__(543);
const env = process.env;
@@ -60482,7 +60741,7 @@ module.exports = {
/***/ }),
-/* 542 */
+/* 543 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -60497,7 +60756,7 @@ module.exports = (flag, argv) => {
/***/ }),
-/* 543 */
+/* 544 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -60632,18 +60891,18 @@ module.exports = (chalk, tmp) => {
/***/ }),
-/* 544 */
+/* 545 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const ansiRegex = __webpack_require__(545);
+const ansiRegex = __webpack_require__(546);
module.exports = string => typeof string === 'string' ? string.replace(ansiRegex(), '') : string;
/***/ }),
-/* 545 */
+/* 546 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -60660,14 +60919,14 @@ module.exports = ({onlyFirst = false} = {}) => {
/***/ }),
-/* 546 */
+/* 547 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var defaults = __webpack_require__(547)
-var combining = __webpack_require__(549)
+var defaults = __webpack_require__(548)
+var combining = __webpack_require__(550)
var DEFAULTS = {
nul: 0,
@@ -60766,10 +61025,10 @@ function bisearch(ucs) {
/***/ }),
-/* 547 */
+/* 548 */
/***/ (function(module, exports, __webpack_require__) {
-var clone = __webpack_require__(548);
+var clone = __webpack_require__(549);
module.exports = function(options, defaults) {
options = options || {};
@@ -60784,7 +61043,7 @@ module.exports = function(options, defaults) {
};
/***/ }),
-/* 548 */
+/* 549 */
/***/ (function(module, exports, __webpack_require__) {
var clone = (function() {
@@ -60956,7 +61215,7 @@ if ( true && module.exports) {
/***/ }),
-/* 549 */
+/* 550 */
/***/ (function(module, exports) {
module.exports = [
@@ -61012,7 +61271,7 @@ module.exports = [
/***/ }),
-/* 550 */
+/* 551 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -61028,7 +61287,7 @@ module.exports = ({stream = process.stdout} = {}) => {
/***/ }),
-/* 551 */
+/* 552 */
/***/ (function(module, exports, __webpack_require__) {
var Stream = __webpack_require__(173)
@@ -61179,7 +61438,7 @@ MuteStream.prototype.close = proxy('close')
/***/ }),
-/* 552 */
+/* 553 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61189,7 +61448,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(240);
/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(del__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(529);
+/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(530);
/* harmony import */ var ora__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(ora__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
@@ -61221,7 +61480,8 @@ const ResetCommand = {
async run(projects) {
_utils_log__WEBPACK_IMPORTED_MODULE_6__["log"].warning(dedent__WEBPACK_IMPORTED_MODULE_0___default.a`
In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
- problems arise. If you need to use this command, please let us know, as it should not be necessary.
+ problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
+ If you think you need to use this command very often (which is not normal), please let us know.
`);
const toDelete = [];
@@ -61302,7 +61562,7 @@ const ResetCommand = {
};
/***/ }),
-/* 553 */
+/* 554 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61312,7 +61572,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var dedent__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(dedent__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(341);
/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(220);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(554);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(555);
/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(340);
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
@@ -61371,7 +61631,7 @@ const RunCommand = {
};
/***/ }),
-/* 554 */
+/* 555 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61426,7 +61686,7 @@ async function parallelize(items, fn, concurrency = 4) {
}
/***/ }),
-/* 555 */
+/* 556 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61463,7 +61723,7 @@ const WatchCommand = {
};
/***/ }),
-/* 556 */
+/* 557 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61475,7 +61735,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(220);
/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(340);
/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(420);
-/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(557);
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(558);
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; }
@@ -61594,7 +61854,7 @@ function toArray(value) {
}
/***/ }),
-/* 557 */
+/* 558 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61604,13 +61864,13 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(132);
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(558);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(559);
/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(333);
/* harmony import */ var is_path_inside__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(is_path_inside__WEBPACK_IMPORTED_MODULE_3__);
/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(408);
/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(340);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(561);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(562);
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; }
@@ -61774,15 +62034,15 @@ class Kibana {
}
/***/ }),
-/* 558 */
+/* 559 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const minimatch = __webpack_require__(247);
const arrayUnion = __webpack_require__(242);
-const arrayDiffer = __webpack_require__(559);
-const arrify = __webpack_require__(560);
+const arrayDiffer = __webpack_require__(560);
+const arrify = __webpack_require__(561);
module.exports = (list, patterns, options = {}) => {
list = arrify(list);
@@ -61806,7 +62066,7 @@ module.exports = (list, patterns, options = {}) => {
/***/ }),
-/* 559 */
+/* 560 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -61821,7 +62081,7 @@ module.exports = arrayDiffer;
/***/ }),
-/* 560 */
+/* 561 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -61851,7 +62111,7 @@ module.exports = arrify;
/***/ }),
-/* 561 */
+/* 562 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -61911,15 +62171,15 @@ function getProjectPaths({
}
/***/ }),
-/* 562 */
+/* 563 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(563);
+/* harmony import */ var _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(564);
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return _build_bazel_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildBazelProductionProjects"]; });
-/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(804);
+/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(805);
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_1__["buildNonBazelProductionProjects"]; });
/*
@@ -61933,19 +62193,19 @@ __webpack_require__.r(__webpack_exports__);
/***/ }),
-/* 563 */
+/* 564 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildBazelProductionProjects", function() { return buildBazelProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(564);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(565);
/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(776);
+/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(777);
/* harmony import */ var globby__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(globby__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 _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(804);
+/* harmony import */ var _build_non_bazel_production_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(805);
/* harmony import */ var _utils_bazel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(421);
/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(231);
/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(220);
@@ -62040,7 +62300,7 @@ async function applyCorrectPermissions(project, kibanaRoot, buildRoot) {
}
/***/ }),
-/* 564 */
+/* 565 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -62048,14 +62308,14 @@ async function applyCorrectPermissions(project, kibanaRoot, buildRoot) {
const EventEmitter = __webpack_require__(164);
const path = __webpack_require__(4);
const os = __webpack_require__(122);
-const pMap = __webpack_require__(565);
-const arrify = __webpack_require__(560);
-const globby = __webpack_require__(568);
-const hasGlob = __webpack_require__(760);
-const cpFile = __webpack_require__(762);
-const junk = __webpack_require__(772);
-const pFilter = __webpack_require__(773);
-const CpyError = __webpack_require__(775);
+const pMap = __webpack_require__(566);
+const arrify = __webpack_require__(561);
+const globby = __webpack_require__(569);
+const hasGlob = __webpack_require__(761);
+const cpFile = __webpack_require__(763);
+const junk = __webpack_require__(773);
+const pFilter = __webpack_require__(774);
+const CpyError = __webpack_require__(776);
const defaultOptions = {
ignoreJunk: true
@@ -62206,12 +62466,12 @@ module.exports = (source, destination, {
/***/ }),
-/* 565 */
+/* 566 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const AggregateError = __webpack_require__(566);
+const AggregateError = __webpack_require__(567);
module.exports = async (
iterable,
@@ -62294,12 +62554,12 @@ module.exports = async (
/***/ }),
-/* 566 */
+/* 567 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const indentString = __webpack_require__(567);
+const indentString = __webpack_require__(568);
const cleanStack = __webpack_require__(338);
const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
@@ -62348,7 +62608,7 @@ module.exports = AggregateError;
/***/ }),
-/* 567 */
+/* 568 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -62390,17 +62650,17 @@ module.exports = (string, count = 1, options) => {
/***/ }),
-/* 568 */
+/* 569 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const fs = __webpack_require__(132);
-const arrayUnion = __webpack_require__(569);
+const arrayUnion = __webpack_require__(570);
const glob = __webpack_require__(244);
-const fastGlob = __webpack_require__(571);
-const dirGlob = __webpack_require__(754);
-const gitignore = __webpack_require__(757);
+const fastGlob = __webpack_require__(572);
+const dirGlob = __webpack_require__(755);
+const gitignore = __webpack_require__(758);
const DEFAULT_FILTER = () => false;
@@ -62545,12 +62805,12 @@ module.exports.gitignore = gitignore;
/***/ }),
-/* 569 */
+/* 570 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var arrayUniq = __webpack_require__(570);
+var arrayUniq = __webpack_require__(571);
module.exports = function () {
return arrayUniq([].concat.apply([], arguments));
@@ -62558,7 +62818,7 @@ module.exports = function () {
/***/ }),
-/* 570 */
+/* 571 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -62627,10 +62887,10 @@ if ('Set' in global) {
/***/ }),
-/* 571 */
+/* 572 */
/***/ (function(module, exports, __webpack_require__) {
-const pkg = __webpack_require__(572);
+const pkg = __webpack_require__(573);
module.exports = pkg.async;
module.exports.default = pkg.async;
@@ -62643,19 +62903,19 @@ module.exports.generateTasks = pkg.generateTasks;
/***/ }),
-/* 572 */
+/* 573 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(573);
-var taskManager = __webpack_require__(574);
-var reader_async_1 = __webpack_require__(725);
-var reader_stream_1 = __webpack_require__(749);
-var reader_sync_1 = __webpack_require__(750);
-var arrayUtils = __webpack_require__(752);
-var streamUtils = __webpack_require__(753);
+var optionsManager = __webpack_require__(574);
+var taskManager = __webpack_require__(575);
+var reader_async_1 = __webpack_require__(726);
+var reader_stream_1 = __webpack_require__(750);
+var reader_sync_1 = __webpack_require__(751);
+var arrayUtils = __webpack_require__(753);
+var streamUtils = __webpack_require__(754);
/**
* Synchronous API.
*/
@@ -62721,7 +62981,7 @@ function isString(source) {
/***/ }),
-/* 573 */
+/* 574 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -62759,13 +63019,13 @@ exports.prepare = prepare;
/***/ }),
-/* 574 */
+/* 575 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(575);
+var patternUtils = __webpack_require__(576);
/**
* Generate tasks based on parent directory of each pattern.
*/
@@ -62856,16 +63116,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
/***/ }),
-/* 575 */
+/* 576 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var path = __webpack_require__(4);
-var globParent = __webpack_require__(576);
+var globParent = __webpack_require__(577);
var isGlob = __webpack_require__(266);
-var micromatch = __webpack_require__(579);
+var micromatch = __webpack_require__(580);
var GLOBSTAR = '**';
/**
* Return true for static pattern.
@@ -63011,15 +63271,15 @@ exports.matchAny = matchAny;
/***/ }),
-/* 576 */
+/* 577 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var path = __webpack_require__(4);
-var isglob = __webpack_require__(577);
-var pathDirname = __webpack_require__(578);
+var isglob = __webpack_require__(578);
+var pathDirname = __webpack_require__(579);
var isWin32 = __webpack_require__(122).platform() === 'win32';
module.exports = function globParent(str) {
@@ -63042,7 +63302,7 @@ module.exports = function globParent(str) {
/***/ }),
-/* 577 */
+/* 578 */
/***/ (function(module, exports, __webpack_require__) {
/*!
@@ -63073,7 +63333,7 @@ module.exports = function isGlob(str) {
/***/ }),
-/* 578 */
+/* 579 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -63223,7 +63483,7 @@ module.exports.win32 = win32;
/***/ }),
-/* 579 */
+/* 580 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -63234,18 +63494,18 @@ module.exports.win32 = win32;
*/
var util = __webpack_require__(113);
-var braces = __webpack_require__(580);
-var toRegex = __webpack_require__(581);
-var extend = __webpack_require__(693);
+var braces = __webpack_require__(581);
+var toRegex = __webpack_require__(582);
+var extend = __webpack_require__(694);
/**
* Local dependencies
*/
-var compilers = __webpack_require__(695);
-var parsers = __webpack_require__(721);
-var cache = __webpack_require__(722);
-var utils = __webpack_require__(723);
+var compilers = __webpack_require__(696);
+var parsers = __webpack_require__(722);
+var cache = __webpack_require__(723);
+var utils = __webpack_require__(724);
var MAX_LENGTH = 1024 * 64;
/**
@@ -64107,7 +64367,7 @@ module.exports = micromatch;
/***/ }),
-/* 580 */
+/* 581 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -64117,18 +64377,18 @@ module.exports = micromatch;
* Module dependencies
*/
-var toRegex = __webpack_require__(581);
-var unique = __webpack_require__(601);
-var extend = __webpack_require__(602);
+var toRegex = __webpack_require__(582);
+var unique = __webpack_require__(602);
+var extend = __webpack_require__(603);
/**
* Local dependencies
*/
-var compilers = __webpack_require__(604);
-var parsers = __webpack_require__(619);
-var Braces = __webpack_require__(624);
-var utils = __webpack_require__(605);
+var compilers = __webpack_require__(605);
+var parsers = __webpack_require__(620);
+var Braces = __webpack_require__(625);
+var utils = __webpack_require__(606);
var MAX_LENGTH = 1024 * 64;
var cache = {};
@@ -64432,16 +64692,16 @@ module.exports = braces;
/***/ }),
-/* 581 */
+/* 582 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var safe = __webpack_require__(582);
-var define = __webpack_require__(588);
-var extend = __webpack_require__(594);
-var not = __webpack_require__(598);
+var safe = __webpack_require__(583);
+var define = __webpack_require__(589);
+var extend = __webpack_require__(595);
+var not = __webpack_require__(599);
var MAX_LENGTH = 1024 * 64;
/**
@@ -64594,10 +64854,10 @@ module.exports.makeRe = makeRe;
/***/ }),
-/* 582 */
+/* 583 */
/***/ (function(module, exports, __webpack_require__) {
-var parse = __webpack_require__(583);
+var parse = __webpack_require__(584);
var types = parse.types;
module.exports = function (re, opts) {
@@ -64643,13 +64903,13 @@ function isRegExp (x) {
/***/ }),
-/* 583 */
+/* 584 */
/***/ (function(module, exports, __webpack_require__) {
-var util = __webpack_require__(584);
-var types = __webpack_require__(585);
-var sets = __webpack_require__(586);
-var positions = __webpack_require__(587);
+var util = __webpack_require__(585);
+var types = __webpack_require__(586);
+var sets = __webpack_require__(587);
+var positions = __webpack_require__(588);
module.exports = function(regexpStr) {
@@ -64931,11 +65191,11 @@ module.exports.types = types;
/***/ }),
-/* 584 */
+/* 585 */
/***/ (function(module, exports, __webpack_require__) {
-var types = __webpack_require__(585);
-var sets = __webpack_require__(586);
+var types = __webpack_require__(586);
+var sets = __webpack_require__(587);
// All of these are private and only used by randexp.
@@ -65048,7 +65308,7 @@ exports.error = function(regexp, msg) {
/***/ }),
-/* 585 */
+/* 586 */
/***/ (function(module, exports) {
module.exports = {
@@ -65064,10 +65324,10 @@ module.exports = {
/***/ }),
-/* 586 */
+/* 587 */
/***/ (function(module, exports, __webpack_require__) {
-var types = __webpack_require__(585);
+var types = __webpack_require__(586);
var INTS = function() {
return [{ type: types.RANGE , from: 48, to: 57 }];
@@ -65152,10 +65412,10 @@ exports.anyChar = function() {
/***/ }),
-/* 587 */
+/* 588 */
/***/ (function(module, exports, __webpack_require__) {
-var types = __webpack_require__(585);
+var types = __webpack_require__(586);
exports.wordBoundary = function() {
return { type: types.POSITION, value: 'b' };
@@ -65175,7 +65435,7 @@ exports.end = function() {
/***/ }),
-/* 588 */
+/* 589 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65188,8 +65448,8 @@ exports.end = function() {
-var isobject = __webpack_require__(589);
-var isDescriptor = __webpack_require__(590);
+var isobject = __webpack_require__(590);
+var isDescriptor = __webpack_require__(591);
var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
? Reflect.defineProperty
: Object.defineProperty;
@@ -65220,7 +65480,7 @@ module.exports = function defineProperty(obj, key, val) {
/***/ }),
-/* 589 */
+/* 590 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65239,7 +65499,7 @@ module.exports = function isObject(val) {
/***/ }),
-/* 590 */
+/* 591 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65252,9 +65512,9 @@ module.exports = function isObject(val) {
-var typeOf = __webpack_require__(591);
-var isAccessor = __webpack_require__(592);
-var isData = __webpack_require__(593);
+var typeOf = __webpack_require__(592);
+var isAccessor = __webpack_require__(593);
+var isData = __webpack_require__(594);
module.exports = function isDescriptor(obj, key) {
if (typeOf(obj) !== 'object') {
@@ -65268,7 +65528,7 @@ module.exports = function isDescriptor(obj, key) {
/***/ }),
-/* 591 */
+/* 592 */
/***/ (function(module, exports) {
var toString = Object.prototype.toString;
@@ -65403,7 +65663,7 @@ function isBuffer(val) {
/***/ }),
-/* 592 */
+/* 593 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65416,7 +65676,7 @@ function isBuffer(val) {
-var typeOf = __webpack_require__(591);
+var typeOf = __webpack_require__(592);
// accessor descriptor properties
var accessor = {
@@ -65479,7 +65739,7 @@ module.exports = isAccessorDescriptor;
/***/ }),
-/* 593 */
+/* 594 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65492,7 +65752,7 @@ module.exports = isAccessorDescriptor;
-var typeOf = __webpack_require__(591);
+var typeOf = __webpack_require__(592);
module.exports = function isDataDescriptor(obj, prop) {
// data descriptor properties
@@ -65535,14 +65795,14 @@ module.exports = function isDataDescriptor(obj, prop) {
/***/ }),
-/* 594 */
+/* 595 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isExtendable = __webpack_require__(595);
-var assignSymbols = __webpack_require__(597);
+var isExtendable = __webpack_require__(596);
+var assignSymbols = __webpack_require__(598);
module.exports = Object.assign || function(obj/*, objects*/) {
if (obj === null || typeof obj === 'undefined') {
@@ -65602,7 +65862,7 @@ function isEnum(obj, key) {
/***/ }),
-/* 595 */
+/* 596 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65615,7 +65875,7 @@ function isEnum(obj, key) {
-var isPlainObject = __webpack_require__(596);
+var isPlainObject = __webpack_require__(597);
module.exports = function isExtendable(val) {
return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -65623,7 +65883,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 596 */
+/* 597 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65636,7 +65896,7 @@ module.exports = function isExtendable(val) {
-var isObject = __webpack_require__(589);
+var isObject = __webpack_require__(590);
function isObjectObject(o) {
return isObject(o) === true
@@ -65667,7 +65927,7 @@ module.exports = function isPlainObject(o) {
/***/ }),
-/* 597 */
+/* 598 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65714,14 +65974,14 @@ module.exports = function(receiver, objects) {
/***/ }),
-/* 598 */
+/* 599 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var extend = __webpack_require__(599);
-var safe = __webpack_require__(582);
+var extend = __webpack_require__(600);
+var safe = __webpack_require__(583);
/**
* The main export is a function that takes a `pattern` string and an `options` object.
@@ -65793,14 +66053,14 @@ module.exports = toRegex;
/***/ }),
-/* 599 */
+/* 600 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isExtendable = __webpack_require__(600);
-var assignSymbols = __webpack_require__(597);
+var isExtendable = __webpack_require__(601);
+var assignSymbols = __webpack_require__(598);
module.exports = Object.assign || function(obj/*, objects*/) {
if (obj === null || typeof obj === 'undefined') {
@@ -65860,7 +66120,7 @@ function isEnum(obj, key) {
/***/ }),
-/* 600 */
+/* 601 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65873,7 +66133,7 @@ function isEnum(obj, key) {
-var isPlainObject = __webpack_require__(596);
+var isPlainObject = __webpack_require__(597);
module.exports = function isExtendable(val) {
return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -65881,7 +66141,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 601 */
+/* 602 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65931,13 +66191,13 @@ module.exports.immutable = function uniqueImmutable(arr) {
/***/ }),
-/* 602 */
+/* 603 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isObject = __webpack_require__(603);
+var isObject = __webpack_require__(604);
module.exports = function extend(o/*, objects*/) {
if (!isObject(o)) { o = {}; }
@@ -65971,7 +66231,7 @@ function hasOwn(obj, key) {
/***/ }),
-/* 603 */
+/* 604 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -65991,13 +66251,13 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 604 */
+/* 605 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var utils = __webpack_require__(605);
+var utils = __webpack_require__(606);
module.exports = function(braces, options) {
braces.compiler
@@ -66280,25 +66540,25 @@ function hasQueue(node) {
/***/ }),
-/* 605 */
+/* 606 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var splitString = __webpack_require__(606);
+var splitString = __webpack_require__(607);
var utils = module.exports;
/**
* Module dependencies
*/
-utils.extend = __webpack_require__(602);
-utils.flatten = __webpack_require__(609);
-utils.isObject = __webpack_require__(589);
-utils.fillRange = __webpack_require__(610);
-utils.repeat = __webpack_require__(618);
-utils.unique = __webpack_require__(601);
+utils.extend = __webpack_require__(603);
+utils.flatten = __webpack_require__(610);
+utils.isObject = __webpack_require__(590);
+utils.fillRange = __webpack_require__(611);
+utils.repeat = __webpack_require__(619);
+utils.unique = __webpack_require__(602);
utils.define = function(obj, key, val) {
Object.defineProperty(obj, key, {
@@ -66630,7 +66890,7 @@ utils.escapeRegex = function(str) {
/***/ }),
-/* 606 */
+/* 607 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -66643,7 +66903,7 @@ utils.escapeRegex = function(str) {
-var extend = __webpack_require__(607);
+var extend = __webpack_require__(608);
module.exports = function(str, options, fn) {
if (typeof str !== 'string') {
@@ -66808,14 +67068,14 @@ function keepEscaping(opts, str, idx) {
/***/ }),
-/* 607 */
+/* 608 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isExtendable = __webpack_require__(608);
-var assignSymbols = __webpack_require__(597);
+var isExtendable = __webpack_require__(609);
+var assignSymbols = __webpack_require__(598);
module.exports = Object.assign || function(obj/*, objects*/) {
if (obj === null || typeof obj === 'undefined') {
@@ -66875,7 +67135,7 @@ function isEnum(obj, key) {
/***/ }),
-/* 608 */
+/* 609 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -66888,7 +67148,7 @@ function isEnum(obj, key) {
-var isPlainObject = __webpack_require__(596);
+var isPlainObject = __webpack_require__(597);
module.exports = function isExtendable(val) {
return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -66896,7 +67156,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 609 */
+/* 610 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -66925,7 +67185,7 @@ function flat(arr, res) {
/***/ }),
-/* 610 */
+/* 611 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -66939,10 +67199,10 @@ function flat(arr, res) {
var util = __webpack_require__(113);
-var isNumber = __webpack_require__(611);
-var extend = __webpack_require__(614);
-var repeat = __webpack_require__(616);
-var toRegex = __webpack_require__(617);
+var isNumber = __webpack_require__(612);
+var extend = __webpack_require__(615);
+var repeat = __webpack_require__(617);
+var toRegex = __webpack_require__(618);
/**
* Return a range of numbers or letters.
@@ -67140,7 +67400,7 @@ module.exports = fillRange;
/***/ }),
-/* 611 */
+/* 612 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -67153,7 +67413,7 @@ module.exports = fillRange;
-var typeOf = __webpack_require__(612);
+var typeOf = __webpack_require__(613);
module.exports = function isNumber(num) {
var type = typeOf(num);
@@ -67169,10 +67429,10 @@ module.exports = function isNumber(num) {
/***/ }),
-/* 612 */
+/* 613 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -67291,7 +67551,7 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 613 */
+/* 614 */
/***/ (function(module, exports) {
/*!
@@ -67318,13 +67578,13 @@ function isSlowBuffer (obj) {
/***/ }),
-/* 614 */
+/* 615 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isObject = __webpack_require__(615);
+var isObject = __webpack_require__(616);
module.exports = function extend(o/*, objects*/) {
if (!isObject(o)) { o = {}; }
@@ -67358,7 +67618,7 @@ function hasOwn(obj, key) {
/***/ }),
-/* 615 */
+/* 616 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -67378,7 +67638,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 616 */
+/* 617 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -67455,7 +67715,7 @@ function repeat(str, num) {
/***/ }),
-/* 617 */
+/* 618 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -67468,8 +67728,8 @@ function repeat(str, num) {
-var repeat = __webpack_require__(616);
-var isNumber = __webpack_require__(611);
+var repeat = __webpack_require__(617);
+var isNumber = __webpack_require__(612);
var cache = {};
function toRegexRange(min, max, options) {
@@ -67756,7 +68016,7 @@ module.exports = toRegexRange;
/***/ }),
-/* 618 */
+/* 619 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -67781,14 +68041,14 @@ module.exports = function repeat(ele, num) {
/***/ }),
-/* 619 */
+/* 620 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var Node = __webpack_require__(620);
-var utils = __webpack_require__(605);
+var Node = __webpack_require__(621);
+var utils = __webpack_require__(606);
/**
* Braces parsers
@@ -68148,15 +68408,15 @@ function concatNodes(pos, node, parent, options) {
/***/ }),
-/* 620 */
+/* 621 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isObject = __webpack_require__(589);
-var define = __webpack_require__(621);
-var utils = __webpack_require__(622);
+var isObject = __webpack_require__(590);
+var define = __webpack_require__(622);
+var utils = __webpack_require__(623);
var ownNames;
/**
@@ -68647,7 +68907,7 @@ exports = module.exports = Node;
/***/ }),
-/* 621 */
+/* 622 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -68660,7 +68920,7 @@ exports = module.exports = Node;
-var isDescriptor = __webpack_require__(590);
+var isDescriptor = __webpack_require__(591);
module.exports = function defineProperty(obj, prop, val) {
if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -68685,13 +68945,13 @@ module.exports = function defineProperty(obj, prop, val) {
/***/ }),
-/* 622 */
+/* 623 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var typeOf = __webpack_require__(623);
+var typeOf = __webpack_require__(624);
var utils = module.exports;
/**
@@ -69711,10 +69971,10 @@ function assert(val, message) {
/***/ }),
-/* 623 */
+/* 624 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -69833,17 +70093,17 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 624 */
+/* 625 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var extend = __webpack_require__(602);
-var Snapdragon = __webpack_require__(625);
-var compilers = __webpack_require__(604);
-var parsers = __webpack_require__(619);
-var utils = __webpack_require__(605);
+var extend = __webpack_require__(603);
+var Snapdragon = __webpack_require__(626);
+var compilers = __webpack_require__(605);
+var parsers = __webpack_require__(620);
+var utils = __webpack_require__(606);
/**
* Customize Snapdragon parser and renderer
@@ -69944,17 +70204,17 @@ module.exports = Braces;
/***/ }),
-/* 625 */
+/* 626 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var Base = __webpack_require__(626);
-var define = __webpack_require__(656);
-var Compiler = __webpack_require__(667);
-var Parser = __webpack_require__(690);
-var utils = __webpack_require__(670);
+var Base = __webpack_require__(627);
+var define = __webpack_require__(657);
+var Compiler = __webpack_require__(668);
+var Parser = __webpack_require__(691);
+var utils = __webpack_require__(671);
var regexCache = {};
var cache = {};
@@ -70125,20 +70385,20 @@ module.exports.Parser = Parser;
/***/ }),
-/* 626 */
+/* 627 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var util = __webpack_require__(113);
-var define = __webpack_require__(627);
-var CacheBase = __webpack_require__(628);
-var Emitter = __webpack_require__(629);
-var isObject = __webpack_require__(589);
-var merge = __webpack_require__(650);
-var pascal = __webpack_require__(653);
-var cu = __webpack_require__(654);
+var define = __webpack_require__(628);
+var CacheBase = __webpack_require__(629);
+var Emitter = __webpack_require__(630);
+var isObject = __webpack_require__(590);
+var merge = __webpack_require__(651);
+var pascal = __webpack_require__(654);
+var cu = __webpack_require__(655);
/**
* Optionally define a custom `cache` namespace to use.
@@ -70567,7 +70827,7 @@ module.exports.namespace = namespace;
/***/ }),
-/* 627 */
+/* 628 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -70580,7 +70840,7 @@ module.exports.namespace = namespace;
-var isDescriptor = __webpack_require__(590);
+var isDescriptor = __webpack_require__(591);
module.exports = function defineProperty(obj, prop, val) {
if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -70605,21 +70865,21 @@ module.exports = function defineProperty(obj, prop, val) {
/***/ }),
-/* 628 */
+/* 629 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isObject = __webpack_require__(589);
-var Emitter = __webpack_require__(629);
-var visit = __webpack_require__(630);
-var toPath = __webpack_require__(633);
-var union = __webpack_require__(635);
-var del = __webpack_require__(641);
-var get = __webpack_require__(638);
-var has = __webpack_require__(646);
-var set = __webpack_require__(649);
+var isObject = __webpack_require__(590);
+var Emitter = __webpack_require__(630);
+var visit = __webpack_require__(631);
+var toPath = __webpack_require__(634);
+var union = __webpack_require__(636);
+var del = __webpack_require__(642);
+var get = __webpack_require__(639);
+var has = __webpack_require__(647);
+var set = __webpack_require__(650);
/**
* Create a `Cache` constructor that when instantiated will
@@ -70873,7 +71133,7 @@ module.exports.namespace = namespace;
/***/ }),
-/* 629 */
+/* 630 */
/***/ (function(module, exports, __webpack_require__) {
@@ -71042,7 +71302,7 @@ Emitter.prototype.hasListeners = function(event){
/***/ }),
-/* 630 */
+/* 631 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71055,8 +71315,8 @@ Emitter.prototype.hasListeners = function(event){
-var visit = __webpack_require__(631);
-var mapVisit = __webpack_require__(632);
+var visit = __webpack_require__(632);
+var mapVisit = __webpack_require__(633);
module.exports = function(collection, method, val) {
var result;
@@ -71079,7 +71339,7 @@ module.exports = function(collection, method, val) {
/***/ }),
-/* 631 */
+/* 632 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71092,7 +71352,7 @@ module.exports = function(collection, method, val) {
-var isObject = __webpack_require__(589);
+var isObject = __webpack_require__(590);
module.exports = function visit(thisArg, method, target, val) {
if (!isObject(thisArg) && typeof thisArg !== 'function') {
@@ -71119,14 +71379,14 @@ module.exports = function visit(thisArg, method, target, val) {
/***/ }),
-/* 632 */
+/* 633 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var util = __webpack_require__(113);
-var visit = __webpack_require__(631);
+var visit = __webpack_require__(632);
/**
* Map `visit` over an array of objects.
@@ -71163,7 +71423,7 @@ function isObject(val) {
/***/ }),
-/* 633 */
+/* 634 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71176,7 +71436,7 @@ function isObject(val) {
-var typeOf = __webpack_require__(634);
+var typeOf = __webpack_require__(635);
module.exports = function toPath(args) {
if (typeOf(args) !== 'arguments') {
@@ -71203,10 +71463,10 @@ function filter(arr) {
/***/ }),
-/* 634 */
+/* 635 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -71325,16 +71585,16 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 635 */
+/* 636 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isObject = __webpack_require__(636);
-var union = __webpack_require__(637);
-var get = __webpack_require__(638);
-var set = __webpack_require__(639);
+var isObject = __webpack_require__(637);
+var union = __webpack_require__(638);
+var get = __webpack_require__(639);
+var set = __webpack_require__(640);
module.exports = function unionValue(obj, prop, value) {
if (!isObject(obj)) {
@@ -71362,7 +71622,7 @@ function arrayify(val) {
/***/ }),
-/* 636 */
+/* 637 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71382,7 +71642,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 637 */
+/* 638 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71418,7 +71678,7 @@ module.exports = function union(init) {
/***/ }),
-/* 638 */
+/* 639 */
/***/ (function(module, exports) {
/*!
@@ -71474,7 +71734,7 @@ function toString(val) {
/***/ }),
-/* 639 */
+/* 640 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71487,10 +71747,10 @@ function toString(val) {
-var split = __webpack_require__(606);
-var extend = __webpack_require__(640);
-var isPlainObject = __webpack_require__(596);
-var isObject = __webpack_require__(636);
+var split = __webpack_require__(607);
+var extend = __webpack_require__(641);
+var isPlainObject = __webpack_require__(597);
+var isObject = __webpack_require__(637);
module.exports = function(obj, prop, val) {
if (!isObject(obj)) {
@@ -71536,13 +71796,13 @@ function isValidKey(key) {
/***/ }),
-/* 640 */
+/* 641 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isObject = __webpack_require__(636);
+var isObject = __webpack_require__(637);
module.exports = function extend(o/*, objects*/) {
if (!isObject(o)) { o = {}; }
@@ -71576,7 +71836,7 @@ function hasOwn(obj, key) {
/***/ }),
-/* 641 */
+/* 642 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71589,8 +71849,8 @@ function hasOwn(obj, key) {
-var isObject = __webpack_require__(589);
-var has = __webpack_require__(642);
+var isObject = __webpack_require__(590);
+var has = __webpack_require__(643);
module.exports = function unset(obj, prop) {
if (!isObject(obj)) {
@@ -71615,7 +71875,7 @@ module.exports = function unset(obj, prop) {
/***/ }),
-/* 642 */
+/* 643 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71628,9 +71888,9 @@ module.exports = function unset(obj, prop) {
-var isObject = __webpack_require__(643);
-var hasValues = __webpack_require__(645);
-var get = __webpack_require__(638);
+var isObject = __webpack_require__(644);
+var hasValues = __webpack_require__(646);
+var get = __webpack_require__(639);
module.exports = function(obj, prop, noZero) {
if (isObject(obj)) {
@@ -71641,7 +71901,7 @@ module.exports = function(obj, prop, noZero) {
/***/ }),
-/* 643 */
+/* 644 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71654,7 +71914,7 @@ module.exports = function(obj, prop, noZero) {
-var isArray = __webpack_require__(644);
+var isArray = __webpack_require__(645);
module.exports = function isObject(val) {
return val != null && typeof val === 'object' && isArray(val) === false;
@@ -71662,7 +71922,7 @@ module.exports = function isObject(val) {
/***/ }),
-/* 644 */
+/* 645 */
/***/ (function(module, exports) {
var toString = {}.toString;
@@ -71673,7 +71933,7 @@ module.exports = Array.isArray || function (arr) {
/***/ }),
-/* 645 */
+/* 646 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71716,7 +71976,7 @@ module.exports = function hasValue(o, noZero) {
/***/ }),
-/* 646 */
+/* 647 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71729,9 +71989,9 @@ module.exports = function hasValue(o, noZero) {
-var isObject = __webpack_require__(589);
-var hasValues = __webpack_require__(647);
-var get = __webpack_require__(638);
+var isObject = __webpack_require__(590);
+var hasValues = __webpack_require__(648);
+var get = __webpack_require__(639);
module.exports = function(val, prop) {
return hasValues(isObject(val) && prop ? get(val, prop) : val);
@@ -71739,7 +71999,7 @@ module.exports = function(val, prop) {
/***/ }),
-/* 647 */
+/* 648 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71752,8 +72012,8 @@ module.exports = function(val, prop) {
-var typeOf = __webpack_require__(648);
-var isNumber = __webpack_require__(611);
+var typeOf = __webpack_require__(649);
+var isNumber = __webpack_require__(612);
module.exports = function hasValue(val) {
// is-number checks for NaN and other edge cases
@@ -71806,10 +72066,10 @@ module.exports = function hasValue(val) {
/***/ }),
-/* 648 */
+/* 649 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -71931,7 +72191,7 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 649 */
+/* 650 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -71944,10 +72204,10 @@ module.exports = function kindOf(val) {
-var split = __webpack_require__(606);
-var extend = __webpack_require__(640);
-var isPlainObject = __webpack_require__(596);
-var isObject = __webpack_require__(636);
+var split = __webpack_require__(607);
+var extend = __webpack_require__(641);
+var isPlainObject = __webpack_require__(597);
+var isObject = __webpack_require__(637);
module.exports = function(obj, prop, val) {
if (!isObject(obj)) {
@@ -71993,14 +72253,14 @@ function isValidKey(key) {
/***/ }),
-/* 650 */
+/* 651 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isExtendable = __webpack_require__(651);
-var forIn = __webpack_require__(652);
+var isExtendable = __webpack_require__(652);
+var forIn = __webpack_require__(653);
function mixinDeep(target, objects) {
var len = arguments.length, i = 0;
@@ -72064,7 +72324,7 @@ module.exports = mixinDeep;
/***/ }),
-/* 651 */
+/* 652 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72077,7 +72337,7 @@ module.exports = mixinDeep;
-var isPlainObject = __webpack_require__(596);
+var isPlainObject = __webpack_require__(597);
module.exports = function isExtendable(val) {
return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -72085,7 +72345,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 652 */
+/* 653 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72108,7 +72368,7 @@ module.exports = function forIn(obj, fn, thisArg) {
/***/ }),
-/* 653 */
+/* 654 */
/***/ (function(module, exports) {
/*!
@@ -72135,14 +72395,14 @@ module.exports = pascalcase;
/***/ }),
-/* 654 */
+/* 655 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var util = __webpack_require__(113);
-var utils = __webpack_require__(655);
+var utils = __webpack_require__(656);
/**
* Expose class utils
@@ -72507,7 +72767,7 @@ cu.bubble = function(Parent, events) {
/***/ }),
-/* 655 */
+/* 656 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72521,10 +72781,10 @@ var utils = {};
* Lazily required module dependencies
*/
-utils.union = __webpack_require__(637);
-utils.define = __webpack_require__(656);
-utils.isObj = __webpack_require__(589);
-utils.staticExtend = __webpack_require__(663);
+utils.union = __webpack_require__(638);
+utils.define = __webpack_require__(657);
+utils.isObj = __webpack_require__(590);
+utils.staticExtend = __webpack_require__(664);
/**
@@ -72535,7 +72795,7 @@ module.exports = utils;
/***/ }),
-/* 656 */
+/* 657 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72548,7 +72808,7 @@ module.exports = utils;
-var isDescriptor = __webpack_require__(657);
+var isDescriptor = __webpack_require__(658);
module.exports = function defineProperty(obj, prop, val) {
if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -72573,7 +72833,7 @@ module.exports = function defineProperty(obj, prop, val) {
/***/ }),
-/* 657 */
+/* 658 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72586,9 +72846,9 @@ module.exports = function defineProperty(obj, prop, val) {
-var typeOf = __webpack_require__(658);
-var isAccessor = __webpack_require__(659);
-var isData = __webpack_require__(661);
+var typeOf = __webpack_require__(659);
+var isAccessor = __webpack_require__(660);
+var isData = __webpack_require__(662);
module.exports = function isDescriptor(obj, key) {
if (typeOf(obj) !== 'object') {
@@ -72602,7 +72862,7 @@ module.exports = function isDescriptor(obj, key) {
/***/ }),
-/* 658 */
+/* 659 */
/***/ (function(module, exports) {
var toString = Object.prototype.toString;
@@ -72755,7 +73015,7 @@ function isBuffer(val) {
/***/ }),
-/* 659 */
+/* 660 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72768,7 +73028,7 @@ function isBuffer(val) {
-var typeOf = __webpack_require__(660);
+var typeOf = __webpack_require__(661);
// accessor descriptor properties
var accessor = {
@@ -72831,10 +73091,10 @@ module.exports = isAccessorDescriptor;
/***/ }),
-/* 660 */
+/* 661 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -72953,7 +73213,7 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 661 */
+/* 662 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -72966,7 +73226,7 @@ module.exports = function kindOf(val) {
-var typeOf = __webpack_require__(662);
+var typeOf = __webpack_require__(663);
// data descriptor properties
var data = {
@@ -73015,10 +73275,10 @@ module.exports = isDataDescriptor;
/***/ }),
-/* 662 */
+/* 663 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -73137,7 +73397,7 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 663 */
+/* 664 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -73150,8 +73410,8 @@ module.exports = function kindOf(val) {
-var copy = __webpack_require__(664);
-var define = __webpack_require__(656);
+var copy = __webpack_require__(665);
+var define = __webpack_require__(657);
var util = __webpack_require__(113);
/**
@@ -73234,15 +73494,15 @@ module.exports = extend;
/***/ }),
-/* 664 */
+/* 665 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var typeOf = __webpack_require__(665);
-var copyDescriptor = __webpack_require__(666);
-var define = __webpack_require__(656);
+var typeOf = __webpack_require__(666);
+var copyDescriptor = __webpack_require__(667);
+var define = __webpack_require__(657);
/**
* Copy static properties, prototype properties, and descriptors from one object to another.
@@ -73415,10 +73675,10 @@ module.exports.has = has;
/***/ }),
-/* 665 */
+/* 666 */
/***/ (function(module, exports, __webpack_require__) {
-var isBuffer = __webpack_require__(613);
+var isBuffer = __webpack_require__(614);
var toString = Object.prototype.toString;
/**
@@ -73537,7 +73797,7 @@ module.exports = function kindOf(val) {
/***/ }),
-/* 666 */
+/* 667 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -73625,16 +73885,16 @@ function isObject(val) {
/***/ }),
-/* 667 */
+/* 668 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var use = __webpack_require__(668);
-var define = __webpack_require__(656);
+var use = __webpack_require__(669);
+var define = __webpack_require__(657);
var debug = __webpack_require__(205)('snapdragon:compiler');
-var utils = __webpack_require__(670);
+var utils = __webpack_require__(671);
/**
* Create a new `Compiler` with the given `options`.
@@ -73788,7 +74048,7 @@ Compiler.prototype = {
// source map support
if (opts.sourcemap) {
- var sourcemaps = __webpack_require__(689);
+ var sourcemaps = __webpack_require__(690);
sourcemaps(this);
this.mapVisit(this.ast.nodes);
this.applySourceMaps();
@@ -73809,7 +74069,7 @@ module.exports = Compiler;
/***/ }),
-/* 668 */
+/* 669 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -73822,7 +74082,7 @@ module.exports = Compiler;
-var utils = __webpack_require__(669);
+var utils = __webpack_require__(670);
module.exports = function base(app, opts) {
if (!utils.isObject(app) && typeof app !== 'function') {
@@ -73937,7 +74197,7 @@ module.exports = function base(app, opts) {
/***/ }),
-/* 669 */
+/* 670 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -73951,8 +74211,8 @@ var utils = {};
* Lazily required module dependencies
*/
-utils.define = __webpack_require__(656);
-utils.isObject = __webpack_require__(589);
+utils.define = __webpack_require__(657);
+utils.isObject = __webpack_require__(590);
utils.isString = function(val) {
@@ -73967,7 +74227,7 @@ module.exports = utils;
/***/ }),
-/* 670 */
+/* 671 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -73977,9 +74237,9 @@ module.exports = utils;
* Module dependencies
*/
-exports.extend = __webpack_require__(640);
-exports.SourceMap = __webpack_require__(671);
-exports.sourceMapResolve = __webpack_require__(682);
+exports.extend = __webpack_require__(641);
+exports.SourceMap = __webpack_require__(672);
+exports.sourceMapResolve = __webpack_require__(683);
/**
* Convert backslash in the given string to forward slashes
@@ -74022,7 +74282,7 @@ exports.last = function(arr, n) {
/***/ }),
-/* 671 */
+/* 672 */
/***/ (function(module, exports, __webpack_require__) {
/*
@@ -74030,13 +74290,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__(672).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(678).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(681).SourceNode;
+exports.SourceMapGenerator = __webpack_require__(673).SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__(679).SourceMapConsumer;
+exports.SourceNode = __webpack_require__(682).SourceNode;
/***/ }),
-/* 672 */
+/* 673 */
/***/ (function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -74046,10 +74306,10 @@ exports.SourceNode = __webpack_require__(681).SourceNode;
* http://opensource.org/licenses/BSD-3-Clause
*/
-var base64VLQ = __webpack_require__(673);
-var util = __webpack_require__(675);
-var ArraySet = __webpack_require__(676).ArraySet;
-var MappingList = __webpack_require__(677).MappingList;
+var base64VLQ = __webpack_require__(674);
+var util = __webpack_require__(676);
+var ArraySet = __webpack_require__(677).ArraySet;
+var MappingList = __webpack_require__(678).MappingList;
/**
* An instance of the SourceMapGenerator represents a source map which is
@@ -74458,7 +74718,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
/***/ }),
-/* 673 */
+/* 674 */
/***/ (function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -74498,7 +74758,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-var base64 = __webpack_require__(674);
+var base64 = __webpack_require__(675);
// 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,
@@ -74604,7 +74864,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
/***/ }),
-/* 674 */
+/* 675 */
/***/ (function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -74677,7 +74937,7 @@ exports.decode = function (charCode) {
/***/ }),
-/* 675 */
+/* 676 */
/***/ (function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -75100,7 +75360,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
/***/ }),
-/* 676 */
+/* 677 */
/***/ (function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -75110,7 +75370,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
* http://opensource.org/licenses/BSD-3-Clause
*/
-var util = __webpack_require__(675);
+var util = __webpack_require__(676);
var has = Object.prototype.hasOwnProperty;
var hasNativeMap = typeof Map !== "undefined";
@@ -75227,7 +75487,7 @@ exports.ArraySet = ArraySet;
/***/ }),
-/* 677 */
+/* 678 */
/***/ (function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -75237,7 +75497,7 @@ exports.ArraySet = ArraySet;
* http://opensource.org/licenses/BSD-3-Clause
*/
-var util = __webpack_require__(675);
+var util = __webpack_require__(676);
/**
* Determine whether mappingB is after mappingA with respect to generated
@@ -75312,7 +75572,7 @@ exports.MappingList = MappingList;
/***/ }),
-/* 678 */
+/* 679 */
/***/ (function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -75322,11 +75582,11 @@ exports.MappingList = MappingList;
* http://opensource.org/licenses/BSD-3-Clause
*/
-var util = __webpack_require__(675);
-var binarySearch = __webpack_require__(679);
-var ArraySet = __webpack_require__(676).ArraySet;
-var base64VLQ = __webpack_require__(673);
-var quickSort = __webpack_require__(680).quickSort;
+var util = __webpack_require__(676);
+var binarySearch = __webpack_require__(680);
+var ArraySet = __webpack_require__(677).ArraySet;
+var base64VLQ = __webpack_require__(674);
+var quickSort = __webpack_require__(681).quickSort;
function SourceMapConsumer(aSourceMap) {
var sourceMap = aSourceMap;
@@ -76400,7 +76660,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
/***/ }),
-/* 679 */
+/* 680 */
/***/ (function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -76517,7 +76777,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
/***/ }),
-/* 680 */
+/* 681 */
/***/ (function(module, exports) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -76637,7 +76897,7 @@ exports.quickSort = function (ary, comparator) {
/***/ }),
-/* 681 */
+/* 682 */
/***/ (function(module, exports, __webpack_require__) {
/* -*- Mode: js; js-indent-level: 2; -*- */
@@ -76647,8 +76907,8 @@ exports.quickSort = function (ary, comparator) {
* http://opensource.org/licenses/BSD-3-Clause
*/
-var SourceMapGenerator = __webpack_require__(672).SourceMapGenerator;
-var util = __webpack_require__(675);
+var SourceMapGenerator = __webpack_require__(673).SourceMapGenerator;
+var util = __webpack_require__(676);
// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
// operating systems these days (capturing the result).
@@ -77056,17 +77316,17 @@ exports.SourceNode = SourceNode;
/***/ }),
-/* 682 */
+/* 683 */
/***/ (function(module, exports, __webpack_require__) {
// Copyright 2014, 2015, 2016, 2017 Simon Lydell
// X11 (“MIT”) Licensed. (See LICENSE.)
-var sourceMappingURL = __webpack_require__(683)
-var resolveUrl = __webpack_require__(684)
-var decodeUriComponent = __webpack_require__(685)
-var urix = __webpack_require__(687)
-var atob = __webpack_require__(688)
+var sourceMappingURL = __webpack_require__(684)
+var resolveUrl = __webpack_require__(685)
+var decodeUriComponent = __webpack_require__(686)
+var urix = __webpack_require__(688)
+var atob = __webpack_require__(689)
@@ -77364,7 +77624,7 @@ module.exports = {
/***/ }),
-/* 683 */
+/* 684 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
@@ -77427,7 +77687,7 @@ void (function(root, factory) {
/***/ }),
-/* 684 */
+/* 685 */
/***/ (function(module, exports, __webpack_require__) {
// Copyright 2014 Simon Lydell
@@ -77445,13 +77705,13 @@ module.exports = resolveUrl
/***/ }),
-/* 685 */
+/* 686 */
/***/ (function(module, exports, __webpack_require__) {
// Copyright 2017 Simon Lydell
// X11 (“MIT”) Licensed. (See LICENSE.)
-var decodeUriComponent = __webpack_require__(686)
+var decodeUriComponent = __webpack_require__(687)
function customDecodeUriComponent(string) {
// `decodeUriComponent` turns `+` into ` `, but that's not wanted.
@@ -77462,7 +77722,7 @@ module.exports = customDecodeUriComponent
/***/ }),
-/* 686 */
+/* 687 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -77563,7 +77823,7 @@ module.exports = function (encodedURI) {
/***/ }),
-/* 687 */
+/* 688 */
/***/ (function(module, exports, __webpack_require__) {
// Copyright 2014 Simon Lydell
@@ -77586,7 +77846,7 @@ module.exports = urix
/***/ }),
-/* 688 */
+/* 689 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -77600,7 +77860,7 @@ module.exports = atob.atob = atob;
/***/ }),
-/* 689 */
+/* 690 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -77608,8 +77868,8 @@ module.exports = atob.atob = atob;
var fs = __webpack_require__(132);
var path = __webpack_require__(4);
-var define = __webpack_require__(656);
-var utils = __webpack_require__(670);
+var define = __webpack_require__(657);
+var utils = __webpack_require__(671);
/**
* Expose `mixin()`.
@@ -77752,19 +78012,19 @@ exports.comment = function(node) {
/***/ }),
-/* 690 */
+/* 691 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var use = __webpack_require__(668);
+var use = __webpack_require__(669);
var util = __webpack_require__(113);
-var Cache = __webpack_require__(691);
-var define = __webpack_require__(656);
+var Cache = __webpack_require__(692);
+var define = __webpack_require__(657);
var debug = __webpack_require__(205)('snapdragon:parser');
-var Position = __webpack_require__(692);
-var utils = __webpack_require__(670);
+var Position = __webpack_require__(693);
+var utils = __webpack_require__(671);
/**
* Create a new `Parser` with the given `input` and `options`.
@@ -78292,7 +78552,7 @@ module.exports = Parser;
/***/ }),
-/* 691 */
+/* 692 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -78399,13 +78659,13 @@ MapCache.prototype.del = function mapDelete(key) {
/***/ }),
-/* 692 */
+/* 693 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var define = __webpack_require__(656);
+var define = __webpack_require__(657);
/**
* Store position for a node
@@ -78420,14 +78680,14 @@ module.exports = function Position(start, parser) {
/***/ }),
-/* 693 */
+/* 694 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isExtendable = __webpack_require__(694);
-var assignSymbols = __webpack_require__(597);
+var isExtendable = __webpack_require__(695);
+var assignSymbols = __webpack_require__(598);
module.exports = Object.assign || function(obj/*, objects*/) {
if (obj === null || typeof obj === 'undefined') {
@@ -78487,7 +78747,7 @@ function isEnum(obj, key) {
/***/ }),
-/* 694 */
+/* 695 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -78500,7 +78760,7 @@ function isEnum(obj, key) {
-var isPlainObject = __webpack_require__(596);
+var isPlainObject = __webpack_require__(597);
module.exports = function isExtendable(val) {
return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -78508,14 +78768,14 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 695 */
+/* 696 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var nanomatch = __webpack_require__(696);
-var extglob = __webpack_require__(710);
+var nanomatch = __webpack_require__(697);
+var extglob = __webpack_require__(711);
module.exports = function(snapdragon) {
var compilers = snapdragon.compiler.compilers;
@@ -78592,7 +78852,7 @@ function escapeExtglobs(compiler) {
/***/ }),
-/* 696 */
+/* 697 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -78603,17 +78863,17 @@ function escapeExtglobs(compiler) {
*/
var util = __webpack_require__(113);
-var toRegex = __webpack_require__(581);
-var extend = __webpack_require__(697);
+var toRegex = __webpack_require__(582);
+var extend = __webpack_require__(698);
/**
* Local dependencies
*/
-var compilers = __webpack_require__(699);
-var parsers = __webpack_require__(700);
-var cache = __webpack_require__(703);
-var utils = __webpack_require__(705);
+var compilers = __webpack_require__(700);
+var parsers = __webpack_require__(701);
+var cache = __webpack_require__(704);
+var utils = __webpack_require__(706);
var MAX_LENGTH = 1024 * 64;
/**
@@ -79437,14 +79697,14 @@ module.exports = nanomatch;
/***/ }),
-/* 697 */
+/* 698 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var isExtendable = __webpack_require__(698);
-var assignSymbols = __webpack_require__(597);
+var isExtendable = __webpack_require__(699);
+var assignSymbols = __webpack_require__(598);
module.exports = Object.assign || function(obj/*, objects*/) {
if (obj === null || typeof obj === 'undefined') {
@@ -79504,7 +79764,7 @@ function isEnum(obj, key) {
/***/ }),
-/* 698 */
+/* 699 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -79517,7 +79777,7 @@ function isEnum(obj, key) {
-var isPlainObject = __webpack_require__(596);
+var isPlainObject = __webpack_require__(597);
module.exports = function isExtendable(val) {
return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -79525,7 +79785,7 @@ module.exports = function isExtendable(val) {
/***/ }),
-/* 699 */
+/* 700 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -79871,15 +80131,15 @@ module.exports = function(nanomatch, options) {
/***/ }),
-/* 700 */
+/* 701 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var regexNot = __webpack_require__(598);
-var toRegex = __webpack_require__(581);
-var isOdd = __webpack_require__(701);
+var regexNot = __webpack_require__(599);
+var toRegex = __webpack_require__(582);
+var isOdd = __webpack_require__(702);
/**
* Characters to use in negation regex (we want to "not" match
@@ -80265,7 +80525,7 @@ module.exports.not = NOT_REGEX;
/***/ }),
-/* 701 */
+/* 702 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80278,7 +80538,7 @@ module.exports.not = NOT_REGEX;
-var isNumber = __webpack_require__(702);
+var isNumber = __webpack_require__(703);
module.exports = function isOdd(i) {
if (!isNumber(i)) {
@@ -80292,7 +80552,7 @@ module.exports = function isOdd(i) {
/***/ }),
-/* 702 */
+/* 703 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80320,14 +80580,14 @@ module.exports = function isNumber(num) {
/***/ }),
-/* 703 */
+/* 704 */
/***/ (function(module, exports, __webpack_require__) {
-module.exports = new (__webpack_require__(704))();
+module.exports = new (__webpack_require__(705))();
/***/ }),
-/* 704 */
+/* 705 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80340,7 +80600,7 @@ module.exports = new (__webpack_require__(704))();
-var MapCache = __webpack_require__(691);
+var MapCache = __webpack_require__(692);
/**
* Create a new `FragmentCache` with an optional object to use for `caches`.
@@ -80462,7 +80722,7 @@ exports = module.exports = FragmentCache;
/***/ }),
-/* 705 */
+/* 706 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80475,14 +80735,14 @@ var path = __webpack_require__(4);
* Module dependencies
*/
-var isWindows = __webpack_require__(706)();
-var Snapdragon = __webpack_require__(625);
-utils.define = __webpack_require__(707);
-utils.diff = __webpack_require__(708);
-utils.extend = __webpack_require__(697);
-utils.pick = __webpack_require__(709);
-utils.typeOf = __webpack_require__(591);
-utils.unique = __webpack_require__(601);
+var isWindows = __webpack_require__(707)();
+var Snapdragon = __webpack_require__(626);
+utils.define = __webpack_require__(708);
+utils.diff = __webpack_require__(709);
+utils.extend = __webpack_require__(698);
+utils.pick = __webpack_require__(710);
+utils.typeOf = __webpack_require__(592);
+utils.unique = __webpack_require__(602);
/**
* Returns true if the given value is effectively an empty string
@@ -80848,7 +81108,7 @@ utils.unixify = function(options) {
/***/ }),
-/* 706 */
+/* 707 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -80876,7 +81136,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
/***/ }),
-/* 707 */
+/* 708 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80889,8 +81149,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
-var isobject = __webpack_require__(589);
-var isDescriptor = __webpack_require__(590);
+var isobject = __webpack_require__(590);
+var isDescriptor = __webpack_require__(591);
var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
? Reflect.defineProperty
: Object.defineProperty;
@@ -80921,7 +81181,7 @@ module.exports = function defineProperty(obj, key, val) {
/***/ }),
-/* 708 */
+/* 709 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80975,7 +81235,7 @@ function diffArray(one, two) {
/***/ }),
-/* 709 */
+/* 710 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -80988,7 +81248,7 @@ function diffArray(one, two) {
-var isObject = __webpack_require__(589);
+var isObject = __webpack_require__(590);
module.exports = function pick(obj, keys) {
if (!isObject(obj) && typeof obj !== 'function') {
@@ -81017,7 +81277,7 @@ module.exports = function pick(obj, keys) {
/***/ }),
-/* 710 */
+/* 711 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81027,18 +81287,18 @@ module.exports = function pick(obj, keys) {
* Module dependencies
*/
-var extend = __webpack_require__(640);
-var unique = __webpack_require__(601);
-var toRegex = __webpack_require__(581);
+var extend = __webpack_require__(641);
+var unique = __webpack_require__(602);
+var toRegex = __webpack_require__(582);
/**
* Local dependencies
*/
-var compilers = __webpack_require__(711);
-var parsers = __webpack_require__(717);
-var Extglob = __webpack_require__(720);
-var utils = __webpack_require__(719);
+var compilers = __webpack_require__(712);
+var parsers = __webpack_require__(718);
+var Extglob = __webpack_require__(721);
+var utils = __webpack_require__(720);
var MAX_LENGTH = 1024 * 64;
/**
@@ -81355,13 +81615,13 @@ module.exports = extglob;
/***/ }),
-/* 711 */
+/* 712 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var brackets = __webpack_require__(712);
+var brackets = __webpack_require__(713);
/**
* Extglob compilers
@@ -81531,7 +81791,7 @@ module.exports = function(extglob) {
/***/ }),
-/* 712 */
+/* 713 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81541,17 +81801,17 @@ module.exports = function(extglob) {
* Local dependencies
*/
-var compilers = __webpack_require__(713);
-var parsers = __webpack_require__(715);
+var compilers = __webpack_require__(714);
+var parsers = __webpack_require__(716);
/**
* Module dependencies
*/
var debug = __webpack_require__(205)('expand-brackets');
-var extend = __webpack_require__(640);
-var Snapdragon = __webpack_require__(625);
-var toRegex = __webpack_require__(581);
+var extend = __webpack_require__(641);
+var Snapdragon = __webpack_require__(626);
+var toRegex = __webpack_require__(582);
/**
* Parses the given POSIX character class `pattern` and returns a
@@ -81749,13 +82009,13 @@ module.exports = brackets;
/***/ }),
-/* 713 */
+/* 714 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var posix = __webpack_require__(714);
+var posix = __webpack_require__(715);
module.exports = function(brackets) {
brackets.compiler
@@ -81843,7 +82103,7 @@ module.exports = function(brackets) {
/***/ }),
-/* 714 */
+/* 715 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -81872,14 +82132,14 @@ module.exports = {
/***/ }),
-/* 715 */
+/* 716 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var utils = __webpack_require__(716);
-var define = __webpack_require__(656);
+var utils = __webpack_require__(717);
+var define = __webpack_require__(657);
/**
* Text regex
@@ -82098,14 +82358,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX;
/***/ }),
-/* 716 */
+/* 717 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var toRegex = __webpack_require__(581);
-var regexNot = __webpack_require__(598);
+var toRegex = __webpack_require__(582);
+var regexNot = __webpack_require__(599);
var cached;
/**
@@ -82139,15 +82399,15 @@ exports.createRegex = function(pattern, include) {
/***/ }),
-/* 717 */
+/* 718 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var brackets = __webpack_require__(712);
-var define = __webpack_require__(718);
-var utils = __webpack_require__(719);
+var brackets = __webpack_require__(713);
+var define = __webpack_require__(719);
+var utils = __webpack_require__(720);
/**
* Characters to use in text regex (we want to "not" match
@@ -82302,7 +82562,7 @@ module.exports = parsers;
/***/ }),
-/* 718 */
+/* 719 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82315,7 +82575,7 @@ module.exports = parsers;
-var isDescriptor = __webpack_require__(590);
+var isDescriptor = __webpack_require__(591);
module.exports = function defineProperty(obj, prop, val) {
if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -82340,14 +82600,14 @@ module.exports = function defineProperty(obj, prop, val) {
/***/ }),
-/* 719 */
+/* 720 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var regex = __webpack_require__(598);
-var Cache = __webpack_require__(704);
+var regex = __webpack_require__(599);
+var Cache = __webpack_require__(705);
/**
* Utils
@@ -82416,7 +82676,7 @@ utils.createRegex = function(str) {
/***/ }),
-/* 720 */
+/* 721 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82426,16 +82686,16 @@ utils.createRegex = function(str) {
* Module dependencies
*/
-var Snapdragon = __webpack_require__(625);
-var define = __webpack_require__(718);
-var extend = __webpack_require__(640);
+var Snapdragon = __webpack_require__(626);
+var define = __webpack_require__(719);
+var extend = __webpack_require__(641);
/**
* Local dependencies
*/
-var compilers = __webpack_require__(711);
-var parsers = __webpack_require__(717);
+var compilers = __webpack_require__(712);
+var parsers = __webpack_require__(718);
/**
* Customize Snapdragon parser and renderer
@@ -82501,16 +82761,16 @@ module.exports = Extglob;
/***/ }),
-/* 721 */
+/* 722 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-var extglob = __webpack_require__(710);
-var nanomatch = __webpack_require__(696);
-var regexNot = __webpack_require__(598);
-var toRegex = __webpack_require__(581);
+var extglob = __webpack_require__(711);
+var nanomatch = __webpack_require__(697);
+var regexNot = __webpack_require__(599);
+var toRegex = __webpack_require__(582);
var not;
/**
@@ -82591,14 +82851,14 @@ function textRegex(pattern) {
/***/ }),
-/* 722 */
+/* 723 */
/***/ (function(module, exports, __webpack_require__) {
-module.exports = new (__webpack_require__(704))();
+module.exports = new (__webpack_require__(705))();
/***/ }),
-/* 723 */
+/* 724 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82611,13 +82871,13 @@ var path = __webpack_require__(4);
* Module dependencies
*/
-var Snapdragon = __webpack_require__(625);
-utils.define = __webpack_require__(724);
-utils.diff = __webpack_require__(708);
-utils.extend = __webpack_require__(693);
-utils.pick = __webpack_require__(709);
-utils.typeOf = __webpack_require__(591);
-utils.unique = __webpack_require__(601);
+var Snapdragon = __webpack_require__(626);
+utils.define = __webpack_require__(725);
+utils.diff = __webpack_require__(709);
+utils.extend = __webpack_require__(694);
+utils.pick = __webpack_require__(710);
+utils.typeOf = __webpack_require__(592);
+utils.unique = __webpack_require__(602);
/**
* Returns true if the platform is windows, or `path.sep` is `\\`.
@@ -82914,7 +83174,7 @@ utils.unixify = function(options) {
/***/ }),
-/* 724 */
+/* 725 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82927,8 +83187,8 @@ utils.unixify = function(options) {
-var isobject = __webpack_require__(589);
-var isDescriptor = __webpack_require__(590);
+var isobject = __webpack_require__(590);
+var isDescriptor = __webpack_require__(591);
var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
? Reflect.defineProperty
: Object.defineProperty;
@@ -82959,7 +83219,7 @@ module.exports = function defineProperty(obj, key, val) {
/***/ }),
-/* 725 */
+/* 726 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -82978,9 +83238,9 @@ var __extends = (this && this.__extends) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(726);
-var reader_1 = __webpack_require__(739);
-var fs_stream_1 = __webpack_require__(743);
+var readdir = __webpack_require__(727);
+var reader_1 = __webpack_require__(740);
+var fs_stream_1 = __webpack_require__(744);
var ReaderAsync = /** @class */ (function (_super) {
__extends(ReaderAsync, _super);
function ReaderAsync() {
@@ -83041,15 +83301,15 @@ exports.default = ReaderAsync;
/***/ }),
-/* 726 */
+/* 727 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const readdirSync = __webpack_require__(727);
-const readdirAsync = __webpack_require__(735);
-const readdirStream = __webpack_require__(738);
+const readdirSync = __webpack_require__(728);
+const readdirAsync = __webpack_require__(736);
+const readdirStream = __webpack_require__(739);
module.exports = exports = readdirAsyncPath;
exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -83133,7 +83393,7 @@ function readdirStreamStat (dir, options) {
/***/ }),
-/* 727 */
+/* 728 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -83141,11 +83401,11 @@ function readdirStreamStat (dir, options) {
module.exports = readdirSync;
-const DirectoryReader = __webpack_require__(728);
+const DirectoryReader = __webpack_require__(729);
let syncFacade = {
- fs: __webpack_require__(733),
- forEach: __webpack_require__(734),
+ fs: __webpack_require__(734),
+ forEach: __webpack_require__(735),
sync: true
};
@@ -83174,7 +83434,7 @@ function readdirSync (dir, options, internalOptions) {
/***/ }),
-/* 728 */
+/* 729 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -83183,9 +83443,9 @@ function readdirSync (dir, options, internalOptions) {
const Readable = __webpack_require__(173).Readable;
const EventEmitter = __webpack_require__(164).EventEmitter;
const path = __webpack_require__(4);
-const normalizeOptions = __webpack_require__(729);
-const stat = __webpack_require__(731);
-const call = __webpack_require__(732);
+const normalizeOptions = __webpack_require__(730);
+const stat = __webpack_require__(732);
+const call = __webpack_require__(733);
/**
* Asynchronously reads the contents of a directory and streams the results
@@ -83561,14 +83821,14 @@ module.exports = DirectoryReader;
/***/ }),
-/* 729 */
+/* 730 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const path = __webpack_require__(4);
-const globToRegExp = __webpack_require__(730);
+const globToRegExp = __webpack_require__(731);
module.exports = normalizeOptions;
@@ -83745,7 +84005,7 @@ function normalizeOptions (options, internalOptions) {
/***/ }),
-/* 730 */
+/* 731 */
/***/ (function(module, exports) {
module.exports = function (glob, opts) {
@@ -83882,13 +84142,13 @@ module.exports = function (glob, opts) {
/***/ }),
-/* 731 */
+/* 732 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const call = __webpack_require__(732);
+const call = __webpack_require__(733);
module.exports = stat;
@@ -83963,7 +84223,7 @@ function symlinkStat (fs, path, lstats, callback) {
/***/ }),
-/* 732 */
+/* 733 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84024,14 +84284,14 @@ function callOnce (fn) {
/***/ }),
-/* 733 */
+/* 734 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const fs = __webpack_require__(132);
-const call = __webpack_require__(732);
+const call = __webpack_require__(733);
/**
* A facade around {@link fs.readdirSync} that allows it to be called
@@ -84095,7 +84355,7 @@ exports.lstat = function (path, callback) {
/***/ }),
-/* 734 */
+/* 735 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84124,7 +84384,7 @@ function syncForEach (array, iterator, done) {
/***/ }),
-/* 735 */
+/* 736 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84132,12 +84392,12 @@ function syncForEach (array, iterator, done) {
module.exports = readdirAsync;
-const maybe = __webpack_require__(736);
-const DirectoryReader = __webpack_require__(728);
+const maybe = __webpack_require__(737);
+const DirectoryReader = __webpack_require__(729);
let asyncFacade = {
fs: __webpack_require__(132),
- forEach: __webpack_require__(737),
+ forEach: __webpack_require__(738),
async: true
};
@@ -84179,7 +84439,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
/***/ }),
-/* 736 */
+/* 737 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84206,7 +84466,7 @@ module.exports = function maybe (cb, promise) {
/***/ }),
-/* 737 */
+/* 738 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84242,7 +84502,7 @@ function asyncForEach (array, iterator, done) {
/***/ }),
-/* 738 */
+/* 739 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84250,11 +84510,11 @@ function asyncForEach (array, iterator, done) {
module.exports = readdirStream;
-const DirectoryReader = __webpack_require__(728);
+const DirectoryReader = __webpack_require__(729);
let streamFacade = {
fs: __webpack_require__(132),
- forEach: __webpack_require__(737),
+ forEach: __webpack_require__(738),
async: true
};
@@ -84274,16 +84534,16 @@ function readdirStream (dir, options, internalOptions) {
/***/ }),
-/* 739 */
+/* 740 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var path = __webpack_require__(4);
-var deep_1 = __webpack_require__(740);
-var entry_1 = __webpack_require__(742);
-var pathUtil = __webpack_require__(741);
+var deep_1 = __webpack_require__(741);
+var entry_1 = __webpack_require__(743);
+var pathUtil = __webpack_require__(742);
var Reader = /** @class */ (function () {
function Reader(options) {
this.options = options;
@@ -84349,14 +84609,14 @@ exports.default = Reader;
/***/ }),
-/* 740 */
+/* 741 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(741);
-var patternUtils = __webpack_require__(575);
+var pathUtils = __webpack_require__(742);
+var patternUtils = __webpack_require__(576);
var DeepFilter = /** @class */ (function () {
function DeepFilter(options, micromatchOptions) {
this.options = options;
@@ -84439,7 +84699,7 @@ exports.default = DeepFilter;
/***/ }),
-/* 741 */
+/* 742 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84470,14 +84730,14 @@ exports.makeAbsolute = makeAbsolute;
/***/ }),
-/* 742 */
+/* 743 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(741);
-var patternUtils = __webpack_require__(575);
+var pathUtils = __webpack_require__(742);
+var patternUtils = __webpack_require__(576);
var EntryFilter = /** @class */ (function () {
function EntryFilter(options, micromatchOptions) {
this.options = options;
@@ -84562,7 +84822,7 @@ exports.default = EntryFilter;
/***/ }),
-/* 743 */
+/* 744 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84582,8 +84842,8 @@ var __extends = (this && this.__extends) || (function () {
})();
Object.defineProperty(exports, "__esModule", { value: true });
var stream = __webpack_require__(173);
-var fsStat = __webpack_require__(744);
-var fs_1 = __webpack_require__(748);
+var fsStat = __webpack_require__(745);
+var fs_1 = __webpack_require__(749);
var FileSystemStream = /** @class */ (function (_super) {
__extends(FileSystemStream, _super);
function FileSystemStream() {
@@ -84633,14 +84893,14 @@ exports.default = FileSystemStream;
/***/ }),
-/* 744 */
+/* 745 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(745);
-const statProvider = __webpack_require__(747);
+const optionsManager = __webpack_require__(746);
+const statProvider = __webpack_require__(748);
/**
* Asynchronous API.
*/
@@ -84671,13 +84931,13 @@ exports.statSync = statSync;
/***/ }),
-/* 745 */
+/* 746 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(746);
+const fsAdapter = __webpack_require__(747);
function prepare(opts) {
const options = Object.assign({
fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -84690,7 +84950,7 @@ exports.prepare = prepare;
/***/ }),
-/* 746 */
+/* 747 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84713,7 +84973,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
/***/ }),
-/* 747 */
+/* 748 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84765,7 +85025,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
/***/ }),
-/* 748 */
+/* 749 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84796,7 +85056,7 @@ exports.default = FileSystem;
/***/ }),
-/* 749 */
+/* 750 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84816,9 +85076,9 @@ var __extends = (this && this.__extends) || (function () {
})();
Object.defineProperty(exports, "__esModule", { value: true });
var stream = __webpack_require__(173);
-var readdir = __webpack_require__(726);
-var reader_1 = __webpack_require__(739);
-var fs_stream_1 = __webpack_require__(743);
+var readdir = __webpack_require__(727);
+var reader_1 = __webpack_require__(740);
+var fs_stream_1 = __webpack_require__(744);
var TransformStream = /** @class */ (function (_super) {
__extends(TransformStream, _super);
function TransformStream(reader) {
@@ -84886,7 +85146,7 @@ exports.default = ReaderStream;
/***/ }),
-/* 750 */
+/* 751 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84905,9 +85165,9 @@ var __extends = (this && this.__extends) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(726);
-var reader_1 = __webpack_require__(739);
-var fs_sync_1 = __webpack_require__(751);
+var readdir = __webpack_require__(727);
+var reader_1 = __webpack_require__(740);
+var fs_sync_1 = __webpack_require__(752);
var ReaderSync = /** @class */ (function (_super) {
__extends(ReaderSync, _super);
function ReaderSync() {
@@ -84967,7 +85227,7 @@ exports.default = ReaderSync;
/***/ }),
-/* 751 */
+/* 752 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -84986,8 +85246,8 @@ var __extends = (this && this.__extends) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(744);
-var fs_1 = __webpack_require__(748);
+var fsStat = __webpack_require__(745);
+var fs_1 = __webpack_require__(749);
var FileSystemSync = /** @class */ (function (_super) {
__extends(FileSystemSync, _super);
function FileSystemSync() {
@@ -85033,7 +85293,7 @@ exports.default = FileSystemSync;
/***/ }),
-/* 752 */
+/* 753 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -85049,7 +85309,7 @@ exports.flatten = flatten;
/***/ }),
-/* 753 */
+/* 754 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -85070,13 +85330,13 @@ exports.merge = merge;
/***/ }),
-/* 754 */
+/* 755 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const path = __webpack_require__(4);
-const pathType = __webpack_require__(755);
+const pathType = __webpack_require__(756);
const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
@@ -85142,13 +85402,13 @@ module.exports.sync = (input, opts) => {
/***/ }),
-/* 755 */
+/* 756 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const fs = __webpack_require__(132);
-const pify = __webpack_require__(756);
+const pify = __webpack_require__(757);
function type(fn, fn2, fp) {
if (typeof fp !== 'string') {
@@ -85191,7 +85451,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
/***/ }),
-/* 756 */
+/* 757 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -85282,17 +85542,17 @@ module.exports = (obj, opts) => {
/***/ }),
-/* 757 */
+/* 758 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const fs = __webpack_require__(132);
const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(571);
-const gitIgnore = __webpack_require__(758);
+const fastGlob = __webpack_require__(572);
+const gitIgnore = __webpack_require__(759);
const pify = __webpack_require__(404);
-const slash = __webpack_require__(759);
+const slash = __webpack_require__(760);
const DEFAULT_IGNORE = [
'**/node_modules/**',
@@ -85390,7 +85650,7 @@ module.exports.sync = options => {
/***/ }),
-/* 758 */
+/* 759 */
/***/ (function(module, exports) {
// A simple implementation of make-array
@@ -85859,7 +86119,7 @@ module.exports = options => new IgnoreBase(options)
/***/ }),
-/* 759 */
+/* 760 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -85877,7 +86137,7 @@ module.exports = input => {
/***/ }),
-/* 760 */
+/* 761 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -85890,7 +86150,7 @@ module.exports = input => {
-var isGlob = __webpack_require__(761);
+var isGlob = __webpack_require__(762);
module.exports = function hasGlob(val) {
if (val == null) return false;
@@ -85910,7 +86170,7 @@ module.exports = function hasGlob(val) {
/***/ }),
-/* 761 */
+/* 762 */
/***/ (function(module, exports, __webpack_require__) {
/*!
@@ -85941,17 +86201,17 @@ module.exports = function isGlob(str) {
/***/ }),
-/* 762 */
+/* 763 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const path = __webpack_require__(4);
const {constants: fsConstants} = __webpack_require__(132);
-const pEvent = __webpack_require__(763);
-const CpFileError = __webpack_require__(766);
-const fs = __webpack_require__(768);
-const ProgressEmitter = __webpack_require__(771);
+const pEvent = __webpack_require__(764);
+const CpFileError = __webpack_require__(767);
+const fs = __webpack_require__(769);
+const ProgressEmitter = __webpack_require__(772);
const cpFileAsync = async (source, destination, options, progressEmitter) => {
let readError;
@@ -86065,12 +86325,12 @@ module.exports.sync = (source, destination, options) => {
/***/ }),
-/* 763 */
+/* 764 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const pTimeout = __webpack_require__(764);
+const pTimeout = __webpack_require__(765);
const symbolAsyncIterator = Symbol.asyncIterator || '@@asyncIterator';
@@ -86361,12 +86621,12 @@ module.exports.iterator = (emitter, event, options) => {
/***/ }),
-/* 764 */
+/* 765 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const pFinally = __webpack_require__(765);
+const pFinally = __webpack_require__(766);
class TimeoutError extends Error {
constructor(message) {
@@ -86412,7 +86672,7 @@ module.exports.TimeoutError = TimeoutError;
/***/ }),
-/* 765 */
+/* 766 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -86434,12 +86694,12 @@ module.exports = (promise, onFinally) => {
/***/ }),
-/* 766 */
+/* 767 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const NestedError = __webpack_require__(767);
+const NestedError = __webpack_require__(768);
class CpFileError extends NestedError {
constructor(message, nested) {
@@ -86453,7 +86713,7 @@ module.exports = CpFileError;
/***/ }),
-/* 767 */
+/* 768 */
/***/ (function(module, exports, __webpack_require__) {
var inherits = __webpack_require__(113).inherits;
@@ -86509,16 +86769,16 @@ module.exports = NestedError;
/***/ }),
-/* 768 */
+/* 769 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
const {promisify} = __webpack_require__(113);
const fs = __webpack_require__(233);
-const makeDir = __webpack_require__(769);
-const pEvent = __webpack_require__(763);
-const CpFileError = __webpack_require__(766);
+const makeDir = __webpack_require__(770);
+const pEvent = __webpack_require__(764);
+const CpFileError = __webpack_require__(767);
const stat = promisify(fs.stat);
const lstat = promisify(fs.lstat);
@@ -86615,7 +86875,7 @@ exports.copyFileSync = (source, destination, flags) => {
/***/ }),
-/* 769 */
+/* 770 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -86623,7 +86883,7 @@ exports.copyFileSync = (source, destination, flags) => {
const fs = __webpack_require__(132);
const path = __webpack_require__(4);
const {promisify} = __webpack_require__(113);
-const semver = __webpack_require__(770);
+const semver = __webpack_require__(771);
const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
@@ -86778,7 +87038,7 @@ module.exports.sync = (input, options) => {
/***/ }),
-/* 770 */
+/* 771 */
/***/ (function(module, exports) {
exports = module.exports = SemVer
@@ -88380,7 +88640,7 @@ function coerce (version, options) {
/***/ }),
-/* 771 */
+/* 772 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88421,7 +88681,7 @@ module.exports = ProgressEmitter;
/***/ }),
-/* 772 */
+/* 773 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88467,12 +88727,12 @@ exports.default = module.exports;
/***/ }),
-/* 773 */
+/* 774 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const pMap = __webpack_require__(774);
+const pMap = __webpack_require__(775);
const pFilter = async (iterable, filterer, options) => {
const values = await pMap(
@@ -88489,7 +88749,7 @@ module.exports.default = pFilter;
/***/ }),
-/* 774 */
+/* 775 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88568,12 +88828,12 @@ module.exports.default = pMap;
/***/ }),
-/* 775 */
+/* 776 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const NestedError = __webpack_require__(767);
+const NestedError = __webpack_require__(768);
class CpyError extends NestedError {
constructor(message, nested) {
@@ -88587,7 +88847,7 @@ module.exports = CpyError;
/***/ }),
-/* 776 */
+/* 777 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88595,10 +88855,10 @@ module.exports = CpyError;
const fs = __webpack_require__(132);
const arrayUnion = __webpack_require__(242);
const merge2 = __webpack_require__(243);
-const fastGlob = __webpack_require__(777);
+const fastGlob = __webpack_require__(778);
const dirGlob = __webpack_require__(326);
-const gitignore = __webpack_require__(802);
-const {FilterStream, UniqueStream} = __webpack_require__(803);
+const gitignore = __webpack_require__(803);
+const {FilterStream, UniqueStream} = __webpack_require__(804);
const DEFAULT_FILTER = () => false;
@@ -88775,17 +89035,17 @@ module.exports.gitignore = gitignore;
/***/ }),
-/* 777 */
+/* 778 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
-const taskManager = __webpack_require__(778);
-const async_1 = __webpack_require__(788);
-const stream_1 = __webpack_require__(798);
-const sync_1 = __webpack_require__(799);
-const settings_1 = __webpack_require__(801);
-const utils = __webpack_require__(779);
+const taskManager = __webpack_require__(779);
+const async_1 = __webpack_require__(789);
+const stream_1 = __webpack_require__(799);
+const sync_1 = __webpack_require__(800);
+const settings_1 = __webpack_require__(802);
+const utils = __webpack_require__(780);
async function FastGlob(source, options) {
assertPatternsInput(source);
const works = getWorks(source, async_1.default, options);
@@ -88849,14 +89109,14 @@ module.exports = FastGlob;
/***/ }),
-/* 778 */
+/* 779 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
-const utils = __webpack_require__(779);
+const utils = __webpack_require__(780);
function generate(patterns, settings) {
const positivePatterns = getPositivePatterns(patterns);
const negativePatterns = getNegativePatternsAsPositive(patterns, settings.ignore);
@@ -88921,31 +89181,31 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
/***/ }),
-/* 779 */
+/* 780 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.string = exports.stream = exports.pattern = exports.path = exports.fs = exports.errno = exports.array = void 0;
-const array = __webpack_require__(780);
+const array = __webpack_require__(781);
exports.array = array;
-const errno = __webpack_require__(781);
+const errno = __webpack_require__(782);
exports.errno = errno;
-const fs = __webpack_require__(782);
+const fs = __webpack_require__(783);
exports.fs = fs;
-const path = __webpack_require__(783);
+const path = __webpack_require__(784);
exports.path = path;
-const pattern = __webpack_require__(784);
+const pattern = __webpack_require__(785);
exports.pattern = pattern;
-const stream = __webpack_require__(786);
+const stream = __webpack_require__(787);
exports.stream = stream;
-const string = __webpack_require__(787);
+const string = __webpack_require__(788);
exports.string = string;
/***/ }),
-/* 780 */
+/* 781 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88974,7 +89234,7 @@ exports.splitWhen = splitWhen;
/***/ }),
-/* 781 */
+/* 782 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -88988,7 +89248,7 @@ exports.isEnoentCodeError = isEnoentCodeError;
/***/ }),
-/* 782 */
+/* 783 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89014,7 +89274,7 @@ exports.createDirentFromStats = createDirentFromStats;
/***/ }),
-/* 783 */
+/* 784 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89054,7 +89314,7 @@ exports.removeLeadingDotSegment = removeLeadingDotSegment;
/***/ }),
-/* 784 */
+/* 785 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89063,7 +89323,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
const path = __webpack_require__(4);
const globParent = __webpack_require__(265);
-const micromatch = __webpack_require__(785);
+const micromatch = __webpack_require__(786);
const picomatch = __webpack_require__(279);
const GLOBSTAR = '**';
const ESCAPE_SYMBOL = '\\';
@@ -89193,7 +89453,7 @@ exports.matchAny = matchAny;
/***/ }),
-/* 785 */
+/* 786 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89667,7 +89927,7 @@ module.exports = micromatch;
/***/ }),
-/* 786 */
+/* 787 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89691,7 +89951,7 @@ function propagateCloseEventToSources(streams) {
/***/ }),
-/* 787 */
+/* 788 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89709,14 +89969,14 @@ exports.isEmpty = isEmpty;
/***/ }),
-/* 788 */
+/* 789 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const stream_1 = __webpack_require__(789);
-const provider_1 = __webpack_require__(791);
+const stream_1 = __webpack_require__(790);
+const provider_1 = __webpack_require__(792);
class ProviderAsync extends provider_1.default {
constructor() {
super(...arguments);
@@ -89744,7 +90004,7 @@ exports.default = ProviderAsync;
/***/ }),
-/* 789 */
+/* 790 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89753,7 +90013,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
const stream_1 = __webpack_require__(173);
const fsStat = __webpack_require__(289);
const fsWalk = __webpack_require__(294);
-const reader_1 = __webpack_require__(790);
+const reader_1 = __webpack_require__(791);
class ReaderStream extends reader_1.default {
constructor() {
super(...arguments);
@@ -89806,7 +90066,7 @@ exports.default = ReaderStream;
/***/ }),
-/* 790 */
+/* 791 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -89814,7 +90074,7 @@ exports.default = ReaderStream;
Object.defineProperty(exports, "__esModule", { value: true });
const path = __webpack_require__(4);
const fsStat = __webpack_require__(289);
-const utils = __webpack_require__(779);
+const utils = __webpack_require__(780);
class Reader {
constructor(_settings) {
this._settings = _settings;
@@ -89846,17 +90106,17 @@ exports.default = Reader;
/***/ }),
-/* 791 */
+/* 792 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const path = __webpack_require__(4);
-const deep_1 = __webpack_require__(792);
-const entry_1 = __webpack_require__(795);
-const error_1 = __webpack_require__(796);
-const entry_2 = __webpack_require__(797);
+const deep_1 = __webpack_require__(793);
+const entry_1 = __webpack_require__(796);
+const error_1 = __webpack_require__(797);
+const entry_2 = __webpack_require__(798);
class Provider {
constructor(_settings) {
this._settings = _settings;
@@ -89901,14 +90161,14 @@ exports.default = Provider;
/***/ }),
-/* 792 */
+/* 793 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(779);
-const partial_1 = __webpack_require__(793);
+const utils = __webpack_require__(780);
+const partial_1 = __webpack_require__(794);
class DeepFilter {
constructor(_settings, _micromatchOptions) {
this._settings = _settings;
@@ -89970,13 +90230,13 @@ exports.default = DeepFilter;
/***/ }),
-/* 793 */
+/* 794 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const matcher_1 = __webpack_require__(794);
+const matcher_1 = __webpack_require__(795);
class PartialMatcher extends matcher_1.default {
match(filepath) {
const parts = filepath.split('/');
@@ -90015,13 +90275,13 @@ exports.default = PartialMatcher;
/***/ }),
-/* 794 */
+/* 795 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(779);
+const utils = __webpack_require__(780);
class Matcher {
constructor(_patterns, _settings, _micromatchOptions) {
this._patterns = _patterns;
@@ -90072,13 +90332,13 @@ exports.default = Matcher;
/***/ }),
-/* 795 */
+/* 796 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(779);
+const utils = __webpack_require__(780);
class EntryFilter {
constructor(_settings, _micromatchOptions) {
this._settings = _settings;
@@ -90135,13 +90395,13 @@ exports.default = EntryFilter;
/***/ }),
-/* 796 */
+/* 797 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(779);
+const utils = __webpack_require__(780);
class ErrorFilter {
constructor(_settings) {
this._settings = _settings;
@@ -90157,13 +90417,13 @@ exports.default = ErrorFilter;
/***/ }),
-/* 797 */
+/* 798 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const utils = __webpack_require__(779);
+const utils = __webpack_require__(780);
class EntryTransformer {
constructor(_settings) {
this._settings = _settings;
@@ -90190,15 +90450,15 @@ exports.default = EntryTransformer;
/***/ }),
-/* 798 */
+/* 799 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const stream_1 = __webpack_require__(173);
-const stream_2 = __webpack_require__(789);
-const provider_1 = __webpack_require__(791);
+const stream_2 = __webpack_require__(790);
+const provider_1 = __webpack_require__(792);
class ProviderStream extends provider_1.default {
constructor() {
super(...arguments);
@@ -90228,14 +90488,14 @@ exports.default = ProviderStream;
/***/ }),
-/* 799 */
+/* 800 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-const sync_1 = __webpack_require__(800);
-const provider_1 = __webpack_require__(791);
+const sync_1 = __webpack_require__(801);
+const provider_1 = __webpack_require__(792);
class ProviderSync extends provider_1.default {
constructor() {
super(...arguments);
@@ -90258,7 +90518,7 @@ exports.default = ProviderSync;
/***/ }),
-/* 800 */
+/* 801 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90266,7 +90526,7 @@ exports.default = ProviderSync;
Object.defineProperty(exports, "__esModule", { value: true });
const fsStat = __webpack_require__(289);
const fsWalk = __webpack_require__(294);
-const reader_1 = __webpack_require__(790);
+const reader_1 = __webpack_require__(791);
class ReaderSync extends reader_1.default {
constructor() {
super(...arguments);
@@ -90308,7 +90568,7 @@ exports.default = ReaderSync;
/***/ }),
-/* 801 */
+/* 802 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90372,7 +90632,7 @@ exports.default = Settings;
/***/ }),
-/* 802 */
+/* 803 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90380,7 +90640,7 @@ exports.default = Settings;
const {promisify} = __webpack_require__(113);
const fs = __webpack_require__(132);
const path = __webpack_require__(4);
-const fastGlob = __webpack_require__(777);
+const fastGlob = __webpack_require__(778);
const gitIgnore = __webpack_require__(329);
const slash = __webpack_require__(330);
@@ -90499,7 +90759,7 @@ module.exports.sync = options => {
/***/ }),
-/* 803 */
+/* 804 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
@@ -90552,7 +90812,7 @@ module.exports = {
/***/ }),
-/* 804 */
+/* 805 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@@ -90560,13 +90820,13 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildNonBazelProductionProjects", function() { return buildNonBazelProductionProjects; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProductionProjects", function() { return getProductionProjects; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProject", function() { return buildProject; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(564);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(565);
/* 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__(240);
/* 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__(561);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(562);
/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231);
/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220);
/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(343);
diff --git a/packages/kbn-pm/src/commands/bootstrap.ts b/packages/kbn-pm/src/commands/bootstrap.ts
index 12034a9f4a094..b5a9645047c09 100644
--- a/packages/kbn-pm/src/commands/bootstrap.ts
+++ b/packages/kbn-pm/src/commands/bootstrap.ts
@@ -17,12 +17,8 @@ import { ICommand } from './';
import { readYarnLock } from '../utils/yarn_lock';
import { sortPackageJson } from '../utils/sort_package_json';
import { validateDependencies } from '../utils/validate_dependencies';
-import {
- ensureYarnIntegrityFileExists,
- installBazelTools,
- runBazel,
- yarnIntegrityFileExists,
-} from '../utils/bazel';
+import { installBazelTools, removeYarnIntegrityFileIfExists, runBazel } from '../utils/bazel';
+import { setupRemoteCache } from '../utils/bazel/setup_remote_cache';
export const BootstrapCommand: ICommand = {
description: 'Install dependencies and crosslink projects',
@@ -41,20 +37,15 @@ export const BootstrapCommand: ICommand = {
const reporter = CiStatsReporter.fromEnv(log);
const timings = [];
- // Force install is set in case a flag is passed or
- // if the `.yarn-integrity` file is not found which
- // will be indicated by the return of yarnIntegrityFileExists.
- const forceInstall =
- (!!options && options['force-install'] === true) ||
- !(await yarnIntegrityFileExists(resolve(kibanaProjectPath, 'node_modules')));
-
- // Ensure we have a `node_modules/.yarn-integrity` file as we depend on it
- // for bazel to know it has to re-install the node_modules after a reset or a clean
- await ensureYarnIntegrityFileExists(resolve(kibanaProjectPath, 'node_modules'));
+ // Force install is set in case a flag is passed into yarn kbn bootstrap
+ const forceInstall = !!options && options['force-install'] === true;
// Install bazel machinery tools if needed
await installBazelTools(rootPath);
+ // Setup remote cache settings in .bazelrc.cache if needed
+ await setupRemoteCache(rootPath);
+
// Bootstrap process for Bazel packages
// Bazel is now managing dependencies so yarn install
// will happen as part of this
@@ -67,7 +58,16 @@ export const BootstrapCommand: ICommand = {
if (forceInstall) {
const forceInstallStartTime = Date.now();
- await runBazel(['run', '@nodejs//:yarn'], runOffline);
+ await removeYarnIntegrityFileIfExists(resolve(kibanaProjectPath, 'node_modules'));
+ await runBazel(['clean']);
+ await runBazel(['run', '@nodejs//:yarn'], runOffline, {
+ env: {
+ SASS_BINARY_SITE:
+ 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass',
+ RE2_DOWNLOAD_MIRROR:
+ 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2',
+ },
+ });
timings.push({
id: 'force install dependencies',
ms: Date.now() - forceInstallStartTime,
diff --git a/packages/kbn-pm/src/commands/clean.ts b/packages/kbn-pm/src/commands/clean.ts
index 89552946faeea..12f6d674ca9e6 100644
--- a/packages/kbn-pm/src/commands/clean.ts
+++ b/packages/kbn-pm/src/commands/clean.ts
@@ -17,7 +17,7 @@ import { log } from '../utils/log';
import { ICommand } from './';
export const CleanCommand: ICommand = {
- description: 'Deletes output directories, node_modules and resets internal caches.',
+ description: 'Deletes output directories and resets internal caches.',
name: 'clean',
reportTiming: {
@@ -27,20 +27,15 @@ export const CleanCommand: ICommand = {
async run(projects) {
log.warning(dedent`
- This command is only necessary for the rare circumstance where you need to recover a consistent
+ This command is only necessary for the circumstance where you need to recover a consistent
state when problems arise. If you need to run this command often, please let us know by
- filling out this form: https://ela.st/yarn-kbn-clean
+ filling out this form: https://ela.st/yarn-kbn-clean.
+ Please not it might not solve problems with node_modules. To solve problems around node_modules
+ you might need to run 'yarn kbn reset'.
`);
const toDelete = [];
for (const project of projects.values()) {
- if (await isDirectory(project.nodeModulesLocation)) {
- toDelete.push({
- cwd: project.path,
- pattern: relative(project.path, project.nodeModulesLocation),
- });
- }
-
if (await isDirectory(project.targetLocation)) {
toDelete.push({
cwd: project.path,
diff --git a/packages/kbn-pm/src/commands/reset.ts b/packages/kbn-pm/src/commands/reset.ts
index 0d5fd72427a9f..1a3f7c748f79e 100644
--- a/packages/kbn-pm/src/commands/reset.ts
+++ b/packages/kbn-pm/src/commands/reset.ts
@@ -34,7 +34,8 @@ export const ResetCommand: ICommand = {
async run(projects) {
log.warning(dedent`
In most cases, 'yarn kbn clean' is all that should be needed to recover a consistent state when
- problems arise. If you need to use this command, please let us know, as it should not be necessary.
+ problems arise. However for the rare cases where something get corrupt on node_modules you might need this command.
+ If you think you need to use this command very often (which is not normal), please let us know.
`);
const toDelete = [];
diff --git a/packages/kbn-pm/src/utils/bazel/index.ts b/packages/kbn-pm/src/utils/bazel/index.ts
index a3651039161b8..84e26a0b914e1 100644
--- a/packages/kbn-pm/src/utils/bazel/index.ts
+++ b/packages/kbn-pm/src/utils/bazel/index.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
-export * from './yarn_integrity';
export * from './get_cache_folders';
export * from './install_tools';
export * from './run';
+export * from './yarn_integrity';
diff --git a/packages/kbn-pm/src/utils/bazel/run.ts b/packages/kbn-pm/src/utils/bazel/run.ts
index c030081e53daa..18a6cacdf6d2a 100644
--- a/packages/kbn-pm/src/utils/bazel/run.ts
+++ b/packages/kbn-pm/src/utils/bazel/run.ts
@@ -52,6 +52,9 @@ async function runBazelCommandWithRunner(
try {
await bazelProc;
} catch {
+ log.error(
+ 'HINT: If experiencing problems with node_modules try `yarn kbn bootstrap --force-install` or as last resort `yarn kbn reset && yarn kbn bootstrap`'
+ );
throw new CliError(`The bazel command that was running failed to complete.`);
}
await bazelLogs$.toPromise();
diff --git a/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts b/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
new file mode 100644
index 0000000000000..0e740e674b7d8
--- /dev/null
+++ b/packages/kbn-pm/src/utils/bazel/setup_remote_cache.ts
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import dedent from 'dedent';
+import { existsSync, writeFileSync } from 'fs';
+import { resolve } from 'path';
+import { spawn } from '../child_process';
+import { log } from '../log';
+
+async function isVaultAvailable() {
+ try {
+ await spawn('vault', ['--version'], { stdio: 'pipe' });
+
+ return true;
+ } catch {
+ return false;
+ }
+}
+
+async function isElasticCommitter() {
+ try {
+ const { stdout: email } = await spawn('git', ['config', 'user.email'], {
+ stdio: 'pipe',
+ });
+
+ return email.trim().endsWith('@elastic.co');
+ } catch {
+ return false;
+ }
+}
+
+export async function setupRemoteCache(repoRootPath: string) {
+ // The remote cache is only for Elastic employees working locally (CI cache settings are handled elsewhere)
+ if (process.env.CI || !(await isElasticCommitter())) {
+ return;
+ }
+
+ log.debug(`[bazel_tools] setting up remote cache settings if necessary`);
+
+ const settingsPath = resolve(repoRootPath, '.bazelrc.cache');
+
+ if (existsSync(settingsPath)) {
+ log.debug(`[bazel_tools] remote cache settings already exist, skipping`);
+ return;
+ }
+
+ if (!(await isVaultAvailable())) {
+ log.info('[bazel_tools] vault is not available, unable to setup remote cache settings.');
+ log.info('[bazel_tools] building packages will work, but will be slower in many cases.');
+ log.info('[bazel_tools] reach out to Operations if you need assistance with this.');
+ return;
+ }
+
+ let apiKey = '';
+
+ try {
+ const { stdout } = await spawn(
+ 'vault',
+ ['read', '-field=readonly-key', 'secret/ui-team/kibana-bazel-remote-cache'],
+ {
+ stdio: 'pipe',
+ }
+ );
+ apiKey = stdout.trim();
+ } catch (ex: unknown) {
+ log.info(
+ '[bazel_tools] unable to read bazel remote cache key from vault, are you authenticated?'
+ );
+ log.info('[bazel_tools] building packages will work, but will be slower in many cases.');
+ log.info('[bazel_tools] reach out to Operations if you need assistance with this.');
+ log.info(`[bazel_tools] ${ex}`);
+
+ return;
+ }
+
+ const contents = dedent`
+ # V1 - This file is automatically generated by 'yarn kbn bootstrap'
+ # To regenerate this file, delete it and run 'yarn kbn bootstrap' again.
+ build --bes_results_url=https://app.buildbuddy.io/invocation/
+ build --bes_backend=grpcs://cloud.buildbuddy.io
+ build --remote_cache=grpcs://cloud.buildbuddy.io
+ build --remote_timeout=3600
+ build --remote_header=${apiKey}
+ `;
+
+ writeFileSync(settingsPath, contents);
+ log.info(`[bazel_tools] remote cache settings written to ${settingsPath}`);
+}
diff --git a/packages/kbn-pm/src/utils/bazel/yarn_integrity.ts b/packages/kbn-pm/src/utils/bazel/yarn_integrity.ts
index 3a72f5ca080b8..1ac9bfeba1e3b 100644
--- a/packages/kbn-pm/src/utils/bazel/yarn_integrity.ts
+++ b/packages/kbn-pm/src/utils/bazel/yarn_integrity.ts
@@ -7,35 +7,18 @@
*/
import { join } from 'path';
-import { isFile, mkdirp, tryRealpath, writeFile } from '../fs';
+import { isFile, tryRealpath, unlink } from '../fs';
-export async function yarnIntegrityFileExists(nodeModulesPath: string) {
+export async function removeYarnIntegrityFileIfExists(nodeModulesPath: string) {
try {
const nodeModulesRealPath = await tryRealpath(nodeModulesPath);
const yarnIntegrityFilePath = join(nodeModulesRealPath, '.yarn-integrity');
- // check if the file already exists
+ // check if the file exists and delete it in that case
if (await isFile(yarnIntegrityFilePath)) {
- return true;
+ await unlink(yarnIntegrityFilePath);
}
} catch {
// no-op
}
-
- return false;
-}
-
-export async function ensureYarnIntegrityFileExists(nodeModulesPath: string) {
- try {
- const nodeModulesRealPath = await tryRealpath(nodeModulesPath);
- const yarnIntegrityFilePath = join(nodeModulesRealPath, '.yarn-integrity');
-
- // ensure node_modules folder is created
- await mkdirp(nodeModulesRealPath);
-
- // write a blank file in case it doesn't exists
- await writeFile(yarnIntegrityFilePath, '', { flag: 'wx' });
- } catch {
- // no-op
- }
}
diff --git a/packages/kbn-test/BUILD.bazel b/packages/kbn-test/BUILD.bazel
index efaf01f7137d9..70af3be022afe 100644
--- a/packages/kbn-test/BUILD.bazel
+++ b/packages/kbn-test/BUILD.bazel
@@ -30,6 +30,8 @@ NPM_MODULE_EXTRA_FILES = [
"jest/package.json",
"jest-preset.js",
"jest_integration/jest-preset.js",
+ "jest_integration_node/jest-preset.js",
+ "jest_node/jest-preset.js",
"jest.config.js",
"README.md",
"package.json",
@@ -41,8 +43,10 @@ RUNTIME_DEPS = [
"//packages/kbn-std",
"//packages/kbn-utils",
"@npm//@elastic/elasticsearch",
- "@npm//axios",
"@npm//@babel/traverse",
+ "@npm//@jest/console",
+ "@npm//@jest/reporters",
+ "@npm//axios",
"@npm//chance",
"@npm//del",
"@npm//enzyme",
@@ -56,7 +60,6 @@ RUNTIME_DEPS = [
"@npm//jest-cli",
"@npm//jest-snapshot",
"@npm//jest-styled-components",
- "@npm//@jest/reporters",
"@npm//joi",
"@npm//mustache",
"@npm//parse-link-header",
@@ -66,6 +69,7 @@ RUNTIME_DEPS = [
"@npm//react-router-dom",
"@npm//redux",
"@npm//rxjs",
+ "@npm//semver",
"@npm//strip-ansi",
"@npm//xmlbuilder",
"@npm//xml2js",
@@ -76,6 +80,10 @@ TYPES_DEPS = [
"//packages/kbn-i18n",
"//packages/kbn-utils",
"@npm//@elastic/elasticsearch",
+ "@npm//@jest/console",
+ "@npm//@jest/reporters",
+ "@npm//axios",
+ "@npm//elastic-apm-node",
"@npm//del",
"@npm//form-data",
"@npm//jest",
@@ -98,6 +106,7 @@ TYPES_DEPS = [
"@npm//@types/react-dom",
"@npm//@types/react-redux",
"@npm//@types/react-router-dom",
+ "@npm//@types/semver",
"@npm//@types/xml2js",
]
diff --git a/packages/kbn-test/jest-preset.js b/packages/kbn-test/jest-preset.js
index db64f070b37d9..1b3b77edeba95 100644
--- a/packages/kbn-test/jest-preset.js
+++ b/packages/kbn-test/jest-preset.js
@@ -54,19 +54,26 @@ module.exports = {
rootDirectory: '.',
},
],
+ [
+ '@kbn/test/target_node/jest/ci_stats_jest_reporter',
+ {
+ testGroupType: 'Jest Unit Tests',
+ },
+ ],
],
// The paths to modules that run some code to configure or set up the testing environment before each test
setupFiles: [
'/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js',
- '/node_modules/@kbn/test/target_node/jest/setup/polyfills.js',
+ '/node_modules/@kbn/test/target_node/jest/setup/polyfills.jsdom.js',
'/node_modules/@kbn/test/target_node/jest/setup/enzyme.js',
],
// A list of paths to modules that run some code to configure or set up the testing framework before each test
setupFilesAfterEnv: [
'/node_modules/@kbn/test/target_node/jest/setup/setup_test.js',
- '/node_modules/@kbn/test/target_node/jest/setup/mocks.js',
+ '/node_modules/@kbn/test/target_node/jest/setup/mocks.moment_timezone.js',
+ '/node_modules/@kbn/test/target_node/jest/setup/mocks.eui.js',
'/node_modules/@kbn/test/target_node/jest/setup/react_testing_library.js',
],
diff --git a/packages/kbn-test/jest.config.js b/packages/kbn-test/jest.config.js
index 6a4847174dde0..ad5513c7ef31c 100644
--- a/packages/kbn-test/jest.config.js
+++ b/packages/kbn-test/jest.config.js
@@ -7,7 +7,7 @@
*/
module.exports = {
- preset: '@kbn/test',
+ preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['/packages/kbn-test'],
};
diff --git a/packages/kbn-test/jest.integration.config.js b/packages/kbn-test/jest.integration.config.js
new file mode 100644
index 0000000000000..0141c86e8fa59
--- /dev/null
+++ b/packages/kbn-test/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration_node',
+ rootDir: '../..',
+ roots: ['/packages/kbn-test'],
+};
diff --git a/packages/kbn-test/jest_integration/jest-preset.js b/packages/kbn-test/jest_integration/jest-preset.js
index 7504dec9e7a20..f5593e3f57fb6 100644
--- a/packages/kbn-test/jest_integration/jest-preset.js
+++ b/packages/kbn-test/jest_integration/jest-preset.js
@@ -16,11 +16,24 @@ module.exports = {
),
setupFilesAfterEnv: [
'/node_modules/@kbn/test/target_node/jest/setup/after_env.integration.js',
- '/node_modules/@kbn/test/target_node/jest/setup/mocks.js',
+ '/node_modules/@kbn/test/target_node/jest/setup/mocks.moment_timezone.js',
+ '/node_modules/@kbn/test/target_node/jest/setup/mocks.eui.js',
],
reporters: [
'default',
- ['@kbn/test/target_node/jest/junit_reporter', { reportName: 'Jest Integration Tests' }],
+ [
+ '@kbn/test/target_node/jest/junit_reporter',
+ {
+ rootDirectory: '.',
+ reportName: 'Jest Integration Tests',
+ },
+ ],
+ [
+ '@kbn/test/target_node/jest/ci_stats_jest_reporter',
+ {
+ testGroupType: 'Jest Integration Tests',
+ },
+ ],
],
coverageReporters: !!process.env.CI
? [['json', { file: 'jest-integration.json' }]]
diff --git a/packages/kbn-test/jest_integration_node/jest-preset.js b/packages/kbn-test/jest_integration_node/jest-preset.js
new file mode 100644
index 0000000000000..50f097f0386d3
--- /dev/null
+++ b/packages/kbn-test/jest_integration_node/jest-preset.js
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+const preset = require('../jest-preset');
+
+/** @typedef {import("@jest/types").Config.InitialOptions} JestConfig */
+/** @type {JestConfig} */
+module.exports = {
+ ...preset,
+ testMatch: ['**/integration_tests**/*.test.{js,mjs,ts,tsx}'],
+ testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
+ (pattern) => !pattern.includes('integration_tests')
+ ),
+ setupFilesAfterEnv: [
+ '/node_modules/@kbn/test/target_node/jest/setup/after_env.integration.js',
+ '/node_modules/@kbn/test/target_node/jest/setup/mocks.moment_timezone.js',
+ ],
+ reporters: [
+ 'default',
+ [
+ '@kbn/test/target_node/jest/junit_reporter',
+ {
+ rootDirectory: '.',
+ reportName: 'Jest Integration Tests',
+ },
+ ],
+ [
+ '@kbn/test/target_node/jest/ci_stats_jest_reporter',
+ {
+ testGroupType: 'Jest Integration Tests',
+ },
+ ],
+ ],
+ coverageReporters: !!process.env.CI
+ ? [['json', { file: 'jest-integration.json' }]]
+ : ['html', 'text'],
+
+ testEnvironment: 'node',
+ snapshotSerializers: [],
+ setupFiles: ['/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js'],
+};
diff --git a/packages/kbn-test/jest_node/jest-preset.js b/packages/kbn-test/jest_node/jest-preset.js
new file mode 100644
index 0000000000000..9a0e9a16321e4
--- /dev/null
+++ b/packages/kbn-test/jest_node/jest-preset.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+const preset = require('../jest-preset');
+
+module.exports = {
+ ...preset,
+ testEnvironment: 'node',
+ snapshotSerializers: [],
+ setupFiles: ['/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js'],
+};
diff --git a/packages/kbn-test/src/es/es_client_for_testing.ts b/packages/kbn-test/src/es/es_client_for_testing.ts
new file mode 100644
index 0000000000000..3bfad09dca626
--- /dev/null
+++ b/packages/kbn-test/src/es/es_client_for_testing.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as Url from 'url';
+import * as Fs from 'fs';
+
+import { CA_CERT_PATH } from '@kbn/dev-utils';
+import { Client as EsClient, ClientOptions } from '@elastic/elasticsearch';
+import type { Config } from '../functional_test_runner';
+
+/** options for creating es instances used in functional testing scenarios */
+export interface EsClientForTestingOptions extends Omit {
+ /** url of es instance */
+ esUrl: string;
+ /** overwrite the auth embedded in the url to use a different user in this client instance */
+ authOverride?: { username: string; password: string };
+ /**
+ * are we running tests against cloud? this is automatically determined
+ * by checking for the TEST_CLOUD environment variable but can be overriden
+ * for special cases
+ */
+ isCloud?: boolean;
+}
+
+export function createEsClientForFtrConfig(
+ config: Config,
+ overrides?: Omit
+) {
+ const esUrl = Url.format(config.get('servers.elasticsearch'));
+ return createEsClientForTesting({
+ esUrl,
+ requestTimeout: config.get('timeouts.esRequestTimeout'),
+ ...overrides,
+ });
+}
+
+export function createEsClientForTesting(options: EsClientForTestingOptions) {
+ const { esUrl, authOverride, isCloud = !!process.env.TEST_CLOUD, ...otherOptions } = options;
+
+ const url = options.authOverride
+ ? Url.format({
+ ...Url.parse(options.esUrl),
+ auth: `${options.authOverride.username}:${options.authOverride.password}`,
+ })
+ : options.esUrl;
+
+ return new EsClient({
+ ssl: isCloud ? undefined : { ca: Fs.readFileSync(CA_CERT_PATH) },
+
+ ...otherOptions,
+
+ // force nodes config
+ nodes: [url],
+ });
+}
diff --git a/packages/kbn-test/src/es/es_test_config.ts b/packages/kbn-test/src/es/es_test_config.ts
index db5d705710a75..da6e67885733d 100644
--- a/packages/kbn-test/src/es/es_test_config.ts
+++ b/packages/kbn-test/src/es/es_test_config.ts
@@ -8,7 +8,7 @@
import { kibanaPackageJson as pkg } from '@kbn/dev-utils';
import Url from 'url';
-import { adminTestUser } from '../kbn';
+import { systemIndicesSuperuser } from '../kbn';
class EsTestConfig {
getVersion() {
@@ -51,8 +51,8 @@ class EsTestConfig {
};
}
- const username = process.env.TEST_ES_USERNAME || adminTestUser.username;
- const password = process.env.TEST_ES_PASSWORD || adminTestUser.password;
+ const username = process.env.TEST_ES_USERNAME || systemIndicesSuperuser.username;
+ const password = process.env.TEST_ES_PASSWORD || systemIndicesSuperuser.password;
const port = process.env.TEST_ES_PORT ? parseInt(process.env.TEST_ES_PORT, 10) : 9220;
diff --git a/packages/kbn-test/src/es/index.ts b/packages/kbn-test/src/es/index.ts
index ccfec67dae848..641253acc3647 100644
--- a/packages/kbn-test/src/es/index.ts
+++ b/packages/kbn-test/src/es/index.ts
@@ -9,3 +9,5 @@
export { createTestEsCluster } from './test_es_cluster';
export type { CreateTestEsClusterOptions, EsTestCluster, ICluster } from './test_es_cluster';
export { esTestConfig } from './es_test_config';
+export { createEsClientForTesting, createEsClientForFtrConfig } from './es_client_for_testing';
+export type { EsClientForTestingOptions } from './es_client_for_testing';
diff --git a/packages/kbn-test/src/es/test_es_cluster.ts b/packages/kbn-test/src/es/test_es_cluster.ts
index 026a57ff0a7a9..7ca19d6082871 100644
--- a/packages/kbn-test/src/es/test_es_cluster.ts
+++ b/packages/kbn-test/src/es/test_es_cluster.ts
@@ -63,6 +63,10 @@ export type EsTestCluster {
+ const esVersion = flags['es-version'] || undefined; // convert "" to undefined
+ if (esVersion !== undefined && typeof esVersion !== 'string') {
+ throw createFlagError('expected --es-version to be a string');
+ }
+
const functionalTestRunner = new FunctionalTestRunner(
log,
makeAbsolutePath(flags.config as string),
{
mochaOpts: {
bail: flags.bail,
+ dryRun: flags['dry-run'],
grep: flags.grep || undefined,
invert: flags.invert,
},
@@ -57,7 +63,8 @@ export function runFtrCli() {
},
updateBaselines: flags.updateBaselines || flags.u,
updateSnapshots: flags.updateSnapshots || flags.u,
- }
+ },
+ esVersion
);
let teardownRun = false;
@@ -123,8 +130,17 @@ export function runFtrCli() {
'include-tag',
'exclude-tag',
'kibana-install-dir',
+ 'es-version',
+ ],
+ boolean: [
+ 'bail',
+ 'invert',
+ 'test-stats',
+ 'updateBaselines',
+ 'updateSnapshots',
+ 'u',
+ 'dry-run',
],
- boolean: ['bail', 'invert', 'test-stats', 'updateBaselines', 'updateSnapshots', 'u'],
default: {
config: 'test/functional/config.js',
},
@@ -133,6 +149,7 @@ export function runFtrCli() {
--bail stop tests after the first failure
--grep pattern used to select which tests to run
--invert invert grep to exclude tests
+ --es-version the elasticsearch version, formatted as "x.y.z"
--include-tag=tag a tag to be included, pass multiple times for multiple tags. Only
suites which have one of the passed include-tag tags will be executed.
When combined with the --exclude-tag flag both conditions must be met
@@ -147,6 +164,7 @@ export function runFtrCli() {
--updateSnapshots replace inline and file snapshots with whatever is generated from the test
-u replace both baseline screenshots and snapshots
--kibana-install-dir directory where the Kibana install being tested resides
+ --dry-run report tests without executing them
`,
},
}
diff --git a/packages/kbn-test/src/functional_test_runner/fake_mocha_types.ts b/packages/kbn-test/src/functional_test_runner/fake_mocha_types.ts
index dec381fb04b56..96ebcd79c4e43 100644
--- a/packages/kbn-test/src/functional_test_runner/fake_mocha_types.ts
+++ b/packages/kbn-test/src/functional_test_runner/fake_mocha_types.ts
@@ -31,6 +31,7 @@ export interface Test {
file?: string;
parent?: Suite;
isPassed: () => boolean;
+ pending?: boolean;
}
export interface Runner extends EventEmitter {
diff --git a/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts b/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts
index 4130cd8d138b8..6bde620b8f4fe 100644
--- a/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts
+++ b/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts
@@ -6,13 +6,16 @@
* Side Public License, v 1.
*/
+import { writeFileSync, mkdirSync } from 'fs';
+import Path, { dirname } from 'path';
import { ToolingLog } from '@kbn/dev-utils';
+import { REPO_ROOT } from '@kbn/utils';
import { Suite, Test } from './fake_mocha_types';
import {
Lifecycle,
LifecyclePhase,
- FailureMetadata,
+ TestMetadata,
readConfigFile,
ProviderCollection,
readProviderSpec,
@@ -21,17 +24,21 @@ import {
DockerServersService,
Config,
SuiteTracker,
+ EsVersion,
} from './lib';
+import { createEsClientForFtrConfig } from '../es';
export class FunctionalTestRunner {
public readonly lifecycle = new Lifecycle();
- public readonly failureMetadata = new FailureMetadata(this.lifecycle);
+ public readonly testMetadata = new TestMetadata(this.lifecycle);
private closed = false;
+ private readonly esVersion: EsVersion;
constructor(
private readonly log: ToolingLog,
private readonly configFile: string,
- private readonly configOverrides: any
+ private readonly configOverrides: any,
+ esVersion?: string | EsVersion
) {
for (const [key, value] of Object.entries(this.lifecycle)) {
if (value instanceof LifecyclePhase) {
@@ -39,6 +46,12 @@ export class FunctionalTestRunner {
value.after$.subscribe(() => log.verbose('starting %j lifecycle phase', key));
}
}
+ this.esVersion =
+ esVersion === undefined
+ ? EsVersion.getDefault()
+ : esVersion instanceof EsVersion
+ ? esVersion
+ : new EsVersion(esVersion);
}
async run() {
@@ -51,6 +64,9 @@ export class FunctionalTestRunner {
...readProviderSpec('PageObject', config.get('pageObjects')),
]);
+ if (providers.hasService('es')) {
+ await this.validateEsVersion(config);
+ }
await providers.loadAll();
const customTestRunner = config.get('testRunner');
@@ -61,7 +77,37 @@ export class FunctionalTestRunner {
return (await providers.invokeProviderFn(customTestRunner)) || 0;
}
- const mocha = await setupMocha(this.lifecycle, this.log, config, providers);
+ let reporter;
+ let reporterOptions;
+ if (config.get('mochaOpts.dryRun')) {
+ // override default reporter for dryRun results
+ const targetFile = Path.resolve(REPO_ROOT, 'target/functional-tests/dryRunOutput.json');
+ reporter = 'json';
+ reporterOptions = {
+ output: targetFile,
+ };
+ this.log.info(`Dry run results will be stored in ${targetFile}`);
+ }
+
+ const mocha = await setupMocha(
+ this.lifecycle,
+ this.log,
+ config,
+ providers,
+ this.esVersion,
+ reporter,
+ reporterOptions
+ );
+
+ // there's a bug in mocha's dry run, see https://github.com/mochajs/mocha/issues/4838
+ // until we can update to a mocha version where this is fixed, we won't actually
+ // execute the mocha dry run but simulate it by reading the suites and tests of
+ // the mocha object and writing a report file with similar structure to the json report
+ // (just leave out some execution details like timing, retry and erros)
+ if (config.get('mochaOpts.dryRun')) {
+ return this.simulateMochaDryRun(mocha);
+ }
+
await this.lifecycle.beforeTests.trigger(mocha.suite);
this.log.info('Starting tests');
@@ -69,6 +115,33 @@ export class FunctionalTestRunner {
});
}
+ private async validateEsVersion(config: Config) {
+ const es = createEsClientForFtrConfig(config);
+
+ let esInfo;
+ try {
+ esInfo = await es.info();
+ } catch (error) {
+ throw new Error(
+ `attempted to use the "es" service to fetch Elasticsearch version info but the request failed: ${error.stack}`
+ );
+ } finally {
+ try {
+ await es.close();
+ } catch {
+ // noop
+ }
+ }
+
+ if (!this.esVersion.eql(esInfo.body.version.number)) {
+ throw new Error(
+ `ES reports a version number "${
+ esInfo.body.version.number
+ }" which doesn't match supplied es version "${this.esVersion.toString()}"`
+ );
+ }
+ }
+
async getTestStats() {
return await this._run(async (config, coreProviders) => {
if (config.get('testRunner')) {
@@ -107,14 +180,14 @@ export class FunctionalTestRunner {
...readStubbedProviderSpec('PageObject', config.get('pageObjects'), []),
]);
- const mocha = await setupMocha(this.lifecycle, this.log, config, providers);
+ const mocha = await setupMocha(this.lifecycle, this.log, config, providers, this.esVersion);
const countTests = (suite: Suite): number =>
suite.suites.reduce((sum, s) => sum + countTests(s), suite.tests.length);
return {
testCount: countTests(mocha.suite),
- excludedTests: mocha.excludedTests.map((t: Test) => t.fullTitle()),
+ testsExcludedByTag: mocha.testsExcludedByTag.map((t: Test) => t.fullTitle()),
};
});
}
@@ -125,7 +198,12 @@ export class FunctionalTestRunner {
let runErrorOccurred = false;
try {
- const config = await readConfigFile(this.log, this.configFile, this.configOverrides);
+ const config = await readConfigFile(
+ this.log,
+ this.esVersion,
+ this.configFile,
+ this.configOverrides
+ );
this.log.info('Config loaded');
if (
@@ -145,9 +223,10 @@ export class FunctionalTestRunner {
const coreProviders = readProviderSpec('Service', {
lifecycle: () => this.lifecycle,
log: () => this.log,
- failureMetadata: () => this.failureMetadata,
+ testMetadata: () => this.testMetadata,
config: () => config,
dockerServers: () => dockerServers,
+ esVersion: () => this.esVersion,
});
return await handler(config, coreProviders);
@@ -175,4 +254,62 @@ export class FunctionalTestRunner {
this.closed = true;
await this.lifecycle.cleanup.trigger();
}
+
+ simulateMochaDryRun(mocha: any) {
+ interface TestEntry {
+ file: string;
+ title: string;
+ fullTitle: string;
+ }
+
+ const getFullTitle = (node: Test | Suite): string => {
+ const parentTitle = node.parent && getFullTitle(node.parent);
+ return parentTitle ? `${parentTitle} ${node.title}` : node.title;
+ };
+
+ let suiteCount = 0;
+ const passes: TestEntry[] = [];
+ const pending: TestEntry[] = [];
+
+ const collectTests = (suite: Suite) => {
+ for (const subSuite of suite.suites) {
+ suiteCount++;
+ for (const test of subSuite.tests) {
+ const testEntry = {
+ title: test.title,
+ fullTitle: getFullTitle(test),
+ file: test.file || '',
+ };
+ if (test.pending) {
+ pending.push(testEntry);
+ } else {
+ passes.push(testEntry);
+ }
+ }
+ collectTests(subSuite);
+ }
+ };
+
+ collectTests(mocha.suite);
+
+ const reportData = {
+ stats: {
+ suites: suiteCount,
+ tests: passes.length + pending.length,
+ passes: passes.length,
+ pending: pending.length,
+ failures: 0,
+ },
+ tests: [...passes, ...pending],
+ passes,
+ pending,
+ failures: [],
+ };
+
+ const reportPath = mocha.options.reporterOptions.output;
+ mkdirSync(dirname(reportPath), { recursive: true });
+ writeFileSync(reportPath, JSON.stringify(reportData, null, 2), 'utf8');
+
+ return 0;
+ }
}
diff --git a/packages/kbn-test/src/functional_test_runner/index.ts b/packages/kbn-test/src/functional_test_runner/index.ts
index 268c6b2bd9a67..e67e72fd5801a 100644
--- a/packages/kbn-test/src/functional_test_runner/index.ts
+++ b/packages/kbn-test/src/functional_test_runner/index.ts
@@ -7,7 +7,8 @@
*/
export { FunctionalTestRunner } from './functional_test_runner';
-export { readConfigFile, Config } from './lib';
+export { readConfigFile, Config, EsVersion, Lifecycle, LifecyclePhase } from './lib';
+export type { ScreenshotRecord } from './lib';
export { runFtrCli } from './cli';
export * from './lib/docker_servers';
export * from './public_types';
diff --git a/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/failure_hooks/config.js b/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/failure_hooks/config.js
index 0b9cfd88b4cbb..b6aa2669be681 100644
--- a/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/failure_hooks/config.js
+++ b/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/failure_hooks/config.js
@@ -35,6 +35,7 @@ export default function () {
},
mochaReporter: {
captureLogOutput: false,
+ sendToCiStats: false,
},
};
}
diff --git a/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/simple_project/config.js b/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/simple_project/config.js
index 7163058b78523..4c87b53b5753b 100644
--- a/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/simple_project/config.js
+++ b/packages/kbn-test/src/functional_test_runner/integration_tests/__fixtures__/simple_project/config.js
@@ -10,4 +10,7 @@ import { resolve } from 'path';
export default () => ({
testFiles: [resolve(__dirname, 'tests.js')],
+ mochaReporter: {
+ sendToCiStats: false,
+ },
});
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/config.ts b/packages/kbn-test/src/functional_test_runner/lib/config/config.ts
index 1d4af9c33fb79..d6248b9628e73 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/config.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/config.ts
@@ -20,6 +20,7 @@ interface Options {
}
export class Config {
+ public readonly path: string;
private [$values]: Record;
constructor(options: Options) {
@@ -29,6 +30,7 @@ export class Config {
throw new TypeError('path is a required option');
}
+ this.path = path;
const { error, value } = schema.validate(settings, {
abortEarly: false,
context: {
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js
index 60c307b58aee6..27434ce5a09ca 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.test.js
@@ -9,34 +9,41 @@
import { ToolingLog } from '@kbn/dev-utils';
import { readConfigFile } from './read_config_file';
import { Config } from './config';
+import { EsVersion } from '../es_version';
const log = new ToolingLog();
+const esVersion = new EsVersion('8.0.0');
describe('readConfigFile()', () => {
it('reads config from a file, returns an instance of Config class', async () => {
- const config = await readConfigFile(log, require.resolve('./__fixtures__/config.1'));
+ const config = await readConfigFile(log, esVersion, require.resolve('./__fixtures__/config.1'));
expect(config instanceof Config).toBeTruthy();
expect(config.get('testFiles')).toEqual(['config.1']);
});
it('merges setting overrides into log', async () => {
- const config = await readConfigFile(log, require.resolve('./__fixtures__/config.1'), {
- screenshots: {
- directory: 'foo.bar',
- },
- });
+ const config = await readConfigFile(
+ log,
+ esVersion,
+ require.resolve('./__fixtures__/config.1'),
+ {
+ screenshots: {
+ directory: 'foo.bar',
+ },
+ }
+ );
expect(config.get('screenshots.directory')).toBe('foo.bar');
});
it('supports loading config files from within config files', async () => {
- const config = await readConfigFile(log, require.resolve('./__fixtures__/config.2'));
+ const config = await readConfigFile(log, esVersion, require.resolve('./__fixtures__/config.2'));
expect(config.get('testFiles')).toEqual(['config.1', 'config.2']);
});
it('throws if settings are invalid', async () => {
try {
- await readConfigFile(log, require.resolve('./__fixtures__/config.invalid'));
+ await readConfigFile(log, esVersion, require.resolve('./__fixtures__/config.invalid'));
throw new Error('expected readConfigFile() to fail');
} catch (err) {
expect(err.message).toMatch(/"foo"/);
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts
index 374edea7a8db7..fd836f338edf0 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts
@@ -10,10 +10,16 @@ import { ToolingLog } from '@kbn/dev-utils';
import { defaultsDeep } from 'lodash';
import { Config } from './config';
+import { EsVersion } from '../es_version';
const cache = new WeakMap();
-async function getSettingsFromFile(log: ToolingLog, path: string, settingOverrides: any) {
+async function getSettingsFromFile(
+ log: ToolingLog,
+ esVersion: EsVersion,
+ path: string,
+ settingOverrides: any
+) {
const configModule = require(path); // eslint-disable-line @typescript-eslint/no-var-requires
const configProvider = configModule.__esModule ? configModule.default : configModule;
@@ -23,9 +29,10 @@ async function getSettingsFromFile(log: ToolingLog, path: string, settingOverrid
configProvider,
configProvider({
log,
+ esVersion,
async readConfigFile(p: string, o: any) {
return new Config({
- settings: await getSettingsFromFile(log, p, o),
+ settings: await getSettingsFromFile(log, esVersion, p, o),
primary: false,
path: p,
});
@@ -43,9 +50,14 @@ async function getSettingsFromFile(log: ToolingLog, path: string, settingOverrid
return settingsWithDefaults;
}
-export async function readConfigFile(log: ToolingLog, path: string, settingOverrides: any = {}) {
+export async function readConfigFile(
+ log: ToolingLog,
+ esVersion: EsVersion,
+ path: string,
+ settingOverrides: any = {}
+) {
return new Config({
- settings: await getSettingsFromFile(log, path, settingOverrides),
+ settings: await getSettingsFromFile(log, esVersion, path, settingOverrides),
primary: true,
path,
});
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
index a9ceaa643a60f..4f4ce0d5bb04e 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
@@ -100,6 +100,7 @@ export const schema = Joi.object()
try: Joi.number().default(120000),
waitFor: Joi.number().default(20000),
esRequestTimeout: Joi.number().default(30000),
+ kibanaReportCompletion: Joi.number().default(60_000),
kibanaStabilize: Joi.number().default(15000),
navigateStatusPageCheck: Joi.number().default(250),
@@ -123,6 +124,7 @@ export const schema = Joi.object()
mochaOpts: Joi.object()
.keys({
bail: Joi.boolean().default(false),
+ dryRun: Joi.boolean().default(false),
grep: Joi.string(),
invert: Joi.boolean().default(false),
slow: Joi.number().default(30000),
@@ -151,7 +153,10 @@ export const schema = Joi.object()
mochaReporter: Joi.object()
.keys({
- captureLogOutput: Joi.boolean().default(!!process.env.CI),
+ captureLogOutput: Joi.boolean().default(
+ !!process.env.CI && !process.env.DISABLE_CI_LOG_OUTPUT_CAPTURE
+ ),
+ sendToCiStats: Joi.boolean().default(!!process.env.CI),
})
.default(),
diff --git a/packages/kbn-test/src/functional_test_runner/lib/es_version.ts b/packages/kbn-test/src/functional_test_runner/lib/es_version.ts
new file mode 100644
index 0000000000000..8b3acde47a4dc
--- /dev/null
+++ b/packages/kbn-test/src/functional_test_runner/lib/es_version.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import semver from 'semver';
+import { kibanaPackageJson } from '@kbn/utils';
+
+export class EsVersion {
+ static getDefault() {
+ // example: https://storage.googleapis.com/kibana-ci-es-snapshots-daily/8.0.0/manifest-latest-verified.json
+ const manifestUrl = process.env.ES_SNAPSHOT_MANIFEST;
+ if (manifestUrl) {
+ const match = manifestUrl.match(/\d+\.\d+\.\d+/);
+ if (!match) {
+ throw new Error('unable to extract es version from ES_SNAPSHOT_MANIFEST_URL');
+ }
+ return new EsVersion(match[0]);
+ }
+
+ return new EsVersion(process.env.TEST_ES_BRANCH || kibanaPackageJson.version);
+ }
+
+ public readonly parsed: semver.SemVer;
+
+ constructor(version: string) {
+ const parsed = semver.coerce(version);
+ if (!parsed) {
+ throw new Error(`unable to parse es version [${version}]`);
+ }
+ this.parsed = parsed;
+ }
+
+ toString() {
+ return this.parsed.version;
+ }
+
+ /**
+ * Determine if the ES version matches a semver range, like >=7 or ^8.1.0
+ */
+ matchRange(range: string) {
+ return semver.satisfies(this.parsed, range);
+ }
+
+ /**
+ * Determine if the ES version matches a specific version, ignores things like -SNAPSHOT
+ */
+ eql(version: string) {
+ const other = semver.coerce(version);
+ return other && semver.compareLoose(this.parsed, other) === 0;
+ }
+}
diff --git a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts b/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts
deleted file mode 100644
index b40f6a5c83688..0000000000000
--- a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts
+++ /dev/null
@@ -1,61 +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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { Lifecycle } from './lifecycle';
-import { FailureMetadata } from './failure_metadata';
-import { Test } from '../fake_mocha_types';
-
-it('collects metadata for the current test', async () => {
- const lifecycle = new Lifecycle();
- const failureMetadata = new FailureMetadata(lifecycle);
-
- const test1 = {} as Test;
- await lifecycle.beforeEachRunnable.trigger(test1);
- failureMetadata.add({ foo: 'bar' });
-
- expect(failureMetadata.get(test1)).toMatchInlineSnapshot(`
- Object {
- "foo": "bar",
- }
- `);
-
- const test2 = {} as Test;
- await lifecycle.beforeEachRunnable.trigger(test2);
- failureMetadata.add({ test: 2 });
-
- expect(failureMetadata.get(test1)).toMatchInlineSnapshot(`
- Object {
- "foo": "bar",
- }
- `);
- expect(failureMetadata.get(test2)).toMatchInlineSnapshot(`
- Object {
- "test": 2,
- }
- `);
-});
-
-it('adds messages to the messages state', () => {
- const lifecycle = new Lifecycle();
- const failureMetadata = new FailureMetadata(lifecycle);
-
- const test1 = {} as Test;
- lifecycle.beforeEachRunnable.trigger(test1);
- failureMetadata.addMessages(['foo', 'bar']);
- failureMetadata.addMessages(['baz']);
-
- expect(failureMetadata.get(test1)).toMatchInlineSnapshot(`
- Object {
- "messages": Array [
- "foo",
- "bar",
- "baz",
- ],
- }
- `);
-});
diff --git a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts b/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts
deleted file mode 100644
index a766c73f4c727..0000000000000
--- a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts
+++ /dev/null
@@ -1,93 +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
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import Path from 'path';
-
-import { REPO_ROOT } from '@kbn/utils';
-
-import { Lifecycle } from './lifecycle';
-
-interface Metadata {
- [key: string]: unknown;
-}
-
-export class FailureMetadata {
- // mocha's global types mean we can't import Mocha or it will override the global jest types..............
- private currentRunnable?: any;
- private readonly allMetadata = new Map();
-
- constructor(lifecycle: Lifecycle) {
- if (!process.env.GCS_UPLOAD_PREFIX && process.env.CI) {
- throw new Error(
- 'GCS_UPLOAD_PREFIX environment variable is not set and must always be set on CI'
- );
- }
-
- lifecycle.beforeEachRunnable.add((runnable) => {
- this.currentRunnable = runnable;
- });
- }
-
- add(metadata: Metadata | ((current: Metadata) => Metadata)) {
- if (!this.currentRunnable) {
- throw new Error('no current runnable to associate metadata with');
- }
-
- const current = this.allMetadata.get(this.currentRunnable);
- this.allMetadata.set(this.currentRunnable, {
- ...current,
- ...(typeof metadata === 'function' ? metadata(current || {}) : metadata),
- });
- }
-
- addMessages(messages: string[]) {
- this.add((current) => ({
- messages: [...(Array.isArray(current.messages) ? current.messages : []), ...messages],
- }));
- }
-
- /**
- * @param name Name to label the URL with
- * @param repoPath absolute path, within the repo, that will be uploaded
- */
- addScreenshot(name: string, repoPath: string) {
- const prefix = process.env.GCS_UPLOAD_PREFIX;
-
- if (!prefix) {
- return;
- }
-
- const slash = prefix.endsWith('/') ? '' : '/';
- const urlPath = Path.relative(REPO_ROOT, repoPath)
- .split(Path.sep)
- .map((c) => encodeURIComponent(c))
- .join('/');
-
- if (urlPath.startsWith('..')) {
- throw new Error(
- `Only call addUploadLink() with paths that are within the repo root, received ${repoPath} and repo root is ${REPO_ROOT}`
- );
- }
-
- const url = `https://storage.googleapis.com/${prefix}${slash}${urlPath}`;
- const screenshot = {
- name,
- url,
- };
-
- this.add((current) => ({
- screenshots: [...(Array.isArray(current.screenshots) ? current.screenshots : []), screenshot],
- }));
-
- return screenshot;
- }
-
- get(runnable: any) {
- return this.allMetadata.get(runnable);
- }
-}
diff --git a/packages/kbn-test/src/functional_test_runner/lib/index.ts b/packages/kbn-test/src/functional_test_runner/lib/index.ts
index 1cb1e58a265d5..e387fd156fe8a 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/index.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/index.ts
@@ -12,8 +12,9 @@ export { readConfigFile, Config } from './config';
export { readProviderSpec, ProviderCollection } from './providers';
// @internal
export { runTests, setupMocha } from './mocha';
-export { FailureMetadata } from './failure_metadata';
+export * from './test_metadata';
export * from './docker_servers';
export { SuiteTracker } from './suite_tracker';
export type { Provider } from './providers';
+export * from './es_version';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts b/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts
index 17dcaa8d7447d..e683ec23a8d84 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts
@@ -11,15 +11,23 @@ import { LifecyclePhase } from './lifecycle_phase';
import { Suite, Test } from '../fake_mocha_types';
export class Lifecycle {
+ /** lifecycle phase that will run handlers once before tests execute */
public readonly beforeTests = new LifecyclePhase<[Suite]>({
singular: true,
});
+ /** lifecycle phase that runs handlers before each runnable (test and hooks) */
public readonly beforeEachRunnable = new LifecyclePhase<[Test]>();
+ /** lifecycle phase that runs handlers before each suite */
public readonly beforeTestSuite = new LifecyclePhase<[Suite]>();
+ /** lifecycle phase that runs handlers before each test */
public readonly beforeEachTest = new LifecyclePhase<[Test]>();
+ /** lifecycle phase that runs handlers after each suite */
public readonly afterTestSuite = new LifecyclePhase<[Suite]>();
+ /** lifecycle phase that runs handlers after a test fails */
public readonly testFailure = new LifecyclePhase<[Error, Test]>();
+ /** lifecycle phase that runs handlers after a hook fails */
public readonly testHookFailure = new LifecyclePhase<[Error, Test]>();
+ /** lifecycle phase that runs handlers at the very end of execution */
public readonly cleanup = new LifecyclePhase<[]>({
singular: true,
});
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
index 7610ca9128694..e12ffdc8cd616 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
@@ -84,6 +84,9 @@ export function decorateMochaUi(log, lifecycle, context, { isDockerGroup, rootTa
this._tags = [...this._tags, ...tagsToAdd];
};
+ this.onlyEsVersion = (semver) => {
+ this._esVersionRequirement = semver;
+ };
provider.call(this);
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.test.js
similarity index 86%
rename from packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js
rename to packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.test.js
index 10030a1c05632..191503af123d0 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.test.js
@@ -12,9 +12,10 @@ import Mocha from 'mocha';
import { create as createSuite } from 'mocha/lib/suite';
import Test from 'mocha/lib/test';
-import { filterSuitesByTags } from './filter_suites_by_tags';
+import { filterSuites } from './filter_suites';
+import { EsVersion } from '../es_version';
-function setup({ include, exclude }) {
+function setup({ include, exclude, esVersion }) {
return new Promise((resolve) => {
const history = [];
@@ -55,6 +56,7 @@ function setup({ include, exclude }) {
const level1b = createSuite(level1, 'level 1b');
level1b._tags = ['level1b'];
+ level1b._esVersionRequirement = '<=8';
level1b.addTest(new Test('test 1b', () => {}));
const level2 = createSuite(mocha.suite, 'level 2');
@@ -62,7 +64,7 @@ function setup({ include, exclude }) {
level2a._tags = ['level2a'];
level2a.addTest(new Test('test 2a', () => {}));
- filterSuitesByTags({
+ filterSuites({
log: {
info(...args) {
history.push(`info: ${format(...args)}`);
@@ -71,6 +73,7 @@ function setup({ include, exclude }) {
mocha,
include,
exclude,
+ esVersion,
});
mocha.run();
@@ -208,3 +211,27 @@ it('does nothing if everything excluded', async () => {
]
`);
});
+
+it(`excludes tests which don't meet the esVersionRequirement`, async () => {
+ const { history } = await setup({
+ include: [],
+ exclude: [],
+ esVersion: new EsVersion('9.0.0'),
+ });
+
+ expect(history).toMatchInlineSnapshot(`
+ Array [
+ "info: Only running suites which are compatible with ES version 9.0.0",
+ "suite: ",
+ "suite: level 1",
+ "suite: level 1 level 1a",
+ "hook: \\"before each\\" hook: rootBeforeEach for \\"test 1a\\"",
+ "hook: level 1 \\"before each\\" hook: level1BeforeEach for \\"test 1a\\"",
+ "test: level 1 level 1a test 1a",
+ "suite: level 2",
+ "suite: level 2 level 2a",
+ "hook: \\"before each\\" hook: rootBeforeEach for \\"test 2a\\"",
+ "test: level 2 level 2a test 2a",
+ ]
+ `);
+});
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts
similarity index 55%
rename from packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js
rename to packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts
index 9724956e121f3..90bb3a894bc6c 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites.ts
@@ -6,6 +6,24 @@
* Side Public License, v 1.
*/
+import { ToolingLog } from '@kbn/dev-utils';
+import { Suite, Test } from '../../fake_mocha_types';
+import { EsVersion } from '../es_version';
+
+interface SuiteInternal extends Suite {
+ _tags?: string[];
+ _esVersionRequirement?: string;
+ suites: SuiteInternal[];
+}
+
+interface Options {
+ log: ToolingLog;
+ mocha: any;
+ include: string[];
+ exclude: string[];
+ esVersion?: EsVersion;
+}
+
/**
* Given a mocha instance that has already loaded all of its suites, filter out
* the suites based on the include/exclude tags. If there are include tags then
@@ -16,23 +34,50 @@
* @param options.include an array of tags that suites must be tagged with to be run
* @param options.exclude an array of tags that will be used to exclude suites from the run
*/
-export function filterSuitesByTags({ log, mocha, include, exclude }) {
- mocha.excludedTests = [];
+export function filterSuites({ log, mocha, include, exclude, esVersion }: Options) {
+ mocha.testsExcludedByTag = [];
+ mocha.testsExcludedByEsVersion = [];
+
// collect all the tests from some suite, including it's children
- const collectTests = (suite) =>
+ const collectTests = (suite: SuiteInternal): Test[] =>
suite.suites.reduce((acc, s) => acc.concat(collectTests(s)), suite.tests);
+ if (esVersion) {
+ // traverse the test graph and exclude any tests which don't meet their esVersionRequirement
+ log.info('Only running suites which are compatible with ES version', esVersion.toString());
+ (function recurse(parentSuite: SuiteInternal) {
+ const children = parentSuite.suites;
+ parentSuite.suites = [];
+
+ const meetsEsVersionRequirement = (suite: SuiteInternal) =>
+ !suite._esVersionRequirement || esVersion.matchRange(suite._esVersionRequirement);
+
+ for (const child of children) {
+ if (meetsEsVersionRequirement(child)) {
+ parentSuite.suites.push(child);
+ recurse(child);
+ } else {
+ mocha.testsExcludedByEsVersion = mocha.testsExcludedByEsVersion.concat(
+ collectTests(child)
+ );
+ }
+ }
+ })(mocha.suite);
+ }
+
// if include tags were provided, filter the tree once to
// only include branches that are included at some point
if (include.length) {
log.info('Only running suites (and their sub-suites) if they include the tag(s):', include);
- const isIncluded = (suite) =>
+ const isIncludedByTags = (suite: SuiteInternal) =>
!suite._tags ? false : suite._tags.some((t) => include.includes(t));
- const isChildIncluded = (suite) =>
+
+ const isIncluded = (suite: SuiteInternal) => isIncludedByTags(suite);
+ const isChildIncluded = (suite: SuiteInternal): boolean =>
suite.suites.some((s) => isIncluded(s) || isChildIncluded(s));
- (function recurse(parentSuite) {
+ (function recurse(parentSuite: SuiteInternal) {
const children = parentSuite.suites;
parentSuite.suites = [];
@@ -47,13 +92,13 @@ export function filterSuitesByTags({ log, mocha, include, exclude }) {
// itself, so strip out its tests and recurse to filter
// out child suites which are not included
if (isChildIncluded(child)) {
- mocha.excludedTests = mocha.excludedTests.concat(child.tests);
+ mocha.testsExcludedByTag = mocha.testsExcludedByTag.concat(child.tests);
child.tests = [];
parentSuite.suites.push(child);
recurse(child);
continue;
} else {
- mocha.excludedTests = mocha.excludedTests.concat(collectTests(child));
+ mocha.testsExcludedByTag = mocha.testsExcludedByTag.concat(collectTests(child));
}
}
})(mocha.suite);
@@ -64,9 +109,10 @@ export function filterSuitesByTags({ log, mocha, include, exclude }) {
if (exclude.length) {
log.info('Filtering out any suites that include the tag(s):', exclude);
- const isNotExcluded = (suite) => !suite._tags || !suite._tags.some((t) => exclude.includes(t));
+ const isNotExcluded = (suite: SuiteInternal) =>
+ !suite._tags || !suite._tags.some((t) => exclude.includes(t));
- (function recurse(parentSuite) {
+ (function recurse(parentSuite: SuiteInternal) {
const children = parentSuite.suites;
parentSuite.suites = [];
@@ -77,7 +123,7 @@ export function filterSuitesByTags({ log, mocha, include, exclude }) {
parentSuite.suites.push(child);
recurse(child);
} else {
- mocha.excludedTests = mocha.excludedTests.concat(collectTests(child));
+ mocha.testsExcludedByTag = mocha.testsExcludedByTag.concat(collectTests(child));
}
}
})(mocha.suite);
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts
new file mode 100644
index 0000000000000..61eb7eccce430
--- /dev/null
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ci_stats_ftr_reporter.ts
@@ -0,0 +1,157 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as Path from 'path';
+
+import { REPO_ROOT } from '@kbn/utils';
+import { CiStatsReporter, CiStatsReportTestsOptions, CiStatsTestType } from '@kbn/dev-utils';
+
+import { Config } from '../../config';
+import { Runner } from '../../../fake_mocha_types';
+import { TestMetadata, ScreenshotRecord } from '../../test_metadata';
+import { Lifecycle } from '../../lifecycle';
+import { getSnapshotOfRunnableLogs } from '../../../../mocha';
+
+interface Suite {
+ _beforeAll: Runnable[];
+ _beforeEach: Runnable[];
+ _afterEach: Runnable[];
+ _afterAll: Runnable[];
+}
+
+interface Runnable {
+ isFailed(): boolean;
+ isPending(): boolean;
+ duration?: number;
+ titlePath(): string[];
+ file: string;
+ title: string;
+ parent: Suite;
+ _screenshots?: ScreenshotRecord[];
+}
+
+function getHookType(hook: Runnable): CiStatsTestType {
+ if (hook.parent._afterAll.includes(hook)) {
+ return 'after all hook';
+ }
+ if (hook.parent._afterEach.includes(hook)) {
+ return 'after each hook';
+ }
+ if (hook.parent._beforeEach.includes(hook)) {
+ return 'before each hook';
+ }
+ if (hook.parent._beforeAll.includes(hook)) {
+ return 'before all hook';
+ }
+
+ throw new Error(`unable to determine hook type, hook is not owned by it's parent`);
+}
+
+export function setupCiStatsFtrTestGroupReporter({
+ config,
+ lifecycle,
+ runner,
+ testMetadata,
+ reporter,
+}: {
+ config: Config;
+ lifecycle: Lifecycle;
+ runner: Runner;
+ testMetadata: TestMetadata;
+ reporter: CiStatsReporter;
+}) {
+ let startMs: number | undefined;
+ runner.on('start', () => {
+ startMs = Date.now();
+ });
+
+ const start = Date.now();
+ const group: CiStatsReportTestsOptions['group'] = {
+ startTime: new Date(start).toJSON(),
+ durationMs: 0,
+ type: config.path.startsWith('x-pack') ? 'X-Pack Functional Tests' : 'Functional Tests',
+ name: Path.relative(REPO_ROOT, config.path),
+ meta: {
+ ciGroup: config.get('suiteTags.include').find((t: string) => t.startsWith('ciGroup')),
+ tags: [
+ ...config.get('suiteTags.include'),
+ ...config.get('suiteTags.exclude').map((t: string) => `-${t}`),
+ ].filter((t) => !t.startsWith('ciGroup')),
+ },
+ };
+
+ const testRuns: CiStatsReportTestsOptions['testRuns'] = [];
+ function trackRunnable(
+ runnable: Runnable,
+ { error, type }: { error?: Error; type: CiStatsTestType }
+ ) {
+ testRuns.push({
+ startTime: new Date(Date.now() - (runnable.duration ?? 0)).toJSON(),
+ durationMs: runnable.duration ?? 0,
+ seq: testRuns.length + 1,
+ file: Path.relative(REPO_ROOT, runnable.file),
+ name: runnable.title,
+ suites: runnable.titlePath().slice(0, -1),
+ result: runnable.isFailed() ? 'fail' : runnable.isPending() ? 'skip' : 'pass',
+ type,
+ error: error?.stack,
+ stdout: getSnapshotOfRunnableLogs(runnable),
+ screenshots: testMetadata.getScreenshots(runnable).map((s) => ({
+ base64Png: s.base64Png,
+ name: s.name,
+ })),
+ });
+ }
+
+ const errors = new Map();
+ runner.on('fail', (test: Runnable, error: Error) => {
+ errors.set(test, error);
+ });
+
+ runner.on('hook end', (hook: Runnable) => {
+ if (hook.isFailed()) {
+ const error = errors.get(hook);
+ if (!error) {
+ throw new Error(`no error recorded for failed hook`);
+ }
+
+ trackRunnable(hook, {
+ type: getHookType(hook),
+ error,
+ });
+ }
+ });
+
+ runner.on('test end', (test: Runnable) => {
+ const error = errors.get(test);
+ if (test.isFailed() && !error) {
+ throw new Error('no error recorded for failed test');
+ }
+
+ trackRunnable(test, {
+ type: 'test',
+ error,
+ });
+ });
+
+ runner.on('end', () => {
+ if (!startMs) {
+ throw new Error('startMs was not defined');
+ }
+
+ // update the durationMs
+ group.durationMs = Date.now() - startMs;
+ });
+
+ lifecycle.cleanup.add(async () => {
+ await reporter.reportTests({
+ group,
+ testRuns,
+ });
+ });
+}
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
index d6045b71bf3a7..84299cba14eaa 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js
@@ -9,7 +9,7 @@
import { format } from 'util';
import Mocha from 'mocha';
-import { ToolingLogTextWriter } from '@kbn/dev-utils';
+import { ToolingLogTextWriter, CiStatsReporter } from '@kbn/dev-utils';
import moment from 'moment';
import { recordLog, snapshotLogsForRunnable, setupJUnitReportGeneration } from '../../../../mocha';
@@ -17,11 +17,13 @@ import * as colors from './colors';
import * as symbols from './symbols';
import { ms } from './ms';
import { writeEpilogue } from './write_epilogue';
+import { setupCiStatsFtrTestGroupReporter } from './ci_stats_ftr_reporter';
export function MochaReporterProvider({ getService }) {
const log = getService('log');
const config = getService('config');
- const failureMetadata = getService('failureMetadata');
+ const lifecycle = getService('lifecycle');
+ const testMetadata = getService('testMetadata');
let originalLogWriters;
let reporterCaptureStartTime;
@@ -45,9 +47,23 @@ export function MochaReporterProvider({ getService }) {
if (config.get('junit.enabled') && config.get('junit.reportName')) {
setupJUnitReportGeneration(runner, {
reportName: config.get('junit.reportName'),
- getTestMetadata: (t) => failureMetadata.get(t),
});
}
+
+ if (config.get('mochaReporter.sendToCiStats')) {
+ const reporter = CiStatsReporter.fromEnv(log);
+ if (!reporter.hasBuildConfig()) {
+ log.warning('ci-stats reporter config is not available so test results will not be sent');
+ } else {
+ setupCiStatsFtrTestGroupReporter({
+ reporter,
+ config,
+ lifecycle,
+ runner,
+ testMetadata,
+ });
+ }
+ }
}
onStart = () => {
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js
index 65b7c09242fdd..9261391c5bf6a 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js
@@ -11,7 +11,7 @@ import { relative } from 'path';
import { REPO_ROOT } from '@kbn/utils';
import { loadTestFiles } from './load_test_files';
-import { filterSuitesByTags } from './filter_suites_by_tags';
+import { filterSuites } from './filter_suites';
import { MochaReporterProvider } from './reporter';
import { validateCiGroupTags } from './validate_ci_group_tags';
@@ -22,13 +22,24 @@ import { validateCiGroupTags } from './validate_ci_group_tags';
* @param {ToolingLog} log
* @param {Config} config
* @param {ProviderCollection} providers
+ * @param {EsVersion} esVersion
* @return {Promise}
*/
-export async function setupMocha(lifecycle, log, config, providers) {
+export async function setupMocha(
+ lifecycle,
+ log,
+ config,
+ providers,
+ esVersion,
+ reporter,
+ reporterOptions
+) {
// configure mocha
const mocha = new Mocha({
...config.get('mochaOpts'),
- reporter: await providers.loadExternalService('mocha reporter', MochaReporterProvider),
+ reporter:
+ reporter || (await providers.loadExternalService('mocha reporter', MochaReporterProvider)),
+ reporterOptions,
});
// global beforeEach hook in root suite triggers before all others
@@ -50,18 +61,26 @@ export async function setupMocha(lifecycle, log, config, providers) {
// valiate that there aren't any tests in multiple ciGroups
validateCiGroupTags(log, mocha);
+ filterSuites({
+ log,
+ mocha,
+ include: [],
+ exclude: [],
+ esVersion,
+ });
+
// Each suite has a tag that is the path relative to the root of the repo
// So we just need to take input paths, make them relative to the root, and use them as tags
// Also, this is a separate filterSuitesByTags() call so that the test suites will be filtered first by
// files, then by tags. This way, you can target tags (like smoke) in a specific file.
- filterSuitesByTags({
+ filterSuites({
log,
mocha,
include: config.get('suiteFiles.include').map((file) => relative(REPO_ROOT, file)),
exclude: config.get('suiteFiles.exclude').map((file) => relative(REPO_ROOT, file)),
});
- filterSuitesByTags({
+ filterSuites({
log,
mocha,
include: config.get('suiteTags.include').map((tag) => tag.replace(/-\d+$/, '')),
diff --git a/packages/kbn-test/src/functional_test_runner/lib/test_metadata.ts b/packages/kbn-test/src/functional_test_runner/lib/test_metadata.ts
new file mode 100644
index 0000000000000..5789231f87044
--- /dev/null
+++ b/packages/kbn-test/src/functional_test_runner/lib/test_metadata.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Lifecycle } from './lifecycle';
+
+export interface ScreenshotRecord {
+ name: string;
+ base64Png: string;
+ baselinePath?: string;
+ failurePath?: string;
+}
+
+export class TestMetadata {
+ // mocha's global types mean we can't import Mocha or it will override the global jest types..............
+ private currentRunnable?: any;
+
+ constructor(lifecycle: Lifecycle) {
+ lifecycle.beforeEachRunnable.add((runnable) => {
+ this.currentRunnable = runnable;
+ });
+ }
+
+ addScreenshot(screenshot: ScreenshotRecord) {
+ this.currentRunnable._screenshots = (this.currentRunnable._screenshots || []).concat(
+ screenshot
+ );
+ }
+
+ getScreenshots(test: any): ScreenshotRecord[] {
+ if (!test || typeof test !== 'object' || !test._screenshots) {
+ return [];
+ }
+
+ return test._screenshots.slice();
+ }
+}
diff --git a/packages/kbn-test/src/functional_test_runner/public_types.ts b/packages/kbn-test/src/functional_test_runner/public_types.ts
index d1a0f7998b0a9..426fdda74d313 100644
--- a/packages/kbn-test/src/functional_test_runner/public_types.ts
+++ b/packages/kbn-test/src/functional_test_runner/public_types.ts
@@ -6,12 +6,12 @@
* Side Public License, v 1.
*/
-import { ToolingLog } from '@kbn/dev-utils';
+import type { ToolingLog } from '@kbn/dev-utils';
-import { Config, Lifecycle, FailureMetadata, DockerServersService } from './lib';
-import { Test, Suite } from './fake_mocha_types';
+import type { Config, Lifecycle, TestMetadata, DockerServersService, EsVersion } from './lib';
+import type { Test, Suite } from './fake_mocha_types';
-export { Lifecycle, Config, FailureMetadata };
+export { Lifecycle, Config, TestMetadata };
export interface AsyncInstance {
/**
@@ -57,7 +57,7 @@ export interface GenericFtrProviderContext<
* @param serviceName
*/
hasService(
- serviceName: 'config' | 'log' | 'lifecycle' | 'failureMetadata' | 'dockerServers'
+ serviceName: 'config' | 'log' | 'lifecycle' | 'testMetadata' | 'dockerServers' | 'esVersion'
): true;
hasService(serviceName: K): serviceName is K;
hasService(serviceName: string): serviceName is Extract;
@@ -71,7 +71,8 @@ export interface GenericFtrProviderContext<
getService(serviceName: 'log'): ToolingLog;
getService(serviceName: 'lifecycle'): Lifecycle;
getService(serviceName: 'dockerServers'): DockerServersService;
- getService(serviceName: 'failureMetadata'): FailureMetadata;
+ getService(serviceName: 'testMetadata'): TestMetadata;
+ getService(serviceName: 'esVersion'): EsVersion;
getService(serviceName: T): ServiceMap[T];
/**
@@ -100,6 +101,7 @@ export class GenericFtrService;
}
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap
index ad2f82de87b82..cff0b46afcad1 100644
--- a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap
+++ b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap
@@ -26,7 +26,8 @@ Options:
--verbose Log everything.
--debug Run in debug mode.
--quiet Only log errors.
- --silent Log nothing."
+ --silent Log nothing.
+ --dry-run Report tests without executing them."
`;
exports[`process options for run tests CLI accepts boolean value for updateBaselines 1`] = `
@@ -37,6 +38,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -58,6 +60,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -80,6 +83,7 @@ Object {
"createLogger": [Function],
"debug": true,
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -101,6 +105,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -124,6 +129,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": Object {
"server.foo": "bar",
},
@@ -146,6 +152,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"quiet": true,
"suiteFiles": Object {
@@ -167,6 +174,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"silent": true,
"suiteFiles": Object {
@@ -188,6 +196,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "source",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -208,6 +217,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "source",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -228,6 +238,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"installDir": "foo",
"suiteFiles": Object {
@@ -249,6 +260,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"grep": "management",
"suiteFiles": Object {
@@ -270,6 +282,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
@@ -291,6 +304,7 @@ Object {
],
"createLogger": [Function],
"esFrom": "snapshot",
+ "esVersion": "999.999.999",
"extraKbnOpts": undefined,
"suiteFiles": Object {
"exclude": Array [],
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap
index 02d11b0033d57..6b81c2e499cf4 100644
--- a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap
+++ b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap
@@ -26,7 +26,8 @@ Options:
--verbose Log everything.
--debug Run in debug mode.
--quiet Only log errors.
- --silent Log nothing.
+ --silent Log nothing.
+ --dry-run Report tests without executing them.
"
`;
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
index 901ff6394649d..20aa65df7299b 100644
--- a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
+++ b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
@@ -10,6 +10,7 @@ import { resolve } from 'path';
import dedent from 'dedent';
import { ToolingLog, pickLevelFromFlags } from '@kbn/dev-utils';
+import { EsVersion } from '../../../functional_test_runner';
const options = {
help: { desc: 'Display this menu and exit.' },
@@ -64,6 +65,7 @@ const options = {
debug: { desc: 'Run in debug mode.' },
quiet: { desc: 'Only log errors.' },
silent: { desc: 'Log nothing.' },
+ 'dry-run': { desc: 'Report tests without executing them.' },
};
export function displayHelp() {
@@ -135,6 +137,11 @@ export function processOptions(userOptions, defaultConfigPaths) {
userOptions.assertNoneExcluded = !!userOptions['assert-none-excluded'];
delete userOptions['assert-none-excluded'];
+ if (userOptions['dry-run']) {
+ userOptions.dryRun = userOptions['dry-run'];
+ delete userOptions['dry-run'];
+ }
+
function createLogger() {
return new ToolingLog({
level: pickLevelFromFlags(userOptions),
@@ -147,6 +154,7 @@ export function processOptions(userOptions, defaultConfigPaths) {
configs: configs.map((c) => resolve(c)),
createLogger,
extraKbnOpts: userOptions._,
+ esVersion: EsVersion.getDefault(),
};
}
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
index 7786aee5af552..72ba541466960 100644
--- a/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
+++ b/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
@@ -6,9 +6,20 @@
* Side Public License, v 1.
*/
-import { displayHelp, processOptions } from './args';
import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+import { displayHelp, processOptions } from './args';
+
+jest.mock('../../../functional_test_runner/lib/es_version', () => {
+ return {
+ EsVersion: class {
+ static getDefault() {
+ return '999.999.999';
+ }
+ },
+ };
+});
+
expect.addSnapshotSerializer(createAbsolutePathSerializer(process.cwd()));
const INITIAL_TEST_ES_FROM = process.env.TEST_ES_FROM;
diff --git a/packages/kbn-test/src/functional_tests/lib/run_ftr.ts b/packages/kbn-test/src/functional_tests/lib/run_ftr.ts
index f9e109928ddc0..e339347b07eb5 100644
--- a/packages/kbn-test/src/functional_tests/lib/run_ftr.ts
+++ b/packages/kbn-test/src/functional_tests/lib/run_ftr.ts
@@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import type { ToolingLog } from '@kbn/dev-utils';
-import { FunctionalTestRunner, readConfigFile } from '../../functional_test_runner';
+import { FunctionalTestRunner, readConfigFile, EsVersion } from '../../functional_test_runner';
import { CliError } from './run_cli';
export interface CreateFtrOptions {
@@ -26,6 +26,8 @@ export interface CreateFtrOptions {
exclude?: string[];
};
updateSnapshots?: boolean;
+ esVersion: EsVersion;
+ dryRun?: boolean;
}
export interface CreateFtrParams {
@@ -34,31 +36,48 @@ export interface CreateFtrParams {
}
async function createFtr({
configPath,
- options: { installDir, log, bail, grep, updateBaselines, suiteFiles, suiteTags, updateSnapshots },
+ options: {
+ installDir,
+ log,
+ bail,
+ grep,
+ updateBaselines,
+ suiteFiles,
+ suiteTags,
+ updateSnapshots,
+ esVersion,
+ dryRun,
+ },
}: CreateFtrParams) {
- const config = await readConfigFile(log, configPath);
+ const config = await readConfigFile(log, esVersion, configPath);
return {
config,
- ftr: new FunctionalTestRunner(log, configPath, {
- mochaOpts: {
- bail: !!bail,
- grep,
+ ftr: new FunctionalTestRunner(
+ log,
+ configPath,
+ {
+ mochaOpts: {
+ bail: !!bail,
+ grep,
+ dryRun: !!dryRun,
+ },
+ kbnTestServer: {
+ installDir,
+ },
+ updateBaselines,
+ updateSnapshots,
+ suiteFiles: {
+ include: [...(suiteFiles?.include || []), ...config.get('suiteFiles.include')],
+ exclude: [...(suiteFiles?.exclude || []), ...config.get('suiteFiles.exclude')],
+ },
+ suiteTags: {
+ include: [...(suiteTags?.include || []), ...config.get('suiteTags.include')],
+ exclude: [...(suiteTags?.exclude || []), ...config.get('suiteTags.exclude')],
+ },
},
- kbnTestServer: {
- installDir,
- },
- updateBaselines,
- updateSnapshots,
- suiteFiles: {
- include: [...(suiteFiles?.include || []), ...config.get('suiteFiles.include')],
- exclude: [...(suiteFiles?.exclude || []), ...config.get('suiteFiles.exclude')],
- },
- suiteTags: {
- include: [...(suiteTags?.include || []), ...config.get('suiteTags.include')],
- exclude: [...(suiteTags?.exclude || []), ...config.get('suiteTags.exclude')],
- },
- }),
+ esVersion
+ ),
};
}
@@ -71,15 +90,15 @@ export async function assertNoneExcluded({ configPath, options }: CreateFtrParam
}
const stats = await ftr.getTestStats();
- if (stats.excludedTests.length > 0) {
+ if (stats.testsExcludedByTag.length > 0) {
throw new CliError(`
- ${stats.excludedTests.length} tests in the ${configPath} config
+ ${stats.testsExcludedByTag.length} tests in the ${configPath} config
are excluded when filtering by the tags run on CI. Make sure that all suites are
tagged with one of the following tags:
${JSON.stringify(options.suiteTags)}
- - ${stats.excludedTests.join('\n - ')}
+ - ${stats.testsExcludedByTag.join('\n - ')}
`);
}
}
diff --git a/packages/kbn-test/src/functional_tests/tasks.ts b/packages/kbn-test/src/functional_tests/tasks.ts
index b220c3899a638..8059c94ae5b2f 100644
--- a/packages/kbn-test/src/functional_tests/tasks.ts
+++ b/packages/kbn-test/src/functional_tests/tasks.ts
@@ -22,7 +22,7 @@ import {
CreateFtrOptions,
} from './lib';
-import { readConfigFile } from '../functional_test_runner/lib';
+import { readConfigFile, EsVersion } from '../functional_test_runner/lib';
const makeSuccessMessage = (options: StartServerOptions) => {
const installDirFlag = options.installDir ? ` --kibana-install-dir=${options.installDir}` : '';
@@ -54,6 +54,7 @@ interface RunTestsParams extends CreateFtrOptions {
configs: string[];
/** run from source instead of snapshot */
esFrom?: string;
+ esVersion: EsVersion;
createLogger: () => ToolingLog;
extraKbnOpts: string[];
assertNoneExcluded: boolean;
@@ -104,11 +105,13 @@ export async function runTests(options: RunTestsParams) {
log.write(`--- [${progress}] Running ${relative(REPO_ROOT, configPath)}`);
await withProcRunner(log, async (procs) => {
- const config = await readConfigFile(log, configPath);
+ const config = await readConfigFile(log, options.esVersion, configPath);
let es;
try {
- es = await runElasticsearch({ config, options: { ...options, log } });
+ if (process.env.TEST_ES_DISABLE_STARTUP !== 'true') {
+ es = await runElasticsearch({ config, options: { ...options, log } });
+ }
await runKibanaServer({ procs, config, options });
await runFtr({ configPath, options: { ...options, log } });
} finally {
@@ -142,6 +145,7 @@ interface StartServerOptions {
createLogger: () => ToolingLog;
extraKbnOpts: string[];
useDefaultConfig?: boolean;
+ esVersion: EsVersion;
}
export async function startServers({ ...options }: StartServerOptions) {
@@ -159,7 +163,7 @@ export async function startServers({ ...options }: StartServerOptions) {
};
await withProcRunner(log, async (procs) => {
- const config = await readConfigFile(log, options.config);
+ const config = await readConfigFile(log, options.esVersion, options.config);
const es = await runElasticsearch({ config, options: opts });
await runKibanaServer({
diff --git a/packages/kbn-test/src/index.ts b/packages/kbn-test/src/index.ts
index f3771c76a722b..bd276036d2247 100644
--- a/packages/kbn-test/src/index.ts
+++ b/packages/kbn-test/src/index.ts
@@ -25,10 +25,26 @@ export { runTests, startServers } from './functional_tests/tasks';
// @internal
export { KIBANA_ROOT } from './functional_tests/lib/paths';
-export type { CreateTestEsClusterOptions, EsTestCluster, ICluster } from './es';
-export { esTestConfig, createTestEsCluster } from './es';
-
-export { kbnTestConfig, kibanaServerTestUser, kibanaTestUser, adminTestUser } from './kbn';
+export type {
+ CreateTestEsClusterOptions,
+ EsTestCluster,
+ ICluster,
+ EsClientForTestingOptions,
+} from './es';
+export {
+ esTestConfig,
+ createTestEsCluster,
+ createEsClientForTesting,
+ createEsClientForFtrConfig,
+} from './es';
+
+export {
+ kbnTestConfig,
+ kibanaServerTestUser,
+ kibanaTestUser,
+ adminTestUser,
+ systemIndicesSuperuser,
+} from './kbn';
export { readConfigFile } from './functional_test_runner/lib/config/read_config_file';
diff --git a/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts b/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts
new file mode 100644
index 0000000000000..94675d87a3a24
--- /dev/null
+++ b/packages/kbn-test/src/jest/ci_stats_jest_reporter.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as Path from 'path';
+
+import getopts from 'getopts';
+import { CiStatsReporter, ToolingLog, CiStatsReportTestsOptions } from '@kbn/dev-utils';
+import type { Config } from '@jest/types';
+import { BaseReporter, Test, TestResult } from '@jest/reporters';
+import { ConsoleBuffer } from '@jest/console';
+
+type LogEntry = ConsoleBuffer[0];
+
+interface ReporterOptions {
+ testGroupType: string;
+}
+
+function formatConsoleLine({ type, message, origin }: LogEntry) {
+ const originLines = origin.split('\n');
+
+ return `console.${type}: ${message}${originLines[0] ? `\n ${originLines[0]}` : ''}`;
+}
+
+/**
+ * Jest reporter that reports tests to CI Stats
+ * @class JestJUnitReporter
+ */
+
+// eslint-disable-next-line import/no-default-export
+export default class CiStatsJestReporter extends BaseReporter {
+ private reporter: CiStatsReporter | undefined;
+ private readonly testGroupType: string;
+ private readonly reportName: string;
+ private readonly rootDir: string;
+ private startTime: number | undefined;
+
+ private group: CiStatsReportTestsOptions['group'] | undefined;
+ private readonly testRuns: CiStatsReportTestsOptions['testRuns'] = [];
+
+ constructor(config: Config.GlobalConfig, options: ReporterOptions) {
+ super();
+
+ this.rootDir = config.rootDir;
+ this.testGroupType = options?.testGroupType;
+ if (!this.testGroupType) {
+ throw new Error('missing testGroupType reporter option');
+ }
+
+ const configArg = getopts(process.argv).config;
+ if (typeof configArg !== 'string') {
+ throw new Error('expected to find a single --config arg');
+ }
+ this.reportName = configArg;
+ }
+
+ async onRunStart() {
+ const reporter = CiStatsReporter.fromEnv(
+ new ToolingLog({
+ level: 'info',
+ writeTo: process.stdout,
+ })
+ );
+
+ if (!reporter.hasBuildConfig()) {
+ return;
+ }
+
+ this.startTime = Date.now();
+ this.reporter = reporter;
+ this.group = {
+ name: this.reportName,
+ type: this.testGroupType,
+ startTime: new Date(this.startTime).toJSON(),
+ meta: {},
+ durationMs: 0,
+ };
+ }
+
+ async onTestFileResult(_: Test, testResult: TestResult) {
+ if (!this.reporter || !this.group) {
+ return;
+ }
+
+ let elapsedTime = 0;
+ for (const t of testResult.testResults) {
+ const startTime = new Date(testResult.perfStats.start + elapsedTime).toJSON();
+ elapsedTime += t.duration ?? 0;
+ this.testRuns.push({
+ startTime,
+ durationMs: t.duration ?? 0,
+ seq: this.testRuns.length + 1,
+ file: Path.relative(this.rootDir, testResult.testFilePath),
+ name: t.title,
+ result: t.status === 'failed' ? 'fail' : t.status === 'passed' ? 'pass' : 'skip',
+ suites: t.ancestorTitles,
+ type: 'test',
+ error: t.failureMessages.join('\n\n'),
+ stdout: testResult.console?.map(formatConsoleLine).join('\n'),
+ });
+ }
+ }
+
+ async onRunComplete() {
+ if (!this.reporter || !this.group || !this.testRuns.length || !this.startTime) {
+ return;
+ }
+
+ this.group.durationMs = Date.now() - this.startTime;
+
+ await this.reporter.reportTests({
+ group: this.group,
+ testRuns: this.testRuns,
+ });
+ }
+}
diff --git a/packages/kbn-test/src/jest/configs/__snapshots__/jest_configs.test.ts.snap b/packages/kbn-test/src/jest/configs/__snapshots__/jest_configs.test.ts.snap
new file mode 100644
index 0000000000000..8de7ea9a41367
--- /dev/null
+++ b/packages/kbn-test/src/jest/configs/__snapshots__/jest_configs.test.ts.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`jestConfigs #expected throws if test file outside root 1`] = `[Error: Test file (bad.test.js) can not exist outside roots (packages/b/nested, packages). Move it to a root or configure additional root.]`;
diff --git a/packages/kbn-test/src/jest/configs/index.ts b/packages/kbn-test/src/jest/configs/index.ts
new file mode 100644
index 0000000000000..155c385ec761d
--- /dev/null
+++ b/packages/kbn-test/src/jest/configs/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from './jest_configs';
diff --git a/packages/kbn-test/src/jest/configs/jest_configs.test.ts b/packages/kbn-test/src/jest/configs/jest_configs.test.ts
new file mode 100644
index 0000000000000..4d68733f58d32
--- /dev/null
+++ b/packages/kbn-test/src/jest/configs/jest_configs.test.ts
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import mockFs from 'mock-fs';
+import fs from 'fs';
+
+import { JestConfigs } from './jest_configs';
+
+describe('jestConfigs', () => {
+ let jestConfigs: JestConfigs;
+
+ beforeEach(async () => {
+ mockFs({
+ '/kbn-test/packages': {
+ a: {
+ 'jest.config.js': '',
+ 'a_first.test.js': '',
+ 'a_second.test.js': '',
+ },
+ b: {
+ 'b.test.js': '',
+ integration_tests: {
+ 'b_integration.test.js': '',
+ },
+ nested: {
+ d: {
+ 'd.test.js': '',
+ },
+ },
+ },
+ c: {
+ 'jest.integration.config.js': '',
+ integration_tests: {
+ 'c_integration.test.js': '',
+ },
+ },
+ },
+ });
+ jestConfigs = new JestConfigs('/kbn-test', ['packages/b/nested', 'packages']);
+ });
+
+ afterEach(mockFs.restore);
+
+ describe('#files', () => {
+ it('lists unit test files', async () => {
+ const files = await jestConfigs.files('unit');
+ expect(files).toEqual([
+ 'packages/a/a_first.test.js',
+ 'packages/a/a_second.test.js',
+ 'packages/b/b.test.js',
+ 'packages/b/nested/d/d.test.js',
+ ]);
+ });
+
+ it('lists integration test files', async () => {
+ const files = await jestConfigs.files('integration');
+ expect(files).toEqual([
+ 'packages/b/integration_tests/b_integration.test.js',
+ 'packages/c/integration_tests/c_integration.test.js',
+ ]);
+ });
+ });
+
+ describe('#expected', () => {
+ it('expects unit config files', async () => {
+ const files = await jestConfigs.expected('unit');
+ expect(files).toEqual([
+ 'packages/a/jest.config.js',
+ 'packages/b/jest.config.js',
+ 'packages/b/nested/d/jest.config.js',
+ ]);
+ });
+
+ it('expects integration config files', async () => {
+ const files = await jestConfigs.expected('integration');
+ expect(files).toEqual([
+ 'packages/b/jest.integration.config.js',
+ 'packages/c/jest.integration.config.js',
+ ]);
+ });
+
+ it('throws if test file outside root', async () => {
+ fs.writeFileSync('/kbn-test/bad.test.js', '');
+ await expect(() => jestConfigs.expected('unit')).rejects.toMatchSnapshot();
+ });
+ });
+
+ describe('#existing', () => {
+ it('lists existing unit test config files', async () => {
+ const files = await jestConfigs.existing('unit');
+ expect(files).toEqual(['packages/a/jest.config.js']);
+ });
+
+ it('lists existing integration test config files', async () => {
+ const files = await jestConfigs.existing('integration');
+ expect(files).toEqual(['packages/c/jest.integration.config.js']);
+ });
+ });
+
+ describe('#missing', () => {
+ it('lists existing unit test config files', async () => {
+ const files = await jestConfigs.missing('unit');
+ expect(files).toEqual(['packages/b/jest.config.js', 'packages/b/nested/d/jest.config.js']);
+ });
+
+ it('lists existing integration test config files', async () => {
+ const files = await jestConfigs.missing('integration');
+ expect(files).toEqual(['packages/b/jest.integration.config.js']);
+ });
+ });
+});
diff --git a/packages/kbn-test/src/jest/configs/jest_configs.ts b/packages/kbn-test/src/jest/configs/jest_configs.ts
new file mode 100644
index 0000000000000..a2a55d4a1b649
--- /dev/null
+++ b/packages/kbn-test/src/jest/configs/jest_configs.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import path from 'path';
+import globby from 'globby';
+
+// @ts-ignore
+import { testMatch } from '../../../jest-preset';
+
+export const CONFIG_NAMES = {
+ unit: 'jest.config.js',
+ integration: 'jest.integration.config.js',
+};
+
+export class JestConfigs {
+ cwd: string;
+ roots: string[];
+ allFiles: string[] | undefined;
+
+ constructor(cwd: string, roots: string[]) {
+ this.cwd = cwd;
+ this.roots = roots;
+ }
+
+ async files(type: 'unit' | 'integration') {
+ if (!this.allFiles) {
+ this.allFiles = await globby(testMatch, {
+ gitignore: true,
+ cwd: this.cwd,
+ });
+ }
+
+ return this.allFiles.filter((f) =>
+ type === 'integration' ? f.includes('integration_tests') : !f.includes('integration_tests')
+ );
+ }
+
+ async expected(type: 'unit' | 'integration') {
+ const filesForType = await this.files(type);
+ const directories: Set = new Set();
+
+ filesForType.forEach((file) => {
+ const root = this.roots.find((r) => file.startsWith(r));
+
+ if (root) {
+ const splitPath = file.substring(root.length).split(path.sep);
+
+ if (splitPath.length > 2) {
+ const name = splitPath[1];
+ directories.add([root, name].join(path.sep));
+ }
+ } else {
+ throw new Error(
+ `Test file (${file}) can not exist outside roots (${this.roots.join(
+ ', '
+ )}). Move it to a root or configure additional root.`
+ );
+ }
+ });
+
+ return [...directories].map((d) => [d, CONFIG_NAMES[type]].join(path.sep));
+ }
+
+ async existing(type: 'unit' | 'integration') {
+ return await globby(`**/${CONFIG_NAMES[type]}`, {
+ gitignore: true,
+ cwd: this.cwd,
+ });
+ }
+
+ async missing(type: 'unit' | 'integration') {
+ const expectedConfigs = await this.expected(type);
+ const existingConfigs = await this.existing(type);
+ return await expectedConfigs.filter((x) => !existingConfigs.includes(x));
+ }
+
+ async allMissing() {
+ return (await this.missing('unit')).concat(await this.missing('integration'));
+ }
+}
diff --git a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
index cf37ee82d61e9..9522d9dafd6fd 100644
--- a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
+++ b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
@@ -6,26 +6,29 @@
* Side Public License, v 1.
*/
-import { relative, resolve, sep } from 'path';
import { writeFileSync } from 'fs';
-
-import execa from 'execa';
-import globby from 'globby';
+import path from 'path';
import Mustache from 'mustache';
-import { run } from '@kbn/dev-utils';
+import { run, createFailError } from '@kbn/dev-utils';
import { REPO_ROOT } from '@kbn/utils';
-// @ts-ignore
-import { testMatch } from '../../jest-preset';
+import { JestConfigs, CONFIG_NAMES } from './configs';
-const template: string = `module.exports = {
+const unitTestingTemplate: string = `module.exports = {
preset: '@kbn/test',
rootDir: '{{{relToRoot}}}',
roots: ['/{{{modulePath}}}'],
};
`;
+const integrationTestingTemplate: string = `module.exports = {
+ preset: '@kbn/test/jest_integration',
+ rootDir: '{{{relToRoot}}}',
+ roots: ['/{{{modulePath}}}'],
+};
+`;
+
const roots: string[] = [
'x-pack/plugins/security_solution/public',
'x-pack/plugins/security_solution/server',
@@ -40,68 +43,43 @@ const roots: string[] = [
export async function runCheckJestConfigsCli() {
run(
async ({ flags: { fix = false }, log }) => {
- const { stdout: coveredFiles } = await execa(
- 'yarn',
- ['--silent', 'jest', '--listTests', '--json'],
- {
- cwd: REPO_ROOT,
- }
- );
+ const jestConfigs = new JestConfigs(REPO_ROOT, roots);
- const allFiles = new Set(
- await globby(testMatch.concat(['!**/integration_tests/**']), {
- gitignore: true,
- })
- );
+ const missing = await jestConfigs.allMissing();
- JSON.parse(coveredFiles).forEach((file: string) => {
- const pathFromRoot = relative(REPO_ROOT, file);
- allFiles.delete(pathFromRoot);
- });
-
- if (allFiles.size) {
+ if (missing.length) {
log.error(
- `The following files do not belong to a jest.config.js file, or that config is not included from the root jest.config.js\n${[
- ...allFiles,
+ `The following Jest config files do not exist for which there are test files for:\n${[
+ ...missing,
]
.map((file) => ` - ${file}`)
.join('\n')}`
);
- } else {
- log.success('All test files are included by a Jest configuration');
- return;
- }
-
- if (fix) {
- allFiles.forEach((file) => {
- const root = roots.find((r) => file.startsWith(r));
- if (root) {
- const name = relative(root, file).split(sep)[0];
- const modulePath = [root, name].join('/');
+ if (fix) {
+ missing.forEach((file) => {
+ const template = file.endsWith(CONFIG_NAMES.unit)
+ ? unitTestingTemplate
+ : integrationTestingTemplate;
+ const modulePath = path.dirname(file);
const content = Mustache.render(template, {
- relToRoot: relative(modulePath, '.'),
+ relToRoot: path.relative(modulePath, '.'),
modulePath,
});
- const configPath = resolve(root, name, 'jest.config.js');
- log.info('created %s', configPath);
- writeFileSync(configPath, content);
- } else {
- log.warning(`Unable to determind where to place jest.config.js for ${file}`);
- }
- });
- } else {
- log.info(
- `Run 'node scripts/check_jest_configs --fix' to attempt to create the missing config files`
- );
+ writeFileSync(file, content);
+ log.info('created %s', file);
+ });
+ } else {
+ throw createFailError(
+ `Run 'node scripts/check_jest_configs --fix' to create the missing config files`
+ );
+ }
}
-
- process.exit(1);
},
{
- description: 'Check that all test files are covered by a jest.config.js',
+ description: 'Check that all test files are covered by a Jest config',
flags: {
boolean: ['fix'],
help: `
diff --git a/packages/kbn-test/src/jest/setup/mocks.eui.js b/packages/kbn-test/src/jest/setup/mocks.eui.js
new file mode 100644
index 0000000000000..caf7f8df6eb5f
--- /dev/null
+++ b/packages/kbn-test/src/jest/setup/mocks.eui.js
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/* eslint-env jest */
+
+jest.mock('@elastic/eui/lib/services/react', () => {
+ // `enqueueStateChange` is an EUI method to batch queued functions that trigger React `setState` calls.
+ // This is for performance, but when used in certain Jest scernarios it can be nondeterministic.
+ // Jest tests are never concerned about the state prior to batch completion, so we bypass batching entirely.
+ return {
+ enqueueStateChange: (fn) => fn(),
+ };
+});
diff --git a/packages/kbn-test/src/jest/setup/mocks.js b/packages/kbn-test/src/jest/setup/mocks.moment_timezone.js
similarity index 80%
rename from packages/kbn-test/src/jest/setup/mocks.js
rename to packages/kbn-test/src/jest/setup/mocks.moment_timezone.js
index df6e51b782f21..bfe1e58f60b12 100644
--- a/packages/kbn-test/src/jest/setup/mocks.js
+++ b/packages/kbn-test/src/jest/setup/mocks.moment_timezone.js
@@ -33,12 +33,3 @@ jest.mock('moment-timezone', () => {
moment.tz.setDefault('America/New_York');
return moment;
});
-
-jest.mock('@elastic/eui/lib/services/react', () => {
- // `enqueueStateChange` is an EUI method to batch queued functions that trigger React `setState` calls.
- // This is for performance, but when used in certain Jest scernarios it can be nondeterministic.
- // Jest tests are never concerned about the state prior to batch completion, so we bypass batching entirely.
- return {
- enqueueStateChange: (fn) => fn(),
- };
-});
diff --git a/packages/kbn-test/src/jest/setup/polyfills.js b/packages/kbn-test/src/jest/setup/polyfills.jsdom.js
similarity index 100%
rename from packages/kbn-test/src/jest/setup/polyfills.js
rename to packages/kbn-test/src/jest/setup/polyfills.jsdom.js
diff --git a/packages/kbn-test/src/jest/utils/testbed/README.md b/packages/kbn-test/src/jest/utils/testbed/README.md
index 5a05ba3750d3c..87cabd7ca4fa1 100644
--- a/packages/kbn-test/src/jest/utils/testbed/README.md
+++ b/packages/kbn-test/src/jest/utils/testbed/README.md
@@ -116,7 +116,7 @@ In order to prevent flakiness in component integration tests, please consider th
});
```
-- **Do not use** using `nextTick()`, `waitFor`, or `waitForFunc` helpers in tests. These helpers use `setTimeout` underneath and add latency in the tests, especially on CI where a timeout (even of a few ms) can trigger a timeout error. These helpers will eventually be deprecated once existing tests has been updated.
+- **Do not use** using `nextTick()` helper in tests. This helper use `setTimeout` underneath and add latency in the tests, especially on CI where a timeout (even of a few ms) can trigger a timeout error.
- **Do not declare** `component.update()` inside `act()`. Each `act()` call should contain a chunk of actions that updates the internal state(s). The `component.update()` that re-renders the internal DOM needs to be called outside, before asserting against the updated DOM.
@@ -274,14 +274,11 @@ expect(tableCellsValues).toEqual([
An object with the following methods:
-##### `setInputValue(input, value, isAsync)`
+##### `setInputValue(input, value)`
Set the value of a form input. The input can either be a test subject (a string) or an Enzyme react wrapper. If you specify a test subject,
you can provide a nested path to access it by separating the parent and child with a dot (e.g. `myForm.followerIndexName`).
-`isAsync`: flag that will return a Promise that resolves on the next "tick". This is useful if updating the input triggers
-an async operation (like a HTTP request) and we need it to resolve so the DOM gets updated (default: `false`).
-
```js
await form.setInputValue('myInput', 'some value', true);
```
diff --git a/packages/kbn-test/src/jest/utils/testbed/testbed.ts b/packages/kbn-test/src/jest/utils/testbed/testbed.ts
index 240ec25a9c296..b10f331da10d6 100644
--- a/packages/kbn-test/src/jest/utils/testbed/testbed.ts
+++ b/packages/kbn-test/src/jest/utils/testbed/testbed.ts
@@ -157,52 +157,17 @@ export function registerTestBed(
});
};
- const waitForFn: TestBed['waitForFn'] = async (predicate, errMessage) => {
- const triggeredAt = Date.now();
-
- const MAX_WAIT_TIME = 30000;
- const WAIT_INTERVAL = 50;
-
- const process = async (): Promise => {
- const isOK = await predicate();
-
- if (isOK) {
- // Great! nothing else to do here.
- return;
- }
-
- const timeElapsed = Date.now() - triggeredAt;
- if (timeElapsed > MAX_WAIT_TIME) {
- throw new Error(errMessage);
- }
-
- return new Promise((resolve) => setTimeout(resolve, WAIT_INTERVAL)).then(() => {
- component.update();
- return process();
- });
- };
-
- return process();
- };
-
- const waitFor: TestBed['waitFor'] = (testSubject: T, count = 1) => {
- return waitForFn(
- () => Promise.resolve(exists(testSubject, count)),
- `I waited patiently for the "${testSubject}" test subject to appear with no luck. It is nowhere to be found!`
- );
- };
-
/**
* ----------------------------------------------------------------
* Forms
* ----------------------------------------------------------------
*/
- const setInputValue: TestBed['form']['setInputValue'] = (
- input,
- value,
- isAsync = false
- ) => {
+ const setInputValue: TestBed['form']['setInputValue'] = function (input, value) {
+ if (arguments.length === 3) {
+ throw new Error(`Passing the "isAsync" arg is not supported anymore.`);
+ }
+
const formInput = typeof input === 'string' ? find(input) : input;
if (!formInput.length) {
@@ -210,11 +175,6 @@ export function registerTestBed(
}
formInput.simulate('change', { target: { value } });
component.update();
-
- if (!isAsync) {
- return;
- }
- return new Promise((resolve) => setTimeout(resolve));
};
const setSelectValue: TestBed['form']['setSelectValue'] = (
@@ -334,8 +294,6 @@ export function registerTestBed(
exists,
find,
setProps,
- waitFor,
- waitForFn,
table: {
getMetaData,
},
diff --git a/packages/kbn-test/src/jest/utils/testbed/types.ts b/packages/kbn-test/src/jest/utils/testbed/types.ts
index 121b848e51b51..924eaa2f81b15 100644
--- a/packages/kbn-test/src/jest/utils/testbed/types.ts
+++ b/packages/kbn-test/src/jest/utils/testbed/types.ts
@@ -61,31 +61,14 @@ export interface TestBed {
* @param updatedProps The updated prop object
*/
setProps: (updatedProps: any) => void;
- /**
- * Helper to wait until an element appears in the DOM as hooks updates cycles are tricky.
- * Useful when loading a component that fetches a resource from the server
- * and we need to wait for the data to be fetched (and bypass any "loading" state).
- */
- waitFor: (testSubject: T, count?: number) => Promise;
- waitForFn: (predicate: () => Promise, errMessage: string) => Promise;
form: {
/**
* Set the value of a form text input.
*
- * In some cases, changing an input value triggers an HTTP request to validate
- * the field. Even if we return immediately the response on the mock server we
- * still need to wait until the next tick before the DOM updates.
- * Setting isAsync to "true" takes care of that.
- *
* @param input The form input. Can either be a data-test-subj or a reactWrapper (can be a nested path. e.g. "myForm.myInput").
* @param value The value to set
- * @param isAsync If set to true will return a Promise that resolves on the next "tick"
*/
- setInputValue: (
- input: T | ReactWrapper,
- value: string,
- isAsync?: boolean
- ) => Promise | void;
+ setInputValue: (input: T | ReactWrapper, value: string) => void;
/**
* Set the value of a or a mocked
* For the you need to mock it like this
diff --git a/packages/kbn-test/src/kbn/index.ts b/packages/kbn-test/src/kbn/index.ts
index 3ba7ef97b062d..c8db8b9473d16 100644
--- a/packages/kbn-test/src/kbn/index.ts
+++ b/packages/kbn-test/src/kbn/index.ts
@@ -7,4 +7,9 @@
*/
export { kbnTestConfig } from './kbn_test_config';
-export { kibanaTestUser, kibanaServerTestUser, adminTestUser } from './users';
+export {
+ kibanaTestUser,
+ kibanaServerTestUser,
+ adminTestUser,
+ systemIndicesSuperuser,
+} from './users';
diff --git a/packages/kbn-test/src/kbn/users.ts b/packages/kbn-test/src/kbn/users.ts
index 88480fde74ddc..9e35e9d7b6c01 100644
--- a/packages/kbn-test/src/kbn/users.ts
+++ b/packages/kbn-test/src/kbn/users.ts
@@ -6,6 +6,9 @@
* Side Public License, v 1.
*/
+// @ts-expect-error no types
+import { SYSTEM_INDICES_SUPERUSER } from '@kbn/es';
+
const env = process.env;
export const kibanaTestUser = {
@@ -22,3 +25,11 @@ export const adminTestUser = {
username: env.TEST_ES_USER || 'elastic',
password: env.TEST_ES_PASS || 'changeme',
};
+
+/**
+ * User with higher privileges than regular superuser role for writing to system indices
+ */
+export const systemIndicesSuperuser = {
+ username: SYSTEM_INDICES_SUPERUSER,
+ password: env.TEST_ES_PASS || 'changeme',
+};
diff --git a/packages/kbn-test/src/kbn_archiver_cli.ts b/packages/kbn-test/src/kbn_archiver_cli.ts
index 80e35efaec976..f7f17900efcff 100644
--- a/packages/kbn-test/src/kbn_archiver_cli.ts
+++ b/packages/kbn-test/src/kbn_archiver_cli.ts
@@ -12,7 +12,7 @@ import Url from 'url';
import { RunWithCommands, createFlagError, Flags } from '@kbn/dev-utils';
import { KbnClient } from './kbn_client';
-import { readConfigFile } from './functional_test_runner';
+import { readConfigFile, EsVersion } from './functional_test_runner';
function getSinglePositionalArg(flags: Flags) {
const positional = flags._;
@@ -57,7 +57,7 @@ export function runKbnArchiverCli() {
throw createFlagError('expected --config to be a string');
}
- config = await readConfigFile(log, Path.resolve(flags.config));
+ config = await readConfigFile(log, EsVersion.getDefault(), Path.resolve(flags.config));
statsMeta.set('ftrConfigPath', flags.config);
}
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
index 904ccc385bd7d..a9d677ac5a5f1 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_saved_objects.ts
@@ -214,6 +214,25 @@ export class KbnClientSavedObjects {
this.log.success('deleted', deleted, 'objects');
}
+ public async cleanStandardList(options?: { space?: string }) {
+ // add types here
+ const types = [
+ 'search',
+ 'index-pattern',
+ 'visualization',
+ 'dashboard',
+ 'lens',
+ 'map',
+ 'graph-workspace',
+ 'query',
+ 'tag',
+ 'url',
+ 'canvas-workpad',
+ ];
+ const newOptions = { types, space: options?.space };
+ await this.clean(newOptions);
+ }
+
public async bulkDelete(options: DeleteObjectsOptions) {
let deleted = 0;
let missing = 0;
diff --git a/packages/kbn-test/src/mocha/index.ts b/packages/kbn-test/src/mocha/index.ts
index 4ada51c7ae013..1be65d60a9842 100644
--- a/packages/kbn-test/src/mocha/index.ts
+++ b/packages/kbn-test/src/mocha/index.ts
@@ -11,7 +11,7 @@
export { setupJUnitReportGeneration } from './junit_report_generation';
// @ts-ignore not typed yet
// @internal
-export { recordLog, snapshotLogsForRunnable } from './log_cache';
+export { recordLog, snapshotLogsForRunnable, getSnapshotOfRunnableLogs } from './log_cache';
// @ts-ignore not typed yet
// @internal
export { escapeCdata } from './xml';
diff --git a/packages/kbn-test/types/ftr_globals/mocha.d.ts b/packages/kbn-test/types/ftr_globals/mocha.d.ts
index ac9e33d4b9dcc..d5895b40f1245 100644
--- a/packages/kbn-test/types/ftr_globals/mocha.d.ts
+++ b/packages/kbn-test/types/ftr_globals/mocha.d.ts
@@ -14,5 +14,11 @@ declare module 'mocha' {
* Assign tags to the test suite to determine in which CI job it should be run.
*/
tags(tags: string[] | string): void;
+ /**
+ * Define the ES versions for which this test requires, any version which doesn't meet this range will
+ * cause these tests to be skipped
+ * @param semver any valid semver range, like ">=8"
+ */
+ onlyEsVersion(semver: string): void;
}
}
diff --git a/packages/kbn-ui-shared-deps-src/src/flot_charts/jquery_flot.js b/packages/kbn-ui-shared-deps-src/src/flot_charts/jquery_flot.js
index 43db1cc3d93db..5252356279e51 100644
--- a/packages/kbn-ui-shared-deps-src/src/flot_charts/jquery_flot.js
+++ b/packages/kbn-ui-shared-deps-src/src/flot_charts/jquery_flot.js
@@ -351,7 +351,7 @@ Licensed under the MIT license.
if (info == null) {
- var element = $("").html(text)
+ var element = $("").text(text)
.css({
position: "absolute",
'max-width': width,
diff --git a/scripts/jest_integration.js b/scripts/jest_integration.js
index 7332f368b31e2..9b4157eddaaf8 100755
--- a/scripts/jest_integration.js
+++ b/scripts/jest_integration.js
@@ -9,4 +9,4 @@
require('../src/setup_node_env/ensure_node_preserve_symlinks');
process.argv.push('--runInBand');
-require('@kbn/test').runJest('jest.config.integration.js');
+require('@kbn/test').runJest('jest.integration.config.js');
diff --git a/src/cli/jest.integration.config.js b/src/cli/jest.integration.config.js
new file mode 100644
index 0000000000000..96f02d0524688
--- /dev/null
+++ b/src/cli/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration',
+ rootDir: '../..',
+ roots: ['/src/cli'],
+};
diff --git a/src/core/jest.integration.config.js b/src/core/jest.integration.config.js
new file mode 100644
index 0000000000000..3b84ae88ad7a7
--- /dev/null
+++ b/src/core/jest.integration.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+ preset: '@kbn/test/jest_integration',
+ rootDir: '../..',
+ roots: ['/src/core'],
+};
diff --git a/src/core/public/apm_system.ts b/src/core/public/apm_system.ts
index 5201b7005c66e..f15a317f9f934 100644
--- a/src/core/public/apm_system.ts
+++ b/src/core/public/apm_system.ts
@@ -71,7 +71,7 @@ export class ApmSystem {
start.application.currentAppId$.subscribe((appId) => {
if (appId && this.apm) {
this.closePageLoadTransaction();
- this.apm.startTransaction(`/app/${appId}`, 'route-change', {
+ this.apm.startTransaction(appId, 'app-change', {
managed: true,
canReuse: true,
});
diff --git a/src/core/public/application/utils/parse_app_url.test.ts b/src/core/public/application/utils/parse_app_url.test.ts
index 71137900d6748..e43fd1045e435 100644
--- a/src/core/public/application/utils/parse_app_url.test.ts
+++ b/src/core/public/application/utils/parse_app_url.test.ts
@@ -39,6 +39,12 @@ describe('parseAppUrl', () => {
id: 'bar',
appRoute: '/custom-bar',
});
+ createApp({
+ id: 're',
+ });
+ createApp({
+ id: 'retail',
+ });
});
describe('with absolute paths', () => {
@@ -51,6 +57,14 @@ describe('parseAppUrl', () => {
app: 'bar',
path: undefined,
});
+ expect(parseAppUrl('/base-path/app/re', basePath, apps, currentUrl)).toEqual({
+ app: 're',
+ path: undefined,
+ });
+ expect(parseAppUrl('/base-path/app/retail', basePath, apps, currentUrl)).toEqual({
+ app: 'retail',
+ path: undefined,
+ });
});
it('parses the path', () => {
expect(parseAppUrl('/base-path/app/foo/some/path', basePath, apps, currentUrl)).toEqual({
@@ -63,6 +77,14 @@ describe('parseAppUrl', () => {
app: 'bar',
path: '/another/path/',
});
+ expect(parseAppUrl('/base-path/app/re/tail', basePath, apps, currentUrl)).toEqual({
+ app: 're',
+ path: '/tail',
+ });
+ expect(parseAppUrl('/base-path/app/retail/path', basePath, apps, currentUrl)).toEqual({
+ app: 'retail',
+ path: '/path',
+ });
});
it('includes query and hash in the path for default app route', () => {
expect(parseAppUrl('/base-path/app/foo#hash/bang', basePath, apps, currentUrl)).toEqual({
@@ -89,6 +111,18 @@ describe('parseAppUrl', () => {
app: 'foo',
path: '/path#hash/bang?hello=dolly',
});
+ expect(parseAppUrl('/base-path/app/re#hash/bang', basePath, apps, currentUrl)).toEqual({
+ app: 're',
+ path: '#hash/bang',
+ });
+ expect(parseAppUrl('/base-path/app/retail?hello=dolly', basePath, apps, currentUrl)).toEqual({
+ app: 'retail',
+ path: '?hello=dolly',
+ });
+ expect(parseAppUrl('/base-path/app/retail#hash/bang', basePath, apps, currentUrl)).toEqual({
+ app: 'retail',
+ path: '#hash/bang',
+ });
});
it('includes query and hash in the path for custom app route', () => {
expect(parseAppUrl('/base-path/custom-bar#hash/bang', basePath, apps, currentUrl)).toEqual({
@@ -190,7 +224,6 @@ describe('parseAppUrl', () => {
path: '/path#hash?hello=dolly',
});
});
-
it('returns undefined if the relative path redirect outside of the basePath', () => {
expect(
parseAppUrl(
@@ -201,6 +234,19 @@ describe('parseAppUrl', () => {
)
).toBeUndefined();
});
+ it('works with inclusive app ids', () => {
+ expect(
+ parseAppUrl(
+ './retail/path',
+ basePath,
+ apps,
+ 'https://kibana.local:8080/base-path/app/current'
+ )
+ ).toEqual({
+ app: 'retail',
+ path: '/path',
+ });
+ });
});
describe('with absolute urls', () => {
@@ -217,6 +263,18 @@ describe('parseAppUrl', () => {
app: 'bar',
path: undefined,
});
+ expect(
+ parseAppUrl('https://kibana.local:8080/base-path/app/re', basePath, apps, currentUrl)
+ ).toEqual({
+ app: 're',
+ path: undefined,
+ });
+ expect(
+ parseAppUrl('https://kibana.local:8080/base-path/app/retail', basePath, apps, currentUrl)
+ ).toEqual({
+ app: 'retail',
+ path: undefined,
+ });
});
it('parses the path', () => {
expect(
@@ -241,6 +299,29 @@ describe('parseAppUrl', () => {
app: 'bar',
path: '/another/path/',
});
+
+ expect(
+ parseAppUrl(
+ 'https://kibana.local:8080/base-path/app/re/some/path',
+ basePath,
+ apps,
+ currentUrl
+ )
+ ).toEqual({
+ app: 're',
+ path: '/some/path',
+ });
+ expect(
+ parseAppUrl(
+ 'https://kibana.local:8080/base-path/app/retail/another/path/',
+ basePath,
+ apps,
+ currentUrl
+ )
+ ).toEqual({
+ app: 'retail',
+ path: '/another/path/',
+ });
});
it('includes query and hash in the path for default app routes', () => {
expect(
@@ -298,6 +379,28 @@ describe('parseAppUrl', () => {
app: 'foo',
path: '/path#hash/bang?hello=dolly',
});
+ expect(
+ parseAppUrl(
+ 'https://kibana.local:8080/base-path/app/re#hash/bang',
+ basePath,
+ apps,
+ currentUrl
+ )
+ ).toEqual({
+ app: 're',
+ path: '#hash/bang',
+ });
+ expect(
+ parseAppUrl(
+ 'https://kibana.local:8080/base-path/app/re?hello=dolly',
+ basePath,
+ apps,
+ currentUrl
+ )
+ ).toEqual({
+ app: 're',
+ path: '?hello=dolly',
+ });
});
it('includes query and hash in the path for custom app route', () => {
expect(
diff --git a/src/core/public/application/utils/parse_app_url.ts b/src/core/public/application/utils/parse_app_url.ts
index 099e8a550920c..db4f3dc6d2420 100644
--- a/src/core/public/application/utils/parse_app_url.ts
+++ b/src/core/public/application/utils/parse_app_url.ts
@@ -61,7 +61,7 @@ export const parseAppUrl = (
for (const app of apps.values()) {
const appPath = app.appRoute || `/app/${app.id}`;
- if (url.startsWith(appPath)) {
+ if (urlInApp(url, appPath)) {
const path = url.substr(appPath.length);
return {
app: app.id,
@@ -70,3 +70,16 @@ export const parseAppUrl = (
}
}
};
+
+const separators = ['/', '?', '#'];
+
+const urlInApp = (url: string, appPath: string) => {
+ if (url === appPath) {
+ return true;
+ }
+ if (url.startsWith(appPath)) {
+ const nextChar = url.substring(appPath.length, appPath.length + 1);
+ return separators.includes(nextChar);
+ }
+ return false;
+};
diff --git a/src/core/public/core_app/status/components/__snapshots__/metric_tiles.test.tsx.snap b/src/core/public/core_app/status/components/__snapshots__/metric_tiles.test.tsx.snap
index 2219e0d7609b8..cc4e27a6d6388 100644
--- a/src/core/public/core_app/status/components/__snapshots__/metric_tiles.test.tsx.snap
+++ b/src/core/public/core_app/status/components/__snapshots__/metric_tiles.test.tsx.snap
@@ -4,17 +4,24 @@ exports[`MetricTile correct displays a byte metric 1`] = `
`;
exports[`MetricTile correct displays a float metric 1`] = `
-
`;
@@ -22,7 +29,7 @@ exports[`MetricTile correct displays a time metric 1`] = `
`;
@@ -31,7 +38,29 @@ exports[`MetricTile correct displays an untyped metric 1`] = `
`;
+
+exports[`MetricTile correctly displays a metric with metadata 1`] = `
+
+`;
diff --git a/src/core/public/core_app/status/components/metric_tiles.test.tsx b/src/core/public/core_app/status/components/metric_tiles.test.tsx
index 76608718e8cd3..8e6d1cf38cd01 100644
--- a/src/core/public/core_app/status/components/metric_tiles.test.tsx
+++ b/src/core/public/core_app/status/components/metric_tiles.test.tsx
@@ -35,6 +35,18 @@ const timeMetric: Metric = {
value: 1234,
};
+const metricWithMeta: Metric = {
+ name: 'Delay',
+ type: 'time',
+ value: 1,
+ meta: {
+ description: 'Percentiles',
+ title: '',
+ value: [1, 5, 10],
+ type: 'time',
+ },
+};
+
describe('MetricTile', () => {
it('correct displays an untyped metric', () => {
const component = shallow();
@@ -55,4 +67,9 @@ describe('MetricTile', () => {
const component = shallow();
expect(component).toMatchSnapshot();
});
+
+ it('correctly displays a metric with metadata', () => {
+ const component = shallow();
+ expect(component).toMatchSnapshot();
+ });
});
diff --git a/src/core/public/core_app/status/components/metric_tiles.tsx b/src/core/public/core_app/status/components/metric_tiles.tsx
index 1eb5ee4c95dd8..18fa9ae738227 100644
--- a/src/core/public/core_app/status/components/metric_tiles.tsx
+++ b/src/core/public/core_app/status/components/metric_tiles.tsx
@@ -7,24 +7,105 @@
*/
import React, { FunctionComponent } from 'react';
-import { EuiFlexGrid, EuiFlexItem, EuiCard } from '@elastic/eui';
-import { formatNumber, Metric } from '../lib';
+import { EuiFlexGrid, EuiFlexItem, EuiCard, EuiStat } from '@elastic/eui';
+import { DataType, formatNumber, Metric } from '../lib';
/*
- * Displays a metric with the correct format.
+ * Displays metadata for a metric.
*/
-export const MetricTile: FunctionComponent<{ metric: Metric }> = ({ metric }) => {
- const { name } = metric;
+const MetricCardFooter: FunctionComponent<{
+ title: string;
+ description: string;
+}> = ({ title, description }) => {
+ return (
+
+ );
+};
+
+const DelayMetricTile: FunctionComponent<{ metric: Metric }> = ({ metric }) => {
+ const { name, meta } = metric;
return (
+ )
+ }
+ />
+ );
+};
+
+const LoadMetricTile: FunctionComponent<{ metric: Metric }> = ({ metric }) => {
+ const { name, meta } = metric;
+ return (
+ }
/>
);
};
+const ResponseTimeMetric: FunctionComponent<{ metric: Metric }> = ({ metric }) => {
+ const { name, meta } = metric;
+ return (
+
+ )
+ }
+ />
+ );
+};
+
+/*
+ * Displays a metric with the correct format.
+ */
+export const MetricTile: FunctionComponent<{ metric: Metric }> = ({ metric }) => {
+ const { name } = metric;
+ switch (name) {
+ case 'Delay':
+ return ;
+ case 'Load':
+ return ;
+ case 'Response time avg':
+ return ;
+ default:
+ return (
+
+ );
+ }
+};
+
/*
* Wrapper component that simply maps each metric to MetricTile inside a FlexGroup
*/
@@ -38,11 +119,20 @@ export const MetricTiles: FunctionComponent<{ metrics: Metric[] }> = ({ metrics
);
+// formatting helper functions
+
const formatMetric = ({ value, type }: Metric) => {
const metrics = Array.isArray(value) ? value : [value];
return metrics.map((metric) => formatNumber(metric, type)).join(', ');
};
-const formatMetricId = ({ name }: Metric) => {
+const formatMetricId = (name: Metric['name']) => {
return name.toLowerCase().replace(/[ ]+/g, '-');
};
+
+const formatDelayFooterTitle = (values: number[], type?: DataType) => {
+ return `
+ 50: ${formatNumber(values[0], type)};
+ 95: ${formatNumber(values[1], type)};
+ 99: ${formatNumber(values[2], type)}`;
+};
diff --git a/src/core/public/core_app/status/lib/load_status.test.ts b/src/core/public/core_app/status/lib/load_status.test.ts
index 73c697c3d55aa..5b5a2d0af99bc 100644
--- a/src/core/public/core_app/status/lib/load_status.test.ts
+++ b/src/core/public/core_app/status/lib/load_status.test.ts
@@ -218,13 +218,23 @@ describe('response processing', () => {
expect(names).toEqual([
'Heap total',
'Heap used',
+ 'Requests per second',
'Load',
+ 'Delay',
'Response time avg',
- 'Response time max',
- 'Requests per second',
]);
-
const values = data.metrics.map((m) => m.value);
- expect(values).toEqual([1000000, 100, [4.1, 2.1, 0.1], 4000, 8000, 400]);
+ expect(values).toEqual([1000000, 100, 400, [4.1, 2.1, 0.1], 1, 4000]);
+ });
+
+ test('adds meta details to Load, Delay and Response time', async () => {
+ const data = await loadStatus({ http, notifications });
+ const metricNames = data.metrics.filter((met) => met.meta);
+ expect(metricNames.map((item) => item.name)).toEqual(['Load', 'Delay', 'Response time avg']);
+ expect(metricNames.map((item) => item.meta!.description)).toEqual([
+ 'Load interval',
+ 'Percentiles',
+ 'Response time max',
+ ]);
});
});
diff --git a/src/core/public/core_app/status/lib/load_status.ts b/src/core/public/core_app/status/lib/load_status.ts
index a5cc18ffd6c16..f33ad70c63f53 100644
--- a/src/core/public/core_app/status/lib/load_status.ts
+++ b/src/core/public/core_app/status/lib/load_status.ts
@@ -13,10 +13,17 @@ import type { HttpSetup } from '../../../http';
import type { NotificationsSetup } from '../../../notifications';
import type { DataType } from '../lib';
+interface MetricMeta {
+ title: string;
+ description: string;
+ value?: number[];
+ type?: DataType;
+}
export interface Metric {
name: string;
value: number | number[];
type?: DataType;
+ meta?: MetricMeta;
}
export interface FormattedStatus {
@@ -57,33 +64,62 @@ function formatMetrics({ metrics }: StatusResponse): Metric[] {
value: metrics.process.memory.heap.used_in_bytes,
type: 'byte',
},
+ {
+ name: i18n.translate('core.statusPage.metricsTiles.columns.requestsPerSecHeader', {
+ defaultMessage: 'Requests per second',
+ }),
+ value: (metrics.requests.total * 1000) / metrics.collection_interval_in_millis,
+ type: 'float',
+ },
{
name: i18n.translate('core.statusPage.metricsTiles.columns.loadHeader', {
defaultMessage: 'Load',
}),
value: [metrics.os.load['1m'], metrics.os.load['5m'], metrics.os.load['15m']],
type: 'float',
+ meta: {
+ description: i18n.translate('core.statusPage.metricsTiles.columns.load.metaHeader', {
+ defaultMessage: 'Load interval',
+ }),
+ title: Object.keys(metrics.os.load).join('; '),
+ },
},
{
- name: i18n.translate('core.statusPage.metricsTiles.columns.resTimeAvgHeader', {
- defaultMessage: 'Response time avg',
+ name: i18n.translate('core.statusPage.metricsTiles.columns.processDelayHeader', {
+ defaultMessage: 'Delay',
}),
- value: metrics.response_times.avg_in_millis,
+ value: metrics.process.event_loop_delay,
type: 'time',
+ meta: {
+ description: i18n.translate(
+ 'core.statusPage.metricsTiles.columns.processDelayDetailsHeader',
+ {
+ defaultMessage: 'Percentiles',
+ }
+ ),
+ title: '',
+ value: [
+ metrics.process.event_loop_delay_histogram?.percentiles['50'],
+ metrics.process.event_loop_delay_histogram?.percentiles['95'],
+ metrics.process.event_loop_delay_histogram?.percentiles['99'],
+ ],
+ type: 'time',
+ },
},
{
- name: i18n.translate('core.statusPage.metricsTiles.columns.resTimeMaxHeader', {
- defaultMessage: 'Response time max',
+ name: i18n.translate('core.statusPage.metricsTiles.columns.resTimeAvgHeader', {
+ defaultMessage: 'Response time avg',
}),
- value: metrics.response_times.max_in_millis,
+ value: metrics.response_times.avg_in_millis,
type: 'time',
- },
- {
- name: i18n.translate('core.statusPage.metricsTiles.columns.requestsPerSecHeader', {
- defaultMessage: 'Requests per second',
- }),
- value: (metrics.requests.total * 1000) / metrics.collection_interval_in_millis,
- type: 'float',
+ meta: {
+ description: i18n.translate('core.statusPage.metricsTiles.columns.resTimeMaxHeader', {
+ defaultMessage: 'Response time max',
+ }),
+ title: '',
+ value: [metrics.response_times.max_in_millis],
+ type: 'time',
+ },
},
];
}
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 8eec74c042fcf..754fb6596e7a9 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -20,7 +20,6 @@ export class DocLinksService {
public start({ injectedMetadata }: StartDeps): DocLinksStart {
const DOC_LINK_VERSION = injectedMetadata.getKibanaBranch();
const ELASTIC_WEBSITE_URL = 'https://www.elastic.co/';
- const STACK_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack/${DOC_LINK_VERSION}/`;
const ELASTICSEARCH_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`;
const KIBANA_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/`;
const FLEET_DOCS = `${ELASTIC_WEBSITE_URL}guide/en/fleet/${DOC_LINK_VERSION}/`;
@@ -36,7 +35,8 @@ export class DocLinksService {
settings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/settings.html`,
elasticStackGetStarted: `${STACK_GETTING_STARTED}get-started-elastic-stack.html`,
upgrade: {
- upgradingElasticStack: `${STACK_DOCS}upgrading-elastic-stack.html`,
+ upgradingStackOnPrem: `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack/8.0/upgrading-elastic-stack-on-prem.html`,
+ upgradingStackOnCloud: `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack/8.0/upgrade-elastic-stack-for-elastic-cloud.html`,
},
apm: {
kibanaSettings: `${KIBANA_DOCS}apm-settings-in-kibana.html`,
@@ -172,6 +172,7 @@ export class DocLinksService {
asyncSearch: `${ELASTICSEARCH_DOCS}async-search-intro.html`,
dataStreams: `${ELASTICSEARCH_DOCS}data-streams.html`,
deprecationLogging: `${ELASTICSEARCH_DOCS}logging.html#deprecation-logging`,
+ hiddenIndices: `${ELASTICSEARCH_DOCS}multi-index.html#hidden`,
ilm: `${ELASTICSEARCH_DOCS}index-lifecycle-management.html`,
ilmForceMerge: `${ELASTICSEARCH_DOCS}ilm-forcemerge.html`,
ilmFreeze: `${ELASTICSEARCH_DOCS}ilm-freeze.html`,
@@ -536,7 +537,8 @@ export interface DocLinksStart {
readonly settings: string;
readonly elasticStackGetStarted: string;
readonly upgrade: {
- readonly upgradingElasticStack: string;
+ readonly upgradingStackOnPrem: string;
+ readonly upgradingStackOnCloud: string;
};
readonly apm: {
readonly kibanaSettings: string;
diff --git a/src/core/public/notifications/toasts/toasts_api.test.ts b/src/core/public/notifications/toasts/toasts_api.test.ts
index 87d703d5b6814..35f141a995d06 100644
--- a/src/core/public/notifications/toasts/toasts_api.test.ts
+++ b/src/core/public/notifications/toasts/toasts_api.test.ts
@@ -19,13 +19,13 @@ async function getCurrentToasts(toasts: ToastsApi) {
function uiSettingsMock() {
const mock = uiSettingsServiceMock.createSetupContract();
- mock.get.mockImplementation(() => (config: string) => {
+ mock.get.mockImplementation((config: string) => {
switch (config) {
case 'notifications:lifetime:info':
return 5000;
case 'notifications:lifetime:warning':
return 10000;
- case 'notification:lifetime:error':
+ case 'notifications:lifetime:error':
return 30000;
default:
throw new Error(`Accessing ${config} is not supported in the mock.`);
@@ -113,6 +113,12 @@ describe('#add()', () => {
const toasts = new ToastsApi(toastDeps());
expect(toasts.add('foo')).toHaveProperty('title', 'foo');
});
+
+ it('fallbacks to default values for undefined properties', async () => {
+ const toasts = new ToastsApi(toastDeps());
+ const toast = toasts.add({ title: 'foo', toastLifeTimeMs: undefined });
+ expect(toast.toastLifeTimeMs).toEqual(5000);
+ });
});
describe('#remove()', () => {
@@ -145,6 +151,12 @@ describe('#addInfo()', () => {
expect(currentToasts[0].toastLifeTimeMs).toBe(1);
expect(currentToasts[0]).toBe(toast);
});
+
+ it('fallbacks to default values for undefined properties', async () => {
+ const toasts = new ToastsApi(toastDeps());
+ const toast = toasts.addInfo({ title: 'foo', toastLifeTimeMs: undefined });
+ expect(toast.toastLifeTimeMs).toEqual(5000);
+ });
});
describe('#addSuccess()', () => {
@@ -159,6 +171,12 @@ describe('#addSuccess()', () => {
const currentToasts = await getCurrentToasts(toasts);
expect(currentToasts[0]).toBe(toast);
});
+
+ it('fallbacks to default values for undefined properties', async () => {
+ const toasts = new ToastsApi(toastDeps());
+ const toast = toasts.addSuccess({ title: 'foo', toastLifeTimeMs: undefined });
+ expect(toast.toastLifeTimeMs).toEqual(5000);
+ });
});
describe('#addWarning()', () => {
@@ -173,6 +191,12 @@ describe('#addWarning()', () => {
const currentToasts = await getCurrentToasts(toasts);
expect(currentToasts[0]).toBe(toast);
});
+
+ it('fallbacks to default values for undefined properties', async () => {
+ const toasts = new ToastsApi(toastDeps());
+ const toast = toasts.addWarning({ title: 'foo', toastLifeTimeMs: undefined });
+ expect(toast.toastLifeTimeMs).toEqual(10000);
+ });
});
describe('#addDanger()', () => {
@@ -187,6 +211,12 @@ describe('#addDanger()', () => {
const currentToasts = await getCurrentToasts(toasts);
expect(currentToasts[0]).toBe(toast);
});
+
+ it('fallbacks to default values for undefined properties', async () => {
+ const toasts = new ToastsApi(toastDeps());
+ const toast = toasts.addDanger({ title: 'foo', toastLifeTimeMs: undefined });
+ expect(toast.toastLifeTimeMs).toEqual(10000);
+ });
});
describe('#addError', () => {
diff --git a/src/core/public/notifications/toasts/toasts_api.tsx b/src/core/public/notifications/toasts/toasts_api.tsx
index 5e5d9d5615fd4..5aaea1ca90a56 100644
--- a/src/core/public/notifications/toasts/toasts_api.tsx
+++ b/src/core/public/notifications/toasts/toasts_api.tsx
@@ -9,6 +9,7 @@
import { EuiGlobalToastListToast as EuiToast } from '@elastic/eui';
import React from 'react';
import * as Rx from 'rxjs';
+import { omitBy, isUndefined } from 'lodash';
import { ErrorToast } from './error_toast';
import { MountPoint } from '../../types';
@@ -75,7 +76,7 @@ const normalizeToast = (toastOrTitle: ToastInput): ToastInputFields => {
title: toastOrTitle,
};
}
- return toastOrTitle;
+ return omitBy(toastOrTitle, isUndefined);
};
/**
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 14437602dab3d..c1aeb47d0c622 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -484,7 +484,8 @@ export interface DocLinksStart {
readonly settings: string;
readonly elasticStackGetStarted: string;
readonly upgrade: {
- readonly upgradingElasticStack: string;
+ readonly upgradingStackOnPrem: string;
+ readonly upgradingStackOnCloud: string;
};
readonly apm: {
readonly kibanaSettings: string;
diff --git a/src/core/server/core_usage_data/core_usage_data_service.mock.ts b/src/core/server/core_usage_data/core_usage_data_service.mock.ts
index 941ac5afacb40..d4ba6176cc78b 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.mock.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.mock.ts
@@ -138,6 +138,7 @@ const createStartContractMock = () => {
alias: 'test_index',
primaryStoreSizeBytes: 1,
storeSizeBytes: 1,
+ savedObjectsDocsCount: 1,
},
],
legacyUrlAliases: {
diff --git a/src/core/server/core_usage_data/core_usage_data_service.test.ts b/src/core/server/core_usage_data/core_usage_data_service.test.ts
index 89d83cfdee2b8..bdaa8ae58a807 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.test.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.test.ts
@@ -177,6 +177,11 @@ describe('CoreUsageDataService', () => {
},
],
} as any);
+ elasticsearch.client.asInternalUser.count.mockResolvedValueOnce({
+ body: {
+ count: '15',
+ },
+ } as any);
elasticsearch.client.asInternalUser.cat.indices.mockResolvedValueOnce({
body: [
{
@@ -188,6 +193,11 @@ describe('CoreUsageDataService', () => {
},
],
} as any);
+ elasticsearch.client.asInternalUser.count.mockResolvedValueOnce({
+ body: {
+ count: '10',
+ },
+ } as any);
elasticsearch.client.asInternalUser.search.mockResolvedValueOnce({
body: {
hits: { total: { value: 6 } },
@@ -343,6 +353,7 @@ describe('CoreUsageDataService', () => {
"docsCount": 10,
"docsDeleted": 10,
"primaryStoreSizeBytes": 2000,
+ "savedObjectsDocsCount": "15",
"storeSizeBytes": 1000,
},
Object {
@@ -350,6 +361,7 @@ describe('CoreUsageDataService', () => {
"docsCount": 20,
"docsDeleted": 20,
"primaryStoreSizeBytes": 4000,
+ "savedObjectsDocsCount": "10",
"storeSizeBytes": 2000,
},
],
diff --git a/src/core/server/core_usage_data/core_usage_data_service.ts b/src/core/server/core_usage_data/core_usage_data_service.ts
index 73f63d4d634df..609e7af3946fe 100644
--- a/src/core/server/core_usage_data/core_usage_data_service.ts
+++ b/src/core/server/core_usage_data/core_usage_data_service.ts
@@ -133,11 +133,11 @@ export class CoreUsageDataService implements CoreService())
.values()
- ).map((index) => {
+ ).map(async (index) => {
// The _cat/indices API returns the _index_ and doesn't return a way
// to map back from the index to the alias. So we have to make an API
- // call for every alias
- return elasticsearch.client.asInternalUser.cat
+ // call for every alias. The document count is the lucene document count.
+ const catIndicesResults = await elasticsearch.client.asInternalUser.cat
.indices({
index,
format: 'JSON',
@@ -145,6 +145,7 @@ export class CoreUsageDataService implements CoreService {
const stats = body[0];
+
return {
alias: kibanaOrTaskManagerIndex(index, this.kibanaConfig!.index),
docsCount: stats['docs.count'] ? parseInt(stats['docs.count'], 10) : 0,
@@ -155,6 +156,27 @@ export class CoreUsageDataService implements CoreService/_count API to get the number of saved objects
+ // to monitor if the cluster will hit the scalling limit of saved object migrations
+ const savedObjectsCounts = await elasticsearch.client.asInternalUser
+ .count({
+ index,
+ })
+ .then(({ body }) => {
+ return {
+ savedObjectsDocsCount: body.count ? body.count : 0,
+ };
+ });
+ this.logger.debug(
+ `Lucene documents count ${catIndicesResults.docsCount} from index ${catIndicesResults.alias}`
+ );
+ this.logger.debug(
+ `Saved objects documents count ${savedObjectsCounts.savedObjectsDocsCount} from index ${catIndicesResults.alias}`
+ );
+ return {
+ ...catIndicesResults,
+ ...savedObjectsCounts,
+ };
})
);
}
diff --git a/src/core/server/core_usage_data/types.ts b/src/core/server/core_usage_data/types.ts
index 7d0e9fd362d29..17eade436551d 100644
--- a/src/core/server/core_usage_data/types.ts
+++ b/src/core/server/core_usage_data/types.ts
@@ -177,6 +177,7 @@ export interface CoreServicesUsageData {
docsDeleted: number;
storeSizeBytes: number;
primaryStoreSizeBytes: number;
+ savedObjectsDocsCount: number;
}[];
legacyUrlAliases: {
activeCount: number;
diff --git a/src/core/server/deprecations/deprecations_registry.test.ts b/src/core/server/deprecations/deprecations_registry.test.ts
index 0e4f48b18a0a9..0f7e2704d934a 100644
--- a/src/core/server/deprecations/deprecations_registry.test.ts
+++ b/src/core/server/deprecations/deprecations_registry.test.ts
@@ -65,6 +65,25 @@ describe('DeprecationsRegistry', () => {
]);
});
+ it('rejects deprecations when reaching the timeout', async () => {
+ const deprecationsRegistry = new DeprecationsRegistry({ timeout: 100 });
+ const mockContext = {} as unknown as GetDeprecationsContext;
+ const deprecationsConfigA = {
+ getDeprecations: jest.fn().mockReturnValue(new Promise(() => {})),
+ };
+ deprecationsRegistry.registerDeprecations(deprecationsConfigA);
+ const deprecations = await deprecationsRegistry.getDeprecations(mockContext);
+ expect(deprecations).toStrictEqual([
+ {
+ status: 'rejected',
+ reason: expect.any(Error),
+ },
+ ]);
+ expect((deprecations[0] as PromiseRejectedResult).reason.message).toEqual(
+ 'Deprecations did not resolve in 10sec.'
+ );
+ });
+
it('passes dependencies to registered getDeprecations function', async () => {
const deprecationsRegistry = new DeprecationsRegistry();
const mockContext = {} as unknown as GetDeprecationsContext;
diff --git a/src/core/server/deprecations/deprecations_registry.ts b/src/core/server/deprecations/deprecations_registry.ts
index cc05473923ac8..e979bb94712e6 100644
--- a/src/core/server/deprecations/deprecations_registry.ts
+++ b/src/core/server/deprecations/deprecations_registry.ts
@@ -6,15 +6,23 @@
* Side Public License, v 1.
*/
+import { withTimeout, isPromise } from '@kbn/std';
import type {
DeprecationsDetails,
RegisterDeprecationsConfig,
GetDeprecationsContext,
} from './types';
+const MsInSec = 1000;
+
export class DeprecationsRegistry {
+ private readonly timeout: number;
private readonly deprecationContexts: RegisterDeprecationsConfig[] = [];
+ constructor({ timeout = 10 * MsInSec }: { timeout?: number } = {}) {
+ this.timeout = timeout;
+ }
+
public registerDeprecations = (deprecationContext: RegisterDeprecationsConfig) => {
if (typeof deprecationContext.getDeprecations !== 'function') {
throw new Error(`getDeprecations must be a function in registerDeprecations(context)`);
@@ -27,9 +35,21 @@ export class DeprecationsRegistry {
dependencies: GetDeprecationsContext
): Promise>> => {
return await Promise.allSettled(
- this.deprecationContexts.map(
- async (deprecationContext) => await deprecationContext.getDeprecations(dependencies)
- )
+ this.deprecationContexts.map(async (deprecationContext) => {
+ const maybePromise = deprecationContext.getDeprecations(dependencies);
+ if (isPromise(maybePromise)) {
+ const resultOrTimeout = await withTimeout({
+ promise: maybePromise,
+ timeoutMs: this.timeout,
+ });
+ if (resultOrTimeout.timedout) {
+ throw new Error('Deprecations did not resolve in 10sec.');
+ }
+ return resultOrTimeout.value;
+ } else {
+ return maybePromise;
+ }
+ })
);
};
}
diff --git a/src/core/server/elasticsearch/client/cluster_client.test.ts b/src/core/server/elasticsearch/client/cluster_client.test.ts
index f96f39349887e..b9fb8a21f0a8b 100644
--- a/src/core/server/elasticsearch/client/cluster_client.test.ts
+++ b/src/core/server/elasticsearch/client/cluster_client.test.ts
@@ -144,13 +144,13 @@ describe('ClusterClient', () => {
});
});
- it('creates a scoped facade with filtered auth headers', () => {
+ it('does not filter auth headers', () => {
const config = createConfig({
requestHeadersWhitelist: ['authorization'],
});
getAuthHeaders.mockReturnValue({
authorization: 'auth',
- other: 'nope',
+ other: 'yep',
});
const clusterClient = new ClusterClient(config, logger, 'custom-type', getAuthHeaders);
@@ -160,7 +160,12 @@ describe('ClusterClient', () => {
expect(scopedClient.child).toHaveBeenCalledTimes(1);
expect(scopedClient.child).toHaveBeenCalledWith({
- headers: { ...DEFAULT_HEADERS, authorization: 'auth', 'x-opaque-id': expect.any(String) },
+ headers: {
+ ...DEFAULT_HEADERS,
+ authorization: 'auth',
+ other: 'yep',
+ 'x-opaque-id': expect.any(String),
+ },
});
});
@@ -170,7 +175,7 @@ describe('ClusterClient', () => {
});
getAuthHeaders.mockReturnValue({
authorization: 'auth',
- other: 'nope',
+ other: 'yep',
});
const clusterClient = new ClusterClient(config, logger, 'custom-type', getAuthHeaders);
@@ -184,7 +189,12 @@ describe('ClusterClient', () => {
expect(scopedClient.child).toHaveBeenCalledTimes(1);
expect(scopedClient.child).toHaveBeenCalledWith({
- headers: { ...DEFAULT_HEADERS, authorization: 'auth', 'x-opaque-id': expect.any(String) },
+ headers: {
+ ...DEFAULT_HEADERS,
+ authorization: 'auth',
+ other: 'yep',
+ 'x-opaque-id': expect.any(String),
+ },
});
});
diff --git a/src/core/server/elasticsearch/client/cluster_client.ts b/src/core/server/elasticsearch/client/cluster_client.ts
index f81b651843013..9086fe464dbbe 100644
--- a/src/core/server/elasticsearch/client/cluster_client.ts
+++ b/src/core/server/elasticsearch/client/cluster_client.ts
@@ -54,7 +54,6 @@ export interface ICustomClusterClient extends IClusterClient {
export class ClusterClient implements ICustomClusterClient {
public readonly asInternalUser: Client;
private readonly rootScopedClient: Client;
- private readonly allowListHeaders: string[];
private isClosed = false;
@@ -72,8 +71,6 @@ export class ClusterClient implements ICustomClusterClient {
getExecutionContext,
scoped: true,
});
-
- this.allowListHeaders = ['x-opaque-id', ...this.config.requestHeadersWhitelist];
}
asScoped(request: ScopeableRequest) {
@@ -95,14 +92,15 @@ export class ClusterClient implements ICustomClusterClient {
private getScopedHeaders(request: ScopeableRequest): Headers {
let scopedHeaders: Headers;
if (isRealRequest(request)) {
- const requestHeaders = ensureRawRequest(request).headers;
+ const requestHeaders = ensureRawRequest(request).headers ?? {};
const requestIdHeaders = isKibanaRequest(request) ? { 'x-opaque-id': request.id } : {};
- const authHeaders = this.getAuthHeaders(request);
+ const authHeaders = this.getAuthHeaders(request) ?? {};
- scopedHeaders = filterHeaders(
- { ...requestHeaders, ...requestIdHeaders, ...authHeaders },
- this.allowListHeaders
- );
+ scopedHeaders = {
+ ...filterHeaders(requestHeaders, this.config.requestHeadersWhitelist),
+ ...requestIdHeaders,
+ ...authHeaders,
+ };
} else {
scopedHeaders = filterHeaders(request?.headers ?? {}, this.config.requestHeadersWhitelist);
}
diff --git a/src/core/server/elasticsearch/client/get_ecs_response_log.test.ts b/src/core/server/elasticsearch/client/get_ecs_response_log.test.ts
new file mode 100644
index 0000000000000..7ab70bc91bcb5
--- /dev/null
+++ b/src/core/server/elasticsearch/client/get_ecs_response_log.test.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { RequestEvent } from '@elastic/elasticsearch';
+import type { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
+import { getEcsResponseLog } from './get_ecs_response_log';
+
+interface ResponseFixtureOptions {
+ requestParams?: Partial;
+
+ response?: {
+ body?: any;
+ headers?: Record;
+ statusCode?: number;
+ };
+}
+
+function createResponseEvent({
+ requestParams = {},
+ response = {},
+}: ResponseFixtureOptions = {}): RequestEvent {
+ return {
+ body: response.body ?? {},
+ statusCode: response.statusCode ?? 200,
+ headers: response.headers ?? {},
+ meta: {
+ request: {
+ params: {
+ method: requestParams.method ?? 'get',
+ path: requestParams.path ?? '/path',
+ querystring: requestParams.querystring ?? '?wait_for_completion=true',
+ },
+ options: {
+ id: '42',
+ },
+ id: '42',
+ } as RequestEvent['meta']['request'],
+ } as RequestEvent['meta'],
+ warnings: null,
+ };
+}
+
+describe('getEcsResponseLog', () => {
+ describe('filters sensitive headers', () => {
+ test('redacts Authorization and Cookie headers by default', () => {
+ const event = createResponseEvent({
+ response: { headers: { 'content-length': '123', 'set-cookie': 'c' } },
+ });
+ const log = getEcsResponseLog(event);
+
+ // @ts-expect-error ECS custom field
+ expect(log.http.response.headers).toMatchInlineSnapshot(`
+ Object {
+ "content-length": "123",
+ "set-cookie": "[REDACTED]",
+ }
+ `);
+ });
+
+ test('does not mutate original headers', () => {
+ const resHeaders = { c: 'bar' };
+ const event = createResponseEvent({
+ response: { headers: resHeaders },
+ });
+
+ const log = getEcsResponseLog(event);
+
+ expect(resHeaders).toMatchInlineSnapshot(`
+ Object {
+ "c": "bar",
+ }
+ `);
+
+ // @ts-expect-error ECS custom field
+ log.http.response.headers.c = 'testC';
+ expect(resHeaders).toMatchInlineSnapshot(`
+ Object {
+ "c": "bar",
+ }
+ `);
+ });
+
+ test('does not mutate original headers when redacting sensitive data', () => {
+ const resHeaders = { 'content-length': '123', 'set-cookie': 'c' };
+ const event = createResponseEvent({
+ response: { headers: resHeaders },
+ });
+ getEcsResponseLog(event);
+
+ expect(resHeaders).toMatchInlineSnapshot(`
+ Object {
+ "content-length": "123",
+ "set-cookie": "c",
+ }
+ `);
+ });
+ });
+
+ describe('ecs', () => {
+ test('provides an ECS-compatible response', () => {
+ const event = createResponseEvent();
+ const result = getEcsResponseLog(event, 123);
+ expect(result).toMatchInlineSnapshot(`
+ Object {
+ "http": Object {
+ "request": Object {
+ "id": undefined,
+ "method": "GET",
+ },
+ "response": Object {
+ "body": Object {
+ "bytes": 123,
+ },
+ "headers": Object {},
+ "status_code": 200,
+ },
+ },
+ "url": Object {
+ "path": "/path",
+ },
+ }
+ `);
+ });
+ });
+});
diff --git a/src/core/server/elasticsearch/client/get_ecs_response_log.ts b/src/core/server/elasticsearch/client/get_ecs_response_log.ts
new file mode 100644
index 0000000000000..d25fdb7028556
--- /dev/null
+++ b/src/core/server/elasticsearch/client/get_ecs_response_log.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { IncomingHttpHeaders } from 'http';
+import type { RequestEvent } from '@elastic/elasticsearch';
+import type { LogMeta } from '@kbn/logging';
+
+const FORBIDDEN_HEADERS = ['authorization', 'cookie', 'set-cookie'];
+const REDACTED_HEADER_TEXT = '[REDACTED]';
+
+// We are excluding sensitive headers by default, until we have a log filtering mechanism.
+function redactSensitiveHeaders(key: string, value: string | string[]): string | string[] {
+ return FORBIDDEN_HEADERS.includes(key) ? REDACTED_HEADER_TEXT : value;
+}
+
+// Shallow clone the headers so they are not mutated if filtered by a RewriteAppender.
+function cloneAndFilterHeaders(headers?: IncomingHttpHeaders) {
+ const result = {} as IncomingHttpHeaders;
+ if (headers) {
+ for (const key of Object.keys(headers)) {
+ const value = headers[key];
+ if (value) {
+ result[key] = redactSensitiveHeaders(key, value);
+ }
+ }
+ }
+ return result;
+}
+
+/**
+ * Retruns ECS-compliant `LogMeta` for logging.
+ *
+ * @internal
+ */
+export function getEcsResponseLog(event: RequestEvent, bytes?: number): LogMeta {
+ const meta: LogMeta = {
+ http: {
+ request: {
+ id: event.meta.request.options.opaqueId,
+ method: event.meta.request.params.method.toUpperCase(),
+ },
+ response: {
+ body: {
+ bytes,
+ },
+ status_code: event.statusCode || undefined,
+ // @ts-expect-error ECS custom field: https://github.com/elastic/ecs/issues/232.
+ headers: cloneAndFilterHeaders(event.headers),
+ },
+ },
+ url: {
+ path: event.meta.request.params.path,
+ },
+ };
+
+ return meta;
+}
diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts
index 86655556bd16f..e82c94eac2b48 100644
--- a/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts
+++ b/src/core/server/elasticsearch/client/log_query_and_deprecation.test.ts
@@ -10,7 +10,6 @@ import { Buffer } from 'buffer';
import { Readable } from 'stream';
import { Client, errors } from '@elastic/elasticsearch';
-
import { parseClientOptionsMock, ClientMock } from './configure_client.test.mocks';
import { loggingSystemMock } from '../../logging/logging_system.mock';
import { instrumentEsQueryAndDeprecationLogger } from './log_query_and_deprecation';
@@ -26,7 +25,7 @@ const createApiResponse = ({
statusCode = 200,
headers = {},
warnings = null,
- params,
+ params = { method: 'GET', path: '/path', querystring: '?wait_for_completion=true' },
requestOptions = {},
}: {
body: T;
@@ -76,10 +75,14 @@ describe('instrumentQueryAndDeprecationLogger', () => {
jest.clearAllMocks();
});
- function createResponseWithBody(body?: RequestBody) {
+ function createResponseWithBody(
+ body?: RequestBody,
+ params?: { headers?: Record }
+ ) {
return createApiResponse({
body: {},
statusCode: 200,
+ headers: params?.headers ?? {},
params: {
method: 'GET',
path: '/foo',
@@ -106,15 +109,10 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "200
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200
GET /foo?hello=dolly
- {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}}",
- undefined,
- ],
- ]
+ {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}}"
`);
});
@@ -131,15 +129,10 @@ describe('instrumentQueryAndDeprecationLogger', () => {
);
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "200
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200
GET /foo?hello=dolly
- {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}}",
- undefined,
- ],
- ]
+ {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}}"
`);
});
@@ -158,15 +151,10 @@ describe('instrumentQueryAndDeprecationLogger', () => {
);
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "200
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200
GET /foo?hello=dolly
- [buffer]",
- undefined,
- ],
- ]
+ [buffer]"
`);
});
@@ -185,15 +173,10 @@ describe('instrumentQueryAndDeprecationLogger', () => {
);
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "200
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200
GET /foo?hello=dolly
- [stream]",
- undefined,
- ],
- ]
+ [stream]"
`);
});
@@ -203,14 +186,9 @@ describe('instrumentQueryAndDeprecationLogger', () => {
const response = createResponseWithBody();
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "200
- GET /foo?hello=dolly",
- undefined,
- ],
- ]
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200
+ GET /foo?hello=dolly"
`);
});
@@ -229,14 +207,9 @@ describe('instrumentQueryAndDeprecationLogger', () => {
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "200
- GET /foo?city=M%C3%BCnich",
- undefined,
- ],
- ]
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200
+ GET /foo?city=M%C3%BCnich"
`);
});
@@ -264,15 +237,10 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', new errors.ResponseError(response), response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "500
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "500
GET /foo?hello=dolly
- {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}} [internal server error]: internal server error",
- undefined,
- ],
- ]
+ {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}} [internal server error]: internal server error"
`);
});
@@ -282,14 +250,9 @@ describe('instrumentQueryAndDeprecationLogger', () => {
const response = createApiResponse({ body: {} });
client.emit('response', new errors.TimeoutError('message', response), response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "[TimeoutError]: message",
- undefined,
- ],
- ]
- `);
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(
+ `"[TimeoutError]: message"`
+ );
});
it('logs debug when the client emits an ResponseError returned by elasticsearch', () => {
@@ -312,14 +275,9 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', new errors.ResponseError(response), response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "400
- GET /_path?hello=dolly [illegal_argument_exception]: request [/_path] contains unrecognized parameter: [name]",
- undefined,
- ],
- ]
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "400
+ GET /_path?hello=dolly [illegal_argument_exception]: request [/_path] contains unrecognized parameter: [name]"
`);
});
@@ -339,14 +297,9 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', new errors.ResponseError(response), response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "400
- GET /_path [undefined]: {\\"error\\":{}}",
- undefined,
- ],
- ]
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "400
+ GET /_path [undefined]: {\\"error\\":{}}"
`);
logger.debug.mockClear();
@@ -362,14 +315,9 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', new errors.ResponseError(response), response);
- expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
- Array [
- Array [
- "400
- GET /_path [undefined]: Response Error",
- undefined,
- ],
- ]
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "400
+ GET /_path [undefined]: Response Error"
`);
});
@@ -397,8 +345,19 @@ describe('instrumentQueryAndDeprecationLogger', () => {
"http": Object {
"request": Object {
"id": "opaque-id",
+ "method": "GET",
+ },
+ "response": Object {
+ "body": Object {
+ "bytes": undefined,
+ },
+ "headers": Object {},
+ "status_code": 400,
},
},
+ "url": Object {
+ "path": "/_path",
+ },
}
`);
@@ -423,11 +382,45 @@ describe('instrumentQueryAndDeprecationLogger', () => {
"http": Object {
"request": Object {
"id": "opaque-id",
+ "method": "GET",
+ },
+ "response": Object {
+ "body": Object {
+ "bytes": undefined,
+ },
+ "headers": Object {},
+ "status_code": 400,
},
},
+ "url": Object {
+ "path": "/_path",
+ },
}
`);
});
+
+ it('logs response size', () => {
+ instrumentEsQueryAndDeprecationLogger({ logger, client, type: 'test type' });
+
+ const response = createResponseWithBody(
+ {
+ seq_no_primary_term: true,
+ query: {
+ term: { user: 'kimchy' },
+ },
+ },
+ {
+ headers: { 'content-length': '12345678' },
+ }
+ );
+
+ client.emit('response', null, response);
+ expect(loggingSystemMock.collect(logger).debug[0][0]).toMatchInlineSnapshot(`
+ "200 - 11.8MB
+ GET /foo?hello=dolly
+ {\\"seq_no_primary_term\\":true,\\"query\\":{\\"term\\":{\\"user\\":\\"kimchy\\"}}}"
+ `);
+ });
});
describe('deprecation warnings from response headers', () => {
@@ -539,13 +532,12 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', new errors.ResponseError(response), response);
- // One debug log entry from 'elasticsearch.query' context
- expect(loggingSystemMock.collect(logger).debug.length).toEqual(1);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch('Origin:kibana');
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch('Origin:kibana');
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
/Query:\n.*400\n.*GET \/_path\?hello\=dolly \[illegal_argument_exception\]: request \[\/_path\] contains unrecognized parameter: \[name\]/
);
});
@@ -571,7 +563,6 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', null, response);
- expect(loggingSystemMock.collect(logger).info).toEqual([]);
// Test debug[1] since theree is one log entry from 'elasticsearch.query' context
expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
@@ -605,13 +596,12 @@ describe('instrumentQueryAndDeprecationLogger', () => {
});
client.emit('response', null, response);
- // One debug log entry from 'elasticsearch.query' context
- expect(loggingSystemMock.collect(logger).debug.length).toEqual(1);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ // Test debug[1] since theree is one log entry from 'elasticsearch.query' context
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
'Elasticsearch deprecation: 299 Elasticsearch-8.1.0 "GET /_path is deprecated"'
);
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch('Origin:kibana');
- expect(loggingSystemMock.collect(logger).info[0][0]).toMatch(
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch('Origin:kibana');
+ expect(loggingSystemMock.collect(logger).debug[1][0]).toMatch(
/Query:\n.*200\n.*GET \/_path\?hello\=dolly/
);
});
diff --git a/src/core/server/elasticsearch/client/log_query_and_deprecation.ts b/src/core/server/elasticsearch/client/log_query_and_deprecation.ts
index 85d0518d9baea..e3492135e8b21 100644
--- a/src/core/server/elasticsearch/client/log_query_and_deprecation.ts
+++ b/src/core/server/elasticsearch/client/log_query_and_deprecation.ts
@@ -5,11 +5,13 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
-
+import type { IncomingHttpHeaders } from 'http';
import { Buffer } from 'buffer';
import { stringify } from 'querystring';
import { errors, Client, ApiError, RequestEvent } from '@elastic/elasticsearch';
import { RequestBody } from '@elastic/elasticsearch/lib/Transport';
+import numeral from '@elastic/numeral';
+import { getEcsResponseLog } from './get_ecs_response_log';
import { Logger } from '../../logging';
const convertQueryString = (qs: string | Record | undefined): string => {
@@ -37,6 +39,14 @@ export function getErrorMessage(error: ApiError): string {
return `[${error.name}]: ${error.message}`;
}
+function getContentLength(headers?: IncomingHttpHeaders | null): number | undefined {
+ const contentLength = headers && headers['content-length'];
+ if (contentLength) {
+ const val = parseInt(contentLength, 10);
+ return !isNaN(val) ? val : undefined;
+ }
+}
+
/**
* returns a string in format:
*
@@ -46,10 +56,10 @@ export function getErrorMessage(error: ApiError): string {
*
* so it could be copy-pasted into the Dev console
*/
-function getResponseMessage(event: RequestEvent): string {
+function getResponseMessage(event: RequestEvent, bytesMsg: string): string {
const errorMeta = getRequestDebugMeta(event);
const body = errorMeta.body ? `\n${errorMeta.body}` : '';
- return `${errorMeta.statusCode}\n${errorMeta.method} ${errorMeta.url}${body}`;
+ return `${errorMeta.statusCode}${bytesMsg}\n${errorMeta.method} ${errorMeta.url}${body}`;
}
/**
@@ -92,21 +102,19 @@ export const instrumentEsQueryAndDeprecationLogger = ({
const deprecationLogger = logger.get('deprecation');
client.on('response', (error, event) => {
if (event) {
- const opaqueId = event.meta.request.options.opaqueId;
- const meta = opaqueId
- ? {
- http: { request: { id: event.meta.request.options.opaqueId } },
- }
- : undefined; // do not clutter logs if opaqueId is not present
+ const bytes = getContentLength(event.headers);
+ const bytesMsg = bytes ? ` - ${numeral(bytes).format('0.0b')}` : '';
+ const meta = getEcsResponseLog(event, bytes);
+
let queryMsg = '';
if (error) {
if (error instanceof errors.ResponseError) {
- queryMsg = `${getResponseMessage(event)} ${getErrorMessage(error)}`;
+ queryMsg = `${getResponseMessage(event, bytesMsg)} ${getErrorMessage(error)}`;
} else {
queryMsg = getErrorMessage(error);
}
} else {
- queryMsg = getResponseMessage(event);
+ queryMsg = getResponseMessage(event, bytesMsg);
}
queryLogger.debug(queryMsg, meta);
@@ -128,12 +136,9 @@ export const instrumentEsQueryAndDeprecationLogger = ({
? 'kibana'
: 'user';
- const deprecationMsg = `Elasticsearch deprecation: ${event.warnings}\nOrigin:${requestOrigin}\nQuery:\n${queryMsg}`;
- if (requestOrigin === 'kibana') {
- deprecationLogger.info(deprecationMsg);
- } else {
- deprecationLogger.debug(deprecationMsg);
- }
+ deprecationLogger.debug(
+ `Elasticsearch deprecation: ${event.warnings}\nOrigin:${requestOrigin}\nQuery:\n${queryMsg}`
+ );
}
}
});
diff --git a/src/core/server/elasticsearch/elasticsearch_config.test.ts b/src/core/server/elasticsearch/elasticsearch_config.test.ts
index 562d25c41caeb..69245de4001cf 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.test.ts
@@ -289,22 +289,24 @@ describe('throws when config is invalid', () => {
});
describe('deprecations', () => {
- it('logs a warning if elasticsearch.username is set to "elastic"', () => {
- const { messages } = applyElasticsearchDeprecations({ username: 'elastic' });
+ it('logs a critical deprecation if elasticsearch.username is set to "elastic"', () => {
+ const { messages, levels } = applyElasticsearchDeprecations({ username: 'elastic' });
expect(messages).toMatchInlineSnapshot(`
Array [
"Kibana is configured to authenticate to Elasticsearch with the \\"elastic\\" user. Use a service account token instead.",
]
`);
+ expect(levels).toEqual(['critical']);
});
it('logs a warning if elasticsearch.username is set to "kibana"', () => {
- const { messages } = applyElasticsearchDeprecations({ username: 'kibana' });
+ const { messages, levels } = applyElasticsearchDeprecations({ username: 'kibana' });
expect(messages).toMatchInlineSnapshot(`
Array [
"Kibana is configured to authenticate to Elasticsearch with the \\"kibana\\" user. Use a service account token instead.",
]
`);
+ expect(levels).toEqual(['warning']);
});
it('does not log a warning if elasticsearch.username is set to something besides "elastic" or "kibana"', () => {
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index ef5d05c8d2280..5108418593623 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -147,6 +147,7 @@ const deprecations: ConfigDeprecationProvider = () => [
if (es.username === 'elastic' || es.username === 'kibana') {
const username = es.username;
+ const level = es.username === 'elastic' ? 'critical' : 'warning';
addDeprecation({
configPath: `${fromPath}.username`,
title: i18n.translate('core.deprecations.elasticsearchUsername.title', {
@@ -158,16 +159,17 @@ const deprecations: ConfigDeprecationProvider = () => [
'Kibana is configured to authenticate to Elasticsearch with the "{username}" user. Use a service account token instead.',
values: { username },
}),
- level: 'warning',
+ level,
documentationUrl: `https://www.elastic.co/guide/en/elasticsearch/reference/${branch}/service-accounts.html`,
correctiveActions: {
manualSteps: [
i18n.translate('core.deprecations.elasticsearchUsername.manualSteps1', {
defaultMessage:
- 'Use the elasticsearch-service-tokens CLI tool to create a new service account token for the "elastic/kibana" service account.',
+ 'Use Kibana Dev Tools to create a service account token using the API: "POST /_security/service/elastic/kibana/credential/token"',
}),
i18n.translate('core.deprecations.elasticsearchUsername.manualSteps2', {
- defaultMessage: 'Add the "elasticsearch.serviceAccountToken" setting to kibana.yml.',
+ defaultMessage:
+ 'Copy the returned token.value and add it as the "elasticsearch.serviceAccountToken" setting to kibana.yml.',
}),
i18n.translate('core.deprecations.elasticsearchUsername.manualSteps3', {
defaultMessage:
diff --git a/src/core/server/elasticsearch/integration_tests/es_kibana_version_compatibility.test.ts b/src/core/server/elasticsearch/integration_tests/es_kibana_version_compatibility.test.ts
new file mode 100644
index 0000000000000..3c8faffc84d13
--- /dev/null
+++ b/src/core/server/elasticsearch/integration_tests/es_kibana_version_compatibility.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import {
+ createTestServers,
+ TestElasticsearchUtils,
+ TestKibanaUtils,
+} from '../../../test_helpers/kbn_server';
+
+// Temporarily skipped until https://github.com/elastic/kibana/pull/123337 is backported
+describe.skip('esVersionCompatibleWithKibana', () => {
+ let esServer: TestElasticsearchUtils;
+ let kibanaServer: TestKibanaUtils;
+
+ afterEach(async () => {
+ if (kibanaServer) {
+ await kibanaServer.stop();
+ }
+ if (esServer) {
+ await esServer.stop();
+ }
+ });
+
+ const start = async ({ esArgs = [], version }: { esArgs?: string[]; version?: string } = {}) => {
+ const { startES, startKibana } = createTestServers({
+ adjustTimeout: jest.setTimeout,
+ settings: {
+ es: {
+ version,
+ esArgs,
+ },
+ },
+ });
+
+ esServer = await startES();
+ return { startKibana };
+ };
+
+ it('successfully starts Kibana 7.17.x against Elasticsearch 8.0.0', async () => {
+ const { startKibana } = await start({ version: '8.0.0' });
+ const startWithCleanup = async () => {
+ kibanaServer = await startKibana();
+ return kibanaServer;
+ };
+ await expect(startWithCleanup()).resolves.toBeDefined();
+ });
+});
diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts
index 70166704679fe..4f17d5b2e52d5 100644
--- a/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts
+++ b/src/core/server/elasticsearch/version_check/ensure_es_version.test.ts
@@ -69,11 +69,11 @@ describe('mapNodesVersionCompatibility', () => {
});
it('returns isCompatible=false for an incompatible node without http publish address', async () => {
- const nodesInfo = createNodesInfoWithoutHTTP('6.1.1');
+ const nodesInfo = createNodesInfoWithoutHTTP('7.1.1');
const result = mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
expect(result.isCompatible).toBe(false);
expect(result.message).toMatchInlineSnapshot(
- `"This version of Kibana (v5.1.0) is incompatible with the following Elasticsearch nodes in your cluster: v6.1.1 @ undefined (ip)"`
+ `"This version of Kibana (v5.1.0) is incompatible with the following Elasticsearch nodes in your cluster: v7.1.1 @ undefined (ip)"`
);
});
diff --git a/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts
index 3aa93435982dc..d4391e78655fd 100644
--- a/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts
+++ b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.test.ts
@@ -8,38 +8,42 @@
import { esVersionCompatibleWithKibana } from './es_kibana_version_compatability';
-describe('plugins/elasticsearch', () => {
- describe('lib/is_es_compatible_with_kibana', () => {
- describe('returns false', () => {
- it('when ES major is greater than Kibana major', () => {
- expect(esVersionCompatibleWithKibana('1.0.0', '0.0.0')).toBe(false);
- });
-
- it('when ES major is less than Kibana major', () => {
- expect(esVersionCompatibleWithKibana('0.0.0', '1.0.0')).toBe(false);
- });
-
- it('when majors are equal, but ES minor is less than Kibana minor', () => {
- expect(esVersionCompatibleWithKibana('1.0.0', '1.1.0')).toBe(false);
- });
- });
-
- describe('returns true', () => {
- it('when version numbers are the same', () => {
- expect(esVersionCompatibleWithKibana('1.1.1', '1.1.1')).toBe(true);
- });
-
- it('when majors are equal, and ES minor is greater than Kibana minor', () => {
- expect(esVersionCompatibleWithKibana('1.1.0', '1.0.0')).toBe(true);
- });
-
- it('when majors and minors are equal, and ES patch is greater than Kibana patch', () => {
- expect(esVersionCompatibleWithKibana('1.1.1', '1.1.0')).toBe(true);
- });
-
- it('when majors and minors are equal, but ES patch is less than Kibana patch', () => {
- expect(esVersionCompatibleWithKibana('1.1.0', '1.1.1')).toBe(true);
- });
+describe('esVersionCompatibleWithKibana', () => {
+ describe('returns false', () => {
+ it('when ES major is greater than Kibana major + 1', () => {
+ expect(esVersionCompatibleWithKibana('2.0.0', '0.0.0')).toBe(false);
+ });
+
+ it('when ES major is less than Kibana major', () => {
+ expect(esVersionCompatibleWithKibana('0.0.0', '1.0.0')).toBe(false);
+ });
+
+ it('when majors are equal, but ES minor is less than Kibana minor', () => {
+ expect(esVersionCompatibleWithKibana('1.0.0', '1.1.0')).toBe(false);
+ });
+ });
+
+ describe('returns true', () => {
+ it('when version numbers are the same', () => {
+ expect(esVersionCompatibleWithKibana('1.1.1', '1.1.1')).toBe(true);
+ });
+
+ it('when majors are equal, and ES minor is greater than Kibana minor', () => {
+ expect(esVersionCompatibleWithKibana('1.1.0', '1.0.0')).toBe(true);
+ });
+
+ it('when majors and minors are equal, and ES patch is greater than Kibana patch', () => {
+ expect(esVersionCompatibleWithKibana('1.1.1', '1.1.0')).toBe(true);
+ });
+
+ it('when majors and minors are equal, but ES patch is less than Kibana patch', () => {
+ expect(esVersionCompatibleWithKibana('1.1.0', '1.1.1')).toBe(true);
+ });
+
+ it('when ES major is Kibana major + 1', () => {
+ expect(esVersionCompatibleWithKibana('1.0.0', '0.0.0')).toBe(true);
+ expect(esVersionCompatibleWithKibana('1.0.0', '0.7.0')).toBe(true);
+ expect(esVersionCompatibleWithKibana('1.9.2', '0.7.12')).toBe(true);
});
});
});
diff --git a/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts
index accf4edc0226e..ac4dd599780c7 100644
--- a/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts
+++ b/src/core/server/elasticsearch/version_check/es_kibana_version_compatability.ts
@@ -26,6 +26,11 @@ export function esVersionCompatibleWithKibana(esVersion: string, kibanaVersion:
patch: semver.patch(kibanaVersion),
};
+ // On 7.17: Accept the next major version of ES.
+ if (esVersionNumbers.major === kibanaVersionNumbers.major + 1) {
+ return true;
+ }
+
// Reject mismatching major version numbers.
if (esVersionNumbers.major !== kibanaVersionNumbers.major) {
return false;
diff --git a/src/core/server/environment/resolve_uuid.test.ts b/src/core/server/environment/resolve_uuid.test.ts
index 3ee65e8ac99cf..75a229bb13e12 100644
--- a/src/core/server/environment/resolve_uuid.test.ts
+++ b/src/core/server/environment/resolve_uuid.test.ts
@@ -22,8 +22,8 @@ jest.mock('./fs', () => ({
writeFile: jest.fn(() => Promise.resolve('')),
}));
-const DEFAULT_FILE_UUID = 'FILE_UUID';
-const DEFAULT_CONFIG_UUID = 'CONFIG_UUID';
+const DEFAULT_FILE_UUID = 'ffffffff-bbbb-0ccc-0ddd-eeeeeeeeeeee';
+const DEFAULT_CONFIG_UUID = 'cccccccc-bbbb-0ccc-0ddd-eeeeeeeeeeee';
const fileNotFoundError = { code: 'ENOENT' };
const permissionError = { code: 'EACCES' };
const isDirectoryError = { code: 'EISDIR' };
@@ -91,7 +91,7 @@ describe('resolveInstanceUuid', () => {
expect(logger.debug).toHaveBeenCalledTimes(1);
expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
Array [
- "Updating Kibana instance UUID to: CONFIG_UUID (was: FILE_UUID)",
+ "Updating Kibana instance UUID to: cccccccc-bbbb-0ccc-0ddd-eeeeeeeeeeee (was: ffffffff-bbbb-0ccc-0ddd-eeeeeeeeeeee)",
]
`);
});
@@ -106,7 +106,7 @@ describe('resolveInstanceUuid', () => {
expect(logger.debug).toHaveBeenCalledTimes(1);
expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
Array [
- "Kibana instance UUID: CONFIG_UUID",
+ "Kibana instance UUID: cccccccc-bbbb-0ccc-0ddd-eeeeeeeeeeee",
]
`);
});
@@ -126,25 +126,45 @@ describe('resolveInstanceUuid', () => {
expect(logger.debug).toHaveBeenCalledTimes(1);
expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
Array [
- "Setting new Kibana instance UUID: CONFIG_UUID",
+ "Setting new Kibana instance UUID: cccccccc-bbbb-0ccc-0ddd-eeeeeeeeeeee",
]
`);
});
});
describe('when file is present and config property is not set', () => {
- it('does not write to file and returns the file uuid', async () => {
+ beforeEach(() => {
serverConfig = createServerConfig(undefined);
+ });
+
+ it('does not write to file and returns the file uuid', async () => {
const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
expect(uuid).toEqual(DEFAULT_FILE_UUID);
expect(writeFile).not.toHaveBeenCalled();
expect(logger.debug).toHaveBeenCalledTimes(1);
expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
Array [
- "Resuming persistent Kibana instance UUID: FILE_UUID",
+ "Resuming persistent Kibana instance UUID: ffffffff-bbbb-0ccc-0ddd-eeeeeeeeeeee",
]
`);
});
+
+ describe('when file contains an invalid uuid', () => {
+ it('throws an explicit error for uuid formatting', async () => {
+ mockReadFile({ uuid: 'invalid uuid in data file' });
+ await expect(
+ resolveInstanceUuid({ pathConfig, serverConfig, logger })
+ ).rejects.toThrowErrorMatchingInlineSnapshot(`"data-folder/uuid contains an invalid UUID"`);
+ });
+ });
+
+ describe('when file contains a trailing new line', () => {
+ it('returns the trimmed file uuid', async () => {
+ mockReadFile({ uuid: DEFAULT_FILE_UUID + '\n' });
+ const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
+ expect(uuid).toEqual(DEFAULT_FILE_UUID);
+ });
+ });
});
describe('when file is present with 7.6.0 UUID', () => {
@@ -193,7 +213,7 @@ describe('resolveInstanceUuid', () => {
"UUID from 7.6.0 bug detected, ignoring file UUID",
],
Array [
- "Setting new Kibana instance UUID: CONFIG_UUID",
+ "Setting new Kibana instance UUID: cccccccc-bbbb-0ccc-0ddd-eeeeeeeeeeee",
],
]
`);
diff --git a/src/core/server/environment/resolve_uuid.ts b/src/core/server/environment/resolve_uuid.ts
index 74201a7ffa04f..4f07f33e94902 100644
--- a/src/core/server/environment/resolve_uuid.ts
+++ b/src/core/server/environment/resolve_uuid.ts
@@ -12,6 +12,7 @@ import { PathConfigType } from '@kbn/utils';
import { readFile, writeFile } from './fs';
import { HttpConfigType } from '../http';
import { Logger } from '../logging';
+import { uuidRegexp } from '../http/http_config';
const FILE_ENCODING = 'utf8';
const FILE_NAME = 'uuid';
@@ -63,16 +64,24 @@ export async function resolveInstanceUuid({
}
async function readUuidFromFile(filepath: string, logger: Logger): Promise {
+ const content = await readFileContent(filepath);
+
+ if (content === UUID_7_6_0_BUG) {
+ logger.debug(`UUID from 7.6.0 bug detected, ignoring file UUID`);
+ return undefined;
+ }
+
+ if (content && !content.match(uuidRegexp)) {
+ throw new Error(`${filepath} contains an invalid UUID`);
+ }
+
+ return content;
+}
+
+async function readFileContent(filepath: string): Promise {
try {
const content = await readFile(filepath);
- const decoded = content.toString(FILE_ENCODING);
-
- if (decoded === UUID_7_6_0_BUG) {
- logger.debug(`UUID from 7.6.0 bug detected, ignoring file UUID`);
- return undefined;
- } else {
- return decoded;
- }
+ return content.toString(FILE_ENCODING).trim();
} catch (e) {
if (e.code === 'ENOENT') {
// non-existent uuid file is ok, we will create it.
diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts
index 88e04fd715f7b..fb241bf91fd69 100644
--- a/src/core/server/http/http_config.ts
+++ b/src/core/server/http/http_config.ts
@@ -21,7 +21,8 @@ import {
} from './security_response_headers_config';
const validBasePathRegex = /^\/.*[^\/]$/;
-const uuidRegexp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+export const uuidRegexp =
+ /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
const hostURISchema = schema.uri({ scheme: ['http', 'https'] });
const match = (regex: RegExp, errorMsg: string) => (str: string) =>
regex.test(str) ? undefined : errorMsg;
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 60f2fa51f25bb..0559f7803159b 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -1587,79 +1587,3 @@ describe('setup contract', () => {
});
});
});
-
-describe('Graceful shutdown', () => {
- let shutdownTimeout: number;
- let innerServerListener: Server;
-
- beforeEach(async () => {
- shutdownTimeout = config.shutdownTimeout.asMilliseconds();
- const { registerRouter, server: innerServer } = await server.setup(config);
- innerServerListener = innerServer.listener;
-
- const router = new Router('', logger, enhanceWithContext);
- router.post(
- {
- path: '/',
- validate: false,
- options: { body: { accepts: 'application/json' } },
- },
- async (context, req, res) => {
- // It takes to resolve the same period of the shutdownTimeout.
- // Since we'll trigger the stop a few ms after, it should have time to finish
- await new Promise((resolve) => setTimeout(resolve, shutdownTimeout));
- return res.ok({ body: { ok: 1 } });
- }
- );
- registerRouter(router);
-
- await server.start();
- });
-
- test('any ongoing requests should be resolved with `connection: close`', async () => {
- const [response] = await Promise.all([
- // Trigger a request that should hold the server from stopping until fulfilled
- supertest(innerServerListener).post('/'),
- // Stop the server while the request is in progress
- (async () => {
- await new Promise((resolve) => setTimeout(resolve, shutdownTimeout / 3));
- await server.stop();
- })(),
- ]);
-
- expect(response.status).toBe(200);
- expect(response.body).toStrictEqual({ ok: 1 });
- // The server is about to be closed, we need to ask connections to close on their end (stop their keep-alive policies)
- expect(response.header.connection).toBe('close');
- });
-
- test('any requests triggered while stopping should be rejected with 503', async () => {
- const [, , response] = await Promise.all([
- // Trigger a request that should hold the server from stopping until fulfilled (otherwise the server will stop straight away)
- supertest(innerServerListener).post('/'),
- // Stop the server while the request is in progress
- (async () => {
- await new Promise((resolve) => setTimeout(resolve, shutdownTimeout / 3));
- await server.stop();
- })(),
- // Trigger a new request while shutting down (should be rejected)
- (async () => {
- await new Promise((resolve) => setTimeout(resolve, (2 * shutdownTimeout) / 3));
- return supertest(innerServerListener).post('/');
- })(),
- ]);
- expect(response.status).toBe(503);
- expect(response.body).toStrictEqual({
- statusCode: 503,
- error: 'Service Unavailable',
- message: 'Kibana is shutting down and not accepting new incoming requests',
- });
- expect(response.header.connection).toBe('close');
- });
-
- test('when no ongoing connections, the server should stop without waiting any longer', async () => {
- const preStop = Date.now();
- await server.stop();
- expect(Date.now() - preStop).toBeLessThan(shutdownTimeout);
- });
-});
diff --git a/src/core/server/http/integration_tests/http_server.test.ts b/src/core/server/http/integration_tests/http_server.test.ts
new file mode 100644
index 0000000000000..edb5a3167ce2b
--- /dev/null
+++ b/src/core/server/http/integration_tests/http_server.test.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Server } from 'http';
+import supertest from 'supertest';
+import moment from 'moment';
+import { of } from 'rxjs';
+import { ByteSizeValue } from '@kbn/config-schema';
+import { HttpConfig } from '../http_config';
+import { loggingSystemMock } from '../../logging/logging_system.mock';
+import { Router } from '../router';
+import { HttpServer } from '../http_server';
+
+describe('Http server', () => {
+ let server: HttpServer;
+ let config: HttpConfig;
+ let logger: ReturnType;
+ const enhanceWithContext = (fn: (...args: any[]) => any) => fn.bind(null, {});
+
+ beforeEach(() => {
+ const loggingService = loggingSystemMock.create();
+ logger = loggingSystemMock.createLogger();
+
+ config = {
+ name: 'kibana',
+ host: '127.0.0.1',
+ maxPayload: new ByteSizeValue(1024),
+ port: 10002,
+ ssl: { enabled: false },
+ compression: { enabled: true },
+ requestId: {
+ allowFromAnyIp: true,
+ ipAllowlist: [],
+ },
+ cors: {
+ enabled: false,
+ },
+ shutdownTimeout: moment.duration(5, 's'),
+ } as any;
+
+ server = new HttpServer(loggingService, 'tests', of(config.shutdownTimeout));
+ });
+
+ describe('Graceful shutdown', () => {
+ let shutdownTimeout: number;
+ let innerServerListener: Server;
+
+ beforeEach(async () => {
+ shutdownTimeout = config.shutdownTimeout.asMilliseconds();
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ innerServerListener = innerServer.listener;
+
+ const router = new Router('', logger, enhanceWithContext);
+ router.post(
+ {
+ path: '/',
+ validate: false,
+ options: { body: { accepts: 'application/json' } },
+ },
+ async (context, req, res) => {
+ // It takes to resolve the same period of the shutdownTimeout.
+ // Since we'll trigger the stop a few ms after, it should have time to finish
+ await new Promise((resolve) => setTimeout(resolve, shutdownTimeout));
+ return res.ok({ body: { ok: 1 } });
+ }
+ );
+ registerRouter(router);
+
+ await server.start();
+ });
+
+ test('any ongoing requests should be resolved with `connection: close`', async () => {
+ const [response] = await Promise.all([
+ // Trigger a request that should hold the server from stopping until fulfilled
+ supertest(innerServerListener).post('/'),
+ // Stop the server while the request is in progress
+ (async () => {
+ await new Promise((resolve) => setTimeout(resolve, shutdownTimeout / 3));
+ await server.stop();
+ })(),
+ ]);
+
+ expect(response.status).toBe(200);
+ expect(response.body).toStrictEqual({ ok: 1 });
+ // The server is about to be closed, we need to ask connections to close on their end (stop their keep-alive policies)
+ expect(response.header.connection).toBe('close');
+ });
+
+ test('any requests triggered while stopping should be rejected with 503', async () => {
+ const [, , response] = await Promise.all([
+ // Trigger a request that should hold the server from stopping until fulfilled (otherwise the server will stop straight away)
+ supertest(innerServerListener).post('/'),
+ // Stop the server while the request is in progress
+ (async () => {
+ await new Promise((resolve) => setTimeout(resolve, shutdownTimeout / 3));
+ await server.stop();
+ })(),
+ // Trigger a new request while shutting down (should be rejected)
+ (async () => {
+ await new Promise((resolve) => setTimeout(resolve, (2 * shutdownTimeout) / 3));
+ return supertest(innerServerListener).post('/');
+ })(),
+ ]);
+ expect(response.status).toBe(503);
+ expect(response.body).toStrictEqual({
+ statusCode: 503,
+ error: 'Service Unavailable',
+ message: 'Kibana is shutting down and not accepting new incoming requests',
+ });
+ expect(response.header.connection).toBe('close');
+ });
+
+ test('when no ongoing connections, the server should stop without waiting any longer', async () => {
+ const preStop = Date.now();
+ await server.stop();
+ expect(Date.now() - preStop).toBeLessThan(shutdownTimeout);
+ });
+ });
+});
diff --git a/src/core/server/http/router/headers.ts b/src/core/server/http/router/headers.ts
index 715337ba813b5..71bfb2fe5c5ed 100644
--- a/src/core/server/http/router/headers.ts
+++ b/src/core/server/http/router/headers.ts
@@ -55,7 +55,7 @@ export function filterHeaders(
headers: Headers,
fieldsToKeep: string[],
fieldsToExclude: string[] = []
-) {
+): Headers {
const fieldsToExcludeNormalized = fieldsToExclude.map(normalizeHeaderField);
// Normalize list of headers we want to allow in upstream request
const fieldsToKeepNormalized = fieldsToKeep
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 92c758f7e6980..4462b08cc1736 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -257,6 +257,7 @@ export type {
PluginName,
SharedGlobalConfig,
MakeUsageFromSchema,
+ ExposedToBrowserDescriptor,
} from './plugins';
export {
diff --git a/src/core/server/metrics/integration_tests/server_collector.test.ts b/src/core/server/metrics/integration_tests/server_collector.test.ts
index 05780e8965dc4..713d3ed1dc96e 100644
--- a/src/core/server/metrics/integration_tests/server_collector.test.ts
+++ b/src/core/server/metrics/integration_tests/server_collector.test.ts
@@ -17,11 +17,7 @@ import { executionContextServiceMock } from '../../execution_context/execution_c
import { ServerMetricsCollector } from '../collectors/server';
import { setTimeout as setTimeoutPromise } from 'timers/promises';
-const requestWaitDelay = 25;
-
-// FLAKY: https://github.com/elastic/kibana/issues/59234
-// FLAKY: https://github.com/elastic/kibana/issues/59235
-describe.skip('ServerMetricsCollector', () => {
+describe('ServerMetricsCollector', () => {
let server: HttpService;
let collector: ServerMetricsCollector;
let hapiServer: HapiServer;
@@ -51,6 +47,7 @@ describe.skip('ServerMetricsCollector', () => {
router.get({ path: '/', validate: false }, async (ctx, req, res) => {
return res.ok({ body: '' });
});
+
await server.start();
let metrics = await collector.collect();
@@ -79,39 +76,49 @@ describe.skip('ServerMetricsCollector', () => {
it('collect disconnects requests infos', async () => {
const never = new Promise((resolve) => undefined);
- const hitSubject = new BehaviorSubject(0);
+ const disconnectRequested$ = new Subject(); // Controls the number of requests in the /disconnect endpoint
+ const disconnectAborted$ = new Subject(); // Controls the abort event in the /disconnect endpoint
router.get({ path: '/', validate: false }, async (ctx, req, res) => {
return res.ok({ body: '' });
});
router.get({ path: '/disconnect', validate: false }, async (ctx, req, res) => {
- hitSubject.next(hitSubject.value + 1);
- await never;
+ disconnectRequested$.next();
+ req.events.aborted$.subscribe(() => {
+ disconnectAborted$.next();
+ });
+ await never; // Never resolve the request
return res.ok({ body: '' });
});
await server.start();
await sendGet('/');
+
+ // Subscribe to expect 2 requests to /disconnect
+ const waitFor2Requests = disconnectRequested$.pipe(take(2)).toPromise();
+
const discoReq1 = sendGet('/disconnect').end();
const discoReq2 = sendGet('/disconnect').end();
- await hitSubject
- .pipe(
- filter((count) => count >= 2),
- take(1)
- )
- .toPromise();
+ // Wait for 2 requests to /disconnect
+ await waitFor2Requests;
let metrics = await collector.collect();
expect(metrics.requests).toEqual(
expect.objectContaining({
total: 3,
disconnects: 0,
+ statusCodes: expect.objectContaining({ '200': 1 }),
})
);
+ // Subscribe to the aborted$ event
+ const waitFor1stAbort = disconnectAborted$.pipe(take(1)).toPromise();
+
discoReq1.abort();
- await delay(requestWaitDelay);
+
+ // Wait for the aborted$ event
+ await waitFor1stAbort;
metrics = await collector.collect();
expect(metrics.requests).toEqual(
@@ -121,8 +128,13 @@ describe.skip('ServerMetricsCollector', () => {
})
);
+ // Subscribe to the aborted$ event
+ const waitFor2ndAbort = disconnectAborted$.pipe(take(1)).toPromise();
+
discoReq2.abort();
- await delay(requestWaitDelay);
+
+ // Wait for the aborted$ event
+ await waitFor2ndAbort;
metrics = await collector.collect();
expect(metrics.requests).toEqual(
@@ -150,14 +162,14 @@ describe.skip('ServerMetricsCollector', () => {
await Promise.all([sendGet('/no-delay'), sendGet('/250-ms')]);
let metrics = await collector.collect();
- expect(metrics.response_times.avg_in_millis).toBeGreaterThanOrEqual(125);
- expect(metrics.response_times.max_in_millis).toBeGreaterThanOrEqual(250);
+ expect(metrics.response_times?.avg_in_millis).toBeGreaterThanOrEqual(125);
+ expect(metrics.response_times?.max_in_millis).toBeGreaterThanOrEqual(250);
await Promise.all([sendGet('/500-ms'), sendGet('/500-ms')]);
metrics = await collector.collect();
- expect(metrics.response_times.avg_in_millis).toBeGreaterThanOrEqual(250);
- expect(metrics.response_times.max_in_millis).toBeGreaterThanOrEqual(500);
+ expect(metrics.response_times?.avg_in_millis).toBeGreaterThanOrEqual(250);
+ expect(metrics.response_times?.max_in_millis).toBeGreaterThanOrEqual(500);
});
it('collect connection count', async () => {
diff --git a/src/core/server/metrics/logging/get_ops_metrics_log.test.ts b/src/core/server/metrics/logging/get_ops_metrics_log.test.ts
index cba188c94c74e..3fd3c4a7a24d6 100644
--- a/src/core/server/metrics/logging/get_ops_metrics_log.test.ts
+++ b/src/core/server/metrics/logging/get_ops_metrics_log.test.ts
@@ -42,6 +42,7 @@ const testMetrics = {
memory: { heap: { used_in_bytes: 100 } },
uptime_in_millis: 1500,
event_loop_delay: 50,
+ event_loop_delay_histogram: { percentiles: { '50': 50, '75': 75, '95': 95, '99': 99 } },
},
os: {
load: {
@@ -56,7 +57,7 @@ describe('getEcsOpsMetricsLog', () => {
it('provides correctly formatted message', () => {
const result = getEcsOpsMetricsLog(createMockOpsMetrics(testMetrics));
expect(result.message).toMatchInlineSnapshot(
- `"memory: 100.0B uptime: 0:00:01 load: [10.00,20.00,30.00] delay: 50.000"`
+ `"memory: 100.0B uptime: 0:00:01 load: [10.00,20.00,30.00] mean delay: 50.000 delay histogram: { 50: 50.000; 95: 95.000; 99: 99.000 }"`
);
});
@@ -70,6 +71,7 @@ describe('getEcsOpsMetricsLog', () => {
const missingMetrics = {
...baseMetrics,
process: {},
+ processes: [],
os: {},
} as unknown as OpsMetrics;
const logMeta = getEcsOpsMetricsLog(missingMetrics);
@@ -77,39 +79,41 @@ describe('getEcsOpsMetricsLog', () => {
});
it('provides an ECS-compatible response', () => {
- const logMeta = getEcsOpsMetricsLog(createBaseOpsMetrics());
- expect(logMeta).toMatchInlineSnapshot(`
+ const logMeta = getEcsOpsMetricsLog(createMockOpsMetrics(testMetrics));
+ expect(logMeta.meta).toMatchInlineSnapshot(`
Object {
- "message": "memory: 1.0B load: [1.00,1.00,1.00] delay: 1.000",
- "meta": Object {
- "event": Object {
- "category": Array [
- "process",
- "host",
- ],
- "kind": "metric",
- "type": Array [
- "info",
- ],
- },
- "host": Object {
- "os": Object {
- "load": Object {
- "15m": 1,
- "1m": 1,
- "5m": 1,
- },
+ "event": Object {
+ "category": Array [
+ "process",
+ "host",
+ ],
+ "kind": "metric",
+ "type": Array [
+ "info",
+ ],
+ },
+ "host": Object {
+ "os": Object {
+ "load": Object {
+ "15m": 30,
+ "1m": 10,
+ "5m": 20,
},
},
- "process": Object {
- "eventLoopDelay": 1,
- "memory": Object {
- "heap": Object {
- "usedInBytes": 1,
- },
+ },
+ "process": Object {
+ "eventLoopDelay": 50,
+ "eventLoopDelayHistogram": Object {
+ "50": 50,
+ "95": 95,
+ "99": 99,
+ },
+ "memory": Object {
+ "heap": Object {
+ "usedInBytes": 100,
},
- "uptime": 0,
},
+ "uptime": 1,
},
}
`);
diff --git a/src/core/server/metrics/logging/get_ops_metrics_log.ts b/src/core/server/metrics/logging/get_ops_metrics_log.ts
index 7e13f35889ec7..6211407ae86f0 100644
--- a/src/core/server/metrics/logging/get_ops_metrics_log.ts
+++ b/src/core/server/metrics/logging/get_ops_metrics_log.ts
@@ -30,10 +30,29 @@ export function getEcsOpsMetricsLog(metrics: OpsMetrics) {
// HH:mm:ss message format for backward compatibility
const uptimeValMsg = uptimeVal ? `uptime: ${numeral(uptimeVal).format('00:00:00')} ` : '';
- // Event loop delay is in ms
+ // Event loop delay metrics are in ms
const eventLoopDelayVal = process?.event_loop_delay;
const eventLoopDelayValMsg = eventLoopDelayVal
- ? `delay: ${numeral(process?.event_loop_delay).format('0.000')}`
+ ? `mean delay: ${numeral(process?.event_loop_delay).format('0.000')}`
+ : '';
+
+ const eventLoopDelayPercentiles = process?.event_loop_delay_histogram?.percentiles;
+
+ // Extract 50th, 95th and 99th percentiles for log meta
+ const eventLoopDelayHistVals = eventLoopDelayPercentiles
+ ? {
+ 50: eventLoopDelayPercentiles[50],
+ 95: eventLoopDelayPercentiles[95],
+ 99: eventLoopDelayPercentiles[99],
+ }
+ : undefined;
+ // Format message from 50th, 95th and 99th percentiles
+ const eventLoopDelayHistMsg = eventLoopDelayPercentiles
+ ? ` delay histogram: { 50: ${numeral(eventLoopDelayPercentiles['50']).format(
+ '0.000'
+ )}; 95: ${numeral(eventLoopDelayPercentiles['95']).format('0.000')}; 99: ${numeral(
+ eventLoopDelayPercentiles['99']
+ ).format('0.000')} }`
: '';
const loadEntries = {
@@ -65,6 +84,7 @@ export function getEcsOpsMetricsLog(metrics: OpsMetrics) {
},
},
eventLoopDelay: eventLoopDelayVal,
+ eventLoopDelayHistogram: eventLoopDelayHistVals,
},
host: {
os: {
@@ -75,7 +95,13 @@ export function getEcsOpsMetricsLog(metrics: OpsMetrics) {
};
return {
- message: `${processMemoryUsedInBytesMsg}${uptimeValMsg}${loadValsMsg}${eventLoopDelayValMsg}`,
+ message: [
+ processMemoryUsedInBytesMsg,
+ uptimeValMsg,
+ loadValsMsg,
+ eventLoopDelayValMsg,
+ eventLoopDelayHistMsg,
+ ].join(''),
meta,
};
}
diff --git a/src/core/server/metrics/metrics_service.test.ts b/src/core/server/metrics/metrics_service.test.ts
index d7de41fd7ccf7..27043b8fa2c8a 100644
--- a/src/core/server/metrics/metrics_service.test.ts
+++ b/src/core/server/metrics/metrics_service.test.ts
@@ -203,6 +203,7 @@ describe('MetricsService', () => {
},
"process": Object {
"eventLoopDelay": undefined,
+ "eventLoopDelayHistogram": undefined,
"memory": Object {
"heap": Object {
"usedInBytes": undefined,
diff --git a/src/core/server/plugins/create_browser_config.test.ts b/src/core/server/plugins/create_browser_config.test.ts
new file mode 100644
index 0000000000000..8b27ba286c53f
--- /dev/null
+++ b/src/core/server/plugins/create_browser_config.test.ts
@@ -0,0 +1,162 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ExposedToBrowserDescriptor } from './types';
+import { createBrowserConfig } from './create_browser_config';
+
+describe('createBrowserConfig', () => {
+ it('picks nothing by default', () => {
+ const config = {
+ foo: 'bar',
+ nested: {
+ str: 'string',
+ num: 42,
+ },
+ };
+ const descriptor: ExposedToBrowserDescriptor = {};
+
+ const browserConfig = createBrowserConfig(config, descriptor);
+
+ expect(browserConfig).toEqual({});
+ });
+
+ it('picks all the nested properties when using `true`', () => {
+ const config = {
+ foo: 'bar',
+ nested: {
+ str: 'string',
+ num: 42,
+ },
+ };
+
+ const descriptor: ExposedToBrowserDescriptor = {
+ foo: true,
+ nested: true,
+ };
+
+ const browserConfig = createBrowserConfig(config, descriptor);
+
+ expect(browserConfig).toEqual({
+ foo: 'bar',
+ nested: {
+ str: 'string',
+ num: 42,
+ },
+ });
+ });
+
+ it('picks specific nested properties when using a nested declaration', () => {
+ const config = {
+ foo: 'bar',
+ nested: {
+ str: 'string',
+ num: 42,
+ },
+ };
+
+ const descriptor: ExposedToBrowserDescriptor = {
+ foo: true,
+ nested: {
+ str: true,
+ num: false,
+ },
+ };
+
+ const browserConfig = createBrowserConfig(config, descriptor);
+
+ expect(browserConfig).toEqual({
+ foo: 'bar',
+ nested: {
+ str: 'string',
+ },
+ });
+ });
+
+ it('accepts deeply nested structures', () => {
+ const config = {
+ foo: 'bar',
+ deeply: {
+ str: 'string',
+ nested: {
+ hello: 'dolly',
+ structure: {
+ propA: 'propA',
+ propB: 'propB',
+ },
+ },
+ },
+ };
+
+ const descriptor: ExposedToBrowserDescriptor = {
+ foo: false,
+ deeply: {
+ str: false,
+ nested: {
+ hello: true,
+ structure: {
+ propA: true,
+ propB: false,
+ },
+ },
+ },
+ };
+
+ const browserConfig = createBrowserConfig(config, descriptor);
+
+ expect(browserConfig).toEqual({
+ deeply: {
+ nested: {
+ hello: 'dolly',
+ structure: {
+ propA: 'propA',
+ },
+ },
+ },
+ });
+ });
+
+ it('only includes leaf properties that are `true` when in nested structures', () => {
+ const config = {
+ foo: 'bar',
+ deeply: {
+ str: 'string',
+ nested: {
+ hello: 'dolly',
+ structure: {
+ propA: 'propA',
+ propB: 'propB',
+ },
+ },
+ },
+ };
+
+ const descriptor: ExposedToBrowserDescriptor = {
+ deeply: {
+ nested: {
+ hello: true,
+ structure: {
+ propA: true,
+ },
+ },
+ },
+ };
+
+ const browserConfig = createBrowserConfig(config, descriptor);
+
+ expect(browserConfig).toEqual({
+ deeply: {
+ nested: {
+ hello: 'dolly',
+ structure: {
+ propA: 'propA',
+ },
+ },
+ },
+ });
+ });
+});
diff --git a/src/core/server/plugins/create_browser_config.ts b/src/core/server/plugins/create_browser_config.ts
new file mode 100644
index 0000000000000..95c8de7f4c8cd
--- /dev/null
+++ b/src/core/server/plugins/create_browser_config.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ExposedToBrowserDescriptor } from './types';
+
+export const createBrowserConfig = (
+ config: T,
+ descriptor: ExposedToBrowserDescriptor
+): unknown => {
+ return recursiveCreateConfig(config, descriptor);
+};
+
+const recursiveCreateConfig = (
+ config: T,
+ descriptor: ExposedToBrowserDescriptor = {}
+): unknown => {
+ return Object.entries(config || {}).reduce((browserConfig, [key, value]) => {
+ const exposedConfig = descriptor[key as keyof ExposedToBrowserDescriptor];
+ if (exposedConfig && typeof exposedConfig === 'object') {
+ browserConfig[key] = recursiveCreateConfig(value, exposedConfig);
+ }
+ if (exposedConfig === true) {
+ browserConfig[key] = value;
+ }
+ return browserConfig;
+ }, {} as Record);
+};
diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
index 989cfed077856..85bb5acc5bf8e 100644
--- a/src/core/server/plugins/plugins_service.ts
+++ b/src/core/server/plugins/plugins_service.ts
@@ -9,7 +9,7 @@
import Path from 'path';
import { Observable } from 'rxjs';
import { concatMap, filter, first, map, tap, toArray } from 'rxjs/operators';
-import { getFlattenedObject, pick } from '@kbn/std';
+import { getFlattenedObject } from '@kbn/std';
import { CoreService } from '../../types';
import { CoreContext } from '../core_context';
@@ -26,6 +26,7 @@ import {
} from './types';
import { PluginsConfig, PluginsConfigType } from './plugins_config';
import { PluginsSystem } from './plugins_system';
+import { createBrowserConfig } from './create_browser_config';
import { InternalCorePreboot, InternalCoreSetup, InternalCoreStart } from '../internal_types';
import { IConfigService } from '../config';
import { InternalEnvironmentServicePreboot } from '../environment';
@@ -228,16 +229,11 @@ export class PluginsService implements CoreService
- pick(
- config || {},
- Object.entries(configDescriptor.exposeToBrowser!)
- .filter(([_, exposed]) => exposed)
- .map(([key, _]) => key)
- )
- )
- ),
+ this.configService
+ .atPath(plugin.configPath)
+ .pipe(
+ map((config: any) => createBrowserConfig(config, configDescriptor.exposeToBrowser!))
+ ),
];
})
);
diff --git a/src/core/server/plugins/types.test.ts b/src/core/server/plugins/types.test.ts
new file mode 100644
index 0000000000000..4a0e6052a9901
--- /dev/null
+++ b/src/core/server/plugins/types.test.ts
@@ -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
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { ExposedToBrowserDescriptor } from './types';
+
+describe('ExposedToBrowserDescriptor', () => {
+ interface ConfigType {
+ str: string;
+ array: number[];
+ obj: {
+ sub1: string;
+ sub2: number;
+ };
+ deep: {
+ foo: number;
+ nested: {
+ str: string;
+ arr: number[];
+ };
+ };
+ }
+
+ it('allows to use recursion on objects', () => {
+ const exposeToBrowser: ExposedToBrowserDescriptor = {
+ obj: {
+ sub1: true,
+ },
+ };
+ expect(exposeToBrowser).toBeDefined();
+ });
+
+ it('allows to use recursion at multiple levels', () => {
+ const exposeToBrowser: ExposedToBrowserDescriptor = {
+ deep: {
+ foo: true,
+ nested: {
+ str: true,
+ },
+ },
+ };
+ expect(exposeToBrowser).toBeDefined();
+ });
+
+ it('does not allow to use recursion on arrays', () => {
+ const exposeToBrowser: ExposedToBrowserDescriptor = {
+ // @ts-expect-error Type '{ 0: true; }' is not assignable to type 'boolean | undefined'.
+ array: {
+ 0: true,
+ },
+ };
+ expect(exposeToBrowser).toBeDefined();
+ });
+
+ it('does not allow to use recursion on arrays at lower levels', () => {
+ const exposeToBrowser: ExposedToBrowserDescriptor = {
+ deep: {
+ nested: {
+ // @ts-expect-error Type '{ 0: true; }' is not assignable to type 'boolean | undefined'.
+ arr: {
+ 0: true,
+ },
+ },
+ },
+ };
+ expect(exposeToBrowser).toBeDefined();
+ });
+
+ it('allows to specify all the properties', () => {
+ const exposeToBrowser: ExposedToBrowserDescriptor = {
+ str: true,
+ array: false,
+ obj: {
+ sub1: true,
+ },
+ deep: {
+ foo: true,
+ nested: {
+ arr: false,
+ str: true,
+ },
+ },
+ };
+ expect(exposeToBrowser).toBeDefined();
+ });
+});
diff --git a/src/core/server/plugins/types.ts b/src/core/server/plugins/types.ts
index a2e460a3e3c67..806c67cd5ea7f 100644
--- a/src/core/server/plugins/types.ts
+++ b/src/core/server/plugins/types.ts
@@ -27,6 +27,23 @@ type Maybe = T | undefined;
*/
export type PluginConfigSchema = Type;
+/**
+ * Type defining the list of configuration properties that will be exposed on the client-side
+ * Object properties can either be fully exposed
+ *
+ * @public
+ */
+export type ExposedToBrowserDescriptor = {
+ [Key in keyof T]?: T[Key] extends Maybe
+ ? // handles arrays as primitive values
+ boolean
+ : T[Key] extends Maybe