ensure all code in alerting uses the constant api endpoint

gmmorris · Mar 17, 2020 · ae7787b · ae7787b
1 parent 4564004
commit ae7787b
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 23 deletions.
diff --git a/examples/alerting_example/public/components/view_alert.tsx b/examples/alerting_example/public/components/view_alert.tsx
@@ -32,7 +32,11 @@ import {
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { CoreStart } from 'kibana/public';
 import { isEmpty } from 'lodash';
-import { Alert, AlertTaskState } from '../../../../x-pack/plugins/alerting/common';
+import {
+  Alert,
+  AlertTaskState,
+  BASE_ALERT_API_PATH,
+} from '../../../../x-pack/plugins/alerting/common';
 import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 
 type Props = RouteComponentProps & {
@@ -45,10 +49,10 @@ export const ViewAlertPage = withRouter(({ http, id }: Props) => {
 
   useEffect(() => {
     if (!alert) {
-      http.get(`/api/alert/${id}`).then(setAlert);
+      http.get(`${BASE_ALERT_API_PATH}/${id}`).then(setAlert);
     }
     if (!alertState) {
-      http.get(`/api/alert/${id}/state`).then(setAlertState);
+      http.get(`${BASE_ALERT_API_PATH}/${id}/state`).then(setAlertState);
     }
   }, [alert, alertState, http, id]);
 

diff --git a/examples/alerting_example/public/components/view_astros_alert.tsx b/examples/alerting_example/public/components/view_astros_alert.tsx
@@ -34,7 +34,11 @@ import {
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { CoreStart } from 'kibana/public';
 import { isEmpty } from 'lodash';
-import { Alert, AlertTaskState } from '../../../../x-pack/plugins/alerting/common';
+import {
+  Alert,
+  AlertTaskState,
+  BASE_ALERT_API_PATH,
+} from '../../../../x-pack/plugins/alerting/common';
 import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 
 type Props = RouteComponentProps & {
@@ -51,10 +55,10 @@ export const ViewPeopleInSpaceAlertPage = withRouter(({ http, id }: Props) => {
 
   useEffect(() => {
     if (!alert) {
-      http.get(`/api/alert/${id}`).then(setAlert);
+      http.get(`${BASE_ALERT_API_PATH}/${id}`).then(setAlert);
     }
     if (!alertState) {
-      http.get(`/api/alert/${id}/state`).then(setAlertState);
+      http.get(`${BASE_ALERT_API_PATH}/${id}/state`).then(setAlertState);
     }
   }, [alert, alertState, http, id]);
 

diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx b/x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx
@@ -19,7 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
-import { Alert } from '../../../../../../plugins/alerting/common';
+import { Alert, BASE_ALERT_API_PATH } from '../../../../../../plugins/alerting/common';
 import { getSetupModeState, addSetupModeCallback, toggleSetupMode } from '../../lib/setup_mode';
 import { NUMBER_OF_MIGRATED_ALERTS, ALERT_TYPE_PREFIX } from '../../../common/constants';
 import { AlertsConfiguration } from './configuration';
@@ -39,7 +39,7 @@ export const AlertsStatus: React.FC<AlertsStatusProps> = (props: AlertsStatusPro
 
   React.useEffect(() => {
     async function fetchAlertsStatus() {
-      const alerts = await kfetch({ method: 'GET', pathname: `/api/alert/_find` });
+      const alerts = await kfetch({ method: 'GET', pathname: `${BASE_ALERT_API_PATH}/_find` });
       const monitoringAlerts = alerts.data.filter((alert: Alert) =>
         alert.alertTypeId.startsWith(ALERT_TYPE_PREFIX)
       );

diff --git a/x-pack/plugins/alerting/server/routes/create.ts b/x-pack/plugins/alerting/server/routes/create.ts
@@ -15,7 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { validateDurationSchema } from '../lib';
-import { Alert } from '../types';
+import { Alert, BASE_ALERT_API_PATH } from '../types';
 
 export const bodySchema = schema.object({
   name: schema.string(),
@@ -42,7 +42,7 @@ export const bodySchema = schema.object({
 export const createAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert',
+      path: BASE_ALERT_API_PATH,
       validate: {
         body: bodySchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/delete.ts b/x-pack/plugins/alerting/server/routes/delete.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const deleteAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.delete(
     {
-      path: '/api/alert/{id}',
+      path: `${BASE_ALERT_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/disable.ts b/x-pack/plugins/alerting/server/routes/disable.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const disableAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_disable',
+      path: `${BASE_ALERT_API_PATH}/{id}/_disable`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/enable.ts b/x-pack/plugins/alerting/server/routes/enable.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const enableAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_enable',
+      path: `${BASE_ALERT_API_PATH}/{id}/_enable`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/find.ts b/x-pack/plugins/alerting/server/routes/find.ts
@@ -15,6 +15,7 @@ import {
 import { FindOptions } from '../../../alerting/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 // config definition
 const querySchema = schema.object({
@@ -43,7 +44,7 @@ const querySchema = schema.object({
 export const findAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: '/api/alert/_find',
+      path: `${BASE_ALERT_API_PATH}/_find`,
       validate: {
         query: querySchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/get.ts b/x-pack/plugins/alerting/server/routes/get.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const getAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/alert/{id}`,
+      path: `${BASE_ALERT_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/get_alert_state.ts b/x-pack/plugins/alerting/server/routes/get_alert_state.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const getAlertStateRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: '/api/alert/{id}/state',
+      path: `${BASE_ALERT_API_PATH}/{id}/state`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/list_alert_types.ts b/x-pack/plugins/alerting/server/routes/list_alert_types.ts
@@ -13,11 +13,12 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 export const listAlertTypesRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/alert/types`,
+      path: `${BASE_ALERT_API_PATH}/types`,
       validate: {},
       options: {
         tags: ['access:alerting-read'],

diff --git a/x-pack/plugins/alerting/server/routes/mute_all.ts b/x-pack/plugins/alerting/server/routes/mute_all.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const muteAllAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_mute_all',
+      path: `${BASE_ALERT_API_PATH}/{id}/_mute_all`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/mute_instance.ts b/x-pack/plugins/alerting/server/routes/mute_instance.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   alertId: schema.string(),
@@ -23,7 +24,7 @@ const paramSchema = schema.object({
 export const muteAlertInstanceRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{alertId}/alert_instance/{alertInstanceId}/_mute',
+      path: `${BASE_ALERT_API_PATH}/{alertId}/alert_instance/{alertInstanceId}/_mute`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/unmute_all.ts b/x-pack/plugins/alerting/server/routes/unmute_all.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const unmuteAllAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_unmute_all',
+      path: `${BASE_ALERT_API_PATH}/{id}/_unmute_all`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/unmute_instance.ts b/x-pack/plugins/alerting/server/routes/unmute_instance.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   alertId: schema.string(),
@@ -23,7 +24,7 @@ const paramSchema = schema.object({
 export const unmuteAlertInstanceRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{alertId}/alert_instance/{alertInstanceId}/_unmute',
+      path: `${BASE_ALERT_API_PATH}/{alertId}/alert_instance/{alertInstanceId}/_unmute`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/alerting/server/routes/update.ts b/x-pack/plugins/alerting/server/routes/update.ts
@@ -15,6 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { validateDurationSchema } from '../lib';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -42,7 +43,7 @@ const bodySchema = schema.object({
 export const updateAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.put(
     {
-      path: '/api/alert/{id}',
+      path: `${BASE_ALERT_API_PATH}/{id}`,
       validate: {
         body: bodySchema,
         params: paramSchema,

diff --git a/x-pack/plugins/alerting/server/routes/update_api_key.ts b/x-pack/plugins/alerting/server/routes/update_api_key.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } 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(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const updateApiKeyRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_update_api_key',
+      path: `${BASE_ALERT_API_PATH}/{id}/_update_api_key`,
       validate: {
         params: paramSchema,
       },