[Backport workspace-pr-integr][Workspace] Support workspace in saved …

…objects client in server side (opensearch-project#6365) (#327) * [Workspace] Support workspace in saved objects client in server side. (opensearch-project#6365) * Support workspace in saved objects client in server side. (#293) * feat: POC implementation Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add some comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: revert dependency Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: update comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: address one TODO Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: address TODO Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: some special logic on specific operation Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: declare workspaces as empty array for advanced settings Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: unified workspaces parameters when parsing from router Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: improve code coverage Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: declare workspaces as null Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use unified types Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: update comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove null Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: address comments Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use request app to store request workspace id Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use app state to store request workspace id Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * refact: update types declaration Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: unit test error Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * fix: import error Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add integration test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: add unit test Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: update CHANGELOG Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: use consts and add comment Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: change the priority value Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: update Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com> * feat: remove useless code Signed-off-by: SuZhou-Joe <suzhou@amazon.com> --------- Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl · Apr 15, 2024 · d6999ac · d6999ac
1 parent 2058998
commit d6999ac
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 7 deletions.
diff --git a/src/core/server/saved_objects/import/create_saved_objects.ts b/src/core/server/saved_objects/import/create_saved_objects.ts
@@ -176,7 +176,7 @@ export const createSavedObjects = async <T>({
     const bulkCreateResponse = await savedObjectsClient.bulkCreate(objectsToCreate, {
       namespace,
       overwrite,
-      workspaces,
+      ...(workspaces ? { workspaces } : {}),
     });
     expectedResults = bulkCreateResponse.saved_objects;
   }

diff --git a/src/plugins/workspace/common/constants.ts b/src/plugins/workspace/common/constants.ts
@@ -22,3 +22,13 @@ export enum WorkspacePermissionMode {
 }
 
 export const WORKSPACE_ID_CONSUMER_WRAPPER_ID = 'workspace_id_consumer';
+
+/**
+ * The priority for these wrappers matters:
+ * 1. WORKSPACE_ID_CONSUMER should be placed before the other two wrappers(smaller than the other two wrappers) as it cost little
+ *    and will append the essential workspaces field into the options, which will be honored by permission control wrapper and conflict wrapper.
+ * 2. The order of permission wrapper and conflict wrapper does not matter as no dependency between these two wrappers.
+ */
+export const PRIORITY_FOR_WORKSPACE_ID_CONSUMER_WRAPPER = -2;
+export const PRIORITY_FOR_PERMISSION_CONTROL_WRAPPER = 0;
+export const PRIORITY_FOR_WORKSPACE_CONFLICT_CONTROL_WRAPPER = -1;
diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
@@ -17,6 +17,9 @@ import {
   WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID,
   WORKSPACE_CONFLICT_CONTROL_SAVED_OBJECTS_CLIENT_WRAPPER_ID,
   WORKSPACE_ID_CONSUMER_WRAPPER_ID,
+  PRIORITY_FOR_WORKSPACE_CONFLICT_CONTROL_WRAPPER,
+  PRIORITY_FOR_WORKSPACE_ID_CONSUMER_WRAPPER,
+  PRIORITY_FOR_PERMISSION_CONTROL_WRAPPER,
 } from '../common/constants';
 import {
   IWorkspaceClientImpl,
@@ -107,7 +110,7 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
     );
 
     core.savedObjects.addClientWrapper(
-      0,
+      PRIORITY_FOR_PERMISSION_CONTROL_WRAPPER,
       WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID,
       this.workspaceSavedObjectsClientWrapper.wrapperFactory
     );
@@ -131,13 +134,13 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
     this.workspaceConflictControl = new WorkspaceConflictSavedObjectsClientWrapper();
 
     core.savedObjects.addClientWrapper(
-      -1,
+      PRIORITY_FOR_WORKSPACE_CONFLICT_CONTROL_WRAPPER,
       WORKSPACE_CONFLICT_CONTROL_SAVED_OBJECTS_CLIENT_WRAPPER_ID,
       this.workspaceConflictControl.wrapperFactory
     );
 
     core.savedObjects.addClientWrapper(
-      -2,
+      PRIORITY_FOR_WORKSPACE_ID_CONSUMER_WRAPPER,
       WORKSPACE_ID_CONSUMER_WRAPPER_ID,
       new WorkspaceIdConsumerWrapper().wrapperFactory
     );

diff --git a/...ns/workspace/server/saved_objects/integration_tests/workspace_id_consumer_wrapper.test.ts b/...ns/workspace/server/saved_objects/integration_tests/workspace_id_consumer_wrapper.test.ts
@@ -238,5 +238,33 @@ describe('workspace_id_consumer integration test', () => {
         )
       );
     });
+
+    it('import within workspace', async () => {
+      await clearFooAndBar();
+
+      const importWithWorkspacesResult = await osdTestServer.request
+        .post(root, `/w/${createdFooWorkspace.id}/api/saved_objects/_import?overwrite=false`)
+        .attach(
+          'file',
+          Buffer.from(
+            [
+              JSON.stringify({
+                ...dashboard,
+                id: 'bar',
+              }),
+            ].join('\n'),
+            'utf-8'
+          ),
+          'tmp.ndjson'
+        )
+        .expect(200);
+
+      const findResult = await osdTestServer.request
+        .get(root, `/w/${createdFooWorkspace.id}/api/saved_objects/_find?type=${dashboard.type}`)
+        .expect(200);
+
+      expect(importWithWorkspacesResult.body.success).toEqual(true);
+      expect(findResult.body.saved_objects[0].workspaces).toEqual([createdFooWorkspace.id]);
+    });
   });
 });
diff --git a/...gins/workspace/server/saved_objects/saved_objects_wrapper_for_check_workspace_conflict.ts b/...gins/workspace/server/saved_objects/saved_objects_wrapper_for_check_workspace_conflict.ts
@@ -20,8 +20,8 @@ import {
 const errorContent = (error: Boom.Boom) => error.output.payload;
 
 const filterWorkspacesAccordingToSourceWorkspaces = (
-  targetWorkspaces?: string[],
-  baseWorkspaces?: string[]
+  targetWorkspaces?: SavedObjectsBaseOptions['workspaces'],
+  baseWorkspaces?: SavedObjectsBaseOptions['workspaces']
 ): string[] => targetWorkspaces?.filter((item) => !baseWorkspaces?.includes(item)) || [];
 
 export class WorkspaceConflictSavedObjectsClientWrapper {
@@ -110,7 +110,7 @@ export class WorkspaceConflictSavedObjectsClientWrapper {
             })
         : [];
       const objectsConflictWithWorkspace: SavedObject[] = [];
-      const objectsMapWorkspaces: Record<string, string[] | undefined> = {};
+      const objectsMapWorkspaces: Record<string, SavedObjectsBaseOptions['workspaces']> = {};
       if (bulkGetDocs.length) {
         /**
          * Get latest status of objects