[ES body removal] @elastic/response-ops (elastic#204882)

tonyghiani · Jan 21, 2025 · 7bb2dad · 7bb2dad
1 parent 17be4e6
commit 7bb2dad
Show file tree

Hide file tree

Showing 121 changed files with 860 additions and 961 deletions.
diff --git a/src/platform/packages/shared/kbn-alerting-types/search_strategy_types.ts b/src/platform/packages/shared/kbn-alerting-types/search_strategy_types.ts
@@ -13,7 +13,7 @@ import type {
   QueryDslFieldAndFormat,
   QueryDslQueryContainer,
   SortCombinations,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import type { Alert } from './alert_type';
 
 export type RuleRegistrySearchRequest = IEsSearchRequest & {

diff --git a/...tform/packages/shared/kbn-alerts-ui-shared/src/common/apis/search_alerts/search_alerts.ts b/...tform/packages/shared/kbn-alerts-ui-shared/src/common/apis/search_alerts/search_alerts.ts
@@ -20,7 +20,7 @@ import type {
   QueryDslFieldAndFormat,
   QueryDslQueryContainer,
   SortCombinations,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import type { EsQuerySnapshot, LegacyField } from '../../types';
 
 export interface SearchAlertsParams {

diff --git a/...s/shared/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts b/...s/shared/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts
@@ -16,7 +16,7 @@ import type {
   AggregationsAggregationContainer,
   QueryDslQueryContainer,
   SortCombinations,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import { BASE_RAC_ALERTS_API_PATH } from '../constants';
 
 export interface UseGetAlertsGroupAggregationsQueryProps {

diff --git a/src/platform/packages/shared/kbn-grouping/src/containers/query/types.ts b/src/platform/packages/shared/kbn-grouping/src/containers/query/types.ts
@@ -11,10 +11,10 @@ import type {
   Script,
   MappingRuntimeField,
   MappingRuntimeFields,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import type { RuntimeFieldSpec, RuntimePrimitiveTypes } from '@kbn/data-views-plugin/common';
 import type { BoolQuery } from '@kbn/es-query';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 
 type RunTimeMappings =
   | Record<string, Omit<RuntimeFieldSpec, 'type'> & { type: RuntimePrimitiveTypes }>

diff --git a/...k/platform/plugins/shared/actions/server/application/connector/methods/get_all/get_all.ts b/...k/platform/plugins/shared/actions/server/application/connector/methods/get_all/get_all.ts
@@ -8,7 +8,7 @@
 /**
  * Get all actions with in-memory connectors
  */
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { AuditLogger } from '@kbn/security-plugin-types-server';
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { omit } from 'lodash';

diff --git a/x-pack/platform/plugins/shared/actions/server/data/connector/types/params.ts b/x-pack/platform/plugins/shared/actions/server/data/connector/types/params.ts
@@ -6,7 +6,7 @@
  */
 
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import { SavedObjectsClient } from '@kbn/core/server';
 

diff --git a/x-pack/platform/plugins/shared/actions/server/lib/get_execution_log_aggregation.ts b/x-pack/platform/plugins/shared/actions/server/lib/get_execution_log_aggregation.ts
@@ -6,7 +6,7 @@
  */
 
 import { KueryNode } from '@kbn/es-query';
-import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import Boom from '@hapi/boom';
 import { flatMap, get, isEmpty } from 'lodash';
 import { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';

diff --git a/x-pack/platform/plugins/shared/actions/server/monitoring/register_cluster_collector.ts b/x-pack/platform/plugins/shared/actions/server/monitoring/register_cluster_collector.ts
@@ -7,7 +7,7 @@
 import type {
   AggregationsKeyedPercentiles,
   AggregationsPercentilesAggregateBase,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import { MonitoringCollectionSetup } from '@kbn/monitoring-collection-plugin/server';
 import { aggregateTaskOverduePercentilesForType } from '@kbn/task-manager-plugin/server';
 import { CoreSetup } from '@kbn/core/server';

diff --git a/x-pack/platform/plugins/shared/actions/server/usage/actions_telemetry.ts b/x-pack/platform/plugins/shared/actions/server/usage/actions_telemetry.ts
@@ -7,7 +7,7 @@
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
-import { AggregationsTermsAggregateBase } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AggregationsTermsAggregateBase } from '@elastic/elasticsearch/lib/api/types';
 import {
   AvgActionRunOutcomeByConnectorTypeBucket,
   parseActionRunOutcomeByConnectorTypesBucket,

diff --git a/x-pack/platform/plugins/shared/actions/server/usage/lib/parse_connector_type_bucket.ts b/x-pack/platform/plugins/shared/actions/server/usage/lib/parse_connector_type_bucket.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AggregationsBuckets } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { AggregationsBuckets } from '@elastic/elasticsearch/lib/api/types';
 import { replaceFirstAndLastDotSymbols } from '../actions_telemetry';
 
 export interface AvgActionRunOutcomeByConnectorTypeBucket {

diff --git a/...platform/plugins/shared/alerting/common/alert_schema/field_maps/mapping_from_field_map.ts b/...platform/plugins/shared/alerting/common/alert_schema/field_maps/mapping_from_field_map.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
 import { set } from '@kbn/safer-lodash-set';
 import type { FieldMap, MultiField } from '@kbn/alerts-as-data-utils';
 

diff --git a/x-pack/platform/plugins/shared/alerting/common/rule_tags_aggregation.ts b/x-pack/platform/plugins/shared/alerting/common/rule_tags_aggregation.ts
@@ -8,7 +8,7 @@
 import type {
   AggregationsAggregationContainer,
   AggregationsCompositeAggregation,
-} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+} from '@elastic/elasticsearch/lib/api/types';
 import type { AggregateOptions } from '../server/application/rule/methods/aggregate/types';
 
 export type RuleTagsAggregationOptions = Pick<AggregateOptions, 'filter' | 'search'> & {

diff --git a/x-pack/platform/plugins/shared/alerting/server/alerts_client/alerts_client.test.ts b/x-pack/platform/plugins/shared/alerting/server/alerts_client/alerts_client.test.ts
@@ -442,18 +442,16 @@ describe('Alerts Client', () => {
           );
 
           expect(clusterClient.search).toHaveBeenCalledWith({
-            body: {
-              query: {
-                bool: {
-                  filter: [
-                    { term: { 'kibana.alert.rule.uuid': '1' } },
-                    { terms: { 'kibana.alert.uuid': ['abc', 'def', 'xyz'] } },
-                  ],
-                },
+            query: {
+              bool: {
+                filter: [
+                  { term: { 'kibana.alert.rule.uuid': '1' } },
+                  { terms: { 'kibana.alert.uuid': ['abc', 'def', 'xyz'] } },
+                ],
               },
-              seq_no_primary_term: true,
-              size: 3,
             },
+            seq_no_primary_term: true,
+            size: 3,
             index: useDataStreamForAlerts
               ? '.alerts-test.alerts-default'
               : '.internal.alerts-test.alerts-default-*',
@@ -516,18 +514,16 @@ describe('Alerts Client', () => {
           );
 
           expect(clusterClient.search).toHaveBeenCalledWith({
-            body: {
-              query: {
-                bool: {
-                  filter: [
-                    { term: { 'kibana.alert.rule.uuid': '1' } },
-                    { terms: { 'kibana.alert.uuid': ['abc'] } },
-                  ],
-                },
+            query: {
+              bool: {
+                filter: [
+                  { term: { 'kibana.alert.rule.uuid': '1' } },
+                  { terms: { 'kibana.alert.uuid': ['abc'] } },
+                ],
               },
-              size: 1,
-              seq_no_primary_term: true,
             },
+            size: 1,
+            seq_no_primary_term: true,
             index: useDataStreamForAlerts
               ? '.alerts-test.alerts-default'
               : '.internal.alerts-test.alerts-default-*',
@@ -570,7 +566,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 create: { _id: uuid1, ...(useDataStreamForAlerts ? {} : { require_alias: true }) },
               },
@@ -617,7 +613,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: true,
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 create: { _id: uuid1, ...(useDataStreamForAlerts ? {} : { require_alias: true }) },
               },
@@ -710,7 +706,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'abc',
@@ -783,7 +779,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'abc',
@@ -918,7 +914,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 create: {
                   _id: 'abc',
@@ -991,7 +987,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'def',
@@ -1090,7 +1086,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'def',
@@ -1247,7 +1243,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'def',
@@ -1365,7 +1361,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'def',
@@ -1569,7 +1565,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'def',
@@ -2540,7 +2536,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 create: { _id: uuid1, ...(useDataStreamForAlerts ? {} : { require_alias: true }) },
               },
@@ -2814,7 +2810,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 create: {
                   _id: expect.any(String),
@@ -2915,7 +2911,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 create: {
                   _id: 'abc',
@@ -3012,7 +3008,7 @@ describe('Alerts Client', () => {
             index: '.alerts-test.alerts-default',
             refresh: 'wait_for',
             require_alias: !useDataStreamForAlerts,
-            body: [
+            operations: [
               {
                 index: {
                   _id: 'abc',

diff --git a/x-pack/platform/plugins/shared/alerting/server/alerts_client/alerts_client.ts b/x-pack/platform/plugins/shared/alerting/server/alerts_client/alerts_client.ts
@@ -15,7 +15,7 @@ import {
   ALERT_MAINTENANCE_WINDOW_IDS,
 } from '@kbn/rule-data-utils';
 import { chunk, flatMap, get, isEmpty, keys } from 'lodash';
-import { SearchRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { SearchRequest } from '@elastic/elasticsearch/lib/api/types';
 import type { Alert } from '@kbn/alerts-as-data-utils';
 import { DEFAULT_NAMESPACE_STRING } from '@kbn/core-saved-objects-utils-server';
 import { DeepPartial } from '@kbn/utility-types';
@@ -231,7 +231,7 @@ export class AlertsClient<
   }
 
   public async search<Aggregation = unknown>(
-    queryBody: SearchRequest['body']
+    queryBody: SearchRequest
   ): Promise<SearchResult<AlertData, Aggregation>> {
     const esClient = await this.options.elasticsearchClientPromise;
     const index = this.isUsingDataStreams()
@@ -242,7 +242,7 @@ export class AlertsClient<
       aggregations,
     } = await esClient.search<Alert & AlertData, Aggregation>({
       index,
-      body: queryBody,
+      ...queryBody,
       ignore_unavailable: true,
     });
 
@@ -568,7 +568,7 @@ export class AlertsClient<
           refresh: this.isServerless ? true : 'wait_for',
           index: this.indexTemplateAndPattern.alias,
           require_alias: !this.isUsingDataStreams(),
-          body: bulkBody,
+          operations: bulkBody,
         });
 
         // If there were individual indexing errors, they will be returned in the success response