From f3fbc91bbfba05eca3bf247264ee0ced36413e77 Mon Sep 17 00:00:00 2001
From: Ido Cohen <90558359+CohenIdo@users.noreply.github.com>
Date: Thu, 7 Dec 2023 11:53:54 +0200
Subject: [PATCH] rename common/types to common/types_old
---
x-pack/plugins/cloud_security_posture/common/constants.ts | 2 +-
.../common/schemas/csp_vulnerability_finding.ts | 2 +-
.../cloud_security_posture/common/{types.ts => types_old.ts} | 0
x-pack/plugins/cloud_security_posture/common/utils/helpers.ts | 2 +-
.../public/common/api/use_setup_status_api.ts | 2 +-
.../cloud_security_posture/public/common/api/use_stats_api.ts | 2 +-
.../public/common/api/use_vulnerability_dashboard_api.ts | 2 +-
.../plugins/cloud_security_posture/public/common/constants.ts | 2 +-
.../public/common/navigation/constants.ts | 2 +-
.../public/common/navigation/use_csp_integration_link.ts | 2 +-
.../navigation/use_navigate_to_cis_integration_policies.ts | 2 +-
.../common/utils/get_enabled_csp_integration_details.ts | 2 +-
.../public/common/utils/get_vulnerability_colors.ts | 2 +-
.../public/components/accounts_evaluated_widget.tsx | 2 +-
.../public/components/cis_benchmark_icon.tsx | 2 +-
.../aws_credentials_form/aws_credentials_form.tsx | 2 +-
.../aws_credentials_form/get_aws_credentials_form_options.tsx | 2 +-
.../components/fleet_extensions/aws_credentials_form/hooks.ts | 2 +-
.../azure_credentials_form/azure_credentials_form.tsx | 2 +-
.../get_azure_credentials_form_options.tsx | 2 +-
.../fleet_extensions/azure_credentials_form/hooks.ts | 2 +-
.../components/fleet_extensions/custom_assets_extension.tsx | 2 +-
.../components/fleet_extensions/gcp_credential_form.tsx | 2 +-
.../public/components/fleet_extensions/mocks.ts | 2 +-
.../components/fleet_extensions/policy_template_form.tsx | 2 +-
.../components/fleet_extensions/policy_template_selectors.tsx | 2 +-
.../public/components/fleet_extensions/utils.ts | 2 +-
.../public/components/no_findings_states.tsx | 2 +-
.../public/components/no_vulnerabilities_states.tsx | 4 ++--
.../public/components/vulnerability_badges.tsx | 2 +-
.../public/pages/benchmarks/benchmarks_table.tsx | 2 +-
.../public/pages/benchmarks/use_csp_benchmark_integrations.ts | 2 +-
.../compliance_charts/compliance_score_chart.tsx | 2 +-
.../compliance_dashboard/compliance_charts/risks_table.tsx | 2 +-
.../pages/compliance_dashboard/compliance_dashboard.test.tsx | 2 +-
.../pages/compliance_dashboard/compliance_dashboard.tsx | 2 +-
.../dashboard_sections/benchmark_details_box.tsx | 2 +-
.../dashboard_sections/benchmarks_section.tsx | 2 +-
.../dashboard_sections/summary_section.tsx | 2 +-
.../public/pages/compliance_dashboard/mock.ts | 2 +-
.../pages/configurations/findings_flyout/findings_flyout.tsx | 4 ++--
.../latest_findings/use_latest_findings_grouping.tsx | 2 +-
.../latest_findings/use_latest_findings_table.tsx | 2 +-
.../findings_by_resource_container.tsx | 2 +-
.../resource_findings/resource_findings_container.tsx | 2 +-
.../pages/configurations/layout/findings_distribution_bar.tsx | 2 +-
.../vulnerabilities_by_resource/severity_map.tsx | 2 +-
.../_mocks_/vulnerability_dashboard.mock.ts | 2 +-
.../vulnerability_table_panel_section.tsx | 2 +-
.../vulnerability_dashboard/vulnerability_trend_graph.tsx | 2 +-
.../public/test/fixtures/csp_benchmark_integration.ts | 2 +-
.../cloud_security_posture/server/lib/check_index_status.ts | 2 +-
.../plugins/cloud_security_posture/server/lib/fleet_util.ts | 2 +-
.../server/lib/telemetry/collectors/types.ts | 2 +-
.../server/routes/benchmarks/benchmarks.ts | 4 ++--
.../routes/compliance_dashboard/compliance_dashboard.ts | 2 +-
.../server/routes/compliance_dashboard/get_benchmarks.ts | 2 +-
.../server/routes/compliance_dashboard/get_clusters.ts | 2 +-
.../compliance_dashboard/get_grouped_findings_evaluation.ts | 2 +-
.../server/routes/compliance_dashboard/get_stats.ts | 2 +-
.../server/routes/compliance_dashboard/get_trends.ts | 2 +-
.../cloud_security_posture/server/routes/status/status.ts | 2 +-
.../get_top_patchable_vulnerabilities.ts | 2 +-
.../vulnerabilities_dashboard/get_top_vulnerabilities.ts | 2 +-
.../vulnerabilities_dashboard/get_top_vulnerable_resources.ts | 2 +-
.../vulnerabilities_dashboard/get_vulnerabilities_trend.ts | 2 +-
.../vulnerabilities_dashboard/vulnerabilities_dashboard.ts | 2 +-
.../server/saved_objects/saved_objects.ts | 2 +-
x-pack/plugins/cloud_security_posture/server/types.ts | 2 +-
69 files changed, 71 insertions(+), 71 deletions(-)
rename x-pack/plugins/cloud_security_posture/common/{types.ts => types_old.ts} (100%)
diff --git a/x-pack/plugins/cloud_security_posture/common/constants.ts b/x-pack/plugins/cloud_security_posture/common/constants.ts
index 441b338e3cd37..770f4ef5d06e3 100644
--- a/x-pack/plugins/cloud_security_posture/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/common/constants.ts
@@ -10,7 +10,7 @@ import {
VulnSeverity,
AwsCredentialsTypeFieldMap,
GcpCredentialsTypeFieldMap,
-} from './types';
+} from './types_old';
export const STATUS_ROUTE_PATH = '/internal/cloud_security_posture/status';
export const STATUS_API_CURRENT_VERSION = '1';
diff --git a/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts b/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts
index f650b115316df..efe26dc6648ba 100644
--- a/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts
+++ b/x-pack/plugins/cloud_security_posture/common/schemas/csp_vulnerability_finding.ts
@@ -7,7 +7,7 @@
// TODO: this needs to be defined in a versioned schema
import type { EcsEvent } from '@kbn/ecs';
-import { VulnSeverity } from '../types';
+import { VulnSeverity } from '../types_old';
export interface CspVulnerabilityFinding {
'@timestamp': string;
diff --git a/x-pack/plugins/cloud_security_posture/common/types.ts b/x-pack/plugins/cloud_security_posture/common/types_old.ts
similarity index 100%
rename from x-pack/plugins/cloud_security_posture/common/types.ts
rename to x-pack/plugins/cloud_security_posture/common/types_old.ts
diff --git a/x-pack/plugins/cloud_security_posture/common/utils/helpers.ts b/x-pack/plugins/cloud_security_posture/common/utils/helpers.ts
index f208c85ccd7b9..fd04733bb17c9 100644
--- a/x-pack/plugins/cloud_security_posture/common/utils/helpers.ts
+++ b/x-pack/plugins/cloud_security_posture/common/utils/helpers.ts
@@ -30,7 +30,7 @@ import type {
GcpCredentialsType,
AzureCredentialsType,
RuleSection,
-} from '../types';
+} from '../types_old';
/**
* @example
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_setup_status_api.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_setup_status_api.ts
index afb7a89c69e6f..35f49282a475e 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_setup_status_api.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_setup_status_api.ts
@@ -7,7 +7,7 @@
import { useQuery, type UseQueryOptions } from '@tanstack/react-query';
import { useKibana } from '../hooks/use_kibana';
-import { type CspSetupStatus } from '../../../common/types';
+import { type CspSetupStatus } from '../../../common/types_old';
import { STATUS_API_CURRENT_VERSION, STATUS_ROUTE_PATH } from '../../../common/constants';
const getCspSetupStatusQueryKey = 'csp_status_key';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_stats_api.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_stats_api.ts
index 834a75581519f..dd893ff356865 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_stats_api.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_stats_api.ts
@@ -7,7 +7,7 @@
import { useQuery, UseQueryOptions } from '@tanstack/react-query';
import { useKibana } from '../hooks/use_kibana';
-import { ComplianceDashboardDataV2, PosturePolicyTemplate } from '../../../common/types';
+import { ComplianceDashboardDataV2, PosturePolicyTemplate } from '../../../common/types_old';
import {
CSPM_POLICY_TEMPLATE,
KSPM_POLICY_TEMPLATE,
diff --git a/x-pack/plugins/cloud_security_posture/public/common/api/use_vulnerability_dashboard_api.ts b/x-pack/plugins/cloud_security_posture/public/common/api/use_vulnerability_dashboard_api.ts
index 11113949d0972..4114a49cdf181 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/api/use_vulnerability_dashboard_api.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/api/use_vulnerability_dashboard_api.ts
@@ -6,7 +6,7 @@
*/
import { useQuery, UseQueryOptions } from '@tanstack/react-query';
-import { CnvmDashboardData } from '../../../common/types';
+import { CnvmDashboardData } from '../../../common/types_old';
import { useKibana } from '../hooks/use_kibana';
import { VULNERABILITIES_DASHBOARD_ROUTE_PATH } from '../../../common/constants';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/constants.ts b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
index 60e15f54b1687..404ea0f036017 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/constants.ts
@@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import { euiThemeVars } from '@kbn/ui-theme';
-import type { CloudSecurityPolicyTemplate, PostureInput } from '../../common/types';
+import type { CloudSecurityPolicyTemplate, PostureInput } from '../../common/types_old';
import {
CLOUDBEAT_EKS,
CLOUDBEAT_VANILLA,
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/constants.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/constants.ts
index ff88d9c38707f..e89d7d610bc9c 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/constants.ts
@@ -7,7 +7,7 @@
import { i18n } from '@kbn/i18n';
import { CSPM_POLICY_TEMPLATE, KSPM_POLICY_TEMPLATE } from '../../../common/constants';
-import { PosturePolicyTemplate } from '../../../common/types';
+import { PosturePolicyTemplate } from '../../../common/types_old';
import type {
CspBenchmarksPage,
CspIntegrationDocNavigationItem,
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_integration_link.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_integration_link.ts
index fb255a9545ad4..1dac88397e8be 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_integration_link.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_csp_integration_link.ts
@@ -6,7 +6,7 @@
*/
import { pagePathGetters, pkgKeyFromPackageInfo } from '@kbn/fleet-plugin/public';
-import type { CloudSecurityPolicyTemplate } from '../../../common/types';
+import type { CloudSecurityPolicyTemplate } from '../../../common/types_old';
import { useCisKubernetesIntegration } from '../api/use_cis_kubernetes_integration';
import { useKibana } from '../hooks/use_kibana';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration_policies.ts b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration_policies.ts
index af1dc5e795485..f5c7a6e5cc5e4 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration_policies.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/navigation/use_navigate_to_cis_integration_policies.ts
@@ -9,7 +9,7 @@ import { pagePathGetters, pkgKeyFromPackageInfo } from '@kbn/fleet-plugin/public
import { useCisKubernetesIntegration } from '../api/use_cis_kubernetes_integration';
import { useKibana } from '../hooks/use_kibana';
import { useCspBenchmarkIntegrations } from '../../pages/benchmarks/use_csp_benchmark_integrations';
-import { PostureTypes } from '../../../common/types';
+import { PostureTypes } from '../../../common/types_old';
export const useCISIntegrationPoliciesLink = ({
postureType,
diff --git a/x-pack/plugins/cloud_security_posture/public/common/utils/get_enabled_csp_integration_details.ts b/x-pack/plugins/cloud_security_posture/public/common/utils/get_enabled_csp_integration_details.ts
index 4cf3d7d129f0c..cd0a413648bed 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/utils/get_enabled_csp_integration_details.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/utils/get_enabled_csp_integration_details.ts
@@ -6,7 +6,7 @@
*/
import type { PackagePolicy } from '@kbn/fleet-plugin/common';
-import type { PostureInput } from '../../../common/types';
+import type { PostureInput } from '../../../common/types_old';
import { SUPPORTED_CLOUDBEAT_INPUTS } from '../../../common/constants';
import { cloudPostureIntegrations, type CloudPostureIntegrations } from '../constants';
diff --git a/x-pack/plugins/cloud_security_posture/public/common/utils/get_vulnerability_colors.ts b/x-pack/plugins/cloud_security_posture/public/common/utils/get_vulnerability_colors.ts
index 6cb1423a77511..db5776bb82ccc 100644
--- a/x-pack/plugins/cloud_security_posture/public/common/utils/get_vulnerability_colors.ts
+++ b/x-pack/plugins/cloud_security_posture/public/common/utils/get_vulnerability_colors.ts
@@ -7,7 +7,7 @@
import { euiThemeVars } from '@kbn/ui-theme';
import { VULNERABILITIES_SEVERITY } from '../../../common/constants';
-import { VulnSeverity } from '../../../common/types';
+import { VulnSeverity } from '../../../common/types_old';
export const getCvsScoreColor = (score: number): string | undefined => {
if (score <= 4) {
diff --git a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
index 4feee3a5e2287..98f99fbd29245 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
@@ -11,7 +11,7 @@ import { CIS_AWS, CIS_GCP, CIS_AZURE, CIS_K8S, CIS_EKS } from '../../common/cons
import { CISBenchmarkIcon } from './cis_benchmark_icon';
import { CompactFormattedNumber } from './compact_formatted_number';
import { useNavigateFindings } from '../common/hooks/use_navigate_findings';
-import { BenchmarkData } from '../../common/types';
+import { BenchmarkData } from '../../common/types_old';
// order in array will determine order of appearance in the dashboard
const benchmarks = [
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cis_benchmark_icon.tsx b/x-pack/plugins/cloud_security_posture/public/components/cis_benchmark_icon.tsx
index 50f9ca1b15d9d..b0b5703937c90 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cis_benchmark_icon.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/cis_benchmark_icon.tsx
@@ -8,7 +8,7 @@
import React from 'react';
import { EuiIcon, EuiToolTip, IconSize } from '@elastic/eui';
import { CSSInterpolation } from '@emotion/serialize';
-import type { BenchmarkId } from '../../common/types';
+import type { BenchmarkId } from '../../common/types_old';
import cisEksIcon from '../assets/icons/cis_eks_logo.svg';
import googleCloudLogo from '../assets/icons/google_cloud_logo.svg';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
index 4be4ac082f60f..947e48f434554 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
@@ -35,7 +35,7 @@ import {
} from '../utils';
import { SetupFormat, useAwsCredentialsForm } from './hooks';
import { AWS_ORGANIZATION_ACCOUNT } from '../policy_template_form';
-import { AwsCredentialsType } from '../../../../common/types';
+import { AwsCredentialsType } from '../../../../common/types_old';
interface AWSSetupInfoContentProps {
integrationLink: string;
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx
index 71882d4cc67cf..c4b19f87636b6 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx
@@ -10,7 +10,7 @@ import { EuiText } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { i18n } from '@kbn/i18n';
import { NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
-import { AwsCredentialsType } from '../../../../common/types';
+import { AwsCredentialsType } from '../../../../common/types_old';
const AssumeRoleDescription = (
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts
index 190ae47a61aec..d4824f5bc04b6 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts
@@ -19,7 +19,7 @@ import {
getInputVarsFields,
} from './get_aws_credentials_form_options';
import { CLOUDBEAT_AWS } from '../../../../common/constants';
-import { AwsCredentialsType } from '../../../../common/types';
+import { AwsCredentialsType } from '../../../../common/types_old';
/**
* Update CloudFormation template and stack name in the Agent Policy
* based on the selected policy template
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
index e941d81112d0c..06de63c3cff0c 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
@@ -29,7 +29,7 @@ import {
AzureOptions,
getAzureCredentialsFormManualOptions,
} from './get_azure_credentials_form_options';
-import { AzureCredentialsType } from '../../../../common/types';
+import { AzureCredentialsType } from '../../../../common/types_old';
import { SetupFormat, useAzureCredentialsForm } from './hooks';
import { getPosturePolicy, NewPackagePolicyPostureInput } from '../utils';
import { CspRadioOption, RadioGroup } from '../csp_boxed_radio_group';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx
index fb28255a08985..d6044118f1afd 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx
@@ -10,7 +10,7 @@ import React from 'react';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import { EuiText } from '@elastic/eui';
-import { AzureCredentialsType } from '../../../../common/types';
+import { AzureCredentialsType } from '../../../../common/types_old';
export type AzureCredentialsFields = Record;
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts
index a229c1a1486f0..2eb56fc6ace83 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts
@@ -19,7 +19,7 @@ import {
getInputVarsFields,
} from './get_azure_credentials_form_options';
import { CLOUDBEAT_AZURE } from '../../../../common/constants';
-import { AzureCredentialsType } from '../../../../common/types';
+import { AzureCredentialsType } from '../../../../common/types_old';
export type SetupFormat = 'arm_template' | 'manual';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/custom_assets_extension.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/custom_assets_extension.tsx
index 774acadbd03ba..c7708cba837cc 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/custom_assets_extension.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/custom_assets_extension.tsx
@@ -10,7 +10,7 @@ import { type CustomAssetsAccordionProps, CustomAssetsAccordion } from '@kbn/fle
import { i18n } from '@kbn/i18n';
import { useParams } from 'react-router-dom';
import { EuiSpacer } from '@elastic/eui';
-import { CloudSecurityPolicyTemplate } from '../../../common/types';
+import { CloudSecurityPolicyTemplate } from '../../../common/types_old';
import { VULN_MGMT_POLICY_TEMPLATE } from '../../../common/constants';
import { useKibana } from '../../common/hooks/use_kibana';
import { benchmarksNavigation, cloudPosturePages } from '../../common/navigation/constants';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
index 4f0adecb60e5b..45a3f8a6639a5 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credential_form.tsx
@@ -25,7 +25,7 @@ import type { NewPackagePolicy } from '@kbn/fleet-plugin/public';
import { NewPackagePolicyInput, PackageInfo } from '@kbn/fleet-plugin/common';
import { FormattedMessage } from '@kbn/i18n-react';
import { i18n } from '@kbn/i18n';
-import { GcpCredentialsType } from '../../../common/types';
+import { GcpCredentialsType } from '../../../common/types_old';
import {
CLOUDBEAT_GCP,
SETUP_ACCESS_CLOUD_SHELL,
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts
index 4c1b04a260df1..ae933a0f941a8 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts
@@ -15,7 +15,7 @@ import {
CLOUDBEAT_AWS,
CLOUDBEAT_VULN_MGMT_AWS,
} from '../../../common/constants';
-import type { PostureInput } from '../../../common/types';
+import type { PostureInput } from '../../../common/types_old';
export const getMockPolicyAWS = () => getPolicyMock(CLOUDBEAT_AWS, 'cspm', 'aws');
export const getMockPolicyGCP = () => getPolicyMock(CLOUDBEAT_GCP, 'cspm', 'gcp');
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
index 25360d33d1114..89ec1007f7d53 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
@@ -32,7 +32,7 @@ import { i18n } from '@kbn/i18n';
import { AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE } from './azure_credentials_form/azure_credentials_form';
import { CspRadioGroupProps, RadioGroup } from './csp_boxed_radio_group';
import { assert } from '../../../common/utils/helpers';
-import type { CloudSecurityPolicyTemplate, PostureInput } from '../../../common/types';
+import type { CloudSecurityPolicyTemplate, PostureInput } from '../../../common/types_old';
import {
CLOUDBEAT_AWS,
CLOUDBEAT_VANILLA,
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx
index ef21868dd404d..aa1e2b7942575 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx
@@ -15,7 +15,7 @@ import {
VULN_MGMT_POLICY_TEMPLATE,
CNVM_POLICY_TEMPLATE,
} from '../../../common/constants';
-import type { PostureInput, CloudSecurityPolicyTemplate } from '../../../common/types';
+import type { PostureInput, CloudSecurityPolicyTemplate } from '../../../common/types_old';
import { getPolicyTemplateInputOptions, type NewPackagePolicyPostureInput } from './utils';
import { RadioGroup } from './csp_boxed_radio_group';
import { AzureCredentialsForm } from './azure_credentials_form/azure_credentials_form';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
index ae7c02ade79d1..1f005ccb950f4 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
@@ -30,7 +30,7 @@ import {
VULN_MGMT_POLICY_TEMPLATE,
} from '../../../common/constants';
import { getDefaultAwsVarsGroup } from './aws_credentials_form/aws_credentials_form';
-import type { PostureInput, CloudSecurityPolicyTemplate } from '../../../common/types';
+import type { PostureInput, CloudSecurityPolicyTemplate } from '../../../common/types_old';
import { cloudPostureIntegrations } from '../../common/constants';
import { DEFAULT_EKS_VARS_GROUP } from './eks_credentials_form';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx
index 422695c7ff576..f070b1e0ad345 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx
@@ -30,7 +30,7 @@ import {
} from './test_subjects';
import { CloudPosturePage, PACKAGE_NOT_INSTALLED_TEST_SUBJECT } from './cloud_posture_page';
import { useCspSetupStatusApi } from '../common/api/use_setup_status_api';
-import type { IndexDetails, PostureTypes } from '../../common/types';
+import type { IndexDetails, PostureTypes } from '../../common/types_old';
import { cspIntegrationDocsNavigation } from '../common/navigation/constants';
import noDataIllustration from '../assets/illustrations/no_data_illustration.svg';
import { useCspIntegrationLink } from '../common/navigation/use_csp_integration_link';
diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
index 7dee3e94e70a6..14872bcc19210 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
@@ -25,7 +25,7 @@ import { VULN_MGMT_POLICY_TEMPLATE } from '../../common/constants';
import { FullSizeCenteredPage } from './full_size_centered_page';
import { CloudPosturePage } from './cloud_posture_page';
import { useCspSetupStatusApi } from '../common/api/use_setup_status_api';
-import type { IndexDetails } from '../../common/types';
+import type { IndexDetails } from '../../common/types_old';
import {
NO_VULNERABILITIES_STATUS_TEST_SUBJ,
CNVM_NOT_INSTALLED_ACTION_SUBJ,
@@ -33,7 +33,7 @@ import {
import noDataIllustration from '../assets/illustrations/no_data_illustration.svg';
import { useCspIntegrationLink } from '../common/navigation/use_csp_integration_link';
import { useCISIntegrationPoliciesLink } from '../common/navigation/use_navigate_to_cis_integration_policies';
-import { PostureTypes } from '../../common/types';
+import { PostureTypes } from '../../common/types_old';
const REFETCH_INTERVAL_MS = 20000;
diff --git a/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx b/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx
index b94efbd2de1a0..20b1326d65526 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/vulnerability_badges.tsx
@@ -10,7 +10,7 @@ import React from 'react';
import { css } from '@emotion/react';
import { float } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { getCvsScoreColor, getSeverityStatusColor } from '../common/utils/get_vulnerability_colors';
-import { VulnSeverity } from '../../common/types';
+import { VulnSeverity } from '../../common/types_old';
import { VULNERABILITIES_CVSS_SCORE_BADGE_SUBJ } from './test_subjects';
interface CVSScoreBadgeProps {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
index e37a9d6fcbe9c..d2b6495667372 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/benchmarks_table.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
import type { PackagePolicy } from '@kbn/fleet-plugin/common';
import { FormattedMessage } from '@kbn/i18n-react';
import { TimestampTableCell } from '../../components/timestamp_table_cell';
-import type { Benchmark } from '../../../common/types';
+import type { Benchmark } from '../../../common/types_old';
import { useKibana } from '../../common/hooks/use_kibana';
import { benchmarksNavigation } from '../../common/navigation/constants';
import * as TEST_SUBJ from './test_subjects';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
index 95d955c69047e..8704846407fc7 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/benchmarks/use_csp_benchmark_integrations.ts
@@ -10,7 +10,7 @@ import type { ListResult } from '@kbn/fleet-plugin/common';
import { BENCHMARKS_API_CURRENT_VERSION, BENCHMARKS_ROUTE_PATH } from '../../../common/constants';
import type { BenchmarksQueryParams } from '../../../common/schemas/benchmark';
import { useKibana } from '../../common/hooks/use_kibana';
-import type { Benchmark } from '../../../common/types';
+import type { Benchmark } from '../../../common/types_old';
const QUERY_KEY = 'csp_benchmark_integrations';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/compliance_score_chart.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/compliance_score_chart.tsx
index 2067a9c98fd23..01821e04403ff 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/compliance_score_chart.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/compliance_score_chart.tsx
@@ -35,7 +35,7 @@ import { DASHBOARD_COMPLIANCE_SCORE_CHART } from '../test_subjects';
import { statusColors } from '../../../common/constants';
import { RULE_FAILED, RULE_PASSED } from '../../../../common/constants';
import { CompactFormattedNumber } from '../../../components/compact_formatted_number';
-import type { Evaluation, PostureTrend, Stats } from '../../../../common/types';
+import type { Evaluation, PostureTrend, Stats } from '../../../../common/types_old';
import { useKibana } from '../../../common/hooks/use_kibana';
interface ComplianceScoreChartProps {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/risks_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/risks_table.tsx
index ac7048533ead5..d8fce2e0bfaa0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/risks_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_charts/risks_table.tsx
@@ -17,7 +17,7 @@ import {
import { i18n } from '@kbn/i18n';
import { css } from '@emotion/react';
import { ComplianceScoreBar } from '../../../components/compliance_score_bar';
-import { ComplianceDashboardData, GroupedFindingsEvaluation } from '../../../../common/types';
+import { ComplianceDashboardData, GroupedFindingsEvaluation } from '../../../../common/types_old';
export interface RisksTableProps {
data: ComplianceDashboardData['groupedFindingsEvaluation'];
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.test.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.test.tsx
index 18e5118f772e5..adf85dd5f84db 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.test.tsx
@@ -36,7 +36,7 @@ import {
BaseCspSetupStatus,
ComplianceDashboardDataV2,
CspStatusCode,
-} from '../../../common/types';
+} from '../../../common/types_old';
jest.mock('../../common/api/use_setup_status_api');
jest.mock('../../common/api/use_stats_api');
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
index 9e3b8df0c1d3e..61a56ecd3187c 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/compliance_dashboard.tsx
@@ -17,7 +17,7 @@ import type {
PosturePolicyTemplate,
ComplianceDashboardDataV2,
BaseCspSetupStatus,
-} from '../../../common/types';
+} from '../../../common/types_old';
import { CloudPosturePageTitle } from '../../components/cloud_posture_page_title';
import {
CloudPosturePage,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmark_details_box.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmark_details_box.tsx
index de982b50f48f6..dc140fef121b3 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmark_details_box.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmark_details_box.tsx
@@ -18,7 +18,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
import React from 'react';
import { i18n } from '@kbn/i18n';
import { getBenchmarkIdQuery } from './benchmarks_section';
-import { BenchmarkData } from '../../../../common/types';
+import { BenchmarkData } from '../../../../common/types_old';
import { useNavigateFindings } from '../../../common/hooks/use_navigate_findings';
import { CISBenchmarkIcon } from '../../../components/cis_benchmark_icon';
import cisLogoIcon from '../../../assets/icons/cis_logo.svg';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmarks_section.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmarks_section.tsx
index 2ac91288475de..d3a6cf3ab12d7 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmarks_section.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/benchmarks_section.tsx
@@ -17,7 +17,7 @@ import type {
ComplianceDashboardDataV2,
Evaluation,
PosturePolicyTemplate,
-} from '../../../../common/types';
+} from '../../../../common/types_old';
import { RisksTable } from '../compliance_charts/risks_table';
import { RULE_FAILED } from '../../../../common/constants';
import { LOCAL_STORAGE_DASHBOARD_BENCHMARK_SORT_KEY } from '../../../common/constants';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/summary_section.tsx b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/summary_section.tsx
index ca4a55c45ebdd..e63152a00590e 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/summary_section.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/dashboard_sections/summary_section.tsx
@@ -25,7 +25,7 @@ import type {
ComplianceDashboardDataV2,
Evaluation,
PosturePolicyTemplate,
-} from '../../../../common/types';
+} from '../../../../common/types_old';
import { RisksTable } from '../compliance_charts/risks_table';
import { NavFilter, useNavigateFindings } from '../../../common/hooks/use_navigate_findings';
import {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/mock.ts b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/mock.ts
index b4a8eae816b24..93eddb2d6454d 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/mock.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/compliance_dashboard/mock.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { BenchmarkData, ComplianceDashboardDataV2 } from '../../../common/types';
+import { BenchmarkData, ComplianceDashboardDataV2 } from '../../../common/types_old';
export const getMockDashboardData = () => ({
...mockDashboardData,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/findings_flyout/findings_flyout.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/findings_flyout/findings_flyout.tsx
index 2542c57aab44f..edc8e7f35bb35 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/findings_flyout/findings_flyout.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/findings_flyout/findings_flyout.tsx
@@ -35,9 +35,9 @@ import { TableTab } from './table_tab';
import { JsonTab } from './json_tab';
import { OverviewTab } from './overview_tab';
import { RuleTab } from './rule_tab';
-import type { BenchmarkId } from '../../../../common/types';
+import type { BenchmarkId } from '../../../../common/types_old';
import { CISBenchmarkIcon } from '../../../components/cis_benchmark_icon';
-import { BenchmarkName } from '../../../../common/types';
+import { BenchmarkName } from '../../../../common/types_old';
import { FINDINGS_FLYOUT } from '../test_subjects';
import { createDetectionRuleFromFinding } from '../utils/create_detection_rule_from_finding';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
index be5253cc710b7..9d092de673edf 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
@@ -15,7 +15,7 @@ import {
} from '@kbn/securitysolution-grouping/src';
import { useMemo } from 'react';
import { DataView } from '@kbn/data-views-plugin/common';
-import { Evaluation } from '../../../../common/types';
+import { Evaluation } from '../../../../common/types_old';
import { LATEST_FINDINGS_RETENTION_POLICY } from '../../../../common/constants';
import {
FindingsGroupingAggregation,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
index 2bcc895ddd4b0..50ebb01f363f0 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_table.tsx
@@ -9,7 +9,7 @@ import { DataView } from '@kbn/data-views-plugin/common';
import { Filter } from '@kbn/es-query';
import { useMemo } from 'react';
import { FindingsBaseURLQuery } from '../../../common/types';
-import { Evaluation } from '../../../../common/types';
+import { Evaluation } from '../../../../common/types_old';
import { LOCAL_STORAGE_DATA_TABLE_PAGE_SIZE_KEY } from '../../../common/constants';
import { useCloudPostureDataTable } from '../../../common/hooks/use_cloud_posture_data_table';
import { getFilters } from '../utils/get_filters';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
index 3054ad352a5bd..85095b149bce4 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/findings_by_resource_container.tsx
@@ -10,7 +10,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
import { CspFinding } from '../../../../common/schemas/csp_finding';
-import type { Evaluation } from '../../../../common/types';
+import type { Evaluation } from '../../../../common/types_old';
import { FindingsSearchBar } from '../layout/findings_search_bar';
import * as TEST_SUBJECTS from '../test_subjects';
import { usePageSlice } from '../../../common/hooks/use_page_slice';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx
index f606241862ee2..bc6e67b887096 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings_by_resource/resource_findings/resource_findings_container.tsx
@@ -17,7 +17,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
import { generatePath } from 'react-router-dom';
import { i18n } from '@kbn/i18n';
import { CspInlineDescriptionList } from '../../../../components/csp_inline_description_list';
-import type { Evaluation } from '../../../../../common/types';
+import type { Evaluation } from '../../../../../common/types_old';
import { CspFinding } from '../../../../../common/schemas/csp_finding';
import { CloudPosturePageTitle } from '../../../../components/cloud_posture_page_title';
import * as TEST_SUBJECTS from '../../test_subjects';
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_distribution_bar.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_distribution_bar.tsx
index 1cf084220ea29..35f6fd008d4b9 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_distribution_bar.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/layout/findings_distribution_bar.tsx
@@ -20,7 +20,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
import { getAbbreviatedNumber } from '../../../common/utils/get_abbreviated_number';
import { RULE_FAILED, RULE_PASSED } from '../../../../common/constants';
import { statusColors } from '../../../common/constants';
-import type { Evaluation } from '../../../../common/types';
+import type { Evaluation } from '../../../../common/types_old';
interface Props {
passed: number;
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/severity_map.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/severity_map.tsx
index 94ebaf30572b3..af47c20ddc50f 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/severity_map.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/vulnerabilities_by_resource/severity_map.tsx
@@ -17,7 +17,7 @@ import {
import { PaletteColorStop } from '@elastic/eui/src/components/color_picker/color_palette_picker';
import { i18n } from '@kbn/i18n';
import { getSeverityStatusColor } from '../../../common/utils/get_vulnerability_colors';
-import { VulnSeverity } from '../../../../common/types';
+import { VulnSeverity } from '../../../../common/types_old';
import { SeverityStatusBadge } from '../../../components/vulnerability_badges';
interface Props {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/_mocks_/vulnerability_dashboard.mock.ts b/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/_mocks_/vulnerability_dashboard.mock.ts
index 6d7f909a82e53..0148105bbc83a 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/_mocks_/vulnerability_dashboard.mock.ts
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/_mocks_/vulnerability_dashboard.mock.ts
@@ -5,7 +5,7 @@
* 2.0.
*/
-import { CnvmDashboardData } from '../../../../common/types';
+import { CnvmDashboardData } from '../../../../common/types_old';
export const mockCnvmDashboardData: CnvmDashboardData = {
cnvmStatistics: {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_table_panel_section.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_table_panel_section.tsx
index 14c3451fd2731..1ba912b1d125b 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_table_panel_section.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_table_panel_section.tsx
@@ -21,7 +21,7 @@ import {
VulnerabilityStat,
VulnerableResourceStat,
VulnSeverity,
-} from '../../../common/types';
+} from '../../../common/types_old';
import { DASHBOARD_TABLE_TYPES } from './vulnerability_table_panel.config';
import { VulnerabilityTablePanel } from './vulnerability_table_panel';
import {
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_trend_graph.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_trend_graph.tsx
index a8c528f7f8804..493d38348ed62 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_trend_graph.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerability_dashboard/vulnerability_trend_graph.tsx
@@ -20,7 +20,7 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import { truthy } from '../../../common/utils/helpers';
import { useNavigateVulnerabilities } from '../../common/hooks/use_navigate_findings';
-import { VulnStatsTrend, VulnSeverity } from '../../../common/types';
+import { VulnStatsTrend, VulnSeverity } from '../../../common/types_old';
import { useVulnerabilityDashboardApi } from '../../common/api/use_vulnerability_dashboard_api';
import { getSeverityStatusColor } from '../../common/utils/get_vulnerability_colors';
import { ChartPanel } from '../../components/chart_panel';
diff --git a/x-pack/plugins/cloud_security_posture/public/test/fixtures/csp_benchmark_integration.ts b/x-pack/plugins/cloud_security_posture/public/test/fixtures/csp_benchmark_integration.ts
index bc9243fad2792..4b5d4f1bfe028 100644
--- a/x-pack/plugins/cloud_security_posture/public/test/fixtures/csp_benchmark_integration.ts
+++ b/x-pack/plugins/cloud_security_posture/public/test/fixtures/csp_benchmark_integration.ts
@@ -8,7 +8,7 @@
/* eslint-disable @typescript-eslint/naming-convention */
import Chance from 'chance';
-import type { Benchmark } from '../../../common/types';
+import type { Benchmark } from '../../../common/types_old';
type CreateCspBenchmarkIntegrationFixtureInput = {
chance?: Chance.Chance;
diff --git a/x-pack/plugins/cloud_security_posture/server/lib/check_index_status.ts b/x-pack/plugins/cloud_security_posture/server/lib/check_index_status.ts
index ebce74d89b2dc..67eb611f9557e 100644
--- a/x-pack/plugins/cloud_security_posture/server/lib/check_index_status.ts
+++ b/x-pack/plugins/cloud_security_posture/server/lib/check_index_status.ts
@@ -7,7 +7,7 @@
import { ElasticsearchClient, type Logger } from '@kbn/core/server';
import { getSafePostureTypeRuntimeMapping } from '../../common/runtime_mappings/get_safe_posture_type_runtime_mapping';
-import { IndexStatus, PostureTypes } from '../../common/types';
+import { IndexStatus, PostureTypes } from '../../common/types_old';
export interface PostureTypeAndRetention {
postureType?: PostureTypes;
diff --git a/x-pack/plugins/cloud_security_posture/server/lib/fleet_util.ts b/x-pack/plugins/cloud_security_posture/server/lib/fleet_util.ts
index cd67f29cef1b4..109d1b46986c9 100644
--- a/x-pack/plugins/cloud_security_posture/server/lib/fleet_util.ts
+++ b/x-pack/plugins/cloud_security_posture/server/lib/fleet_util.ts
@@ -19,7 +19,7 @@ import type {
PackagePolicyInput,
} from '@kbn/fleet-plugin/common';
import { errors } from '@elastic/elasticsearch';
-import { CloudSecurityPolicyTemplate, PostureTypes } from '../../common/types';
+import { CloudSecurityPolicyTemplate, PostureTypes } from '../../common/types_old';
import {
SUPPORTED_POLICY_TEMPLATES,
CLOUD_SECURITY_POSTURE_PACKAGE_NAME,
diff --git a/x-pack/plugins/cloud_security_posture/server/lib/telemetry/collectors/types.ts b/x-pack/plugins/cloud_security_posture/server/lib/telemetry/collectors/types.ts
index cb8d6eec64dcb..f9eb6094277a4 100644
--- a/x-pack/plugins/cloud_security_posture/server/lib/telemetry/collectors/types.ts
+++ b/x-pack/plugins/cloud_security_posture/server/lib/telemetry/collectors/types.ts
@@ -6,7 +6,7 @@
*/
import { AggregationsMultiBucketBase } from '@elastic/elasticsearch/lib/api/types';
-import { CspStatusCode } from '../../../../common/types';
+import { CspStatusCode } from '../../../../common/types_old';
export type CloudSecurityUsageCollectorType =
| 'Indices'
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
index 37f85a08b8243..0c920754fb77b 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/benchmarks/benchmarks.ts
@@ -15,7 +15,7 @@ import {
POSTURE_TYPE_ALL,
} from '../../../common/constants';
import { benchmarksQueryParamsSchema } from '../../../common/schemas/benchmark';
-import type { Benchmark } from '../../../common/types';
+import type { Benchmark } from '../../../common/types_old';
import {
getBenchmarkFromPackagePolicy,
getBenchmarkFilter,
@@ -28,7 +28,7 @@ import {
getCspAgentPolicies,
getCspPackagePolicies,
} from '../../lib/fleet_util';
-import { BenchmarkId } from '../../../common/types';
+import { BenchmarkId } from '../../../common/types_old';
export const PACKAGE_POLICY_SAVED_OBJECT_TYPE = 'ingest-package-policies';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
index 88c7afd5aca11..614f85dcf9374 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/compliance_dashboard.ts
@@ -15,7 +15,7 @@ import type {
ComplianceDashboardData,
GetComplianceDashboardRequest,
ComplianceDashboardDataV2,
-} from '../../../common/types';
+} from '../../../common/types_old';
import { LATEST_FINDINGS_INDEX_DEFAULT_NS, STATS_ROUTE_PATH } from '../../../common/constants';
import { getGroupedFindingsEvaluation } from './get_grouped_findings_evaluation';
import { ClusterWithoutTrend, getClusters } from './get_clusters';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_benchmarks.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_benchmarks.ts
index b1f8335a61866..130af8d20a2b8 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_benchmarks.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_benchmarks.ts
@@ -13,7 +13,7 @@ import type {
} from '@elastic/elasticsearch/lib/api/types';
import type { Logger } from '@kbn/core/server';
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/types';
-import type { BenchmarkData } from '../../../common/types';
+import type { BenchmarkData } from '../../../common/types_old';
import {
failedFindingsAggQuery,
BenchmarkVersionQueryResult,
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
index 51d5c71673ed1..e793863621340 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_clusters.ts
@@ -16,7 +16,7 @@ import type {
import type { Logger } from '@kbn/core/server';
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/types';
import { CspFinding } from '../../../common/schemas/csp_finding';
-import type { Cluster } from '../../../common/types';
+import type { Cluster } from '../../../common/types_old';
import { getPostureStatsFromAggs, failedFindingsAggQuery } from './get_grouped_findings_evaluation';
import type { FailedFindingsQueryResult } from './get_grouped_findings_evaluation';
import { findingsEvaluationAggsQuery, getStatsFromFindingsEvaluationsAggs } from './get_stats';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_grouped_findings_evaluation.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_grouped_findings_evaluation.ts
index 74b239f14d242..ec915d0d62330 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_grouped_findings_evaluation.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_grouped_findings_evaluation.ts
@@ -14,7 +14,7 @@ import type {
import type { Logger } from '@kbn/core/server';
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/types';
import { calculatePostureScore } from '../../../common/utils/helpers';
-import type { ComplianceDashboardData } from '../../../common/types';
+import type { ComplianceDashboardData } from '../../../common/types_old';
import { KeyDocCount } from './compliance_dashboard';
export interface FailedFindingsQueryResult {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
index f639f8a7e1421..e02b355f27e18 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_stats.ts
@@ -10,7 +10,7 @@ import type { QueryDslQueryContainer, SearchRequest } from '@elastic/elasticsear
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/types';
import type { Logger } from '@kbn/core/server';
import { calculatePostureScore } from '../../../common/utils/helpers';
-import type { ComplianceDashboardData } from '../../../common/types';
+import type { ComplianceDashboardData } from '../../../common/types_old';
export interface FindingsEvaluationsQueryResult {
failed_findings: {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
index 00acd14d960fa..150c531f4a1fa 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/compliance_dashboard/get_trends.ts
@@ -8,7 +8,7 @@
import { ElasticsearchClient, Logger } from '@kbn/core/server';
import { calculatePostureScore } from '../../../common/utils/helpers';
import { BENCHMARK_SCORE_INDEX_DEFAULT_NS } from '../../../common/constants';
-import type { PosturePolicyTemplate, Stats } from '../../../common/types';
+import type { PosturePolicyTemplate, Stats } from '../../../common/types_old';
import { toBenchmarkDocFieldKey } from '../../lib/mapping_field_util';
import { CSPM_FINDINGS_STATS_INTERVAL } from '../../tasks/findings_stats_task';
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/status/status.ts b/x-pack/plugins/cloud_security_posture/server/routes/status/status.ts
index ed3bcd99746fc..df2fc0d36fc63 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/status/status.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/status/status.ts
@@ -44,7 +44,7 @@ import type {
CspStatusCode,
IndexStatus,
PostureTypes,
-} from '../../../common/types';
+} from '../../../common/types_old';
import {
getAgentStatusesByAgentPolicies,
getCspAgentPolicies,
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_patchable_vulnerabilities.ts b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_patchable_vulnerabilities.ts
index 6eec795e2dad6..3f4db5e90a526 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_patchable_vulnerabilities.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_patchable_vulnerabilities.ts
@@ -7,7 +7,7 @@
import { SearchRequest } from '@elastic/elasticsearch/lib/api/types';
import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { AggFieldBucket, PatchableVulnerabilityStat } from '../../../common/types';
+import { AggFieldBucket, PatchableVulnerabilityStat } from '../../../common/types_old';
import { LATEST_VULNERABILITIES_INDEX_DEFAULT_NS } from '../../../common/constants';
interface VulnerabilityBucket {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerabilities.ts b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerabilities.ts
index cd8c5b64f532d..8efb0fd33c61e 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerabilities.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerabilities.ts
@@ -7,7 +7,7 @@
import { SearchRequest } from '@elastic/elasticsearch/lib/api/types';
import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { VulnerabilityStat } from '../../../common/types';
+import { VulnerabilityStat } from '../../../common/types_old';
import { LATEST_VULNERABILITIES_INDEX_DEFAULT_NS } from '../../../common/constants';
interface VulnerabilityBucket {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerable_resources.ts b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerable_resources.ts
index 0a41a11aeedea..50f54f69e0a64 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerable_resources.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_top_vulnerable_resources.ts
@@ -7,7 +7,7 @@
import { SearchRequest } from '@elastic/elasticsearch/lib/api/types';
import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { AggFieldBucket, VulnerableResourceStat } from '../../../common/types';
+import { AggFieldBucket, VulnerableResourceStat } from '../../../common/types_old';
import { LATEST_VULNERABILITIES_INDEX_DEFAULT_NS } from '../../../common/constants';
interface ResourceBucket {
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_vulnerabilities_trend.ts b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_vulnerabilities_trend.ts
index a3e335734e74c..5a619b125deab 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_vulnerabilities_trend.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/get_vulnerabilities_trend.ts
@@ -7,7 +7,7 @@
import { ElasticsearchClient } from '@kbn/core/server';
import { BENCHMARK_SCORE_INDEX_DEFAULT_NS } from '../../../common/constants';
-import { VulnStatsTrend } from '../../../common/types';
+import { VulnStatsTrend } from '../../../common/types_old';
interface LastDocBucket {
key_as_string: string;
diff --git a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/vulnerabilities_dashboard.ts b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/vulnerabilities_dashboard.ts
index 7f676226559aa..f7de7f1be4b65 100644
--- a/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/vulnerabilities_dashboard.ts
+++ b/x-pack/plugins/cloud_security_posture/server/routes/vulnerabilities_dashboard/vulnerabilities_dashboard.ts
@@ -7,7 +7,7 @@
import { transformError } from '@kbn/securitysolution-es-utils';
import { getVulnerabilitiesTrends } from './get_vulnerabilities_trend';
-import type { CnvmDashboardData } from '../../../common/types';
+import type { CnvmDashboardData } from '../../../common/types_old';
import { VULNERABILITIES_DASHBOARD_ROUTE_PATH } from '../../../common/constants';
import { CspRouter } from '../../types';
import { getVulnerabilitiesStatistics } from './get_vulnerabilities_statistics';
diff --git a/x-pack/plugins/cloud_security_posture/server/saved_objects/saved_objects.ts b/x-pack/plugins/cloud_security_posture/server/saved_objects/saved_objects.ts
index f806571fa195c..eed21b5b91916 100644
--- a/x-pack/plugins/cloud_security_posture/server/saved_objects/saved_objects.ts
+++ b/x-pack/plugins/cloud_security_posture/server/saved_objects/saved_objects.ts
@@ -7,7 +7,7 @@
import { SavedObjectsServiceSetup } from '@kbn/core/server';
import { SECURITY_SOLUTION_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
-import { rulesV1, rulesV2, rulesV3 } from '../../common/types/index';
+import { rulesV1, rulesV2, rulesV3 } from '../../common/types';
import { cspBenchmarkRuleSavedObjectMapping } from './mappings';
import { cspBenchmarkRuleMigrations } from './migrations';
diff --git a/x-pack/plugins/cloud_security_posture/server/types.ts b/x-pack/plugins/cloud_security_posture/server/types.ts
index 1b3c4fd840347..3c84de12decf6 100644
--- a/x-pack/plugins/cloud_security_posture/server/types.ts
+++ b/x-pack/plugins/cloud_security_posture/server/types.ts
@@ -34,7 +34,7 @@ import type {
import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
import type { FleetStartContract, FleetRequestHandlerContext } from '@kbn/fleet-plugin/server';
import { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
-import { CspStatusCode, IndexDetails } from '../common/types';
+import { CspStatusCode, IndexDetails } from '../common/types_old';
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface CspServerPluginSetup {}