[9.0] [Security Solution] Remove duplicated services used in integration tests (#235221)#237108
Merged
nikitaindik merged 4 commits intoelastic:9.0from Oct 10, 2025
Merged
Conversation
maximpn
reviewed
Oct 6, 2025
Comment on lines
+23
to
+25
| function getRouteUrlForSpace(routeUrl: string, spaceId?: string): string { | ||
| return spaceId ? `/s/${spaceId}${routeUrl}` : routeUrl; | ||
| } |
Contributor
There was a problem hiding this comment.
It shouldn't be too difficult to add getRouteUrlForSpace to @kbn/spaces-plugin/common as it's done in main. By doing that we make sure there is less difference with main and less potential conflicts as a result.
Contributor
Author
There was a problem hiding this comment.
Indeed, it turned out to be a good solution. Contrary to what I said before, the package is there in 9.0.
nikitaindik
force-pushed
the
backport/9.0/pr-235221
branch
from
b7dea3c to
3e358f3
Compare
Contributor
💚 Build Succeeded
Metrics [docs]
History
cc @nikitaindik |
…sts (elastic#235221) **Partially addresses: elastic#234642 ## Summary Recent Sustainable Kibana Architecture PR elastic#231416 introduced duplicate copies of SuperTest services used in Security Solution API integration tests. This PR removes those duplicates by extracting the services into a `@kbn/security-solution-test-api-clients` package, making them reusable across the Security Solution codebase. The duplicated services were previously located in: - `x-pack/solutions/security/test/api_integration/services/` - `x-pack/solutions/security/test/security_solution_api_integration/config/services/` - `x-pack/solutions/security/test/functional/services/` ## Changes - Extracted services into a new `@kbn/security-solution-test-api-clients` package - Updated `yarn openapi:generate` scripts to output generated files into the new package. - Split Security Solution API client (`security_solution_api.gen.ts`) into 4 domain-specific clients, each owned by its respective team. - Removed redundant `security_solution` prefix from API client filenames. For example `security_solution_osquery_api.gen.ts` was renamed `osquery_api.gen.ts`. Most of the changes are file moves or variable renames.⚠️ Note: Removal of duplicated D&R utilities mentioned in the issue will be handled in a follow-up PR to keep this one focused and manageable. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 6a69d0e) # Conflicts: # src/platform/packages/shared/kbn-openapi-generator/src/template_service/templates/api_client_supertest.handlebars # x-pack/platform/plugins/shared/osquery/scripts/openapi/generate.js # x-pack/solutions/security/packages/kbn-securitysolution-endpoint-exceptions-common/scripts/openapi_generate.js # x-pack/solutions/security/packages/kbn-securitysolution-exceptions-common/scripts/openapi_generate.js # x-pack/solutions/security/packages/kbn-securitysolution-lists-common/scripts/openapi_generate.js # x-pack/solutions/security/packages/test-api-clients/supertest/endpoint_exceptions.gen.ts # x-pack/solutions/security/packages/test-api-clients/supertest/exceptions.gen.ts # x-pack/solutions/security/packages/test-api-clients/supertest/lists.gen.ts # x-pack/solutions/security/packages/test-api-clients/supertest/osquery.gen.ts # x-pack/solutions/security/plugins/security_solution/scripts/openapi/generate.js # x-pack/solutions/security/test/api_integration/services/index.ts # x-pack/solutions/security/test/api_integration/services/security_solution_endpoint_exceptions_api.gen.ts # x-pack/solutions/security/test/api_integration/services/security_solution_exceptions_api.gen.ts # x-pack/solutions/security/test/api_integration/services/security_solution_lists_api.gen.ts # x-pack/solutions/security/test/api_integration/services/security_solution_osquery_api.gen.ts # x-pack/solutions/security/test/security_solution_api_integration/config/ess/services.ts # x-pack/solutions/security/test/security_solution_api_integration/config/ess/services_edr_workflows.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/frozen_indices_handling/trial_license_complete_tier/frozen_indices_handling.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/revert_prebuilt_rules/get_prebuilt_rule_base_version.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/common/revert_prebuilt_rules/revert_prebuilt_rules.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/perform_bulk_action_suppression.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/upsert_crud_api.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/engine.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/privileged_access_detection/pad_installation.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/privileged_users/api.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/privileged_users/cross_source_sync.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/privileged_users/migrations.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/privileged_users/task.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/search_indices.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/utils/plain_index_sync_utils.ts # x-pack/solutions/security/test/security_solution_api_integration/test_suites/entity_analytics/monitoring/trial_license_complete_tier/utils/privmon_utils.ts # x-pack/solutions/security/test/serverless/functional/services/index.ts # x-pack/solutions/security/test/serverless/functional/test_suites/ftr/discover/context_awareness/index.ts # x-pack/solutions/security/test/tsconfig.json # x-pack/test/api_integration/services/security_solution_api.gen.ts # x-pack/test/api_integration/services/security_solution_endpoint_exceptions_api.gen.ts # x-pack/test/api_integration/services/security_solution_exceptions_api.gen.ts # x-pack/test/api_integration/services/security_solution_lists_api.gen.ts # x-pack/test/api_integration/services/security_solution_osquery_api.gen.ts # x-pack/test/cloud_security_posture_functional/services/index.ts # x-pack/test/security_solution_api_integration/config/serverless/services.ts # x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/perform_bulk_action.ts # x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/perform_bulk_action_dry_run.ts # x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_bulk_actions/trial_license_complete_tier/perform_bulk_action_ess.ts # x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/create_rules.ts # x-pack/test/security_solution_api_integration/test_suites/siem_migrations/rules/trial_license_complete_tier/install.ts # x-pack/test/security_solution_api_integration/tsconfig.json
nikitaindik
force-pushed
the
backport/9.0/pr-235221
branch
from
3e358f3 to
3d45d60
Compare
maximpn
approved these changes
Oct 10, 2025
Contributor
maximpn
left a comment
maximpn
left a comment
There was a problem hiding this comment.
@nikitaindik Thanks for addressing my comments 🙏
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This will backport the following commits from
mainto9.0:Questions ?
Please refer to the Backport tool documentation