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] Allowing to use ftr archives in Cypress #178724

Merged
merged 14 commits into from
Mar 15, 2024
Merged

[Security Solution] Allowing to use ftr archives in Cypress #178724

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e20412e
allowing to load ftr archives
MadameSheema Mar 14, 2024
b5a2ec5
adjustments
MadameSheema Mar 14, 2024
b264f0e
updating readme
MadameSheema Mar 14, 2024
c1c6da7
Merge branch 'main' into esarchiver-improvement
MadameSheema Mar 14, 2024
dac21b4
forcing to use just archives that we own in order to prevent flakiness
MadameSheema Mar 14, 2024
8e6f758
adding new dependency
MadameSheema Mar 14, 2024
b36d2be
fixing path
MadameSheema Mar 14, 2024
3a80634
typo
MadameSheema Mar 14, 2024
464b552
Merge branch 'main' into esarchiver-improvement
MadameSheema Mar 14, 2024
fd4b27f
Update x-pack/test/security_solution_cypress/cypress/support/es_archi…
MadameSheema Mar 14, 2024
7a785ba
fixes
MadameSheema Mar 14, 2024
e6a353a
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Mar 14, 2024
5191a1e
fixes
MadameSheema Mar 14, 2024
eea83af
Merge branch 'main' into esarchiver-improvement
MadameSheema Mar 15, 2024
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: 2 additions & 0 deletions .buildkite/scripts/pipelines/pull_request/pipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
/^x-pack\/packages\/security-solution/,
/^x-pack\/packages\/kbn-elastic-assistant/,
/^x-pack\/packages\/kbn-elastic-assistant-common/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
Expand Down Expand Up @@ -271,6 +272,7 @@ const uploadPipeline = (pipelineContent: string | object) => {
/^x-pack\/packages\/security-solution/,
/^x-pack\/packages\/kbn-elastic-assistant/,
/^x-pack\/packages\/kbn-elastic-assistant-common/,
/^x-pack\/test\/functional\/es_archives\/security_solution/,
/^x-pack\/test\/security_solution_cypress/,
])) ||
GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
Expand Down
15 changes: 15 additions & 0 deletions x-pack/test/security_solution_cypress/cypress/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,21 @@ Note that the command will create the folder if it does not exist.

