From e9e71cdf882da3236724a5bd8be45d0dc306a9e5 Mon Sep 17 00:00:00 2001 From: PhilippeOberti Date: Thu, 12 Dec 2024 16:32:12 -0600 Subject: [PATCH 1/5] Relocating module `@kbn/data-stream-adapter` --- .eslintrc.js | 4 ++-- .github/CODEOWNERS | 2 +- package.json | 2 +- tsconfig.base.json | 4 ++-- .../security/packages}/kbn-data-stream-adapter/README.md | 0 .../security/packages}/kbn-data-stream-adapter/index.ts | 0 .../security/packages}/kbn-data-stream-adapter/jest.config.js | 4 ++-- .../security/packages}/kbn-data-stream-adapter/kibana.jsonc | 0 .../security/packages}/kbn-data-stream-adapter/package.json | 2 +- .../src/create_or_update_data_stream.test.ts | 0 .../src/create_or_update_data_stream.ts | 0 .../kbn-data-stream-adapter/src/data_stream_adapter.ts | 0 .../kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts | 0 .../security/packages}/kbn-data-stream-adapter/tsconfig.json | 2 +- yarn.lock | 2 +- 15 files changed, 11 insertions(+), 11 deletions(-) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/README.md (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/index.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/jest.config.js (82%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/kibana.jsonc (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/package.json (70%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/src/create_or_update_data_stream.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/src/data_stream_adapter.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-data-stream-adapter/tsconfig.json (83%) diff --git a/.eslintrc.js b/.eslintrc.js index 8559a20f481fe..3cfca882ef803 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1216,7 +1216,7 @@ module.exports = { 'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}', 'x-pack/solutions/security/plugins/timelines/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}', - 'packages/kbn-data-stream-adapter/**/*.{js,mjs,ts,tsx}', + 'x-pack/solutions/security/packages/kbn-data-stream-adapter/**/*.{js,mjs,ts,tsx}', 'packages/kbn-cell-actions/**/*.{js,mjs,ts,tsx}', ], plugins: ['eslint-plugin-node', 'react'], @@ -1316,7 +1316,7 @@ module.exports = { 'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/ecs_data_quality_dashboard/**/*.{js,mjs,ts,tsx}', - 'x-pack/packages/kbn-data-stream-adapter/**/*.{js,mjs,ts,tsx}', + 'x-pack/x-pack/solutions/security/packages/kbn-data-stream-adapter/**/*.{js,mjs,ts,tsx}', 'packages/kbn-cell-actions/**/*.{js,mjs,ts,tsx}', ], rules: { diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a4b80cd589b18..9584793a13130 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -323,7 +323,6 @@ packages/kbn-custom-icons @elastic/obs-ux-logs-team packages/kbn-custom-integrations @elastic/obs-ux-logs-team packages/kbn-cypress-config @elastic/kibana-operations packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery -packages/kbn-data-stream-adapter @elastic/security-threat-hunting packages/kbn-data-view-utils @elastic/kibana-data-discovery packages/kbn-datemath @elastic/kibana-data-discovery packages/kbn-dependency-ownership @elastic/kibana-security @@ -995,6 +994,7 @@ x-pack/solutions/security/packages/distribution_bar @elastic/kibana-cloud-securi x-pack/solutions/security/packages/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/expandable-flyout @elastic/security-threat-hunting-investigations x-pack/solutions/security/packages/features @elastic/security-threat-hunting-explore +x-pack/solutions/security/packages/kbn-data-stream-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/side_nav @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-explore diff --git a/package.json b/package.json index 3a3ca45901810..0319f7a5d7849 100644 --- a/package.json +++ b/package.json @@ -428,7 +428,7 @@ "@kbn/data-quality-plugin": "link:x-pack/plugins/data_quality", "@kbn/data-search-plugin": "link:test/plugin_functional/plugins/data_search", "@kbn/data-service": "link:packages/kbn-data-service", - "@kbn/data-stream-adapter": "link:packages/kbn-data-stream-adapter", + "@kbn/data-stream-adapter": "link:x-pack/solutions/security/packages/kbn-data-stream-adapter", "@kbn/data-usage-plugin": "link:x-pack/platform/plugins/private/data_usage", "@kbn/data-view-editor-plugin": "link:src/plugins/data_view_editor", "@kbn/data-view-field-editor-example-plugin": "link:examples/data_view_field_editor_example", diff --git a/tsconfig.base.json b/tsconfig.base.json index 0180c2a69f6f4..0d08667cf6295 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -710,8 +710,8 @@ "@kbn/data-search-plugin/*": ["test/plugin_functional/plugins/data_search/*"], "@kbn/data-service": ["packages/kbn-data-service"], "@kbn/data-service/*": ["packages/kbn-data-service/*"], - "@kbn/data-stream-adapter": ["packages/kbn-data-stream-adapter"], - "@kbn/data-stream-adapter/*": ["packages/kbn-data-stream-adapter/*"], + "@kbn/data-stream-adapter": ["x-pack/solutions/security/packages/kbn-data-stream-adapter"], + "@kbn/data-stream-adapter/*": ["x-pack/solutions/security/packages/kbn-data-stream-adapter/*"], "@kbn/data-usage-plugin": ["x-pack/platform/plugins/private/data_usage"], "@kbn/data-usage-plugin/*": ["x-pack/platform/plugins/private/data_usage/*"], "@kbn/data-view-editor-plugin": ["src/plugins/data_view_editor"], diff --git a/packages/kbn-data-stream-adapter/README.md b/x-pack/solutions/security/packages/kbn-data-stream-adapter/README.md similarity index 100% rename from packages/kbn-data-stream-adapter/README.md rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/README.md diff --git a/packages/kbn-data-stream-adapter/index.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts similarity index 100% rename from packages/kbn-data-stream-adapter/index.ts rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts diff --git a/packages/kbn-data-stream-adapter/jest.config.js b/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js similarity index 82% rename from packages/kbn-data-stream-adapter/jest.config.js rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js index 9dad2c70d375c..001390b8ad9c3 100644 --- a/packages/kbn-data-stream-adapter/jest.config.js +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js @@ -9,6 +9,6 @@ module.exports = { preset: '@kbn/test', - rootDir: '../..', - roots: ['/packages/kbn-data-stream-adapter'], + rootDir: '../../../../..', + roots: ['/x-pack/solutions/security/packages/kbn-data-stream-adapter'], }; diff --git a/packages/kbn-data-stream-adapter/kibana.jsonc b/x-pack/solutions/security/packages/kbn-data-stream-adapter/kibana.jsonc similarity index 100% rename from packages/kbn-data-stream-adapter/kibana.jsonc rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/kibana.jsonc diff --git a/packages/kbn-data-stream-adapter/package.json b/x-pack/solutions/security/packages/kbn-data-stream-adapter/package.json similarity index 70% rename from packages/kbn-data-stream-adapter/package.json rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/package.json index 588c7e4a1cf37..ff622fd59305c 100644 --- a/packages/kbn-data-stream-adapter/package.json +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/package.json @@ -2,6 +2,6 @@ "name": "@kbn/data-stream-adapter", "version": "1.0.0", "description": "Utility library for Elasticsearch Data Stream management", - "license": "Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0", + "license": "Elastic License 2.0", "private": true } diff --git a/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts similarity index 100% rename from packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts diff --git a/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts similarity index 100% rename from packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts diff --git a/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts similarity index 100% rename from packages/kbn-data-stream-adapter/src/data_stream_adapter.ts rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts diff --git a/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts similarity index 100% rename from packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts diff --git a/packages/kbn-data-stream-adapter/tsconfig.json b/x-pack/solutions/security/packages/kbn-data-stream-adapter/tsconfig.json similarity index 83% rename from packages/kbn-data-stream-adapter/tsconfig.json rename to x-pack/solutions/security/packages/kbn-data-stream-adapter/tsconfig.json index 8c8bcce97fe74..0df371ef60210 100644 --- a/packages/kbn-data-stream-adapter/tsconfig.json +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", "types": [ diff --git a/yarn.lock b/yarn.lock index e405ed3ddbafa..38ee58443cde2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5236,7 +5236,7 @@ version "0.0.0" uid "" -"@kbn/data-stream-adapter@link:packages/kbn-data-stream-adapter": +"@kbn/data-stream-adapter@link:x-pack/solutions/security/packages/kbn-data-stream-adapter": version "0.0.0" uid "" From 7cc85d225b97b7b31b3c3ab389edc4451538a346 Mon Sep 17 00:00:00 2001 From: PhilippeOberti Date: Thu, 12 Dec 2024 16:33:53 -0600 Subject: [PATCH 2/5] Relocating module `@kbn/index-adapter` --- .github/CODEOWNERS | 2 +- package.json | 2 +- tsconfig.base.json | 4 ++-- .../solutions/security/packages}/kbn-index-adapter/README.md | 0 .../solutions/security/packages}/kbn-index-adapter/index.ts | 0 .../security/packages}/kbn-index-adapter/jest.config.js | 4 ++-- .../security/packages}/kbn-index-adapter/kibana.jsonc | 0 .../security/packages}/kbn-index-adapter/package.json | 2 +- .../src/create_or_update_component_template.test.ts | 0 .../src/create_or_update_component_template.ts | 0 .../kbn-index-adapter/src/create_or_update_index.test.ts | 0 .../packages}/kbn-index-adapter/src/create_or_update_index.ts | 0 .../src/create_or_update_index_template.test.ts | 0 .../kbn-index-adapter/src/create_or_update_index_template.ts | 0 .../kbn-index-adapter/src/field_maps/ecs_field_map.ts | 0 .../src/field_maps/mapping_from_field_map.test.ts | 0 .../src/field_maps/mapping_from_field_map.ts | 0 .../packages}/kbn-index-adapter/src/field_maps/types.ts | 0 .../security/packages}/kbn-index-adapter/src/index_adapter.ts | 0 .../packages}/kbn-index-adapter/src/index_pattern_adapter.ts | 0 .../kbn-index-adapter/src/install_with_timeout.test.ts | 0 .../packages}/kbn-index-adapter/src/install_with_timeout.ts | 0 .../kbn-index-adapter/src/resource_installer_utils.test.ts | 0 .../kbn-index-adapter/src/resource_installer_utils.ts | 0 .../kbn-index-adapter/src/retry_transient_es_errors.test.ts | 0 .../kbn-index-adapter/src/retry_transient_es_errors.ts | 0 .../security/packages}/kbn-index-adapter/tsconfig.json | 2 +- yarn.lock | 2 +- 28 files changed, 9 insertions(+), 9 deletions(-) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/README.md (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/index.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/jest.config.js (82%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/kibana.jsonc (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/package.json (69%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/create_or_update_component_template.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/create_or_update_component_template.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/create_or_update_index.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/create_or_update_index.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/create_or_update_index_template.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/create_or_update_index_template.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/field_maps/ecs_field_map.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/field_maps/types.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/index_adapter.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/index_pattern_adapter.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/install_with_timeout.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/install_with_timeout.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/resource_installer_utils.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/resource_installer_utils.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/retry_transient_es_errors.test.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/src/retry_transient_es_errors.ts (100%) rename {packages => x-pack/solutions/security/packages}/kbn-index-adapter/tsconfig.json (85%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9584793a13130..39f8dba0e857b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -375,7 +375,6 @@ packages/kbn-i18n @elastic/kibana-core packages/kbn-i18n-react @elastic/kibana-core packages/kbn-import-locator @elastic/kibana-operations packages/kbn-import-resolver @elastic/kibana-operations -packages/kbn-index-adapter @elastic/security-threat-hunting packages/kbn-interpreter @elastic/kibana-visualizations packages/kbn-io-ts-utils @elastic/obs-knowledge-team packages/kbn-ipynb @elastic/search-kibana @@ -995,6 +994,7 @@ x-pack/solutions/security/packages/ecs_data_quality_dashboard @elastic/security- x-pack/solutions/security/packages/expandable-flyout @elastic/security-threat-hunting-investigations x-pack/solutions/security/packages/features @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/kbn-data-stream-adapter @elastic/security-threat-hunting +x-pack/solutions/security/packages/kbn-index-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/side_nav @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-explore diff --git a/package.json b/package.json index 0319f7a5d7849..9dd27fcb8a885 100644 --- a/package.json +++ b/package.json @@ -571,7 +571,7 @@ "@kbn/i18n-react": "link:packages/kbn-i18n-react", "@kbn/iframe-embedded-plugin": "link:x-pack/test/functional_embedded/plugins/iframe_embedded", "@kbn/image-embeddable-plugin": "link:src/plugins/image_embeddable", - "@kbn/index-adapter": "link:packages/kbn-index-adapter", + "@kbn/index-adapter": "link:x-pack/solutions/security/packages/kbn-index-adapter", "@kbn/index-lifecycle-management-common-shared": "link:x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared", "@kbn/index-lifecycle-management-plugin": "link:x-pack/plugins/index_lifecycle_management", "@kbn/index-management-plugin": "link:x-pack/plugins/index_management", diff --git a/tsconfig.base.json b/tsconfig.base.json index 0d08667cf6295..95029ba072a9d 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1048,8 +1048,8 @@ "@kbn/import-locator/*": ["packages/kbn-import-locator/*"], "@kbn/import-resolver": ["packages/kbn-import-resolver"], "@kbn/import-resolver/*": ["packages/kbn-import-resolver/*"], - "@kbn/index-adapter": ["packages/kbn-index-adapter"], - "@kbn/index-adapter/*": ["packages/kbn-index-adapter/*"], + "@kbn/index-adapter": ["x-pack/solutions/security/packages/kbn-index-adapter"], + "@kbn/index-adapter/*": ["x-pack/solutions/security/packages/kbn-index-adapter/*"], "@kbn/index-lifecycle-management-common-shared": ["x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared"], "@kbn/index-lifecycle-management-common-shared/*": ["x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared/*"], "@kbn/index-lifecycle-management-plugin": ["x-pack/plugins/index_lifecycle_management"], diff --git a/packages/kbn-index-adapter/README.md b/x-pack/solutions/security/packages/kbn-index-adapter/README.md similarity index 100% rename from packages/kbn-index-adapter/README.md rename to x-pack/solutions/security/packages/kbn-index-adapter/README.md diff --git a/packages/kbn-index-adapter/index.ts b/x-pack/solutions/security/packages/kbn-index-adapter/index.ts similarity index 100% rename from packages/kbn-index-adapter/index.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/index.ts diff --git a/packages/kbn-index-adapter/jest.config.js b/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js similarity index 82% rename from packages/kbn-index-adapter/jest.config.js rename to x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js index bf08ec1526382..37d08a7045f6d 100644 --- a/packages/kbn-index-adapter/jest.config.js +++ b/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js @@ -9,6 +9,6 @@ module.exports = { preset: '@kbn/test', - rootDir: '../..', - roots: ['/packages/kbn-index-adapter'], + rootDir: '../../../../..', + roots: ['/x-pack/solutions/security/packages/kbn-index-adapter'], }; diff --git a/packages/kbn-index-adapter/kibana.jsonc b/x-pack/solutions/security/packages/kbn-index-adapter/kibana.jsonc similarity index 100% rename from packages/kbn-index-adapter/kibana.jsonc rename to x-pack/solutions/security/packages/kbn-index-adapter/kibana.jsonc diff --git a/packages/kbn-index-adapter/package.json b/x-pack/solutions/security/packages/kbn-index-adapter/package.json similarity index 69% rename from packages/kbn-index-adapter/package.json rename to x-pack/solutions/security/packages/kbn-index-adapter/package.json index 70b79abe1b571..557f2133488cd 100644 --- a/packages/kbn-index-adapter/package.json +++ b/x-pack/solutions/security/packages/kbn-index-adapter/package.json @@ -2,6 +2,6 @@ "name": "@kbn/index-adapter", "version": "1.0.0", "description": "Utility library for Elasticsearch index management", - "license": "Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0", + "license": "Elastic License 2.0", "private": true } \ No newline at end of file diff --git a/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/create_or_update_component_template.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts diff --git a/packages/kbn-index-adapter/src/create_or_update_component_template.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts similarity index 100% rename from packages/kbn-index-adapter/src/create_or_update_component_template.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts diff --git a/packages/kbn-index-adapter/src/create_or_update_index.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/create_or_update_index.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts diff --git a/packages/kbn-index-adapter/src/create_or_update_index.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts similarity index 100% rename from packages/kbn-index-adapter/src/create_or_update_index.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts diff --git a/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/create_or_update_index_template.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts diff --git a/packages/kbn-index-adapter/src/create_or_update_index_template.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts similarity index 100% rename from packages/kbn-index-adapter/src/create_or_update_index_template.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts diff --git a/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts similarity index 100% rename from packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts diff --git a/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts diff --git a/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts similarity index 100% rename from packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts diff --git a/packages/kbn-index-adapter/src/field_maps/types.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts similarity index 100% rename from packages/kbn-index-adapter/src/field_maps/types.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts diff --git a/packages/kbn-index-adapter/src/index_adapter.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts similarity index 100% rename from packages/kbn-index-adapter/src/index_adapter.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts diff --git a/packages/kbn-index-adapter/src/index_pattern_adapter.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts similarity index 100% rename from packages/kbn-index-adapter/src/index_pattern_adapter.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts diff --git a/packages/kbn-index-adapter/src/install_with_timeout.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/install_with_timeout.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts diff --git a/packages/kbn-index-adapter/src/install_with_timeout.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts similarity index 100% rename from packages/kbn-index-adapter/src/install_with_timeout.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts diff --git a/packages/kbn-index-adapter/src/resource_installer_utils.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/resource_installer_utils.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts diff --git a/packages/kbn-index-adapter/src/resource_installer_utils.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts similarity index 100% rename from packages/kbn-index-adapter/src/resource_installer_utils.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts diff --git a/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts similarity index 100% rename from packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts diff --git a/packages/kbn-index-adapter/src/retry_transient_es_errors.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts similarity index 100% rename from packages/kbn-index-adapter/src/retry_transient_es_errors.ts rename to x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts diff --git a/packages/kbn-index-adapter/tsconfig.json b/x-pack/solutions/security/packages/kbn-index-adapter/tsconfig.json similarity index 85% rename from packages/kbn-index-adapter/tsconfig.json rename to x-pack/solutions/security/packages/kbn-index-adapter/tsconfig.json index cca50adbf7eb8..fb98020940ad0 100644 --- a/packages/kbn-index-adapter/tsconfig.json +++ b/x-pack/solutions/security/packages/kbn-index-adapter/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types", "types": [ diff --git a/yarn.lock b/yarn.lock index 38ee58443cde2..a0620d0102b12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5912,7 +5912,7 @@ version "0.0.0" uid "" -"@kbn/index-adapter@link:packages/kbn-index-adapter": +"@kbn/index-adapter@link:x-pack/solutions/security/packages/kbn-index-adapter": version "0.0.0" uid "" From cfc908f30f52653be203761a0c476062ea6d2f57 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Thu, 12 Dec 2024 22:59:32 +0000 Subject: [PATCH 3/5] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- .../security/packages/kbn-data-stream-adapter/index.ts | 8 +++----- .../packages/kbn-data-stream-adapter/jest.config.js | 8 +++----- .../src/create_or_update_data_stream.test.ts | 8 +++----- .../src/create_or_update_data_stream.ts | 8 +++----- .../kbn-data-stream-adapter/src/data_stream_adapter.ts | 8 +++----- .../src/data_stream_spaces_adapter.ts | 8 +++----- .../security/packages/kbn-index-adapter/index.ts | 8 +++----- .../security/packages/kbn-index-adapter/jest.config.js | 8 +++----- .../src/create_or_update_component_template.test.ts | 8 +++----- .../src/create_or_update_component_template.ts | 8 +++----- .../kbn-index-adapter/src/create_or_update_index.test.ts | 8 +++----- .../kbn-index-adapter/src/create_or_update_index.ts | 8 +++----- .../src/create_or_update_index_template.test.ts | 8 +++----- .../src/create_or_update_index_template.ts | 8 +++----- .../kbn-index-adapter/src/field_maps/ecs_field_map.ts | 8 +++----- .../src/field_maps/mapping_from_field_map.test.ts | 8 +++----- .../src/field_maps/mapping_from_field_map.ts | 8 +++----- .../packages/kbn-index-adapter/src/field_maps/types.ts | 8 +++----- .../packages/kbn-index-adapter/src/index_adapter.ts | 8 +++----- .../kbn-index-adapter/src/index_pattern_adapter.ts | 8 +++----- .../kbn-index-adapter/src/install_with_timeout.test.ts | 8 +++----- .../kbn-index-adapter/src/install_with_timeout.ts | 8 +++----- .../src/resource_installer_utils.test.ts | 8 +++----- .../kbn-index-adapter/src/resource_installer_utils.ts | 8 +++----- .../src/retry_transient_es_errors.test.ts | 8 +++----- .../kbn-index-adapter/src/retry_transient_es_errors.ts | 8 +++----- 26 files changed, 78 insertions(+), 130 deletions(-) diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts index f03a384dca1ff..211fc4f9b5f17 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ export { DataStreamAdapter } from './src/data_stream_adapter'; diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js b/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js index 001390b8ad9c3..34b19286183dd 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ module.exports = { diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts index e2141d4afb740..35112e96ecb09 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { IndicesDataStream } from '@elastic/elasticsearch/lib/api/types'; diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts index 2b0fba3fb0ac0..56e3d3a63548a 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { IndicesDataStream } from '@elastic/elasticsearch/lib/api/types'; diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts index f54ed81312d75..d42fb870ab3c5 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { IndexAdapter, SetIndexTemplateParams, type InstallParams } from '@kbn/index-adapter'; diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts index df131920b7bf9..5fbb986fc647d 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts +++ b/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/index.ts b/x-pack/solutions/security/packages/kbn-index-adapter/index.ts index 6956792135282..8f5bf5446863c 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/index.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/index.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ export { IndexAdapter } from './src/index_adapter'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js b/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js index 37d08a7045f6d..e823950f27341 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js +++ b/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ module.exports = { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts index 2bedbec8691b2..c99952689b7b0 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts index 73abf92c9e4af..6a7f87539de9b 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts index 6c32b183e1fda..22d126782f68c 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts index ff825c61305b7..ce9528d8277fc 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { IndexName } from '@elastic/elasticsearch/lib/api/types'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts index 5f53c329e8cd5..eb85b0931f9ef 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts index 586b76ff44f29..d7e4b25771b86 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts index a15c8480e6fc4..424c2af01d4c2 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { EcsFlat } from '@elastic/ecs'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts index 5a4bffd3c46a5..7d8a17a84fe42 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { mappingFromFieldMap } from './mapping_from_field_map'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts index 0d416ae8356e9..c40dcbef695c5 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts index 90fb44873a342..9c96fa2d796f6 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ export interface AllowedValue { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts index eef2ce529d78a..f8395db9fa9b9 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts index 38a96a3c65b83..ae5e692cd55bc 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { createIndex, updateIndices } from './create_or_update_index'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts index 6743604ba24f3..43cdb8ce734ae 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { loggerMock } from '@kbn/logging-mocks'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts index 79b78b7bb6569..bb88b29cfe95b 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { firstValueFrom, type Observable } from 'rxjs'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts index 31d4a3abcbb0d..2067d17e5cb36 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { getIndexTemplate, getComponentTemplate } from './resource_installer_utils'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts index eb6e2490000b2..dbe958dc019d7 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts index 1b4582587f972..9120bdab51866 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import { loggingSystemMock } from '@kbn/core/server/mocks'; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts b/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts index 2b6ddea509824..6dd568de3b98c 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts +++ b/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts @@ -1,10 +1,8 @@ /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. */ import type { Logger } from '@kbn/core/server'; From 6fd9f90f5c8d138f35e3fb8ceb75c8d87884d76f Mon Sep 17 00:00:00 2001 From: PhilippeOberti Date: Thu, 12 Dec 2024 17:52:55 -0600 Subject: [PATCH 4/5] update kbn-data-stream-adapter to data-stream-adapter and kbn-index-adapter to index-adapter --- .eslintrc.js | 4 ++-- .github/CODEOWNERS | 8 ++++---- package.json | 4 ++-- tsconfig.base.json | 8 ++++---- .../README.md | 0 .../index.ts | 0 .../jest.config.js | 2 +- .../kibana.jsonc | 0 .../package.json | 0 .../src/create_or_update_data_stream.test.ts | 0 .../src/create_or_update_data_stream.ts | 0 .../src/data_stream_adapter.ts | 0 .../src/data_stream_spaces_adapter.ts | 0 .../tsconfig.json | 0 .../{kbn-index-adapter => index-adapter}/README.md | 0 .../{kbn-index-adapter => index-adapter}/index.ts | 0 .../{kbn-index-adapter => index-adapter}/jest.config.js | 2 +- .../{kbn-index-adapter => index-adapter}/kibana.jsonc | 0 .../{kbn-index-adapter => index-adapter}/package.json | 0 .../src/create_or_update_component_template.test.ts | 0 .../src/create_or_update_component_template.ts | 0 .../src/create_or_update_index.test.ts | 0 .../src/create_or_update_index.ts | 0 .../src/create_or_update_index_template.test.ts | 0 .../src/create_or_update_index_template.ts | 0 .../src/field_maps/ecs_field_map.ts | 0 .../src/field_maps/mapping_from_field_map.test.ts | 0 .../src/field_maps/mapping_from_field_map.ts | 0 .../src/field_maps/types.ts | 0 .../src/index_adapter.ts | 0 .../src/index_pattern_adapter.ts | 0 .../src/install_with_timeout.test.ts | 0 .../src/install_with_timeout.ts | 0 .../src/resource_installer_utils.test.ts | 0 .../src/resource_installer_utils.ts | 0 .../src/retry_transient_es_errors.test.ts | 0 .../src/retry_transient_es_errors.ts | 0 .../{kbn-index-adapter => index-adapter}/tsconfig.json | 0 yarn.lock | 4 ++-- 39 files changed, 16 insertions(+), 16 deletions(-) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/README.md (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/index.ts (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/jest.config.js (79%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/kibana.jsonc (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/package.json (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/src/create_or_update_data_stream.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/src/create_or_update_data_stream.ts (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/src/data_stream_adapter.ts (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/src/data_stream_spaces_adapter.ts (100%) rename x-pack/solutions/security/packages/{kbn-data-stream-adapter => data-stream-adapter}/tsconfig.json (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/README.md (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/index.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/jest.config.js (80%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/kibana.jsonc (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/package.json (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/create_or_update_component_template.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/create_or_update_component_template.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/create_or_update_index.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/create_or_update_index.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/create_or_update_index_template.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/create_or_update_index_template.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/field_maps/ecs_field_map.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/field_maps/mapping_from_field_map.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/field_maps/mapping_from_field_map.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/field_maps/types.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/index_adapter.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/index_pattern_adapter.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/install_with_timeout.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/install_with_timeout.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/resource_installer_utils.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/resource_installer_utils.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/retry_transient_es_errors.test.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/src/retry_transient_es_errors.ts (100%) rename x-pack/solutions/security/packages/{kbn-index-adapter => index-adapter}/tsconfig.json (100%) diff --git a/.eslintrc.js b/.eslintrc.js index 3cfca882ef803..9f1b14e4a5d12 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1216,7 +1216,7 @@ module.exports = { 'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}', 'x-pack/solutions/security/plugins/timelines/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}', - 'x-pack/solutions/security/packages/kbn-data-stream-adapter/**/*.{js,mjs,ts,tsx}', + 'x-pack/solutions/security/packages/data-stream-adapter/**/*.{js,mjs,ts,tsx}', 'packages/kbn-cell-actions/**/*.{js,mjs,ts,tsx}', ], plugins: ['eslint-plugin-node', 'react'], @@ -1316,7 +1316,7 @@ module.exports = { 'x-pack/plugins/security_solution_serverless/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/cases/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/ecs_data_quality_dashboard/**/*.{js,mjs,ts,tsx}', - 'x-pack/x-pack/solutions/security/packages/kbn-data-stream-adapter/**/*.{js,mjs,ts,tsx}', + 'x-pack/x-pack/solutions/security/packages/data-stream-adapter/**/*.{js,mjs,ts,tsx}', 'packages/kbn-cell-actions/**/*.{js,mjs,ts,tsx}', ], rules: { diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 39f8dba0e857b..d31a699cf48bc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -993,8 +993,8 @@ x-pack/solutions/security/packages/distribution_bar @elastic/kibana-cloud-securi x-pack/solutions/security/packages/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/expandable-flyout @elastic/security-threat-hunting-investigations x-pack/solutions/security/packages/features @elastic/security-threat-hunting-explore -x-pack/solutions/security/packages/kbn-data-stream-adapter @elastic/security-threat-hunting -x-pack/solutions/security/packages/kbn-index-adapter @elastic/security-threat-hunting +x-pack/solutions/security/packages/data-stream-adapter @elastic/security-threat-hunting +x-pack/solutions/security/packages/index-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/side_nav @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-explore @@ -3352,9 +3352,9 @@ x-pack/solutions/security/packages/ecs_data_quality_dashboard @elastic/security- x-pack/solutions/security/packages/features @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/kbn-cloud-security-posture/graph @elastic/kibana-cloud-security-posture x-pack/solutions/security/packages/kbn-cloud-security-posture/public @elastic/kibana-cloud-security-posture -x-pack/solutions/security/packages/kbn-data-stream-adapter @elastic/security-threat-hunting +x-pack/solutions/security/packages/data-stream-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/expandable-flyout @elastic/security-threat-hunting-investigations -x-pack/solutions/security/packages/kbn-index-adapter @elastic/security-threat-hunting +x-pack/solutions/security/packages/index-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/kbn-securitysolution-autocomplete @elastic/security-detection-engine x-pack/solutions/security/packages/kbn-securitysolution-endpoint-exceptions-common @elastic/security-detection-engine x-pack/solutions/security/packages/kbn-securitysolution-exception-list-components @elastic/security-detection-engine diff --git a/package.json b/package.json index 9dd27fcb8a885..fa0492d33a45e 100644 --- a/package.json +++ b/package.json @@ -428,7 +428,7 @@ "@kbn/data-quality-plugin": "link:x-pack/plugins/data_quality", "@kbn/data-search-plugin": "link:test/plugin_functional/plugins/data_search", "@kbn/data-service": "link:packages/kbn-data-service", - "@kbn/data-stream-adapter": "link:x-pack/solutions/security/packages/kbn-data-stream-adapter", + "@kbn/data-stream-adapter": "link:x-pack/solutions/security/packages/data-stream-adapter", "@kbn/data-usage-plugin": "link:x-pack/platform/plugins/private/data_usage", "@kbn/data-view-editor-plugin": "link:src/plugins/data_view_editor", "@kbn/data-view-field-editor-example-plugin": "link:examples/data_view_field_editor_example", @@ -571,7 +571,7 @@ "@kbn/i18n-react": "link:packages/kbn-i18n-react", "@kbn/iframe-embedded-plugin": "link:x-pack/test/functional_embedded/plugins/iframe_embedded", "@kbn/image-embeddable-plugin": "link:src/plugins/image_embeddable", - "@kbn/index-adapter": "link:x-pack/solutions/security/packages/kbn-index-adapter", + "@kbn/index-adapter": "link:x-pack/solutions/security/packages/index-adapter", "@kbn/index-lifecycle-management-common-shared": "link:x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared", "@kbn/index-lifecycle-management-plugin": "link:x-pack/plugins/index_lifecycle_management", "@kbn/index-management-plugin": "link:x-pack/plugins/index_management", diff --git a/tsconfig.base.json b/tsconfig.base.json index 95029ba072a9d..d9531670631f5 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -710,8 +710,8 @@ "@kbn/data-search-plugin/*": ["test/plugin_functional/plugins/data_search/*"], "@kbn/data-service": ["packages/kbn-data-service"], "@kbn/data-service/*": ["packages/kbn-data-service/*"], - "@kbn/data-stream-adapter": ["x-pack/solutions/security/packages/kbn-data-stream-adapter"], - "@kbn/data-stream-adapter/*": ["x-pack/solutions/security/packages/kbn-data-stream-adapter/*"], + "@kbn/data-stream-adapter": ["x-pack/solutions/security/packages/data-stream-adapter"], + "@kbn/data-stream-adapter/*": ["x-pack/solutions/security/packages/data-stream-adapter/*"], "@kbn/data-usage-plugin": ["x-pack/platform/plugins/private/data_usage"], "@kbn/data-usage-plugin/*": ["x-pack/platform/plugins/private/data_usage/*"], "@kbn/data-view-editor-plugin": ["src/plugins/data_view_editor"], @@ -1048,8 +1048,8 @@ "@kbn/import-locator/*": ["packages/kbn-import-locator/*"], "@kbn/import-resolver": ["packages/kbn-import-resolver"], "@kbn/import-resolver/*": ["packages/kbn-import-resolver/*"], - "@kbn/index-adapter": ["x-pack/solutions/security/packages/kbn-index-adapter"], - "@kbn/index-adapter/*": ["x-pack/solutions/security/packages/kbn-index-adapter/*"], + "@kbn/index-adapter": ["x-pack/solutions/security/packages/index-adapter"], + "@kbn/index-adapter/*": ["x-pack/solutions/security/packages/index-adapter/*"], "@kbn/index-lifecycle-management-common-shared": ["x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared"], "@kbn/index-lifecycle-management-common-shared/*": ["x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared/*"], "@kbn/index-lifecycle-management-plugin": ["x-pack/plugins/index_lifecycle_management"], diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/README.md b/x-pack/solutions/security/packages/data-stream-adapter/README.md similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/README.md rename to x-pack/solutions/security/packages/data-stream-adapter/README.md diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts b/x-pack/solutions/security/packages/data-stream-adapter/index.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/index.ts rename to x-pack/solutions/security/packages/data-stream-adapter/index.ts diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js b/x-pack/solutions/security/packages/data-stream-adapter/jest.config.js similarity index 79% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js rename to x-pack/solutions/security/packages/data-stream-adapter/jest.config.js index 34b19286183dd..a5e7d4348c737 100644 --- a/x-pack/solutions/security/packages/kbn-data-stream-adapter/jest.config.js +++ b/x-pack/solutions/security/packages/data-stream-adapter/jest.config.js @@ -8,5 +8,5 @@ module.exports = { preset: '@kbn/test', rootDir: '../../../../..', - roots: ['/x-pack/solutions/security/packages/kbn-data-stream-adapter'], + roots: ['/x-pack/solutions/security/packages/data-stream-adapter'], }; diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/kibana.jsonc b/x-pack/solutions/security/packages/data-stream-adapter/kibana.jsonc similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/kibana.jsonc rename to x-pack/solutions/security/packages/data-stream-adapter/kibana.jsonc diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/package.json b/x-pack/solutions/security/packages/data-stream-adapter/package.json similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/package.json rename to x-pack/solutions/security/packages/data-stream-adapter/package.json diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts b/x-pack/solutions/security/packages/data-stream-adapter/src/create_or_update_data_stream.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.test.ts rename to x-pack/solutions/security/packages/data-stream-adapter/src/create_or_update_data_stream.test.ts diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts b/x-pack/solutions/security/packages/data-stream-adapter/src/create_or_update_data_stream.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/src/create_or_update_data_stream.ts rename to x-pack/solutions/security/packages/data-stream-adapter/src/create_or_update_data_stream.ts diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts b/x-pack/solutions/security/packages/data-stream-adapter/src/data_stream_adapter.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_adapter.ts rename to x-pack/solutions/security/packages/data-stream-adapter/src/data_stream_adapter.ts diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts b/x-pack/solutions/security/packages/data-stream-adapter/src/data_stream_spaces_adapter.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/src/data_stream_spaces_adapter.ts rename to x-pack/solutions/security/packages/data-stream-adapter/src/data_stream_spaces_adapter.ts diff --git a/x-pack/solutions/security/packages/kbn-data-stream-adapter/tsconfig.json b/x-pack/solutions/security/packages/data-stream-adapter/tsconfig.json similarity index 100% rename from x-pack/solutions/security/packages/kbn-data-stream-adapter/tsconfig.json rename to x-pack/solutions/security/packages/data-stream-adapter/tsconfig.json diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/README.md b/x-pack/solutions/security/packages/index-adapter/README.md similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/README.md rename to x-pack/solutions/security/packages/index-adapter/README.md diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/index.ts b/x-pack/solutions/security/packages/index-adapter/index.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/index.ts rename to x-pack/solutions/security/packages/index-adapter/index.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js b/x-pack/solutions/security/packages/index-adapter/jest.config.js similarity index 80% rename from x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js rename to x-pack/solutions/security/packages/index-adapter/jest.config.js index e823950f27341..5162be5bba837 100644 --- a/x-pack/solutions/security/packages/kbn-index-adapter/jest.config.js +++ b/x-pack/solutions/security/packages/index-adapter/jest.config.js @@ -8,5 +8,5 @@ module.exports = { preset: '@kbn/test', rootDir: '../../../../..', - roots: ['/x-pack/solutions/security/packages/kbn-index-adapter'], + roots: ['/x-pack/solutions/security/packages/index-adapter'], }; diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/kibana.jsonc b/x-pack/solutions/security/packages/index-adapter/kibana.jsonc similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/kibana.jsonc rename to x-pack/solutions/security/packages/index-adapter/kibana.jsonc diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/package.json b/x-pack/solutions/security/packages/index-adapter/package.json similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/package.json rename to x-pack/solutions/security/packages/index-adapter/package.json diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts b/x-pack/solutions/security/packages/index-adapter/src/create_or_update_component_template.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/create_or_update_component_template.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts b/x-pack/solutions/security/packages/index-adapter/src/create_or_update_component_template.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_component_template.ts rename to x-pack/solutions/security/packages/index-adapter/src/create_or_update_component_template.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts b/x-pack/solutions/security/packages/index-adapter/src/create_or_update_index.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/create_or_update_index.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts b/x-pack/solutions/security/packages/index-adapter/src/create_or_update_index.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index.ts rename to x-pack/solutions/security/packages/index-adapter/src/create_or_update_index.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts b/x-pack/solutions/security/packages/index-adapter/src/create_or_update_index_template.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/create_or_update_index_template.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts b/x-pack/solutions/security/packages/index-adapter/src/create_or_update_index_template.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/create_or_update_index_template.ts rename to x-pack/solutions/security/packages/index-adapter/src/create_or_update_index_template.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts b/x-pack/solutions/security/packages/index-adapter/src/field_maps/ecs_field_map.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/ecs_field_map.ts rename to x-pack/solutions/security/packages/index-adapter/src/field_maps/ecs_field_map.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts b/x-pack/solutions/security/packages/index-adapter/src/field_maps/mapping_from_field_map.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/field_maps/mapping_from_field_map.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts b/x-pack/solutions/security/packages/index-adapter/src/field_maps/mapping_from_field_map.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/mapping_from_field_map.ts rename to x-pack/solutions/security/packages/index-adapter/src/field_maps/mapping_from_field_map.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts b/x-pack/solutions/security/packages/index-adapter/src/field_maps/types.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/field_maps/types.ts rename to x-pack/solutions/security/packages/index-adapter/src/field_maps/types.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts b/x-pack/solutions/security/packages/index-adapter/src/index_adapter.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/index_adapter.ts rename to x-pack/solutions/security/packages/index-adapter/src/index_adapter.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts b/x-pack/solutions/security/packages/index-adapter/src/index_pattern_adapter.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/index_pattern_adapter.ts rename to x-pack/solutions/security/packages/index-adapter/src/index_pattern_adapter.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts b/x-pack/solutions/security/packages/index-adapter/src/install_with_timeout.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/install_with_timeout.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts b/x-pack/solutions/security/packages/index-adapter/src/install_with_timeout.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/install_with_timeout.ts rename to x-pack/solutions/security/packages/index-adapter/src/install_with_timeout.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts b/x-pack/solutions/security/packages/index-adapter/src/resource_installer_utils.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/resource_installer_utils.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts b/x-pack/solutions/security/packages/index-adapter/src/resource_installer_utils.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/resource_installer_utils.ts rename to x-pack/solutions/security/packages/index-adapter/src/resource_installer_utils.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts b/x-pack/solutions/security/packages/index-adapter/src/retry_transient_es_errors.test.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.test.ts rename to x-pack/solutions/security/packages/index-adapter/src/retry_transient_es_errors.test.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts b/x-pack/solutions/security/packages/index-adapter/src/retry_transient_es_errors.ts similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/src/retry_transient_es_errors.ts rename to x-pack/solutions/security/packages/index-adapter/src/retry_transient_es_errors.ts diff --git a/x-pack/solutions/security/packages/kbn-index-adapter/tsconfig.json b/x-pack/solutions/security/packages/index-adapter/tsconfig.json similarity index 100% rename from x-pack/solutions/security/packages/kbn-index-adapter/tsconfig.json rename to x-pack/solutions/security/packages/index-adapter/tsconfig.json diff --git a/yarn.lock b/yarn.lock index a0620d0102b12..aa72930d0834f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5236,7 +5236,7 @@ version "0.0.0" uid "" -"@kbn/data-stream-adapter@link:x-pack/solutions/security/packages/kbn-data-stream-adapter": +"@kbn/data-stream-adapter@link:x-pack/solutions/security/packages/data-stream-adapter": version "0.0.0" uid "" @@ -5912,7 +5912,7 @@ version "0.0.0" uid "" -"@kbn/index-adapter@link:x-pack/solutions/security/packages/kbn-index-adapter": +"@kbn/index-adapter@link:x-pack/solutions/security/packages/index-adapter": version "0.0.0" uid "" From bf3a05e3a886c6f35463bab6492f11836e578484 Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Fri, 13 Dec 2024 00:02:30 +0000 Subject: [PATCH 5/5] [CI] Auto-commit changed files from 'node scripts/generate codeowners' --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d31a699cf48bc..25eb595f45da7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -989,11 +989,11 @@ x-pack/solutions/observability/plugins/synthetics/e2e @elastic/obs-ux-management x-pack/solutions/observability/plugins/uptime @elastic/obs-ux-management-team x-pack/solutions/observability/plugins/ux @elastic/obs-ux-management-team x-pack/solutions/security/packages/data_table @elastic/security-threat-hunting-investigations +x-pack/solutions/security/packages/data-stream-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/distribution_bar @elastic/kibana-cloud-security-posture x-pack/solutions/security/packages/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/expandable-flyout @elastic/security-threat-hunting-investigations x-pack/solutions/security/packages/features @elastic/security-threat-hunting-explore -x-pack/solutions/security/packages/data-stream-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/index-adapter @elastic/security-threat-hunting x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-explore x-pack/solutions/security/packages/side_nav @elastic/security-threat-hunting-explore