moved rewrite_request_case to the common folder

elastic · Mar 15, 2021 · 5c1aca4 · 5c1aca4
1 parent d02ef98
commit 5c1aca4
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 34 deletions.
diff --git a/x-pack/plugins/actions/common/index.ts b/x-pack/plugins/actions/common/index.ts
@@ -8,3 +8,5 @@
 export * from './types';
 
 export const BASE_ACTION_API_PATH = '/api/actions';
+
+export * from './rewrite_request_case';
diff --git a/...ons/server/routes/rewrite_request_case.ts → ...ns/actions/common/rewrite_request_case.ts b/...ons/server/routes/rewrite_request_case.ts → ...ns/actions/common/rewrite_request_case.ts
diff --git a/x-pack/plugins/actions/server/routes/connector_types.ts b/x-pack/plugins/actions/server/routes/connector_types.ts
@@ -7,10 +7,9 @@
 
 import { IRouter } from 'kibana/server';
 import { ILicenseState } from '../lib';
-import { ActionType, BASE_ACTION_API_PATH } from '../../common';
+import { ActionType, BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionsRequestHandlerContext } from '../types';
 import { verifyAccessAndContext } from './verify_access_and_context';
-import { RewriteResponseCase } from './rewrite_request_case';
 
 const rewriteBodyRes: RewriteResponseCase<ActionType[]> = (results) => {
   return results.map(({ enabledInConfig, enabledInLicense, minimumLicenseRequired, ...res }) => ({

diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
@@ -9,9 +9,8 @@ import { schema } from '@kbn/config-schema';
 import { IRouter } from 'kibana/server';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
 import { ILicenseState } from '../lib';
-import { BASE_ACTION_API_PATH } from '../../common';
+import { BASE_ACTION_API_PATH, RewriteRequestCase, RewriteResponseCase } from '../../common';
 import { verifyAccessAndContext } from './verify_access_and_context';
-import { RewriteRequestCase, RewriteResponseCase } from './rewrite_request_case';
 import { CreateOptions } from '../actions_client';
 
 export const bodySchema = schema.object({

diff --git a/x-pack/plugins/actions/server/routes/execute.ts b/x-pack/plugins/actions/server/routes/execute.ts
@@ -10,10 +10,9 @@ import { IRouter } from 'kibana/server';
 import { ILicenseState } from '../lib';
 
 import { ActionTypeExecutorResult, ActionsRequestHandlerContext } from '../types';
-import { BASE_ACTION_API_PATH } from '../../common';
+import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { asHttpRequestExecutionSource } from '../lib/action_execution_source';
 import { verifyAccessAndContext } from './verify_access_and_context';
-import { RewriteResponseCase } from './rewrite_request_case';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/server/routes/get.ts
@@ -8,10 +8,9 @@
 import { schema } from '@kbn/config-schema';
 import { IRouter } from 'kibana/server';
 import { ILicenseState } from '../lib';
-import { BASE_ACTION_API_PATH } from '../../common';
+import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
 import { verifyAccessAndContext } from './verify_access_and_context';
-import { RewriteResponseCase } from './rewrite_request_case';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/x-pack/plugins/actions/server/routes/get_all.ts b/x-pack/plugins/actions/server/routes/get_all.ts
@@ -7,10 +7,9 @@
 
 import { IRouter } from 'kibana/server';
 import { ILicenseState } from '../lib';
-import { BASE_ACTION_API_PATH } from '../../common';
+import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionsRequestHandlerContext, FindActionResult } from '../types';
 import { verifyAccessAndContext } from './verify_access_and_context';
-import { RewriteResponseCase } from './rewrite_request_case';
 
 const rewriteBodyRes: RewriteResponseCase<FindActionResult[]> = (results) => {
   return results.map(({ actionTypeId, isPreconfigured, referencedByCount, ...res }) => ({

diff --git a/x-pack/plugins/actions/server/routes/update.ts b/x-pack/plugins/actions/server/routes/update.ts
@@ -8,10 +8,9 @@
 import { schema } from '@kbn/config-schema';
 import { IRouter } from 'kibana/server';
 import { ILicenseState } from '../lib';
-import { BASE_ACTION_API_PATH } from '../../common';
+import { BASE_ACTION_API_PATH, RewriteResponseCase } from '../../common';
 import { ActionResult, ActionsRequestHandlerContext } from '../types';
 import { verifyAccessAndContext } from './verify_access_and_context';
-import { RewriteResponseCase } from './rewrite_request_case';
 
 const paramSchema = schema.object({
   id: schema.string(),

diff --git a/...lugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts b/...lugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts
@@ -5,11 +5,8 @@
  * 2.0.
  */
 import { HttpSetup } from 'kibana/public';
-import {
-  AsApiContract,
-  RewriteRequestCase,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../actions/server/routes/rewrite_request_case';
+
+import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type { ActionType } from '../../../types';
 

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connectors.ts
@@ -5,11 +5,7 @@
  * 2.0.
  */
 import { HttpSetup } from 'kibana/public';
-import {
-  AsApiContract,
-  RewriteRequestCase,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../actions/server/routes/rewrite_request_case';
+import { AsApiContract, RewriteRequestCase } from '../../../../../actions/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type { ActionConnector, ActionConnectorProps } from '../../../types';
 

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/create.ts
@@ -5,11 +5,7 @@
  * 2.0.
  */
 import { HttpSetup } from 'kibana/public';
-import {
-  RewriteRequestCase,
-  RewriteResponseCase,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../actions/server/routes/rewrite_request_case';
+import { RewriteRequestCase, RewriteResponseCase } from '../../../../../actions/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type {
   ActionConnector,

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts
@@ -6,9 +6,10 @@
  */
 
 import { HttpSetup } from 'kibana/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { RewriteRequestCase } from '../../../../../actions/server/routes/rewrite_request_case';
-import { ActionTypeExecutorResult } from '../../../../../../plugins/actions/common';
+import {
+  ActionTypeExecutorResult,
+  RewriteRequestCase,
+} from '../../../../../../plugins/actions/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 
 const rewriteBodyRes: RewriteRequestCase<ActionTypeExecutorResult<unknown>> = ({

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 import { HttpSetup } from 'kibana/public';
-import {
-  RewriteRequestCase,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../actions/server/routes/rewrite_request_case';
+import { RewriteRequestCase } from '../../../../../actions/common';
 import { BASE_ACTION_API_PATH } from '../../constants';
 import type {
   ActionConnector,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,5 @@
		export * from './types';

		export const BASE_ACTION_API_PATH = '/api/actions';

		export * from './rewrite_request_case';