ServiceNow push to Incident generic implementation (supporting both Case specific and generic Alerts)

src/core/public/application/ui/app_router.tsx

@@ -59,20 +59,22 @@ export const AppRouter: FunctionComponent<Props> = ({
           // legacy apps can have multiple sub-apps registered with the same route
           // which needs additional logic that is handled in the catch-all route below
           .filter(([_, mounter]) => !mounter.legacy)
-          .map(([appId, mounter]) => (
-            <Route
-              key={mounter.appRoute}
-              path={mounter.appRoute}
-              render={({ match: { url } }) => (
-                <AppContainer
-                  appPath={url}
-                  appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
-                  createScopedHistory={createScopedHistory}
-                  {...{ appId, mounter, setAppLeaveHandler, setIsMounting }}
-                />
-              )}
-            />
-          ))}
+          .map(([appId, mounter]) => {
+            return (
+              <Route
+                key={mounter.appRoute}
+                path={mounter.appRoute}
+                render={({ match: { url } }) => (
+                  <AppContainer
+                    appPath={url}
+                    appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
+                    createScopedHistory={createScopedHistory}
+                    {...{ appId, mounter, setAppLeaveHandler, setIsMounting }}
+                  />
+                )}
+              />
+            );
+          })}
         {/* handler for legacy apps and used as a catch-all to display 404 page on not existing /app/appId apps*/}
         <Route
           path="/app/:appId"

x-pack/plugins/actions/common/types.ts

@@ -16,6 +16,7 @@ export interface ActionType {
 }
 
 export interface ActionResult {
+  consumer: string;
   id: string;
   actionTypeId: string;
   name: string;

x-pack/plugins/actions/server/action_type_registry.test.ts

@@ -36,6 +36,7 @@ beforeEach(() => {
         name: 'Slack #xyz',
         secrets: {},
         isPreconfigured: true,
+        consumer: 'alerts',
       },
     ],
   };

x-pack/plugins/actions/server/actions_client.test.ts

@@ -65,6 +65,7 @@ describe('create()', () => {
         name: 'my name',
         actionTypeId: 'my-action-type',
         config: {},
+        consumer: 'alerts',
       },
       references: [],
     };
@@ -80,6 +81,7 @@ describe('create()', () => {
         name: 'my name',
         actionTypeId: 'my-action-type',
         config: {},
+        consumer: 'alerts',
         secrets: {},
       },
     });
@@ -89,6 +91,7 @@ describe('create()', () => {
       name: 'my name',
       actionTypeId: 'my-action-type',
       config: {},
+      consumer: 'alerts',
     });
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
@@ -97,6 +100,7 @@ describe('create()', () => {
         Object {
           "actionTypeId": "my-action-type",
           "config": Object {},
+          "consumer": "alerts",
           "name": "my name",
           "secrets": Object {},
         },
@@ -123,6 +127,7 @@ describe('create()', () => {
           actionTypeId: 'my-action-type',
           config: {},
           secrets: {},
+          consumer: 'alerts',
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -138,6 +143,7 @@ describe('create()', () => {
           actionTypeId: 'unregistered-action-type',
           config: {},
           secrets: {},
+          consumer: 'alerts',
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -164,6 +170,7 @@ describe('create()', () => {
           c: true,
         },
         secrets: {},
+        consumer: 'alerts',
       },
       references: [],
     });
@@ -177,6 +184,7 @@ describe('create()', () => {
           c: true,
         },
         secrets: {},
+        consumer: 'alerts',
       },
     });
     expect(result).toEqual({
@@ -189,6 +197,7 @@ describe('create()', () => {
         b: true,
         c: true,
       },
+      consumer: 'alerts',
     });
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
@@ -201,6 +210,7 @@ describe('create()', () => {
             "b": true,
             "c": true,
           },
+          "consumer": "alerts",
           "name": "my name",
           "secrets": Object {},
         },
@@ -259,6 +269,7 @@ describe('create()', () => {
           actionTypeId: 'my-action-type',
           config: {},
           secrets: {},
+          consumer: 'alerts',
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -294,6 +305,7 @@ describe('create()', () => {
           actionTypeId: 'my-action-type',
           config: {},
           secrets: {},
+          consumer: 'alerts',
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(`"Fail"`);
@@ -340,6 +352,7 @@ describe('get()', () => {
           config: {
             foo: 'bar',
           },
+          consumer: 'alerts',
         },
       ],
     });
@@ -350,6 +363,7 @@ describe('get()', () => {
       actionTypeId: '.slack',
       isPreconfigured: true,
       name: 'test',
+      consumer: 'alerts',
     });
     expect(savedObjectsClient.get).not.toHaveBeenCalled();
   });
@@ -370,6 +384,7 @@ describe('getAll()', () => {
             config: {
               foo: 'bar',
             },
+            consumer: 'alerts',
           },
           references: [],
         },
@@ -398,6 +413,7 @@ describe('getAll()', () => {
           config: {
             foo: 'bar',
           },
+          consumer: 'alerts',
         },
       ],
     });
@@ -411,13 +427,15 @@ describe('getAll()', () => {
           foo: 'bar',
         },
         referencedByCount: 6,
+        consumer: 'alerts',
       },
       {
         id: 'testPreconfigured',
         actionTypeId: '.slack',
         isPreconfigured: true,
         name: 'test',
         referencedByCount: 2,
+        consumer: 'alerts',
       },
     ]);
   });
