Merge branch 'master' into dynamic-action

Author: mattkime

x-pack/plugins/actions/server/routes/create.ts

@@ -41,9 +41,6 @@ export const createActionRoute = (router: IRouter, licenseState: LicenseState) =
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
 
-      if (!context.actions) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
-      }
       const actionsClient = context.actions.getActionsClient();
       const action = req.body;
       const actionRes: ActionResult = await actionsClient.create({ action });

x-pack/plugins/actions/server/routes/delete.ts

@@ -41,9 +41,6 @@ export const deleteActionRoute = (router: IRouter, licenseState: LicenseState) =
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
-      if (!context.actions) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
-      }
       const actionsClient = context.actions.getActionsClient();
       const { id } = req.params;
       await actionsClient.delete({ id });

x-pack/plugins/actions/server/routes/find.ts

@@ -57,9 +57,6 @@ export const findActionRoute = (router: IRouter, licenseState: LicenseState) =>
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
-      if (!context.actions) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
-      }
       const actionsClient = context.actions.getActionsClient();
       const query = req.query;
       const options: FindOptions['options'] = {

x-pack/plugins/actions/server/routes/get.ts

@@ -36,9 +36,6 @@ export const getActionRoute = (router: IRouter, licenseState: LicenseState) => {
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
-      if (!context.actions) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
-      }
       const actionsClient = context.actions.getActionsClient();
       const { id } = req.params;
       return res.ok({

x-pack/plugins/actions/server/routes/list_action_types.test.ts

@@ -58,7 +58,7 @@ describe('listActionTypesRoute', () => {
       }
     `);
 
-    expect(context.actions!.listTypes).toHaveBeenCalledTimes(1);
+    expect(context.actions.listTypes).toHaveBeenCalledTimes(1);
 
     expect(res.ok).toHaveBeenCalledWith({
       body: listTypes,

x-pack/plugins/actions/server/routes/list_action_types.ts

@@ -29,9 +29,6 @@ export const listActionTypesRoute = (router: IRouter, licenseState: LicenseState
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
-      if (!context.actions) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
-      }
       return res.ok({
         body: context.actions.listTypes(),
       });

x-pack/plugins/actions/server/routes/update.ts

@@ -43,9 +43,6 @@ export const updateActionRoute = (router: IRouter, licenseState: LicenseState) =
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
-      if (!context.actions) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for actions' });
-      }
       const actionsClient = context.actions.getActionsClient();
       const { id } = req.params;
       const { name, config, secrets } = req.body;

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

@@ -22,7 +22,7 @@ export interface Services {
 
 declare module 'src/core/server' {
   interface RequestHandlerContext {
-    actions?: {
+    actions: {
       getActionsClient: () => ActionsClient;
       listTypes: ActionTypeRegistry['list'];
     };

x-pack/plugins/alerting/server/routes/create.ts

@@ -57,9 +57,6 @@ export const createAlertRoute = (router: IRouter, licenseState: LicenseState) =>
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
 
-      if (!context.alerting) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
-      }
       const alertsClient = context.alerting.getAlertsClient();
       const alert = req.body;
       const alertRes: Alert = await alertsClient.create({ data: alert });

x-pack/plugins/alerting/server/routes/delete.ts

@@ -36,9 +36,6 @@ export const deleteAlertRoute = (router: IRouter, licenseState: LicenseState) =>
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse<any>> {
       verifyApiAccess(licenseState);
-      if (!context.alerting) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for alerting' });
-      }
       const alertsClient = context.alerting.getAlertsClient();
       const { id } = req.params;
       await alertsClient.delete({ id });