use PIT search for savedObjectTagging plugin (#120476)

* use PIT search for savedObjectTagging plugin * fixing FTR tests * foo is the new grep * fix tests * fix tests again
elastic · Dec 8, 2021 · 6fb7325 · 6fb7325
1 parent 0438566
commit 6fb7325
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts b/x-pack/plugins/saved_objects_tagging/server/routes/lib/get_connection_count.ts
@@ -5,9 +5,13 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract, SavedObjectsFindOptionsReference } from 'src/core/server';
+import {
+  SavedObjectsClientContract,
+  SavedObjectsFindOptionsReference,
+  SavedObject,
+} from 'src/core/server';
 import { tagSavedObjectTypeName } from '../../../common/constants';
-import { Tag, TagWithRelations } from '../../../common/types';
+import { Tag, TagAttributes, TagWithRelations } from '../../../common/types';
 
 export const addConnectionCount = async (
   tags: Tag[],
@@ -22,14 +26,19 @@ export const addConnectionCount = async (
     id,
   }));
 
-  const allResults = await client.find({
+  const pitFinder = client.createPointInTimeFinder<TagAttributes>({
     type: targetTypes,
-    page: 1,
-    perPage: 10000,
+    perPage: 1000,
     hasReference: references,
     hasReferenceOperator: 'OR',
   });
-  allResults.saved_objects.forEach((obj) => {
+
+  const results: SavedObject[] = [];
+  for await (const response of pitFinder.find()) {
+    results.push(...response.saved_objects);
+  }
+
+  results.forEach((obj) => {
     obj.references.forEach((ref) => {
       if (ref.type === tagSavedObjectTypeName && ids.has(ref.id)) {
         counts.set(ref.id, counts.get(ref.id)! + 1);

diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.test.ts
@@ -194,11 +194,19 @@ describe('TagsClient', () => {
     it('calls `soClient.find` with the correct parameters', async () => {
       await tagsClient.getAll();
 
-      expect(soClient.find).toHaveBeenCalledTimes(1);
-      expect(soClient.find).toHaveBeenCalledWith({
+      expect(soClient.createPointInTimeFinder).toHaveBeenCalledTimes(1);
+      expect(soClient.createPointInTimeFinder).toHaveBeenCalledWith({
         type: 'tag',
-        perPage: 10000,
+        perPage: 1000,
       });
+
+      expect(soClient.find).toHaveBeenCalledTimes(1);
+      expect(soClient.find).toHaveBeenCalledWith(
+        expect.objectContaining({
+          type: 'tag',
+          perPage: 1000,
+        })
+      );
     });
 
     it('converts the objects returned from the soClient to tags', async () => {

diff --git a/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts b/x-pack/plugins/saved_objects_tagging/server/services/tags/tags_client.ts
@@ -48,12 +48,18 @@ export class TagsClient implements ITagsClient {
   }
 
   public async getAll() {
-    const result = await this.soClient.find<TagAttributes>({
+    const pitFinder = this.soClient.createPointInTimeFinder<TagAttributes>({
       type: this.type,
-      perPage: 10000,
+      perPage: 1000,
     });
 
-    return result.saved_objects.map(savedObjectToTag);
+    const results: TagSavedObject[] = [];
+    for await (const response of pitFinder.find()) {
+      results.push(...response.saved_objects);
+    }
+    await pitFinder.close();
+
+    return results.map(savedObjectToTag);
   }
 
   public async delete(id: string) {

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts
@@ -45,7 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
           });
         },
       },
-      unauthorized: {
+      noResults: {
         httpCode: 200,
         expectResponse: ({ body }) => {
           expect(body).to.eql({
@@ -54,8 +54,17 @@ export default function ({ getService }: FtrProviderContext) {
           });
         },
       },
+      unauthorized: {
+        httpCode: 403,
+        expectResponse: ({ body }) => {
+          expect(body).to.eql({
+            error: 'Forbidden',
+            message: 'unauthorized',
+            statusCode: 403,
+          });
+        },
+      },
     };
-
     const expectedResults: Record<string, User[]> = {
       authorized: [
         USERS.SUPERUSER,
@@ -67,7 +76,8 @@ export default function ({ getService }: FtrProviderContext) {
         USERS.DEFAULT_SPACE_VISUALIZE_READ_USER,
         USERS.DEFAULT_SPACE_MAPS_READ_USER,
       ],
-      unauthorized: [USERS.NOT_A_KIBANA_USER, USERS.DEFAULT_SPACE_ADVANCED_SETTINGS_READ_USER],
+      noResults: [USERS.DEFAULT_SPACE_ADVANCED_SETTINGS_READ_USER],
+      unauthorized: [USERS.NOT_A_KIBANA_USER],
     };
 
     const createUserTest = (

diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts
@@ -50,10 +50,12 @@ export default function ({ getService }: FtrProviderContext) {
         },
       },
       unauthorized: {
-        httpCode: 200,
+        httpCode: 403,
         expectResponse: ({ body }) => {
           expect(body).to.eql({
-            tags: [],
+            error: 'Forbidden',
+            message: 'unauthorized',
+            statusCode: 403,
           });
         },
       },