diff --git a/packages/kbn-securitysolution-io-ts-alerting-types/src/threat_mapping/index.test.ts b/packages/kbn-securitysolution-io-ts-alerting-types/src/threat_mapping/index.test.ts index fb5db89dbb2292..3ebc7331aef715 100644 --- a/packages/kbn-securitysolution-io-ts-alerting-types/src/threat_mapping/index.test.ts +++ b/packages/kbn-securitysolution-io-ts-alerting-types/src/threat_mapping/index.test.ts @@ -37,12 +37,11 @@ describe('threat_mapping', () => { }); test('it should fail validation with an extra entry item', () => { - const payload: ThreatMappingEntries & Array<{ extra: string }> = [ + const payload: Array = [ { field: 'field.one', type: 'mapping', value: 'field.one', - // @ts-expect-error upgrade typescript v4.9.5 extra: 'blah', }, ]; @@ -112,7 +111,7 @@ describe('threat_mapping', () => { }); test('it should fail validate with an extra key', () => { - const payload: ThreatMapping & Array<{ extra: string }> = [ + const payload: Array = [ { entries: [ { @@ -121,7 +120,6 @@ describe('threat_mapping', () => { value: 'field.one', }, ], - // @ts-expect-error upgrade typescript v4.9.5 extra: 'invalid', }, ]; @@ -135,14 +133,13 @@ describe('threat_mapping', () => { }); test('it should fail validate with an extra inner entry', () => { - const payload: ThreatMapping & Array<{ entries: Array<{ extra: string }> }> = [ + const payload: Array }> = [ { entries: [ { field: 'field.one', type: 'mapping', value: 'field.one', - // @ts-expect-error upgrade typescript v4.9.5 extra: 'blah', }, ], diff --git a/packages/kbn-securitysolution-utils/src/add_remove_id_to_item/index.ts b/packages/kbn-securitysolution-utils/src/add_remove_id_to_item/index.ts index d08b2f54e6e7e6..7dff8653128296 100644 --- a/packages/kbn-securitysolution-utils/src/add_remove_id_to_item/index.ts +++ b/packages/kbn-securitysolution-utils/src/add_remove_id_to_item/index.ts @@ -19,8 +19,7 @@ import { v4 as uuidv4 } from 'uuid'; */ type NotArray = T extends unknown[] ? never : T; export const addIdToItem = (item: NotArray): T => { - // @ts-expect-error upgrade typescript v4.9.5 - const maybeId: typeof item & { id?: string } = item; + const maybeId = item as typeof item & { id?: string }; if (maybeId.id != null) { return item; } else { @@ -42,8 +41,7 @@ export const removeIdFromItem = ( }, Exclude > => { - // @ts-expect-error upgrade typescript v4.9.5 - const maybeId: typeof item & { id?: string } = item; + const maybeId = item as typeof item & { id?: string }; if (maybeId.id != null) { const { id, ...noId } = maybeId; return noId; diff --git a/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts b/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts index 99552d332eca22..f4baa8779201f6 100644 --- a/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts +++ b/x-pack/plugins/lists/server/routes/utils/build_siem_response.ts @@ -5,7 +5,12 @@ * 2.0. */ -import { CustomHttpResponseOptions, KibanaResponseFactory } from '@kbn/core/server'; +import { + CustomHttpResponseOptions, + HttpResponsePayload, + KibanaResponseFactory, + ResponseError, +} from '@kbn/core/server'; /** * Copied from x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts @@ -48,22 +53,24 @@ const statusToErrorMessage = ( export class SiemResponseFactory { constructor(private response: KibanaResponseFactory) {} - // @ts-expect-error upgrade typescript v4.9.5 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type - error({ statusCode, body, headers, bypassErrorFormat }: CustomHttpResponseOptions) { + error({ + statusCode, + body, + headers, + bypassErrorFormat, + }: CustomHttpResponseOptions) { // KibanaResponse is not exported so we cannot use a return type here and that is why the linter is turned off above - // @ts-expect-error upgrade typescript v4.9.5 const contentType: CustomHttpResponseOptions['headers'] = { 'content-type': 'application/json', }; - // @ts-expect-error upgrade typescript v4.9.5 const defaultedHeaders: CustomHttpResponseOptions['headers'] = { ...contentType, ...(headers ?? {}), }; const formattedBody = bypassErrorFormat - ? body + ? Object.assign<{}, unknown>({}, body) // eslint-disable-line prefer-object-spread : { message: body ?? statusToErrorMessage(statusCode) }; return this.response.custom({ diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts index 64fa7995182c57..5b0e8590525002 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/utils.ts @@ -12,6 +12,8 @@ import type { RouteValidationFunction, KibanaResponseFactory, CustomHttpResponseOptions, + HttpResponsePayload, + ResponseError, } from '@kbn/core/server'; import { CustomHttpRequestError } from '../../../utils/custom_http_request_error'; @@ -160,13 +162,14 @@ const statusToErrorMessage = (statusCode: number) => { export class SiemResponseFactory { constructor(private response: KibanaResponseFactory) {} - // @ts-expect-error upgrade typescript v4.9.5 - error({ statusCode, body, headers }: CustomHttpResponseOptions) { - // @ts-expect-error upgrade typescript v4.9.5 + error({ + statusCode, + body, + headers, + }: CustomHttpResponseOptions) { const contentType: CustomHttpResponseOptions['headers'] = { 'content-type': 'application/json', }; - // @ts-expect-error upgrade typescript v4.9.5 const defaultedHeaders: CustomHttpResponseOptions['headers'] = { ...contentType, ...(headers ?? {}), diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/utils.ts index 42c062aba5d740..18634fb7162b75 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/utils.ts @@ -13,10 +13,11 @@ import { BulkActionEditTypeEnum } from '../../../../../../common/api/detection_e * @param editAction {@link BulkActionEditType} * @returns {boolean} */ -export const isIndexPatternsBulkEditAction = (editAction: BulkActionEditType) => - [ +export const isIndexPatternsBulkEditAction = (editAction: BulkActionEditType) => { + const indexPatternsActions: BulkActionEditType[] = [ BulkActionEditTypeEnum.add_index_patterns, BulkActionEditTypeEnum.delete_index_patterns, BulkActionEditTypeEnum.set_index_patterns, - // @ts-expect-error upgrade typescript v4.9.5 - ].includes(editAction); + ]; + return indexPatternsActions.includes(editAction); +}; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/validations.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/validations.ts index f387de9e3525ff..74fc6f91d37c48 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/validations.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/validations.ts @@ -10,7 +10,10 @@ import { invariant } from '../../../../../../common/utils/invariant'; import { isMlRule } from '../../../../../../common/machine_learning/helpers'; import { isEsqlRule } from '../../../../../../common/detection_engine/utils'; import { BulkActionsDryRunErrCode } from '../../../../../../common/constants'; -import type { BulkActionEditPayload } from '../../../../../../common/api/detection_engine/rule_management'; +import type { + BulkActionEditPayload, + BulkActionEditType, +} from '../../../../../../common/api/detection_engine/rule_management'; import { BulkActionEditTypeEnum } from '../../../../../../common/api/detection_engine/rule_management'; import type { RuleAlertType } from '../../../rule_schema'; import { isIndexPatternsBulkEditAction } from './utils'; @@ -99,12 +102,11 @@ export const validateBulkEditRule = async ({ * add_rule_actions, set_rule_actions can be applied to prebuilt/immutable rules */ const istEditApplicableToImmutableRule = (edit: BulkActionEditPayload[]): boolean => { - return edit.every(({ type }) => - [BulkActionEditTypeEnum.set_rule_actions, BulkActionEditTypeEnum.add_rule_actions].includes( - // @ts-expect-error upgrade typescript v4.9.5 - type - ) - ); + const applicableActions: BulkActionEditType[] = [ + BulkActionEditTypeEnum.set_rule_actions, + BulkActionEditTypeEnum.add_rule_actions, + ]; + return edit.every(({ type }) => applicableActions.includes(type)); }; /**