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 ]Re-organize the Investigations api integration test for MKI #194707

Merged
merged 14 commits into from
Oct 16, 2024
Merged

[ Security Solution ]Re-organize the Investigations api integration test for MKI #194707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4e28f8d
new directory structure
logeekal Jul 17, 2024
57d2167
incremental save
logeekal Aug 12, 2024
196baf4
fix: basic and trial similar tests
logeekal Aug 14, 2024
5902a18
fix: ESS working + serverless migration issue
logeekal Aug 23, 2024
f8a66c2
tests: reorganize
logeekal Oct 2, 2024
987011c
housekeeping
logeekal Oct 2, 2024
b37fea5
fix: tests organization
logeekal Oct 2, 2024
6f23f83
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine Oct 2, 2024
9a9323f
fix: request expectation
logeekal Oct 2, 2024
14e1937
PR Comments
logeekal Oct 4, 2024
85b7861
Remove ftr_configs
logeekal Oct 4, 2024
36745eb
fix: types
logeekal Oct 7, 2024
ffcf5ee
PR Comments
logeekal Oct 16, 2024
70c1679
Merge branch 'main' into fix/security_solution_api_integration_test
logeekal Oct 16, 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
8 changes: 6 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 @@ -69,10 +69,14 @@ enabled:
- x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/saved_objects/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/security_and_spaces/configs/ess.basic.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/security_and_spaces/configs/ess.trial.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
- x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
- x-pack/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts
Expand Down
19 changes: 19 additions & 0 deletions x-pack/test/security_solution_api_integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
"initialize-server:edr-workflows": "node ./scripts/index.js server edr_workflows trial_license_complete_tier",
"run-tests:edr-workflows": "node ./scripts/index.js runner edr_workflows trial_license_complete_tier",


"initialize-server:investigations:basic_essentials": "node scripts/index.js server investigation basic_license_essentials_tier",
"run-tests:investigations:basic_essentials": "node scripts/index.js runner investigation basic_license_essentials_tier",

"initialize-server:investigations": "node scripts/index.js server investigation trial_license_complete_tier",
"run-tests:investigations": "node scripts/index.js runner investigation trial_license_complete_tier",

Expand Down Expand Up @@ -377,13 +381,28 @@
"investigations:timeline:server:ess": "npm run initialize-server:investigations timeline ess",
"investigations:timeline:runner:ess": "npm run run-tests:investigations timeline ess essEnv",


"investigations:basic:timeline:server:ess": "npm run initialize-server:investigations:basic_essentials timeline ess",
"investigations:basic:timeline:server:serverless": "npm run initialize-server:investigations:basic_essentials timeline serverless",
"investigations:basic:timeline:runner:ess": "npm run run-tests:investigations:basic_essentials timeline ess essEnv",
"investigations:basic:timeline:runner:serverless": "npm run run-tests:investigations:basic_essentials timeline serverless serverlessEnv",
"investigations:basic:timeline:runner:qa:serverless": "npm run run-tests:investigations:basic_essentials timeline serverless qaPeriodicEnv",
"investigations:basic:timeline:runner:qa:serverless:release": "npm run run-tests:investigations:basic_essentials timeline serverless qaEnv",

"investigations:saved-objects:server:serverless": "npm run initialize-server:investigations saved_objects serverless",
"investigations:saved-objects:runner:serverless": "npm run run-tests:investigations saved_objects serverless serverlessEnv",
"investigations:saved-objects:runner:qa:serverless": "npm run run-tests:investigations saved_objects serverless qaPeriodicEnv",
"investigations:saved-objects:runner:qa:serverless:release": "npm run run-tests:investigations saved_objects serverless qaEnv",
"investigations:saved-objects:server:ess": "npm run initialize-server:investigations saved_objects ess",
"investigations:saved-objects:runner:ess": "npm run run-tests:investigations saved_objects ess essEnv",

"investigations:basic:saved-objects:server:serverless": "npm run initialize-server:investigations:basic_essentials saved_objects serverless",
"investigations:basic:saved-objects:runner:serverless": "npm run run-tests:investigations:basic_essentials saved_objects serverless serverlessEnv",
"investigations:basic:saved-objects:runner:qa:serverless": "npm run run-tests:investigations:basic_essentials saved_objects serverless qaPeriodicEnv",
"investigations:basic:saved-objects:runner:qa:serverless:release": "npm run run-tests:investigations:basic_essentials saved_objects serverless qaEnv",
"investigations:basic:saved-objects:server:ess": "npm run initialize-server:investigations:basic_essentials saved_objects ess",
"investigations:basic:saved-objects:runner:ess": "npm run run-tests:investigations:basic_essentials saved_objects ess essEnv",

