[Security Solution] Remove D&R helpers duplicates#235972
[Security Solution] Remove D&R helpers duplicates#235972nikitaindik merged 4 commits intoelastic:mainfrom
Conversation
801daa5 to
ac69ec0
Compare
ac69ec0 to
0aa316c
Compare
|
Pinging @elastic/security-detections-response (Team:Detections and Resp) |
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
|
Pinging @elastic/security-detection-rule-management (Team:Detection Rule Management) |
dmlemeshko
left a comment
There was a problem hiding this comment.
Thanks for the cleanup, LGTM
janmonschke
left a comment
There was a problem hiding this comment.
kibana-cases changes lgtm
maximpn
left a comment
There was a problem hiding this comment.
@nikitaindik Thanks for getting rid of service duplicates 🙏
The changes LGTM. There is a smart trick with tsconfig.json in D&R services folder and referencing it from Security Solution and Cases API integrations folders 👍
Could you create a ticket for relocating reusable services in a shared test utilities package and mention it in the PR description?
|
Starting backport for target branches: 8.18, 8.19, 9.1, 9.2 https://github.com/elastic/kibana/actions/runs/18713394561 |
**Partially addresses: elastic#234642 **Follow-up issue to extract into package: elastic#240043 # Summary This PR removes duplicated Detections & Response test utils directory that was used by `cases_api_integrations` tests. The removed directory was located at `x-pack/solutions/security/test/common/utils/detections_response`. # Changes - Removed duplicated utils directory at `x-pack/solutions/security/test/common/utils/detections_response` - Updated util imports in `cases_api_integrations` directory to import from `x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response` instead of the removed directory - Added a `tsconfig.json` for the utils directory to make it importable from both `security_solution_api_integration` and `cases_api_integrations`. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 9f98970)
**Partially addresses: elastic#234642 **Follow-up issue to extract into package: elastic#240043 # Summary This PR removes duplicated Detections & Response test utils directory that was used by `cases_api_integrations` tests. The removed directory was located at `x-pack/solutions/security/test/common/utils/detections_response`. # Changes - Removed duplicated utils directory at `x-pack/solutions/security/test/common/utils/detections_response` - Updated util imports in `cases_api_integrations` directory to import from `x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response` instead of the removed directory - Added a `tsconfig.json` for the utils directory to make it importable from both `security_solution_api_integration` and `cases_api_integrations`. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 9f98970) # Conflicts: # x-pack/solutions/security/test/common/utils/detections_response/alerts/create_alerts_index.ts # x-pack/solutions/security/test/common/utils/detections_response/alerts/get_alerts_by_id.ts # x-pack/solutions/security/test/common/utils/detections_response/alerts/get_alerts_by_ids.ts # x-pack/solutions/security/test/common/utils/detections_response/alerts/search_alerts.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/get_gaps_by_rule_id.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/manual_run.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/wait_for_rule_status.ts # x-pack/solutions/security/test/common/utils/detections_response/tasks/indices_metadata.ts # x-pack/solutions/security/test/common/utils/detections_response/tasks/task_manager.ts
**Partially addresses: elastic#234642 **Follow-up issue to extract into package: elastic#240043 # Summary This PR removes duplicated Detections & Response test utils directory that was used by `cases_api_integrations` tests. The removed directory was located at `x-pack/solutions/security/test/common/utils/detections_response`. # Changes - Removed duplicated utils directory at `x-pack/solutions/security/test/common/utils/detections_response` - Updated util imports in `cases_api_integrations` directory to import from `x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response` instead of the removed directory - Added a `tsconfig.json` for the utils directory to make it importable from both `security_solution_api_integration` and `cases_api_integrations`. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 9f98970) # Conflicts: # x-pack/solutions/security/test/common/utils/detections_response/index.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/delete_all_rules.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/get_gaps_by_rule_id.ts
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
…40052) # Backport This will backport the following commits from `main` to `9.2`: - [[Security Solution] Remove D&R helpers duplicates (#235972)](#235972) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-10-22T10:34:25Z","message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","backport:version","v9.2.0","v9.3.0","v9.1.6","v8.18.9","v8.19.6"],"title":"[Security Solution] Remove D&R helpers duplicates","number":235972,"url":"https://github.com/elastic/kibana/pull/235972","mergeCommit":{"message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724"}},"sourceBranch":"main","suggestedTargetBranches":["9.2","9.1","8.18","8.19"],"targetPullRequestStates":[{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/235972","number":235972,"mergeCommit":{"message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.9","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Nikita Indik <nikita.indik@elastic.co>
**Partially addresses: elastic#234642 **Follow-up issue to extract into package: elastic#240043 # Summary This PR removes duplicated Detections & Response test utils directory that was used by `cases_api_integrations` tests. The removed directory was located at `x-pack/solutions/security/test/common/utils/detections_response`. # Changes - Removed duplicated utils directory at `x-pack/solutions/security/test/common/utils/detections_response` - Updated util imports in `cases_api_integrations` directory to import from `x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response` instead of the removed directory - Added a `tsconfig.json` for the utils directory to make it importable from both `security_solution_api_integration` and `cases_api_integrations`. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 9f98970) # Conflicts: # x-pack/solutions/security/test/common/utils/detections_response/alerts/create_alerts_index.ts # x-pack/solutions/security/test/common/utils/detections_response/alerts/get_alerts_by_id.ts # x-pack/solutions/security/test/common/utils/detections_response/alerts/get_alerts_by_ids.ts # x-pack/solutions/security/test/common/utils/detections_response/alerts/search_alerts.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/get_gaps_by_rule_id.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/manual_run.ts # x-pack/solutions/security/test/common/utils/detections_response/rules/wait_for_rule_status.ts # x-pack/solutions/security/test/common/utils/detections_response/tasks/indices_metadata.ts # x-pack/solutions/security/test/common/utils/detections_response/tasks/task_manager.ts
…40070) # Backport This will backport the following commits from `main` to `9.1`: - [[Security Solution] Remove D&R helpers duplicates (#235972)](#235972) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-10-22T10:34:25Z","message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","backport:version","v9.2.0","v9.3.0","v9.1.6","v8.19.6"],"title":"[Security Solution] Remove D&R helpers duplicates","number":235972,"url":"https://github.com/elastic/kibana/pull/235972","mergeCommit":{"message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/240052","number":240052,"state":"OPEN"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/235972","number":235972,"mergeCommit":{"message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
…240073) # Backport This will backport the following commits from `main` to `8.19`: - [[Security Solution] Remove D&R helpers duplicates (#235972)](#235972) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Nikita Indik","email":"nikita.indik@elastic.co"},"sourceCommit":{"committedDate":"2025-10-22T10:34:25Z","message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","backport:version","v9.2.0","v9.3.0","v9.1.6","v8.19.6"],"title":"[Security Solution] Remove D&R helpers duplicates","number":235972,"url":"https://github.com/elastic/kibana/pull/235972","mergeCommit":{"message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"9.2","label":"v9.2.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/240052","number":240052,"state":"OPEN"},{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/235972","number":235972,"mergeCommit":{"message":"[Security Solution] Remove D&R helpers duplicates (#235972)\n\n**Partially addresses: https://github.com/elastic/kibana/issues/234642**\n**Follow-up issue to extract into package:\nhttps://github.com//issues/240043**\n\n# Summary\n\nThis PR removes duplicated Detections & Response test utils directory\nthat was used by `cases_api_integrations` tests. The removed directory\nwas located at\n`x-pack/solutions/security/test/common/utils/detections_response`.\n\n# Changes\n- Removed duplicated utils directory at\n`x-pack/solutions/security/test/common/utils/detections_response`\n- Updated util imports in `cases_api_integrations` directory to import\nfrom\n`x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response`\ninstead of the removed directory\n- Added a `tsconfig.json` for the utils directory to make it importable\nfrom both `security_solution_api_integration` and\n`cases_api_integrations`.\n\n---------\n\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"9f98970955f0311530dba249d6b8f68829343724"}},{"branch":"9.1","label":"v9.1.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.6","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
**Partially addresses: elastic#234642 **Follow-up issue to extract into package: elastic#240043 # Summary This PR removes duplicated Detections & Response test utils directory that was used by `cases_api_integrations` tests. The removed directory was located at `x-pack/solutions/security/test/common/utils/detections_response`. # Changes - Removed duplicated utils directory at `x-pack/solutions/security/test/common/utils/detections_response` - Updated util imports in `cases_api_integrations` directory to import from `x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response` instead of the removed directory - Added a `tsconfig.json` for the utils directory to make it importable from both `security_solution_api_integration` and `cases_api_integrations`. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Partially addresses: #234642
Follow-up issue to extract into package: #240043
Summary
This PR removes duplicated Detections & Response test utils directory that was used by
cases_api_integrationstests. The removed directory was located atx-pack/solutions/security/test/common/utils/detections_response.Changes
x-pack/solutions/security/test/common/utils/detections_responsecases_api_integrationsdirectory to import fromx-pack/solutions/security/test/security_solution_api_integration/config/services/detections_responseinstead of the removed directorytsconfig.jsonfor the utils directory to make it importable from bothsecurity_solution_api_integrationandcases_api_integrations.