Merge branch 'master' into empty-engine-polling

elastic · Jun 23, 2021 · 96c9319 · 96c9319
2 parents fd62872 + 3e952fa
commit 96c9319
Show file tree

Hide file tree

Showing 22 changed files with 566 additions and 854 deletions.
diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -109,77 +109,6 @@ test('successfully executes', async () => {
   });
 
   expect(loggerMock.debug).toBeCalledWith('executing action test:1: 1');
-  expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
-    Array [
-      Array [
-        Object {
-          "event": Object {
-            "action": "execute",
-            "outcome": "success",
-          },
-          "kibana": Object {
-            "saved_objects": Array [
-              Object {
-                "id": "1",
-                "namespace": "some-namespace",
-                "rel": "primary",
-                "type": "action",
-                "type_id": "test",
-              },
-            ],
-          },
-          "message": "action executed: test:1: 1",
-        },
-      ],
-    ]
-  `);
-});
-
-test('successfully executes as a task', async () => {
-  const actionType: jest.Mocked<ActionType> = {
-    id: 'test',
-    name: 'Test',
-    minimumLicenseRequired: 'basic',
-    executor: jest.fn(),
-  };
-  const actionSavedObject = {
-    id: '1',
-    type: 'action',
-    attributes: {
-      actionTypeId: 'test',
-      config: {
-        bar: true,
-      },
-      secrets: {
-        baz: true,
-      },
-    },
-    references: [],
-  };
-  const actionResult = {
-    id: actionSavedObject.id,
-    name: actionSavedObject.id,
-    ...pick(actionSavedObject.attributes, 'actionTypeId', 'config'),
-    isPreconfigured: false,
-  };
-  actionsClient.get.mockResolvedValueOnce(actionResult);
-  encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValueOnce(actionSavedObject);
-  actionTypeRegistry.get.mockReturnValueOnce(actionType);
-
-  const scheduleDelay = 10000; // milliseconds
-  const scheduled = new Date(Date.now() - scheduleDelay);
-  await actionExecutor.execute({
-    ...executeParams,
-    taskInfo: {
-      scheduled,
-    },
-  });
-
-  const eventTask = eventLogger.logEvent.mock.calls[0][0]?.kibana?.task;
-  expect(eventTask).toBeDefined();
-  expect(eventTask?.scheduled).toBe(scheduled.toISOString());
-  expect(eventTask?.schedule_delay).toBeGreaterThanOrEqual(scheduleDelay * 1000 * 1000);
-  expect(eventTask?.schedule_delay).toBeLessThanOrEqual(2 * scheduleDelay * 1000 * 1000);
 });
 
 test('provides empty config when config and / or secrets is empty', async () => {

diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -25,9 +25,6 @@ import { ActionsClient } from '../actions_client';
 import { ActionExecutionSource } from './action_execution_source';
 import { RelatedSavedObjects } from './related_saved_objects';
 
-// 1,000,000 nanoseconds in 1 millisecond
-const Millis2Nanos = 1000 * 1000;
-
 export interface ActionExecutorContext {
   logger: Logger;
   spaces?: SpacesServiceStart;
@@ -42,16 +39,11 @@ export interface ActionExecutorContext {
   preconfiguredActions: PreConfiguredAction[];
 }
 
-export interface TaskInfo {
-  scheduled: Date;
-}
-
 export interface ExecuteOptions<Source = unknown> {
   actionId: string;
   request: KibanaRequest;
   params: Record<string, unknown>;
   source?: ActionExecutionSource<Source>;
-  taskInfo?: TaskInfo;
   relatedSavedObjects?: RelatedSavedObjects;
 }
 
@@ -79,7 +71,6 @@ export class ActionExecutor {
     params,
     request,
     source,
-    taskInfo,
     relatedSavedObjects,
   }: ExecuteOptions): Promise<ActionTypeExecutorResult<unknown>> {
     if (!this.isInitialized) {
@@ -152,19 +143,9 @@ export class ActionExecutor {
         const actionLabel = `${actionTypeId}:${actionId}: ${name}`;
         logger.debug(`executing action ${actionLabel}`);
 
-        const task = taskInfo
-          ? {
-              task: {
-                scheduled: taskInfo.scheduled.toISOString(),
-                schedule_delay: Millis2Nanos * (Date.now() - taskInfo.scheduled.getTime()),
-              },
-            }
-          : {};
-
         const event: IEvent = {
           event: { action: EVENT_LOG_ACTIONS.execute },
           kibana: {
-            ...task,
             saved_objects: [
               {
                 rel: SAVED_OBJECT_REL_PRIMARY,

diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -133,9 +133,6 @@ test('executes the task by calling the executor with proper parameters', async (
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
-    taskInfo: {
-      scheduled: new Date(),
-    },
   });
 
   const [executeParams] = mockedActionExecutor.execute.mock.calls[0];
@@ -258,9 +255,6 @@ test('uses API key when provided', async () => {
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
-    taskInfo: {
-      scheduled: new Date(),
-    },
   });
 
   const [executeParams] = mockedActionExecutor.execute.mock.calls[0];
@@ -306,9 +300,6 @@ test('uses relatedSavedObjects when provided', async () => {
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
-    taskInfo: {
-      scheduled: new Date(),
-    },
   });
 });
 
@@ -332,6 +323,7 @@ test('sanitizes invalid relatedSavedObjects when provided', async () => {
   });
 
   await taskRunner.run();
+
   expect(mockedActionExecutor.execute).toHaveBeenCalledWith({
     actionId: '2',
     params: { baz: true },
@@ -342,9 +334,6 @@ test('sanitizes invalid relatedSavedObjects when provided', async () => {
         authorization: 'ApiKey MTIzOmFiYw==',
       },
     }),
-    taskInfo: {
-      scheduled: new Date(),
-    },
   });
 });
 
@@ -374,9 +363,6 @@ test(`doesn't use API key when not provided`, async () => {
     request: expect.objectContaining({
       headers: {},
     }),
-    taskInfo: {
-      scheduled: new Date(),
-    },
   });
 
   const [executeParams] = mockedActionExecutor.execute.mock.calls[0];

diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
@@ -72,10 +72,6 @@ export class TaskRunnerFactory {
       getUnsecuredSavedObjectsClient,
     } = this.taskRunnerContext!;
 
-    const taskInfo = {
-      scheduled: taskInstance.runAt,
-    };
-
     return {
       async run() {
         const { spaceId, actionTaskParamsId } = taskInstance.params as Record<string, string>;
@@ -122,7 +118,6 @@ export class TaskRunnerFactory {
             actionId,
             request: fakeRequest,
             ...getSourceFromReferences(references),
-            taskInfo,
             relatedSavedObjects: validatedRelatedSavedObjects(logger, relatedSavedObjects),
           });
         } catch (e) {

diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
@@ -195,6 +195,7 @@ test('enqueues execution per selected action', async () => {
             "id": "1",
             "license": "basic",
             "name": "name-of-alert",
+            "namespace": "test1",
             "ruleset": "alerts",
           },
         },

diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
@@ -209,6 +209,7 @@ export function createExecutionHandler<
           license: alertType.minimumLicenseRequired,
           category: alertType.id,
           ruleset: alertType.producer,
+          ...namespace,
           name: alertName,
         },
       };