Fixed more issues from PR review

elastic · Jul 20, 2021 · 2793a8f · 2793a8f
1 parent d0f8274
commit 2793a8f
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 34 deletions.
diff --git a/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -23,9 +23,28 @@ const createMockClients = () => ({
   appClient: siemMock.createClient(),
 });
 
+/**
+ * Adds mocking to the interface so we don't have to cast everywhere
+ */
+type SecuritySolutionRequestHandlerContextMock = SecuritySolutionRequestHandlerContext & {
+  core: {
+    elasticsearch: {
+      client: {
+        asCurrentUser: {
+          updateByQuery: jest.Mock;
+          search: jest.Mock;
+          transport: {
+            request: jest.Mock;
+          };
+        };
+      };
+    };
+  };
+};
+
 const createRequestContextMock = (
   clients: ReturnType<typeof createMockClients> = createMockClients()
-) => {
+): SecuritySolutionRequestHandlerContextMock => {
   const coreContext = coreMock.createRequestHandlerContext();
   return ({
     alerting: { getAlertsClient: jest.fn(() => clients.alertsClient) },
@@ -39,7 +58,7 @@ const createRequestContextMock = (
     },
     licensing: clients.licensing,
     securitySolution: { getAppClient: jest.fn(() => clients.appClient) },
-  } as unknown) as SecuritySolutionRequestHandlerContext;
+  } as unknown) as SecuritySolutionRequestHandlerContextMock;
 };
 
 const createTools = () => {

diff --git a/...rity_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts b/...rity_solution/server/lib/detection_engine/routes/privileges/read_privileges_route.test.ts
@@ -19,8 +19,7 @@ describe('read_privileges route', () => {
     server = serverMock.create();
     ({ context } = requestContextMock.createTools());
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.transport.request as any).mockResolvedValue({
+    context.core.elasticsearch.client.asCurrentUser.transport.request.mockResolvedValue({
       body: getMockPrivilegesResult(),
     });
 
@@ -66,8 +65,7 @@ describe('read_privileges route', () => {
     });
 
     test('returns 500 when bad response from cluster', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.transport.request as any).mockResolvedValue(
+      context.core.elasticsearch.client.asCurrentUser.transport.request.mockResolvedValue(
         elasticsearchClientMock.createErrorTransportRequestPromise(new Error('Test error'))
       );
       const response = await server.inject(

diff --git a/...ity_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/...ity_solution/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -100,8 +100,7 @@ describe('add_prepackaged_rules_route', () => {
       errors: [],
     });
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+    context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 1 } })
     );
     addPrepackedRulesRoute(server.router, createMockConfig(), securitySetup);
@@ -129,8 +128,7 @@ describe('add_prepackaged_rules_route', () => {
 
     test('it returns a 400 if the index does not exist', async () => {
       const request = addPrepackagedRulesRequest();
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValueOnce(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValueOnce(
         elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 0 } })
       );
       const response = await server.inject(request, context);
@@ -185,8 +183,7 @@ describe('add_prepackaged_rules_route', () => {
     });
 
     test('catches errors if payloads cause errors to be thrown', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
         elasticsearchClientMock.createErrorTransportRequestPromise(new Error('Test error'))
       );
       const request = addPrepackagedRulesRequest();

diff --git a/...ecurity_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/...ecurity_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -37,8 +37,7 @@ describe('create_rules_bulk', () => {
     clients.alertsClient.find.mockResolvedValue(getEmptyFindResult()); // no existing rules
     clients.alertsClient.create.mockResolvedValue(getAlertMock(getQueryRuleParams())); // successful creation
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+    context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 1 } })
     );
     createRulesBulkRoute(server.router, ml);
@@ -88,8 +87,7 @@ describe('create_rules_bulk', () => {
     });
 
     it('returns an error object if the index does not exist', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValueOnce(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValueOnce(
         elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 0 } })
       );
       const response = await server.inject(getReadBulkRequest(), context);

diff --git a/...ins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/...ins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -40,8 +40,7 @@ describe('create_rules', () => {
     clients.alertsClient.create.mockResolvedValue(getAlertMock(getQueryRuleParams())); // creation succeeds
     clients.savedObjectsClient.find.mockResolvedValue(getFindResultStatus()); // needed to transform
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+    context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 1 } })
     );
     createRulesRoute(server.router, ml);
@@ -106,8 +105,7 @@ describe('create_rules', () => {
 
   describe('unhappy paths', () => {
     test('it returns a 400 if the index does not exist', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValueOnce(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValueOnce(
         elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 0 } })
       );
       const response = await server.inject(getCreateRequest(), context);

diff --git a/...ins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/...ins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -46,8 +46,7 @@ describe('import_rules_route', () => {
 
     clients.alertsClient.find.mockResolvedValue(getEmptyFindResult()); // no extant rules
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+    context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 1 } })
     );
     importRulesRoute(server.router, config, ml);
@@ -128,8 +127,7 @@ describe('import_rules_route', () => {
 
     test('returns an error if the index does not exist', async () => {
       clients.appClient.getSignalsIndex.mockReturnValue('mockSignalsIndex');
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValueOnce(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValueOnce(
         elasticsearchClientMock.createSuccessTransportRequestPromise({ _shards: { total: 0 } })
       );
       const response = await server.inject(request, context);
@@ -142,8 +140,7 @@ describe('import_rules_route', () => {
     });
 
     test('returns an error when cluster throws error', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
         elasticsearchClientMock.createErrorTransportRequestPromise({
           body: new Error('Test error'),
         })

diff --git a/...s/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts b/...s/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
@@ -26,8 +26,7 @@ describe('set signal status', () => {
   beforeEach(() => {
     server = serverMock.create();
     ({ context } = requestContextMock.createTools());
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+    context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise(
         getSuccessfulSignalUpdateResponse()
       )
@@ -58,8 +57,7 @@ describe('set signal status', () => {
     });
 
     test('catches error if asCurrentUser throws error', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.updateByQuery as any).mockResolvedValue(
+      context.core.elasticsearch.client.asCurrentUser.updateByQuery.mockResolvedValue(
         elasticsearchClientMock.createErrorTransportRequestPromise(new Error('Test error'))
       );
       const response = await server.inject(getSetSignalStatusByQueryRequest(), context);

diff --git a/.../security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts b/.../security_solution/server/lib/detection_engine/routes/signals/query_signals_route.test.ts
@@ -27,8 +27,7 @@ describe('query for signal', () => {
     server = serverMock.create();
     ({ context } = requestContextMock.createTools());
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+    context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise(getEmptySignalsResponse())
     );
 
@@ -71,8 +70,7 @@ describe('query for signal', () => {
     });
 
     test('catches error if query throws error', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (context.core.elasticsearch.client.asCurrentUser.search as any).mockResolvedValue(
+      context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
         elasticsearchClientMock.createErrorTransportRequestPromise(new Error('Test error'))
       );
       const response = await server.inject(getSignalsAggsQueryRequest(), context);