Skip to content

[Security Solution] Add extra rules export tests #150553

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

Closed
maximpn wants to merge 29 commits into from
Closed

[Security Solution] Add extra rules export tests #150553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e4c1813
delete execution_summary from export all rules function
maximpn Feb 8, 2023
a391891
cover rules export by functional tests
maximpn Feb 8, 2023
d0e06fc
add an extra importing just exported rules e2e test
maximpn Feb 8, 2023
79b8a12
add waitForDelay helper function
maximpn Feb 8, 2023
db47ca8
use waitForEventLogExecuteComplete instead of waitForDelay
maximpn Feb 8, 2023
08eecb4
use proper function invocation
maximpn Feb 8, 2023
e5dbc89
fix expected exported rule object
maximpn Feb 8, 2023
f72851d
fix rule creation
maximpn Feb 22, 2023
7147d97
reuse expectManagementTableRules helper function
maximpn Feb 22, 2023
39a6928
improve rule creation readability
maximpn Feb 24, 2023
a0362f5
improve test's naming
maximpn Feb 24, 2023
ef64884
make sure rule has been executed before exporting
maximpn Feb 25, 2023
b030d00
remove unnecessary wait command
maximpn Feb 25, 2023
8aef259
add a comment to transformRuleToExportableFormat
maximpn Feb 25, 2023
4c6face
move constants to files their belong to
maximpn Feb 25, 2023
37a4db2
fix typing errors
maximpn Feb 25, 2023
4cf10bb
move rule export tests related logic to the test itself
maximpn Feb 25, 2023
6d15ad3
add an explanation comment
maximpn Feb 25, 2023
6bbe4fe
add getNewSavedQueryRule helper
maximpn Feb 27, 2023
62ad791
fix rule id usage
maximpn Feb 27, 2023
7d018ff
move id from createCustomRuleEnabled to getNewRule
maximpn Feb 27, 2023
b8b7413
fix enabled rule creation
maximpn Feb 27, 2023
abd1285
simplify getNewSavedQueryRule
maximpn Feb 27, 2023
4e0ce7e
allow to wait for rule status by ruleId
maximpn Mar 7, 2023
253a062
remove unused constant
maximpn Mar 7, 2023
7cc3315
fix typing errors
maximpn Mar 7, 2023
d13db9f
match test names with contents
maximpn Mar 7, 2023
62bc98d
simplify waitForRuleStatus logic
maximpn Mar 7, 2023
b4e974e
fix rule's identifier discriminated union
maximpn Mar 7, 2023
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
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/cypress/e2e/dashboards/enable_risk_score.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('Enable risk scores', () => {
before(() => {
cleanKibana();
login();
createCustomRuleEnabled(getNewRule(), 'rule1');
createCustomRuleEnabled(getNewRule({ id: 'rule1' }));
});

beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/cypress/e2e/dashboards/upgrade_risk_score.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('Upgrade risk scores', () => {
before(() => {
cleanKibana();
login();
createCustomRuleEnabled(getNewRule(), 'rule1');
createCustomRuleEnabled(getNewRule({ id: 'rule1' }));
});

beforeEach(() => {
Expand Down Expand Up @@ -88,7 +88,7 @@ versions.forEach((version) =>
before(() => {
cleanKibana();
login();
createCustomRuleEnabled(getNewRule(), 'rule1');
createCustomRuleEnabled(getNewRule({ id: 'rule1' }));
});

beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_charts.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import { TIMELINE_DATA_PROVIDERS_CONTAINER } from '../../screens/timeline';
import { closeTimelineUsingCloseButton } from '../../tasks/security_main';

describe('Histogram legend hover actions', { testIsolation: false }, () => {
const ruleConfigs = getNewRule();
const ruleConfigs = getNewRule({ id: 'new custom rule' });
before(() => {
cleanKibana();
login();
createCustomRuleEnabled(ruleConfigs, 'new custom rule');
createCustomRuleEnabled(ruleConfigs);
visit(ALERTS_URL);
selectAlertsHistogram();
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/cypress/e2e/detection_alerts/changing_alert_status.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ describe('Changing alert status', () => {
context('Closing alerts', () => {
beforeEach(() => {
deleteAlertsAndRules();
createCustomRuleEnabled(getNewRule(), '1', 100);
createCustomRuleEnabled(getNewRule({ id: '1' }), 100);
visit(ALERTS_URL);
waitForAlertsToPopulate();
selectCountTable();
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe.skip('Detections : Page Filters', () => {
before(() => {
cleanKibana();
login();
createCustomRuleEnabled(getNewRule(), 'custom_rule_filters');
createCustomRuleEnabled(getNewRule({ id: 'custom_rule_filters' }));
});

beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/cypress/e2e/detection_alerts/enrichments.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('Enrichment', () => {
beforeEach(() => {
esArchiverLoad('risk_hosts');
deleteAlertsAndRules();
createCustomRuleEnabled(getNewRule(), 'rule1');
createCustomRuleEnabled(getNewRule({ id: 'rule1' }));
visit(ALERTS_URL);
waitForAlertsToPopulate();
});
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/security_solution/cypress/e2e/detection_alerts/navigation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ describe('Alert Details Page Navigation', () => {
describe('navigating to alert details page', () => {
let rule: CustomRule;
before(() => {
rule = getNewRule();
rule = getNewRule({ id: 'rule1' });
cleanKibana();
login();
createCustomRuleEnabled(rule, 'rule1');
createCustomRuleEnabled(rule);
});

describe('context menu', () => {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/security_solution/cypress/e2e/detection_rules/all_rules_read_only.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const MISSING_PRIVILEGES_CALLOUT = 'missing-user-privileges';
describe('All rules - read only', () => {
before(() => {
cleanKibana();
createCustomRule(getNewRule(), '1');
createCustomRule(getNewRule({ id: '1' }));
login(ROLES.reader);
});

Expand Down
19 changes: 6 additions & 13 deletions x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,12 @@ describe('Detection rules, bulk edit', () => {
resetRulesTableState();
deleteAlertsAndRules();
esArchiverResetKibana();
createCustomRule(
{
...getNewRule(),
name: RULE_NAME,
...defaultRuleData,
},
'1'
);
createEventCorrelationRule({ ...getEqlRule(), ...defaultRuleData }, '2');
createMachineLearningRule({ ...getMachineLearningRule(), ...defaultRuleData });
createCustomIndicatorRule({ ...getNewThreatIndicatorRule(), ...defaultRuleData }, '4');
createThresholdRule({ ...getNewThresholdRule(), ...defaultRuleData }, '5');
createNewTermsRule({ ...getNewTermsRule(), ...defaultRuleData }, '6');
createCustomRule(getNewRule({ id: '1', name: RULE_NAME, ...defaultRuleData }));
createEventCorrelationRule(getEqlRule({ id: '2', ...defaultRuleData }));
createMachineLearningRule(getMachineLearningRule(defaultRuleData));
createCustomIndicatorRule(getNewThreatIndicatorRule({ id: '4', ...defaultRuleData }));
createThresholdRule(getNewThresholdRule({ id: '5', ...defaultRuleData }));
createNewTermsRule(getNewTermsRule({ id: '6', ...defaultRuleData }));

visitWithoutDateRange(SECURITY_DETECTIONS_RULES_URL);

Expand Down
22 changes: 7 additions & 15 deletions x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules_actions.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,15 @@ describe('Detection rules, bulk edit of rule actions', () => {
},
];

createCustomRuleEnabled(
{
...getNewRule(),
name: ruleNameToAssert,
},
'1',
500,
actions
);
createCustomRuleEnabled(getNewRule({ id: '1', name: ruleNameToAssert }), 500, actions);
});

createEventCorrelationRule(getEqlRule(), '2');
createMachineLearningRule(getMachineLearningRule(), '3');
createCustomIndicatorRule(getNewThreatIndicatorRule(), '4');
createThresholdRule(getNewThresholdRule(), '5');
createNewTermsRule(getNewTermsRule(), '6');
createSavedQueryRule({ ...getNewRule(), savedId: 'mocked' }, '7');
createEventCorrelationRule(getEqlRule({ id: '2' }));
createMachineLearningRule(getMachineLearningRule({ id: '3' }));
createCustomIndicatorRule(getNewThreatIndicatorRule({ id: '4' }));
createThresholdRule(getNewThresholdRule({ id: '5' }));
createNewTermsRule(getNewTermsRule({ id: '6' }));
createSavedQueryRule({ ...getNewRule({ id: '7' }), savedId: 'mocked' });

createSlackConnector();
});
Expand Down
22 changes: 11 additions & 11 deletions x-pack/plugins/security_solution/cypress/e2e/detection_rules/bulk_edit_rules_data_view.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import {
getNewRule,
getNewThresholdRule,
getNewTermsRule,
getNewSavedQueryRule,
} from '../../objects/rule';

import { esArchiverResetKibana } from '../../tasks/es_archiver';
Expand Down Expand Up @@ -75,12 +76,12 @@ describe('Bulk editing index patterns of rules with a data view only', () => {

postDataView(DATA_VIEW_ID);

createCustomRule({ ...getNewRule(), ...dataViewRuleData }, '1');
createEventCorrelationRule({ ...getEqlRule(), ...dataViewRuleData }, '2');
createCustomIndicatorRule({ ...getNewThreatIndicatorRule(), ...dataViewRuleData }, '3');
createThresholdRule({ ...getNewThresholdRule(), ...dataViewRuleData }, '4');
createNewTermsRule({ ...getNewTermsRule(), ...dataViewRuleData }, '5');
createSavedQueryRule({ ...getNewRule(), ...dataViewRuleData, savedId: 'mocked' }, '6');
createCustomRule(getNewRule({ id: '1', ...dataViewRuleData }));
createEventCorrelationRule(getEqlRule({ id: '2', ...dataViewRuleData }));
createCustomIndicatorRule(getNewThreatIndicatorRule({ id: '3', ...dataViewRuleData }));
createThresholdRule(getNewThresholdRule({ id: '4', ...dataViewRuleData }));
createNewTermsRule(getNewTermsRule({ id: '5', ...dataViewRuleData }));
createSavedQueryRule(getNewSavedQueryRule({ savedId: 'mocked', id: '6', ...dataViewRuleData }));

visitWithoutDateRange(SECURITY_DETECTIONS_RULES_URL);

Expand Down Expand Up @@ -197,16 +198,15 @@ describe('Bulk editing index patterns of rules with index patterns and rules wit

postDataView(DATA_VIEW_ID);

createCustomRule({ ...getNewRule(), ...dataViewRuleData }, '1');
createCustomRule(getNewRule({ id: '1', ...dataViewRuleData }));
createCustomRule(
{
...getNewRule(),
getNewRule({
id: '2',
dataSource: {
type: 'indexPatterns',
index: ['test-index-1-*'],
},
},
'2'
})
);

visitWithoutDateRange(SECURITY_DETECTIONS_RULES_URL);
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/security_solution/cypress/e2e/detection_rules/custom_query_rule.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ describe('Custom query rules', () => {
context('Deletion', () => {
beforeEach(() => {
deleteAlertsAndRules();
createCustomRuleEnabled(getNewRule(), 'rule1');
createCustomRuleEnabled(getNewOverrideRule(), 'rule2');
createCustomRuleEnabled(getExistingRule(), 'rule3');
createCustomRuleEnabled(getNewRule({ id: 'rule1' }));
createCustomRuleEnabled(getNewOverrideRule({ id: 'rule2' }));
createCustomRuleEnabled(getExistingRule({ id: 'rule3' }));
visit(DETECTIONS_RULE_MANAGEMENT_URL);
});

Expand Down Expand Up @@ -357,7 +357,7 @@ describe('Custom query rules', () => {
before(() => {
deleteAlertsAndRules();
deleteConnectors();
createCustomRuleEnabled(getExistingRule(), 'rule1');
createCustomRuleEnabled(getExistingRule({ id: 'rule1' }));
});
beforeEach(() => {
visit(DETECTIONS_RULE_MANAGEMENT_URL);
Expand Down
Loading