[9.1] [Security Solution] Remove duplicated services used in integration tests (#235221)

.github/CODEOWNERS

@@ -1113,6 +1113,7 @@ x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-i
 x-pack/solutions/security/packages/security-ai-prompts @elastic/security-generative-ai
 x-pack/solutions/security/packages/side-nav @elastic/security-threat-hunting-investigations
 x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-investigations
+x-pack/solutions/security/packages/test-api-clients @elastic/security-detection-rule-management
 x-pack/solutions/security/packages/upselling @elastic/security-threat-hunting-investigations
 x-pack/solutions/security/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture
 x-pack/solutions/security/plugins/ecs_data_quality_dashboard @elastic/security-threat-hunting-investigations

package.json

@@ -882,6 +882,7 @@
     "@kbn/security-solution-serverless": "link:x-pack/solutions/security/plugins/security_solution_serverless",
     "@kbn/security-solution-side-nav": "link:x-pack/solutions/security/packages/side-nav",
     "@kbn/security-solution-storybook-config": "link:x-pack/solutions/security/packages/storybook/config",
+    "@kbn/security-solution-test-api-clients": "link:x-pack/solutions/security/packages/test-api-clients",
     "@kbn/security-solution-upselling": "link:x-pack/solutions/security/packages/upselling",
     "@kbn/security-test-endpoints-plugin": "link:x-pack/platform/test/security_functional/plugins/test_endpoints",
     "@kbn/security-ui-components": "link:x-pack/platform/packages/private/security/ui_components",

src/platform/packages/shared/kbn-openapi-generator/src/template_service/templates/api_client_supertest.handlebars

@@ -9,17 +9,18 @@
 
 import { ELASTIC_HTTP_VERSION_HEADER, X_ELASTIC_INTERNAL_ORIGIN_REQUEST } from '@kbn/core-http-common';
 import { replaceParams } from '@kbn/openapi-common/shared';
-import { getRouteUrlForSpace } from '@kbn/spaces-plugin/common';
-import { FtrProviderContext } from 'x-pack/platform/test/api_integration/ftr_provider_context';
 
 {{#each operations}}
-import { 
+import type {
   {{operationId}}RequestQueryInput,
   {{operationId}}RequestParamsInput,
   {{operationId}}RequestBodyInput
 } from '{{replace sourcePath 'schema.yaml' 'gen'}}';
 {{/each}}
 
+import type { FtrProviderContext } from '@kbn/ftr-common-functional-services';
+import { getRouteUrlForSpace } from '@kbn/spaces-plugin/common';
+
 export function SecuritySolutionApiProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
@@ -39,7 +40,7 @@ export function SecuritySolutionApiProvider({ getService }: FtrProviderContext)
         {{~#if requestBody}}.send(props.body as object){{/if}}
         {{~#if requestQuery}}.query(props.query){{/if}}
       },
-  {{/each}} 
+  {{/each}}
   }
 }
 

tsconfig.base.json

@@ -1752,6 +1752,8 @@
       "@kbn/security-solution-side-nav/*": ["x-pack/solutions/security/packages/side-nav/*"],
       "@kbn/security-solution-storybook-config": ["x-pack/solutions/security/packages/storybook/config"],
       "@kbn/security-solution-storybook-config/*": ["x-pack/solutions/security/packages/storybook/config/*"],
+      "@kbn/security-solution-test-api-clients": ["x-pack/solutions/security/packages/test-api-clients"],
+      "@kbn/security-solution-test-api-clients/*": ["x-pack/solutions/security/packages/test-api-clients/*"],
       "@kbn/security-solution-upselling": ["x-pack/solutions/security/packages/upselling"],
       "@kbn/security-solution-upselling/*": ["x-pack/solutions/security/packages/upselling/*"],
       "@kbn/security-test-endpoints-plugin": ["x-pack/platform/test/security_functional/plugins/test_endpoints"],

x-pack/platform/plugins/shared/osquery/scripts/openapi/generate.js

@@ -32,7 +32,7 @@ const OSQUERY_ROOT = resolve(__dirname, '../..');
     bundle: {
       outFile: join(
         REPO_ROOT,
-        'x-pack/solutions/security/test/api_integration/services/security_solution_osquery_api.gen.ts'
+        'x-pack/solutions/security/packages/test-api-clients/supertest/osquery.gen.ts'
       ),
     },
   });

x-pack/solutions/security/packages/kbn-securitysolution-endpoint-exceptions-common/scripts/openapi_generate.js

@@ -30,7 +30,7 @@ const ROOT = resolve(__dirname, '..');
     bundle: {
       outFile: join(
         REPO_ROOT,
-        'x-pack/solutions/security/test/api_integration/services/security_solution_endpoint_exceptions_api.gen.ts'
+        'x-pack/solutions/security/packages/test-api-clients/supertest/endpoint_exceptions.gen.ts'
       ),
     },
   });

x-pack/solutions/security/packages/kbn-securitysolution-exceptions-common/scripts/openapi_generate.js

@@ -30,7 +30,7 @@ const ROOT = resolve(__dirname, '..');
     bundle: {
       outFile: join(
         REPO_ROOT,
-        'x-pack/solutions/security/test/api_integration/services/security_solution_exceptions_api.gen.ts'
+        'x-pack/solutions/security/packages/test-api-clients/supertest/exceptions.gen.ts'
       ),
     },
   });

x-pack/solutions/security/packages/kbn-securitysolution-lists-common/scripts/openapi_generate.js

@@ -30,7 +30,7 @@ const ROOT = resolve(__dirname, '..');
     bundle: {
       outFile: join(
         REPO_ROOT,
-        'x-pack/solutions/security/test/api_integration/services/security_solution_lists_api.gen.ts'
+        'x-pack/solutions/security/packages/test-api-clients/supertest/lists.gen.ts'
       ),
     },
   });

x-pack/solutions/security/packages/test-api-clients/README.md

@@ -0,0 +1,27 @@
+# @kbn/security-solution-test-api-clients
+
+Auto-generated API clients for Security Solution testing.
+
+This package contains Supertest API clients generated from OpenAPI schemas for use in Security Solution integration tests.
+
+## Usage example
+
+Add a service to your test services configuration
+```typescript
+import { SecuritySolutionApiProvider } from '@kbn/security-solution-test-api-clients/supertest/detections.gen';
+
+export const services = {
+  detectionsApi: SecuritySolutionApiProvider,
+  // ... other services
+};
+```
+
+Then use the service in your test
+```typescript
+export default ({ getService }: FtrProviderContext): void => {
+  const detectionsApi = getService('detectionsApi');
+
+  // ...
+
+  detectionsApi.findRules({ query: {} }).expect(200);
+```

x-pack/solutions/security/packages/test-api-clients/kibana.jsonc

@@ -0,0 +1,9 @@
+{
+  "id": "@kbn/security-solution-test-api-clients",
+  "type": "shared-common",
+  "owner": [
+    "@elastic/security-detection-rule-management"
+  ],
+  "group": "security",
+  "visibility": "private"
+}

x-pack/solutions/security/packages/test-api-clients/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/security-solution-test-api-clients",
+  "description": "Security Solution API clients for testing",
+  "private": true,
+  "version": "1.0.0",
+  "license": "Elastic License 2.0"
+}