Task [cypress/support/es_archiver.ts](https://github.com/elastic/kibana/blob/main/x-pack/test/security_solution_cypress/cypress/support/es_archiver.ts) provides helpers such as `esArchiverLoad` and `esArchiverUnload` by means of `es_archiver`'s CLI.

Archives used only for Cypress tests purposes are stored in `x-pack/test/security_solution_cypress/es_archives` and are used as follow on the tests.

```typescript
cy.task('esArchiverLoad', { archiveName: 'overview' });
cy.task('esArchiverUnload', { archiveName: 'overview'});

```

You can also use archives stored in `kibana/x-pack/test/functional/es_archives`. In order to do sow uste it on the tests as follow.

```typescript
cy.task('esArchiverLoad', { archiveName: 'security_solution/alias' }, type: 'ftr');
cy.task('esArchiverUnload', { archiveName: 'security_solution/alias', type:'ftr'});
```

## Serverless

Note that we use tags in order to select which tests we want to execute, if you want a test to be executed on serverless you need to add @serverless tag to it.
Expand Down
2 changes: 1 addition & 1 deletion ...ss/e2e/detection_response/detection_engine/detection_alerts/assignments/assignments.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('Alert user assignment - ESS & Serverless', { tags: ['@ess', '@serverle
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion ...2e/detection_response/detection_engine/detection_alerts/assignments/assignments_ess.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Alert user assignment - ESS', { tags: ['@ess'] }, () => {
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion ...ection_response/detection_engine/detection_alerts/assignments/assignments_ess_basic.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('Alert user assignment - Basic License', { tags: ['@ess'] }, () => {
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

beforeEach(() => {
Expand Down
6 changes: 3 additions & 3 deletions ...ion_response/detection_engine/detection_alerts/enrichments/alert_threat_enrichments.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ describe(
});

after(() => {
cy.task('esArchiverUnload', 'threat_indicator');
cy.task('esArchiverUnload', 'suspicious_source_event');
cy.task('esArchiverUnload', { archiveName: 'threat_indicator' });
cy.task('esArchiverUnload', { archiveName: 'suspicious_source_event' });
});

beforeEach(() => {
Expand Down Expand Up @@ -165,7 +165,7 @@ describe(
});

after(() => {
cy.task('esArchiverUnload', 'threat_indicator2');
cy.task('esArchiverUnload', { archiveName: 'threat_indicator2' });
});

it('Displays matched fields from both indicator match rules and investigation time enrichments on Threat Intel tab', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...ypress/e2e/detection_response/detection_engine/detection_alerts/status/alert_status.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe.skip('Changing alert status', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

context('Opening alerts', { tags: ['@ess', '@serverless'] }, () => {
Expand Down
4 changes: 2 additions & 2 deletions ...ss/cypress/e2e/detection_response/detection_engine/detection_alerts/tags/alert_tags.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ describe('Alert tagging', { tags: ['@ess', '@serverless'] }, () => {
});

after(() => {
cy.task('esArchiverUnload', 'endpoint');
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'endpoint' });
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions ...etection_response/detection_engine/exceptions/alerts_table_flow/endpoint_exceptions.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe.skip(
const ADDITIONAL_ENTRY = 'host.hostname';

beforeEach(() => {
cy.task('esArchiverUnload', 'endpoint');
cy.task('esArchiverUnload', { archiveName: 'endpoint' });
login();
deleteAlertsAndRules();

Expand All @@ -62,7 +62,7 @@ describe.skip(
});

after(() => {
cy.task('esArchiverUnload', 'endpoint');
cy.task('esArchiverUnload', { archiveName: 'endpoint' });
});

it('Should be able to create and close single Endpoint exception from overflow menu', () => {
Expand Down
6 changes: 3 additions & 3 deletions ...n_engine/exceptions/alerts_table_flow/rule_exceptions/auto_populate_with_alert_data.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ describe.skip(
const ADDITIONAL_ENTRY = 'host.hostname';

beforeEach(() => {
cy.task('esArchiverUnload', 'endpoint');
cy.task('esArchiverUnload', { archiveName: 'endpoint' });
cy.task('esArchiverLoad', { archiveName: 'endpoint' });
login();
createRule(getEndpointRule()).then((rule) => visitRuleDetailsPage(rule.body.id));

waitForAlertsToPopulate();
});
after(() => {
cy.task('esArchiverUnload', 'endpoint');
cy.task('esArchiverUnload', { archiveName: 'endpoint' });
deleteAlertsAndRules();
});
afterEach(() => {
cy.task('esArchiverUnload', 'endpoint');
cy.task('esArchiverUnload', { archiveName: 'endpoint' });
});

it('Should create a Rule exception item from alert actions overflow menu and auto populate the conditions using alert Highlighted fields', () => {
Expand Down
4 changes: 2 additions & 2 deletions ...ion_engine/exceptions/alerts_table_flow/rule_exceptions/closing_all_matching_alerts.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('Close matching Alerts ', { tags: ['@ess', '@serverless', '@skipInServe
const ITEM_NAME = 'Sample Exception Item';

beforeEach(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
deleteAlertsAndRules();
cy.task('esArchiverLoad', { archiveName: 'exceptions' });

Expand All @@ -50,7 +50,7 @@ describe('Close matching Alerts ', { tags: ['@ess', '@serverless', '@skipInServe
waitForAlertsToPopulate();
});
after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});

// TODO: https://github.com/elastic/kibana/issues/161539
Expand Down
2 changes: 1 addition & 1 deletion .../cypress/e2e/detection_response/detection_engine/exceptions/entry/flyout_validation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ describe.skip('Exceptions flyout', { tags: ['@ess', '@serverless', '@skipInServe
});

after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});

it('Validates empty entry values correctly', () => {
Expand Down
2 changes: 1 addition & 1 deletion ..._cypress/cypress/e2e/detection_response/detection_engine/exceptions/entry/match_any.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('Exceptions match_any', { tags: ['@ess', '@serverless'] }, () => {
});

after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});

it('Creates exception item', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...ypress/e2e/detection_response/detection_engine/exceptions/entry/multiple_conditions.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe(
});

after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});

const exceptionName = 'My item name';
Expand Down
2 changes: 1 addition & 1 deletion ...ess/cypress/e2e/detection_response/detection_engine/exceptions/entry/use_value_list.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ describe.skip('Use Value list in exception entry', { tags: ['@ess', '@serverless
});

after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});
beforeEach(() => {
login();
Expand Down
2 changes: 1 addition & 1 deletion ..._response/detection_engine/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 @@ -61,7 +61,7 @@ describe('Add endpoint exception from rule details', { tags: ['@ess', '@serverle
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions ...detection_response/detection_engine/exceptions/rule_details_flow/add_edit_exception.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe(
});

after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});

beforeEach(() => {
Expand Down Expand Up @@ -263,7 +263,7 @@ describe(
});

afterEach(() => {
cy.task('esArchiverUnload', 'exceptions_2');
cy.task('esArchiverUnload', { archiveName: 'exceptions_2' });
});

it('Cannot create an item to add to rule but not shared list as rule has no lists attached', () => {
Expand Down
4 changes: 2 additions & 2 deletions ...response/detection_engine/exceptions/rule_details_flow/add_edit_exception_data_view.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe(
});

after(() => {
cy.task('esArchiverUnload', 'exceptions');
cy.task('esArchiverUnload', { archiveName: 'exceptions' });
});

beforeEach(() => {
Expand All @@ -74,7 +74,7 @@ describe(
});

afterEach(() => {
cy.task('esArchiverUnload', 'exceptions_2');
cy.task('esArchiverUnload', { archiveName: 'exceptions_2' });
});

it('Creates an exception item and close all matching alerts', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...ion_cypress/cypress/e2e/detection_response/detection_engine/overview/cti_link_panel.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe.skip('CTI Link Panel', { tags: ['@ess', '@serverless', '@skipInServerle
});

after(() => {
cy.task('esArchiverUnload', 'threat_indicator');
cy.task('esArchiverUnload', { archiveName: 'threat_indicator' });
});

it('renders disabled dashboard module as expected when there are no events in the selected time period', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...ypress/e2e/detection_response/detection_engine/rule_creation/event_correlation_rule.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ describe('EQL rules', { tags: ['@ess', '@serverless'] }, () => {
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

it('Creates and enables a new EQL rule with a sequence', function () {
Expand Down
22 changes: 11 additions & 11 deletions .../security_solution_cypress/cypress/e2e/entity_analytics/dashboards/entity_analytics.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'auditbeat_multiple');
cy.task('esArchiverUnload', { archiveName: 'auditbeat_multiple' });
});

describe('legacy risk score', () => {
Expand Down Expand Up @@ -101,8 +101,8 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_hosts_no_data');
cy.task('esArchiverUnload', 'risk_users_no_data');
cy.task('esArchiverUnload', { archiveName: 'risk_hosts_no_data' });
cy.task('esArchiverUnload', { archiveName: 'risk_users_no_data' });
});

it('shows no data detected prompt for host risk score module', () => {
Expand All @@ -126,8 +126,8 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_hosts_legacy_data');
cy.task('esArchiverUnload', 'risk_users_legacy_data');
cy.task('esArchiverUnload', { archiveName: 'risk_hosts_legacy_data' });
cy.task('esArchiverUnload', { archiveName: 'risk_users_legacy_data' });
});

it('shows enable host risk button', () => {
Expand All @@ -150,7 +150,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_hosts');
cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
});

it('renders donut chart', () => {
Expand Down Expand Up @@ -235,7 +235,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_users');
cy.task('esArchiverUnload', { archiveName: 'risk_users' });
});

it('renders donut chart', () => {
Expand Down Expand Up @@ -338,7 +338,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_scores_new_no_data');
cy.task('esArchiverUnload', { archiveName: 'risk_scores_new_no_data' });
});

it('shows no data detected prompt for host and user risk scores', () => {
Expand All @@ -353,7 +353,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_scores_new');
cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
});

it('renders donut chart', () => {
Expand Down Expand Up @@ -446,7 +446,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'risk_scores_new');
cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
});

it('renders donut chart', () => {
Expand Down Expand Up @@ -546,7 +546,7 @@ describe('Entity Analytics Dashboard', { tags: ['@ess', '@serverless'] }, () =>
});

after(() => {
cy.task('esArchiverUnload', 'network');
cy.task('esArchiverUnload', { archiveName: 'network' });
});

it('should enable a job and renders the table with pagination', () => {
Expand Down
8 changes: 4 additions & 4 deletions ...ecurity_solution_cypress/cypress/e2e/entity_analytics/dashboards/upgrade_risk_score.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ describe('Upgrade risk scores', { tags: ['@ess', '@serverless'] }, () => {
afterEach(() => {
deleteRiskScore({ riskScoreEntity: RiskScoreEntity.host, spaceId });
deleteRiskScore({ riskScoreEntity: RiskScoreEntity.user, spaceId });
cy.task('esArchiverUnload', 'risk_hosts');
cy.task('esArchiverUnload', 'risk_users');
cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
cy.task('esArchiverUnload', { archiveName: 'risk_users' });
});

it('shows upgrade panel', () => {
Expand All @@ -77,8 +77,8 @@ describe('Upgrade risk scores', { tags: ['@ess', '@serverless'] }, () => {
});

afterEach(() => {
cy.task('esArchiverUnload', 'risk_hosts');
cy.task('esArchiverUnload', 'risk_users');
cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
cy.task('esArchiverUnload', { archiveName: 'risk_users' });
deleteRiskScore({ riskScoreEntity: RiskScoreEntity.host, spaceId });
deleteRiskScore({ riskScoreEntity: RiskScoreEntity.user, spaceId });
deleteRiskEngineConfiguration();
Expand Down
Loading