Fixing type check

elastic · Oct 31, 2024 · 8d7df4c · 8d7df4c
1 parent 296872c
commit 8d7df4c
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 14 deletions.
diff --git a/x-pack/plugins/alerting/server/task_runner/action_scheduler/action_scheduler.ts b/x-pack/plugins/alerting/server/task_runner/action_scheduler/action_scheduler.ts
@@ -51,8 +51,6 @@ export class ActionScheduler<
     IActionScheduler<State, Context, ActionGroupIds, RecoveryActionGroupId>
   > = [];
 
-  private ephemeralActionsToSchedule: number;
-
   constructor(
     private readonly context: ActionSchedulerOptions<
       Params,
@@ -65,7 +63,6 @@ export class ActionScheduler<
       AlertData
     >
   ) {
-    this.ephemeralActionsToSchedule = context.taskRunnerContext.maxEphemeralActionsPerRule;
     for (const [_, scheduler] of Object.entries(schedulers)) {
       this.schedulers.push(new scheduler(context));
     }
@@ -183,11 +180,7 @@ export class ActionScheduler<
     enqueueOptions: EnqueueExecutionOptions;
     bulkScheduleRequest: EnqueueExecutionOptions[];
   }) {
-    if (
-      this.context.taskRunnerContext.supportsEphemeralTasks &&
-      this.ephemeralActionsToSchedule > 0
-    ) {
-      this.ephemeralActionsToSchedule--;
+    if (this.context.taskRunnerContext.supportsEphemeralTasks) {
       try {
         await this.context.actionsClient!.ephemeralEnqueuedExecution(enqueueOptions);
       } catch (err) {

diff --git a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.test.ts
@@ -167,7 +167,6 @@ const taskRunnerFactoryInitializerParams: TaskRunnerFactoryInitializerParamsType
   kibanaBaseUrl: 'https://localhost:5601',
   logger,
   maxAlerts: 1000,
-  maxEphemeralActionsPerRule: 10,
   ruleTypeRegistry,
   rulesSettingsService,
   savedObjects: savedObjectsService,

diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -187,7 +187,6 @@ describe('Task Runner', () => {
     logger,
     maintenanceWindowsService,
     maxAlerts: 1000,
-    maxEphemeralActionsPerRule: 10,
     ruleTypeRegistry,
     rulesSettingsService,
     savedObjects: savedObjectsService,

diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_alerts_client.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_alerts_client.test.ts
@@ -216,7 +216,6 @@ describe('Task Runner', () => {
       logger,
       maintenanceWindowsService,
       maxAlerts: 1000,
-      maxEphemeralActionsPerRule: 10,
       ruleTypeRegistry,
       rulesSettingsService,
       savedObjects: savedObjectsService,

diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
@@ -149,7 +149,6 @@ describe('Task Runner Cancel', () => {
     logger,
     maintenanceWindowsService,
     maxAlerts: 1000,
-    maxEphemeralActionsPerRule: 10,
     ruleTypeRegistry,
     rulesSettingsService,
     savedObjects: savedObjectsService,

diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -120,7 +120,6 @@ describe('Task Runner Factory', () => {
     logger: loggingSystemMock.create().get(),
     maintenanceWindowsService,
     maxAlerts: 1000,
-    maxEphemeralActionsPerRule: 10,
     ruleTypeRegistry: ruleTypeRegistryMock.create(),
     rulesSettingsService,
     savedObjects: savedObjectsService,

diff --git a/x-pack/plugins/alerting/server/task_runner/types.ts b/x-pack/plugins/alerting/server/task_runner/types.ts
@@ -171,7 +171,6 @@ export interface TaskRunnerContext {
   logger: Logger;
   maintenanceWindowsService: MaintenanceWindowsService;
   maxAlerts: number;
-  maxEphemeralActionsPerRule: number;
   ruleTypeRegistry: RuleTypeRegistry;
   rulesSettingsService: RulesSettingsService;
   savedObjects: SavedObjectsServiceStart;