[ES body removal] @elastic/fleet (#204867)

## Summary

Attempt to remove the deprecated `body` in the ES client.

Author: afharo

x-pack/plugins/fleet/common/types/models/agent_policy.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SecurityRoleDescriptor } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { SecurityRoleDescriptor } from '@elastic/elasticsearch/lib/api/types';
 
 import type { agentPolicyStatuses } from '../../constants';
 import type { MonitoringType, PolicySecretReference, ValueOf } from '..';

x-pack/plugins/fleet/common/types/models/epm.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type {
   ASSETS_SAVED_OBJECT_TYPE,

x-pack/plugins/fleet/server/routes/data_streams/handlers.ts

@@ -8,7 +8,7 @@ import type { Dictionary } from 'lodash';
 import { keyBy, keys, merge } from 'lodash';
 import type { RequestHandler } from '@kbn/core/server';
 import pMap from 'p-map';
-import type { IndicesDataStreamsStatsDataStreamsStatsItem } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { IndicesDataStreamsStatsDataStreamsStatsItem } from '@elastic/elasticsearch/lib/api/types';
 import { ByteSizeValue } from '@kbn/config-schema';
 
 import type { DataStream } from '../../types';

x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts

@@ -8,7 +8,7 @@
 import type {
   SecurityIndicesPrivileges,
   SecurityRoleDescriptor,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 
 import {
   FLEET_APM_PACKAGE,

x-pack/plugins/fleet/server/services/agent_policy.ts

@@ -22,7 +22,7 @@ import type {
 } from '@kbn/core/server';
 import { SavedObjectsUtils } from '@kbn/core/server';
 
-import type { BulkResponseItem } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { BulkResponseItem } from '@elastic/elasticsearch/lib/api/types';
 
 import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common/constants';
 

x-pack/plugins/fleet/server/services/agents/action.mock.ts

@@ -152,7 +152,7 @@ export function createClientMock() {
 
   esClientMock.mget.mockResponseImplementation((params) => {
     // @ts-expect-error
-    const docs = params?.body.docs.map(({ _id }) => {
+    const docs = params?.docs.map(({ _id }) => {
       let result;
       switch (_id) {
         case agentInHostedDoc._id:

x-pack/plugins/fleet/server/services/agents/actions.test.ts

@@ -135,7 +135,7 @@ describe('Agent actions', () => {
 
         expect(esClient.create).toBeCalledWith(
           expect.objectContaining({
-            body: expect.objectContaining({
+            document: expect.objectContaining({
               signed: {
                 data: expect.any(String),
                 signature: expect.any(String),
@@ -180,7 +180,7 @@ describe('Agent actions', () => {
 
       expect(esClient.create).toBeCalledWith(
         expect.objectContaining({
-          body: expect.not.objectContaining({
+          document: expect.not.objectContaining({
             signed: expect.any(Object),
           }),
         })
@@ -235,7 +235,7 @@ describe('Agent actions', () => {
       await bulkCreateAgentActions(esClient, newActions);
       expect(esClient.bulk).toHaveBeenCalledWith(
         expect.objectContaining({
-          body: expect.arrayContaining([
+          operations: expect.arrayContaining([
             expect.arrayContaining([
               expect.objectContaining({
                 signed: {
@@ -274,7 +274,7 @@ describe('Agent actions', () => {
       await bulkCreateAgentActions(esClient, newActions);
       expect(esClient.bulk).toHaveBeenCalledWith(
         expect.objectContaining({
-          body: expect.arrayContaining([
+          operations: expect.arrayContaining([
             expect.arrayContaining([
               expect.not.objectContaining({
                 signed: {
@@ -350,7 +350,7 @@ describe('Agent actions', () => {
       expect(esClient.create).toBeCalledTimes(2);
       expect(esClient.create).toBeCalledWith(
         expect.objectContaining({
-          body: expect.objectContaining({
+          document: expect.objectContaining({
             type: 'CANCEL',
             data: { target_id: 'action1' },
             agents: ['agent1', 'agent2'],
@@ -359,7 +359,7 @@ describe('Agent actions', () => {
       );
       expect(esClient.create).toBeCalledWith(
         expect.objectContaining({
-          body: expect.objectContaining({
+          document: expect.objectContaining({
             type: 'CANCEL',
             data: { target_id: 'action1' },
             agents: ['agent3', 'agent4'],

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

@@ -81,7 +81,7 @@ export async function createAgentAction(
   await esClient.create({
     index: AGENT_ACTIONS_INDEX,
     id: uuidv4(),
-    body,
+    document: body,
     refresh: 'wait_for',
   });
 
@@ -153,7 +153,7 @@ export async function bulkCreateAgentActions(
 
   await esClient.bulk({
     index: AGENT_ACTIONS_INDEX,
-    body: fleetServerAgentActions,
+    operations: fleetServerAgentActions,
   });
 
   for (const action of actions) {
@@ -231,7 +231,7 @@ export async function bulkCreateAgentActionResults(
 
   await esClient.bulk({
     index: AGENT_ACTIONS_RESULTS_INDEX,
-    body: bulkBody,
+    operations: bulkBody,
     refresh: 'wait_for',
   });
 }

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

@@ -13,9 +13,9 @@ import type {
   SavedObjectsClientContract,
 } from '@kbn/core/server';
 
-import type { AggregationsAggregationContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { AggregationsAggregationContainer } from '@elastic/elasticsearch/lib/api/types';
 
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 import type { SortResults } from '@elastic/elasticsearch/lib/api/types';
 

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

@@ -107,9 +107,7 @@ describe('Agents CRUD test', () => {
       expect(searchMock).toHaveBeenCalledWith(
         expect.objectContaining({
           aggs: { tags: { terms: { field: 'tags', size: 10000 } } },
-          body: {
-            query: expect.any(Object),
-          },
+          query: expect.any(Object),
           index: '.fleet-agents',
           size: 0,
           fields: ['status'],
@@ -164,7 +162,7 @@ describe('Agents CRUD test', () => {
         })
       );
 
-      expect(searchMock.mock.calls.at(-1)[0].body.query).toEqual(
+      expect(searchMock.mock.calls.at(-1)[0].query).toEqual(
         toElasticsearchQuery(
           _joinFilters(['fleet-agents.policy_id: 123', 'NOT status:unenrolled'])!
         )