Fix malformed geo alerts call to transformResults (elastic#98094)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kindsun · May 3, 2021 · 1ce2182 · 1ce2182
1 parent c40f965
commit 1ce2182
Show file tree

Hide file tree

Showing 6 changed files with 1,068 additions and 373 deletions.
diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/alert_type.ts
@@ -120,6 +120,7 @@ export interface GeoContainmentParams extends AlertTypeParams {
 export interface GeoContainmentState extends AlertTypeState {
   shapesFilters: Record<string, unknown>;
   shapesIdsNamesMap: Record<string, unknown>;
+  prevLocationMap: Record<string, unknown>;
 }
 export interface GeoContainmentInstanceState extends AlertInstanceState {
   location: number[];

diff --git a/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts b/x-pack/plugins/stack_alerts/server/alert_types/geo_containment/geo_containment.ts
@@ -16,6 +16,7 @@ import {
   GeoContainmentInstanceState,
   GeoContainmentAlertType,
   GeoContainmentInstanceContext,
+  GeoContainmentState,
 } from './alert_type';
 
 export type LatestEntityLocation = GeoContainmentInstanceState;
@@ -141,7 +142,7 @@ export const getGeoContainmentExecutor = (log: Logger): GeoContainmentAlertType[
     params,
     alertId,
     state,
-  }) {
+  }): Promise<GeoContainmentState> {
     const { shapesFilters, shapesIdsNamesMap } = state.shapesFilters
       ? state
       : await getShapesFilters(
@@ -176,8 +177,7 @@ export const getGeoContainmentExecutor = (log: Logger): GeoContainmentAlertType[
     }
 
     const currLocationMap: Map<string, LatestEntityLocation[]> = transformResults(
-      // @ts-expect-error body doesn't exist on currentIntervalResults
-      currentIntervalResults?.body,
+      currentIntervalResults,
       params.dateField,
       params.geoField
     );