Elasticsearch-js 9

package.json

@@ -115,7 +115,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/ebt": "^1.1.1",
     "@elastic/ecs": "^8.11.1",
-    "@elastic/elasticsearch": "^8.15.2",
+    "@elastic/elasticsearch": "9.0.0-alpha.1",
     "@elastic/ems-client": "8.5.3",
     "@elastic/eui": "98.1.0-borealis.0",
     "@elastic/eui-theme-borealis": "0.0.4",

packages/core/elasticsearch/core-elasticsearch-server-internal/src/is_scripting_enabled.test.ts

@@ -8,7 +8,7 @@
  */
 
 import { isRetryableEsClientErrorMock } from './is_scripting_enabled.test.mocks';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { isInlineScriptingEnabled } from './is_scripting_enabled';
 

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_delete.test.ts

@@ -18,7 +18,7 @@ import {
 } from '../repository.test.mock';
 
 import type { Payload } from '@hapi/boom';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type {
   SavedObjectsBulkDeleteObject,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_get.isolated.test.ts

@@ -11,7 +11,7 @@ import {
   getSavedObjectFromSourceMock,
   rawDocExistsInNamespaceMock,
 } from './bulk_get.isolated.test.mocks';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { SavedObject, CheckAuthorizationResult } from '@kbn/core-saved-objects-server';
 import { apiContextMock, ApiExecutionContextMock } from '../../mocks';
 import { performBulkGet } from './bulk_get';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_get.test.ts

@@ -15,7 +15,7 @@ import {
 } from '../repository.test.mock';
 
 import type { Payload } from '@hapi/boom';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type { SavedObjectsBulkGetObject } from '@kbn/core-saved-objects-api-server';
 import { type SavedObjectsRawDocSource, type SavedObject } from '@kbn/core-saved-objects-server';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.test.ts

@@ -17,7 +17,7 @@ import {
 } from '../repository.test.mock';
 
 import type { Payload } from '@hapi/boom';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type {
   SavedObjectsBulkUpdateObject,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/check_conflicts.test.ts

@@ -13,7 +13,7 @@ import {
   mockGetSearchDsl,
 } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import { ALL_NAMESPACES_STRING } from '@kbn/core-saved-objects-utils-server';
 import { SavedObjectsRepository } from '../repository';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/create.test.ts

@@ -16,7 +16,7 @@ import {
   mockGetSearchDsl,
 } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type { SavedObjectsCreateOptions } from '@kbn/core-saved-objects-api-server';
 import {

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/delete.test.ts

@@ -16,7 +16,7 @@ import {
   mockGetSearchDsl,
 } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type { SavedObjectsDeleteOptions } from '@kbn/core-saved-objects-api-server';
 import { ALL_NAMESPACES_STRING } from '@kbn/core-saved-objects-utils-server';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/find.isolated.test.ts

@@ -8,7 +8,7 @@
  */
 
 import { isSupportedEsServerMock } from './find.isolated.test.mocks';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { SavedObject, AuthorizationTypeMap } from '@kbn/core-saved-objects-server';
 import { apiContextMock, ApiExecutionContextMock } from '../../mocks';
 import { performFind } from './find';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/find.ts

@@ -8,7 +8,7 @@
  */
 
 import Boom from '@hapi/boom';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { isSupportedEsServer } from '@kbn/core-elasticsearch-server-internal';
 import {
   SavedObjectsErrorHelpers,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/get.test.ts

@@ -15,7 +15,7 @@ import {
   mockGetSearchDsl,
 } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type { SavedObjectsBaseOptions } from '@kbn/core-saved-objects-api-server';
 import { ALL_NAMESPACES_STRING } from '@kbn/core-saved-objects-utils-server';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/increment_counter.test.ts

@@ -16,7 +16,7 @@ import {
   mockGetSearchDsl,
 } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type {
   SavedObjectsIncrementCounterField,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/internals/collect_multi_namespace_references.ts

@@ -185,7 +185,7 @@ async function getObjectsAndReferences({
       );
     }
     const bulkGetResponse = await client.mget(
-      { body: { docs: makeBulkGetDocs(bulkGetObjects) } },
+      { docs: makeBulkGetDocs(bulkGetObjects) },
       { ignore: [404], meta: true }
     );
     // exit early if we can't verify a 404 response is from Elasticsearch

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/internals/internal_bulk_resolve.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import type { MgetResponseItem } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { MgetResponseItem } from '@elastic/elasticsearch/lib/api/types';
 
 import { isNotFoundFromUnsupportedServer } from '@kbn/core-elasticsearch-server-internal';
 import type {

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/internals/preflight_check_for_create.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { isNotFoundFromUnsupportedServer } from '@kbn/core-elasticsearch-server-internal';
 import {
   type ISavedObjectTypeRegistry,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/internals/update_objects_spaces.ts

@@ -8,7 +8,7 @@
  */
 
 import pMap from 'p-map';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import intersection from 'lodash/intersection';
 
 import type { Logger } from '@kbn/logging';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/remove_references_to.test.ts

@@ -15,7 +15,7 @@ import {
   mockGetSearchDsl,
 } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import { SavedObjectsRepository } from '../repository';
 import { loggerMock } from '@kbn/logging-mocks';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts

@@ -11,7 +11,7 @@
 
 import { mockGetCurrentTime, mockPreflightCheckForCreate } from '../repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import {
   type SavedObjectUnsanitizedDoc,
   type SavedObjectReference,
@@ -357,7 +357,7 @@ describe('#update', () => {
           ...mockTimestampFieldsWithCreated,
         };
         expect(
-          (client.create.mock.calls[0][0] as estypes.CreateRequest<SavedObjectsRawDocSource>).body!
+          (client.create.mock.calls[0][0] as estypes.CreateRequest<SavedObjectsRawDocSource>)!
         ).toEqual(expectedType);
       });
 
@@ -403,7 +403,7 @@ describe('#update', () => {
             references,
           });
           expect(
-            (client.index.mock.calls[0][0] as estypes.CreateRequest<SavedObjectsRawDocSource>).body!
+            (client.index.mock.calls[0][0] as estypes.CreateRequest<SavedObjectsRawDocSource>)!
               .references
           ).toEqual([]);
           client.index.mockClear();

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/utils/es_responses.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 /**
  * Type and type guard function for converting a possibly not existent doc to an existent doc.

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/utils/internal_utils.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { Payload } from '@hapi/boom';
 import {
   SavedObjectsErrorHelpers,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/utils/merge_for_update.ts

@@ -9,7 +9,7 @@
 
 import { isPlainObject } from 'lodash';
 import { set } from '@kbn/safer-lodash-set';
-import type { MappingProperty as EsMappingProperty } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { MappingProperty as EsMappingProperty } from '@elastic/elasticsearch/lib/api/types';
 import type {
   SavedObjectsTypeMappingDefinition,
   SavedObjectsFieldMapping,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/point_in_time_finder.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch';
 import type { Logger } from '@kbn/logging';
 import type {
   SavedObjectsFindOptions,

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.encryption_extension.test.ts

@@ -14,7 +14,7 @@ import {
   mockGetSearchDsl,
 } from './repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import { SavedObjectsRepository } from './repository';
 import { loggerMock } from '@kbn/logging-mocks';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts

@@ -18,7 +18,7 @@ import {
   mockDeleteLegacyUrlAliases,
 } from './repository.test.mock';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import { SavedObjectsRepository } from './repository';
 import { loggerMock } from '@kbn/logging-mocks';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/aggregations/validation.test.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { validateAndConvertAggregations } from './validation';
 
 type AggsMap = Record<string, estypes.AggregationsAggregationContainer>;

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/aggregations/validation.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { ObjectType } from '@kbn/config-schema';
 import { isPlainObject, isArray } from 'lodash';
 

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/search_dsl/search_dsl.ts

@@ -9,7 +9,7 @@
 
 import Boom from '@hapi/boom';
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type { SavedObjectsPitParams } from '@kbn/core-saved-objects-api-server';
 import type { ISavedObjectTypeRegistry } from '@kbn/core-saved-objects-server';
 import type { IndexMapping } from '@kbn/core-saved-objects-base-server-internal';

packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/search/search_dsl/sorting_params.ts

@@ -8,7 +8,7 @@
  */
 
 import Boom from '@hapi/boom';
-import type { SortOrder, SortCombinations } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { SortOrder, SortCombinations } from '@elastic/elasticsearch/lib/api/types';
 import type { SavedObjectsPitParams } from '@kbn/core-saved-objects-api-server/src/apis';
 import { getProperty, type IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 

packages/core/saved-objects/core-saved-objects-api-server-internal/src/test_helpers/repository.test.common.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { schema } from '@kbn/config-schema';
 import { loggerMock } from '@kbn/logging-mocks';
 import type { Payload } from 'elastic-apm-node';

packages/core/saved-objects/core-saved-objects-api-server/src/apis/find.ts

@@ -11,7 +11,7 @@ import type {
   SortOrder,
   AggregationsAggregationContainer,
   SortResults,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import type { SavedObject } from '../..';
 
 type KueryNode = any;

packages/core/saved-objects/core-saved-objects-base-server-internal/src/utils/get_field_list.ts

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { MappingProperty as EsMappingProperty } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { MappingProperty as EsMappingProperty } from '@elastic/elasticsearch/lib/api/types';
 import type {
   SavedObjectsTypeMappingDefinition,
   SavedObjectsFieldMapping,

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/actions/bulk_overwrite_transformed_documents.ts

@@ -9,7 +9,7 @@
 
 import * as Either from 'fp-ts/lib/Either';
 import * as TaskEither from 'fp-ts/lib/TaskEither';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { errors as esErrors } from '@elastic/elasticsearch';
 import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import {

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/actions/close_pit.ts

@@ -28,9 +28,7 @@ export const closePit =
   ({ client, pitId }: ClosePitParams): TaskEither.TaskEither<RetryableEsClientError, {}> =>
   () => {
     return client
-      .closePointInTime({
-        body: { id: pitId },
-      })
+      .closePointInTime({ id: pitId })
       .then((response) => {
         if (!response.succeeded) {
           throw new Error(`Failed to close PointInTime with id: ${pitId}`);

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/actions/create_index.ts

@@ -10,7 +10,7 @@
 import * as Either from 'fp-ts/lib/Either';
 import * as TaskEither from 'fp-ts/lib/TaskEither';
 import { pipe } from 'fp-ts/lib/function';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import type {
   ElasticsearchClient,
   ElasticsearchCapabilities,

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/actions/read_with_pit.ts

@@ -9,7 +9,7 @@
 
 import * as Either from 'fp-ts/lib/Either';
 import * as TaskEither from 'fp-ts/lib/TaskEither';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { errors as EsErrors } from '@elastic/elasticsearch';
 import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import type { SavedObjectsRawDoc } from '@kbn/core-saved-objects-server';

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/actions/reindex.ts

@@ -62,29 +62,28 @@ export const reindex =
         // Require targetIndex to be an alias. Prevents a new index from being
         // created if targetIndex doesn't exist.
         require_alias: requireAlias,
-        body: {
-          // Ignore version conflicts from existing documents
-          conflicts: 'proceed',
-          source: {
-            index: sourceIndex,
-            // Set reindex batch size
-            size: batchSize,
-            // Exclude saved object types
-            query: excludeOnUpgradeQuery,
-          },
-          dest: {
-            index: targetIndex,
-            // Don't override existing documents, only create if missing
-            op_type: 'create',
-          },
-          script: Option.fold<string, undefined | { source: string; lang: 'painless' }>(
-            () => undefined,
-            (script) => ({
-              source: script,
-              lang: 'painless',
-            })
-          )(reindexScript),
+
+        // Ignore version conflicts from existing documents
+        conflicts: 'proceed',
+        source: {
+          index: sourceIndex,
+          // Set reindex batch size
+          size: batchSize,
+          // Exclude saved object types
+          query: excludeOnUpgradeQuery,
+        },
+        dest: {
+          index: targetIndex,
+          // Don't override existing documents, only create if missing
+          op_type: 'create',
         },
+        script: Option.fold<string, undefined | { source: string; lang: 'painless' }>(
+          () => undefined,
+          (script) => ({
+            source: script,
+            lang: 'painless',
+          })
+        )(reindexScript),
         // force a refresh so that we can query the target index
         refresh: true,
         // Create a task and return task id instead of blocking until complete