feat: remove useless code (opensearch-project#311)

Signed-off-by: SuZhou-Joe <[email protected]>
SuZhou-Joe · Mar 27, 2024 · a2cead4 · a2cead4
1 parent e3ce2e2
commit a2cead4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 127 deletions.
diff --git a/src/core/server/saved_objects/import/import_saved_objects.test.ts b/src/core/server/saved_objects/import/import_saved_objects.test.ts
@@ -42,7 +42,7 @@ import { typeRegistryMock } from '../saved_objects_type_registry.mock';
 import { importSavedObjectsFromStream } from './import_saved_objects';
 
 import { collectSavedObjects } from './collect_saved_objects';
-import { regenerateIds, regenerateIdsWithReference } from './regenerate_ids';
+import { regenerateIds } from './regenerate_ids';
 import { validateReferences } from './validate_references';
 import { checkConflicts } from './check_conflicts';
 import { checkOriginConflicts } from './check_origin_conflicts';
@@ -70,7 +70,6 @@ describe('#importSavedObjectsFromStream', () => {
       importIdMap: new Map(),
     });
     getMockFn(regenerateIds).mockReturnValue(new Map());
-    getMockFn(regenerateIdsWithReference).mockReturnValue(Promise.resolve(new Map()));
     getMockFn(validateReferences).mockResolvedValue([]);
     getMockFn(checkConflicts).mockResolvedValue({
       errors: [],
@@ -279,15 +278,6 @@ describe('#importSavedObjectsFromStream', () => {
           ]),
         });
         getMockFn(validateReferences).mockResolvedValue([errors[1]]);
-        getMockFn(regenerateIdsWithReference).mockResolvedValue(
-          Promise.resolve(
-            new Map([
-              ['foo', {}],
-              ['bar', {}],
-              ['baz', {}],
-            ])
-          )
-        );
         getMockFn(checkConflicts).mockResolvedValue({
           errors: [errors[2]],
           filteredObjects,

diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts
@@ -38,7 +38,7 @@ import { validateReferences } from './validate_references';
 import { checkOriginConflicts } from './check_origin_conflicts';
 import { createSavedObjects } from './create_saved_objects';
 import { checkConflicts } from './check_conflicts';
-import { regenerateIds, regenerateIdsWithReference } from './regenerate_ids';
+import { regenerateIds } from './regenerate_ids';
 import { checkConflictsForDataSource } from './check_conflict_for_data_source';
 
 /**
@@ -86,17 +86,6 @@ export async function importSavedObjectsFromStream({
     // randomly generated id
     importIdMap = regenerateIds(collectSavedObjectsResult.collectedObjects, dataSourceId);
   } else {
-    // in check conclict and override mode
-
-    if (workspaces) {
-      importIdMap = await regenerateIdsWithReference({
-        savedObjects: collectSavedObjectsResult.collectedObjects,
-        savedObjectsClient,
-        workspaces,
-        objectLimit,
-        importIdMap,
-      });
-    }
     // Check single-namespace objects for conflicts in this namespace, and check multi-namespace objects for conflicts across all namespaces
     const checkConflictsParams = {
       objects: collectSavedObjectsResult.collectedObjects,

diff --git a/src/core/server/saved_objects/import/regenerate_ids.test.ts b/src/core/server/saved_objects/import/regenerate_ids.test.ts
@@ -29,10 +29,8 @@
  */
 
 import { mockUuidv4 } from './__mocks__';
-import { regenerateIds, regenerateIdsWithReference } from './regenerate_ids';
+import { regenerateIds } from './regenerate_ids';
 import { SavedObject } from '../types';
-import { savedObjectsClientMock } from '../service/saved_objects_client.mock';
-import { SavedObjectsBulkResponse } from '../service';
 
 describe('#regenerateIds', () => {
   const objects = ([
@@ -70,70 +68,3 @@ describe('#regenerateIds', () => {
     `);
   });
 });
-
-describe('#regenerateIdsWithReference', () => {
-  const objects = ([
-    { type: 'foo', id: '1' },
-    { type: 'bar', id: '2' },
-    { type: 'baz', id: '3' },
-  ] as any) as SavedObject[];
-
-  test('returns expected values', async () => {
-    const mockedSavedObjectsClient = savedObjectsClientMock.create();
-    mockUuidv4.mockReturnValueOnce('uuidv4 #1');
-    const result: SavedObjectsBulkResponse<unknown> = {
-      saved_objects: [
-        {
-          error: {
-            statusCode: 404,
-            error: '',
-            message: '',
-          },
-          id: '1',
-          type: 'foo',
-          attributes: {},
-          references: [],
-        },
-        {
-          id: '2',
-          type: 'bar',
-          attributes: {},
-          references: [],
-          workspaces: ['bar'],
-        },
-        {
-          id: '3',
-          type: 'baz',
-          attributes: {},
-          references: [],
-          workspaces: ['foo'],
-        },
-      ],
-    };
-    mockedSavedObjectsClient.bulkGet.mockResolvedValue(result);
-    expect(
-      await regenerateIdsWithReference({
-        savedObjects: objects,
-        savedObjectsClient: mockedSavedObjectsClient,
-        workspaces: ['bar'],
-        objectLimit: 1000,
-        importIdMap: new Map(),
-      })
-    ).toMatchInlineSnapshot(`
-      Map {
-        "foo:1" => Object {
-          "id": "1",
-          "omitOriginId": true,
-        },
-        "bar:2" => Object {
-          "id": "2",
-          "omitOriginId": false,
-        },
-        "baz:3" => Object {
-          "id": "uuidv4 #1",
-          "omitOriginId": true,
-        },
-      }
-    `);
-  });
-});
diff --git a/src/core/server/saved_objects/import/regenerate_ids.ts b/src/core/server/saved_objects/import/regenerate_ids.ts
@@ -29,8 +29,7 @@
  */
 
 import { v4 as uuidv4 } from 'uuid';
-import { SavedObject, SavedObjectsClientContract } from '../types';
-import { SavedObjectsUtils } from '../service';
+import { SavedObject } from '../types';
 
 /**
  * Takes an array of saved objects and returns an importIdMap of randomly-generated new IDs.
@@ -48,35 +47,3 @@ export const regenerateIds = (objects: SavedObject[], dataSourceId: string | und
   }, new Map<string, { id: string; omitOriginId?: boolean }>());
   return importIdMap;
 };
-
-export const regenerateIdsWithReference = async (props: {
-  savedObjects: SavedObject[];
-  savedObjectsClient: SavedObjectsClientContract;
-  workspaces: string[];
-  objectLimit: number;
-  importIdMap: Map<string, { id?: string; omitOriginId?: boolean }>;
-}): Promise<Map<string, { id?: string; omitOriginId?: boolean }>> => {
-  const { savedObjects, savedObjectsClient, workspaces, importIdMap } = props;
-
-  const bulkGetResult = await savedObjectsClient.bulkGet(
-    savedObjects.map((item) => ({ type: item.type, id: item.id }))
-  );
-
-  return bulkGetResult.saved_objects.reduce((acc, object) => {
-    if (object.error?.statusCode === 404) {
-      acc.set(`${object.type}:${object.id}`, { id: object.id, omitOriginId: true });
-      return acc;
-    }
-
-    const filteredWorkspaces = SavedObjectsUtils.filterWorkspacesAccordingToBaseWorkspaces(
-      workspaces,
-      object.workspaces
-    );
-    if (filteredWorkspaces.length) {
-      acc.set(`${object.type}:${object.id}`, { id: uuidv4(), omitOriginId: true });
-    } else {
-      acc.set(`${object.type}:${object.id}`, { id: object.id, omitOriginId: false });
-    }
-    return acc;
-  }, importIdMap);
-};