[SecuritySolution] Remove duplicated serverless tests

test/common/services/bsearch.ts

@@ -39,7 +39,7 @@ const getSpaceUrlPrefix = (spaceId?: string): string => {
 /**
  * Options for the send method
  */
-interface SendOptions {
+export interface SendOptions {
   supertest: SuperTest.Agent;
   options: object;
   strategy: string;

x-pack/test/security_solution_api_integration/config/services/security_solution_ess_utils.ts

@@ -5,18 +5,20 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { SecuritySolutionUtils } from './types';
+import { FtrProviderContextWithSpaces as FtrProviderContext } from '../../ftr_provider_context_with_spaces';
+import { SecuritySolutionESSUtilsInterface } from './types';
 
 export function SecuritySolutionESSUtils({
   getService,
-}: FtrProviderContext): SecuritySolutionUtils {
+}: FtrProviderContext): SecuritySolutionESSUtilsInterface {
   const config = getService('config');
   const supertest = getService('supertest');
+  const bsearch = getService('bsearch');
 
   return {
     getUsername: (_role?: string) =>
       Promise.resolve(config.get('servers.kibana.username') as string),
     createSuperTest: (_role?: string) => Promise.resolve(supertest),
+    createBsearch: (_role?: string) => Promise.resolve(bsearch),
   };
 }

x-pack/test/security_solution_api_integration/config/services/security_solution_serverless_bsearch_creator.ts

@@ -0,0 +1,14 @@
+/*
+ * 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 { FtrProviderContext } from '../../ftr_provider_context';
+
+export async function SecuritySolutionServerlessBsearchCreator({ getService }: FtrProviderContext) {
+  const { createBsearch } = getService('securitySolutionUtils');
+
+  return await createBsearch('admin');
+}

x-pack/test/security_solution_api_integration/config/services/security_solution_serverless_utils.ts

@@ -7,18 +7,22 @@
 
 import supertest from 'supertest';
 import { format as formatUrl } from 'url';
+import { IEsSearchResponse } from '@kbn/search-types';
 import { RoleCredentials } from '@kbn/test-suites-serverless/shared/services';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { SecuritySolutionUtils } from './types';
+import type { SendOptions } from '@kbn/test-suites-src/common/services/bsearch';
+import type { SendOptions as SecureBsearchSendOptions } from '@kbn/test-suites-serverless/shared/services/bsearch_secure';
+import type { FtrProviderContext } from '../../ftr_provider_context';
+import type { SecuritySolutionUtilsInterface } from './types';
 
 export function SecuritySolutionServerlessUtils({
   getService,
-}: FtrProviderContext): SecuritySolutionUtils {
+}: FtrProviderContext): SecuritySolutionUtilsInterface {
   const svlUserManager = getService('svlUserManager');
   const lifecycle = getService('lifecycle');
   const svlCommonApi = getService('svlCommonApi');
   const config = getService('config');
   const log = getService('log');
+  const SecureBsearch = getService('secureBsearch');
 
   const rolesCredentials = new Map<string, RoleCredentials>();
   const commonRequestHeader = svlCommonApi.getCommonRequestHeader();
@@ -48,6 +52,13 @@ export function SecuritySolutionServerlessUtils({
     });
   });
 
+  const createSuperTest = async (role = 'admin') => {
+    cleanCredentials(role);
+    const credentials = await svlUserManager.createM2mApiKeyWithRoleScope(role);
+    rolesCredentials.set(role, credentials);
+    return agentWithCommonHeaders.set(credentials.apiKeyHeader);
+  };
+
   return {
     getUsername: async (role = 'admin') => {
       const { username } = await svlUserManager.getUserData(role);
@@ -57,12 +68,32 @@ export function SecuritySolutionServerlessUtils({
     /**
      * Only one API key for each role can be active at a time.
      */
-    createSuperTest: async (role = 'admin') => {
-      cleanCredentials(role);
-      const credentials = await svlUserManager.createM2mApiKeyWithRoleScope(role);
-      rolesCredentials.set(role, credentials);
+    createSuperTest,
+
+    createBsearch: async (role = 'admin') => {
+      const apiKeyHeader = rolesCredentials.get(role)?.apiKeyHeader;
+
+      if (!apiKeyHeader) {
+        log.error(`API key for role [${role}] is not available, SecureBsearch cannot be created`);
+      }
+
+      const send = <T extends IEsSearchResponse>(sendOptions: SendOptions): Promise<T> => {
+        const { supertest: _, ...rest } = sendOptions;
+        const serverlessSendOptions: SecureBsearchSendOptions = {
+          ...rest,
+          // We need super test WITHOUT auth to make the request here, as we are setting the auth header in bsearch `apiKeyHeader`
+          supertestWithoutAuth: supertest.agent(kbnUrl),
+          apiKeyHeader: apiKeyHeader ?? { Authorization: '' },
+          internalOrigin: 'Kibana',
+        };
+
+        log.debug(
+          `Sending request to SecureBsearch with options: ${JSON.stringify(serverlessSendOptions)}`
+        );
+        return SecureBsearch.send(serverlessSendOptions);
+      };
 
-      return agentWithCommonHeaders.set(credentials.apiKeyHeader);
+      return { ...SecureBsearch, send };
     },
   };
 }

x-pack/test/security_solution_api_integration/config/services/types.ts

@@ -6,8 +6,23 @@
  */
 
 import TestAgent from 'supertest/lib/agent';
+import type { IEsSearchResponse } from '@kbn/search-types';
 
-export interface SecuritySolutionUtils {
+import type { BsearchSecureService } from '@kbn/test-suites-serverless/shared/services/bsearch_secure';
+import type { BsearchService, SendOptions } from '@kbn/test-suites-src/common/services/bsearch';
+
+export interface SecuritySolutionServerlessBsearch extends Omit<BsearchSecureService, 'send'> {
+  send: <T extends IEsSearchResponse>(options: SendOptions) => Promise<T>;
+}
+
+export interface SecuritySolutionUtilsInterface {
+  getUsername: (role?: string) => Promise<string>;
+  createSuperTest: (role?: string) => Promise<TestAgent<any>>;
+  createBsearch: (role?: string) => Promise<SecuritySolutionServerlessBsearch>;
+}
+
+export interface SecuritySolutionESSUtilsInterface {
   getUsername: (role?: string) => Promise<string>;
   createSuperTest: (role?: string) => Promise<TestAgent<any>>;
+  createBsearch: (role?: string) => Promise<BsearchService>;
 }

x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/ess.config.ts

@@ -14,7 +14,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
 
   return {
     ...functionalConfig.getAll(),
-    testFiles: [require.resolve('../ess')],
+    testFiles: [require.resolve('../tests')],
     junit: {
       reportName: 'Explore - Hosts Integration Tests - ESS Env - Trial License',
     },

x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/serverless.config.ts

@@ -16,7 +16,7 @@ export default createTestConfig({
       { product_line: 'cloud', product_tier: 'complete' },
     ])}`,
   ],
-  testFiles: [require.resolve('../serverless')],
+  testFiles: [require.resolve('../tests')],
   junit: {
     reportName: 'Explore - Hosts Integration Tests - Serverless Env - Complete Tier',
   },