Skip to content

[9.1] [Security Solution] Enable accidentally skipped prebuilt rules package integration tests (#226759) #227506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kibanamachine merged 1 commit into from
Jul 10, 2025
Merged

[9.1] [Security Solution] Enable accidentally skipped prebuilt rules package integration tests (#226759) #227506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .buildkite/ftr_security_stateful_configs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_update/basic_license_essentials_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/ess_basic_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/ess_air_gapped.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/ess_air_gapped_large_package.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_air_gapped.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_air_gapped_large_package.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_disabled/configs/ess_basic_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/configs/edge_cases/ess_trial_license.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/common_fields/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/customization_enabled/upgrade_prebuilt_rules/diffable_rule_fields/type_specific_fields/configs/ess.config.ts
Expand Down
12 changes: 8 additions & 4 deletions ...s/common/configs/ess_air_gapped.config.ts → ...nfigs/edge_cases/ess_air_gapped.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import path from 'path';

const SECURITY_DETECTION_ENGINE_PACKAGES_PATH = path.join(
path.dirname(__filename),
'../fixtures/packages'
'../../fixtures/packages'
);

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../../../../../config/ess/config.base.basic')
);

return {
...functionalConfig.getAll(),
testFiles: [
require.resolve('../import_export/import_with_installing_package'),
require.resolve('../prebuilt_rules_package/air_gapped'),
require.resolve('../../import_export/import_with_installing_package'),
require.resolve('../../prebuilt_rules_package/air_gapped'),
],
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
Expand All @@ -36,5 +36,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`--xpack.fleet.developer.bundledPackageLocation=${SECURITY_DETECTION_ENGINE_PACKAGES_PATH}`,
],
},
junit: {
reportName:
'Rules Management - Prebuilt Rules (Common) Integration Tests - ESS Basic License (Air Gapped)',
},
};
}
10 changes: 7 additions & 3 deletions ...gs/ess_air_gapped_large_package.config.ts → ...es/ess_air_gapped_large_package.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ import path from 'path';

export const BUNDLED_PACKAGE_DIR = path.join(
path.dirname(__filename),
'../fixtures/packages/large'
'../../fixtures/packages/large'
);

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../config/ess/config.base.basic')
require.resolve('../../../../../../../config/ess/config.base.basic')
);

return {
...functionalConfig.getAll(),
testFiles: [
require.resolve('../prebuilt_rules_package/air_gapped/install_large_bundled_package'),
require.resolve('../../prebuilt_rules_package/air_gapped/install_large_bundled_package'),
],
kbnTestServer: {
...functionalConfig.get('kbnTestServer'),
Expand All @@ -37,5 +37,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`--xpack.fleet.developer.bundledPackageLocation=${BUNDLED_PACKAGE_DIR}`,
],
},
junit: {
reportName:
'Rules Management - Prebuilt Rules (Common) Integration Tests - ESS Basic License (Air Gapped, Large Package)',
},
};
}
25 changes: 25 additions & 0 deletions ...nse/rules_management/prebuilt_rules/common/configs/edge_cases/ess_trial_license.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import { FtrConfigProviderContext } from '@kbn/test';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../../../config/ess/config.base.trial')
);

const testConfig = {
...functionalConfig.getAll(),
testFiles: [require.resolve('../../prebuilt_rules_package/install_package_from_epr')],
junit: {
reportName:
'Rules Management - Prebuilt Rules (Common) Integration Tests - ESS Trial License',
},
};

return testConfig;
}
2 changes: 1 addition & 1 deletion ...tions_response/rules_management/prebuilt_rules/common/configs/ess_basic_license.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
testFiles: [require.resolve('..')],
junit: {
reportName:
'Rules Management - Prebuilt Rules (Customization Disabled) Integration Tests - ESS Env Basic License',
'Rules Management - Prebuilt Rules (Common) Integration Tests - ESS Basic License',
},
};

Expand Down
2 changes: 1 addition & 1 deletion ...ponse/rules_management/prebuilt_rules/common/configs/serverless_essentials_tier.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ export default createTestConfig({
testFiles: [require.resolve('..')],
junit: {
reportName:
'Rules Management - Prebuilt Rules (Customization Disabled) Integration Tests - Serverless Env Essentials Tier',
'Rules Management - Prebuilt Rules (Common) Integration Tests - Serverless Env Essentials Tier',
},
});
3 changes: 2 additions & 1 deletion ...tegration/test_suites/detections_response/rules_management/prebuilt_rules/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
this.tags('skipFIPS');
loadTestFile(require.resolve('./import_export'));
loadTestFile(require.resolve('./install_prebuilt_rules'));
loadTestFile(require.resolve('./status'));
loadTestFile(require.resolve('./prebuilt_rules_package'));
loadTestFile(require.resolve('./revert_prebuilt_rules'));
loadTestFile(require.resolve('./status'));
});
};
1 change: 0 additions & 1 deletion ...etections_response/rules_management/prebuilt_rules/common/prebuilt_rules_package/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { FtrProviderContext } from '../../../../../../ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext): void => {
describe('Prebuilt rules package', function () {
loadTestFile(require.resolve('./bootstrap_prebuilt_rules'));
loadTestFile(require.resolve('./install_package_from_epr'));
loadTestFile(require.resolve('./update_package'));
});
};