From 2012bd594e3d0a4aa7cc84937a4cafad06d0233c Mon Sep 17 00:00:00 2001 From: Georgii Gorbachev Date: Wed, 23 Oct 2024 14:20:04 +0200 Subject: [PATCH 1/2] Disable deprecated rules bulk CRUD API endpoints in Serverless and 9.0 --- .../rule_management/api/register_routes.ts | 10 ---------- .../api/rules/bulk_create_rules/route.ts | 2 ++ .../api/rules/bulk_delete_rules/route.ts | 2 ++ .../api/rules/bulk_patch_rules/route.ts | 2 ++ .../api/rules/bulk_update_rules/route.ts | 2 ++ 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/register_routes.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/register_routes.ts index e6999cc9e429e..0cb3cac35b292 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/register_routes.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/register_routes.ts @@ -11,10 +11,6 @@ import type { SetupPlugins } from '../../../../plugin_contract'; import type { SecuritySolutionPluginRouter } from '../../../../types'; import { performBulkActionRoute } from './rules/bulk_actions/route'; -import { bulkCreateRulesRoute } from './rules/bulk_create_rules/route'; -import { bulkDeleteRulesRoute } from './rules/bulk_delete_rules/route'; -import { bulkPatchRulesRoute } from './rules/bulk_patch_rules/route'; -import { bulkUpdateRulesRoute } from './rules/bulk_update_rules/route'; import { createRuleRoute } from './rules/create_rule/route'; import { deleteRuleRoute } from './rules/delete_rule/route'; import { exportRulesRoute } from './rules/export_rules/route'; @@ -40,12 +36,6 @@ export const registerRuleManagementRoutes = ( patchRuleRoute(router); deleteRuleRoute(router); - // Rules bulk CRUD - bulkCreateRulesRoute(router, logger); - bulkUpdateRulesRoute(router, logger); - bulkPatchRulesRoute(router, logger); - bulkDeleteRulesRoute(router, logger); - // Rules bulk actions performBulkActionRoute(router, config, ml, logger); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_create_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_create_rules/route.ts index 98910ea337630..9a3751bfb1d04 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_create_rules/route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_create_rules/route.ts @@ -31,6 +31,8 @@ import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../. /** * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead + * + * TODO: https://github.com/elastic/kibana/issues/193184 Delete this route and clean up the code */ export const bulkCreateRulesRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => { router.versioned diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts index f582e19d2bcad..f24f563e1a99d 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts @@ -45,6 +45,8 @@ type Handler = RequestHandler< /** * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead + * + * TODO: https://github.com/elastic/kibana/issues/193184 Delete this route and clean up the code */ export const bulkDeleteRulesRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => { const handler: Handler = async ( diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts index da75e4e33362a..fc5edf0e65ac3 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts @@ -25,6 +25,8 @@ import { RULE_MANAGEMENT_BULK_ACTION_SOCKET_TIMEOUT_MS } from '../../timeouts'; /** * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead + * + * TODO: https://github.com/elastic/kibana/issues/193184 Delete this route and clean up the code */ export const bulkPatchRulesRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => { router.versioned diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts index fb95e7e452afd..cccd1656d5091 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts @@ -29,6 +29,8 @@ import { RULE_MANAGEMENT_BULK_ACTION_SOCKET_TIMEOUT_MS } from '../../timeouts'; /** * @deprecated since version 8.2.0. Use the detection_engine/rules/_bulk_action API instead + * + * TODO: https://github.com/elastic/kibana/issues/193184 Delete this route and clean up the code */ export const bulkUpdateRulesRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => { router.versioned From 21f1e87cfb64ba16a08b8cba6c8da79d08b112cb Mon Sep 17 00:00:00 2001 From: Georgii Gorbachev Date: Wed, 23 Oct 2024 16:12:50 +0200 Subject: [PATCH 2/2] Skip the corresponding tests --- .../rules_export.ts | 64 +++++++++---------- .../create_rules_bulk.ts | 3 +- .../basic_license_essentials_tier/index.ts | 1 - .../create_rules_bulk.ts | 4 +- .../delete_rules_bulk.ts | 3 +- .../delete_rules_bulk.ts | 4 +- .../delete_rules_bulk_legacy.ts | 3 +- .../basic_license_essentials_tier/index.ts | 1 - .../patch_rules_bulk.ts | 3 +- .../trial_license_complete_tier/index.ts | 1 - .../patch_rules_bulk.ts | 4 +- .../basic_license_essentials_tier/index.ts | 1 - .../update_rules_bulk.ts | 3 +- .../trial_license_complete_tier/index.ts | 1 - .../update_rules_bulk.ts | 4 +- 15 files changed, 50 insertions(+), 50 deletions(-) diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/trial_license_complete_tier/rules_export.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/trial_license_complete_tier/rules_export.ts index e49a23f6138a3..729bd7849cd06 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/trial_license_complete_tier/rules_export.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/prebuilt_rule_customization/trial_license_complete_tier/rules_export.ts @@ -46,14 +46,14 @@ export default ({ getService }: FtrProviderContext): void => { }); it('exports a set of custom installed rules via the _export API', async () => { - await securitySolutionApi - .bulkCreateRules({ - body: [ - getCustomQueryRuleParams({ rule_id: 'rule-id-1' }), - getCustomQueryRuleParams({ rule_id: 'rule-id-2' }), - ], - }) - .expect(200); + await Promise.all([ + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-1' }) }) + .expect(200), + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-2' }) }) + .expect(200), + ]); const { body: exportResult } = await securitySolutionApi .exportRules({ query: {}, body: null }) @@ -182,14 +182,14 @@ export default ({ getService }: FtrProviderContext): void => { }); it('exports a set of custom and prebuilt installed rules via the _export API', async () => { - await securitySolutionApi - .bulkCreateRules({ - body: [ - getCustomQueryRuleParams({ rule_id: 'rule-id-1' }), - getCustomQueryRuleParams({ rule_id: 'rule-id-2' }), - ], - }) - .expect(200); + await Promise.all([ + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-1' }) }) + .expect(200), + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-2' }) }) + .expect(200), + ]); const { body: exportResult } = await securitySolutionApi .exportRules({ query: {}, body: null }) @@ -232,14 +232,14 @@ export default ({ getService }: FtrProviderContext): void => { }); it('exports both custom and prebuilt rules when rule_ids are specified via the _export API', async () => { - await securitySolutionApi - .bulkCreateRules({ - body: [ - getCustomQueryRuleParams({ rule_id: 'rule-id-1' }), - getCustomQueryRuleParams({ rule_id: 'rule-id-2' }), - ], - }) - .expect(200); + await Promise.all([ + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-1' }) }) + .expect(200), + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-2' }) }) + .expect(200), + ]); const { body: exportResult } = await securitySolutionApi .exportRules({ @@ -277,14 +277,14 @@ export default ({ getService }: FtrProviderContext): void => { }); it('exports a set of custom and prebuilt installed rules via the bulk_actions API', async () => { - await securitySolutionApi - .bulkCreateRules({ - body: [ - getCustomQueryRuleParams({ rule_id: 'rule-id-1' }), - getCustomQueryRuleParams({ rule_id: 'rule-id-2' }), - ], - }) - .expect(200); + await Promise.all([ + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-1' }) }) + .expect(200), + securitySolutionApi + .createRule({ body: getCustomQueryRuleParams({ rule_id: 'rule-id-2' }) }) + .expect(200), + ]); const { body: exportResult } = await securitySolutionApi .performRulesBulkAction({ diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/create_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/create_rules_bulk.ts index e212a57c39d83..079edc9e4cc96 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/create_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/create_rules_bulk.ts @@ -38,7 +38,8 @@ export default ({ getService }: FtrProviderContext): void => { const auditbeatPath = dataPathBuilder.getPath('auditbeat/hosts'); const utils = getService('securitySolutionUtils'); - describe('@ess @serverless @skipInServerlessMKI create_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Delete this file and clean up the code + describe.skip('@ess @serverless @skipInServerlessMKI create_rules_bulk', () => { describe('creating rules in bulk', () => { before(async () => { await esArchiver.load(auditbeatPath); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/index.ts index 9a2d3b8256c2f..aa21da6d74cc7 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/index.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/index.ts @@ -9,7 +9,6 @@ import { FtrProviderContext } from '../../../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Rules Management - Rule Creation APIs', function () { loadTestFile(require.resolve('./create_rules')); - loadTestFile(require.resolve('./create_rules_bulk')); loadTestFile(require.resolve('./create_ml_rules_privileges')); }); } diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/create_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/create_rules_bulk.ts index 282ffcf327dee..eae33b878e284 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/create_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/create_rules_bulk.ts @@ -44,8 +44,8 @@ export default ({ getService }: FtrProviderContext): void => { const log = getService('log'); const es = getService('es'); - // See https://github.com/elastic/kibana/issues/130963 for discussion on deprecation - describe('@ess @skipInServerless create_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Delete this file and clean up the code + describe.skip('@ess @skipInServerless create_rules_bulk', () => { describe('deprecations', () => { afterEach(async () => { await deleteAllRules(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/delete_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/delete_rules_bulk.ts index dd73fa4d848b3..b0b21411781a4 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/delete_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/basic_license_essentials_tier/delete_rules_bulk.ts @@ -32,7 +32,8 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const utils = getService('securitySolutionUtils'); - describe('@ess @serverless @skipInServerlessMKI delete_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Unskip and rewrite using the _bulk_action API endpoint + describe.skip('@ess @serverless @skipInServerlessMKI delete_rules_bulk', () => { describe('deleting rules bulk using DELETE', () => { beforeEach(async () => { await createAlertsIndex(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk.ts index 361dfbef8c642..8c451d1155de5 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk.ts @@ -37,8 +37,8 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const utils = getService('securitySolutionUtils'); - // See https://github.com/elastic/kibana/issues/130963 for discussion on deprecation - describe('@ess @skipInServerlesMKI delete_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Unskip and rewrite using the _bulk_action API endpoint + describe.skip('@ess @skipInServerlesMKI delete_rules_bulk', () => { describe('deprecations', () => { it('should return a warning header', async () => { await createRule(supertest, log, getSimpleRule()); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk_legacy.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk_legacy.ts index e6eff700d93de..b902723f5384e 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk_legacy.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_delete/trial_license_complete_tier/delete_rules_bulk_legacy.ts @@ -28,7 +28,8 @@ export default ({ getService }: FtrProviderContext): void => { const log = getService('log'); const es = getService('es'); - describe('@ess delete_rules_bulk_legacy', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Unskip and rewrite using the _bulk_action API endpoint + describe.skip('@ess delete_rules_bulk_legacy', () => { describe('deleting rules bulk using POST', () => { beforeEach(async () => { await createAlertsIndex(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/index.ts index ccaa2d297a8de..c913c170a4597 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/index.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/index.ts @@ -9,7 +9,6 @@ import { FtrProviderContext } from '../../../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Rules Management - Rule Patch APIs', function () { - loadTestFile(require.resolve('./patch_rules_bulk')); loadTestFile(require.resolve('./patch_rules')); }); } diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/patch_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/patch_rules_bulk.ts index f02ab60eaabf7..30f5bd655e215 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/patch_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/basic_license_essentials_tier/patch_rules_bulk.ts @@ -34,7 +34,8 @@ export default ({ getService }: FtrProviderContext) => { const es = getService('es'); const utils = getService('securitySolutionUtils'); - describe('@ess @serverless @skipInServerlessMKI patch_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Delete this file and clean up the code + describe.skip('@ess @serverless @skipInServerlessMKI patch_rules_bulk', () => { describe('patch rules bulk', () => { beforeEach(async () => { await createAlertsIndex(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/index.ts index e80b9bd9e33e5..0d5f6e9f02a93 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/index.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/index.ts @@ -9,7 +9,6 @@ import { FtrProviderContext } from '../../../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Rules Management - Rule Patch APIs', function () { - loadTestFile(require.resolve('./patch_rules_bulk')); loadTestFile(require.resolve('./patch_rules')); loadTestFile(require.resolve('./patch_rules_ess')); }); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts index 947b191469e3d..259fe2da6c550 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts @@ -41,8 +41,8 @@ export default ({ getService }: FtrProviderContext) => { const es = getService('es'); const utils = getService('securitySolutionUtils'); - // See https://github.com/elastic/kibana/issues/130963 for discussion on deprecation - describe('@ess @skipInServerless patch_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Delete this file and clean up the code + describe.skip('@ess @skipInServerless patch_rules_bulk', () => { describe('deprecations', () => { afterEach(async () => { await deleteAllRules(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/index.ts index fe58f672777ba..13b6b0e93808f 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/index.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/index.ts @@ -9,7 +9,6 @@ import { FtrProviderContext } from '../../../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Rules Management - Rule Update APIs', function () { - loadTestFile(require.resolve('./update_rules_bulk')); loadTestFile(require.resolve('./update_rules')); }); } diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/update_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/update_rules_bulk.ts index 409b07f301c0d..4dbe0567c0da5 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/update_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/update_rules_bulk.ts @@ -35,7 +35,8 @@ export default ({ getService }: FtrProviderContext) => { const es = getService('es'); const utils = getService('securitySolutionUtils'); - describe('@ess @serverless @skipInServerlessMKI update_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Delete this file and clean up the code + describe.skip('@ess @serverless @skipInServerlessMKI update_rules_bulk', () => { describe('update rules bulk', () => { beforeEach(async () => { await createAlertsIndex(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/index.ts index e38cb8fa4f181..bb560cbf2336b 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/index.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/index.ts @@ -9,7 +9,6 @@ import { FtrProviderContext } from '../../../../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { describe('Rules Management - Rule Update APIs', function () { - loadTestFile(require.resolve('./update_rules_bulk')); loadTestFile(require.resolve('./update_rules')); loadTestFile(require.resolve('./update_rules_ess')); }); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/update_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/update_rules_bulk.ts index 68886130e6cc3..4f323f412ae34 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/update_rules_bulk.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/update_rules_bulk.ts @@ -52,8 +52,8 @@ export default ({ getService }: FtrProviderContext) => { const utils = getService('securitySolutionUtils'); let username: string; - // See https://github.com/elastic/kibana/issues/130963 for discussion on deprecation - describe('@ess update_rules_bulk', () => { + // TODO: https://github.com/elastic/kibana/issues/193184 Delete this file and clean up the code + describe.skip('@ess update_rules_bulk', () => { before(async () => { username = await utils.getUsername(); });