address comments

mshustov · mshustov · commit f2750b8044f7 · 2021-01-21T11:00:51.000+01:00
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
@@ -41,15 +41,15 @@ import { createApmApi } from './routes/create_apm_api';
 import { apmIndices, apmTelemetry } from './saved_objects';
 import { createElasticCloudInstructions } from './tutorial/elastic_cloud';
 import { uiSettings } from './ui_settings';
-import type { AplPluginRequestHandlerContext } from './routes/typings';
+import type { ApmPluginRequestHandlerContext } from './routes/typings';
 
 export interface APMPluginSetup {
   config$: Observable<APMConfig>;
   getApmIndices: () => ReturnType<typeof getApmIndices>;
   createApmEventClient: (params: {
     debug?: boolean;
     request: KibanaRequest;
-    context: AplPluginRequestHandlerContext;
+    context: ApmPluginRequestHandlerContext;
   }) => Promise<ReturnType<typeof createApmEventClient>>;
 }
 
@@ -166,7 +166,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
       }: {
         debug?: boolean;
         request: KibanaRequest;
-        context: AplPluginRequestHandlerContext;
+        context: ApmPluginRequestHandlerContext;
       }) => {
         const [indices, includeFrozen] = await Promise.all([
           boundGetApmIndices(),
diff --git a/x-pack/plugins/apm/server/routes/create_api/index.ts b/x-pack/plugins/apm/server/routes/create_api/index.ts
@@ -15,7 +15,7 @@ import { strictKeysRt } from '../../../common/runtime_types/strict_keys_rt';
 import { APMConfig } from '../..';
 import { ServerAPI } from '../typings';
 import { jsonRt } from '../../../common/runtime_types/json_rt';
-import type { AplPluginRequestHandlerContext } from '../typings';
+import type { ApmPluginRequestHandlerContext } from '../typings';
 
 const debugRt = t.exact(
   t.partial({
@@ -76,7 +76,7 @@ export function createApi() {
 
         (router[typedRouterMethod] as RouteRegistrar<
           typeof typedRouterMethod,
-          AplPluginRequestHandlerContext
+          ApmPluginRequestHandlerContext
         >)(
           {
             path,
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
@@ -68,13 +68,13 @@ export interface Route<
 /**
  * @internal
  */
-export interface AplPluginRequestHandlerContext extends RequestHandlerContext {
+export interface ApmPluginRequestHandlerContext extends RequestHandlerContext {
   licensing: LicensingApiRequestHandlerContext;
 }
 
 export type APMRequestHandlerContext<
   TRouteParams = {}
-> = AplPluginRequestHandlerContext & {
+> = ApmPluginRequestHandlerContext & {
   params: TRouteParams & { query: { _debug: boolean } };
   config: APMConfig;
   logger: Logger;
diff --git a/x-pack/plugins/cross_cluster_replication/server/types.ts b/x-pack/plugins/cross_cluster_replication/server/types.ts
@@ -41,4 +41,4 @@ export interface CcrRequestHandlerContext extends RequestHandlerContext {
 /**
  * @internal
  */
-export type CcrPluginRouter = IRouter<CcrRequestHandlerContext>;
+type CcrPluginRouter = IRouter<CcrRequestHandlerContext>;
diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts
@@ -20,15 +20,15 @@ import {
   SAMLLogin,
 } from '../../authentication';
 import { defineCommonRoutes } from './common';
-import type { SecurityRequestHandlerContext, SecurityPluginRouter } from '../../types';
+import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
 
 import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 
 describe('Common authentication routes', () => {
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
   let license: jest.Mocked<SecurityLicense>;
   let mockContext: SecurityRequestHandlerContext;
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.test.ts b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
@@ -9,15 +9,15 @@ import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { AuthenticationResult, AuthenticationServiceStart, SAMLLogin } from '../../authentication';
 import { defineSAMLRoutes } from './saml';
 import type { RequestHandler, RouteConfig } from '../../../../../../src/core/server';
-import type { SecurityPluginRouter } from '../../types';
+import type { SecurityRouter } from '../../types';
 
 import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
 import { routeDefinitionParamsMock } from '../index.mock';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 
 describe('SAML authentication routes', () => {
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
   beforeEach(() => {
     const routeParamsMock = routeDefinitionParamsMock.create();
diff --git a/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts b/x-pack/plugins/security/server/routes/authorization/spaces/share_saved_object_permissions.test.ts
@@ -16,10 +16,10 @@ import { routeDefinitionParamsMock } from '../../index.mock';
 import { RouteDefinitionParams } from '../..';
 import { DeeplyMockedKeys } from '@kbn/utility-types/target/jest';
 import { CheckPrivileges } from '../../../authorization/types';
-import type { SecurityRequestHandlerContext, SecurityPluginRouter } from '../../../types';
+import type { SecurityRequestHandlerContext, SecurityRouter } from '../../../types';
 
 describe('Share Saved Object Permissions', () => {
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let routeParamsMock: DeeplyMockedKeys<RouteDefinitionParams>;
 
   const mockContext = ({
@@ -30,7 +30,7 @@ describe('Share Saved Object Permissions', () => {
 
   beforeEach(() => {
     routeParamsMock = routeDefinitionParamsMock.create();
-    router = routeParamsMock.router as jest.Mocked<SecurityPluginRouter>;
+    router = routeParamsMock.router as jest.Mocked<SecurityRouter>;
 
     defineShareSavedObjectPermissionRoutes(routeParamsMock);
   });
diff --git a/x-pack/plugins/security/server/routes/index.ts b/x-pack/plugins/security/server/routes/index.ts
@@ -12,7 +12,7 @@ import type { AuthorizationServiceSetup } from '../authorization';
 import type { ConfigType } from '../config';
 import type { SecurityFeatureUsageServiceStart } from '../feature_usage';
 import type { Session } from '../session_management';
-import type { SecurityPluginRouter } from '../types';
+import type { SecurityRouter } from '../types';
 
 import { defineAuthenticationRoutes } from './authentication';
 import { defineAuthorizationRoutes } from './authorization';
@@ -27,7 +27,7 @@ import { defineViewRoutes } from './views';
  * Describes parameters used to define HTTP routes.
  */
 export interface RouteDefinitionParams {
-  router: SecurityPluginRouter;
+  router: SecurityRouter;
   basePath: IBasePath;
   httpResources: HttpResources;
   logger: Logger;
diff --git a/x-pack/plugins/security/server/routes/session_management/extend.test.ts b/x-pack/plugins/security/server/routes/session_management/extend.test.ts
@@ -12,11 +12,11 @@ import {
 import { defineSessionExtendRoutes } from './extend';
 
 import { httpServerMock } from '../../../../../../src/core/server/mocks';
-import type { SecurityRequestHandlerContext, SecurityPluginRouter } from '../../types';
+import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
 
 describe('Extend session routes', () => {
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   beforeEach(() => {
     const routeParamsMock = routeDefinitionParamsMock.create();
     router = routeParamsMock.router;
diff --git a/x-pack/plugins/security/server/routes/session_management/info.test.ts b/x-pack/plugins/security/server/routes/session_management/info.test.ts
@@ -12,14 +12,14 @@ import {
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Session } from '../../session_management';
 import { defineSessionInfoRoutes } from './info';
-import type { SecurityRequestHandlerContext, SecurityPluginRouter } from '../../types';
+import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
 
 import { httpServerMock } from '../../../../../../src/core/server/mocks';
 import { sessionMock } from '../../session_management/session.mock';
 import { routeDefinitionParamsMock } from '../index.mock';
 
 describe('Info session routes', () => {
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let session: jest.Mocked<PublicMethodsOf<Session>>;
   beforeEach(() => {
     const routeParamsMock = routeDefinitionParamsMock.create();
diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts
@@ -8,7 +8,7 @@ import { errors } from 'elasticsearch';
 import { ObjectType } from '@kbn/config-schema';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
-import type { SecurityRequestHandlerContext, SecurityPluginRouter } from '../../types';
+import type { SecurityRequestHandlerContext, SecurityRouter } from '../../types';
 import {
   Headers,
   kibanaResponseFactory,
@@ -26,7 +26,7 @@ import { routeDefinitionParamsMock } from '../index.mock';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 
 describe('Change password', () => {
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
   let session: jest.Mocked<PublicMethodsOf<Session>>;
   let routeHandler: RequestHandler<any, any, any, SecurityRequestHandlerContext>;
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
@@ -16,15 +16,15 @@ import type { AuthenticationProvider } from '../../../common/model';
 import { ConfigType } from '../../config';
 import { Session } from '../../session_management';
 import { defineAccessAgreementRoutes } from './access_agreement';
-import type { SecurityPluginRouter, SecurityRequestHandlerContext } from '../../types';
+import type { SecurityRouter, SecurityRequestHandlerContext } from '../../types';
 
 import { httpResourcesMock, httpServerMock } from '../../../../../../src/core/server/mocks';
 import { sessionMock } from '../../session_management/session.mock';
 import { routeDefinitionParamsMock } from '../index.mock';
 
 describe('Access agreement view routes', () => {
   let httpResources: jest.Mocked<HttpResources>;
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let config: ConfigType;
   let session: jest.Mocked<PublicMethodsOf<Session>>;
   let license: jest.Mocked<SecurityLicense>;
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -17,7 +17,7 @@ import { SecurityLicense } from '../../../common/licensing';
 import { LoginSelectorProvider } from '../../../common/login_state';
 import { ConfigType } from '../../config';
 import { defineLoginRoutes } from './login';
-import type { SecurityPluginRouter, SecurityRequestHandlerContext } from '../../types';
+import type { SecurityRouter, SecurityRequestHandlerContext } from '../../types';
 
 import {
   coreMock,
@@ -28,7 +28,7 @@ import { routeDefinitionParamsMock } from '../index.mock';
 
 describe('Login view routes', () => {
   let httpResources: jest.Mocked<HttpResources>;
-  let router: jest.Mocked<SecurityPluginRouter>;
+  let router: jest.Mocked<SecurityRouter>;
   let license: jest.Mocked<SecurityLicense>;
   let config: ConfigType;
   beforeEach(() => {
diff --git a/x-pack/plugins/security/server/types.ts b/x-pack/plugins/security/server/types.ts
@@ -16,4 +16,4 @@ export interface SecurityRequestHandlerContext extends RequestHandlerContext {
 /**
  * @internal
  */
-export type SecurityPluginRouter = IRouter<SecurityRequestHandlerContext>;
+export type SecurityRouter = IRouter<SecurityRequestHandlerContext>;
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
@@ -169,12 +169,12 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     };
 
     const router = core.http.createRouter<SecuritySolutionRequestHandlerContext>();
-    core.http.registerRouteHandlerContext<
-      SecuritySolutionRequestHandlerContext,
-      'securitySolution'
-    >(APP_ID, (context, request, response) => ({
-      getAppClient: () => this.appClientFactory.create(request),
-    }));
+    core.http.registerRouteHandlerContext<SecuritySolutionRequestHandlerContext, typeof APP_ID>(
+      APP_ID,
+      (context, request, response) => ({
+        getAppClient: () => this.appClientFactory.create(request),
+      })
+    );
 
     this.appClientFactory.setup({
       getSpaceId: plugins.spaces?.spacesService?.getSpaceId,
