diff --git a/x-pack/solutions/security/packages/kbn-securitysolution-io-ts-list-types/src/common/meta/index.ts b/x-pack/solutions/security/packages/kbn-securitysolution-io-ts-list-types/src/common/meta/index.ts index 547b45969be71..b4a2e3d44ef06 100644 --- a/x-pack/solutions/security/packages/kbn-securitysolution-io-ts-list-types/src/common/meta/index.ts +++ b/x-pack/solutions/security/packages/kbn-securitysolution-io-ts-list-types/src/common/meta/index.ts @@ -7,7 +7,7 @@ import * as t from 'io-ts'; -export const meta = t.object; +export const meta = t.UnknownRecord; export type Meta = t.TypeOf; export const metaOrUndefined = t.union([meta, t.undefined]); export type MetaOrUndefined = t.TypeOf; diff --git a/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts b/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts index 4aa13036c3c88..496056f6878d6 100644 --- a/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts @@ -69,7 +69,7 @@ import type { } from '@kbn/fleet-plugin/common'; import { createMockPolicyData } from '../endpoint/services/feature_usage/mocks'; import { ALL_ENDPOINT_ARTIFACT_LIST_IDS } from '../../common/endpoint/service/artifacts/constants'; -import { ENDPOINT_EVENT_FILTERS_LIST_ID } from '@kbn/securitysolution-list-constants'; +import { ENDPOINT_ARTIFACT_LISTS } from '@kbn/securitysolution-list-constants'; import * as PolicyConfigHelpers from '../../common/endpoint/models/policy_config_helpers'; import { disableProtections } from '../../common/endpoint/models/policy_config_helpers'; import type { ProductFeaturesService } from '../lib/product_features_service/product_features_service'; @@ -421,12 +421,15 @@ describe('Fleet integrations', () => { ); expect(exceptionListClient.createExceptionList).toHaveBeenCalledWith( - expect.objectContaining({ listId: ENDPOINT_EVENT_FILTERS_LIST_ID }) + expect.objectContaining({ + listId: ENDPOINT_ARTIFACT_LISTS.eventFilters.id, + meta: undefined, + }) ); expect(exceptionListClient.createExceptionListItem).toHaveBeenCalledWith( expect.objectContaining({ - listId: ENDPOINT_EVENT_FILTERS_LIST_ID, + listId: ENDPOINT_ARTIFACT_LISTS.eventFilters.id, tags: [`policy:${postCreatedPolicyConfig.id}`], osTypes: ['linux'], entries: [ @@ -439,6 +442,7 @@ describe('Fleet integrations', () => { ], itemId: 'NEW_UUID', namespaceType: 'agnostic', + meta: undefined, }) ); }); diff --git a/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/handlers/create_event_filters.ts b/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/handlers/create_event_filters.ts index 5e5cefd5d2a90..bd9aa21045d17 100644 --- a/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/handlers/create_event_filters.ts +++ b/x-pack/solutions/security/plugins/security_solution/server/fleet_integration/handlers/create_event_filters.ts @@ -6,11 +6,7 @@ */ import { v4 as uuidv4 } from 'uuid'; import { i18n } from '@kbn/i18n'; -import { - ENDPOINT_EVENT_FILTERS_LIST_ID, - ENDPOINT_EVENT_FILTERS_LIST_NAME, - ENDPOINT_EVENT_FILTERS_LIST_DESCRIPTION, -} from '@kbn/securitysolution-list-constants'; +import { ENDPOINT_ARTIFACT_LISTS } from '@kbn/securitysolution-list-constants'; import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types'; import { SavedObjectsErrorHelpers } from '@kbn/core/server'; import type { Logger } from '@kbn/core/server'; @@ -37,10 +33,10 @@ export const createEventFilters = async ( // Attempt to Create the Event Filter List. It won't create the list if it already exists. // So we can skip the validation and ignore the conflict error await exceptionsClient.createExceptionList({ - name: ENDPOINT_EVENT_FILTERS_LIST_NAME, + name: ENDPOINT_ARTIFACT_LISTS.eventFilters.name, namespaceType: 'agnostic', - description: ENDPOINT_EVENT_FILTERS_LIST_DESCRIPTION, - listId: ENDPOINT_EVENT_FILTERS_LIST_ID, + description: ENDPOINT_ARTIFACT_LISTS.eventFilters.description, + listId: ENDPOINT_ARTIFACT_LISTS.eventFilters.id, type: ExceptionListTypeEnum.ENDPOINT_EVENTS, immutable: false, meta: undefined, @@ -61,14 +57,14 @@ export const createEventFilters = async ( /** * Create an Event Filter for non-interactive sessions and attach it to the policy */ -export const createNonInteractiveSessionEventFilter = async ( +const createNonInteractiveSessionEventFilter = async ( logger: Logger, exceptionsClient: ExceptionListClient, packagePolicy: PackagePolicy ): Promise => { try { await exceptionsClient.createExceptionListItem({ - listId: ENDPOINT_EVENT_FILTERS_LIST_ID, + listId: ENDPOINT_ARTIFACT_LISTS.eventFilters.id, description: i18n.translate( 'xpack.securitySolution.fleetIntegration.elasticDefend.eventFilter.nonInteractiveSessions.description', { @@ -95,7 +91,7 @@ export const createNonInteractiveSessionEventFilter = async ( }, ], itemId: uuidv4(), - meta: [], + meta: undefined, comments: [], expireTime: undefined, });