Revert "[Alerting] Handle when an Alerting Task fails due to its Alert object being deleted mid flight (#63093) (#63569)"

This reverts commit 3cdf259.

Author: gmmorris

x-pack/plugins/alerting/server/alerts_client.ts

@@ -33,7 +33,6 @@ import {
 import { EncryptedSavedObjectsPluginStart } from '../../../plugins/encrypted_saved_objects/server';
 import { TaskManagerStartContract } from '../../../plugins/task_manager/server';
 import { taskInstanceToAlertTaskInstance } from './task_runner/alert_task_instance';
-import { deleteTaskIfItExists } from './lib/delete_task_if_it_exists';
 
 type NormalizedAlertAction = Omit<AlertAction, 'actionTypeId'>;
 export type CreateAPIKeyResult =
@@ -264,7 +263,7 @@ export class AlertsClient {
     const removeResult = await this.savedObjectsClient.delete('alert', id);
 
     await Promise.all([
-      taskIdToRemove ? deleteTaskIfItExists(this.taskManager, taskIdToRemove) : null,
+      taskIdToRemove ? this.taskManager.remove(taskIdToRemove) : null,
       apiKeyToInvalidate ? this.invalidateApiKey({ apiKey: apiKeyToInvalidate }) : null,
     ]);
 
@@ -506,9 +505,7 @@ export class AlertsClient {
       );
 
       await Promise.all([
-        attributes.scheduledTaskId
-          ? deleteTaskIfItExists(this.taskManager, attributes.scheduledTaskId)
-          : null,
+        attributes.scheduledTaskId ? this.taskManager.remove(attributes.scheduledTaskId) : null,
         apiKeyToInvalidate ? this.invalidateApiKey({ apiKey: apiKeyToInvalidate }) : null,
       ]);
     }

x-pack/plugins/alerting/server/lib/delete_task_if_it_exists.test.ts

@@ -14,7 +14,6 @@ import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_o
 import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
 import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
 import { actionsMock } from '../../../actions/server/mocks';
-import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
 
 const alertType = {
   id: 'test',
@@ -502,36 +501,4 @@ describe('Task Runner', () => {
       }
     `);
   });
-
-  test('avoids rescheduling a failed Alert Task Runner when it throws due to failing to fetch the alert', async () => {
-    savedObjectsClient.get.mockImplementation(() => {
-      throw SavedObjectsErrorHelpers.createGenericNotFoundError('task', '1');
-    });
-
-    const taskRunner = new TaskRunner(
-      alertType,
-      mockedTaskInstance,
-      taskRunnerFactoryInitializerParams
-    );
-
-    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-      id: '1',
-      type: 'alert',
-      attributes: {
-        apiKey: Buffer.from('123:abc').toString('base64'),
-      },
-      references: [],
-    });
-
-    const runnerResult = await taskRunner.run();
-
-    expect(runnerResult).toMatchInlineSnapshot(`
-      Object {
-        "runAt": undefined,
-        "state": Object {
-          "previousStartedAt": 1970-01-01T00:00:00.000Z,
-        },
-      }
-    `);
-  });
 });

x-pack/plugins/alerting/server/lib/delete_task_if_it_exists.ts

@@ -24,13 +24,12 @@ import {
 import { promiseResult, map, Resultable, asOk, asErr, resolveErr } from '../lib/result_type';
 import { taskInstanceToAlertTaskInstance } from './alert_task_instance';
 import { AlertInstances } from '../alert_instance/alert_instance';
-import { isAlertSavedObjectNotFoundError } from '../lib/is_alert_not_found_error';
 
 const FALLBACK_RETRY_INTERVAL: IntervalSchedule = { interval: '5m' };
 
 interface AlertTaskRunResult {
   state: AlertTaskState;
-  runAt: Date | undefined;
+  runAt: Date;
 }
 
 interface AlertTaskInstance extends ConcreteTaskInstance {
@@ -294,29 +293,22 @@ export class TaskRunner {
           };
         },
         (err: Error) => {
-          const message = `Executing Alert "${alertId}" has resulted in Error: ${err.message}`;
-          if (isAlertSavedObjectNotFoundError(err, alertId)) {
-            this.logger.debug(message);
-          } else {
-            this.logger.error(message);
-          }
+          this.logger.error(`Executing Alert "${alertId}" has resulted in Error: ${err.message}`);
           return {
             ...originalState,
             previousStartedAt,
           };
         }
       ),
-      runAt: resolveErr<Date | undefined, Error>(runAt, err => {
-        return isAlertSavedObjectNotFoundError(err, alertId)
-          ? undefined
-          : getNextRunAt(
-              new Date(),
-              // if we fail at this point we wish to recover but don't have access to the Alert's
-              // attributes, so we'll use a default interval to prevent the underlying task from
-              // falling into a failed state
-              FALLBACK_RETRY_INTERVAL
-            );
-      }),
+      runAt: resolveErr<Date, Error>(runAt, () =>
+        getNextRunAt(
+          new Date(),
+          // if we fail at this point we wish to recover but don't have access to the Alert's
+          // attributes, so we'll use a default interval to prevent the underlying task from
+          // falling into a failed state
+          FALLBACK_RETRY_INTERVAL
+        )
+      ),
     };
   }
 }

x-pack/plugins/alerting/server/lib/is_alert_not_found_error.test.ts

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import moment from 'moment';
 import {
   getMockCallWithInternal,
   getMockConfig,
@@ -12,7 +13,6 @@ import {
 } from '../../../test_utils';
 import { visualizationsTaskRunner } from './task_runner';
 import { TaskInstance } from '../../../../../task_manager/server';
-import { getNextMidnight } from '../../get_next_midnight';
 
 describe('visualizationsTaskRunner', () => {
   let mockTaskInstance: TaskInstance;
@@ -41,6 +41,12 @@ describe('visualizationsTaskRunner', () => {
   });
 
   test('Summarizes visualization response data', async () => {
+    const getNextMidnight = () =>
+      moment()
+        .add(1, 'days')
+        .startOf('day')
+        .toDate();
+
     const runner = visualizationsTaskRunner(mockTaskInstance, getMockConfig(), getMockEs());
     const result = await runner();