[ES body removal] @elastic/security-detection-rule-management (#2…

…04855) ## Summary Attempt to remove the deprecated `body` in the ES client.
elastic · Dec 19, 2024 · cb24aa5 · cb24aa5
1 parent e5cdf36
commit cb24aa5
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 14 deletions.
diff --git a/.../plugins/security_solution/public/common/components/toolbar/bulk_actions/update_alerts.ts b/.../plugins/security_solution/public/common/components/toolbar/bulk_actions/update_alerts.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UpdateByQueryResponse } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { UpdateByQueryResponse } from '@elastic/elasticsearch/lib/api/types';
 import type { Status } from '../../../../../common/api/detection_engine';
 import {
   updateAlertStatusByIds,

diff --git a/...ution/public/detection_engine/rule_details_ui/pages/rule_details/rule_details_context.tsx b/...ution/public/detection_engine/rule_details_ui/pages/rule_details/rule_details_context.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SortOrder } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { SortOrder } from '@elastic/elasticsearch/lib/api/types';
 import type { DurationRange } from '@elastic/eui/src/components/date_picker/types';
 import React, { createContext, useContext, useMemo, useState } from 'react';
 import {

diff --git a/...rver/lib/detection_engine/prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client.ts b/...rver/lib/detection_engine/prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client.ts
@@ -5,8 +5,10 @@
  * 2.0.
  */
 
-import type { AggregationsMultiBucketAggregateBase } from '@elastic/elasticsearch/lib/api/types';
-import type { AggregationsTopHitsAggregate } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type {
+  AggregationsMultiBucketAggregateBase,
+  AggregationsTopHitsAggregate,
+} from '@elastic/elasticsearch/lib/api/types';
 import type { SavedObjectsClientContract } from '@kbn/core/server';
 import { invariant } from '../../../../../../common/utils/invariant';
 import { withSecuritySpan } from '../../../../../utils/with_security_span';

diff --git a/..._monitoring/logic/detection_engine_health/event_log/aggregations/health_stats_for_rule.ts b/..._monitoring/logic/detection_engine_health/event_log/aggregations/health_stats_for_rule.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 { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 
 import type {

diff --git a/...e_monitoring/logic/detection_engine_health/event_log/aggregations/rule_execution_stats.ts b/...e_monitoring/logic/detection_engine_health/event_log/aggregations/rule_execution_stats.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 { mapValues } from 'lodash';
 
 import type {

diff --git a/...engine/rule_monitoring/logic/detection_engine_health/event_log/event_log_health_client.ts b/...engine/rule_monitoring/logic/detection_engine_health/event_log/event_log_health_client.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 { Logger } from '@kbn/core/server';
 import { SavedObjectsUtils } from '@kbn/core/server';
 import type { KueryNode } from '@kbn/es-query';

diff --git a/...oring/logic/detection_engine_health/rule_objects/aggregations/health_stats_for_cluster.ts b/...oring/logic/detection_engine_health/rule_objects/aggregations/health_stats_for_cluster.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 { ClusterHealthState } from '../../../../../../../../common/api/detection_engine/rule_monitoring';
 import { getRuleStatsAggregation, normalizeRuleStatsAggregation } from './rule_stats';
 

diff --git a/...itoring/logic/detection_engine_health/rule_objects/aggregations/health_stats_for_space.ts b/...itoring/logic/detection_engine_health/rule_objects/aggregations/health_stats_for_space.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 { SpaceHealthState } from '../../../../../../../../common/api/detection_engine/rule_monitoring';
 import { getRuleStatsAggregation, normalizeRuleStatsAggregation } from './rule_stats';
 

diff --git a/...ine/rule_monitoring/logic/detection_engine_health/rule_objects/aggregations/rule_stats.ts b/...ine/rule_monitoring/logic/detection_engine_health/rule_objects/aggregations/rule_stats.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 {
   HealthOverviewState,
   TotalEnabledDisabled,

diff --git a/...n_engine/rule_monitoring/logic/detection_engine_health/rule_spaces/aggregations/spaces.ts b/...n_engine/rule_monitoring/logic/detection_engine_health/rule_spaces/aggregations/spaces.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 { RawData } from '../../../utils/normalization';
 
 // The number of Kibana spaces is limited by the `maxSpaces` config setting of the spaces plugin.

diff --git a/...ule_monitoring/logic/rule_execution_log/event_log/aggregations/execution_results/index.ts b/...ule_monitoring/logic/rule_execution_log/event_log/aggregations/execution_results/index.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 { AggregateEventsBySavedObjectResult } from '@kbn/event-log-plugin/server';
 import { BadRequestError } from '@kbn/securitysolution-es-utils';
 import { MAX_EXECUTION_EVENTS_DISPLAYED } from '@kbn/securitysolution-rules';

diff --git a/...ule_monitoring/logic/rule_execution_log/event_log/aggregations/execution_results/types.ts b/...ule_monitoring/logic/rule_execution_log/event_log/aggregations/execution_results/types.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 { RuleRunType } from '../../../../../../../../../common/api/detection_engine/rule_monitoring';
 
 type AlertCounts = estypes.AggregationsMultiBucketAggregateBase & {

diff --git a/...b/detection_engine/rule_monitoring/logic/rule_execution_log/event_log/event_log_reader.ts b/...b/detection_engine/rule_monitoring/logic/rule_execution_log/event_log/event_log_reader.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 { IEventLogClient, IValidatedEvent } from '@kbn/event-log-plugin/server';
 import { MAX_EXECUTION_EVENTS_DISPLAYED } from '@kbn/securitysolution-rules';
 import type {