Skip to content

Commit e846aac

Browse files
committed
Merge remote-tracking branch 'upstream/main' into prebuilt-rule-diff-flyout-follow-up
2 parents bcd0527 + eb948ae commit e846aac

2,424 files changed

Lines changed: 50909 additions & 26826 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/.mocharc.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ disabled:
22
# Stateful base config for deployment-agnostic tests
33
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
44
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
5+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
6+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
57

68
# Base config files, only necessary to inform config finding script
79
- src/platform/test/functional/config.base.js
810
- src/platform/test/functional/firefox/config.base.ts
911
- x-pack/test/functional/config.base.js
1012
- x-pack/platform/test/functional/config.base.ts
11-
- x-pack/test/localization/config.base.ts
13+
- x-pack/platform/test/localization/config.base.ts
1214
- src/platform/test/server_integration/config.base.js
1315
- x-pack/test/functional_with_es_ssl/config.base.ts
1416
- x-pack/test/api_integration/config.ts
@@ -17,10 +19,11 @@ disabled:
1719
- x-pack/test/functional_basic/apps/ml/config.base.ts
1820
- x-pack/test/functional_basic/apps/transform/config.base.ts
1921
- x-pack/platform/test/api_integration_basic/config.basic_license.ts
22+
- x-pack/platform/test/ui_capabilities/common/config.ts
2023

2124
# QA suites that are run out-of-band
2225
- x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
23-
- x-pack/test/upgrade/config.ts
26+
- x-pack/platform/test/upgrade/config.ts
2427
- src/platform/test/functional/config.edge.js
2528
- x-pack/platform/test/functional/config.edge.ts
2629
- x-pack/test/functional/config.edge.js
@@ -51,12 +54,12 @@ disabled:
5154
# Gen AI suites, running with their own pipeline
5255
- x-pack/test/functional_gen_ai/inference/config.ts
5356

