Apply suggestions from code review

Co-authored-by: Aleh Zasypkin <aleh.zasypkin@gmail.com>
elastic · Nov 19, 2020 · d8c3de0 · d8c3de0
1 parent 0a4a045
commit d8c3de0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
@@ -355,7 +355,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
           : undefined,
     });
 
-    const spaceIdToNamespace = (spaceId?: string): string | undefined => {
+    const spaceIdToNamespace = (spaceId?: string) => {
       return plugins.spaces && spaceId
         ? plugins.spaces.spacesService.spaceIdToNamespace(spaceId)
         : undefined;

diff --git a/x-pack/plugins/alerts/server/plugin.ts b/x-pack/plugins/alerts/server/plugin.ts
@@ -268,7 +268,7 @@ export class AlertingPlugin {
       includedHiddenTypes: ['alert'],
     });
 
-    const spaceIdToNamespace = (spaceId?: string): string | undefined => {
+    const spaceIdToNamespace = (spaceId?: string) => {
       return plugins.spaces && spaceId
         ? plugins.spaces.spacesService.spaceIdToNamespace(spaceId)
         : undefined;

diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.test.ts
@@ -49,7 +49,7 @@ const setup = ({ securityEnabled = false }: Opts = {}) => {
     if (!space) {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError('space', spaceId);
     }
-    return Promise.resolve(space);
+    return space;
   });
 
   const authorization = authorizationMock.create({

diff --git a/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts b/x-pack/plugins/security/server/spaces/secure_spaces_client_wrapper.ts
@@ -42,7 +42,6 @@ export class SecureSpacesClientWrapper implements ISpacesClient {
     private readonly authorization: AuthorizationServiceSetup,
     private readonly legacyAuditLogger: LegacySpacesAuditLogger
   ) {
-    this.useRbac = authorization.mode.useRbacForRequest(request);
   }
 
   public async getAll({
@@ -170,7 +169,7 @@ export class SecureSpacesClientWrapper implements ISpacesClient {
   }
 
   private async ensureAuthorizedGlobally(action: string, method: string, forbiddenMessage: string) {
-    const checkPrivileges = this.authorization!.checkPrivilegesWithRequest(this.request);
+    const checkPrivileges = this.authorization.checkPrivilegesWithRequest(this.request);
     const { username, hasAllRequested } = await checkPrivileges.globally({ kibana: action });
 
     if (hasAllRequested) {

diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
@@ -8,7 +8,7 @@ import Boom from '@hapi/boom';
 import { omit } from 'lodash';
 import { ISavedObjectsRepository } from 'src/core/server';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { isReservedSpace } from '../../common/is_reserved_space';
+import { isReservedSpace } from '../../common';
 import { Space } from '../../common/model/space';
 import { ConfigType } from '../config';
 import { GetAllSpacesPurpose, GetSpaceResult } from '../../common/model/types';
@@ -55,7 +55,7 @@ export class SpacesClient {
     return savedObjects.map(this.transformSavedObjectToSpace);
   }
 
-  public async get(id: string): Promise<Space> {
+  public async get(id: string) {
     const savedObject = await this.repository.get('space', id);
     return this.transformSavedObjectToSpace(savedObject);
   }
@@ -101,7 +101,7 @@ export class SpacesClient {
     await this.repository.delete('space', id);
   }
 
-  private transformSavedObjectToSpace(savedObject: any): Space {
+  private transformSavedObjectToSpace(savedObject: SavedObject<any>) {
     return {
       id: savedObject.id,
       ...savedObject.attributes,

diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client_service.ts
@@ -28,7 +28,7 @@ export interface SpacesClientServiceSetup {
   /**
    * Sets the factory that should be used to create the Saved Objects Repository
    * whenever a new instance of the SpacesClient is created. By default, a repository
-   * scoped the current user will be created.
+   * scoped to the current user will be created.
    */
   setClientRepositoryFactory: (factory: SpacesClientRepositoryFactory) => void;
 

diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
@@ -7,7 +7,7 @@
 import { Subscription } from 'rxjs';
 import type { KibanaRequest, IBasePath } from 'src/core/server';
 import { SpacesClientServiceStart } from '../spaces_client';
-import { getSpaceIdFromPath } from '../../common/lib/spaces_url_parser';
+import { getSpaceIdFromPath } from '../../common';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 import { spaceIdToNamespace, namespaceToSpaceId } from '../lib/utils/namespace';
 import { Space } from '..';