Update ES client to 7.16-canary.7

package.json

@@ -97,7 +97,7 @@
     "@elastic/apm-rum-react": "^1.3.1",
     "@elastic/charts": "38.0.2",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
-    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^7.16.0-canary.4",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^7.16.0-canary.7",
     "@elastic/ems-client": "7.16.0",
     "@elastic/eui": "39.1.2",
     "@elastic/filesaver": "1.1.2",

packages/kbn-es-query/src/kuery/functions/geo_bounding_box.test.ts

@@ -109,7 +109,6 @@ describe('kuery functions', () => {
         const node = nodeTypes.function.buildNode('geoBoundingBox', 'geo', params);
         const result = geoBoundingBox.toElasticsearchQuery(node, indexPattern);
 
-        // @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoBoundingBoxQuery
         expect(result.geo_bounding_box!.ignore_unmapped).toBe(true);
       });
 

packages/kbn-es-query/src/kuery/functions/geo_bounding_box.ts

@@ -53,7 +53,6 @@ export function toElasticsearchQuery(
   }
 
   return {
-    // @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoBoundingBoxQuery
     geo_bounding_box: {
       [fieldName]: queryParams,
       ignore_unmapped: true,

packages/kbn-es-query/src/kuery/functions/geo_polygon.ts

@@ -49,7 +49,6 @@ export function toElasticsearchQuery(
   }
 
   return {
-    // @ts-expect-error @elastic/elasticsearch doesn't support ignore_unmapped in QueryDslGeoPolygonQuery
     geo_polygon: {
       [fieldName]: queryParams,
       ignore_unmapped: true,

packages/kbn-securitysolution-es-utils/src/delete_policy/index.ts

@@ -12,8 +12,5 @@ export const deletePolicy = async (
   esClient: ElasticsearchClient,
   policy: string
 ): Promise<unknown> => {
-  return (
-    // @ts-expect-error policy_id is required by mistake. fixed in the v8.0
-    (await esClient.ilm.deleteLifecycle({ policy })).body
-  );
+  return (await esClient.ilm.deleteLifecycle({ policy })).body;
 };

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

@@ -164,7 +164,7 @@ describe('ElasticIndex', () => {
       client.tasks.get.mockResolvedValue(
         elasticsearchClientMock.createSuccessTransportRequestPromise({
           completed: true,
-        } as estypes.TaskGetResponse)
+        } as estypes.TasksGetResponse)
       );
 
       const info = {
@@ -248,7 +248,7 @@ describe('ElasticIndex', () => {
             reason: 'all shards failed',
             failed_shards: [],
           },
-        } as estypes.TaskGetResponse)
+        } as estypes.TasksGetResponse)
       );
 
       const info = {

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

@@ -450,7 +450,7 @@ function withIndex(
   client.tasks.get.mockReturnValue(
     elasticsearchClientMock.createSuccessTransportRequestPromise({
       completed: true,
-    } as estypes.TaskGetResponse)
+    } as estypes.TasksGetResponse)
   );
   client.search.mockReturnValue(
     elasticsearchClientMock.createSuccessTransportRequestPromise(searchResult(0) as any)

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

@@ -242,7 +242,7 @@ const mockV2MigrationOptions = () => {
       error: undefined,
       failures: [],
       task: { description: 'task description' } as any,
-    } as estypes.TaskGetResponse)
+    } as estypes.TasksGetResponse)
   );
 
   options.client.search = jest

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

@@ -100,7 +100,7 @@ export const createIndex = ({
            * - acknowledged=true, shards_acknowledged=true, index creation complete
            */
           return Either.right({
-            acknowledged: res.body.acknowledged,
+            acknowledged: Boolean(res.body.acknowledged),
             shardsAcknowledged: res.body.shards_acknowledged,
           });
         })

src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts

@@ -49,7 +49,7 @@ export function getSortingParams(
         {
           [sortField]: {
             order: sortOrder,
-            unmapped_type: rootField.type,
+            unmapped_type: rootField.type as estypes.MappingFieldType,
           },
         },
       ],
@@ -73,7 +73,7 @@ export function getSortingParams(
       {
         [key]: {
           order: sortOrder,
-          unmapped_type: field.type,
+          unmapped_type: field.type as estypes.MappingFieldType,
         },
       },
     ],

