diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index dfab0c0717ede..df034e9f0b477 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -933,7 +933,7 @@ x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux x-pack/solutions/observability/packages/kbn-scout-oblt @elastic/appex-qa x-pack/solutions/observability/packages/observability-ai/observability-ai-common @elastic/obs-ai-assistant x-pack/solutions/observability/packages/observability-ai/observability-ai-server @elastic/obs-ai-assistant -x-pack/solutions/observability/packages/synthetics_test_data @elastic/obs-ux-management-team +x-pack/solutions/observability/packages/synthetics-test-data @elastic/obs-ux-management-team x-pack/solutions/observability/packages/utils-browser @elastic/observability-ui x-pack/solutions/observability/packages/utils-common @elastic/observability-ui x-pack/solutions/observability/packages/utils-server @elastic/observability-ui diff --git a/package.json b/package.json index 73eb395ad3c98..10cfa7513f1b8 100644 --- a/package.json +++ b/package.json @@ -1475,7 +1475,7 @@ "@kbn/manifest": "link:packages/kbn-manifest", "@kbn/mock-idp-plugin": "link:packages/kbn-mock-idp-plugin", "@kbn/mock-idp-utils": "link:src/platform/packages/private/kbn-mock-idp-utils", - "@kbn/observability-synthetics-test-data": "link:x-pack/solutions/observability/packages/synthetics_test_data", + "@kbn/observability-synthetics-test-data": "link:x-pack/solutions/observability/packages/synthetics-test-data", "@kbn/openapi-bundler": "link:src/platform/packages/shared/kbn-openapi-bundler", "@kbn/openapi-generator": "link:src/platform/packages/shared/kbn-openapi-generator", "@kbn/optimizer": "link:packages/kbn-optimizer", diff --git a/packages/kbn-managed-vscode-config/src/managed_config_keys.ts b/packages/kbn-managed-vscode-config/src/managed_config_keys.ts index a90b8ead44540..c13c5bd556ac5 100644 --- a/packages/kbn-managed-vscode-config/src/managed_config_keys.ts +++ b/packages/kbn-managed-vscode-config/src/managed_config_keys.ts @@ -38,7 +38,6 @@ export const MANAGED_CONFIG_KEYS: ManagedConfigKey[] = [ { key: 'search.exclude', value: { - ['**/packages/kbn-pm/dist/index.js']: true, ['**/api_docs']: true, ['**/tsconfig.tsbuildinfo']: true, ['**/*.map']: true, diff --git a/packages/kbn-relocate/relocate.ts b/packages/kbn-relocate/relocate.ts index 87d76b89468d5..069ef422040a8 100644 --- a/packages/kbn-relocate/relocate.ts +++ b/packages/kbn-relocate/relocate.ts @@ -36,7 +36,7 @@ import { getManualCommits, } from './utils/git'; -const SKIP_RESET = true; +const SKIP_RESET = false; const moveModule = async (module: Package, log: ToolingLog) => { const destination = calculateModuleTargetFolder(module); diff --git a/packages/kbn-relocate/utils/transforms.ts b/packages/kbn-relocate/utils/transforms.ts index 7671df5ee4271..9a6c047e4c2a4 100644 --- a/packages/kbn-relocate/utils/transforms.ts +++ b/packages/kbn-relocate/utils/transforms.ts @@ -10,69 +10,15 @@ import type { Package } from '../types'; export const HARDCODED_MODULE_PATHS: Record = { + '@kbn/apm-ftr-e2e': 'x-pack/solutions/observability/plugins/apm/ftr_e2e', + '@kbn/core-test-helpers-kbn-server': 'src/core/test-helpers/kbn-server', + '@kbn/core-test-helpers-model-versions': 'src/core/test-helpers/model-versions', + '@kbn/synthetics-e2e': 'x-pack/solutions/observability/plugins/synthetics/e2e', '@kbn/test-suites-src': 'src/platform/test', }; type TransformFunction = (param: string) => string; const TRANSFORMS: Record = { - // misc path enhancements - 'x-pack/platform/packages/shared/observability/': 'x-pack/platform/packages/shared/', - 'src/platform/packages/shared/chart_expressions/common': - 'src/platform/packages/shared/chart-expressions-common', - 'x-pack/solutions/security/packages/security-solution/': 'x-pack/solutions/security/packages/', - 'x-pack/platform/plugins/shared/observability_ai_assistant': - 'x-pack/platform/plugins/shared/observability_ai_assistant', - 'x-pack/solutions/observability/plugins/observability_solution/': - 'x-pack/solutions/observability/plugins/', - 'x-pack/solutions/observability/packages/observability/observability_utils/observability_': - 'x-pack/solutions/observability/packages/', - 'x-pack/solutions/observability/packages/observability/': - 'x-pack/solutions/observability/packages/', - 'x-pack/platform/packages/shared/alerting_rule_utils': - 'x-pack/platform/packages/shared/alerting-rule-utils', - 'x-pack/platform/packages/shared/logs_overview': 'x-pack/platform/packages/shared/logs-overview', - 'x-pack/solutions/observability/packages/alert_details': - 'x-pack/solutions/observability/packages/alert-details', - 'x-pack/solutions/observability/packages/alerting_test_data': - 'x-pack/solutions/observability/packages/alerting-test-data', - 'x-pack/solutions/observability/packages/get_padded_alert_time_range_util': - 'x-pack/solutions/observability/packages/get-padded-alert-time-range-util', - 'x-pack/solutions/observability/packages/synthetics_test_data': - 'x-pack/solutions/observability/packages/synthetics-test-data', - 'x-pack/solutions/observability/packages/utils_browser': - 'x-pack/solutions/observability/packages/utils-browser', - 'x-pack/solutions/observability/packages/utils_common': - 'x-pack/solutions/observability/packages/utils-common', - 'x-pack/solutions/observability/packages/utils_server': - 'x-pack/solutions/observability/packages/utils-server', - 'x-pack/solutions/search/packages/shared_ui': 'x-pack/solutions/search/packages/shared-ui', - 'x-pack/solutions/security/packages/data_table': 'x-pack/solutions/security/packages/data-table', - 'x-pack/solutions/security/packages/distribution_bar': - 'x-pack/solutions/security/packages/distribution-bar', - 'x-pack/solutions/security/packages/ecs_data_quality_dashboard': - 'x-pack/solutions/security/packages/ecs-data-quality-dashboard', - 'x-pack/solutions/security/packages/side_nav': 'x-pack/solutions/security/packages/side-nav', - 'x-pack/solutions/observability/packages/observability_ai/observability_ai_common': - 'x-pack/solutions/observability/packages/observability-ai/observability-ai-common', - 'x-pack/solutions/observability/packages/observability_ai/observability_ai_server': - 'x-pack/solutions/observability/packages/observability-ai/observability-ai-server', - 'src/platform/packages/shared/response-ops/alerts_apis': - 'src/platform/packages/shared/response-ops/alerts-apis', - 'src/platform/packages/shared/response-ops/alerts_fields_browser': - 'src/platform/packages/shared/response-ops/alerts-fields-browser', - 'src/platform/packages/shared/response-ops/alerts_table': - 'src/platform/packages/shared/response-ops/alerts-table', - - // custom core package relocation - 'src/dev/packages/serverless/storybook/config': 'src/dev/packages/serverless-storybook-config', - 'src/dev/packages/kbn-management/storybook/config': - 'src/dev/packages/management-storybook-config', - 'src/core/packages/core/test-helpers/core-test-helpers-kbn-server': - 'src/dev/packages/core-test-helpers-kbn-server', - 'src/core/packages/core/test-helpers/core-test-helpers-model-versions': - 'src/dev/packages/core-test-helpers-model-versions', - // 'src/dev/packages/kbn-': (path: string) => - // path.replace('src/dev/packages/kbn-', 'src/dev/packages/'), 'src/core/packages/core/': (path: string) => { const relativePath = path.split('src/core/packages/')[1]; const relativeChunks = relativePath.split('/'); diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index e7790d6e4271c..d193ee3875a70 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -131,7 +131,6 @@ export const IGNORE_DIRECTORY_GLOBS = [ 'src/babel-*', 'packages/*', 'x-pack/packages/ai-infra/*', - 'packages/kbn-pm/src/utils/__fixtures__/*', 'packages/kbn-check-prod-native-modules-cli/integration_tests/__fixtures__/*/node_modules/*', 'x-pack/dev-tools', 'packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack', diff --git a/tsconfig.base.json b/tsconfig.base.json index 24591f944105f..68bec19b2be9b 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1360,8 +1360,8 @@ "@kbn/observability-plugin/*": ["x-pack/solutions/observability/plugins/observability/*"], "@kbn/observability-shared-plugin": ["x-pack/solutions/observability/plugins/observability_shared"], "@kbn/observability-shared-plugin/*": ["x-pack/solutions/observability/plugins/observability_shared/*"], - "@kbn/observability-synthetics-test-data": ["x-pack/solutions/observability/packages/synthetics_test_data"], - "@kbn/observability-synthetics-test-data/*": ["x-pack/solutions/observability/packages/synthetics_test_data/*"], + "@kbn/observability-synthetics-test-data": ["x-pack/solutions/observability/packages/synthetics-test-data"], + "@kbn/observability-synthetics-test-data/*": ["x-pack/solutions/observability/packages/synthetics-test-data/*"], "@kbn/observability-utils-browser": ["x-pack/solutions/observability/packages/utils-browser"], "@kbn/observability-utils-browser/*": ["x-pack/solutions/observability/packages/utils-browser/*"], "@kbn/observability-utils-common": ["x-pack/solutions/observability/packages/utils-common"], diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/README.md b/x-pack/solutions/observability/packages/synthetics-test-data/README.md similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/README.md rename to x-pack/solutions/observability/packages/synthetics-test-data/README.md diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/index.ts b/x-pack/solutions/observability/packages/synthetics-test-data/index.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/index.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/index.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/jest.config.js b/x-pack/solutions/observability/packages/synthetics-test-data/jest.config.js similarity index 94% rename from x-pack/solutions/observability/packages/synthetics_test_data/jest.config.js rename to x-pack/solutions/observability/packages/synthetics-test-data/jest.config.js index 1d9e9717d3e40..7de844080c032 100644 --- a/x-pack/solutions/observability/packages/synthetics_test_data/jest.config.js +++ b/x-pack/solutions/observability/packages/synthetics-test-data/jest.config.js @@ -8,5 +8,5 @@ module.exports = { preset: '@kbn/test', rootDir: '../../../../..', - roots: ['/x-pack/solutions/observability/packages/synthetics_test_data'], + roots: ['/x-pack/solutions/observability/packages/synthetics-test-data'], }; diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/kibana.jsonc b/x-pack/solutions/observability/packages/synthetics-test-data/kibana.jsonc similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/kibana.jsonc rename to x-pack/solutions/observability/packages/synthetics-test-data/kibana.jsonc diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/package.json b/x-pack/solutions/observability/packages/synthetics-test-data/package.json similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/package.json rename to x-pack/solutions/observability/packages/synthetics-test-data/package.json diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/parse_args_params.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/parse_args_params.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/parse_args_params.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/parse_args_params.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/record_video.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/record_video.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/record_video.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/record_video.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/synthetics_runner.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/synthetics_runner.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/synthetics_runner.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/synthetics_runner.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/test_reporter.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/test_reporter.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/test_reporter.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/test_reporter.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/utils.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/utils.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/helpers/utils.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/helpers/utils.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/index.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/index.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/index.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/index.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/tasks/es_archiver.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/tasks/es_archiver.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/tasks/es_archiver.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/tasks/es_archiver.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/tasks/read_kibana_config.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/tasks/read_kibana_config.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/e2e/tasks/read_kibana_config.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/e2e/tasks/read_kibana_config.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/make_summaries.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/make_summaries.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/make_summaries.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/make_summaries.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/src/utils.ts b/x-pack/solutions/observability/packages/synthetics-test-data/src/utils.ts similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/src/utils.ts rename to x-pack/solutions/observability/packages/synthetics-test-data/src/utils.ts diff --git a/x-pack/solutions/observability/packages/synthetics_test_data/tsconfig.json b/x-pack/solutions/observability/packages/synthetics-test-data/tsconfig.json similarity index 100% rename from x-pack/solutions/observability/packages/synthetics_test_data/tsconfig.json rename to x-pack/solutions/observability/packages/synthetics-test-data/tsconfig.json diff --git a/yarn.lock b/yarn.lock index 78865513e9f11..a7654970f5487 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6589,7 +6589,7 @@ version "0.0.0" uid "" -"@kbn/observability-synthetics-test-data@link:x-pack/solutions/observability/packages/synthetics_test_data": +"@kbn/observability-synthetics-test-data@link:x-pack/solutions/observability/packages/synthetics-test-data": version "0.0.0" uid ""