fixed typing

gmmorris · Feb 11, 2020 · 059dcab · 059dcab
1 parent f48721e
commit 059dcab
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
@@ -18,7 +18,7 @@ interface ScheduledExecutionOptions {
   context: Context;
   state: State;
 }
-
+export type AlertInstances = Record<string, AlertInstance>;
 export class AlertInstance {
   private scheduledExecutionOptions?: ScheduledExecutionOptions;
   private meta: AlertInstanceMeta;

diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -22,6 +22,7 @@ import {
   AlertType,
   IntervalSchedule,
   SanitizedAlert,
+  AlertTaskState,
 } from './types';
 import { validateAlertTypeParams } from './lib';
 import {
@@ -31,7 +32,7 @@ import {
 } from '../../../../plugins/security/server';
 import { EncryptedSavedObjectsPluginStart } from '../../../../plugins/encrypted_saved_objects/server';
 import { TaskManagerStartContract } from '../../../../plugins/task_manager/server';
-import { AlertTaskState, taskInstanceToAlertTaskInstance } from './task_runner/alert_task_instance';
+import { taskInstanceToAlertTaskInstance } from './task_runner/alert_task_instance';
 
 type NormalizedAlertAction = Omit<AlertAction, 'actionTypeId'>;
 export type CreateAPIKeyResult =

diff --git a/x-pack/legacy/plugins/alerting/server/index.ts b/x-pack/legacy/plugins/alerting/server/index.ts
@@ -10,5 +10,4 @@ export type AlertsClient = PublicMethodsOf<AlertsClientClass>;
 
 export { init } from './init';
 export { AlertType, AlertingPlugin, AlertExecutorOptions } from './types';
-export { AlertTaskState } from './task_runner';
 export { PluginSetupContract, PluginStartContract } from './plugin';
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/index.ts b/x-pack/legacy/plugins/alerting/server/task_runner/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { AlertTaskState } from './alert_task_instance';
 export { TaskRunnerFactory } from './task_runner_factory';
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
@@ -20,13 +20,11 @@ import {
   Services,
   AlertInfoParams,
   RawAlertInstance,
+  AlertTaskState,
 } from '../types';
 import { promiseResult, map, Resultable, asOk, asErr, resolveErr } from '../lib/result_type';
-import {
-  AlertTaskState,
-  AlertInstances,
-  taskInstanceToAlertTaskInstance,
-} from './alert_task_instance';
+import { taskInstanceToAlertTaskInstance } from './alert_task_instance';
+import { AlertInstances } from '../alert_instance/alert_instance';
 
 const FALLBACK_RETRY_INTERVAL: IntervalSchedule = { interval: '5m' };