diff --git a/x-pack/plugins/actions/server/routes/connector/get/get.ts b/x-pack/plugins/actions/server/routes/connector/get/get.ts index 4519673a400fe..da639cdd49b25 100644 --- a/x-pack/plugins/actions/server/routes/connector/get/get.ts +++ b/x-pack/plugins/actions/server/routes/connector/get/get.ts @@ -6,10 +6,7 @@ */ import { IRouter } from '@kbn/core/server'; -import { - getConnectorParamsSchemaV1, - GetConnectorParamsV1, -} from '../../../../common/routes/connector/apis/get'; +import { getConnectorParamsSchemaV1, GetConnectorParamsV1 } from '../schemas/apis/get'; import { transformGetConnectorResponseV1 } from './transforms'; import { ILicenseState } from '../../../lib'; import { BASE_ACTION_API_PATH } from '../../../../common'; diff --git a/x-pack/plugins/actions/server/routes/connector/get/transforms/transform_connector_response/v1.ts b/x-pack/plugins/actions/server/routes/connector/get/transforms/transform_connector_response/v1.ts index ab6f6332280d1..8668ea6c0dbf4 100644 --- a/x-pack/plugins/actions/server/routes/connector/get/transforms/transform_connector_response/v1.ts +++ b/x-pack/plugins/actions/server/routes/connector/get/transforms/transform_connector_response/v1.ts @@ -5,7 +5,7 @@ * 2.0. */ -import { ConnectorResponseV1 } from '../../../../../../common/routes/connector/response'; +import { ConnectorResponseV1 } from '../../../schemas/response'; import { Connector } from '../../../../../application/connector/types'; export const transformGetConnectorResponse = ({ diff --git a/x-pack/plugins/actions/server/routes/connector/get_all/get_all.ts b/x-pack/plugins/actions/server/routes/connector/get_all/get_all.ts index 27f43a75eb151..b9554bdfcf301 100644 --- a/x-pack/plugins/actions/server/routes/connector/get_all/get_all.ts +++ b/x-pack/plugins/actions/server/routes/connector/get_all/get_all.ts @@ -6,7 +6,7 @@ */ import { IRouter } from '@kbn/core/server'; -import { AllConnectorsResponseV1 } from '../../../../common/routes/connector/response'; +import { AllConnectorsResponseV1 } from '../schemas/response'; import { transformGetAllConnectorsResponseV1 } from './transforms'; import { ActionsRequestHandlerContext } from '../../../types'; import { BASE_ACTION_API_PATH } from '../../../../common'; diff --git a/x-pack/plugins/actions/server/routes/connector/get_all/transforms/transform_connectors_response/v1.ts b/x-pack/plugins/actions/server/routes/connector/get_all/transforms/transform_connectors_response/v1.ts index a651255536eaf..27493043f8031 100644 --- a/x-pack/plugins/actions/server/routes/connector/get_all/transforms/transform_connectors_response/v1.ts +++ b/x-pack/plugins/actions/server/routes/connector/get_all/transforms/transform_connectors_response/v1.ts @@ -6,7 +6,7 @@ */ import { ConnectorWithExtraFindData } from '../../../../../application/connector/types'; -import { AllConnectorsResponseV1 } from '../../../../../../common/routes/connector/response'; +import { AllConnectorsResponseV1 } from '../../../schemas/response'; export const transformGetAllConnectorsResponse = ( results: ConnectorWithExtraFindData[] diff --git a/x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.ts b/x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.ts index 9ba51287c56fd..2d1b9f09c9b6b 100644 --- a/x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.ts +++ b/x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.ts @@ -6,7 +6,7 @@ */ import { IRouter } from '@kbn/core/server'; -import { AllConnectorsResponseV1 } from '../../../../common/routes/connector/response'; +import { AllConnectorsResponseV1 } from '../schemas/response'; import { ActionsRequestHandlerContext } from '../../../types'; import { INTERNAL_BASE_ACTION_API_PATH } from '../../../../common'; import { ILicenseState } from '../../../lib'; diff --git a/x-pack/plugins/actions/server/routes/connector/list_types/list_types.ts b/x-pack/plugins/actions/server/routes/connector/list_types/list_types.ts index 20ca0d9343608..547c6f8b78f83 100644 --- a/x-pack/plugins/actions/server/routes/connector/list_types/list_types.ts +++ b/x-pack/plugins/actions/server/routes/connector/list_types/list_types.ts @@ -6,11 +6,11 @@ */ import { IRouter } from '@kbn/core/server'; -import { ConnectorTypesResponseV1 } from '../../../../common/routes/connector/response'; +import { ConnectorTypesResponseV1 } from '../schemas/response'; import { connectorTypesQuerySchemaV1, ConnectorTypesRequestQueryV1, -} from '../../../../common/routes/connector/apis/connector_types'; +} from '../schemas/apis/connector_types'; import { transformListTypesResponseV1 } from './transforms'; import { ActionsRequestHandlerContext } from '../../../types'; import { BASE_ACTION_API_PATH } from '../../../../common'; diff --git a/x-pack/plugins/actions/server/routes/connector/list_types/transforms/transform_list_types_response/v1.ts b/x-pack/plugins/actions/server/routes/connector/list_types/transforms/transform_list_types_response/v1.ts index e32bec2f9e1a1..41edff6819bc0 100644 --- a/x-pack/plugins/actions/server/routes/connector/list_types/transforms/transform_list_types_response/v1.ts +++ b/x-pack/plugins/actions/server/routes/connector/list_types/transforms/transform_list_types_response/v1.ts @@ -6,7 +6,7 @@ */ import { ConnectorType } from '../../../../../application/connector/types'; -import { ConnectorTypesResponseV1 } from '../../../../../../common/routes/connector/response'; +import { ConnectorTypesResponseV1 } from '../../../schemas/response'; export const transformListTypesResponse = ( results: ConnectorType[] diff --git a/x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.ts b/x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.ts index 6611830f6a3c7..2720dbbef4cbf 100644 --- a/x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.ts +++ b/x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.ts @@ -6,11 +6,11 @@ */ import { IRouter } from '@kbn/core/server'; -import { ConnectorTypesResponseV1 } from '../../../../common/routes/connector/response'; +import { ConnectorTypesResponseV1 } from '../schemas/response'; import { connectorTypesQuerySchemaV1, ConnectorTypesRequestQueryV1, -} from '../../../../common/routes/connector/apis/connector_types'; +} from '../schemas/apis/connector_types'; import { ActionsRequestHandlerContext } from '../../../types'; import { INTERNAL_BASE_ACTION_API_PATH } from '../../../../common'; import { ILicenseState } from '../../../lib'; diff --git a/x-pack/plugins/actions/common/routes/connector/apis/connector_types/index.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/index.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/connector_types/index.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/index.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/connector_types/schemas/latest.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/schemas/latest.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/connector_types/schemas/latest.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/schemas/latest.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/connector_types/schemas/v1.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/schemas/v1.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/connector_types/schemas/v1.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/schemas/v1.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/connector_types/types/latest.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/types/latest.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/connector_types/types/latest.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/types/latest.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/connector_types/types/v1.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/types/v1.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/connector_types/types/v1.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/connector_types/types/v1.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/get/index.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/get/index.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/get/index.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/get/index.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/get/schemas/latest.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/get/schemas/latest.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/get/schemas/latest.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/get/schemas/latest.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/get/schemas/v1.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/get/schemas/v1.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/get/schemas/v1.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/get/schemas/v1.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/get/types/latest.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/get/types/latest.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/get/types/latest.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/get/types/latest.ts diff --git a/x-pack/plugins/actions/common/routes/connector/apis/get/types/v1.ts b/x-pack/plugins/actions/server/routes/connector/schemas/apis/get/types/v1.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/apis/get/types/v1.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/apis/get/types/v1.ts diff --git a/x-pack/plugins/actions/common/routes/connector/response/index.ts b/x-pack/plugins/actions/server/routes/connector/schemas/response/index.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/response/index.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/response/index.ts diff --git a/x-pack/plugins/actions/common/routes/connector/response/schemas/latest.ts b/x-pack/plugins/actions/server/routes/connector/schemas/response/schemas/latest.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/response/schemas/latest.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/response/schemas/latest.ts diff --git a/x-pack/plugins/actions/common/routes/connector/response/schemas/v1.ts b/x-pack/plugins/actions/server/routes/connector/schemas/response/schemas/v1.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/response/schemas/v1.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/response/schemas/v1.ts diff --git a/x-pack/plugins/actions/common/routes/connector/response/types/latest.ts b/x-pack/plugins/actions/server/routes/connector/schemas/response/types/latest.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/response/types/latest.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/response/types/latest.ts diff --git a/x-pack/plugins/actions/common/routes/connector/response/types/v1.ts b/x-pack/plugins/actions/server/routes/connector/schemas/response/types/v1.ts similarity index 100% rename from x-pack/plugins/actions/common/routes/connector/response/types/v1.ts rename to x-pack/plugins/actions/server/routes/connector/schemas/response/types/v1.ts diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/connectors_services.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/connectors_services.ts index 3fb2971f1236d..8dd98630098c6 100644 --- a/x-pack/plugins/security_solution/scripts/endpoint/common/connectors_services.ts +++ b/x-pack/plugins/security_solution/scripts/endpoint/common/connectors_services.ts @@ -6,7 +6,7 @@ */ import type { KbnClient } from '@kbn/test'; -import type { AllConnectorsResponseV1 } from '@kbn/actions-plugin/common/routes/connector/response'; +import type { AllConnectorsResponseV1 } from '@kbn/actions-plugin/server/routes/connector/schemas/response'; import type { bodySchema } from '@kbn/actions-plugin/server/routes/create'; import type { TypeOf } from '@kbn/config-schema'; import type { Connector } from '@kbn/actions-plugin/server/application/connector/types'; diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/common.ts b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/common.ts index 7c78858070a20..304d71fc78802 100644 --- a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/common.ts +++ b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/common.ts @@ -7,7 +7,7 @@ import { DATA_VIEW_PATH, INITIAL_REST_VERSION } from '@kbn/data-views-plugin/server/constants'; import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common'; -import { AllConnectorsResponse } from '@kbn/actions-plugin/common/routes/connector/response'; +import type { AllConnectorsResponse } from '@kbn/actions-plugin/server/routes/connector/schemas/response'; import { DETECTION_ENGINE_RULES_BULK_ACTION } from '@kbn/security-solution-plugin/common/constants'; import { ELASTICSEARCH_PASSWORD, ELASTICSEARCH_USERNAME } from '../../env_var_names_constants'; import { deleteAllDocuments } from './elasticsearch';