From 3b6c061014fb6ac4e29daa703e6f4021ea21d9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cjeramysoucy=E2=80=9D?= Date: Fri, 11 Jul 2025 17:02:19 +0200 Subject: [PATCH 1/2] Removes basic check condition because FIPS overrides to trial --- .../perform_installation/perform_installation.ts | 6 +----- .../ml_disabled/perform_upgrade/perform_upgrade.ts | 10 ++-------- .../review_installation/review_installation.ts | 8 ++------ .../ml_disabled/review_upgrade/review_upgrade.ts | 6 +----- .../prebuilt_rules/ml_disabled/status/status.ts | 6 +----- 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_installation/perform_installation.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_installation/perform_installation.ts index 1830db2465171..e4f73238b2425 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_installation/perform_installation.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_installation/perform_installation.ts @@ -19,13 +19,9 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const supertest = getService('supertest'); const log = getService('log'); - const config = getService('config'); - const basic = config.get('esTestCluster.license') === 'basic'; describe('@ess @serverless @skipInServerlessMKI Prebuilt rules installation perform', function () { - if (basic) { - this.tags('skipFIPS'); - } + this.tags('skipFIPS'); beforeEach(async () => { await deleteAllRules(supertest, log); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_upgrade/perform_upgrade.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_upgrade/perform_upgrade.ts index 77b350db6bf39..43b3e04ffc187 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_upgrade/perform_upgrade.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/perform_upgrade/perform_upgrade.ts @@ -22,8 +22,6 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const supertest = getService('supertest'); const log = getService('log'); - const config = getService('config'); - const basic = config.get('esTestCluster.license') === 'basic'; const deps = { es, supertest, @@ -39,9 +37,7 @@ export default ({ getService }: FtrProviderContext): void => { const ruleId = 'ml-rule'; describe('ALL_RULES mode', function () { - if (basic) { - this.tags('skipFIPS'); - } + this.tags('skipFIPS'); it('silently skips ML rules in ALL_RULES mode', async () => { await setUpRuleUpgrade({ @@ -76,9 +72,7 @@ export default ({ getService }: FtrProviderContext): void => { describe('SPECIFIC_RULES mode', function () { describe(`doesn't upgrade`, function () { - if (basic) { - this.tags('skipFIPS'); - } + this.tags('skipFIPS'); it(`if target is an ML rule`, async () => { await createMlRuleThroughAlertingEndpoint(supertest, { diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts index e3b003eae1c47..ccde635bfbf47 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts @@ -19,15 +19,11 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const supertest = getService('supertest'); const log = getService('log'); - const config = getService('config'); - const basic = config.get('esTestCluster.license') === 'basic'; describe('@ess @serverless @skipInServerlessMKI Prebuilt rules installation review', function () { - if (basic) { - this.tags('skipFIPS'); - } + this.tags('skipFIPS'); - beforeEach(async () => { + beforeEach(async () => { await deleteAllRules(supertest, log); await deleteAllPrebuiltRuleAssets(es, log); }); diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_upgrade/review_upgrade.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_upgrade/review_upgrade.ts index a6a881f7fad77..dd9c7fa1290fe 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_upgrade/review_upgrade.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_upgrade/review_upgrade.ts @@ -21,8 +21,6 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const supertest = getService('supertest'); const log = getService('log'); - const config = getService('config'); - const basic = config.get('esTestCluster.license') === 'basic'; const deps = { es, supertest, @@ -38,9 +36,7 @@ export default ({ getService }: FtrProviderContext): void => { const ruleId = 'ml-rule'; describe(`rule is excluded from response`, function () { - if (basic) { - this.tags('skipFIPS'); - } + this.tags('skipFIPS'); it('if target is an ML rule', async () => { await createMlRuleThroughAlertingEndpoint(supertest, { diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/status/status.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/status/status.ts index 895071b84a4b1..afe410c4dcfe0 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/status/status.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/status/status.ts @@ -20,13 +20,9 @@ export default ({ getService }: FtrProviderContext): void => { const es = getService('es'); const supertest = getService('supertest'); const log = getService('log'); - const config = getService('config'); - const basic = config.get('esTestCluster.license') === 'basic'; describe('@ess @serverless @skipInServerlessMKI Prebuilt rules status', function () { - if (basic) { - this.tags('skipFIPS'); - } + this.tags('skipFIPS'); beforeEach(async () => { await deleteAllRules(supertest, log); From b30e4fb03615a84a8a7faaa254a5ccb7929e87be Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Fri, 11 Jul 2025 15:29:55 +0000 Subject: [PATCH 2/2] [CI] Auto-commit changed files from 'node scripts/eslint_all_files --no-cache --fix' --- .../ml_disabled/review_installation/review_installation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts index ccde635bfbf47..dca2daf70208c 100644 --- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts +++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/ml_disabled/review_installation/review_installation.ts @@ -23,7 +23,7 @@ export default ({ getService }: FtrProviderContext): void => { describe('@ess @serverless @skipInServerlessMKI Prebuilt rules installation review', function () { this.tags('skipFIPS'); - beforeEach(async () => { + beforeEach(async () => { await deleteAllRules(supertest, log); await deleteAllPrebuiltRuleAssets(es, log); });