@@ -436,6 +454,7 @@ describe('getBulk()', () => {
             config: {
               foo: 'bar',
             },
+            consumer: 'alerts',
           },
           references: [],
         },
@@ -463,6 +482,7 @@ describe('getBulk()', () => {
           config: {
             foo: 'bar',
           },
+          consumer: 'alerts',
         },
       ],
     });
@@ -477,6 +497,7 @@ describe('getBulk()', () => {
         isPreconfigured: true,
         name: 'test',
         secrets: {},
+        consumer: 'alerts',
       },
       {
         actionTypeId: 'test',
@@ -486,6 +507,7 @@ describe('getBulk()', () => {
         id: '1',
         isPreconfigured: false,
         name: 'test',
+        consumer: 'alerts',
       },
     ]);
   });
@@ -540,6 +562,7 @@ describe('update()', () => {
         name: 'my name',
         config: {},
         secrets: {},
+        consumer: 'alerts',
       },
     });
     expect(result).toEqual({
@@ -598,6 +621,7 @@ describe('update()', () => {
           name: 'my name',
           config: {},
           secrets: {},
+          consumer: 'alerts',
         },
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -617,6 +641,7 @@ describe('update()', () => {
       type: 'action',
       attributes: {
         actionTypeId: 'my-action-type',
+        consumer: 'alerts',
       },
       references: [],
     });
@@ -657,6 +682,7 @@ describe('update()', () => {
         b: true,
         c: true,
       },
+      consumer: 'alerts',
     });
     expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
     expect(savedObjectsClient.update.mock.calls[0]).toMatchInlineSnapshot(`

x-pack/plugins/actions/server/actions_client.ts

@@ -30,6 +30,7 @@ interface ActionUpdate extends SavedObjectAttributes {
 
 interface Action extends ActionUpdate {
   actionTypeId: string;
+  consumer: string;
 }
 
 interface CreateOptions {
@@ -74,7 +75,7 @@ export class ActionsClient {
    * Create an action
    */
   public async create({ action }: CreateOptions): Promise<ActionResult> {
-    const { actionTypeId, name, config, secrets } = action;
+    const { actionTypeId, name, config, secrets, consumer } = action;
     const actionType = this.actionTypeRegistry.get(actionTypeId);
     const validatedActionTypeConfig = validateConfig(actionType, config);
     const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
@@ -86,6 +87,7 @@ export class ActionsClient {
       name,
       config: validatedActionTypeConfig as SavedObjectAttributes,
       secrets: validatedActionTypeSecrets as SavedObjectAttributes,
+      consumer,
     });
 
     return {
@@ -94,6 +96,7 @@ export class ActionsClient {
       name: result.attributes.name,
       config: result.attributes.config,
       isPreconfigured: false,
+      consumer: result.attributes.consumer,
     };
   }
 
@@ -124,7 +127,7 @@ export class ActionsClient {
 
     this.actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
 
-    const result = await this.savedObjectsClient.update('action', id, {
+    const result = await this.savedObjectsClient.update<RawAction>('action', id, {
       actionTypeId,
       name,
       config: validatedActionTypeConfig as SavedObjectAttributes,
@@ -137,6 +140,7 @@ export class ActionsClient {
       name: result.attributes.name as string,
       config: result.attributes.config as Record<string, unknown>,
       isPreconfigured: false,
+      consumer: existingObject.attributes.consumer,
     };
   }
 
@@ -153,6 +157,7 @@ export class ActionsClient {
         actionTypeId: preconfiguredActionsList.actionTypeId,
         name: preconfiguredActionsList.name,
         isPreconfigured: true,
+        consumer: preconfiguredActionsList.consumer,
       };
     }
     const result = await this.savedObjectsClient.get<RawAction>('action', id);
@@ -163,6 +168,7 @@ export class ActionsClient {
       name: result.attributes.name,
       config: result.attributes.config,
       isPreconfigured: false,
+      consumer: result.attributes.consumer,
     };
   }
 
@@ -184,6 +190,7 @@ export class ActionsClient {
         actionTypeId: preconfiguredAction.actionTypeId,
         name: preconfiguredAction.name,
         isPreconfigured: true,
+        consumer: preconfiguredAction.consumer,
       })),
     ].sort((a, b) => a.name.localeCompare(b.name));
     return await injectExtraFindData(

x-pack/plugins/actions/server/builtin_action_types/case/api.ts

@@ -41,7 +41,7 @@ const pushToServiceHandler = async ({
   }
 
   const fields = prepareFieldsForTransformation({
-    params,
+    externalCase: params.externalCase,
     mapping,
     defaultPipes,
   });

x-pack/plugins/actions/server/builtin_action_types/case/schema.ts

@@ -67,7 +67,7 @@ export const ExecutorSubActionSchema = schema.oneOf([
 ]);
 
 export const ExecutorSubActionPushParamsSchema = schema.object({
-  caseId: schema.string(),
+  savedObjectId: schema.string(),
   title: schema.string(),
   description: schema.nullable(schema.string()),
   comments: schema.nullable(schema.arrayOf(CommentSchema)),

x-pack/plugins/actions/server/builtin_action_types/case/types.ts

@@ -144,7 +144,7 @@ export interface PipedField {
 }
 
 export interface PrepareFieldsForTransformArgs {
-  params: PushToServiceApiParams;
+  externalCase: Record<string, any>;
   mapping: Map<string, MapRecord>;
   defaultPipes?: string[];
 }