src/core/server/saved_objects/service/lib/update_objects_spaces.ts

@@ -259,7 +259,6 @@ export async function updateObjectsSpaces({
         // @ts-expect-error BulkOperation.retry_on_conflict, BulkOperation.routing. BulkOperation.version, and BulkOperation.version_type are optional
         bulkOperationParams.push({ update: documentMetadata }, { doc: documentToSave });
       } else {
-        // @ts-expect-error BulkOperation.retry_on_conflict, BulkOperation.routing. BulkOperation.version, and BulkOperation.version_type are optional
         bulkOperationParams.push({ delete: documentMetadata });
       }
     }

src/plugins/data_views/server/fetcher/lib/field_capabilities/field_caps_response.ts

@@ -116,7 +116,6 @@ export function readFieldCapsResponse(
             }),
             {}
           ),
-          // @ts-expect-error
           metadata_field: capsByType[types[0]].metadata_field,
         };
         // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes
@@ -133,7 +132,6 @@ export function readFieldCapsResponse(
         searchable: isSearchable,
         aggregatable: isAggregatable,
         readFromDocValues: shouldReadFieldFromDocValues(isAggregatable, esType),
-        // @ts-expect-error
         metadata_field: capsByType[types[0]].metadata_field,
       };
       // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes

x-pack/plugins/actions/server/cleanup_failed_executions/lib/extract_bulk_response_delete_failures.ts

@@ -7,7 +7,7 @@
 
 import { ApiResponse, estypes } from '@elastic/elasticsearch';
 
