Skip to content

Commit cd0b235

Browse files
authored
Merge branch 'main' into 225972-settings-error-wrapper-change
2 parents 691a7b3 + d839f7f commit cd0b235

566 files changed

Lines changed: 362 additions & 1320 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/ftr_base_serverless_configs.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@ disabled:
22
# Base config files, only necessary to inform config finding script
33

44
# Serverless deployment-agnostic default config for api-integration tests
5-
- x-pack/test/api_integration/deployment_agnostic/default_configs/serverless.config.base.ts
6-
- x-pack/test/api_integration/deployment_agnostic/default_configs/feature_flag.serverless.config.base.ts
5+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/serverless.config.base.ts
6+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.serverless.config.base.ts
77
# Serverless base config files
88
- x-pack/test_serverless/api_integration/config.base.ts
99
- x-pack/test_serverless/functional/config.base.ts
1010
- x-pack/test_serverless/shared/config.base.ts
11+
12+
enabled:
13+
# Serverless deployment-agnostic configs to run platform api-integration tests
14+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.serverless.config.ts
15+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/search.serverless.config.ts
16+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/security.serverless.config.ts
17+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ enabled:
4141
- x-pack/test_serverless/functional/test_suites/observability/config.telemetry.ts
4242
# serverless config files that run deployment-agnostic tests
4343
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
44-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts
4544
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
4645
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
4746
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts

.buildkite/ftr_platform_stateful_configs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
disabled:
22
# Stateful base config for deployment-agnostic tests
3+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/stateful.config.base.ts
4+
- x-pack/platform/test/api_integration_deployment_agnostic/default_configs/feature_flag.stateful.config.base.ts
35
- x-pack/test/api_integration/deployment_agnostic/default_configs/stateful.config.base.ts
46
- 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
77

88
# Base config files, only necessary to inform config finding script
99
- src/platform/test/functional/config.base.js
@@ -363,8 +363,6 @@ enabled:
363363
- x-pack/performance/journeys_e2e/apm_service_inventory.ts
364364
- x-pack/performance/journeys_e2e/infra_hosts_view.ts
365365
- x-pack/test/custom_branding/config.ts
366-
# stateful config files that run deployment-agnostic tests
367-
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/platform.stateful.config.ts
368366
# configs migrated to the new Kibana architecture
369367
- x-pack/platform/test/api_integration/apis/aiops/config.ts
370368
- x-pack/platform/test/api_integration/apis/cloud/config.ts
@@ -410,3 +408,5 @@ enabled:
410408
- x-pack/platform/test/saved_object_api_integration/spaces_only/config.ts
411409
- x-pack/platform/test/saved_object_api_integration/low-level/config.ts
412410
- x-pack/platform/test/saved_object_api_integration/user_profiles/config.ts
411+
# stateful config files that run deployment-agnostic tests
412+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/stateful/platform.stateful.config.ts

.buildkite/ftr_search_serverless_configs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,3 @@ enabled:
2525
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group10.ts
2626
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group11.ts
2727
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group12.ts
28-
# serverless config files that run deployment-agnostic tests
29-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/search.serverless.config.ts

.buildkite/ftr_security_serverless_configs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,5 @@ enabled:
131131
- x-pack/test/security_solution_api_integration/test_suites/ai4dsoc/cases/search_ai_lake_tier/configs/serverless.config.ts
132132
- x-pack/test/security_solution_api_integration/test_suites/ai4dsoc/nlp_cleanup_task/search_ai_lake_tier/configs/serverless.config.ts
133133
# serverless config files that run deployment-agnostic tests
134-
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/security.serverless.config.ts
135134
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.config.ts
136135
- x-pack/platform/test/spaces_api_integration/deployment_agnostic/security_and_spaces/serverless.copy_to_space.config.ts

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ steps:
5454
env:
5555
FTR_CONFIGS_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/ftr_configs.sh"
5656
JEST_INTEGRATION_SCRIPT: "TEST_ES_SERVERLESS_IMAGE=$ES_SERVERLESS_IMAGE .buildkite/scripts/steps/test/jest_integration.sh"
57-
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**"
57+
FTR_CONFIG_PATTERNS: "**/test_serverless/**,**/test/security_solution_api_integration/**/serverless.config.ts,x-pack/test/api_integration/deployment_agnostic/configs/serverless/**,x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/**"
5858
FTR_EXTRA_ARGS: "$FTR_EXTRA_ARGS"
5959
LIMIT_CONFIG_TYPE: "functional,integration"
6060
retry:

