ensure all code in actions uses the constant api endpoint

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

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/step1.tsx b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/step1.tsx
@@ -19,7 +19,7 @@ import {
 import { kfetch } from 'ui/kfetch';
 import { omit, pick } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ActionResult } from '../../../../../../../plugins/actions/common';
+import { ActionResult, BASE_ACTION_API_PATH } from '../../../../../../../plugins/actions/common';
 import { ManageEmailAction, EmailActionData } from '../manage_email_action';
 import { ALERT_ACTION_TYPE_EMAIL } from '../../../../common/constants';
 import { NEW_ACTION_ID } from './configuration';
@@ -44,7 +44,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
     if (props.editAction) {
       await kfetch({
         method: 'PUT',
-        pathname: `/api/action/${props.editAction.id}`,
+        pathname: `${BASE_ACTION_API_PATH}/${props.editAction.id}`,
         body: JSON.stringify({
           name: props.editAction.name,
           config: omit(data, ['user', 'password']),
@@ -55,7 +55,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
     } else {
       await kfetch({
         method: 'POST',
-        pathname: '/api/action',
+        pathname: BASE_ACTION_API_PATH,
         body: JSON.stringify({
           name: i18n.translate('xpack.monitoring.alerts.configuration.emailAction.name', {
             defaultMessage: 'Email action for Stack Monitoring alerts',
@@ -75,7 +75,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
 
     await kfetch({
       method: 'DELETE',
-      pathname: `/api/action/${id}`,
+      pathname: `${BASE_ACTION_API_PATH}/${id}`,
     });
 
     if (props.editAction && props.editAction.id === id) {
@@ -101,7 +101,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
 
     const result = await kfetch({
       method: 'POST',
-      pathname: `/api/action/${props.selectedEmailActionId}/_execute`,
+      pathname: `${BASE_ACTION_API_PATH}/${props.selectedEmailActionId}/_execute`,
       body: JSON.stringify({ params }),
     });
     if (result.status === 'ok') {

diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
@@ -15,6 +15,7 @@ import {
 import { ActionResult } from '../types';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 export const bodySchema = schema.object({
   name: schema.string(),
@@ -26,7 +27,7 @@ export const bodySchema = schema.object({
 export const createActionRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: `/api/action`,
+      path: BASE_ACTION_API_PATH,
       validate: {
         body: bodySchema,
       },

diff --git a/x-pack/plugins/actions/server/routes/delete.ts b/x-pack/plugins/actions/server/routes/delete.ts
@@ -19,6 +19,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -27,7 +28,7 @@ const paramSchema = schema.object({
 export const deleteActionRoute = (router: IRouter, licenseState: LicenseState) => {
   router.delete(
     {
-      path: `/api/action/{id}`,
+      path: `${BASE_ACTION_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/actions/server/routes/execute.ts b/x-pack/plugins/actions/server/routes/execute.ts
@@ -16,6 +16,7 @@ import { verifyApiAccess } from '../lib/license_api_access';
 
 import { ActionExecutorContract } from '../lib';
 import { ActionTypeExecutorResult } from '../types';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -32,7 +33,7 @@ export const executeActionRoute = (
 ) => {
   router.post(
     {
-      path: '/api/action/{id}/_execute',
+      path: `${BASE_ACTION_API_PATH}/{id}/_execute`,
       validate: {
         body: bodySchema,
         params: paramSchema,

diff --git a/x-pack/plugins/actions/server/routes/find.ts b/x-pack/plugins/actions/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_ACTION_API_PATH } from '../../common';
 
 // config definition
 const querySchema = schema.object({
@@ -43,7 +44,7 @@ const querySchema = schema.object({
 export const findActionRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/action/_find`,
+      path: `${BASE_ACTION_API_PATH}/_find`,
       validate: {
         query: querySchema,
       },

diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/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_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const getActionRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/action/{id}`,
+      path: `${BASE_ACTION_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },

diff --git a/x-pack/plugins/actions/server/routes/list_action_types.ts b/x-pack/plugins/actions/server/routes/list_action_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_ACTION_API_PATH } from '../../common';
 
 export const listActionTypesRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/action/types`,
+      path: `${BASE_ACTION_API_PATH}/types`,
       validate: {},
       options: {
         tags: ['access:actions-read'],

diff --git a/x-pack/plugins/actions/server/routes/update.ts b/x-pack/plugins/actions/server/routes/update.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -28,7 +29,7 @@ const bodySchema = schema.object({
 export const updateActionRoute = (router: IRouter, licenseState: LicenseState) => {
   router.put(
     {
-      path: `/api/action/{id}`,
+      path: `${BASE_ACTION_API_PATH}/{id}`,
       validate: {
         body: bodySchema,
         params: paramSchema,