-type ResponseFailures = Array<Pick<estypes.BulkDeleteResponseItem, '_id' | 'status' | 'result'>>;
+type ResponseFailures = Array<Pick<estypes.BulkResponseItem, '_id' | 'status' | 'result'>>;
 
 export function extractBulkResponseDeleteFailures(
   response: ApiResponse<estypes.BulkResponse, unknown>

x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/Waterfall/waterfall_helpers/waterfall_helpers.ts

@@ -271,14 +271,15 @@ const getWaterfallDuration = (waterfallItems: IWaterfallItem[]) =>
 
 const getWaterfallItems = (items: TraceAPIResponse['traceDocs']) =>
   items.map((item) => {
+    // @ts-expect-error processor doesn't exist on Profile
     const docType = item.processor.event;
     switch (docType) {
       case 'span':
         return getSpanItem(item as Span);
       case 'transaction':
         return getTransactionItem(item as Transaction);
     }
-  });
+  }) as IWaterfallSpanOrTransaction[];
 
 function reparentSpans(waterfallItems: IWaterfallSpanOrTransaction[]) {
   // find children that needs to be re-parented and map them to their correct parent id

x-pack/plugins/apm/server/lib/alerts/register_error_count_alert_type.test.ts

@@ -51,6 +51,7 @@ describe('Error count alert', () => {
     const params = { threshold: 2, windowSize: 5, windowUnit: 'm' };
 
     services.scopedClusterClient.asCurrentUser.search.mockReturnValue(
+      // @ts-expect-error not full interface
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         hits: {
           hits: [],

x-pack/plugins/apm/server/lib/alerts/register_transaction_error_rate_alert_type.test.ts

@@ -58,6 +58,7 @@ describe('Transaction error rate alert', () => {
     });
 
     services.scopedClusterClient.asCurrentUser.search.mockReturnValue(
+      // @ts-expect-error not full interface
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         hits: {
           hits: [],

x-pack/plugins/apm/server/lib/errors/get_error_group_sample.ts

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import type { estypes } from '@elastic/elasticsearch';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import {
   ERROR_GROUP_ID,
@@ -55,9 +55,9 @@ export async function getErrorGroupSample({
         },
       },
       sort: asMutableArray([
-        { _score: 'desc' }, // sort by _score first to ensure that errors with transaction.sampled:true ends up on top
-        { '@timestamp': { order: 'desc' } }, // sort by timestamp to get the most recent error
-      ] as const),
+        { _score: { order: 'desc' as const } }, // sort by _score first to ensure that errors with transaction.sampled:true ends up on top
+        { '@timestamp': { order: 'desc' as const } }, // sort by timestamp to get the most recent error
+      ]) as estypes.SearchSortCombinations[],
     },
   };
 

x-pack/plugins/apm/server/lib/search_strategies/queries/field_stats/get_boolean_field_stats.ts

@@ -66,9 +66,9 @@ export const fetchBooleanFieldStats = async (
     termFilters
   );
   const { body } = await esClient.search(request);
-  const aggregations = body.aggregations as {
+  const aggregations = body.aggregations as unknown as {
     sample: {
-      sampled_value_count: estypes.AggregationsFiltersBucketItemKeys;
+      sampled_value_count: estypes.AggregationsFiltersBucketItem;
       sampled_values: estypes.AggregationsTermsAggregate<TopValueBucket>;
     };
   };

x-pack/plugins/apm/server/lib/search_strategies/queries/field_stats/get_keyword_field_stats.ts

@@ -66,7 +66,7 @@ export const fetchKeywordFieldStats = async (
     termFilters
   );
   const { body } = await esClient.search(request);
-  const aggregations = body.aggregations as {
+  const aggregations = body.aggregations as unknown as {
     sample: {
       sampled_top: estypes.AggregationsTermsAggregate<TopValueBucket>;
     };

x-pack/plugins/apm/server/lib/search_strategies/queries/field_stats/get_numeric_field_stats.ts

@@ -87,7 +87,7 @@ export const fetchNumericFieldStats = async (
   );
   const { body } = await esClient.search(request);
 
-  const aggregations = body.aggregations as {
+  const aggregations = body.aggregations as unknown as {
     sample: {
       sampled_top: estypes.AggregationsTermsAggregate<TopValueBucket>;
       sampled_percentiles: estypes.AggregationsHdrPercentilesAggregate;

x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts

@@ -36,7 +36,6 @@ const mappings: Mappings = {
   dynamic_templates: [
     {
       // force string to keyword (instead of default of text + keyword)
-      // @ts-expect-error @elastic/elasticsearch expects here mapping: MappingPropertyBase
       strings: {
         match_mapping_type: 'string',
         mapping: {

x-pack/plugins/fleet/server/services/agents/crud.ts

@@ -315,11 +315,11 @@ export async function bulkUpdateAgents(
   });
 
   return {
-    items: res.body.items.map((item: estypes.BulkResponseItemContainer) => ({
+    // @ts-expect-error ErrorCause is not assignable to Error
+    items: res.body.items.map((item) => ({
       id: item.update!._id as string,
       success: !item.update!.error,
-      // @ts-expect-error ErrorCause is not assignable to Error
-      error: item.update!.error as Error,
+      error: item.update!.error,
     })),
   };
 }

x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.ts

@@ -192,7 +192,6 @@ function putComponentTemplate(
   const { name, body, create = false } = params;
   return {
     clusterPromise: esClient.cluster.putComponentTemplate(
-      // @ts-expect-error body is missing required key `settings`. TemplateMapEntry has settings *or* mappings
       { name, body, create },
       { ignore: [404] }
     ),

x-pack/plugins/index_lifecycle_management/common/types/policies.ts

@@ -212,12 +212,12 @@ export interface IndexLifecyclePolicy {
   index: string;
   managed: boolean;
   action?: string;
-  action_time_millis?: number;
-  age?: string;
+  action_time_millis?: string | number;
+  age?: string | number;
   failed_step?: string;
   failed_step_retry_count?: number;
   is_auto_retryable_error?: boolean;
-  lifecycle_date_millis?: number;
+  lifecycle_date_millis?: string | number;
   phase?: string;
   phase_execution?: {
     policy: string;

x-pack/plugins/index_lifecycle_management/server/plugin.ts

@@ -32,10 +32,10 @@ const indexLifecycleDataEnricher = async (
     index: '*',
   });
 
+  // @ts-expect-error Property 'phase_definition' is missing in type 'IlmExplainLifecycleLifecycleExplainPhaseExecution'
   return indicesList.map((index: IndexWithoutIlm) => {
     return {
       ...index,
-      // @ts-expect-error @elastic/elasticsearch https://github.com/elastic/elasticsearch-specification/issues/531
       ilm: { ...(ilmIndicesData[index.name] || {}) },
     };
   });

x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_delete_route.ts

@@ -17,7 +17,6 @@ async function deletePolicies(client: ElasticsearchClient, policyName: string):
     ignore: [404],
   };
 
-  // @ts-expect-error @elastic/elasticsearch DeleteSnapshotLifecycleRequest.policy_id is required
   return client.ilm.deleteLifecycle({ policy: policyName }, options);
 }
 

x-pack/plugins/index_management/server/lib/fetch_indices.ts

@@ -54,7 +54,6 @@ async function fetchIndicesCall(
         aliases: aliases.length ? aliases : 'none',
         // @ts-expect-error @elastic/elasticsearch https://github.com/elastic/elasticsearch-specification/issues/532
         hidden: index.settings.index.hidden === 'true',
-        // @ts-expect-error @elastic/elasticsearch https://github.com/elastic/elasticsearch-specification/issues/532
         data_stream: index.data_stream!,
       });
     }

x-pack/plugins/index_management/server/routes/api/templates/lib.ts

@@ -54,7 +54,6 @@ export const saveTemplate = async ({
 
     return await client.asCurrentUser.indices.putTemplate({
       name: template.name,
-      // @ts-expect-error @elastic/elasticsearch https://github.com/elastic/elasticsearch-specification/issues/533
       order,
       include_type_name,
       body: {

x-pack/plugins/index_management/server/routes/api/templates/register_simulate_route.ts

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import type { estypes } from '@elastic/elasticsearch';
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { RouteDependencies } from '../../../types';
@@ -31,7 +31,7 @@ export function registerSimulateRoute({ router, lib: { handleEsError } }: RouteD
             // Issue: https://github.com/elastic/elasticsearch/issues/59152
             index_patterns: ['a_fake_index_pattern_that_wont_match_any_indices'],
           },
-        });
+        } as estypes.IndicesSimulateTemplateRequest);
 
         return response.ok({ body: templatePreview });
       } catch (error) {

x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.test.tsx

@@ -54,7 +54,7 @@ describe('ExpressionChart', () => {
         metricAlias: 'metricbeat-*',
         inventoryDefaultView: 'host',
         metricsExplorerDefaultView: 'host',
-
+        // @ts-ignore message is missing
         fields: {
           timestamp: '@timestamp',
           container: 'container.id',

x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/create_uptime_link.test.ts

@@ -10,6 +10,7 @@ import { InfraWaffleMapOptions, InfraFormatterType } from '../../../../lib/lib';
 import { SnapshotMetricType } from '../../../../../common/inventory_models/types';
 
 const options: InfraWaffleMapOptions = {
+  // @ts-ignore message is missing
   fields: {
     container: 'container.id',
     pod: 'kubernetes.pod.uid',

x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts

@@ -10,8 +10,8 @@ import { fold, map } from 'fp-ts/lib/Either';
 import { constant, identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import * as runtimeTypes from 'io-ts';
-import { compact } from 'lodash';
 import { JsonArray } from '@kbn/utility-types';
+import { compact } from 'lodash';
 import type { InfraPluginRequestHandlerContext } from '../../../types';
 import {
   LogEntriesAdapter,
@@ -46,7 +46,7 @@ export class InfraKibanaLogEntriesAdapter implements LogEntriesAdapter {
     const highlightClause = highlightQuery
       ? {
           highlight: {
-            boundary_scanner: 'word',
+            boundary_scanner: 'word' as const,
             fields: fields.reduce(
               (highlightFieldConfigs, fieldName) => ({
                 ...highlightFieldConfigs,

x-pack/plugins/infra/server/lib/alerting/metric_threshold/lib/evaluate_alert.ts

@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { mapValues, first, last, isNaN, isNumber, isObject, has } from 'lodash';
 import moment from 'moment';
 import { ElasticsearchClient } from 'kibana/server';
+import { mapValues, first, last, isNaN, isNumber, isObject, has } from 'lodash';
 import {
   isTooManyBucketsPreviewException,
   TOO_MANY_BUCKETS_PREVIEW_EXCEPTION,
@@ -222,6 +222,7 @@ const getMetric: (
       return groupedResults;
     }
     const { body: result } = await esClient.search({
+      // @ts-expect-error buckets_path is not compatible with @elastic/elasticsearch
       body: searchBody,
       index,
     });