.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,8 @@ module.exports = {
776776
'x-pack/test/apm_api_integration/**/*.ts',
777777
'x-pack/test/functional/apps/**/*.js',
778778
'x-pack/solutions/observability/plugins/apm/**/*.js',
779-
'x-pack/platform/test/*/{tests,test_suites,apis,apps,deployment_agnostic}/**/*',
779+
'x-pack/platform/test/*/{tests,test_suites,apis,apps}/**/*',
780+
'x-pack/platform/test/*api_integration*/**/*',
780781
'x-pack/platform/test/*/*config.*ts',
781782
'x-pack/solutions/*/test/**/{tests,test_suites,apis,apps,deployment_agnostic,fixtures}/**/*',
782783
'x-pack/solutions/*/test/**/*config.*ts',

.github/CODEOWNERS

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,6 +1349,8 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
13491349
/x-pack/test_serverless/api_integration/test_suites/observability/config.logs_essentials.ts @elastic/observability-ui @elastic/appex-qa
13501350
/x-pack/test_serverless/api_integration/test_suites/observability/index.logs_essentials.ts @elastic/observability-ui
13511351
/x-pack/test_serverless/api_integration/test_suites/observability/logs_essentials_only @elastic/observability-ui
1352+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.logs_essentials.index.ts @elastic/observability-ui
1353+
/x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts @elastic/observability-ui
13521354

13531355
### Observability Plugins
13541356

@@ -1359,6 +1361,15 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
13591361
/x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
13601362
/x-pack/test/functional/es_archives/observability/ai_assistant @elastic/obs-ai-assistant
13611363
/x-pack/test/api_integration/deployment_agnostic/apis/observability/ai_assistant @elastic/obs-ai-assistant
1364+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.index.ts @elastic/obs-ai-assistant
1365+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts @elastic/obs-ai-assistant
1366+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant.index.ts @elastic/obs-ai-assistant
1367+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant.stateful.config.ts @elastic/obs-ai-assistant
1368+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant_local.index.ts @elastic/obs-ai-assistant
1369+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.ai_assistant_local.serverless.config.ts @elastic/obs-ai-assistant
1370+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant_local.index.ts @elastic/obs-ai-assistant
1371+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts @elastic/obs-ai-assistant
1372+
13621373
# Infra Obs
13631374
## This plugin mostly contains the codebase for the infra services, but also includes some code for the Logs UI app.
13641375
## To keep @elastic/obs-ux-logs-team as codeowner of the plugin manifest without requiring a review for all the other code changes
@@ -1371,7 +1382,15 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
13711382
## infra/{common,docs,public,server}/{sub-folders}/ -> @elastic/obs-ux-infra_services-team
13721383
# obs-ux-infra_services-team
13731384
/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/ @elastic/obs-ux-infra_services-team
1385+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.index.ts @elastic/obs-ux-infra_services-team
1386+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts @elastic/obs-ux-infra_services-team
1387+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.index.ts @elastic/obs-ux-infra_services-team
1388+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts @elastic/obs-ux-infra_services-team
13741389
/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/ @elastic/obs-ux-infra_services-team
1390+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts @elastic/obs-ux-infra_services-team
1391+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts @elastic/obs-ux-infra_services-team
1392+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts @elastic/obs-ux-infra_services-team
1393+
/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts @elastic/obs-ux-infra_services-team
13751394
/x-pack/test/functional/page_objects/asset_details.ts @elastic/obs-ux-infra_services-team # Assigned per https://github.com/elastic/kibana/pull/200157/files/c83fae62151fe634342c498aca69b686b739fe45#r1842202022
13761395
/x-pack/test/functional/page_objects/infra_* @elastic/obs-ux-infra_services-team
13771396
/x-pack/test/functional/es_archives/infra @elastic/obs-ux-infra_services-team
@@ -1467,6 +1486,12 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
14671486
/x-pack/test/api_integration/deployment_agnostic/services/alerting_api @elastic/obs-ux-management-team
14681487
/x-pack/test/api_integration/deployment_agnostic/services/slo_api @elastic/obs-ux-management-team
14691488
/x-pack/test/api_integration/deployment_agnostic/apis/observability/synthetics/ @elastic/obs-ux-management-team
1489+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.index.ts @elastic/obs-ux-management-team
1490+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts @elastic/obs-ux-management-team
1491+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/serverless/oblt.synthetics.index.ts @elastic/obs-ux-management-team
1492+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/serverless/oblt.synthetics.serverless.config.ts @elastic/obs-ux-management-team
1493+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/stateful/oblt.synthetics.index.ts @elastic/obs-ux-management-team
1494+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/stateful/oblt.synthetics.stateful.config.ts @elastic/obs-ux-management-team
14701495
/x-pack/test/api_integration/deployment_agnostic/services/synthetics_monitors @elastic/obs-ux-management-team
14711496
/x-pack/test/api_integration/deployment_agnostic/services/synthetics_private_location @elastic/obs-ux-management-team
14721497
/x-pack/test/api_integration/deployment_agnostic/apis/observability/incident_management/ @elastic/obs-ux-management-team
@@ -1575,6 +1600,8 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
15751600

15761601
# Streams
15771602
/x-pack/test/api_integration/deployment_agnostic/apis/observability/streams @elastic/streams-program-team
1603+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.index.ts @elastic/streams-program-team
1604+
/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts @elastic/streams-program-team
15781605
/x-pack/test/api_integration/fixtures/kbn_archiver/streams @elastic/streams-program-team
15791606

15801607
### END Observability Plugins
@@ -1868,7 +1895,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
18681895
/src/platform/packages/shared/kbn-es/src/stateful_resources/roles.yml @elastic/appex-qa
18691896
/x-pack/test/api_integration/deployment_agnostic/ftr_provider_context.d.ts @elastic/appex-qa
18701897
/x-pack/test/api_integration/deployment_agnostic/README.md @elastic/appex-qa
1871-
/x-pack/test/api_integration/deployment_agnostic/*configs/ @elastic/appex-qa
1898+
/x-pack/platform/test/api_integration_deployment_agnostic/*configs/ @elastic/appex-qa
18721899
/x-pack/test/api_integration/deployment_agnostic/services/ @elastic/appex-qa
18731900
/x-pack/platform/test/api_integration_deployment_agnostic/ @elastic/appex-qa
18741901
/x-pack/platform/test/kibana.jsonc @elastic/appex-qa
@@ -1890,6 +1917,10 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
18901917
/x-pack/test/apm_api_integration @elastic/appex-qa # temporarily due to SKA tests relocation
18911918
/x-pack/test/common/utils/observability @elastic/appex-qa # temporarily due to SKA tests relocation
18921919
/x-pack/test/common/utils/uptime @elastic/appex-qa # temporarily due to SKA tests relocation
1920+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/serverless/oblt.index.ts @elastic/appex-qa # temporarily due to SKA tests relocation
1921+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts @elastic/appex-qa # temporarily due to SKA tests relocation
1922+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/stateful/oblt.index.ts @elastic/appex-qa # temporarily due to SKA tests relocation
1923+
/x-pack/test/api_integration/deployment_agnostic/feature_flag_configs/stateful/oblt.stateful.config.ts @elastic/appex-qa # temporarily due to SKA tests relocation
18931924
/x-pack/platform/test/serverless @elastic/appex-qa
18941925

18951926
# Core
@@ -1975,8 +2006,8 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security
19752006
/x-pack/platform/test/api_integration/apis/status @elastic/kibana-core
19762007
/x-pack/platform/test/api_integration/apis/stats @elastic/kibana-core
19772008
/x-pack/platform/test/api_integration/apis/kibana/stats @elastic/kibana-core
1978-
/x-pack/test/api_integration/deployment_agnostic/apis/core/ @elastic/kibana-core
1979-
/x-pack/test/api_integration/deployment_agnostic/apis/saved_objects_management/ @elastic/kibana-core
2009+
/x-pack/platform/test/api_integration_deployment_agnostic/apis/core/ @elastic/kibana-core
2010+
/x-pack/platform/test/api_integration_deployment_agnostic/apis/saved_objects_management/ @elastic/kibana-core
19802011
/x-pack/test_serverless/functional/test_suites/security/config.saved_objects_management.ts @elastic/kibana-core
19812012
/config/ @elastic/kibana-core
19822013
/config/serverless.yml @elastic/kibana-core @elastic/kibana-security
@@ -2255,7 +2286,7 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
22552286
/src/platform/test/functional/apps/saved_objects_management @elastic/kibana-management
22562287
/src/platform/test/functional/apps/console/*.ts @elastic/kibana-management
22572288
/src/platform/test/api_integration/apis/console/*.ts @elastic/kibana-management
2258-
/x-pack/test/api_integration/deployment_agnostic/apis/console/ @elastic/kibana-management
2289+
/x-pack/platform/test/api_integration_deployment_agnostic/apis/console/ @elastic/kibana-management
22592290
/src/platform/test/accessibility/apps/management.ts @elastic/kibana-management
22602291
/src/platform/test/accessibility/apps/console.ts @elastic/kibana-management
22612292
/x-pack/test/api_integration/services/index_management.ts @elastic/kibana-management
@@ -2282,8 +2313,8 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
22822313
/x-pack/test_serverless/functional/test_suites/common/dev_tools/ @elastic/kibana-management
22832314
/x-pack/test_serverless/**/test_suites/common/grok_debugger/ @elastic/kibana-management
22842315
/x-pack/platform/test/api_integration/apis/management/ @elastic/kibana-management
2285-
/x-pack/test/api_integration/deployment_agnostic/apis/management/ @elastic/kibana-management
2286-
/x-pack/test/api_integration/deployment_agnostic/apis/painless_lab/ @elastic/kibana-management
2316+
/x-pack/platform/test/api_integration_deployment_agnostic/apis/management/ @elastic/kibana-management
2317+
/x-pack/platform/test/api_integration_deployment_agnostic/apis/painless_lab/ @elastic/kibana-management
22872318
/x-pack/test/functional/apps/rollup_job/ @elastic/kibana-management
22882319
/x-pack/platform/test/api_integration/apis/grok_debugger @elastic/kibana-management
22892320
/x-pack/test/accessibility/apps/group1/advanced_settings.ts @elastic/kibana-management

src/platform/plugins/shared/saved_objects_management/public/management_section/object_view/__snapshots__/saved_object_view.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/platform/plugins/shared/saved_objects_management/public/management_section/object_view/saved_object_view.scss

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

0 commit comments

Comments
 (0)