From 666f7ea237f21270158c2cd8909fa605568b11ae Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Tue, 10 Jun 2025 23:00:02 +0300 Subject: [PATCH] [ska] update paths, kibana.jsons for test plugins (#223004) ## Summary This pull request introduces changes to map test directories and plugins according new SKA ### Test Directory Organization: * [`.buildkite/pull_requests.json`](diffhunk://#diff-f6a29d74dea38fb756d38e158cbd1c306158a61f66da3d0633bb64af3000e5cfR44-R45): Added regex patterns to include directories under `x-pack/platform/test` and `x-pack/solutions/(search|observability|security)/test` for build reuse. [[1]](diffhunk://#diff-f6a29d74dea38fb756d38e158cbd1c306158a61f66da3d0633bb64af3000e5cfR44-R45) [[2]](diffhunk://#diff-f6a29d74dea38fb756d38e158cbd1c306158a61f66da3d0633bb64af3000e5cfR72-R73) [[3]](diffhunk://#diff-f6a29d74dea38fb756d38e158cbd1c306158a61f66da3d0633bb64af3000e5cfR99-R100) * [`src/platform/packages/shared/kbn-test/src/functional_test_runner/cli/code_owners.ts`](diffhunk://#diff-be6c88de4eca4b556f8b3d63174abc86830a2fc76502ccc318de3753fcf69e42L16-R25): Expanded `TEST_DIRECTORIES` to include new test paths for `platform` and `solutions` groups. ### Module Grouping Logic: * [`packages/kbn-repo-source-classifier/src/group.ts`](diffhunk://#diff-ca1d6e73c75bc70f1f99a19fdc6cca66ca79dc290de32f222595aa7d0b5099b9R49-R52): Updated `MODULE_GROUPING_BY_PATH` to include `x-pack/platform/test` and `x-pack/solutions/*/test` directories under their respective groups with appropriate visibility settings. [[1]](diffhunk://#diff-ca1d6e73c75bc70f1f99a19fdc6cca66ca79dc290de32f222595aa7d0b5099b9R49-R52) [[2]](diffhunk://#diff-ca1d6e73c75bc70f1f99a19fdc6cca66ca79dc290de32f222595aa7d0b5099b9R61-R64) ### Plugin Metadata Updates: * Various plugin `kibana.jsonc` files under `x-pack/platform/test`: Added `group` and `visibility` fields to ensure plugins are categorized under the `platform` group with `private` visibility. [[1]](diffhunk://#diff-9a5f9434970ecdc05e4e011ea6a677d5df9daff80173d30e871bee57f291dc61R5-R6) [[2]](diffhunk://#diff-4c6f1ed3260dd9413db2e7ac107bec1c68db883fed9fe5adb4416494bf2ad770R5-R6) [[3]](diffhunk://#diff-54d92cdb9f449d9787cc79650f65fca02d3c28698d16bcb3a2195e638a0ef3b0R5-R6) [[4]](diffhunk://#diff-821b5bb2cb432c7817e3bc2be254be13f9ae721f9b6ec48d604df1f5f35a065dR5-R6) [[5]](diffhunk://#diff-32ee7ae7e104765e023fbb7cc98f770056c51f61e9c33f1530367b04cabe0e68R5-R6) [[6]](diffhunk://#diff-8f976d082851d9e761a5bb0d8b044aeae7069ab013312e7fed2616932c3fd013R5-R6) These changes collectively improve the organization and maintainability of test-related files and plugins within the repository. --- .buildkite/pull_requests.json | 9 +++++++ .github/CODEOWNERS | 24 +++++++++++++++++++ .../kbn-repo-source-classifier/src/group.ts | 8 +++++++ .../kbn-repo-packages/modern/package.js | 5 +++- .../functional_test_runner/cli/code_owners.ts | 11 ++++++++- .../fixture_plugin/kibana.jsonc | 2 ++ .../plugins/api_consumer_plugin/kibana.jsonc | 2 ++ .../plugins/elasticsearch_client/kibana.jsonc | 2 ++ .../plugins/event_log/kibana.jsonc | 2 ++ .../plugins/feature_usage_test/kibana.jsonc | 2 ++ .../plugins/sample_task_plugin/kibana.jsonc | 2 ++ 11 files changed, 67 insertions(+), 2 deletions(-) diff --git a/.buildkite/pull_requests.json b/.buildkite/pull_requests.json index d0d8e8a561b3..0929beea93ef 100644 --- a/.buildkite/pull_requests.json +++ b/.buildkite/pull_requests.json @@ -41,7 +41,10 @@ "kibana_build_reuse_pipeline_slugs": ["kibana-pull-request", "kibana-on-merge"], "kibana_build_reuse_regexes": [ "^test/", + "^x-pack/platform/test/", + "^x-pack/solutions/(search|observability|security)/test/", "^x-pack/test/", + "^x-pack/test_serverless/", "/__snapshots__/", "\\.test\\.(ts|tsx|js|jsx)" ] @@ -67,6 +70,9 @@ "kibana_build_reuse_regexes": [ "^test/", "^x-pack/test/", + "^x-pack/test_serverless/", + "^x-pack/platform/test/", + "^x-pack/solutions/(search|observability|security)/test/", "/__snapshots__/", "\\.test\\.(ts|tsx|js|jsx)" ] @@ -92,6 +98,9 @@ "kibana_build_reuse_regexes": [ "^test/", "^x-pack/test/", + "^x-pack/test_serverless/", + "^x-pack/platform/test/", + "^x-pack/solutions/(search|observability|security)/test/", "/__snapshots__/", "\\.test\\.(ts|tsx|js|jsx)" ] diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 919c5a25b808..1f31d57b65ea 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1409,6 +1409,7 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /x-pack/solutions/observability/plugins/infra/server/services/rules @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team /x-pack/test/common/utils/synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team # Assigned per https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-apm-synthtrace/kibana.jsonc#L5 /x-pack/test/common/utils/server_route_repository @elastic/obs-knowledge-team +/src/platform/test/functional/services/synthtrace/logs_synthtrace_es_client.ts @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team ## Streams parts owned by Logs UX /x-pack/platform/plugins/shared/streams/server/routes/streams/processing @elastic/obs-ux-logs-team @@ -1421,6 +1422,8 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /x-pack/test/api_integration/apis/infra @elastic/obs-ux-infra_services-team /x-pack/test/functional/apps/infra @elastic/obs-ux-infra_services-team /x-pack/test/functional/apps/infra/logs @elastic/obs-ux-logs-team +/x-pack/solutions/observability/test/api_integration/services/index.ts @elastic/obs-ux-infra_services-team +/x-pack/solutions/observability/test/api_integration/services/infra_log_views.ts @elastic/obs-ux-infra_services-team # Observability UX management team /src/platform/test/api_integration/apis/suggestions @elastic/obs-ux-management-team # Assigned per https://github.com/elastic/kibana/pull/200950#discussion_r1853705079 @@ -1447,6 +1450,7 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /x-pack/test/api_integration/deployment_agnostic/services/synthetics_monitors @elastic/obs-ux-management-team /x-pack/test/api_integration/deployment_agnostic/services/synthetics_private_location @elastic/obs-ux-management-team /x-pack/test/api_integration/deployment_agnostic/apis/observability/incident_management/ @elastic/obs-ux-management-team +/x-pack/solutions/observability/test/api_integration_deployment_agnostic/services @elastic/obs-ux-management-team /x-pack/test/functional/page_objects/alert_controls.ts @elastic/obs-ux-management-team # Elastic Stack Monitoring @@ -1485,6 +1489,7 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /src/platform/packages/shared/kbn-utility-types/src/dot.ts @dgieselaar /src/platform/packages/shared/kbn-utility-types/src/dot_test.ts @dgieselaar /x-pack/test_serverless/api_integration/test_suites/observability/apm_api_integration/ @elastic/obs-ux-infra_services-team +/x-pack/solutions/observability/test/apm_api_integration/ @elastic/obs-ux-infra_services-team #CC# /src/plugins/apm_oss/ @elastic/apm-ui #CC# /x-pack/plugins/observability_solution/observability/ @elastic/apm-ui @@ -1682,6 +1687,8 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /src/platform/packages/shared/kbn-es/src/serverless_resources/project_roles/es/roles.yml @elastic/appex-qa /src/platform/packages/shared/kbn-es/src/serverless_resources/project_roles/oblt/roles.yml @elastic/appex-qa /src/platform/packages/shared/kbn-es/src/serverless_resources/project_roles/security/roles.yml @elastic/appex-qa +/x-pack/platform/test/common/ftr_provider_context.ts @elastic/appex-qa +/x-pack/platform/test/common/lib/test_data_loader.ts @elastic/appex-qa # temporarily /x-pack/platform/plugins/shared/maps/ui_tests @elastic/appex-qa # temporarily /x-pack/platform/plugins/private/discover_enhanced/ui_tests/ @elastic/appex-qa # temporarily /x-pack/platform/plugins/private/discover_enhanced/ui_tests/tests/discover_cdp_perf.spec.ts @elastic/kibana-data-discovery # test tracks bundle size limits @@ -1835,6 +1842,21 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /x-pack/test/api_integration/deployment_agnostic/README.md @elastic/appex-qa /x-pack/test/api_integration/deployment_agnostic/*configs/ @elastic/appex-qa /x-pack/test/api_integration/deployment_agnostic/services/ @elastic/appex-qa +/x-pack/platform/test/api_integration_deployment_agnostic/ @elastic/appex-qa +/x-pack/platform/test/kibana.jsonc @elastic/appex-qa +/x-pack/platform/test/tsconfig.json @elastic/appex-qa +/x-pack/platform/test/api_integration_basic/config.basic_license.ts @elastic/appex-qa +/x-pack/platform/test/api_integration_basic/ftr_provider_context.d.ts @elastic/appex-qa +/x-pack/solutions/observability/test/kibana.jsonc @elastic/appex-qa +/x-pack/solutions/observability/test/tsconfig.json @elastic/appex-qa +/x-pack/solutions/observability/test/api_integration/config.ts @elastic/appex-qa +/x-pack/solutions/observability/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa +/x-pack/solutions/observability/test/api_integration_deployment_agnostic/ftr_provider_context.d.ts @elastic/appex-qa +/x-pack/solutions/security/test/kibana.jsonc @elastic/appex-qa +/x-pack/solutions/security/test/tsconfig.json @elastic/appex-qa +/x-pack/solutions/security/test/api_integration/config.ts @elastic/appex-qa +/x-pack/solutions/security/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa +/x-pack/solutions/security/test/api_integration/services/index.ts @elastic/appex-qa # Core /src/platform/test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json @elastic/kibana-core @elastic/kibana-data-discovery @@ -1891,6 +1913,8 @@ src/platform/plugins/shared/discover/public/context_awareness/profile_providers/ /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 +/src/platform/test/functional/page_objects/export_page.ts @elastic/kibana-sharedux +/src/platform/test/functional/page_objects/solution_navigation.ts @elastic/kibana-sharedux /src/platform/test/functional/fixtures/es_archiver/deprecations_service @elastic/kibana-core /src/platform/test/health_gateway @elastic/kibana-core /src/platform/test/api_integration/apis/saved_objects* @elastic/kibana-core diff --git a/packages/kbn-repo-source-classifier/src/group.ts b/packages/kbn-repo-source-classifier/src/group.ts index 944eba9e9ef4..f99ea0243e0e 100644 --- a/packages/kbn-repo-source-classifier/src/group.ts +++ b/packages/kbn-repo-source-classifier/src/group.ts @@ -46,6 +46,10 @@ const MODULE_GROUPING_BY_PATH: Record = ['packages', 'plugi group: solution, visibility: 'private', }; + acc[`x-pack/solutions/${solution}/test`] = { + group: solution, + visibility: 'private', + }; return acc; }, {}), })) @@ -54,6 +58,10 @@ const MODULE_GROUPING_BY_PATH: Record = ['packages', 'plugi group: 'platform', visibility: 'shared', }, + 'x-pack/platform/test': { + group: 'platform', + visibility: 'shared', + }, }); /** diff --git a/src/platform/packages/private/kbn-repo-packages/modern/package.js b/src/platform/packages/private/kbn-repo-packages/modern/package.js index f131aee6c853..fc145e51aad4 100644 --- a/src/platform/packages/private/kbn-repo-packages/modern/package.js +++ b/src/platform/packages/private/kbn-repo-packages/modern/package.js @@ -193,7 +193,10 @@ class Package { const example = dir.startsWith('examples/') || dir.startsWith('x-pack/examples/'); const testPlugin = dir.startsWith('src/platform/test/') || - dir.startsWith('x-pack/platform/test') || + dir.startsWith('x-pack/platform/test/') || + dir.startsWith('x-pack/solutions/search/test/') || + dir.startsWith('x-pack/solutions/observability/test/') || + dir.startsWith('x-pack/solutions/security/test/') || dir.startsWith('x-pack/test/'); return { diff --git a/src/platform/packages/shared/kbn-test/src/functional_test_runner/cli/code_owners.ts b/src/platform/packages/shared/kbn-test/src/functional_test_runner/cli/code_owners.ts index 62948bbfcde5..830f64506945 100644 --- a/src/platform/packages/shared/kbn-test/src/functional_test_runner/cli/code_owners.ts +++ b/src/platform/packages/shared/kbn-test/src/functional_test_runner/cli/code_owners.ts @@ -13,7 +13,16 @@ import { getRepoFiles } from '@kbn/get-repo-files'; import { getCodeOwnersEntries } from '@kbn/code-owners'; import ignore from 'ignore'; -const TEST_DIRECTORIES = ['test', 'x-pack/test', 'x-pack/test_serverless']; +const TEST_DIRECTORIES = [ + 'test', + 'x-pack/test', + 'x-pack/test_serverless', + 'src/platform/test', + 'x-pack/platform/test', + 'x-pack/solutions/search/test', + 'x-pack/solutions/observability/test', + 'x-pack/solutions/security/test', +]; export async function checkFTRCodeOwnersCLI() { await run( diff --git a/x-pack/platform/test/api_integration/apis/entity_manager/fixture_plugin/kibana.jsonc b/x-pack/platform/test/api_integration/apis/entity_manager/fixture_plugin/kibana.jsonc index ca3d05aea0f8..fe1e2be06b3e 100644 --- a/x-pack/platform/test/api_integration/apis/entity_manager/fixture_plugin/kibana.jsonc +++ b/x-pack/platform/test/api_integration/apis/entity_manager/fixture_plugin/kibana.jsonc @@ -2,6 +2,8 @@ "type": "plugin", "id": "@kbn/entity-manager-fixture-plugin", "owner": "@elastic/obs-entities", + "group": "platform", + "visibility": "private", "plugin": { "id": "entityManagerFixture", "server": true, diff --git a/x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin/kibana.jsonc b/x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin/kibana.jsonc index bd9a36c5f137..f49678c1bb12 100644 --- a/x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin/kibana.jsonc +++ b/x-pack/platform/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin/kibana.jsonc @@ -2,6 +2,8 @@ "type": "plugin", "id": "@kbn/eso-plugin", "owner": "@elastic/kibana-security", + "group": "platform", + "visibility": "private", "plugin": { "id": "eso", "server": true, diff --git a/x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client/kibana.jsonc b/x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client/kibana.jsonc index 5308edf07bd7..0b3a1b08be28 100644 --- a/x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client/kibana.jsonc +++ b/x-pack/platform/test/plugin_api_integration/plugins/elasticsearch_client/kibana.jsonc @@ -2,6 +2,8 @@ "type": "plugin", "id": "@kbn/elasticsearch-client-xpack-plugin", "owner": "@elastic/kibana-core", + "group": "platform", + "visibility": "private", "plugin": { "id": "elasticsearchClientXpack", "server": true, diff --git a/x-pack/platform/test/plugin_api_integration/plugins/event_log/kibana.jsonc b/x-pack/platform/test/plugin_api_integration/plugins/event_log/kibana.jsonc index 9e5702c323cb..e6cc71fd6ecc 100644 --- a/x-pack/platform/test/plugin_api_integration/plugins/event_log/kibana.jsonc +++ b/x-pack/platform/test/plugin_api_integration/plugins/event_log/kibana.jsonc @@ -2,6 +2,8 @@ "type": "plugin", "id": "@kbn/event-log-fixture-plugin", "owner": "@elastic/response-ops", + "group": "platform", + "visibility": "private", "plugin": { "id": "eventLogFixture", "server": true, diff --git a/x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test/kibana.jsonc b/x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test/kibana.jsonc index a7fe8e0cb237..eadacb9ca780 100644 --- a/x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test/kibana.jsonc +++ b/x-pack/platform/test/plugin_api_integration/plugins/feature_usage_test/kibana.jsonc @@ -2,6 +2,8 @@ "type": "plugin", "id": "@kbn/feature-usage-test-plugin", "owner": "@elastic/kibana-security", + "group": "platform", + "visibility": "private", "plugin": { "id": "featureUsageTest", "server": true, diff --git a/x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin/kibana.jsonc b/x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin/kibana.jsonc index d7e5bdac2e80..4f4678980c66 100644 --- a/x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin/kibana.jsonc +++ b/x-pack/platform/test/plugin_api_integration/plugins/sample_task_plugin/kibana.jsonc @@ -2,6 +2,8 @@ "type": "plugin", "id": "@kbn/sample-task-plugin", "owner": "@elastic/response-ops", + "group": "platform", + "visibility": "private", "plugin": { "id": "sampleTaskPlugin", "server": true,