Skip to content
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

[Security Solution] Enable Serverless for exceptions/entry and exceptions/rule_details_flow Cypress tests #169211

Merged
merged 8 commits into from
Oct 24, 2023
Merged

[Security Solution] Enable Serverless for exceptions/entry and exceptions/rule_details_flow Cypress tests #169211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c4a51fb
Run flaky test runner for exception entry and rule_details_flow
jpdjere Oct 18, 2023
8bb7c35
Update serverless tags
jpdjere Oct 19, 2023
27d5ac5
Merge branch 'main' into flaky-test-runner-exceptions-entry-and_rule_…
jpdjere Oct 19, 2023
ea689ca
Revert package json
jpdjere Oct 23, 2023
fe33b95
Merge branch 'main' into flaky-test-runner-exceptions-entry-and_rule_…
jpdjere Oct 23, 2023
b814183
Merge branch 'main' into flaky-test-runner-exceptions-entry-and_rule_…
jpdjere Oct 23, 2023
dc5a16f
Changes:
jpdjere Oct 23, 2023
cb6a89c
Merge branch 'main' into flaky-test-runner-exceptions-entry-and_rule_…
jpdjere Oct 24, 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
6 changes: 1 addition & 5 deletions x-pack/test/security_solution_cypress/cypress/e2e/exceptions/entry/multiple_conditions.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@ import {

import { deleteAlertsAndRules } from '../../../tasks/common';

// TODO: https://github.com/elastic/kibana/issues/161539
// FLAKY: https://github.com/elastic/kibana/issues/165651
// FLAKY: https://github.com/elastic/kibana/issues/165734
// FLAKY: https://github.com/elastic/kibana/issues/165652
describe(
'Add multiple conditions and validate the generated exceptions',
{ tags: ['@ess', '@serverless', '@skipInServerless'] },
{ tags: ['@ess', '@serverless'] },
() => {
beforeEach(() => {
cy.task('esArchiverResetKibana');
Expand Down
132 changes: 63 additions & 69 deletions x-pack/test/security_solution_cypress/cypress/e2e/exceptions/entry/use_value_list.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,72 +47,66 @@ const goToRulesAndOpenValueListModal = () => {
openValueListsModal();
};

// TODO: https://github.com/elastic/kibana/issues/161539
// Flaky on serverless
describe(
'Use Value list in exception entry',
{ tags: ['@ess', '@serverless', '@skipInServerless'] },
() => {
beforeEach(() => {
cleanKibana();
login();
createListsIndex();
cy.task('esArchiverLoad', { archiveName: 'exceptions' });
importValueList(KNOWN_VALUE_LIST_FILES.TEXT, 'keyword');

createRule(
getNewRule({
query: 'user.name:*',
index: ['exceptions*'],
exceptions_list: [],
rule_id: '2',
enabled: false,
})
).then((rule) => visitRuleDetailsPage(rule.body.id, { tab: 'rule_exceptions' }));
});

afterEach(() => {
cy.task('esArchiverUnload', 'exceptions');
});

it('Should use value list in exception entry, and validate deleting value list prompt', () => {
const ITEM_NAME = 'Exception item with value list';
const ITEM_FIELD = 'agent.name';

// open add exception modal
openExceptionFlyoutFromEmptyViewerPrompt();

// add exception item name
addExceptionFlyoutItemName(ITEM_NAME);

addExceptionEntryFieldValue(ITEM_FIELD, 0);
addExceptionEntryOperatorValue('is in list', 0);

addExceptionEntryFieldMatchIncludedValue(KNOWN_VALUE_LIST_FILES.TEXT, 0);

// The Close all alerts that match attributes in this exception option is disabled
cy.get(CLOSE_ALERTS_CHECKBOX).should('exist');
cy.get(CLOSE_ALERTS_CHECKBOX).should('have.attr', 'disabled');

// Create exception
submitNewExceptionItem();

// displays existing exception items
cy.get(EXCEPTION_ITEM_VIEWER_CONTAINER).should('have.length', 1);
cy.get(NO_EXCEPTIONS_EXIST_PROMPT).should('not.exist');
cy.get(EXCEPTION_CARD_ITEM_NAME).should('have.text', ITEM_NAME);
cy.get(EXCEPTION_CARD_ITEM_CONDITIONS).should(
'have.text',
` ${ITEM_FIELD}included in value_list.txt`
);

// Go back to value list to delete the existing one
goToRulesAndOpenValueListModal();

deleteValueListsFile(KNOWN_VALUE_LIST_FILES.TEXT);

// Toast should be shown because of exception reference
cy.get(EXCEPTIONS_TABLE_MODAL).should('exist');
});
}
);
describe('Use Value list in exception entry', { tags: ['@ess', '@serverless'] }, () => {
beforeEach(() => {
cleanKibana();
login();
createListsIndex();
cy.task('esArchiverLoad', { archiveName: 'exceptions' });
importValueList(KNOWN_VALUE_LIST_FILES.TEXT, 'keyword');

createRule(
getNewRule({
query: 'user.name:*',
index: ['exceptions*'],
exceptions_list: [],
rule_id: '2',
enabled: false,
})
).then((rule) => visitRuleDetailsPage(rule.body.id, { tab: 'rule_exceptions' }));
});

afterEach(() => {
cy.task('esArchiverUnload', 'exceptions');
});

it('Should use value list in exception entry, and validate deleting value list prompt', () => {
const ITEM_NAME = 'Exception item with value list';
const ITEM_FIELD = 'agent.name';

// open add exception modal
openExceptionFlyoutFromEmptyViewerPrompt();

// add exception item name
addExceptionFlyoutItemName(ITEM_NAME);

addExceptionEntryFieldValue(ITEM_FIELD, 0);
addExceptionEntryOperatorValue('is in list', 0);

addExceptionEntryFieldMatchIncludedValue(KNOWN_VALUE_LIST_FILES.TEXT, 0);

// The Close all alerts that match attributes in this exception option is disabled
cy.get(CLOSE_ALERTS_CHECKBOX).should('exist');
cy.get(CLOSE_ALERTS_CHECKBOX).should('have.attr', 'disabled');

// Create exception
submitNewExceptionItem();

// displays existing exception items
cy.get(EXCEPTION_ITEM_VIEWER_CONTAINER).should('have.length', 1);
cy.get(NO_EXCEPTIONS_EXIST_PROMPT).should('not.exist');
cy.get(EXCEPTION_CARD_ITEM_NAME).should('have.text', ITEM_NAME);
cy.get(EXCEPTION_CARD_ITEM_CONDITIONS).should(
'have.text',
` ${ITEM_FIELD}included in value_list.txt`
);

// Go back to value list to delete the existing one
goToRulesAndOpenValueListModal();

deleteValueListsFile(KNOWN_VALUE_LIST_FILES.TEXT);

// Toast should be shown because of exception reference
cy.get(EXCEPTIONS_TABLE_MODAL).should('exist');
});
});
1 change: 0 additions & 1 deletion ...lution_cypress/cypress/e2e/exceptions/rule_details_flow/add_edit_endpoint_exception.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import {
} from '../../../tasks/api_calls/exceptions';

// TODO: https://github.com/elastic/kibana/issues/161539
// FLAKY: https://github.com/elastic/kibana/issues/165736
describe(
'Add endpoint exception from rule details',
{ tags: ['@ess', '@serverless', '@brokenInServerless'] },
Expand Down
3 changes: 1 addition & 2 deletions ...t/security_solution_cypress/cypress/e2e/exceptions/rule_details_flow/read_only_view.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import {
deleteExceptionList,
} from '../../../tasks/api_calls/exceptions';

// TODO: https://github.com/elastic/kibana/issues/161539 Do we need this to run in Serverless?
describe('Exceptions viewer read only', { tags: ['@ess', '@skipInServerless'] }, () => {
describe('Exceptions viewer read only', { tags: ['@ess'] }, () => {
const exceptionList = getExceptionList();

beforeEach(() => {
Expand Down