54-
5557
defaultQueue: 'n2-4-spot'
5658
enabled:
5759
- src/platform/test/accessibility/config.ts
5860
- src/platform/test/analytics/config.ts
5961
- src/platform/test/api_integration/config.js
62+
- src/platform/test/api_integration/apis/unused_urls_task/config.ts
6063
- src/platform/test/examples/config.js
6164
- src/platform/test/functional/apps/bundles/config.ts
6265
- src/platform/test/functional/apps/console/config.ts
@@ -135,9 +138,9 @@ enabled:
135138
- x-pack/test/accessibility/apps/group1/config.ts
136139
- x-pack/test/accessibility/apps/group2/config.ts
137140
- x-pack/test/accessibility/apps/group3/config.ts
138-
- x-pack/test/localization/config.ja_jp.ts
139-
- x-pack/test/localization/config.fr_fr.ts
140-
- x-pack/test/localization/config.zh_cn.ts
141+
- x-pack/platform/test/localization/config.ja_jp.ts
142+
- x-pack/platform/test/localization/config.fr_fr.ts
143+
- x-pack/platform/test/localization/config.zh_cn.ts
141144
- x-pack/platform/test/alerting_api_integration/basic/config.ts
142145
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group1/config.ts
143146
- x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/config.ts
@@ -163,8 +166,8 @@ enabled:
163166
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial_common.ts
164167
- x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts
165168
- x-pack/platform/test/cases_api_integration/spaces_only/config.ts
166-
- x-pack/test/disable_ems/config.ts
167-
- x-pack/test/examples/config.ts
169+
- x-pack/platform/test/disable_ems/config.ts
170+
- x-pack/platform/test/examples/config.ts
168171
- x-pack/test/fleet_api_integration/config.agent.ts
169172
- x-pack/test/fleet_api_integration/config.agent_policy.ts
170173
- x-pack/test/fleet_api_integration/config.epm.ts
@@ -185,9 +188,9 @@ enabled:
185188
- x-pack/test/functional_basic/apps/transform/creation/runtime_mappings_saved_search/config.ts
186189
- x-pack/test/functional_basic/apps/transform/permissions/config.ts
187190
- x-pack/test/functional_basic/apps/transform/feature_controls/config.ts
188-
- x-pack/test/functional_cors/config.ts
189-
- x-pack/test/functional_embedded/config.ts
190-
- x-pack/test/functional_execution_context/config.ts
191+
- x-pack/platform/test/functional_cors/config.ts
192+
- x-pack/platform/test/functional_embedded/config.ts
193+
- x-pack/platform/test/functional_execution_context/config.ts
191194
- x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts
192195
- x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts
193196
- x-pack/test/functional_with_es_ssl/apps/cases/basic/config.ts
@@ -250,11 +253,11 @@ enabled:
250253
- x-pack/test/functional/apps/remote_clusters/config.ts
251254
- x-pack/platform/test/functional/apps/reporting_management/config.ts
252255
- x-pack/test/functional/apps/rollup_job/config.ts
253-
- x-pack/test/functional/apps/saved_objects_management/config.ts
254-
- x-pack/test/functional/apps/saved_query_management/config.ts
255-
- x-pack/test/functional/apps/saved_query_management/config.v2.ts
256+
- x-pack/platform/test/functional/apps/saved_objects_management/config.ts
257+
- x-pack/platform/test/functional/apps/saved_query_management/config.ts
258+
- x-pack/platform/test/functional/apps/saved_query_management/config.v2.ts
256259
- x-pack/platform/test/functional/apps/security/config.ts
257-
- x-pack/test/functional/apps/snapshot_restore/config.ts
260+
- x-pack/platform/test/functional/apps/snapshot_restore/config.ts
258261
- x-pack/platform/test/functional/apps/spaces/config.ts
259262
- x-pack/test/functional/apps/status_page/config.ts
260263
- x-pack/test/functional/apps/transform/creation/index_pattern/config.ts
@@ -264,19 +267,19 @@ enabled:
264267
- x-pack/test/functional/apps/transform/permissions/config.ts
265268
- x-pack/test/functional/apps/transform/feature_controls/config.ts
266269
- x-pack/platform/test/functional/apps/upgrade_assistant/config.ts
267-
- x-pack/test/functional/apps/user_profiles/config.ts
270+
- x-pack/platform/test/functional/apps/user_profiles/config.ts
268271
- x-pack/test/functional/apps/visualize/config.ts
269272
- x-pack/platform/test/functional/apps/watcher/config.ts
270273
- x-pack/platform/test/functional/config_security_basic.ts
271274
- x-pack/test/functional/config.ccs.ts
272275
- x-pack/test/functional/config.firefox.js
273276
- x-pack/platform/test/functional/config.firefox.ts
274277
- x-pack/platform/test/functional/config.upgrade_assistant.ts
275-
- x-pack/test/functional_cloud/config.ts
276-
- x-pack/test/functional_cloud/saml.config.ts
278+
- x-pack/platform/test/functional_cloud/config.ts
279+
- x-pack/platform/test/functional_cloud/saml.config.ts
277280
- x-pack/test/functional_solution_sidenav/config.ts
278-
- x-pack/test/licensing_plugin/config.public.ts
279-
- x-pack/test/licensing_plugin/config.ts
281+
- x-pack/platform/test/licensing_plugin/config.public.ts
282+
- x-pack/platform/test/licensing_plugin/config.ts
280283
- x-pack/test/plugin_functional/config.ts
281284
- x-pack/platform/test/reporting_api_integration/reporting_and_security.config.ts
282285
- x-pack/platform/test/reporting_api_integration/reporting_without_security.config.ts
@@ -291,7 +294,7 @@ enabled:
291294
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
292295
- x-pack/test/saved_object_tagging/functional/config.ts
293296
- x-pack/test/saved_objects_field_count/config.ts
294-
- x-pack/test/search_sessions_integration/config.ts
297+
- x-pack/platform/test/search_sessions_integration/config.ts
295298
- x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts
296299
- x-pack/test/security_api_integration/anonymous.config.ts
297300
- x-pack/test/security_api_integration/api_keys.config.ts
@@ -327,14 +330,14 @@ enabled:
327330
- x-pack/test/security_functional/user_profiles.config.ts
328331
- x-pack/test/security_functional/expired_session.config.ts
329332
- x-pack/test/session_view/basic/config.ts
330-
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
331-
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
332-
- x-pack/test/spaces_api_integration/spaces_only/config.ts
333+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_basic.ts
334+
- x-pack/platform/test/spaces_api_integration/security_and_spaces/config_trial.ts
335+
- x-pack/platform/test/spaces_api_integration/spaces_only/config.ts
333336
- x-pack/platform/test/task_manager_claimer_update_by_query/config.ts
334-
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
335-
- x-pack/test/ui_capabilities/spaces_only/config.ts
337+
- x-pack/platform/test/ui_capabilities/security_and_spaces/config.ts
338+
- x-pack/platform/test/ui_capabilities/spaces_only/config.ts
336339
- x-pack/test/upgrade_assistant_integration/config.ts
337-
- x-pack/test/usage_collection/config.ts
340+
- x-pack/platform/test/usage_collection/config.ts
338341
- x-pack/performance/journeys_e2e/aiops_log_rate_analysis.ts
339342
- x-pack/performance/journeys_e2e/ecommerce_dashboard.ts
340343
- x-pack/performance/journeys_e2e/ecommerce_dashboard_http2.ts
@@ -407,4 +410,3 @@ enabled:
407410
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
408411
- x-pack/platform/test/saved_object_api_integration/low-level/config.ts
409412
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
410-
- src/platform/test/api_integration/apis/unused_urls_task/config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ enabled:
8181
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/serverless.config.ts
8282
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/serverless.config.ts
8383
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/serverless.config.ts
84+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/serverless_essentials_tier.config.ts
8485
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/serverless.config.ts
8586
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/configs/serverless.config.ts
8687
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/serverless.config.ts
@@ -131,5 +132,5 @@ enabled:
131132
- x-pack/test/security_solution_api_integration/test_suites/ai4dsoc/nlp_cleanup_task/search_ai_lake_tier/configs/serverless.config.ts
132133
# serverless config files that run deployment-agnostic tests
133134
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts
134-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
135-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts
135+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
136+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ enabled:
6767
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts
6868
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/ess.config.ts
6969
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/ess.config.ts
70+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/configs/ess_basic_license.config.ts
7071
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/configs/ess.config.ts
7172
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/configs/ess.config.ts
7273
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/configs/ess.config.ts
@@ -114,11 +115,11 @@ enabled:
114115
- x-pack/solutions/security/test/cloud_security_posture_functional/config.ts
115116
- x-pack/solutions/security/test/cloud_security_posture_functional/config.agentless.ts
116117
- x-pack/solutions/security/test/cloud_security_posture_functional/data_views/config.ts
117-
- x-pack/test/spaces_api_integration/deployment_agnostic/spaces_only/config.ts
118-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_basic.ts
119-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_trial.ts
120-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_trial.ts
121-
- x-pack/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_basic.ts
118+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/spaces_only/config.ts
119+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_basic.ts
120+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.config_trial.ts
121+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_trial.ts
122+
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/stateful.copy_to_space.config_basic.ts
122123
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group1/config.ts
123124
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config.ts
124125
- x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts

src/platform/packages/shared/kbn-esql-ast/src/ast/util.ts renamed to .buildkite/jest.config.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import { ESQLAstNode, ESQLCommandOption } from '../types';
10+
const { createJsWithTsEsmPreset } = require('ts-jest');
1111

12-
export const isOptionNode = (node: ESQLAstNode): node is ESQLCommandOption => {
13-
return !!node && typeof node === 'object' && !Array.isArray(node) && node.type === 'option';
12+
const tsJestTransformCfg = createJsWithTsEsmPreset().transform;
13+
14+
/** @type {import("jest").Config} **/
15+
module.exports = {
16+
testEnvironment: 'node',
17+
transform: {
18+
...tsJestTransformCfg,
19+
},
20+
transformIgnorePatterns: [
21+
'node_modules/(?!(@octokit/.*|universal-user-agent|before-after-hook)/)',
22+
],
1423
};

0 commit comments

Comments
 (0)