Update ES client to 8.1.0-canary.2

docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md

@@ -30,7 +30,7 @@ export interface SavedObjectsFindOptions
 |  [searchAfter?](./kibana-plugin-core-public.savedobjectsfindoptions.searchafter.md) | estypes.Id\[\] | <i>(Optional)</i> Use the sort values from the previous page to retrieve the next page of results. |
 |  [searchFields?](./kibana-plugin-core-public.savedobjectsfindoptions.searchfields.md) | string\[\] | <i>(Optional)</i> The fields to perform the parsed query against. See Elasticsearch Simple Query String <code>fields</code> argument for more information |
 |  [sortField?](./kibana-plugin-core-public.savedobjectsfindoptions.sortfield.md) | string | <i>(Optional)</i> |
-|  [sortOrder?](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | estypes.SearchSortOrder | <i>(Optional)</i> |
+|  [sortOrder?](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | estypes.SortOrder | <i>(Optional)</i> |
 |  [type](./kibana-plugin-core-public.savedobjectsfindoptions.type.md) | string \| string\[\] |  |
 |  [typeToNamespacesMap?](./kibana-plugin-core-public.savedobjectsfindoptions.typetonamespacesmap.md) | Map&lt;string, string\[\] \| undefined&gt; | <i>(Optional)</i> This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the <code>type</code> and <code>namespaces</code> fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
 

docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-sortOrder?: estypes.SearchSortOrder;
+sortOrder?: estypes.SortOrder;
 ```

docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md

@@ -30,7 +30,7 @@ export interface SavedObjectsFindOptions
 |  [searchAfter?](./kibana-plugin-core-server.savedobjectsfindoptions.searchafter.md) | estypes.Id\[\] | <i>(Optional)</i> Use the sort values from the previous page to retrieve the next page of results. |
 |  [searchFields?](./kibana-plugin-core-server.savedobjectsfindoptions.searchfields.md) | string\[\] | <i>(Optional)</i> The fields to perform the parsed query against. See Elasticsearch Simple Query String <code>fields</code> argument for more information |
 |  [sortField?](./kibana-plugin-core-server.savedobjectsfindoptions.sortfield.md) | string | <i>(Optional)</i> |
-|  [sortOrder?](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | estypes.SearchSortOrder | <i>(Optional)</i> |
+|  [sortOrder?](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | estypes.SortOrder | <i>(Optional)</i> |
 |  [type](./kibana-plugin-core-server.savedobjectsfindoptions.type.md) | string \| string\[\] |  |
 |  [typeToNamespacesMap?](./kibana-plugin-core-server.savedobjectsfindoptions.typetonamespacesmap.md) | Map&lt;string, string\[\] \| undefined&gt; | <i>(Optional)</i> This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the <code>type</code> and <code>namespaces</code> fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
 

docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md

@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-sortOrder?: estypes.SearchSortOrder;
+sortOrder?: estypes.SortOrder;
 ```

package.json

@@ -105,7 +105,7 @@
     "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
     "@elastic/charts": "40.1.0",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
-    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.35",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.1.0-canary.2",
     "@elastic/ems-client": "8.0.0",
     "@elastic/eui": "41.2.3",
     "@elastic/filesaver": "1.1.2",

packages/kbn-es-archiver/src/lib/docs/generate_doc_records_stream.ts

@@ -65,7 +65,6 @@ export function createGenerateDocRecordsStream({
                 // when it is loaded it can skip migration, if possible
                 index:
                   hit._index.startsWith('.kibana') && !keepIndexNames ? '.kibana_1' : hit._index,
-                type: hit._type,
                 id: hit._id,
                 source: hit._source,
               },

packages/kbn-rule-data-utils/src/alerts_as_data_rbac.ts

@@ -40,10 +40,10 @@ export const isValidFeatureId = (a: unknown): a is ValidFeatureId =>
  * Ref: https://github.com/elastic/elasticsearch/issues/28806#issuecomment-369303620
  *
  * return stringified Long.MAX_VALUE if we receive Number.MAX_SAFE_INTEGER
- * @param sortIds estypes.SearchSortResults | undefined
+ * @param sortIds estypes.SortResults | undefined
  * @returns SortResults
  */
-export const getSafeSortIds = (sortIds: estypes.SearchSortResults | null | undefined) => {
+export const getSafeSortIds = (sortIds: estypes.SortResults | null | undefined) => {
   if (sortIds == null) {
     return sortIds;
   }

src/core/public/public.api.md

@@ -1498,7 +1498,7 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     sortField?: string;
     // (undocumented)
-    sortOrder?: estypes.SearchSortOrder;
+    sortOrder?: estypes.SortOrder;
     // (undocumented)
     type: string | string[];
     typeToNamespacesMap?: Map<string, string[] | undefined>;

src/core/server/core_usage_data/core_usage_data_service.ts

@@ -13,9 +13,9 @@ import { hasConfigPathIntersection, ChangedDeprecatedPaths } from '@kbn/config';
 
 import { CoreService } from 'src/core/types';
 import { Logger, SavedObjectsServiceStart, SavedObjectTypeRegistry } from 'src/core/server';
-import {
-  AggregationsFiltersAggregate,
-  AggregationsFiltersBucketItem,
+import type {
+  AggregationsMultiBucketAggregateBase,
+  AggregationsSingleBucketAggregateBase,
   SearchTotalHits,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { CoreContext } from '../core_context';
@@ -75,6 +75,13 @@ const kibanaOrTaskManagerIndex = (index: string, kibanaConfigIndex: string) => {
   return index === kibanaConfigIndex ? '.kibana' : '.kibana_task_manager';
 };
 
+interface UsageDataAggs extends AggregationsMultiBucketAggregateBase {
+  buckets: {
+    disabled: AggregationsSingleBucketAggregateBase;
+    active: AggregationsSingleBucketAggregateBase;
+  };
+}
+
 export class CoreUsageDataService
   implements CoreService<InternalCoreUsageDataSetup, CoreUsageDataStart>
 {
@@ -153,7 +160,10 @@ export class CoreUsageDataService
   private async getSavedObjectAliasUsageData(elasticsearch: ElasticsearchServiceStart) {
     // Note: this agg can be changed to use `savedObjectsRepository.find` in the future after `filters` is supported.
     // See src/core/server/saved_objects/service/lib/aggregations/aggs_types/bucket_aggs.ts for supported aggregations.
-    const { body: resp } = await elasticsearch.client.asInternalUser.search({
+    const { body: resp } = await elasticsearch.client.asInternalUser.search<
+      unknown,
+      { aliases: UsageDataAggs }
+    >({
       index: kibanaIndex,
       body: {
         track_total_hits: true,
@@ -179,10 +189,10 @@ export class CoreUsageDataService
 
     const { hits, aggregations } = resp;
     const totalCount = (hits.total as SearchTotalHits).value;
-    const aggregate = aggregations!.aliases as AggregationsFiltersAggregate;
-    const buckets = aggregate.buckets as Record<string, AggregationsFiltersBucketItem>;
-    const disabledCount = buckets.disabled.doc_count as number;
-    const activeCount = buckets.active.doc_count as number;
+    const aggregate = aggregations!.aliases;
+    const buckets = aggregate.buckets;
+    const disabledCount = buckets.disabled.doc_count;
+    const activeCount = buckets.active.doc_count;
     const inactiveCount = totalCount - disabledCount - activeCount;
 
     return { totalCount, disabledCount, activeCount, inactiveCount };

src/core/server/saved_objects/migrations/actions/integration_tests/actions.test.ts

@@ -331,7 +331,7 @@ describe('migration actions', () => {
               // Allocate 1 replica so that this index stays yellow
               number_of_replicas: '1',
               // Disable all shard allocation so that the index status is red
-              'index.routing.allocation.enable': 'none',
+              index: { routing: { allocation: { enable: 'none' } } },
             },
           },
         })
@@ -395,7 +395,7 @@ describe('migration actions', () => {
               // Allocate 1 replica so that this index stays yellow
               number_of_replicas: '1',
               // Disable all shard allocation so that the index status is red
-              'index.routing.allocation.enable': 'none',
+              index: { routing: { allocation: { enable: 'none' } } },
             },
           },
         })
@@ -1450,7 +1450,7 @@ describe('migration actions', () => {
                 // Allocate 1 replica so that this index stays yellow
                 number_of_replicas: '1',
                 // Disable all shard allocation so that the index status is red
-                'index.routing.allocation.enable': 'none',
+                index: { routing: { allocation: { enable: 'none' } } },
               },
             },
           },
@@ -1567,8 +1567,8 @@ describe('migration actions', () => {
         }
       `);
     });
-    // TODO: unskip after https://github.com/elastic/kibana/issues/116111
-    it.skip('resolves left request_entity_too_large_exception when the payload is too large', async () => {
+
+    it('resolves left request_entity_too_large_exception when the payload is too large', async () => {
       const newDocs = new Array(10000).fill({
         _source: {
           title:

src/core/server/saved_objects/migrations/integration_tests/7_13_0_unknown_types.test.ts

@@ -97,8 +97,7 @@ describe('migration v2', () => {
         { index: '.kibana_7.13.0_001' },
         { meta: true }
       );
-      const settings = response['.kibana_7.13.0_001']
-        .settings as estypes.IndicesIndexStatePrefixedSettings;
+      const settings = response['.kibana_7.13.0_001'].settings as estypes.IndicesIndexSettings;
       expect(settings.index).not.toBeUndefined();
       expect(settings.index!.blocks?.write).not.toEqual('true');
     }

src/core/server/saved_objects/migrations/integration_tests/batch_size_bytes_exceeds_es_content_length.test.ts

@@ -20,8 +20,7 @@ async function removeLogFile() {
   await fs.unlink(logFilePath).catch(() => void 0);
 }
 
-// un-skip after https://github.com/elastic/kibana/issues/116111
-describe.skip('migration v2', () => {
+describe('migration v2', () => {
   let esServer: kbnTestServer.TestElasticsearchUtils;
   let root: Root;
   let startES: () => Promise<kbnTestServer.TestElasticsearchUtils>;
@@ -111,7 +110,7 @@ function createRoot(options: { maxBatchSizeBytes?: number }) {
       },
     },
     {
-      oss: true,
+      oss: false,
     }
   );
 }

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

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { MgetHit } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { MgetResponseItem } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import {
   CORE_USAGE_STATS_ID,
@@ -150,7 +150,7 @@ export async function internalBulkResolve<T>(
         return either.value;
       }
       const exactMatchDoc = bulkGetResponse?.body.docs[getResponseIndex++];
-      let aliasMatchDoc: MgetHit<SavedObjectsRawDocSource> | undefined;
+      let aliasMatchDoc: MgetResponseItem<SavedObjectsRawDocSource> | undefined;
       const aliasTargetId = aliasTargetIds[aliasTargetIndex++];
       if (aliasTargetId !== undefined) {
         aliasMatchDoc = bulkGetResponse?.body.docs[getResponseIndex++];

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

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { LegacyUrlAlias, LEGACY_URL_ALIAS_TYPE } from '../../object_types';
 import type { ISavedObjectTypeRegistry } from '../../saved_objects_type_registry';
 import type {
@@ -79,6 +79,10 @@ interface ParsedObject {
   spaces: Set<string>;
 }
 
+function isMgetDoc(doc?: estypes.MgetResponseItem<unknown>): doc is estypes.GetGetResult {
+  return Boolean(doc && 'found' in doc);
+}
+
 /**
  * Conducts pre-flight checks before object creation. Consumers should only check eligible objects (multi-namespace types).
  * For each object that the consumer intends to create, we check for three potential error cases in all applicable spaces:
@@ -139,7 +143,7 @@ export async function preflightCheckForCreate(params: PreflightCheckForCreatePar
         for (let i = 0; i < spaces.size; i++) {
           const aliasDoc = bulkGetResponse?.body.docs[getResponseIndex++];
           const index = aliasSpacesIndex++; // increment whether the alias was found or not
-          if (aliasDoc?.found) {
+          if (isMgetDoc(aliasDoc) && aliasDoc.found) {
             const legacyUrlAlias: LegacyUrlAlias | undefined =
               aliasDoc._source![LEGACY_URL_ALIAS_TYPE]; // if the 'disabled' field is not present, the source will be empty
             if (!legacyUrlAlias?.disabled) {
@@ -160,7 +164,7 @@ export async function preflightCheckForCreate(params: PreflightCheckForCreatePar
       }
 
       let existingDocument: PreflightCheckForCreateResult['existingDocument'];
-      if (objectDoc.found) {
+      if (isMgetDoc(objectDoc) && objectDoc.found) {
         // @ts-expect-error MultiGetHit._source is optional
         if (!rawDocExistsInNamespaces(registry, objectDoc, [...spaces])) {
           const error = {

src/core/server/saved_objects/service/lib/repository.test.ts

@@ -1328,7 +1328,7 @@ describe('SavedObjectsRepository', () => {
     describe('returns', () => {
       const expectSuccessResult = (
         { type, id }: TypeIdTuple,
-        doc: estypes.MgetHit<SavedObjectsRawDocSource>
+        doc: estypes.GetGetResult<SavedObjectsRawDocSource>
       ) => ({
         type,
         id,
@@ -1356,8 +1356,14 @@ describe('SavedObjectsRepository', () => {
         expect(client.mget).toHaveBeenCalledTimes(1);
         expect(result).toEqual({
           saved_objects: [
-            expectSuccessResult(obj1, response.docs[0]),
-            expectSuccessResult(obj2, response.docs[1]),
+            expectSuccessResult(
+              obj1,
+              response.docs[0] as estypes.GetGetResult<SavedObjectsRawDocSource>
+            ),
+            expectSuccessResult(
+              obj2,
+              response.docs[1] as estypes.GetGetResult<SavedObjectsRawDocSource>
+            ),
           ],
         });
       });
@@ -1377,9 +1383,15 @@ describe('SavedObjectsRepository', () => {
         expect(client.mget).toHaveBeenCalledTimes(1);
         expect(result).toEqual({
           saved_objects: [
-            expectSuccessResult(obj1, response.docs[0]),
+            expectSuccessResult(
+              obj1,
+              response.docs[0] as estypes.GetGetResult<SavedObjectsRawDocSource>
+            ),
             expectError(obj),
-            expectSuccessResult(obj2, response.docs[1]),
+            expectSuccessResult(
+              obj2,
+              response.docs[1] as estypes.GetGetResult<SavedObjectsRawDocSource>
+            ),
           ],
         });
       });

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

@@ -196,6 +196,10 @@ interface PreflightCheckNamespacesResult {
   rawDocSource?: GetResponseFound<SavedObjectsRawDocSource>;
 }
 
+function isMgetDoc(doc?: estypes.MgetResponseItem<unknown>): doc is estypes.GetGetResult {
+  return Boolean(doc && 'found' in doc);
+}
+
 /**
  * @public
  */
@@ -647,7 +651,7 @@ export class SavedObjectsRepository {
 
       const { type, id, esRequestIndex } = expectedResult.value;
       const doc = bulkGetResponse?.body.docs[esRequestIndex];
-      if (doc?.found) {
+      if (isMgetDoc(doc) && doc.found) {
         errors.push({
           id,
           type,
@@ -1497,7 +1501,7 @@ export class SavedObjectsRepository {
         if (esRequestIndex !== undefined) {
           const indexFound = bulkGetResponse?.statusCode !== 404;
           const actualResult = indexFound ? bulkGetResponse?.body.docs[esRequestIndex] : undefined;
-          const docFound = indexFound && actualResult?.found === true;
+          const docFound = indexFound && isMgetDoc(actualResult) && actualResult.found;
           if (
             !docFound ||
             // @ts-expect-error MultiGetHit is incorrectly missing _id, _source

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

@@ -26,7 +26,7 @@ interface GetSearchDslOptions {
   rootSearchFields?: string[];
   searchAfter?: estypes.Id[];
   sortField?: string;
-  sortOrder?: estypes.SearchSortOrder;
+  sortOrder?: estypes.SortOrder;
   namespaces?: string[];
   pit?: SavedObjectsPitParams;
   typeToNamespacesMap?: Map<string, string[] | undefined>;

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

@@ -16,8 +16,8 @@ export function getSortingParams(
   mappings: IndexMapping,
   type: string | string[],
   sortField?: string,
-  sortOrder?: estypes.SearchSortOrder
-): { sort?: estypes.SearchSortContainer[] } {
+  sortOrder?: estypes.SortOrder
+): { sort?: estypes.SortCombinations[] } {
   if (!sortField) {
     return {};
   }

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

@@ -120,6 +120,9 @@ type ObjectToDeleteAliasesFor = Pick<
 
 const MAX_CONCURRENT_ALIAS_DELETIONS = 10;
 
+function isMgetError(doc?: estypes.MgetResponseItem<unknown>): doc is estypes.MgetMultiGetError {
+  return Boolean(doc && 'error' in doc);
+}
 /**
  * Gets all references and transitive references of the given objects. Ignores any object and/or reference that is not a multi-namespace
  * type.
@@ -224,15 +227,21 @@ export async function updateObjectsSpaces({
     let versionProperties;
     if (esRequestIndex !== undefined) {
       const doc = bulkGetResponse?.body.docs[esRequestIndex];
-      // @ts-expect-error MultiGetHit._source is optional
-      if (!doc?.found || !rawDocExistsInNamespace(registry, doc, namespace)) {
+      const isErrorDoc = isMgetError(doc);
+
+      if (
+        isErrorDoc ||
+        !doc?.found ||
+        // @ts-expect-error MultiGetHit._source is optional
+        !rawDocExistsInNamespace(registry, doc, namespace)
+      ) {
         const error = errorContent(SavedObjectsErrorHelpers.createGenericNotFoundError(type, id));
         return {
           tag: 'Left',
           value: { id, type, spaces: [], error },
         };
       }
-      currentSpaces = doc._source?.namespaces ?? [];
+      currentSpaces = doc?._source?.namespaces ?? [];
       // @ts-expect-error MultiGetHit._source is optional
       versionProperties = getExpectedVersionProperties(version, doc);
     } else if (spaces?.length === 0) {

src/core/server/saved_objects/types.ts

@@ -81,7 +81,7 @@ export interface SavedObjectsFindOptions {
   page?: number;
   perPage?: number;
   sortField?: string;
-  sortOrder?: estypes.SearchSortOrder;
+  sortOrder?: estypes.SortOrder;
   /**
    * An array of fields to include in the results
    * @example

src/core/server/server.api.md

@@ -2373,7 +2373,7 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     sortField?: string;
     // (undocumented)
-    sortOrder?: estypes.SearchSortOrder;
+    sortOrder?: estypes.SortOrder;
     // (undocumented)
     type: string | string[];
     typeToNamespacesMap?: Map<string, string[] | undefined>;