From f78e72247053c5efbf04fe9b67cd207a4d3c47cc Mon Sep 17 00:00:00 2001 From: Gerard Soldevila Date: Mon, 24 Feb 2025 14:31:00 +0100 Subject: [PATCH] SKA: Misc cleanup and enhancements (#212207) ## Summary * Remove some old paths pointing to `packages/kbn-pm` (no longer exists). * ~Fix group and visibility for `@kbn/streams-app-wrapper-plugin`~. (done in https://github.com/elastic/kibana/pull/212210) * Update `scripts/relocate` logic with latest enhancements. * Convert `@kbn/observability-synthetics-test-data` folder name to camel-case (messes up with pre-commit hook). (cherry picked from commit a41badf96496c81587fca3d56c1c891abeb1a3a9) # Conflicts: # .github/CODEOWNERS # package.json # packages/kbn-relocate/relocate.ts # packages/kbn-relocate/utils/transforms.ts --- .github/CODEOWNERS | 2 +- package.json | 2 +- .../src/managed_config_keys.ts | 1 - packages/kbn-relocate/healthcheck.ts | 3 +- packages/kbn-relocate/list.ts | 4 +- packages/kbn-relocate/relocate.ts | 90 ++++++++++--------- packages/kbn-relocate/utils/relocate.ts | 29 +++++- packages/kbn-relocate/utils/transforms.ts | 22 ++--- src/dev/precommit_hook/casing_check_config.js | 1 - tsconfig.base.json | 4 +- .../README.md | 0 .../index.ts | 0 .../jest.config.js | 2 +- .../kibana.jsonc | 0 .../package.json | 0 .../src/e2e/helpers/parse_args_params.ts | 0 .../src/e2e/helpers/record_video.ts | 0 .../src/e2e/helpers/synthetics_runner.ts | 0 .../src/e2e/helpers/test_reporter.ts | 0 .../src/e2e/helpers/utils.ts | 0 .../src/e2e/index.ts | 0 .../src/e2e/tasks/es_archiver.ts | 0 .../src/e2e/tasks/read_kibana_config.ts | 0 .../src/make_summaries.ts | 0 .../src/utils.ts | 0 .../tsconfig.json | 0 yarn.lock | 2 +- 27 files changed, 89 insertions(+), 73 deletions(-) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/README.md (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/index.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/jest.config.js (94%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/kibana.jsonc (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/package.json (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/helpers/parse_args_params.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/helpers/record_video.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/helpers/synthetics_runner.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/helpers/test_reporter.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/helpers/utils.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/index.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/tasks/es_archiver.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/e2e/tasks/read_kibana_config.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/make_summaries.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/src/utils.ts (100%) rename x-pack/solutions/observability/packages/{synthetics_test_data => synthetics-test-data}/tsconfig.json (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 41c3732bb18f2..b7d6dd591f7f4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -687,7 +687,7 @@ x-pack/solutions/observability/plugins/observability_onboarding/e2e @elastic/obs x-pack/solutions/observability/plugins/observability_onboarding @elastic/obs-ux-logs-team x-pack/solutions/observability/plugins/observability @elastic/obs-ux-management-team x-pack/solutions/observability/plugins/observability_shared @elastic/observability-ui -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 bf725af1eb11d..b6a64643970a9 100644 --- a/package.json +++ b/package.json @@ -1469,7 +1469,7 @@ "@kbn/mock-idp-plugin": "link:packages/kbn-mock-idp-plugin", "@kbn/mock-idp-utils": "link:packages/kbn-mock-idp-utils", "@kbn/observability-onboarding-e2e": "link:x-pack/solutions/observability/plugins/observability_onboarding/e2e", - "@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:packages/kbn-openapi-bundler", "@kbn/openapi-generator": "link:packages/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/healthcheck.ts b/packages/kbn-relocate/healthcheck.ts index 5ebaf501cc701..99dacda580b85 100644 --- a/packages/kbn-relocate/healthcheck.ts +++ b/packages/kbn-relocate/healthcheck.ts @@ -12,8 +12,7 @@ import fs from 'fs'; import path, { join } from 'path'; import { getPackages } from '@kbn/repo-packages'; import { REPO_ROOT } from '@kbn/repo-info'; -import { EXCLUDED_FOLDERS, EXCLUDED_FOLDER_NAMES, EXTENSIONS } from './constants'; -import { BASE_FOLDER } from './constants'; +import { EXCLUDED_FOLDERS, EXCLUDED_FOLDER_NAMES, EXTENSIONS, BASE_FOLDER } from './constants'; const findPaths = (content: string): string[] => { const regex = /([\.]{1,2}(\/[^\s)\]\['`#"]+)+)/g; diff --git a/packages/kbn-relocate/list.ts b/packages/kbn-relocate/list.ts index 73fe93f3b6d9f..67f17a2557baf 100644 --- a/packages/kbn-relocate/list.ts +++ b/packages/kbn-relocate/list.ts @@ -39,9 +39,7 @@ export const listModules = async (listFlag: string, log: ToolingLog) => { ? module.directory : join(BASE_FOLDER, module.directory); - if (module.isDevOnly()) { - devOnly.push(module); - } else if ( + if ( directory.includes(`/${KIBANA_FOLDER}/test/`) || directory.includes(`/${KIBANA_FOLDER}/x-pack/test/`) ) { diff --git a/packages/kbn-relocate/relocate.ts b/packages/kbn-relocate/relocate.ts index 98da95f39f98f..069ef422040a8 100644 --- a/packages/kbn-relocate/relocate.ts +++ b/packages/kbn-relocate/relocate.ts @@ -36,6 +36,8 @@ import { getManualCommits, } from './utils/git'; +const SKIP_RESET = false; + const moveModule = async (module: Package, log: ToolingLog) => { const destination = calculateModuleTargetFolder(module); log.info(`Moving ${module.directory} to ${destination}`); @@ -107,8 +109,6 @@ const findModules = ({ teams, paths, included, excluded }: FindModulesParams, lo // find modules selected by user filters return ( sortBy(modules, ['directory']) - // exclude devOnly modules (they will remain in /packages) - .filter(({ manifest }) => !manifest.devOnly) // explicit exclusions .filter(({ id }) => !EXCLUDED_MODULES.includes(id) && !excluded.includes(id)) // we don't want to move test and example modules (just yet) @@ -181,55 +181,57 @@ export const findAndRelocateModules = async (params: RelocateModulesParams, log: return; } - if (prNumber) { - pr = await findPr(prNumber); - - if (getManualCommits(pr.commits).length > 0) { - const resOverride = await inquirer.prompt({ - type: 'confirm', - name: 'overrideManualCommits', - message: - 'Manual commits detected in the PR. The script will try to cherry-pick them, but it might require manual intervention to resolve conflicts. Continue?', - }); - if (!resOverride.overrideManualCommits) { - log.info('Aborting'); - return; + if (!SKIP_RESET) { + if (prNumber) { + pr = await findPr(prNumber); + + if (getManualCommits(pr.commits).length > 0) { + const resOverride = await inquirer.prompt({ + type: 'confirm', + name: 'overrideManualCommits', + message: + 'Manual commits detected in the PR. The script will try to cherry-pick them, but it might require manual intervention to resolve conflicts. Continue?', + }); + if (!resOverride.overrideManualCommits) { + log.info('Aborting'); + return; + } } } - } - - const resConfirmReset = await inquirer.prompt({ - type: 'confirm', - name: 'confirmReset', - message: `The script will RESET CHANGES in this repository. Proceed?`, - }); - - if (!resConfirmReset.confirmReset) { - log.info('Aborting'); - return; - } - // start with a clean repo - await safeExec(`git restore --staged .`); - await safeExec(`git restore .`); - await safeExec(`git clean -f -d`); - await safeExec(`git checkout ${baseBranch} && git pull ${upstream} ${baseBranch}`); + const resConfirmReset = await inquirer.prompt({ + type: 'confirm', + name: 'confirmReset', + message: `The script will RESET CHANGES in this repository. Proceed?`, + }); - if (pr) { - // checkout existing PR, reset all commits, rebase from baseBranch - try { - await checkoutResetPr(pr, baseBranch); - } catch (error) { - log.error(`Error checking out / resetting PR #${prNumber}:`); - log.error(error); + if (!resConfirmReset.confirmReset) { + log.info('Aborting'); return; } - } else { - // checkout new branch - await checkoutBranch(NEW_BRANCH); - } - await safeExec(`yarn kbn bootstrap`); + // start with a clean repo + await safeExec(`git restore --staged .`); + await safeExec(`git restore .`); + await safeExec(`git clean -f -d`); + await safeExec(`git checkout ${baseBranch} && git pull ${upstream} ${baseBranch}`); + + if (pr) { + // checkout existing PR, reset all commits, rebase from baseBranch + try { + await checkoutResetPr(pr, baseBranch); + } catch (error) { + log.error(`Error checking out / resetting PR #${prNumber}:`); + log.error(error); + return; + } + } else { + // checkout new branch + await checkoutBranch(NEW_BRANCH); + } + + await safeExec(`yarn kbn bootstrap`); + } await inquirer.prompt({ type: 'confirm', name: 'readyRelocate', diff --git a/packages/kbn-relocate/utils/relocate.ts b/packages/kbn-relocate/utils/relocate.ts index 770a1993eea68..e9dcc2c18eac8 100644 --- a/packages/kbn-relocate/utils/relocate.ts +++ b/packages/kbn-relocate/utils/relocate.ts @@ -11,7 +11,7 @@ import { basename, join } from 'path'; import type { ToolingLog } from '@kbn/tooling-log'; import { orderBy } from 'lodash'; import type { Package } from '../types'; -import { applyTransforms } from './transforms'; +import { HARDCODED_MODULE_PATHS, applyTransforms } from './transforms'; import { BASE_FOLDER, BASE_FOLDER_DEPTH, @@ -42,7 +42,12 @@ export const calculateModuleTargetFolder = (module: Package): string => { : join(BASE_FOLDER, module.directory); let moduleDelimiter: string; - if (!fullPath.includes('/plugins/') && !fullPath.includes('/packages/')) { + if (HARDCODED_MODULE_PATHS[module.id]) { + return join(BASE_FOLDER, HARDCODED_MODULE_PATHS[module.id]); + } else if (module.isDevOnly()) { + // only packages can be devOnly + moduleDelimiter = '/packages/'; + } else if (!fullPath.includes('/plugins/') && !fullPath.includes('/packages/')) { throw new Error( `The module ${module.id} is not located under a '*/plugins/*' or '*/packages/*' folder` ); @@ -63,6 +68,15 @@ export const calculateModuleTargetFolder = (module: Package): string => { chunks.shift(); // remove the base path up to '/packages/' or '/plugins/' const moduleFolder = chunks.join(moduleDelimiter); // in case there's an extra /packages/ or /plugins/ folder + if ( + module.isDevOnly() && + (!module.group || module.group === 'common') && + fullPath.includes(`/${KIBANA_FOLDER}/packages/`) && + !fullPath.includes(`/${KIBANA_FOLDER}/packages/core/`) + ) { + // relocate all dev modules under /packages to /src/dev/packages + return applyTransforms(module, join(BASE_FOLDER, 'src', 'dev', 'packages', moduleFolder)); + } let path: string; if (group === 'platform') { @@ -85,7 +99,7 @@ export const calculateModuleTargetFolder = (module: Package): string => { moduleFolder ); } - } else { + } else if (group === 'observability' || group === 'security' || group === 'search') { path = join( BASE_FOLDER, 'x-pack', // all solution modules are 'x-pack' @@ -94,6 +108,8 @@ export const calculateModuleTargetFolder = (module: Package): string => { isPlugin ? 'plugins' : 'packages', moduleFolder ); + } else { + path = fullPath; } // after-creation transforms @@ -113,6 +129,13 @@ export const replaceReferences = async (module: Package, destination: string, lo const relativeSource = source.replace(BASE_FOLDER, ''); const relativeDestination = destination.replace(BASE_FOLDER, ''); + if (relativeSource.split('/').length === 1) { + log.warning( + `Cannot replace references of a 1-level relative path '${relativeSource}'. Skipping.` + ); + return; + } + if ( (relativeSource.startsWith('src') && relativeDestination.startsWith('src')) || (relativeSource.startsWith('x-pack') && relativeDestination.startsWith('x-pack')) diff --git a/packages/kbn-relocate/utils/transforms.ts b/packages/kbn-relocate/utils/transforms.ts index 5a242e65b025a..9a6c047e4c2a4 100644 --- a/packages/kbn-relocate/utils/transforms.ts +++ b/packages/kbn-relocate/utils/transforms.ts @@ -9,21 +9,16 @@ 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 = { - '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/search/packages/shared_ui': 'x-pack/solutions/search/packages/shared_ui', - '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/', 'src/core/packages/core/': (path: string) => { const relativePath = path.split('src/core/packages/')[1]; const relativeChunks = relativePath.split('/'); @@ -40,6 +35,7 @@ const TRANSFORMS: Record = { } }, }; + export const applyTransforms = (module: Package, path: string): string => { const transform = Object.entries(TRANSFORMS).find(([what]) => path.includes(what)); if (!transform) { diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index cbbc68c1dadc6..bffa87ad137a0 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -128,7 +128,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 0c175009d3c5c..cb9dc9b719468 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1368,8 +1368,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 9cac5913bffae..2384cba8b0570 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6601,7 +6601,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 ""