"explore:hosts:server:serverless": "npm run intialize-server:explore hosts serverless",
"explore:hosts:runner:serverless": "npm run run-tests:explore hosts serverless serverlessEnv",
"explore:hosts:runner:qa:serverless": "npm run run-tests:explore hosts serverless qaPeriodicEnv",
Expand Down
6 changes: 3 additions & 3 deletions ...ty_and_spaces/configs/ess.trial.config.ts → ...nse_essentials_tier/configs/ess.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { FtrConfigProviderContext } from '@kbn/test';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(
require.resolve('../../../../../config/ess/config.base.trial')
require.resolve('../../../../../config/ess/config.base.basic')
);

return {
Expand All @@ -20,9 +20,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
],
},
testFiles: [require.resolve('../tests/trial')],
testFiles: [require.resolve('../../tests')],
junit: {
reportName: 'Timeline Integration Tests - ESS Env - Trial License',
reportName: 'Saved Objects Integration Tests - ESS Env - Basic License',
},
};
}
23 changes: 23 additions & 0 deletions ...es/investigation/saved_objects/basic_license_essentials_tier/configs/serverless.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* 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 { createTestConfig } from '../../../../../config/serverless/config.base';

export default createTestConfig({
kbnTestServerArgs: [
`--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
`--xpack.securitySolutionServerless.productTypes=${JSON.stringify([
{ product_line: 'security', product_tier: 'essentials' },
{ product_line: 'endpoint', product_tier: 'essentials' },
{ product_line: 'cloud', product_tier: 'essentials' },
])}`,
],
testFiles: [require.resolve('../../tests')],
junit: {
reportName: 'Saved Objects Integration Tests - Serverless Env - Complete Tier',
},
});
0 ...l_license_complete_tier/draft_timeline.ts → ...ion/saved_objects/tests/draft_timeline.ts
View file
Open in desktop
File renamed without changes.
0 ...ts/trial_license_complete_tier/helpers.ts → ...estigation/saved_objects/tests/helpers.ts
View file
Open in desktop
File renamed without changes.
0 ...ects/trial_license_complete_tier/index.ts → ...nvestigation/saved_objects/tests/index.ts
View file
Open in desktop
File renamed without changes.
0 ...ects/trial_license_complete_tier/notes.ts → ...nvestigation/saved_objects/tests/notes.ts
View file
Open in desktop
File renamed without changes.
0 ...al_license_complete_tier/pinned_events.ts → ...tion/saved_objects/tests/pinned_events.ts
View file
Open in desktop
File renamed without changes.
0 ...s/trial_license_complete_tier/timeline.ts → ...stigation/saved_objects/tests/timeline.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...test_suites/investigation/saved_objects/trial_license_complete_tier/configs/ess.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
],
},
testFiles: [require.resolve('..')],
testFiles: [require.resolve('../../tests')],
junit: {
reportName: 'Saved Objects Integration Tests - ESS Env - Basic License',
},
Expand Down
2 changes: 1 addition & 1 deletion ...ites/investigation/saved_objects/trial_license_complete_tier/configs/serverless.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default createTestConfig({
{ product_line: 'cloud', product_tier: 'complete' },
])}`,
],
testFiles: [require.resolve('..')],
testFiles: [require.resolve('../../tests')],
junit: {
reportName: 'Saved Objects Integration Tests - Serverless Env - Complete Tier',
},
Expand Down
2 changes: 1 addition & 1 deletion ...ty_and_spaces/configs/ess.basic.config.ts → ...nse_essentials_tier/configs/ess.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
`--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
],
},
testFiles: [require.resolve('../tests/basic')],
testFiles: [require.resolve('../../tests')],
junit: {
reportName: 'Timeline Integration Tests - ESS Env - Basic License',
},
Expand Down
23 changes: 23 additions & 0 deletions ..._suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* 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 { createTestConfig } from '../../../../../config/serverless/config.base';

export default createTestConfig({
kbnTestServerArgs: [
`--xpack.securitySolution.enableExperimental=${JSON.stringify([])}`,
`--xpack.securitySolutionServerless.productTypes=${JSON.stringify([
{ product_line: 'security', product_tier: 'essentials' },
{ product_line: 'endpoint', product_tier: 'essentials' },
{ product_line: 'cloud', product_tier: 'essentials' },
])}`,
],
testFiles: [require.resolve('../../tests')],
junit: {
reportName: 'Timeline Integration Tests - Serverless Env - Essentials Tier',
},
});
0 ...e_complete_tier/mocks/timeline_details.ts → ...gation/timeline/mocks/timeline_details.ts
View file
Open in desktop
File renamed without changes.
Loading