diff --git a/x-pack/plugins/alerting/server/routes/create.test.ts b/x-pack/plugins/alerting/server/routes/create.test.ts index 2740642eed175..0227f139cc450 100644 --- a/x-pack/plugins/alerting/server/routes/create.test.ts +++ b/x-pack/plugins/alerting/server/routes/create.test.ts @@ -110,7 +110,6 @@ describe('createAlertRoute', () => { ], "alertTypeId": "1", "consumer": "bar", - "enabled": true, "name": "abc", "params": Object { "bar": true, diff --git a/x-pack/plugins/alerting/server/routes/create.ts b/x-pack/plugins/alerting/server/routes/create.ts index 1319ea49188bf..c8d6753c6520b 100644 --- a/x-pack/plugins/alerting/server/routes/create.ts +++ b/x-pack/plugins/alerting/server/routes/create.ts @@ -32,6 +32,7 @@ export const bodySchema = schema.object({ schema.object({ group: schema.string(), id: schema.string(), + actionTypeId: schema.string(), params: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }), }), { defaultValue: [] } diff --git a/x-pack/plugins/alerting/server/routes/get.test.ts b/x-pack/plugins/alerting/server/routes/get.test.ts index 46a42f5eb9c84..7d0201480b16c 100644 --- a/x-pack/plugins/alerting/server/routes/get.test.ts +++ b/x-pack/plugins/alerting/server/routes/get.test.ts @@ -78,17 +78,7 @@ describe('getAlertRoute', () => { }, ['ok'] ); - - expect(await handler(context, req, res)).toMatchInlineSnapshot(` - Object { - "body": Object { - "actionTypeId": "2", - "config": Object {}, - "id": "1", - "name": "action name", - }, - } - `); + await handler(context, req, res); expect(alertsClient.get).toHaveBeenCalledTimes(1); expect(alertsClient.get.mock.calls[0][0].id).toEqual('1'); diff --git a/x-pack/plugins/alerting/server/routes/get_alert_state.test.ts b/x-pack/plugins/alerting/server/routes/get_alert_state.test.ts index ab45977f62814..da80d73bce553 100644 --- a/x-pack/plugins/alerting/server/routes/get_alert_state.test.ts +++ b/x-pack/plugins/alerting/server/routes/get_alert_state.test.ts @@ -8,7 +8,7 @@ import { getAlertStateRoute } from './get_alert_state'; import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock'; import { mockLicenseState } from '../lib/license_state.mock'; import { mockHandlerArguments } from './_mock_handler_arguments'; -import { SavedObjectsErrorHelpers } from 'kibana/server'; +import { SavedObjectsErrorHelpers } from 'src/core/server/saved_objects'; jest.mock('../lib/license_api_access.ts', () => ({ verifyApiAccess: jest.fn(), @@ -43,13 +43,13 @@ describe('getAlertStateRoute', () => { getAlertStateRoute(router, licenseState); - const [config, handler] = router.post.mock.calls[0]; + const [config, handler] = router.get.mock.calls[0]; expect(config.path).toMatchInlineSnapshot(`"/api/alert/{id}/state"`); expect(config.options).toMatchInlineSnapshot(` Object { "tags": Array [ - "access:alerting-all", + "access:alerting-read", ], } `); @@ -68,7 +68,7 @@ describe('getAlertStateRoute', () => { ['ok'] ); - expect(await handler(context, req, res)).toEqual(undefined); + await handler(context, req, res); expect(alertsClient.getAlertState).toHaveBeenCalledTimes(1); expect(alertsClient.getAlertState.mock.calls[0]).toMatchInlineSnapshot(` @@ -88,13 +88,13 @@ describe('getAlertStateRoute', () => { getAlertStateRoute(router, licenseState); - const [config, handler] = router.post.mock.calls[0]; + const [config, handler] = router.get.mock.calls[0]; expect(config.path).toMatchInlineSnapshot(`"/api/alert/{id}/state"`); expect(config.options).toMatchInlineSnapshot(` Object { "tags": Array [ - "access:alerting-all", + "access:alerting-read", ], } `); @@ -133,13 +133,13 @@ describe('getAlertStateRoute', () => { getAlertStateRoute(router, licenseState); - const [config, handler] = router.post.mock.calls[0]; + const [config, handler] = router.get.mock.calls[0]; expect(config.path).toMatchInlineSnapshot(`"/api/alert/{id}/state"`); expect(config.options).toMatchInlineSnapshot(` Object { "tags": Array [ - "access:alerting-all", + "access:alerting-read", ], } `); @@ -170,7 +170,5 @@ describe('getAlertStateRoute', () => { }, ] `); - - expect(res.notFound).toHaveBeenCalled(); }); }); diff --git a/x-pack/plugins/alerting/server/routes/get_alert_state.ts b/x-pack/plugins/alerting/server/routes/get_alert_state.ts index 09e11868dbaca..b419889eea422 100644 --- a/x-pack/plugins/alerting/server/routes/get_alert_state.ts +++ b/x-pack/plugins/alerting/server/routes/get_alert_state.ts @@ -38,8 +38,8 @@ export const getAlertStateRoute = (router: IRouter, licenseState: LicenseState) verifyApiAccess(licenseState); const alertsClient = context.alerting.getAlertsClient(); const { id } = req.params; - await alertsClient.getAlertState({ id }); - return res.noContent(); + const state = await alertsClient.getAlertState({ id }); + return state ? res.ok({ body: state }) : res.noContent(); }) ); }; diff --git a/x-pack/plugins/alerting/server/routes/list_alert_types.test.ts b/x-pack/plugins/alerting/server/routes/list_alert_types.test.ts index a958135bdcacc..3e9f57d55122d 100644 --- a/x-pack/plugins/alerting/server/routes/list_alert_types.test.ts +++ b/x-pack/plugins/alerting/server/routes/list_alert_types.test.ts @@ -50,7 +50,7 @@ describe('listAlertTypesRoute', () => { Object { "body": Array [ Object { - "actionGroups": [], + "actionGroups": Array [], "id": "1", "name": "name", }, diff --git a/x-pack/plugins/alerting/server/routes/update.test.ts b/x-pack/plugins/alerting/server/routes/update.test.ts index f7b464887a67c..2696985c6d1b5 100644 --- a/x-pack/plugins/alerting/server/routes/update.test.ts +++ b/x-pack/plugins/alerting/server/routes/update.test.ts @@ -116,7 +116,6 @@ describe('updateAlertRoute', () => { "tags": Array [ "bar", ], - "throttle": null, }, "id": "1", }, diff --git a/x-pack/plugins/alerting/server/routes/update.ts b/x-pack/plugins/alerting/server/routes/update.ts index aa4e525c5ce31..733e13a1d47d3 100644 --- a/x-pack/plugins/alerting/server/routes/update.ts +++ b/x-pack/plugins/alerting/server/routes/update.ts @@ -47,7 +47,7 @@ export const updateAlertRoute = (router: IRouter, licenseState: LicenseState) => params: paramSchema, }, options: { - tags: ['access:actions-all'], + tags: ['access:alerting-all'], }, }, router.handleLegacyErrors(async function(