From ad96dca2ae6648bd0a20eb0ddc467e932a497a67 Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Thu, 3 Jul 2025 18:52:12 +0200 Subject: [PATCH 1/4] relocate examples --- .buildkite/ftr_platform_stateful_configs.yml | 2 +- .github/CODEOWNERS | 12 ++++++------ x-pack/{ => platform}/test/examples/config.ts | 2 +- .../test/examples/embedded_lens/embedded_example.ts | 0 .../test/examples/embedded_lens/index.ts | 0 .../test/examples/screenshotting/index.ts | 0 .../test/examples/search_examples/index.ts | 0 .../search_examples/partial_results_example.ts | 0 .../test/examples/search_examples/search_example.ts | 0 .../search_examples/search_session_example.ts | 0 .../search_examples/search_sessions_cache.ts | 0 .../examples/search_examples/sql_search_example.ts | 0 .../global_rule_event_log_list.ts | 0 .../examples/triggers_actions_ui_examples/index.ts | 0 .../rule_event_log_list.ts | 0 .../rule_status_dropdown.ts | 0 .../rule_status_filter.ts | 0 .../triggers_actions_ui_examples/rule_tag_badge.ts | 0 .../triggers_actions_ui_examples/rule_tag_filter.ts | 0 .../triggers_actions_ui_examples/rules_list.ts | 0 .../rules_settings_link.ts | 0 x-pack/platform/test/functional/services/index.ts | 2 ++ .../test/functional/services/search_sessions.ts | 0 x-pack/test/functional/services/index.ts | 2 +- 24 files changed, 11 insertions(+), 9 deletions(-) rename x-pack/{ => platform}/test/examples/config.ts (96%) rename x-pack/{ => platform}/test/examples/embedded_lens/embedded_example.ts (100%) rename x-pack/{ => platform}/test/examples/embedded_lens/index.ts (100%) rename x-pack/{ => platform}/test/examples/screenshotting/index.ts (100%) rename x-pack/{ => platform}/test/examples/search_examples/index.ts (100%) rename x-pack/{ => platform}/test/examples/search_examples/partial_results_example.ts (100%) rename x-pack/{ => platform}/test/examples/search_examples/search_example.ts (100%) rename x-pack/{ => platform}/test/examples/search_examples/search_session_example.ts (100%) rename x-pack/{ => platform}/test/examples/search_examples/search_sessions_cache.ts (100%) rename x-pack/{ => platform}/test/examples/search_examples/sql_search_example.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/index.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rule_status_filter.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rules_list.ts (100%) rename x-pack/{ => platform}/test/examples/triggers_actions_ui_examples/rules_settings_link.ts (100%) rename x-pack/{ => platform}/test/functional/services/search_sessions.ts (100%) diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index f6d8aecb64082..64140041c6051 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -165,7 +165,7 @@ enabled: - x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts - x-pack/platform/test/cases_api_integration/spaces_only/config.ts - x-pack/test/disable_ems/config.ts - - x-pack/test/examples/config.ts + - x-pack/platform/test/examples/config.ts - x-pack/test/fleet_api_integration/config.agent.ts - x-pack/test/fleet_api_integration/config.agent_policy.ts - x-pack/test/fleet_api_integration/config.epm.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d375a7e9a0ee6..0619dad6fab3e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1206,7 +1206,7 @@ x-pack/test_serverless/api_integration/test_suites/common/platform_security @ela /x-pack/test/accessibility/apps/group3/search_sessions.ts @elastic/kibana-data-discovery /x-pack/platform/test/api_integration/apis/management/rollup/index_patterns_extensions.js @elastic/kibana-data-discovery /x-pack/platform/test/api_integration/apis/search @elastic/kibana-data-discovery -/x-pack/test/examples/search_examples @elastic/kibana-data-discovery +/x-pack/platform/test/examples/search_examples @elastic/kibana-data-discovery /x-pack/test/functional/apps/data_views @elastic/kibana-data-discovery /x-pack/test/functional/apps/discover @elastic/kibana-data-discovery /x-pack/test/functional/apps/saved_query_management @elastic/kibana-data-discovery @@ -1272,7 +1272,7 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /src/platform/test/functional/page_objects/tag_cloud_page.ts @elastic/kibana-visualizations /x-pack/platform/test/functional/page_objects/lens_page.ts @elastic/kibana-visualizations /x-pack/test/functional/es_archives/lens @elastic/kibana-visualizations -/x-pack/test/examples/embedded_lens @elastic/kibana-visualizations +/x-pack/platform/test/examples/embedded_lens @elastic/kibana-visualizations /x-pack/test/api_integration/fixtures/kbn_archiver/lens/ @elastic/kibana-visualizations /x-pack/platform/test/api_integration/apis/lens @elastic/kibana-visualizations /src/platform/test/plugin_functional/test_suites/custom_visualizations @elastic/kibana-visualizations @@ -1308,7 +1308,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions /x-pack/test/functional/apps/dashboard/reporting/ @elastic/response-ops /x-pack/test/functional/apps/reporting/ @elastic/response-ops /x-pack/platform/test/functional/apps/reporting_management/ @elastic/response-ops -/x-pack/test/examples/screenshotting/ @elastic/response-ops +/x-pack/platform/test/examples/screenshotting/ @elastic/response-ops /x-pack/test/functional/es_archives/lens/reporting/ @elastic/response-ops /x-pack/test/functional/es_archives/reporting/ @elastic/response-ops /x-pack/test/functional/fixtures/kbn_archiver/reporting/ @elastic/response-ops @@ -1766,7 +1766,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /x-pack/test/functional/ftr_provider_context.ts @elastic/appex-qa /x-pack/platform/test/functional/ftr_provider_context.ts @elastic/appex-qa /x-pack/test/functional/README.md @elastic/appex-qa -/x-pack/test/examples/config.ts @elastic/appex-qa +/x-pack/platform/test/examples/config.ts @elastic/appex-qa /x-pack/test/common/services/index.ts @elastic/appex-qa /x-pack/test/common/services/bsearch_secure.ts @elastic/appex-qa /x-pack/test/common/ftr_provider_context.ts @elastic/appex-qa @@ -2130,7 +2130,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops @elastic/kibana-cases /x-pack/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops /x-pack/test/upgrade/apps/rules @elastic/response-ops -/x-pack/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4 +/x-pack/platform/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4 /x-pack/test/functional/services/rules @elastic/response-ops /x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops /x-pack/test/functional/fixtures/kbn_archiver/cases @elastic/response-ops @elastic/kibana-cases @@ -2186,7 +2186,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /src/platform/test/functional/fixtures/kbn_archiver/annotation_listing_page_search.json @elastic/search-kibana /src/platform/test/functional/fixtures/es_archiver/search/downsampled @elastic/search-kibana /x-pack/test/functional_solution_sidenav/tests/search_sidenav.ts @elastic/search-kibana -/x-pack/test/functional/services/search_sessions.ts @elastic/search-kibana +/x-pack/platform/test/functional/services/search_sessions.ts @elastic/search-kibana /x-pack/test/functional/page_objects/search_* @elastic/search-kibana x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/search-kibana /x-pack/test/functional/apps/search_playground @elastic/search-kibana diff --git a/x-pack/test/examples/config.ts b/x-pack/platform/test/examples/config.ts similarity index 96% rename from x-pack/test/examples/config.ts rename to x-pack/platform/test/examples/config.ts index 01e0c779b58cb..38c64a768bdce 100644 --- a/x-pack/test/examples/config.ts +++ b/x-pack/platform/test/examples/config.ts @@ -11,7 +11,7 @@ import { REPO_ROOT as KIBANA_ROOT } from '@kbn/repo-info'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const xpackFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); return { diff --git a/x-pack/test/examples/embedded_lens/embedded_example.ts b/x-pack/platform/test/examples/embedded_lens/embedded_example.ts similarity index 100% rename from x-pack/test/examples/embedded_lens/embedded_example.ts rename to x-pack/platform/test/examples/embedded_lens/embedded_example.ts diff --git a/x-pack/test/examples/embedded_lens/index.ts b/x-pack/platform/test/examples/embedded_lens/index.ts similarity index 100% rename from x-pack/test/examples/embedded_lens/index.ts rename to x-pack/platform/test/examples/embedded_lens/index.ts diff --git a/x-pack/test/examples/screenshotting/index.ts b/x-pack/platform/test/examples/screenshotting/index.ts similarity index 100% rename from x-pack/test/examples/screenshotting/index.ts rename to x-pack/platform/test/examples/screenshotting/index.ts diff --git a/x-pack/test/examples/search_examples/index.ts b/x-pack/platform/test/examples/search_examples/index.ts similarity index 100% rename from x-pack/test/examples/search_examples/index.ts rename to x-pack/platform/test/examples/search_examples/index.ts diff --git a/x-pack/test/examples/search_examples/partial_results_example.ts b/x-pack/platform/test/examples/search_examples/partial_results_example.ts similarity index 100% rename from x-pack/test/examples/search_examples/partial_results_example.ts rename to x-pack/platform/test/examples/search_examples/partial_results_example.ts diff --git a/x-pack/test/examples/search_examples/search_example.ts b/x-pack/platform/test/examples/search_examples/search_example.ts similarity index 100% rename from x-pack/test/examples/search_examples/search_example.ts rename to x-pack/platform/test/examples/search_examples/search_example.ts diff --git a/x-pack/test/examples/search_examples/search_session_example.ts b/x-pack/platform/test/examples/search_examples/search_session_example.ts similarity index 100% rename from x-pack/test/examples/search_examples/search_session_example.ts rename to x-pack/platform/test/examples/search_examples/search_session_example.ts diff --git a/x-pack/test/examples/search_examples/search_sessions_cache.ts b/x-pack/platform/test/examples/search_examples/search_sessions_cache.ts similarity index 100% rename from x-pack/test/examples/search_examples/search_sessions_cache.ts rename to x-pack/platform/test/examples/search_examples/search_sessions_cache.ts diff --git a/x-pack/test/examples/search_examples/sql_search_example.ts b/x-pack/platform/test/examples/search_examples/sql_search_example.ts similarity index 100% rename from x-pack/test/examples/search_examples/sql_search_example.ts rename to x-pack/platform/test/examples/search_examples/sql_search_example.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/global_rule_event_log_list.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/index.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/index.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/index.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/index.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rule_event_log_list.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_dropdown.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rule_status_filter.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_filter.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rule_status_filter.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rule_status_filter.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_badge.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rule_tag_filter.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rules_list.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rules_list.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rules_list.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rules_list.ts diff --git a/x-pack/test/examples/triggers_actions_ui_examples/rules_settings_link.ts b/x-pack/platform/test/examples/triggers_actions_ui_examples/rules_settings_link.ts similarity index 100% rename from x-pack/test/examples/triggers_actions_ui_examples/rules_settings_link.ts rename to x-pack/platform/test/examples/triggers_actions_ui_examples/rules_settings_link.ts diff --git a/x-pack/platform/test/functional/services/index.ts b/x-pack/platform/test/functional/services/index.ts index 1b418147b5865..78e5874ae0078 100644 --- a/x-pack/platform/test/functional/services/index.ts +++ b/x-pack/platform/test/functional/services/index.ts @@ -12,6 +12,7 @@ import { UserMenuProvider } from './user_menu'; import { AceEditorProvider } from './ace_editor'; import { SampleDataServiceProvider } from './sample_data'; import { GrokDebuggerProvider } from './grok_debugger'; +import { SearchSessionsService } from './search_sessions'; // define the name and providers for services that should be // available to your tests. If you don't specify anything here @@ -27,4 +28,5 @@ export const services = { aceEditor: AceEditorProvider, sampleData: SampleDataServiceProvider, grokDebugger: GrokDebuggerProvider, + searchSessions: SearchSessionsService, }; diff --git a/x-pack/test/functional/services/search_sessions.ts b/x-pack/platform/test/functional/services/search_sessions.ts similarity index 100% rename from x-pack/test/functional/services/search_sessions.ts rename to x-pack/platform/test/functional/services/search_sessions.ts diff --git a/x-pack/test/functional/services/index.ts b/x-pack/test/functional/services/index.ts index 3ea20c2252c6e..eb0cac586451d 100644 --- a/x-pack/test/functional/services/index.ts +++ b/x-pack/test/functional/services/index.ts @@ -11,6 +11,7 @@ import { AceEditorProvider } from '@kbn/test-suites-xpack-platform/functional/se import { UserMenuProvider } from '@kbn/test-suites-xpack-platform/functional/services/user_menu'; import { SampleDataServiceProvider } from '@kbn/test-suites-xpack-platform/functional/services/sample_data'; import { GrokDebuggerProvider } from '@kbn/test-suites-xpack-platform/functional/services/grok_debugger'; +import { SearchSessionsService } from '@kbn/test-suites-xpack-platform/functional/services/search_sessions'; import { ReportingFunctionalProvider } from '@kbn/test-suites-xpack-platform/reporting_functional/services'; import { services as kibanaXPackApiIntegrationServices } from '../../api_integration/services'; import { services as commonServices } from '../../common/services'; @@ -62,7 +63,6 @@ import { InfraSourceConfigurationFormProvider } from './infra_source_configurati import { LogsUiProvider } from './logs_ui'; import { MachineLearningProvider } from './ml'; import { TransformProvider } from './transform'; -import { SearchSessionsService } from './search_sessions'; import { ObservabilityProvider } from './observability'; import { CasesServiceProvider } from './cases'; import { ActionsServiceProvider } from './actions'; From f506576936f641f8e4d9b92d0c414651e757982d Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Thu, 3 Jul 2025 18:57:46 +0200 Subject: [PATCH 2/4] relocate functional_cors --- .buildkite/ftr_platform_stateful_configs.yml | 2 +- .github/CODEOWNERS | 4 ++-- package.json | 2 +- tsconfig.base.json | 4 ++-- x-pack/{ => platform}/test/functional_cors/config.ts | 2 +- .../test/functional_cors/ftr_provider_context.d.ts | 0 .../functional_cors/plugins/kibana_cors_test/kibana.jsonc | 0 .../functional_cors/plugins/kibana_cors_test/package.json | 4 ++-- .../functional_cors/plugins/kibana_cors_test/server/config.ts | 0 .../functional_cors/plugins/kibana_cors_test/server/index.ts | 0 .../functional_cors/plugins/kibana_cors_test/server/plugin.ts | 0 .../functional_cors/plugins/kibana_cors_test/tsconfig.json | 2 +- x-pack/{ => platform}/test/functional_cors/services.ts | 0 x-pack/{ => platform}/test/functional_cors/tests/cors.ts | 0 x-pack/{ => platform}/test/functional_cors/tests/index.ts | 0 yarn.lock | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename x-pack/{ => platform}/test/functional_cors/config.ts (97%) rename x-pack/{ => platform}/test/functional_cors/ftr_provider_context.d.ts (100%) rename x-pack/{ => platform}/test/functional_cors/plugins/kibana_cors_test/kibana.jsonc (100%) rename x-pack/{ => platform}/test/functional_cors/plugins/kibana_cors_test/package.json (56%) rename x-pack/{ => platform}/test/functional_cors/plugins/kibana_cors_test/server/config.ts (100%) rename x-pack/{ => platform}/test/functional_cors/plugins/kibana_cors_test/server/index.ts (100%) rename x-pack/{ => platform}/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts (100%) rename x-pack/{ => platform}/test/functional_cors/plugins/kibana_cors_test/tsconfig.json (81%) rename x-pack/{ => platform}/test/functional_cors/services.ts (100%) rename x-pack/{ => platform}/test/functional_cors/tests/cors.ts (100%) rename x-pack/{ => platform}/test/functional_cors/tests/index.ts (100%) diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index 64140041c6051..ebd36dbeeaa1e 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -186,7 +186,7 @@ enabled: - x-pack/test/functional_basic/apps/transform/creation/runtime_mappings_saved_search/config.ts - x-pack/test/functional_basic/apps/transform/permissions/config.ts - x-pack/test/functional_basic/apps/transform/feature_controls/config.ts - - x-pack/test/functional_cors/config.ts + - x-pack/platform/test/functional_cors/config.ts - x-pack/test/functional_embedded/config.ts - x-pack/test/functional_execution_context/config.ts - x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0619dad6fab3e..49e28ca37e180 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1111,7 +1111,7 @@ x-pack/solutions/security/test x-pack/test x-pack/test_serverless x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core -x-pack/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security +x-pack/platform/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security x-pack/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops @@ -1927,7 +1927,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /x-pack/test/cloud_integration @elastic/kibana-core /x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core /src/platform/test/server_integration @elastic/kibana-core -/x-pack/test/functional_cors @elastic/kibana-core +/x-pack/platform/test/functional_cors @elastic/kibana-core /x-pack/test/stack_functional_integration/apps/telemetry @elastic/kibana-core /src/platform/test/plugin_functional/plugins/core* @elastic/kibana-core /src/platform/test/plugin_functional/platform/plugins/shared/telemetry @elastic/kibana-core diff --git a/package.json b/package.json index 26cf1252a83d5..5fc55f818e115 100644 --- a/package.json +++ b/package.json @@ -631,7 +631,7 @@ "@kbn/kbn-tp-run-pipeline-plugin": "link:src/platform/test/interpreter_functional/plugins/kbn_tp_run_pipeline", "@kbn/key-value-metadata-table": "link:x-pack/platform/packages/shared/kbn-key-value-metadata-table", "@kbn/kibana-api-cli": "link:x-pack/platform/packages/shared/kbn-kibana-api-cli", - "@kbn/kibana-cors-test-plugin": "link:x-pack/test/functional_cors/plugins/kibana_cors_test", + "@kbn/kibana-cors-test-plugin": "link:x-pack/platform/test/functional_cors/plugins/kibana_cors_test", "@kbn/kibana-overview-plugin": "link:src/platform/plugins/private/kibana_overview", "@kbn/kibana-react-plugin": "link:src/platform/plugins/shared/kibana_react", "@kbn/kibana-usage-collection-plugin": "link:src/platform/plugins/private/kibana_usage_collection", diff --git a/tsconfig.base.json b/tsconfig.base.json index 2bd6825a60615..f52fce5c3278c 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1178,8 +1178,8 @@ "@kbn/key-value-metadata-table/*": ["x-pack/platform/packages/shared/kbn-key-value-metadata-table/*"], "@kbn/kibana-api-cli": ["x-pack/platform/packages/shared/kbn-kibana-api-cli"], "@kbn/kibana-api-cli/*": ["x-pack/platform/packages/shared/kbn-kibana-api-cli/*"], - "@kbn/kibana-cors-test-plugin": ["x-pack/test/functional_cors/plugins/kibana_cors_test"], - "@kbn/kibana-cors-test-plugin/*": ["x-pack/test/functional_cors/plugins/kibana_cors_test/*"], + "@kbn/kibana-cors-test-plugin": ["x-pack/platform/test/functional_cors/plugins/kibana_cors_test"], + "@kbn/kibana-cors-test-plugin/*": ["x-pack/platform/test/functional_cors/plugins/kibana_cors_test/*"], "@kbn/kibana-manifest-schema": ["packages/kbn-kibana-manifest-schema"], "@kbn/kibana-manifest-schema/*": ["packages/kbn-kibana-manifest-schema/*"], "@kbn/kibana-overview-plugin": ["src/platform/plugins/private/kibana_overview"], diff --git a/x-pack/test/functional_cors/config.ts b/x-pack/platform/test/functional_cors/config.ts similarity index 97% rename from x-pack/test/functional_cors/config.ts rename to x-pack/platform/test/functional_cors/config.ts index f2613041f4aa9..4974c0c1881bf 100644 --- a/x-pack/test/functional_cors/config.ts +++ b/x-pack/platform/test/functional_cors/config.ts @@ -18,7 +18,7 @@ const pluginPort = process.env.TEST_CORS_SERVER_PORT export default async function ({ readConfigFile }: FtrConfigProviderContext) { const kibanaFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); const corsTestPlugin = Path.resolve(__dirname, './plugins/kibana_cors_test'); diff --git a/x-pack/test/functional_cors/ftr_provider_context.d.ts b/x-pack/platform/test/functional_cors/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/functional_cors/ftr_provider_context.d.ts rename to x-pack/platform/test/functional_cors/ftr_provider_context.d.ts diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/kibana.jsonc b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/kibana.jsonc similarity index 100% rename from x-pack/test/functional_cors/plugins/kibana_cors_test/kibana.jsonc rename to x-pack/platform/test/functional_cors/plugins/kibana_cors_test/kibana.jsonc diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/package.json b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/package.json similarity index 56% rename from x-pack/test/functional_cors/plugins/kibana_cors_test/package.json rename to x-pack/platform/test/functional_cors/plugins/kibana_cors_test/package.json index e83242578333e..73812011bb3c3 100644 --- a/x-pack/test/functional_cors/plugins/kibana_cors_test/package.json +++ b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/package.json @@ -6,7 +6,7 @@ "version": "kibana" }, "scripts": { - "kbn": "node ../../../../../scripts/kbn.js", - "build": "rm -rf './target' && ../../../../../node_modules/.bin/tsc" + "kbn": "node ../../../../../../scripts/kbn.js", + "build": "rm -rf './target' && ../../../../../../node_modules/.bin/tsc" } } \ No newline at end of file diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/config.ts b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/server/config.ts similarity index 100% rename from x-pack/test/functional_cors/plugins/kibana_cors_test/server/config.ts rename to x-pack/platform/test/functional_cors/plugins/kibana_cors_test/server/config.ts diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/server/index.ts similarity index 100% rename from x-pack/test/functional_cors/plugins/kibana_cors_test/server/index.ts rename to x-pack/platform/test/functional_cors/plugins/kibana_cors_test/server/index.ts diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts similarity index 100% rename from x-pack/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts rename to x-pack/platform/test/functional_cors/plugins/kibana_cors_test/server/plugin.ts diff --git a/x-pack/test/functional_cors/plugins/kibana_cors_test/tsconfig.json b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/tsconfig.json similarity index 81% rename from x-pack/test/functional_cors/plugins/kibana_cors_test/tsconfig.json rename to x-pack/platform/test/functional_cors/plugins/kibana_cors_test/tsconfig.json index 3428af6bad2f5..84260fcaebc69 100644 --- a/x-pack/test/functional_cors/plugins/kibana_cors_test/tsconfig.json +++ b/x-pack/platform/test/functional_cors/plugins/kibana_cors_test/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, diff --git a/x-pack/test/functional_cors/services.ts b/x-pack/platform/test/functional_cors/services.ts similarity index 100% rename from x-pack/test/functional_cors/services.ts rename to x-pack/platform/test/functional_cors/services.ts diff --git a/x-pack/test/functional_cors/tests/cors.ts b/x-pack/platform/test/functional_cors/tests/cors.ts similarity index 100% rename from x-pack/test/functional_cors/tests/cors.ts rename to x-pack/platform/test/functional_cors/tests/cors.ts diff --git a/x-pack/test/functional_cors/tests/index.ts b/x-pack/platform/test/functional_cors/tests/index.ts similarity index 100% rename from x-pack/test/functional_cors/tests/index.ts rename to x-pack/platform/test/functional_cors/tests/index.ts diff --git a/yarn.lock b/yarn.lock index 3dc74ff0275f0..1a6f8b4827192 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6137,7 +6137,7 @@ version "0.0.0" uid "" -"@kbn/kibana-cors-test-plugin@link:x-pack/test/functional_cors/plugins/kibana_cors_test": +"@kbn/kibana-cors-test-plugin@link:x-pack/platform/test/functional_cors/plugins/kibana_cors_test": version "0.0.0" uid "" From 8473e6b3bcfb93256291d5d8eb4e58110b7dd0df Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Thu, 3 Jul 2025 19:14:04 +0200 Subject: [PATCH 3/4] relocate functional_embedded --- .buildkite/ftr_platform_stateful_configs.yml | 2 +- .github/CODEOWNERS | 4 ++-- package.json | 2 +- tsconfig.base.json | 4 ++-- x-pack/{ => platform}/test/functional_embedded/config.ts | 2 +- .../test/functional_embedded/ftr_provider_context.d.ts | 0 .../functional_embedded/plugins/iframe_embedded/kibana.jsonc | 0 .../functional_embedded/plugins/iframe_embedded/package.json | 0 .../plugins/iframe_embedded/server/index.ts | 0 .../plugins/iframe_embedded/server/plugin.ts | 0 .../functional_embedded/plugins/iframe_embedded/tsconfig.json | 2 +- x-pack/{ => platform}/test/functional_embedded/services.ts | 0 .../test/functional_embedded/tests/iframe_embedded.ts | 0 x-pack/{ => platform}/test/functional_embedded/tests/index.ts | 0 yarn.lock | 2 +- 15 files changed, 9 insertions(+), 9 deletions(-) rename x-pack/{ => platform}/test/functional_embedded/config.ts (97%) rename x-pack/{ => platform}/test/functional_embedded/ftr_provider_context.d.ts (100%) rename x-pack/{ => platform}/test/functional_embedded/plugins/iframe_embedded/kibana.jsonc (100%) rename x-pack/{ => platform}/test/functional_embedded/plugins/iframe_embedded/package.json (100%) rename x-pack/{ => platform}/test/functional_embedded/plugins/iframe_embedded/server/index.ts (100%) rename x-pack/{ => platform}/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts (100%) rename x-pack/{ => platform}/test/functional_embedded/plugins/iframe_embedded/tsconfig.json (78%) rename x-pack/{ => platform}/test/functional_embedded/services.ts (100%) rename x-pack/{ => platform}/test/functional_embedded/tests/iframe_embedded.ts (100%) rename x-pack/{ => platform}/test/functional_embedded/tests/index.ts (100%) diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index ebd36dbeeaa1e..93dc679fa4a6c 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -187,7 +187,7 @@ enabled: - x-pack/test/functional_basic/apps/transform/permissions/config.ts - x-pack/test/functional_basic/apps/transform/feature_controls/config.ts - x-pack/platform/test/functional_cors/config.ts - - x-pack/test/functional_embedded/config.ts + - x-pack/platform/test/functional_embedded/config.ts - x-pack/test/functional_execution_context/config.ts - x-pack/test/functional_with_es_ssl/apps/cases/group1/config.ts - x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 49e28ca37e180..a472271443283 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1112,7 +1112,7 @@ x-pack/test x-pack/test_serverless x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core x-pack/platform/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security -x-pack/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core +x-pack/platform/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops @@ -1943,7 +1943,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /src/platform/test/plugin_functional/test_suites/core* @elastic/kibana-core /src/platform/test/interpreter_functional/plugins/kbn_tp_run_pipeline @elastic/kibana-core /x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management @elastic/kibana-core -/x-pack/test/functional_embedded @elastic/kibana-core +/x-pack/platform/test/functional_embedded @elastic/kibana-core /src/platform/test/node_roles_functional @elastic/kibana-core /src/platform/test/functional/page_objects/newsfeed_page.ts @elastic/kibana-core # assigned per https://github.com/elastic/kibana/pull/160210 /src/platform/test/functional/page_objects/home_page.ts @elastic/appex-sharedux diff --git a/package.json b/package.json index 5fc55f818e115..bcd49d572c50b 100644 --- a/package.json +++ b/package.json @@ -596,7 +596,7 @@ "@kbn/home-sample-data-types": "link:src/platform/packages/shared/home/sample_data_types", "@kbn/i18n": "link:src/platform/packages/shared/kbn-i18n", "@kbn/i18n-react": "link:src/platform/packages/shared/kbn-i18n-react", - "@kbn/iframe-embedded-plugin": "link:x-pack/test/functional_embedded/plugins/iframe_embedded", + "@kbn/iframe-embedded-plugin": "link:x-pack/platform/test/functional_embedded/plugins/iframe_embedded", "@kbn/image-embeddable-plugin": "link:src/platform/plugins/private/image_embeddable", "@kbn/index-adapter": "link:x-pack/solutions/security/packages/index-adapter", "@kbn/index-lifecycle-management-common-shared": "link:x-pack/platform/packages/shared/index-lifecycle-management/index_lifecycle_management_common_shared", diff --git a/tsconfig.base.json b/tsconfig.base.json index f52fce5c3278c..948cb626384bf 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1094,8 +1094,8 @@ "@kbn/i18n/*": ["src/platform/packages/shared/kbn-i18n/*"], "@kbn/i18n-react": ["src/platform/packages/shared/kbn-i18n-react"], "@kbn/i18n-react/*": ["src/platform/packages/shared/kbn-i18n-react/*"], - "@kbn/iframe-embedded-plugin": ["x-pack/test/functional_embedded/plugins/iframe_embedded"], - "@kbn/iframe-embedded-plugin/*": ["x-pack/test/functional_embedded/plugins/iframe_embedded/*"], + "@kbn/iframe-embedded-plugin": ["x-pack/platform/test/functional_embedded/plugins/iframe_embedded"], + "@kbn/iframe-embedded-plugin/*": ["x-pack/platform/test/functional_embedded/plugins/iframe_embedded/*"], "@kbn/image-embeddable-plugin": ["src/platform/plugins/private/image_embeddable"], "@kbn/image-embeddable-plugin/*": ["src/platform/plugins/private/image_embeddable/*"], "@kbn/import-locator": ["packages/kbn-import-locator"], diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/platform/test/functional_embedded/config.ts similarity index 97% rename from x-pack/test/functional_embedded/config.ts rename to x-pack/platform/test/functional_embedded/config.ts index 78cddd89514a9..811b202a46653 100644 --- a/x-pack/test/functional_embedded/config.ts +++ b/x-pack/platform/test/functional_embedded/config.ts @@ -14,7 +14,7 @@ import { pageObjects } from '../functional/page_objects'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const kibanaFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); const iframeEmbeddedPlugin = resolve(__dirname, './plugins/iframe_embedded'); diff --git a/x-pack/test/functional_embedded/ftr_provider_context.d.ts b/x-pack/platform/test/functional_embedded/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/functional_embedded/ftr_provider_context.d.ts rename to x-pack/platform/test/functional_embedded/ftr_provider_context.d.ts diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.jsonc b/x-pack/platform/test/functional_embedded/plugins/iframe_embedded/kibana.jsonc similarity index 100% rename from x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.jsonc rename to x-pack/platform/test/functional_embedded/plugins/iframe_embedded/kibana.jsonc diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json b/x-pack/platform/test/functional_embedded/plugins/iframe_embedded/package.json similarity index 100% rename from x-pack/test/functional_embedded/plugins/iframe_embedded/package.json rename to x-pack/platform/test/functional_embedded/plugins/iframe_embedded/package.json diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts b/x-pack/platform/test/functional_embedded/plugins/iframe_embedded/server/index.ts similarity index 100% rename from x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts rename to x-pack/platform/test/functional_embedded/plugins/iframe_embedded/server/index.ts diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts b/x-pack/platform/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts similarity index 100% rename from x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts rename to x-pack/platform/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/tsconfig.json b/x-pack/platform/test/functional_embedded/plugins/iframe_embedded/tsconfig.json similarity index 78% rename from x-pack/test/functional_embedded/plugins/iframe_embedded/tsconfig.json rename to x-pack/platform/test/functional_embedded/plugins/iframe_embedded/tsconfig.json index 71169d35a6125..2db79453cdfdd 100644 --- a/x-pack/test/functional_embedded/plugins/iframe_embedded/tsconfig.json +++ b/x-pack/platform/test/functional_embedded/plugins/iframe_embedded/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, diff --git a/x-pack/test/functional_embedded/services.ts b/x-pack/platform/test/functional_embedded/services.ts similarity index 100% rename from x-pack/test/functional_embedded/services.ts rename to x-pack/platform/test/functional_embedded/services.ts diff --git a/x-pack/test/functional_embedded/tests/iframe_embedded.ts b/x-pack/platform/test/functional_embedded/tests/iframe_embedded.ts similarity index 100% rename from x-pack/test/functional_embedded/tests/iframe_embedded.ts rename to x-pack/platform/test/functional_embedded/tests/iframe_embedded.ts diff --git a/x-pack/test/functional_embedded/tests/index.ts b/x-pack/platform/test/functional_embedded/tests/index.ts similarity index 100% rename from x-pack/test/functional_embedded/tests/index.ts rename to x-pack/platform/test/functional_embedded/tests/index.ts diff --git a/yarn.lock b/yarn.lock index 1a6f8b4827192..11f8f56185aa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5969,7 +5969,7 @@ version "0.0.0" uid "" -"@kbn/iframe-embedded-plugin@link:x-pack/test/functional_embedded/plugins/iframe_embedded": +"@kbn/iframe-embedded-plugin@link:x-pack/platform/test/functional_embedded/plugins/iframe_embedded": version "0.0.0" uid "" From bfaeb272fb4001247f5b0676cd5a26325ff90d87 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Thu, 3 Jul 2025 17:38:27 +0000 Subject: [PATCH 4/4] [CI] Auto-commit changed files from 'node scripts/generate codeowners' --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a472271443283..002c44f259cf9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -992,6 +992,8 @@ x-pack/platform/test/cases_api_integration/common/plugins/cases @elastic/respons x-pack/platform/test/cases_api_integration/common/plugins/observability @elastic/response-ops x-pack/platform/test/cases_api_integration/common/plugins/security_solution @elastic/response-ops x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin @elastic/kibana-security +x-pack/platform/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security +x-pack/platform/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client @elastic/kibana-core x-pack/platform/test/plugin_api_integration/plugins/event_log @elastic/response-ops x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security @@ -1111,8 +1113,6 @@ x-pack/solutions/security/test x-pack/test x-pack/test_serverless x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core -x-pack/platform/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security -x-pack/platform/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops