diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index 78ea84bff95c6..c77dea94cab0e 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -30,7 +30,7 @@ disabled: - x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts - x-pack/platform/test/alerting_api_integration/security_and_spaces/group2/tests/telemetry/config.ts - x-pack/platform/test/alerting_api_integration/spaces_only_legacy/config.ts - - x-pack/test/cloud_integration/config.ts + - x-pack/platform/test/cloud_integration/config.ts - x-pack/platform/test/load/config.ts - x-pack/platform/test/plugin_api_perf/config.ts - x-pack/test/screenshot_creation/config.ts @@ -158,7 +158,7 @@ enabled: - x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts - x-pack/test/api_integration/apis/cases/config.ts - x-pack/test/api_integration/apis/security/config.ts - - x-pack/test/banners_functional/config.ts + - x-pack/platform/test/banners_functional/config.ts - x-pack/platform/test/cases_api_integration/security_and_spaces/config_basic.ts - x-pack/platform/test/cases_api_integration/security_and_spaces/config_trial.ts - x-pack/platform/test/cases_api_integration/security_and_spaces/config_no_public_base_url.ts @@ -287,7 +287,7 @@ enabled: - x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts - x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts - x-pack/test/saved_object_tagging/functional/config.ts - - x-pack/test/saved_objects_field_count/config.ts + - x-pack/platform/test/saved_objects_field_count/config.ts - x-pack/platform/test/search_sessions_integration/config.ts - x-pack/test/security_api_integration/anonymous_es_anonymous.config.ts - x-pack/test/security_api_integration/anonymous.config.ts @@ -357,7 +357,7 @@ enabled: - x-pack/performance/journeys_e2e/cloud_security_dashboard.ts - x-pack/performance/journeys_e2e/apm_service_inventory.ts - x-pack/performance/journeys_e2e/infra_hosts_view.ts - - x-pack/test/custom_branding/config.ts + - x-pack/platform/test/custom_branding/config.ts # stateful config files that run deployment-agnostic tests - x-pack/platform/test/api_integration_deployment_agnostic/configs/stateful/platform.stateful.config.ts # configs migrated to the new Kibana architecture diff --git a/.buildkite/scripts/saved_object_field_metrics.sh b/.buildkite/scripts/saved_object_field_metrics.sh index 53f0b22400dde..c6b44b9c4ab41 100755 --- a/.buildkite/scripts/saved_object_field_metrics.sh +++ b/.buildkite/scripts/saved_object_field_metrics.sh @@ -8,4 +8,4 @@ echo '--- Default Saved Object Field Metrics' node scripts/functional_tests \ --debug --bail \ --kibana-install-dir "$KIBANA_BUILD_LOCATION" \ - --config x-pack/test/saved_objects_field_count/config.ts + --config x-pack/platform/test/saved_objects_field_count/config.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9348012e9f855..76fdfeb9e3f2c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -97,7 +97,7 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_data_migration @elastic x-pack/solutions/security/plugins/cloud_defend @elastic/kibana-cloud-security-posture x-pack/platform/plugins/private/cloud_integrations/cloud_experiments @elastic/kibana-core x-pack/platform/plugins/private/cloud_integrations/cloud_full_story @elastic/kibana-core -x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core +x-pack/platform/test/cloud_integration/plugins/saml_provider @elastic/kibana-core x-pack/platform/plugins/private/cloud_integrations/cloud_links @elastic/kibana-core x-pack/platform/plugins/shared/cloud @elastic/kibana-core x-pack/solutions/security/packages/kbn-cloud-security-posture/public @elastic/kibana-cloud-security-posture @@ -1814,7 +1814,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /x-pack/test/stack_functional_integration/apps/savedobjects_upgrade_testing @elastic/kibana-core /x-pack/test/functional/page_objects/status_page.ts @elastic/kibana-core /x-pack/test/functional/page_objects/share_saved_objects_to_space_page.ts @elastic/kibana-core -/x-pack/test/functional/page_objects/banners_page.ts @elastic/kibana-core +/x-pack/platform/test/functional/page_objects/banners_page.ts @elastic/kibana-core /x-pack/test/common/lib/test_data_loader.ts @elastic/kibana-core /x-pack/test/api_integration/services/usage_api.ts @elastic/kibana-core /x-pack/platform/test/api_integration/apis/kibana @elastic/kibana-core @@ -1830,9 +1830,9 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security ^/src/platform/test/api_integration/fixtures/import_managed.ndjson @elastic/kibana-core ^/src/platform/test/functional/services/apps_menu.ts @elastic/kibana-core /x-pack/test/functional/apps/status_page @elastic/kibana-core -/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/platform/test/cloud_integration @elastic/kibana-core +/x-pack/platform/test/cloud_integration/plugins/saml_provider @elastic/kibana-core +/src/platform/test/server_integration @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 @@ -1898,7 +1898,7 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /typings/ @elastic/kibana-core ^/src/platform/test/analytics @elastic/kibana-core /src/platform/packages/shared/kbn-test/src/jest/setup/mocks.kbn_i18n_react.js @elastic/kibana-core -/x-pack/test/saved_objects_field_count/ @elastic/kibana-core +/x-pack/platform/test/saved_objects_field_count/ @elastic/kibana-core /x-pack/test_serverless/**/test_suites/common/saved_objects_management/ @elastic/kibana-core /x-pack/test_serverless/api_integration/test_suites/common/core/ @elastic/kibana-core /x-pack/test_serverless/api_integration/test_suites/**/telemetry/ @elastic/kibana-core @@ -2750,8 +2750,8 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr ^/src/platform/test/examples/content_management/*.ts @elastic/appex-sharedux ^/src/platform/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux /x-pack/solutions/search/test/api_integration/apis/guided_onboarding @elastic/appex-sharedux -/x-pack/test/banners_functional @elastic/appex-sharedux -/x-pack/test/custom_branding @elastic/appex-sharedux +/x-pack/platform/test/banners_functional @elastic/appex-sharedux +/x-pack/platform/test/custom_branding @elastic/appex-sharedux /x-pack/platform/test/api_integration/apis/content_management @elastic/appex-sharedux /x-pack/test/accessibility/apps/group3/tags.ts @elastic/appex-sharedux /x-pack/test/accessibility/apps/group3/snapshot_and_restore.ts @elastic/appex-sharedux diff --git a/package.json b/package.json index 8ac2e859d5cd5..73a064d508f77 100644 --- a/package.json +++ b/package.json @@ -232,7 +232,7 @@ "@kbn/cloud-defend-plugin": "link:x-pack/solutions/security/plugins/cloud_defend", "@kbn/cloud-experiments-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_experiments", "@kbn/cloud-full-story-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_full_story", - "@kbn/cloud-integration-saml-provider-plugin": "link:x-pack/test/cloud_integration/plugins/saml_provider", + "@kbn/cloud-integration-saml-provider-plugin": "link:x-pack/platform/test/cloud_integration/plugins/saml_provider", "@kbn/cloud-links-plugin": "link:x-pack/platform/plugins/private/cloud_integrations/cloud_links", "@kbn/cloud-plugin": "link:x-pack/platform/plugins/shared/cloud", "@kbn/cloud-security-posture": "link:x-pack/solutions/security/packages/kbn-cloud-security-posture/public", diff --git a/tsconfig.base.json b/tsconfig.base.json index ae9948f31283b..94519d3cca3bb 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -188,8 +188,8 @@ "@kbn/cloud-experiments-plugin/*": ["x-pack/platform/plugins/private/cloud_integrations/cloud_experiments/*"], "@kbn/cloud-full-story-plugin": ["x-pack/platform/plugins/private/cloud_integrations/cloud_full_story"], "@kbn/cloud-full-story-plugin/*": ["x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/*"], - "@kbn/cloud-integration-saml-provider-plugin": ["x-pack/test/cloud_integration/plugins/saml_provider"], - "@kbn/cloud-integration-saml-provider-plugin/*": ["x-pack/test/cloud_integration/plugins/saml_provider/*"], + "@kbn/cloud-integration-saml-provider-plugin": ["x-pack/platform/test/cloud_integration/plugins/saml_provider"], + "@kbn/cloud-integration-saml-provider-plugin/*": ["x-pack/platform/test/cloud_integration/plugins/saml_provider/*"], "@kbn/cloud-links-plugin": ["x-pack/platform/plugins/private/cloud_integrations/cloud_links"], "@kbn/cloud-links-plugin/*": ["x-pack/platform/plugins/private/cloud_integrations/cloud_links/*"], "@kbn/cloud-plugin": ["x-pack/platform/plugins/shared/cloud"], diff --git a/x-pack/test/banners_functional/config.ts b/x-pack/platform/test/banners_functional/config.ts similarity index 96% rename from x-pack/test/banners_functional/config.ts rename to x-pack/platform/test/banners_functional/config.ts index d79655173c110..02b10090329ce 100644 --- a/x-pack/test/banners_functional/config.ts +++ b/x-pack/platform/test/banners_functional/config.ts @@ -11,7 +11,7 @@ import { services, pageObjects } from './ftr_provider_context'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const kibanaFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); return { diff --git a/x-pack/test/banners_functional/ftr_provider_context.ts b/x-pack/platform/test/banners_functional/ftr_provider_context.ts similarity index 100% rename from x-pack/test/banners_functional/ftr_provider_context.ts rename to x-pack/platform/test/banners_functional/ftr_provider_context.ts diff --git a/x-pack/test/banners_functional/tests/global.ts b/x-pack/platform/test/banners_functional/tests/global.ts similarity index 100% rename from x-pack/test/banners_functional/tests/global.ts rename to x-pack/platform/test/banners_functional/tests/global.ts diff --git a/x-pack/test/banners_functional/tests/index.ts b/x-pack/platform/test/banners_functional/tests/index.ts similarity index 100% rename from x-pack/test/banners_functional/tests/index.ts rename to x-pack/platform/test/banners_functional/tests/index.ts diff --git a/x-pack/test/banners_functional/tests/spaces.ts b/x-pack/platform/test/banners_functional/tests/spaces.ts similarity index 100% rename from x-pack/test/banners_functional/tests/spaces.ts rename to x-pack/platform/test/banners_functional/tests/spaces.ts diff --git a/x-pack/test/cloud_integration/config.ts b/x-pack/platform/test/cloud_integration/config.ts similarity index 100% rename from x-pack/test/cloud_integration/config.ts rename to x-pack/platform/test/cloud_integration/config.ts diff --git a/x-pack/test/cloud_integration/ftr_provider_context.d.ts b/x-pack/platform/test/cloud_integration/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/cloud_integration/ftr_provider_context.d.ts rename to x-pack/platform/test/cloud_integration/ftr_provider_context.d.ts diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/constants.ts b/x-pack/platform/test/cloud_integration/plugins/saml_provider/constants.ts similarity index 100% rename from x-pack/test/cloud_integration/plugins/saml_provider/constants.ts rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/constants.ts diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/kibana.jsonc b/x-pack/platform/test/cloud_integration/plugins/saml_provider/kibana.jsonc similarity index 100% rename from x-pack/test/cloud_integration/plugins/saml_provider/kibana.jsonc rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/kibana.jsonc diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/metadata.xml b/x-pack/platform/test/cloud_integration/plugins/saml_provider/metadata.xml similarity index 100% rename from x-pack/test/cloud_integration/plugins/saml_provider/metadata.xml rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/metadata.xml diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/server/index.ts b/x-pack/platform/test/cloud_integration/plugins/saml_provider/server/index.ts similarity index 100% rename from x-pack/test/cloud_integration/plugins/saml_provider/server/index.ts rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/server/index.ts diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/server/init_routes.ts b/x-pack/platform/test/cloud_integration/plugins/saml_provider/server/init_routes.ts similarity index 100% rename from x-pack/test/cloud_integration/plugins/saml_provider/server/init_routes.ts rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/server/init_routes.ts diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/server/saml_tools.ts b/x-pack/platform/test/cloud_integration/plugins/saml_provider/server/saml_tools.ts similarity index 100% rename from x-pack/test/cloud_integration/plugins/saml_provider/server/saml_tools.ts rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/server/saml_tools.ts diff --git a/x-pack/test/cloud_integration/plugins/saml_provider/tsconfig.json b/x-pack/platform/test/cloud_integration/plugins/saml_provider/tsconfig.json similarity index 80% rename from x-pack/test/cloud_integration/plugins/saml_provider/tsconfig.json rename to x-pack/platform/test/cloud_integration/plugins/saml_provider/tsconfig.json index 8a9196e62823a..daa1dc45e878a 100644 --- a/x-pack/test/cloud_integration/plugins/saml_provider/tsconfig.json +++ b/x-pack/platform/test/cloud_integration/plugins/saml_provider/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../../../tsconfig.base.json", + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, diff --git a/x-pack/test/cloud_integration/tests/fullstory.ts b/x-pack/platform/test/cloud_integration/tests/fullstory.ts similarity index 100% rename from x-pack/test/cloud_integration/tests/fullstory.ts rename to x-pack/platform/test/cloud_integration/tests/fullstory.ts diff --git a/x-pack/test/custom_branding/config.ts b/x-pack/platform/test/custom_branding/config.ts similarity index 96% rename from x-pack/test/custom_branding/config.ts rename to x-pack/platform/test/custom_branding/config.ts index 6450d5594f88c..81551a56abcac 100644 --- a/x-pack/test/custom_branding/config.ts +++ b/x-pack/platform/test/custom_branding/config.ts @@ -11,7 +11,7 @@ import { services, pageObjects } from './ftr_provider_context'; export default async function ({ readConfigFile }: FtrConfigProviderContext) { const kibanaFunctionalConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('../functional/config.base.ts') ); return { diff --git a/x-pack/test/custom_branding/ftr_provider_context.ts b/x-pack/platform/test/custom_branding/ftr_provider_context.ts similarity index 100% rename from x-pack/test/custom_branding/ftr_provider_context.ts rename to x-pack/platform/test/custom_branding/ftr_provider_context.ts diff --git a/x-pack/test/custom_branding/tests/acme_logo.png b/x-pack/platform/test/custom_branding/tests/acme_logo.png similarity index 100% rename from x-pack/test/custom_branding/tests/acme_logo.png rename to x-pack/platform/test/custom_branding/tests/acme_logo.png diff --git a/x-pack/test/custom_branding/tests/acme_text.png b/x-pack/platform/test/custom_branding/tests/acme_text.png similarity index 100% rename from x-pack/test/custom_branding/tests/acme_text.png rename to x-pack/platform/test/custom_branding/tests/acme_text.png diff --git a/x-pack/test/custom_branding/tests/index.ts b/x-pack/platform/test/custom_branding/tests/index.ts similarity index 100% rename from x-pack/test/custom_branding/tests/index.ts rename to x-pack/platform/test/custom_branding/tests/index.ts diff --git a/x-pack/test/custom_branding/tests/settings.ts b/x-pack/platform/test/custom_branding/tests/settings.ts similarity index 100% rename from x-pack/test/custom_branding/tests/settings.ts rename to x-pack/platform/test/custom_branding/tests/settings.ts diff --git a/x-pack/test/functional/page_objects/banners_page.ts b/x-pack/platform/test/functional/page_objects/banners_page.ts similarity index 100% rename from x-pack/test/functional/page_objects/banners_page.ts rename to x-pack/platform/test/functional/page_objects/banners_page.ts diff --git a/x-pack/platform/test/functional/page_objects/index.ts b/x-pack/platform/test/functional/page_objects/index.ts index 78a6e871e59ee..108c919e35cc8 100644 --- a/x-pack/platform/test/functional/page_objects/index.ts +++ b/x-pack/platform/test/functional/page_objects/index.ts @@ -23,6 +23,7 @@ import { UserProfilePageProvider } from './user_profile_page'; import { SearchSessionsPageProvider } from './search_sessions_management_page'; import { GraphPageObject } from './graph_page'; import { MaintenanceWindowsPageProvider } from './maintenance_windows_page'; +import { BannersPageObject } from './banners_page'; // just like services, PageObjects are defined as a map of // names to Providers. Merge in Kibana's or pick specific ones @@ -45,4 +46,5 @@ export const pageObjects = { upgradeAssistant: UpgradeAssistantFlyoutObject, userProfiles: UserProfilePageProvider, maintenanceWindows: MaintenanceWindowsPageProvider, + banners: BannersPageObject, }; diff --git a/x-pack/test/saved_objects_field_count/config.ts b/x-pack/platform/test/saved_objects_field_count/config.ts similarity index 100% rename from x-pack/test/saved_objects_field_count/config.ts rename to x-pack/platform/test/saved_objects_field_count/config.ts diff --git a/x-pack/test/saved_objects_field_count/test.ts b/x-pack/platform/test/saved_objects_field_count/test.ts similarity index 100% rename from x-pack/test/saved_objects_field_count/test.ts rename to x-pack/platform/test/saved_objects_field_count/test.ts diff --git a/x-pack/platform/test/tsconfig.json b/x-pack/platform/test/tsconfig.json index 0d10532db2ca7..089ec3d794c6c 100644 --- a/x-pack/platform/test/tsconfig.json +++ b/x-pack/platform/test/tsconfig.json @@ -133,5 +133,7 @@ "@kbn/embeddable-alerts-table-plugin", "@kbn/apm-synthtrace-client", "@kbn/apm-synthtrace", + "@kbn/cloud-integration-saml-provider-plugin", + "@kbn/ci-stats-reporter", ] } diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts index 7059444698d48..f713ef992d59b 100644 --- a/x-pack/test/functional/page_objects/index.ts +++ b/x-pack/test/functional/page_objects/index.ts @@ -23,9 +23,9 @@ import { UserProfilePageProvider } from '@kbn/test-suites-xpack-platform/functio import { SearchSessionsPageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/search_sessions_management_page'; import { GraphPageObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/graph_page'; import { MaintenanceWindowsPageProvider } from '@kbn/test-suites-xpack-platform/functional/page_objects/maintenance_windows_page'; +import { BannersPageObject } from '@kbn/test-suites-xpack-platform/functional/page_objects/banners_page'; import { ApiKeysPageProvider } from './api_keys_page'; import { AssetDetailsProvider } from './asset_details'; -import { BannersPageObject } from './banners_page'; import { CrossClusterReplicationPageProvider } from './cross_cluster_replication_page'; import { DetectionsPageObject } from '../../security_solution_ftr/page_objects/detections'; import { EmbeddedConsoleProvider } from './embedded_console'; diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json index 7b9d3f34d60cb..b0980a8c1974a 100644 --- a/x-pack/test/tsconfig.json +++ b/x-pack/test/tsconfig.json @@ -58,7 +58,6 @@ "@kbn/dev-utils", "@kbn/ftr-common-functional-services", "@kbn/expect", - "@kbn/ci-stats-reporter", "@kbn/std", "@kbn/apm-synthtrace", "@kbn/core-saved-objects-base-server-internal", @@ -83,7 +82,6 @@ "@kbn/core-saved-objects-server", "@kbn/apm-synthtrace-client", "@kbn/stdio-dev-helpers", - "@kbn/cloud-integration-saml-provider-plugin", "@kbn/security-api-integration-helpers", "@kbn/alerts-as-data-utils", "@kbn/discover-plugin", diff --git a/yarn.lock b/yarn.lock index aa08b2c3fdea0..18365d588b040 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4140,7 +4140,7 @@ version "0.0.0" uid "" -"@kbn/cloud-integration-saml-provider-plugin@link:x-pack/test/cloud_integration/plugins/saml_provider": +"@kbn/cloud-integration-saml-provider-plugin@link:x-pack/platform/test/cloud_integration/plugins/saml_provider": version "0.0.0" uid ""