Putting type ids into saved object array

elastic · Jun 2, 2021 · 3b8b3fa · 3b8b3fa
1 parent 67ed115
commit 3b8b3fa
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 276 deletions.
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -124,19 +124,12 @@ export class ActionExecutor {
     const event: IEvent = {
       event: { action: EVENT_LOG_ACTIONS.execute },
       kibana: {
-        alerting: {
-          action_type_id: actionTypeId,
-          primary_saved_object: {
-            id: actionId,
-            type: 'action',
-            ...namespace,
-          },
-        },
         saved_objects: [
           {
             rel: SAVED_OBJECT_REL_PRIMARY,
             type: 'action',
             id: actionId,
+            type_id: actionTypeId,
             ...namespace,
           },
         ],

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
@@ -160,21 +160,18 @@ test('enqueues execution per selected action', async () => {
               "action_group_id": "default",
               "action_subgroup": undefined,
               "instance_id": "2",
-              "primary_saved_object": Object {
-                "id": "1",
-                "type": "alert",
-              },
-              "rule_type_id": "test",
             },
             "saved_objects": Array [
               Object {
                 "id": "1",
                 "rel": "primary",
                 "type": "alert",
+                "type_id": "test",
               },
               Object {
                 "id": "1",
                 "type": "action",
+                "type_id": "test",
               },
             ],
           },

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
@@ -177,19 +177,19 @@ export function createExecutionHandler<
         event: { action: EVENT_LOG_ACTIONS.executeAction },
         kibana: {
           alerting: {
+            instance_id: alertInstanceId,
             action_group_id: actionGroup,
             action_subgroup: actionSubgroup,
-            instance_id: alertInstanceId,
-            primary_saved_object: {
-              id: alertId,
+          },
+          saved_objects: [
+            {
+              rel: SAVED_OBJECT_REL_PRIMARY,
               type: 'alert',
+              id: alertId,
+              type_id: alertType.id,
               ...namespace,
             },
-            rule_type_id: alertType.id,
-          },
-          saved_objects: [
-            { rel: SAVED_OBJECT_REL_PRIMARY, type: 'alert', id: alertId, ...namespace },
-            { type: 'action', id: action.id, ...namespace },
+            { type: 'action', id: action.id, type_id: action.actionTypeId, ...namespace },
           ],
         },
       };