From 37d1c8bdabad4f6ac49fafd1b111f42deef846ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Bl=C3=A1zquez?= Date: Tue, 25 Feb 2025 18:27:21 +0100 Subject: [PATCH] Rename FindingsBaseEsQuery type in CSP package --- .../packages/kbn-cloud-security-posture/public/src/types.ts | 2 +- .../configurations/latest_findings/use_latest_findings.ts | 4 ++-- .../vulnerabilities/hooks/use_latest_vulnerabilities.tsx | 4 ++-- .../public/asset_inventory/hooks/use_fetch_chart_data.ts | 4 ++-- .../public/asset_inventory/hooks/use_fetch_data.ts | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/x-pack/solutions/security/packages/kbn-cloud-security-posture/public/src/types.ts b/x-pack/solutions/security/packages/kbn-cloud-security-posture/public/src/types.ts index 5c3eec8a1dd33..a500e9ae6dd89 100644 --- a/x-pack/solutions/security/packages/kbn-cloud-security-posture/public/src/types.ts +++ b/x-pack/solutions/security/packages/kbn-cloud-security-posture/public/src/types.ts @@ -27,7 +27,7 @@ import type { estypes } from '@elastic/elasticsearch'; import type { IKibanaSearchResponse, IKibanaSearchRequest } from '@kbn/search-types'; import type { BoolQuery } from '@kbn/es-query'; -export interface FindingsBaseEsQuery { +export interface BaseEsQuery { query?: { bool: BoolQuery; }; diff --git a/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts b/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts index 9800990a38e4b..e879b07fb2b77 100644 --- a/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts +++ b/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings.ts @@ -19,14 +19,14 @@ import { } from '@kbn/cloud-security-posture-common'; import type { CspFinding } from '@kbn/cloud-security-posture-common'; import type { CspBenchmarkRulesStates } from '@kbn/cloud-security-posture-common/schema/rules/latest'; -import type { FindingsBaseEsQuery } from '@kbn/cloud-security-posture'; +import type { BaseEsQuery } from '@kbn/cloud-security-posture'; import { useGetCspBenchmarkRulesStatesApi } from '@kbn/cloud-security-posture/src/hooks/use_get_benchmark_rules_state_api'; import type { RuntimePrimitiveTypes } from '@kbn/data-views-plugin/common'; import { CDR_MISCONFIGURATION_DATA_TABLE_RUNTIME_MAPPING_FIELDS } from '../../../common/constants'; import { useKibana } from '../../../common/hooks/use_kibana'; import { getAggregationCount, getFindingsCountAggQuery } from '../utils/utils'; -interface UseFindingsOptions extends FindingsBaseEsQuery { +interface UseFindingsOptions extends BaseEsQuery { sort: string[][]; enabled: boolean; pageSize: number; diff --git a/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx b/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx index 6763547730e1a..e53c8cb9c685a 100644 --- a/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx +++ b/x-pack/solutions/security/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities.tsx @@ -21,7 +21,7 @@ import { CDR_VULNERABILITIES_INDEX_PATTERN, CDR_3RD_PARTY_RETENTION_POLICY, } from '@kbn/cloud-security-posture-common'; -import { FindingsBaseEsQuery, showErrorToast } from '@kbn/cloud-security-posture'; +import { BaseEsQuery, showErrorToast } from '@kbn/cloud-security-posture'; import type { CspVulnerabilityFinding } from '@kbn/cloud-security-posture-common/schema/vulnerabilities/latest'; import type { RuntimePrimitiveTypes } from '@kbn/data-views-plugin/common'; import { @@ -38,7 +38,7 @@ type LatestFindingsResponse = IKibanaSearchResponse< interface FindingsAggs { count: AggregationsMultiBucketAggregateBase; } -interface VulnerabilitiesQuery extends FindingsBaseEsQuery { +interface VulnerabilitiesQuery extends BaseEsQuery { sort: string[][]; enabled: boolean; pageSize: number; diff --git a/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_chart_data.ts b/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_chart_data.ts index 130b9821854e8..aac245973bb78 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_chart_data.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_chart_data.ts @@ -11,12 +11,12 @@ import { i18n } from '@kbn/i18n'; import type * as estypes from '@elastic/elasticsearch/lib/api/types'; import { showErrorToast } from '@kbn/cloud-security-posture'; import type { IKibanaSearchResponse, IKibanaSearchRequest } from '@kbn/search-types'; -import type { FindingsBaseEsQuery } from '@kbn/cloud-security-posture'; +import type { BaseEsQuery } from '@kbn/cloud-security-posture'; import { useKibana } from '../../common/lib/kibana'; import { ASSET_INVENTORY_INDEX_PATTERN } from '../constants'; import { getMultiFieldsSort } from './fetch_utils'; -interface UseTopAssetsOptions extends FindingsBaseEsQuery { +interface UseTopAssetsOptions extends BaseEsQuery { sort: string[][]; enabled: boolean; } diff --git a/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_data.ts b/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_data.ts index 08edb6aaaffe4..13f495ebe411d 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_data.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/hooks/use_fetch_data.ts @@ -13,12 +13,12 @@ import { buildDataTableRecord } from '@kbn/discover-utils'; import type { EsHitRecord } from '@kbn/discover-utils/types'; import { showErrorToast } from '@kbn/cloud-security-posture'; import type { IKibanaSearchResponse, IKibanaSearchRequest } from '@kbn/search-types'; -import type { FindingsBaseEsQuery } from '@kbn/cloud-security-posture'; +import type { BaseEsQuery } from '@kbn/cloud-security-posture'; import { useKibana } from '../../common/lib/kibana'; import { MAX_ASSETS_TO_LOAD, ASSET_INVENTORY_INDEX_PATTERN } from '../constants'; import { getRuntimeMappingsFromSort, getMultiFieldsSort } from './fetch_utils'; -interface UseAssetsOptions extends FindingsBaseEsQuery { +interface UseAssetsOptions extends BaseEsQuery { sort: string[][]; enabled: boolean; pageSize: number;