optimize code

Signed-off-by: yubonluo <[email protected]>
ruanyl · Apr 11, 2024 · 27d95fe · 27d95fe
1 parent b342950
commit 27d95fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
@@ -91,11 +91,9 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
       }
 
       if (!!applicationConfig) {
-        const [coreStart] = await core.getStartServices();
-        const scopeClient = coreStart.opensearch.client.asScoped(request);
         [configGroups, configUsers] = await getApplicationOSDAdminConfig(
           { applicationConfig },
-          scopeClient
+          request
         );
       } else {
         [configGroups, configUsers] = await getOSDAdminConfig(this.globalConfig$);

diff --git a/src/plugins/workspace/server/utils.test.ts b/src/plugins/workspace/server/utils.test.ts
@@ -4,7 +4,7 @@
  */
 
 import { AuthStatus } from '../../../core/server';
-import { coreMock, httpServerMock, httpServiceMock } from '../../../core/server/mocks';
+import { httpServerMock, httpServiceMock } from '../../../core/server/mocks';
 import {
   generateRandomId,
   getApplicationOSDAdminConfig,
@@ -156,12 +156,8 @@ describe('workspace utils', () => {
     const mockDependencies: AppPluginSetupDependencies = {
       applicationConfig: applicationConfigMock,
     };
-    const coreStart = coreMock.createInternalStart();
-    const scopedClusterClientMock = coreStart.opensearch.client.asScoped();
-    const [groups, users] = await getApplicationOSDAdminConfig(
-      mockDependencies,
-      scopedClusterClientMock
-    );
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const [groups, users] = await getApplicationOSDAdminConfig(mockDependencies, mockRequest);
     expect(groups).toEqual(['group1', 'group2']);
     expect(users).toEqual(['user1', 'user2']);
   });
@@ -179,12 +175,8 @@ describe('workspace utils', () => {
     const mockDependencies: AppPluginSetupDependencies = {
       applicationConfig: applicationConfigMock,
     };
-    const coreStart = coreMock.createInternalStart();
-    const scopedClusterClientMock = coreStart.opensearch.client.asScoped();
-    const [groups, users] = await getApplicationOSDAdminConfig(
-      mockDependencies,
-      scopedClusterClientMock
-    );
+    const mockRequest = httpServerMock.createOpenSearchDashboardsRequest();
+    const [groups, users] = await getApplicationOSDAdminConfig(mockDependencies, mockRequest);
     expect(groups).toEqual([]);
     expect(users).toEqual([]);
   });

diff --git a/src/plugins/workspace/server/utils.ts b/src/plugins/workspace/server/utils.ts
@@ -9,7 +9,6 @@ import { first } from 'rxjs/operators';
 import {
   AuthStatus,
   HttpAuth,
-  IScopedClusterClient,
   OpenSearchDashboardsRequest,
   Principals,
   PrincipalType,
@@ -91,9 +90,9 @@ export const stringToArray = (adminConfig: string | undefined) => {
 
 export const getApplicationOSDAdminConfig = async (
   { applicationConfig }: AppPluginSetupDependencies,
-  scopeClient: IScopedClusterClient
+  request: OpenSearchDashboardsRequest
 ) => {
-  const applicationConfigClient = applicationConfig.getConfigurationClient(scopeClient);
+  const applicationConfigClient = applicationConfig.getConfigurationClient(request);
 
   const [groupsResult, usersResult] = await Promise.all([
     applicationConfigClient