From 9a02be474a1e7d4c7c36fcc56461c4291fe48114 Mon Sep 17 00:00:00 2001 From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Date: Mon, 4 Apr 2022 05:36:14 -0400 Subject: [PATCH] Update @elastic/elasticsearch to v8.2.0-canary.2 (#128633) (#129287) * Update @elastic/elasticsearch to v8.2.0-canary.2 * fix core violation * add optional properties to our type * update generated doc * add another ts-ignore * remove unused ts-expect-error * add ts-expect-error for type typo * add ts-expect-error infra code * fix more errors (cherry picked from commit 158c6170ae0c584eb1cf3a1473fcf0506d948a2e) Co-authored-by: Pierre Gayvallet --- .../kibana-plugin-core-server.savedobjectsfieldmapping.md | 1 + package.json | 2 +- src/core/server/saved_objects/mappings/types.ts | 5 +++++ src/core/server/server.api.md | 1 + .../get_data_telemetry/get_data_telemetry.ts | 1 + .../plugins/enterprise_search/server/lib/fetch_indices.ts | 1 - .../plugins/index_management/server/lib/fetch_indices.ts | 1 - .../lib/adapters/framework/kibana_framework_adapter.ts | 1 + .../server/models/data_frame_analytics/models_provider.ts | 1 + .../detection_engine/migrations/create_migration_index.ts | 2 +- yarn.lock | 8 ++++---- 11 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md index 85b52bacafa25..cf5b5d7e6e339 100644 --- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md +++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md @@ -13,5 +13,6 @@ Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/el ```typescript export declare type SavedObjectsFieldMapping = estypes.MappingProperty & { dynamic?: false | 'strict'; + properties?: Record; }; ``` diff --git a/package.json b/package.json index ca07b15277735..b6183525bb3a0 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace", "@elastic/charts": "45.1.1", "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath", - "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.1", + "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.2.0-canary.2", "@elastic/ems-client": "8.2.0", "@elastic/eui": "53.0.1", "@elastic/filesaver": "1.1.2", diff --git a/src/core/server/saved_objects/mappings/types.ts b/src/core/server/saved_objects/mappings/types.ts index e225d0ff31022..3fc088d0e82c4 100644 --- a/src/core/server/saved_objects/mappings/types.ts +++ b/src/core/server/saved_objects/mappings/types.ts @@ -107,6 +107,11 @@ export type SavedObjectsFieldMapping = estypes.MappingProperty & { * *never* use `dynamic: true`. */ dynamic?: false | 'strict'; + /** + * Some mapping types do not accept the `properties` attributes. Explicitly adding it as optional to our type + * to avoid type failures on all code using accessing them via `SavedObjectsFieldMapping.properties`. + */ + properties?: Record; }; /** @internal */ diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md index c89a5fc89d2fa..7337a3809172e 100644 --- a/src/core/server/server.api.md +++ b/src/core/server/server.api.md @@ -2366,6 +2366,7 @@ export interface SavedObjectsExportTransformContext { // @public export type SavedObjectsFieldMapping = estypes.MappingProperty & { dynamic?: false | 'strict'; + properties?: Record; }; // @public (undocumented) diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts index 3f98ead25ff4e..174e200a6c996 100644 --- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts +++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts @@ -228,6 +228,7 @@ export async function getDataTelemetry(esClient: ElasticsearchClient) { const indices = indexNames.map((name) => { const baseIndexInfo = { name, + // @ts-expect-error 'properties' does not exist on type 'MappingMatchOnlyTextProperty' isECS: !!indexMappings[name]?.mappings?.properties?.ecs?.properties?.version?.type, shipper: indexMappings[name]?.mappings?._meta?.beat, packageName: indexMappings[name]?.mappings?._meta?.package?.name, diff --git a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts index 4b8c2612f6467..b355df2c56843 100644 --- a/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts +++ b/x-pack/plugins/enterprise_search/server/lib/fetch_indices.ts @@ -23,7 +23,6 @@ export const fetchIndices = async (client: IScopedClusterClient): Promise { // TODO set node_id to ml:true when elasticsearch client is updated. + // @ts-expect-error typo in type definition: MlGetMemoryStatsResponse.cluser_name const response = (await mlClient.getMemoryStats()) as MemoryStatsResponse; const { trained_model_stats: trainedModelStats } = await mlClient.getTrainedModelsStats({ diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts index 0c3da2a114595..b1f1ecf85746a 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/migrations/create_migration_index.ts @@ -37,8 +37,8 @@ export const createMigrationIndex = async ({ body: { settings: { index: { + // @ts-expect-error `name` is required on IndicesIndexSettingsLifecycle lifecycle: { - // @ts-expect-error typings don't contain the property yet indexing_complete: true, }, }, diff --git a/yarn.lock b/yarn.lock index f90363032c43b..eca2c6c07f4ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,10 +1485,10 @@ dependencies: "@elastic/ecs-helpers" "^1.1.0" -"@elastic/elasticsearch@npm:@elastic/elasticsearch-canary@8.2.0-canary.1": - version "8.2.0-canary.1" - resolved "https://registry.yarnpkg.com/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.2.0-canary.1.tgz#da547aaf0a39846cda4484bc021dea2117acaf0c" - integrity sha512-MxDCQjcKgxQulX+PJiPWdwFJwYq5J1EVycU5EaE1sDODLnnJp5dvQFPtRRla9MM5Elyy52swtfzQA5ktGixyRg== +"@elastic/elasticsearch@npm:@elastic/elasticsearch-canary@8.2.0-canary.2": + version "8.2.0-canary.2" + resolved "https://registry.yarnpkg.com/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.2.0-canary.2.tgz#2513926cdbfe7c070e1fa6926f7829171b27cdba" + integrity sha512-Ki2lQ3/UlOnBaf5EjNw0WmCdXiW+J020aYtdVnIuCNhPSLoNPKoM7P+MlggdfeRnENvINlStrMy4bkYF/h6Vbw== dependencies: "@elastic/transport" "^8.0.2" tslib "^2.3.0"