Fixed ci type check errors for alerting and actions properties for SI…

…EM RouteHandlerContext (#59400) * Fixed ci type check errors for alerting and actions optional properties on RouteHandlerContext * Reverted git revert b83f814
elastic · Mar 5, 2020 · 4883d4b · 4883d4b
1 parent d55524c
commit 4883d4b
Show file tree

Hide file tree

Showing 54 changed files with 144 additions and 29 deletions.
diff --git a/...plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/...plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -63,7 +63,7 @@ describe('add_prepackaged_rules_route', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const request = addPrepackagedRulesRequest();
       const response = await server.inject(request, context);
 

diff --git a/...gacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/...gacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -33,6 +33,9 @@ export const addPrepackedRulesRoute = (router: IRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        if (!context.alerting || !context.actions) {
+          return siemResponse.error({ statusCode: 404 });
+        }
         const alertsClient = context.alerting.getAlertsClient();
         const actionsClient = context.actions.getActionsClient();
         const clusterClient = context.core.elasticsearch.dataClient;

diff --git a/...acy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/...acy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -39,7 +39,7 @@ describe('create_rules_bulk', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getReadBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -35,11 +35,14 @@ export const createRulesBulkRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
+      const siemResponse = buildSiemResponse(response);
+      if (!context.alerting || !context.actions) {
+        return siemResponse.error({ statusCode: 404 });
+      }
       const alertsClient = context.alerting.getAlertsClient();
       const actionsClient = context.actions.getActionsClient();
       const clusterClient = context.core.elasticsearch.dataClient;
       const siemClient = context.siem.getSiemClient();
-      const siemResponse = buildSiemResponse(response);
 
       if (!actionsClient || !alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -41,7 +41,7 @@ describe('create_rules', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getCreateRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -59,6 +59,9 @@ export const createRulesRoute = (router: IRouter): void => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        if (!context.alerting || !context.actions) {
+          return siemResponse.error({ statusCode: 404 });
+        }
         const alertsClient = context.alerting.getAlertsClient();
         const actionsClient = context.actions.getActionsClient();
         const clusterClient = context.core.elasticsearch.dataClient;

diff --git a/...acy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts b/...acy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
@@ -82,7 +82,7 @@ describe('delete_rules', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getDeleteBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
@@ -32,10 +32,14 @@ export const deleteRulesBulkRoute = (router: IRouter) => {
     },
   };
   const handler: Handler = async (context, request, response) => {
+    const siemResponse = buildSiemResponse(response);
+
+    if (!context.alerting || !context.actions) {
+      return siemResponse.error({ statusCode: 404 });
+    }
     const alertsClient = context.alerting.getAlertsClient();
     const actionsClient = context.actions.getActionsClient();
     const savedObjectsClient = context.core.savedObjects.client;
-    const siemResponse = buildSiemResponse(response);
 
     if (!actionsClient || !alertsClient) {
       return siemResponse.error({ statusCode: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.test.ts
@@ -56,7 +56,7 @@ describe('delete_rules', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getDeleteRequest(), context);
 
       expect(response.status).toEqual(404);

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
@@ -33,6 +33,9 @@ export const deleteRulesRoute = (router: IRouter) => {
 
       try {
         const { id, rule_id: ruleId } = request.query;
+        if (!context.alerting || !context.actions) {
+          return siemResponse.error({ statusCode: 404 });
+        }
 
         const alertsClient = context.alerting.getAlertsClient();
         const actionsClient = context.actions.getActionsClient();

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/export_rules_route.ts
@@ -27,8 +27,11 @@ export const exportRulesRoute = (router: IRouter, config: LegacyServices['config
       },
     },
     async (context, request, response) => {
-      const alertsClient = context.alerting.getAlertsClient();
       const siemResponse = buildSiemResponse(response);
+      if (!context.alerting) {
+        return siemResponse.error({ statusCode: 404 });
+      }
+      const alertsClient = context.alerting.getAlertsClient();
 
       if (!alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
@@ -36,7 +36,7 @@ describe('find_rules', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getFindRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_route.ts
@@ -32,6 +32,9 @@ export const findRulesRoute = (router: IRouter) => {
 
       try {
         const { query } = request;
+        if (!context.alerting) {
+          return siemResponse.error({ statusCode: 404 });
+        }
         const alertsClient = context.alerting.getAlertsClient();
         const savedObjectsClient = context.core.savedObjects.client;
 

diff --git a/...acy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts b/...acy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts
@@ -29,7 +29,7 @@ describe('find_statuses', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(ruleStatusRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_status_route.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/find_rules_status_route.ts
@@ -34,9 +34,12 @@ export const findRulesStatusesRoute = (router: IRouter) => {
     },
     async (context, request, response) => {
       const { query } = request;
+      const siemResponse = buildSiemResponse(response);
+      if (!context.alerting) {
+        return siemResponse.error({ statusCode: 404 });
+      }
       const alertsClient = context.alerting.getAlertsClient();
       const savedObjectsClient = context.core.savedObjects.client;
-      const siemResponse = buildSiemResponse(response);
 
       if (!alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/.../siem/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts b/.../siem/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.test.ts
@@ -58,7 +58,7 @@ describe('get_prepackaged_rule_status_route', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getPrepackagedRulesStatusRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/...ugins/siem/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts b/...ugins/siem/server/lib/detection_engine/routes/rules/get_prepackaged_rules_status_route.ts
@@ -28,8 +28,11 @@ export const getPrepackagedRulesStatusRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
-      const alertsClient = context.alerting.getAlertsClient();
       const siemResponse = buildSiemResponse(response);
+      if (!context.alerting) {
+        return siemResponse.error({ statusCode: 404 });
+      }
+      const alertsClient = context.alerting.getAlertsClient();
 
       if (!alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -78,14 +78,14 @@ describe('import_rules_route', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(request, context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
     });
 
     test('returns 404 if actionsClient is not available on the route', async () => {
-      context.actions.getActionsClient = jest.fn();
+      context.actions!.getActionsClient = jest.fn();
       const response = await server.inject(request, context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -54,12 +54,16 @@ export const importRulesRoute = (router: IRouter, config: LegacyServices['config
       },
     },
     async (context, request, response) => {
+      const siemResponse = buildSiemResponse(response);
+
+      if (!context.alerting || !context.actions) {
+        return siemResponse.error({ statusCode: 404 });
+      }
       const alertsClient = context.alerting.getAlertsClient();
       const actionsClient = context.actions.getActionsClient();
       const clusterClient = context.core.elasticsearch.dataClient;
       const savedObjectsClient = context.core.savedObjects.client;
       const siemClient = context.siem.getSiemClient();
-      const siemResponse = buildSiemResponse(response);
 
       if (!actionsClient || !alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/...gacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/...gacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
@@ -48,7 +48,7 @@ describe('patch_rules_bulk', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getPatchBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/...ck/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/...ck/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
@@ -30,10 +30,14 @@ export const patchRulesBulkRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
+      const siemResponse = buildSiemResponse(response);
+
+      if (!context.alerting || !context.actions) {
+        return siemResponse.error({ statusCode: 404 });
+      }
       const alertsClient = context.alerting.getAlertsClient();
       const actionsClient = context.actions.getActionsClient();
       const savedObjectsClient = context.core.savedObjects.client;
-      const siemResponse = buildSiemResponse(response);
 
       if (!actionsClient || !alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/...ck/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts b/...ck/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
@@ -49,7 +49,7 @@ describe('patch_rules', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getPatchRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts
@@ -60,6 +60,10 @@ export const patchRulesRoute = (router: IRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        if (!context.alerting || !context.actions) {
+          return siemResponse.error({ statusCode: 404 });
+        }
+
         const alertsClient = context.alerting.getAlertsClient();
         const actionsClient = context.actions.getActionsClient();
         const savedObjectsClient = context.core.savedObjects.client;

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.test.ts
@@ -36,7 +36,7 @@ describe('read_signals', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getReadRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.ts
@@ -30,9 +30,13 @@ export const readRulesRoute = (router: IRouter) => {
     },
     async (context, request, response) => {
       const { id, rule_id: ruleId } = request.query;
+      const siemResponse = buildSiemResponse(response);
+
+      if (!context.alerting) {
+        return siemResponse.error({ statusCode: 404 });
+      }
       const alertsClient = context.alerting.getAlertsClient();
       const savedObjectsClient = context.core.savedObjects.client;
-      const siemResponse = buildSiemResponse(response);
 
       try {
         if (!alertsClient) {

diff --git a/...acy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/...acy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
@@ -53,7 +53,7 @@ describe('update_rules_bulk', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getUpdateBulkRequest(), context);
       expect(response.status).toEqual(404);
       expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -30,11 +30,15 @@ export const updateRulesBulkRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
+      const siemResponse = buildSiemResponse(response);
+
+      if (!context.alerting || !context.actions) {
+        return siemResponse.error({ statusCode: 404 });
+      }
       const alertsClient = context.alerting.getAlertsClient();
       const actionsClient = context.actions.getActionsClient();
       const savedObjectsClient = context.core.savedObjects.client;
       const siemClient = context.siem.getSiemClient();
-      const siemResponse = buildSiemResponse(response);
 
       if (!actionsClient || !alertsClient) {
         return siemResponse.error({ statusCode: 404 });

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
@@ -50,7 +50,7 @@ describe('update_rules', () => {
     });
 
     test('returns 404 if alertClient is not available on the route', async () => {
-      context.alerting.getAlertsClient = jest.fn();
+      context.alerting!.getAlertsClient = jest.fn();
       const response = await server.inject(getUpdateRequest(), context);
 
       expect(response.status).toEqual(404);

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -60,6 +60,9 @@ export const updateRulesRoute = (router: IRouter) => {
       const siemResponse = buildSiemResponse(response);
 
       try {
+        if (!context.alerting || !context.actions) {
+          return siemResponse.error({ statusCode: 404 });
+        }
         const alertsClient = context.alerting.getAlertsClient();
         const actionsClient = context.actions.getActionsClient();
         const savedObjectsClient = context.core.savedObjects.client;

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/tags/read_tags_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/tags/read_tags_route.ts
@@ -19,9 +19,13 @@ export const readTagsRoute = (router: IRouter) => {
       },
     },
     async (context, request, response) => {
-      const alertsClient = context.alerting.getAlertsClient();
       const siemResponse = buildSiemResponse(response);
 
+      if (!context.alerting) {
+        return siemResponse.error({ statusCode: 404 });
+      }
+      const alertsClient = context.alerting.getAlertsClient();
+
       if (!alertsClient) {
         return siemResponse.error({ statusCode: 404 });
       }

diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
@@ -41,6 +41,9 @@ 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 });

diff --git a/x-pack/plugins/actions/server/routes/delete.ts b/x-pack/plugins/actions/server/routes/delete.ts
@@ -41,6 +41,9 @@ 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 });

diff --git a/x-pack/plugins/actions/server/routes/find.ts b/x-pack/plugins/actions/server/routes/find.ts
@@ -57,6 +57,9 @@ 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'] = {

diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/server/routes/get.ts
@@ -36,6 +36,9 @@ 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({

diff --git a/x-pack/plugins/actions/server/routes/list_action_types.test.ts b/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,