Update @elastic/elasticsearch to 8.0.0-canary13

package.json

@@ -99,7 +99,7 @@
     "@elastic/apm-rum-react": "^1.2.5",
     "@elastic/charts": "29.0.0",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
-    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.7",
     "@elastic/ems-client": "7.13.0",
     "@elastic/eui": "32.1.0",
     "@elastic/filesaver": "1.1.2",

packages/kbn-es-archiver/src/lib/indices/delete_index.ts

@@ -126,7 +126,7 @@ export async function waitForSnapshotCompletion(
   const { body: repositoryMap } = await client.snapshot.getRepository({} as any);
   for (const repository of Object.keys(repositoryMap)) {
     const allInProgress = await getInProgressSnapshots(repository);
-    const found = allInProgress.find((s: any) => s.indices.includes(index));
+    const found = allInProgress?.find((s: any) => s.indices.includes(index));
 
     if (!found) {
       continue;

src/core/server/saved_objects/mappings/lib/get_property.test.ts

@@ -34,7 +34,7 @@ const MAPPINGS = {
       },
     },
   },
-};
+} as const;
 
 function runTest(key: string | string[], mapping: IndexMapping | SavedObjectsFieldMapping) {
   expect(typeof key === 'string' || Array.isArray(key)).toBeTruthy();

src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts

@@ -15,7 +15,7 @@ test(`returns single object with properties`, () => {
         properties: {},
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -32,7 +32,7 @@ test(`returns single object with type === 'object'`, () => {
         type: 'object',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -75,7 +75,7 @@ test(`returns two objects with type === 'object'`, () => {
         type: 'object',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -95,7 +95,7 @@ test(`excludes objects without properties and type of keyword`, () => {
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({});
@@ -111,7 +111,7 @@ test(`excludes two objects without properties and type of keyword`, () => {
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({});
@@ -127,7 +127,7 @@ test(`includes one object with properties and excludes one object without proper
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -147,7 +147,7 @@ test(`includes one object with type === 'object' and excludes one object without
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -170,7 +170,7 @@ test('excludes references and migrationVersion which are part of the blacklist',
         type: 'object',
       },
     },
-  };
+  } as const;
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
     foo: {

src/core/server/saved_objects/mappings/types.ts

@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { estypes } from '@elastic/elasticsearch';
 /**
  * Describe a saved object type mapping.
  *
@@ -120,18 +121,17 @@ export interface IndexMappingMeta {
  *
  * @public
  */
-export interface SavedObjectsCoreFieldMapping {
-  type: string;
-  null_value?: number | boolean | string;
-  index?: boolean;
-  doc_values?: boolean;
-  fields?: {
-    [subfield: string]: {
-      type: string;
-      ignore_above?: number;
-    };
-  };
-}
+export type SavedObjectsCoreFieldMapping = estypes.Property & {
+  /**
+   * The dynamic property of the mapping, either `false` or `'strict'`. If
+   * unspecified `dynamic: 'strict'` will be inherited from the top-level
+   * index mappings.
+   *
+   * Note: To limit the number of mapping fields Saved Object types should
+   * *never* use `dynamic: true`.
+   */
+  dynamic?: false | 'strict';
+};
 
 /**
  * See {@link SavedObjectsFieldMapping} for documentation.

src/core/server/saved_objects/migrations/core/build_active_mappings.test.ts

@@ -19,19 +19,19 @@ describe('buildActiveMappings', () => {
     const properties = {
       aaa: { type: 'text' },
       bbb: { type: 'long' },
-    };
+    } as const;
 
     expect(buildActiveMappings(properties)).toMatchSnapshot();
   });
 
   test('disallows duplicate mappings', () => {
-    const properties = { type: { type: 'long' } };
+    const properties = { type: { type: 'long' } } as const;
 
     expect(() => buildActiveMappings(properties)).toThrow(/Cannot redefine core mapping \"type\"/);
   });
 
   test('disallows mappings with leading underscore', () => {
-    const properties = { _hm: { type: 'keyword' } };
+    const properties = { _hm: { type: 'keyword' } } as const;
 
     expect(() => buildActiveMappings(properties)).toThrow(
       /Invalid mapping \"_hm\"\. Mappings cannot start with _/
@@ -60,7 +60,7 @@ describe('buildActiveMappings', () => {
       aaa: { type: 'keyword', fields: { a: { type: 'keyword' }, b: { type: 'text' } } },
       bbb: { fields: { b: { type: 'text' }, a: { type: 'keyword' } }, type: 'keyword' },
       ccc: { fields: { b: { type: 'text' }, a: { type: 'text' } }, type: 'keyword' },
-    };
+    } as const;
 
     const mappings = buildActiveMappings(properties);
     const hashes = mappings._meta!.migrationMappingPropertyHashes!;

src/core/server/saved_objects/migrations/core/build_index_map.test.ts

@@ -36,7 +36,7 @@ test('mappings without index pattern goes to default index', () => {
       type1: {
         properties: {
           field1: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
@@ -48,7 +48,7 @@ test('mappings without index pattern goes to default index', () => {
         type1: {
           properties: {
             field1: {
-              type: 'string',
+              type: 'text',
             },
           },
         },
@@ -69,7 +69,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
       type1: {
         properties: {
           field1: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
@@ -81,7 +81,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
         type1: {
           properties: {
             field1: {
-              type: 'string',
+              type: 'text',
             },
           },
         },
@@ -103,7 +103,7 @@ test('creating a script gets added to the index pattern', () => {
       type1: {
         properties: {
           field1: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
@@ -116,7 +116,7 @@ test('creating a script gets added to the index pattern', () => {
         type1: {
           properties: {
             field1: {
-              type: 'string',
+              type: 'text',
             },
           },
         },
@@ -144,18 +144,18 @@ test('throws when two scripts are defined for an index pattern', () => {
     type1: {
       properties: {
         field1: {
-          type: 'string',
+          type: 'text',
         },
       },
     },
     type2: {
       properties: {
         field1: {
-          type: 'string',
+          type: 'text',
         },
       },
     },
-  };
+  } as const;
   expect(() =>
     createIndexMap({
       kibanaIndexName: defaultIndex,

src/core/server/saved_objects/migrations/core/elastic_index.test.ts

@@ -40,7 +40,7 @@ describe('ElasticIndex', () => {
         return elasticsearchClientMock.createSuccessTransportRequestPromise({
           [index]: {
             aliases: { foo: index },
-            mappings: { dynamic: 'strict', properties: { a: 'b' } },
+            mappings: { dynamic: 'strict', properties: { a: 'b' } as any },
             settings: {},
           },
         } as estypes.GetIndexResponse);
@@ -175,7 +175,7 @@ describe('ElasticIndex', () => {
           dynamic: 'strict' as const,
           properties: { foo: { type: 'keyword' } },
         },
-      };
+      } as const;
 
       await Index.convertToAlias(
         client,

src/core/server/saved_objects/migrations/core/elastic_index.ts

@@ -261,6 +261,7 @@ export async function createIndex(
   mappings?: IndexMapping
 ) {
   await client.indices.create({
+    // @ts-expect-error @elastic-elasticsearch types don't support nested properties
     body: { mappings, settings },
     index,
   });
@@ -283,6 +284,7 @@ export async function convertToAlias(
   script?: string
 ) {
   await client.indices.create({
+    // @ts-expect-error @elastic-elasticsearch types don't support nested properties
     body: { mappings: info.mappings, settings },
     index: info.indexName,
   });
@@ -406,7 +408,6 @@ async function reindex(
       task_id: String(task),
     });
 
-    // @ts-expect-error @elastic/elasticsearch GetTaskResponse doesn't contain `error` property
     const e = body.error;
     if (e) {
       throw new Error(`Re-index failed [${e.type}] ${e.reason} :: ${JSON.stringify(e)}`);

src/core/server/saved_objects/migrations/core/migration_context.test.ts

@@ -31,7 +31,7 @@ describe('disableUnknownTypeMappingFields', () => {
         },
       },
     },
-  };
+  } as const;
   const activeMappings = {
     _meta: {
       migrationMappingPropertyHashes: {
@@ -46,7 +46,7 @@ describe('disableUnknownTypeMappingFields', () => {
         },
       },
     },
-  };
+  } as const;
   const targetMappings = disableUnknownTypeMappingFields(activeMappings, sourceMappings);
 
   it('disables complex field mappings from unknown types in the source mappings', () => {

src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts

@@ -362,7 +362,11 @@ const mockV2MigrationOptions = () => {
     )
   );
   options.client.indices.addBlock.mockReturnValue(
-    elasticsearchClientMock.createSuccessTransportRequestPromise({ acknowledged: true })
+    elasticsearchClientMock.createSuccessTransportRequestPromise({
+      acknowledged: true,
+      shards_acknowledged: true,
+      indices: [],
+    })
   );
   options.client.reindex.mockReturnValue(
     elasticsearchClientMock.createSuccessTransportRequestPromise({

src/core/server/saved_objects/migrationsv2/actions/index.ts

@@ -305,7 +305,7 @@ export const cloneIndex = (
 };
 
 interface WaitForTaskResponse {
-  error: Option.Option<{ type: string; reason: string; index: string }>;
+  error: Option.Option<{ type: string; reason: string; index?: string }>;
   completed: boolean;
   failures: Option.Option<any[]>;
   description?: string;
@@ -367,7 +367,6 @@ const waitForTask = (
       const failures = body.response?.failures ?? [];
       return Either.right({
         completed: body.completed,
-        // @ts-expect-error @elastic/elasticsearch GetTaskResponse doesn't declare `error` property
         error: Option.fromNullable(body.error),
         failures: failures.length > 0 ? Option.some(failures) : Option.none,
         description: body.task.description,
@@ -523,7 +522,7 @@ export const waitForReindexTask = flow(
         if (res.error.value.type === 'index_not_found_exception') {
           return TaskEither.left({
             type: 'index_not_found_exception' as const,
-            index: res.error.value.index,
+            index: res.error.value.index!,
           });
         } else {
           throw new Error('Reindex failed with the following error:\n' + JSON.stringify(res.error));
@@ -720,6 +719,7 @@ export const createIndex = (
           // started
           timeout: DEFAULT_TIMEOUT,
           body: {
+            // @ts-expect-error @elastic-elasticsearch types don't support nested properties
             mappings,
             aliases: aliasesObject,
             settings: {
@@ -813,6 +813,7 @@ export const updateAndPickupMappings = (
       .putMapping({
         index,
         timeout: DEFAULT_TIMEOUT,
+        // @ts-expect-error @elastic-elasticsearch types don't support nested properties
         body: mappings,
       })
       .then((res) => {

src/core/server/saved_objects/migrationsv2/model.test.ts

@@ -210,7 +210,7 @@ describe('migrations v2 model', () => {
             disabled_saved_object_type: '7997cf5a56cc02bdc9c93361bde732b0',
           },
         },
-      };
+      } as const;
 
       test('INIT -> OUTDATED_DOCUMENTS_SEARCH if .kibana is already pointing to the target index', () => {
         const res: ResponseType<'INIT'> = Either.right({
@@ -657,7 +657,7 @@ describe('migrations v2 model', () => {
             disabled_saved_object_type: '7997cf5a56cc02bdc9c93361bde732b0',
           },
         },
-      };
+      } as const;
 
       const waitForYellowSourceState: WaitForYellowSourceState = {
         ...baseState,

src/core/server/saved_objects/saved_objects_type_registry.ts

@@ -33,7 +33,7 @@ export class SavedObjectTypeRegistry {
       throw new Error(`Type '${type.name}' is already registered`);
     }
     validateType(type);
-    this.types.set(type.name, deepFreeze(type));
+    this.types.set(type.name, deepFreeze(type) as SavedObjectsType);
   }
 
   /**