Move current HTTP APIs to legacy folder

elastic · Mar 8, 2021 · d66cf3d · d66cf3d
1 parent 96c360b
commit d66cf3d
Show file tree

Hide file tree

Showing 38 changed files with 254 additions and 239 deletions.
diff --git a/x-pack/plugins/alerting/server/lib/index.ts b/x-pack/plugins/alerting/server/lib/index.ts
@@ -6,7 +6,7 @@
  */
 
 export { parseDuration, validateDurationSchema } from '../../common/parse_duration';
-export { LicenseState } from './license_state';
+export { ILicenseState, LicenseState } from './license_state';
 export { validateAlertTypeParams } from './validate_alert_type_params';
 export { getAlertNotifyWhenType } from './get_alert_notify_when_type';
 export { ErrorWithReason, getReasonFromError, isErrorWithReason } from './error_with_reason';

diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
@@ -38,25 +38,7 @@ import {
 } from '../../../../src/core/server';
 import type { AlertingRequestHandlerContext } from './types';
 
-import {
-  aggregateAlertRoute,
-  createAlertRoute,
-  deleteAlertRoute,
-  findAlertRoute,
-  getAlertRoute,
-  getAlertStateRoute,
-  getAlertInstanceSummaryRoute,
-  listAlertTypesRoute,
-  updateAlertRoute,
-  enableAlertRoute,
-  disableAlertRoute,
-  updateApiKeyRoute,
-  muteAllAlertRoute,
-  unmuteAllAlertRoute,
-  muteAlertInstanceRoute,
-  unmuteAlertInstanceRoute,
-  healthRoute,
-} from './routes';
+import { defineRoutes } from './routes';
 import { LICENSE_TYPE, LicensingPluginSetup, LicensingPluginStart } from '../../licensing/server';
 import {
   PluginSetupContract as ActionsPluginSetupContract,
@@ -267,23 +249,7 @@ export class AlertingPlugin {
     // Routes
     const router = core.http.createRouter<AlertingRequestHandlerContext>();
     // Register routes
-    aggregateAlertRoute(router, this.licenseState);
-    createAlertRoute(router, this.licenseState);
-    deleteAlertRoute(router, this.licenseState);
-    findAlertRoute(router, this.licenseState);
-    getAlertRoute(router, this.licenseState);
-    getAlertStateRoute(router, this.licenseState);
-    getAlertInstanceSummaryRoute(router, this.licenseState);
-    listAlertTypesRoute(router, this.licenseState);
-    updateAlertRoute(router, this.licenseState);
-    enableAlertRoute(router, this.licenseState);
-    disableAlertRoute(router, this.licenseState);
-    updateApiKeyRoute(router, this.licenseState);
-    muteAllAlertRoute(router, this.licenseState);
-    unmuteAllAlertRoute(router, this.licenseState);
-    muteAlertInstanceRoute(router, this.licenseState);
-    unmuteAlertInstanceRoute(router, this.licenseState);
-    healthRoute(router, this.licenseState, plugins.encryptedSavedObjects);
+    defineRoutes(router, this.licenseState, plugins.encryptedSavedObjects);
 
     return {
       registerType<

diff --git a/x-pack/plugins/alerting/server/routes/index.ts b/x-pack/plugins/alerting/server/routes/index.ts
@@ -5,20 +5,16 @@
  * 2.0.
  */
 
-export { aggregateAlertRoute } from './aggregate';
-export { createAlertRoute } from './create';
-export { deleteAlertRoute } from './delete';
-export { findAlertRoute } from './find';
-export { getAlertRoute } from './get';
-export { getAlertStateRoute } from './get_alert_state';
-export { getAlertInstanceSummaryRoute } from './get_alert_instance_summary';
-export { listAlertTypesRoute } from './list_alert_types';
-export { updateAlertRoute } from './update';
-export { enableAlertRoute } from './enable';
-export { disableAlertRoute } from './disable';
-export { updateApiKeyRoute } from './update_api_key';
-export { muteAlertInstanceRoute } from './mute_instance';
-export { unmuteAlertInstanceRoute } from './unmute_instance';
-export { muteAllAlertRoute } from './mute_all';
-export { unmuteAllAlertRoute } from './unmute_all';
-export { healthRoute } from './health';
+import { IRouter } from 'kibana/server';
+import { ILicenseState } from '../lib';
+import { defineLegacyRoutes } from './legacy';
+import { AlertingRequestHandlerContext } from '../types';
+import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
+
+export function defineRoutes(
+  router: IRouter<AlertingRequestHandlerContext>,
+  licenseState: ILicenseState,
+  encryptedSavedObjects: EncryptedSavedObjectsPluginSetup
+) {
+  defineLegacyRoutes(router, licenseState, encryptedSavedObjects);
+}
diff --git a/.../alerting/server/routes/aggregate.test.ts → ...ng/server/routes/legacy/aggregate.test.ts b/.../alerting/server/routes/aggregate.test.ts → ...ng/server/routes/legacy/aggregate.test.ts
@@ -7,14 +7,14 @@
 
 import { aggregateAlertRoute } from './aggregate';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
 
 const alertsClient = alertsClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/...ugins/alerting/server/routes/aggregate.ts → ...lerting/server/routes/legacy/aggregate.ts b/...ugins/alerting/server/routes/aggregate.ts → ...lerting/server/routes/legacy/aggregate.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { AlertingRouter } from '../types';
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { BASE_ALERT_API_PATH } from '../../common';
-import { renameKeys } from './lib/rename_keys';
-import { FindOptions } from '../alerts_client';
+import type { AlertingRouter } from '../../types';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../../common';
+import { renameKeys } from './../lib/rename_keys';
+import { FindOptions } from '../../alerts_client';
 
 // config definition
 const querySchema = schema.object({

diff --git a/...ins/alerting/server/routes/create.test.ts → ...rting/server/routes/legacy/create.test.ts b/...ins/alerting/server/routes/create.test.ts → ...rting/server/routes/legacy/create.test.ts
@@ -7,16 +7,16 @@
 
 import { createAlertRoute } from './create';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
-import { Alert } from '../../common/alert';
-import { AlertTypeDisabledError } from '../lib/errors/alert_type_disabled';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
+import { Alert } from '../../../common/alert';
+import { AlertTypeDisabledError } from '../../lib/errors/alert_type_disabled';
 
 const alertsClient = alertsClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/.../plugins/alerting/server/routes/create.ts → ...s/alerting/server/routes/legacy/create.ts b/.../plugins/alerting/server/routes/create.ts → ...s/alerting/server/routes/legacy/create.ts
@@ -6,19 +6,19 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { AlertingRouter } from '../types';
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { validateDurationSchema } from '../lib';
-import { handleDisabledApiKeysError } from './lib/error_handler';
+import type { AlertingRouter } from '../../types';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { validateDurationSchema } from '../../lib';
+import { handleDisabledApiKeysError } from './../lib/error_handler';
 import {
   Alert,
   AlertNotifyWhenType,
   AlertTypeParams,
   BASE_ALERT_API_PATH,
   validateNotifyWhenType,
-} from '../types';
-import { AlertTypeDisabledError } from '../lib/errors/alert_type_disabled';
+} from '../../types';
+import { AlertTypeDisabledError } from '../../lib/errors/alert_type_disabled';
 
 export const bodySchema = schema.object({
   name: schema.string(),

diff --git a/...ins/alerting/server/routes/delete.test.ts → ...rting/server/routes/legacy/delete.test.ts b/...ins/alerting/server/routes/delete.test.ts → ...rting/server/routes/legacy/delete.test.ts
@@ -7,14 +7,14 @@
 
 import { deleteAlertRoute } from './delete';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
 
 const alertsClient = alertsClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/.../plugins/alerting/server/routes/delete.ts → ...s/alerting/server/routes/legacy/delete.ts b/.../plugins/alerting/server/routes/delete.ts → ...s/alerting/server/routes/legacy/delete.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { AlertingRouter } from '../types';
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { BASE_ALERT_API_PATH } from '../../common';
+import type { AlertingRouter } from '../../types';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/...ns/alerting/server/routes/disable.test.ts → ...ting/server/routes/legacy/disable.test.ts b/...ns/alerting/server/routes/disable.test.ts → ...ting/server/routes/legacy/disable.test.ts
@@ -7,14 +7,14 @@
 
 import { disableAlertRoute } from './disable';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
-import { AlertTypeDisabledError } from '../lib/errors/alert_type_disabled';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
+import { AlertTypeDisabledError } from '../../lib/errors/alert_type_disabled';
 
 const alertsClient = alertsClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/...plugins/alerting/server/routes/disable.ts → .../alerting/server/routes/legacy/disable.ts b/...plugins/alerting/server/routes/disable.ts → .../alerting/server/routes/legacy/disable.ts
@@ -6,11 +6,11 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { AlertingRouter } from '../types';
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { BASE_ALERT_API_PATH } from '../../common';
-import { AlertTypeDisabledError } from '../lib/errors/alert_type_disabled';
+import type { AlertingRouter } from '../../types';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../../common';
+import { AlertTypeDisabledError } from '../../lib/errors/alert_type_disabled';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/...ins/alerting/server/routes/enable.test.ts → ...rting/server/routes/legacy/enable.test.ts b/...ins/alerting/server/routes/enable.test.ts → ...rting/server/routes/legacy/enable.test.ts
@@ -7,14 +7,14 @@
 
 import { enableAlertRoute } from './enable';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
-import { AlertTypeDisabledError } from '../lib/errors/alert_type_disabled';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
+import { AlertTypeDisabledError } from '../../lib/errors/alert_type_disabled';
 
 const alertsClient = alertsClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/.../plugins/alerting/server/routes/enable.ts → ...s/alerting/server/routes/legacy/enable.ts b/.../plugins/alerting/server/routes/enable.ts → ...s/alerting/server/routes/legacy/enable.ts
@@ -6,12 +6,12 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { AlertingRouter } from '../types';
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { BASE_ALERT_API_PATH } from '../../common';
-import { handleDisabledApiKeysError } from './lib/error_handler';
-import { AlertTypeDisabledError } from '../lib/errors/alert_type_disabled';
+import type { AlertingRouter } from '../../types';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../../common';
+import { handleDisabledApiKeysError } from './../lib/error_handler';
+import { AlertTypeDisabledError } from '../../lib/errors/alert_type_disabled';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/...ugins/alerting/server/routes/find.test.ts → ...lerting/server/routes/legacy/find.test.ts b/...ugins/alerting/server/routes/find.test.ts → ...lerting/server/routes/legacy/find.test.ts
@@ -7,14 +7,14 @@
 
 import { findAlertRoute } from './find';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
 
 const alertsClient = alertsClientMock.create();
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/...ck/plugins/alerting/server/routes/find.ts → ...ins/alerting/server/routes/legacy/find.ts b/...ck/plugins/alerting/server/routes/find.ts → ...ins/alerting/server/routes/legacy/find.ts
@@ -6,13 +6,13 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import type { AlertingRouter } from '../types';
+import type { AlertingRouter } from '../../types';
 
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { BASE_ALERT_API_PATH } from '../../common';
-import { renameKeys } from './lib/rename_keys';
-import { FindOptions } from '../alerts_client';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../../common';
+import { renameKeys } from './../lib/rename_keys';
+import { FindOptions } from '../../alerts_client';
 
 // config definition
 const querySchema = schema.object({

diff --git a/...lugins/alerting/server/routes/get.test.ts → ...alerting/server/routes/legacy/get.test.ts b/...lugins/alerting/server/routes/get.test.ts → ...alerting/server/routes/legacy/get.test.ts
@@ -7,14 +7,14 @@
 
 import { getAlertRoute } from './get';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { mockHandlerArguments } from './_mock_handler_arguments';
-import { alertsClientMock } from '../alerts_client.mock';
-import { Alert } from '../../common';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
+import { alertsClientMock } from '../../alerts_client.mock';
+import { Alert } from '../../../common';
 
 const alertsClient = alertsClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 

diff --git a/x-pack/plugins/alerting/server/routes/get.ts → ...gins/alerting/server/routes/legacy/get.ts b/x-pack/plugins/alerting/server/routes/get.ts → ...gins/alerting/server/routes/legacy/get.ts
@@ -6,10 +6,10 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ILicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
-import { BASE_ALERT_API_PATH } from '../../common';
-import type { AlertingRouter } from '../types';
+import { ILicenseState } from '../../lib/license_state';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../../common';
+import type { AlertingRouter } from '../../types';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/...routes/get_alert_instance_summary.test.ts → ...legacy/get_alert_instance_summary.test.ts b/...routes/get_alert_instance_summary.test.ts → ...legacy/get_alert_instance_summary.test.ts
@@ -7,14 +7,14 @@
 
 import { getAlertInstanceSummaryRoute } from './get_alert_instance_summary';
 import { httpServiceMock } from 'src/core/server/mocks';
-import { licenseStateMock } from '../lib/license_state.mock';
-import { mockHandlerArguments } from './_mock_handler_arguments';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { mockHandlerArguments } from './../_mock_handler_arguments';
 import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { alertsClientMock } from '../alerts_client.mock';
-import { AlertInstanceSummary } from '../types';
+import { alertsClientMock } from '../../alerts_client.mock';
+import { AlertInstanceSummary } from '../../types';
 
 const alertsClient = alertsClientMock.create();
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../../lib/license_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));