added unit tests

elastic · Apr 1, 2021 · eac81e0 · eac81e0
1 parent 8c8a5d9
commit eac81e0
Show file tree

Hide file tree

Showing 37 changed files with 1,333 additions and 716 deletions.
diff --git a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
@@ -150,7 +150,7 @@ export interface CreateOptions<Params extends AlertTypeParams> {
     | 'mutedInstanceIds'
     | 'actions'
     | 'executionStatus'
-  > & { actions: NormalizedAlertAction[] };
+  > & { actions: AlertAction[] };
   options?: {
     id?: string;
     migrationVersion?: Record<string, string>;
@@ -163,7 +163,7 @@ export interface UpdateOptions<Params extends AlertTypeParams> {
     name: string;
     tags: string[];
     schedule: IntervalSchedule;
-    actions: NormalizedAlertAction[];
+    actions: AlertAction[];
     params: Params;
     throttle: string | null;
     notifyWhen: AlertNotifyWhenType | null;

diff --git a/x-pack/plugins/alerting/server/routes/create_rule.test.ts b/x-pack/plugins/alerting/server/routes/create_rule.test.ts
@@ -76,6 +76,7 @@ describe('createRuleRoute', () => {
         group: mockedAlert.actions[0].group,
         id: mockedAlert.actions[0].id,
         params: mockedAlert.actions[0].params,
+        connector_type_id: mockedAlert.actions[0].actionTypeId,
       },
     ],
   };
@@ -131,6 +132,7 @@ describe('createRuleRoute', () => {
           "data": Object {
             "actions": Array [
               Object {
+                "actionTypeId": "test",
                 "group": "default",
                 "id": "2",
                 "params": Object {
@@ -203,6 +205,7 @@ describe('createRuleRoute', () => {
           "data": Object {
             "actions": Array [
               Object {
+                "actionTypeId": "test",
                 "group": "default",
                 "id": "2",
                 "params": Object {

diff --git a/x-pack/plugins/alerting/server/routes/create_rule.ts b/x-pack/plugins/alerting/server/routes/create_rule.ts
@@ -22,6 +22,7 @@ import {
   AlertingRequestHandlerContext,
   BASE_ALERTING_API_PATH,
   AlertNotifyWhenType,
+  AlertAction,
 } from '../types';
 
 export const bodySchema = schema.object({
@@ -40,12 +41,21 @@ export const bodySchema = schema.object({
       group: schema.string(),
       id: schema.string(),
       params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
+      connector_type_id: schema.string(),
     }),
     { defaultValue: [] }
   ),
   notify_when: schema.string({ validate: validateNotifyWhenType }),
 });
 
+const rewriteBodyReqActions: RewriteRequestCase<AlertAction> = ({
+  connector_type_id: actionTypeId,
+  ...rest
+}) => ({
+  actionTypeId,
+  ...rest,
+});
+
 const rewriteBodyReq: RewriteRequestCase<CreateOptions<AlertTypeParams>['data']> = ({
   rule_type_id: alertTypeId,
   notify_when: notifyWhen,
@@ -121,6 +131,7 @@ export const createRuleRoute = (
                 data: rewriteBodyReq({
                   ...rule,
                   notify_when: rule.notify_when as AlertNotifyWhenType,
+                  actions: rule.actions.map((action) => rewriteBodyReqActions(action)),
                 }),
                 options: { id: params?.id },
               }

diff --git a/x-pack/plugins/alerting/server/routes/update_rule.test.ts b/x-pack/plugins/alerting/server/routes/update_rule.test.ts
@@ -61,6 +61,7 @@ describe('updateRuleRoute', () => {
         group: mockedAlert.actions[0].group,
         id: mockedAlert.actions[0].id,
         params: mockedAlert.actions[0].params,
+        connector_type_id: mockedAlert.actions[0].actionTypeId,
       },
     ],
   };
@@ -109,6 +110,7 @@ describe('updateRuleRoute', () => {
           "data": Object {
             "actions": Array [
               Object {
+                "actionTypeId": "test",
                 "group": "default",
                 "id": "2",
                 "params": Object {
@@ -203,10 +205,11 @@ describe('updateRuleRoute', () => {
 
     alertsClient.update.mockRejectedValue(new AlertTypeDisabledError('Fail', 'license_invalid'));
 
-    const [context, req, res] = mockHandlerArguments({ alertsClient }, { params: {}, body: {} }, [
-      'ok',
-      'forbidden',
-    ]);
+    const [context, req, res] = mockHandlerArguments(
+      { alertsClient },
+      { params: {}, body: updateRequest },
+      ['ok', 'forbidden']
+    );
 
     await handler(context, req, res);
 

diff --git a/x-pack/plugins/alerting/server/routes/update_rule.ts b/x-pack/plugins/alerting/server/routes/update_rule.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import { IRouter } from 'kibana/server';
 import { ILicenseState, AlertTypeDisabledError, validateDurationSchema } from '../lib';
-import { AlertNotifyWhenType } from '../../common';
+import { AlertAction, AlertNotifyWhenType } from '../../common';
 import { UpdateOptions } from '../alerts_client';
 import {
   verifyAccessAndContext,
@@ -41,12 +41,21 @@ const bodySchema = schema.object({
       group: schema.string(),
       id: schema.string(),
       params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
+      connector_type_id: schema.string(),
     }),
     { defaultValue: [] }
   ),
   notify_when: schema.string({ validate: validateNotifyWhenType }),
 });
 
+const rewriteBodyReqActions: RewriteRequestCase<AlertAction> = ({
+  connector_type_id: actionTypeId,
+  ...rest
+}) => ({
+  actionTypeId,
+  ...rest,
+});
+
 const rewriteBodyReq: RewriteRequestCase<UpdateOptions<AlertTypeParams>> = (result) => {
   const { notify_when: notifyWhen, ...rest } = result.data;
   return {
@@ -128,6 +137,7 @@ export const updateRuleRoute = (
                 data: {
                   ...rule,
                   notify_when: rule.notify_when as AlertNotifyWhenType,
+                  actions: rule.actions.map((action) => rewriteBodyReqActions(action)),
                 },
               })
             );

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/health_check.test.tsx
@@ -59,8 +59,13 @@ describe('health check', () => {
 
   it('renders children if keys are enabled', async () => {
     useKibanaMock().services.http.get = jest.fn().mockResolvedValue({
-      isSufficientlySecure: true,
-      hasPermanentEncryptionKey: true,
+      is_sufficiently_secure: true,
+      has_permanent_encryption_key: true,
+      alerting_framework_heath: {
+        decryption_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        execution_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        read_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+      },
       isAlertsAvailable: true,
     });
     const { queryByText } = render(
@@ -78,8 +83,13 @@ describe('health check', () => {
 
   test('renders warning if TLS is required', async () => {
     useKibanaMock().services.http.get = jest.fn().mockImplementation(async () => ({
-      isSufficientlySecure: false,
-      hasPermanentEncryptionKey: true,
+      is_sufficiently_secure: false,
+      has_permanent_encryption_key: true,
+      alerting_framework_heath: {
+        decryption_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        execution_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        read_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+      },
       isAlertsAvailable: true,
     }));
     const { queryAllByText } = render(
@@ -110,8 +120,13 @@ describe('health check', () => {
 
   test('renders warning if encryption key is ephemeral', async () => {
     useKibanaMock().services.http.get = jest.fn().mockImplementation(async () => ({
-      isSufficientlySecure: true,
-      hasPermanentEncryptionKey: false,
+      is_sufficiently_secure: true,
+      has_permanent_encryption_key: false,
+      alerting_framework_heath: {
+        decryption_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        execution_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        read_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+      },
       isAlertsAvailable: true,
     }));
     const { queryByText, queryByRole } = render(
@@ -139,8 +154,13 @@ describe('health check', () => {
 
   test('renders warning if encryption key is ephemeral and keys are disabled', async () => {
     useKibanaMock().services.http.get = jest.fn().mockImplementation(async () => ({
-      isSufficientlySecure: false,
-      hasPermanentEncryptionKey: false,
+      is_sufficiently_secure: false,
+      has_permanent_encryption_key: false,
+      alerting_framework_heath: {
+        decryption_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        execution_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+        read_health: { status: 'ok', timestamp: '2021-04-01T21:29:22.991Z' },
+      },
       isAlertsAvailable: true,
     }));