Fix existing failed integration test cases (opensearch-project#260)

* fix: integration test fail Signed-off-by: SuZhou-Joe <[email protected]> * feat: change variable name Signed-off-by: SuZhou-Joe <[email protected]> --------- Signed-off-by: SuZhou-Joe <[email protected]>
SuZhou-Joe · Feb 29, 2024 · 587f0d4 · 587f0d4
1 parent e025fd7
commit 587f0d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...ace/server/saved_objects/integration_tests/workspace_saved_objects_client_wrapper.test.ts b/...ace/server/saved_objects/integration_tests/workspace_saved_objects_client_wrapper.test.ts
@@ -11,7 +11,7 @@ import {
   TestOpenSearchDashboardsUtils,
   TestUtils,
 } from '../../../../../core/test_helpers/osd_server';
-import { SavedObjectsErrorHelpers } from '../../../../../core/server';
+import { SavedObjectsErrorHelpers, WORKSPACE_TYPE } from '../../../../../core/server';
 import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import * as utilsExports from '../../utils';
 
@@ -74,7 +74,13 @@ describe('WorkspaceSavedObjectsClientWrapper', () => {
     opensearchServer = await servers.startOpenSearch();
     osd = await servers.startOpenSearchDashboards();
 
-    internalSavedObjectsRepository = osd.coreStart.savedObjects.createInternalRepository();
+    /**
+     * Workspace is a hidden type,
+     * and this integration_test is mainly to test the permission control function so we add workspace into includedHiddenTypes
+     */
+    internalSavedObjectsRepository = osd.coreStart.savedObjects.createInternalRepository([
+      WORKSPACE_TYPE,
+    ]);
 
     await repositoryKit.create(
       internalSavedObjectsRepository,

diff --git a/src/plugins/workspace/server/workspace_client.ts b/src/plugins/workspace/server/workspace_client.ts
@@ -343,8 +343,9 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceClientImpl {
         type: WORKSPACE_TYPE,
         ...(permissionModes ? { ACLSearchParams: { permissionModes } } : {}),
       });
-      const { saved_objects: resultSavedObjects, ...others } = resultResp;
+      const { saved_objects: resultSavedObjects, ...resultOthers } = resultResp;
       let savedObjects = resultSavedObjects;
+      let others = resultOthers;
       const scopedClientWithoutPermissionCheck = this.getScopedClientWithoutPermission(
         requestDetail
       );
@@ -397,7 +398,9 @@ export class WorkspaceClientWithSavedObject implements IWorkspaceClientImpl {
             type: WORKSPACE_TYPE,
             ...(permissionModes ? { ACLSearchParams: { permissionModes } } : {}),
           });
+          const { saved_objects: retrySavedObjects, ...retryOthers } = retryFindResp;
           savedObjects = retryFindResp.saved_objects;
+          others = retryOthers;
         }
       } catch (e) {
         this.logger.error(`Some error happened when initializing reserved workspace: ${e}`);