EMT-451: some more clean up

nnamdifrankie · nnamdifrankie · commit b310f920d34c · 2020-06-25T07:52:50.000-04:00
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts
@@ -25,23 +25,6 @@ const noUnenrolledEndpoint = () =>
 
 describe('test find all unenrolled HostId', () => {
   let mockScopedClient: jest.Mocked<IScopedClusterClient>;
-  const expectedAllUnenrolledHostQuery = {
-    index: metadataMirrorIndexPattern,
-    scroll: '10s',
-    body: {
-      size: 1000,
-      _source: ['host.id'],
-      query: {
-        bool: {
-          filter: {
-            term: {
-              'Endpoint.status': EndpointStatus.unenrolled,
-            },
-          },
-        },
-      },
-    },
-  };
 
   it('can find all hits with scroll', async () => {
     const firstHostId = '1fdca33f-799f-49f4-939c-ea4383c77671';
@@ -74,9 +57,23 @@ describe('test find all unenrolled HostId', () => {
       .mockImplementationOnce(noUnenrolledEndpoint);
     const hostIds = await findAllUnenrolledHostIds(mockScopedClient);
 
-    expect(mockScopedClient.callAsCurrentUser.mock.calls[0][1]).toEqual(
-      expectedAllUnenrolledHostQuery
-    );
+    expect(mockScopedClient.callAsCurrentUser.mock.calls[0][1]).toEqual({
+      index: metadataMirrorIndexPattern,
+      scroll: '30s',
+      body: {
+        size: 1000,
+        _source: ['host.id'],
+        query: {
+          bool: {
+            filter: {
+              term: {
+                'Endpoint.status': EndpointStatus.unenrolled,
+              },
+            },
+          },
+        },
+      },
+    });
     expect(hostIds).toEqual([
       { host: { id: firstEndpointHostId } },
       { host: { id: secondEndpointHostId } },
@@ -94,6 +91,9 @@ describe('test find unenrolled endpoint host id by hostId', () => {
       Promise.resolve(createSearchResponse(firstEndpointHostId, 'initialScrollId'))
     );
     const endpointHostId = await findUnenrolledHostByHostId(mockScopedClient, firstEndpointHostId);
+    expect(mockScopedClient.callAsCurrentUser.mock.calls[0][1]?.index).toEqual(
+      metadataMirrorIndexPattern
+    );
     expect(mockScopedClient.callAsCurrentUser.mock.calls[0][1]?.body).toEqual({
       size: 1,
       _source: ['host.id'],
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
@@ -9,7 +9,7 @@ import { SearchResponse } from 'elasticsearch';
 import { metadataMirrorIndexPattern } from '../../../../../common/endpoint/constants';
 import { EndpointStatus } from '../../../../../common/endpoint/types';
 
-const KEEPALIVE = '10s';
+const KEEPALIVE = '30s';
 const SIZE = 1000;
 
 export interface HostId {
