Revert "[FTR] Refactor test/common/services/* -> packages/kbn-ftr-com… (#191765)

Build failure


https://buildkite.com/elastic/kibana-pull-request/builds/230868#01919ed7-15d5-425c-9b8e-146ed5fe9daf

docs/developer/contributing/development-functional-tests.asciidoc

@@ -203,7 +203,7 @@ Tests should run at the positive security boundary condition, meaning that they
  
 The functional UI tests now default to logging in with a user named `test_user` and the roles of this user can be changed dynamically without logging in and out.  
 
-In order to achieve this a new service was introduced called `createTestUserService` (see `packages/kbn-ftr-common-functional-ui-services/services/security/test_user.ts`). The purpose of this test user service is to create roles defined in the test config files and setRoles() or restoreDefaults().
+In order to achieve this a new service was introduced called `createTestUserService` (see `test/common/services/security/test_user.ts`). The purpose of this test user service is to create roles defined in the test config files and setRoles() or restoreDefaults().
 
 An example of how to set the role like how its defined below:
 
@@ -366,14 +366,14 @@ await testSubjects.click(‘containerButton’);
 ** `find.allByCssSelector()`
 
 **retry:**:::
-// * Source: {kibana-blob}packages/kbn-ftr-common-functional-services/services/retry/retry.ts[packages/kbn-ftr-common-functional-services/services/retry/retry.ts]
+// * Source: {kibana-blob}test/common/services/retry/retry.ts[test/common/services/retry/retry.ts]
 * Helpers for retrying operations
 * Popular methods:
 ** `retry.try(fn, onFailureBlock)` - Execute `fn` in a loop until it succeeds or the default timeout elapses. The optional `onFailureBlock` is executed before each retry attempt.
 ** `retry.tryForTime(ms, fn, onFailureBlock)` - Execute `fn` in a loop until it succeeds or `ms` milliseconds elapses. The optional `onFailureBlock` is executed before each retry attempt.
 
 **kibanaServer:**:::
-// * Source: {kibana-blob}packages/kbn-ftr-common-functional-services/services/kibana_server/kibana_server.ts[packages/kbn-ftr-common-functional-services/services/kibana_server/kibana_server.ts]
+// * Source: {kibana-blob}test/common/services/kibana_server/kibana_server.js[test/common/services/kibana_server/kibana_server.js]
 * Helpers for interacting with {kib}'s server
 * Commonly used methods:
 ** `kibanaServer.uiSettings.update()`
@@ -381,7 +381,7 @@ await testSubjects.click(‘containerButton’);
 ** `kibanaServer.status.getOverallState()`
 
 **esArchiver:**:::
-// * Source: {kibana-blob}packages/kbn-ftr-common-functional-services/services/es_archiver.ts[packages/kbn-ftr-common-functional-services/services/es_archiver.ts]
+// * Source: {kibana-blob}test/common/services/es_archiver.ts[test/common/services/es_archiver.ts]
 * Load/unload archives created with the `esArchiver`
 * Popular methods:
 ** `esArchiver.load(path)`
@@ -393,7 +393,7 @@ Full list of services that are used in functional tests can be found here: {kiba
 
 **Low-level utilities:**:::
 * es
-// ** Source: {kibana-blob}packages/kbn-ftr-common-functional-services/services/es.ts[packages/kbn-ftr-common-functional-services/services/es.ts]
+// ** Source: {kibana-blob}test/common/services/es.ts[test/common/services/es.ts]
 ** {es} client
 ** Higher level options: `kibanaServer.uiSettings` or `esArchiver`
 * remote

packages/kbn-ftr-common-functional-services/index.ts

@@ -10,7 +10,6 @@ import { ProvidedType } from '@kbn/test';
 export { services as commonFunctionalServices } from './services/all';
 
 import { KibanaServerProvider } from './services/kibana_server';
-export { KibanaServerProvider } from './services/kibana_server';
 export type KibanaServer = ProvidedType<typeof KibanaServerProvider>;
 
 export { RetryService } from './services/retry';
@@ -19,7 +18,6 @@ import { EsArchiverProvider } from './services/es_archiver';
 export type EsArchiver = ProvidedType<typeof EsArchiverProvider>;
 
 import { EsProvider } from './services/es';
-export { EsProvider } from './services/es';
 export type Es = ProvidedType<typeof EsProvider>;
 
 import { SupertestWithoutAuthProvider } from './services/supertest_without_auth';
@@ -31,10 +29,3 @@ import { SamlAuthProvider } from './services/saml_auth/saml_auth_provider';
 export type SamlAuthProviderType = ProvidedType<typeof SamlAuthProvider>;
 
 export type { FtrProviderContext } from './services/ftr_provider_context';
-export { runSavedObjInfoSvc } from './services/saved_object_info';
-
-export type { BsearchService, SendOptions } from './services/bsearch';
-export { SavedObjectInfoService } from './services/saved_object_info';
-export { DeploymentService } from './services/deployment';
-export { IndexPatternsService } from './services/index_patterns';
-export { RandomnessService } from './services/randomness';

packages/kbn-ftr-common-functional-services/services/all.ts

@@ -10,13 +10,6 @@ import { EsArchiverProvider } from './es_archiver';
 import { EsProvider } from './es';
 import { KibanaServerProvider } from './kibana_server';
 import { RetryService } from './retry';
-import { BsearchService } from './bsearch';
-import { ConsoleProvider } from './console';
-import { DeploymentService } from './deployment';
-import { EsDeleteAllIndicesProvider } from './es_delete_all_indices';
-import { IndexPatternsService } from './index_patterns';
-import { SavedObjectInfoService } from './saved_object_info';
-import { RandomnessService } from './randomness';
 import { SupertestWithoutAuthProvider } from './supertest_without_auth';
 import { SamlAuthProvider } from './saml_auth';
 
@@ -25,13 +18,6 @@ export const services = {
   kibanaServer: KibanaServerProvider,
   esArchiver: EsArchiverProvider,
   retry: RetryService,
-  bsearch: BsearchService,
-  console: ConsoleProvider,
-  deployment: DeploymentService,
-  esDeleteAllIndices: EsDeleteAllIndicesProvider,
-  indexPatterns: IndexPatternsService,
-  savedObjectInfo: SavedObjectInfoService,
-  randomness: RandomnessService,
   supertestWithoutAuth: SupertestWithoutAuthProvider,
   samlAuth: SamlAuthProvider,
 };

packages/kbn-ftr-common-functional-services/tsconfig.json

@@ -16,15 +16,8 @@
     "@kbn/es-archiver",
     "@kbn/test",
     "@kbn/expect",
-    "@kbn/search-types",
-    "@kbn/core-http-common",
-    "@kbn/bfetch-plugin",
-    "@kbn/data-plugin",
-    "@kbn/dev-cli-runner",
-    "@kbn/dev-cli-errors",
     "@kbn/repo-info",
     "@kbn/es",
-    "@kbn/data-views-plugin"
   ],
   "exclude": [
     "target/**/*",

packages/kbn-ftr-common-functional-ui-services/index.ts

@@ -22,4 +22,3 @@ export {
 } from './services/remote/network_profiles';
 export type { TimeoutOpt } from './types';
 export { TestSubjects } from './services/test_subjects';
-export { SecurityService } from './services/security';

packages/kbn-ftr-common-functional-ui-services/services/all.ts

@@ -12,7 +12,6 @@ import { FindProvider } from './find';
 import { TestSubjects } from './test_subjects';
 import { BrowserProvider } from './browser';
 import { ToastsService } from './toasts';
-import { SecurityServiceProvider } from './security';
 
 export const services = {
   retryOnStale: RetryOnStaleProvider,
@@ -21,5 +20,4 @@ export const services = {
   testSubjects: TestSubjects,
   browser: BrowserProvider,
   toasts: ToastsService,
-  security: SecurityServiceProvider,
 };

packages/kbn-ftr-common-functional-ui-services/services/ftr_provider_context.ts

@@ -7,18 +7,12 @@
  */
 
 import { GenericFtrProviderContext, GenericFtrService } from '@kbn/test';
-import {
-  RetryService,
-  EsProvider,
-  KibanaServerProvider,
-} from '@kbn/ftr-common-functional-services';
+import { RetryService } from '@kbn/ftr-common-functional-services';
 import { services as commonFunctionalUiServices } from './all';
 
 const services = {
   ...commonFunctionalUiServices,
   retry: RetryService,
-  es: EsProvider,
-  kibanaServer: KibanaServerProvider,
 };
 
 export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;

scripts/saved_objs_info.js

@@ -7,4 +7,4 @@
  */
 
 require('../src/setup_node_env');
-require('@kbn/ftr-common-functional-services').runSavedObjInfoSvc();
+require('@kbn/test-suites-src/common/services/saved_object_info').runSavedObjInfoSvc();

test/analytics/services/index.ts

@@ -7,17 +7,14 @@
  */
 
 import { GenericFtrProviderContext } from '@kbn/test';
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
-
+import { services as commonServices } from '../../common/services';
 import { services as functionalServices } from '../../functional/services';
 import { pageObjects } from '../../functional/page_objects';
 
 import { KibanaEBTServerProvider, KibanaEBTUIProvider } from './kibana_ebt';
 
 export const services = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
+  ...commonServices,
   ...functionalServices,
   kibana_ebt_server: KibanaEBTServerProvider,
   kibana_ebt_ui: KibanaEBTUIProvider,

test/api_integration/apis/console/autocomplete_entities.ts

@@ -8,11 +8,25 @@
 
 import expect from '@kbn/expect';
 import type { FtrProviderContext } from '../../ftr_provider_context';
+import { helpers } from './helpers';
 
 export default ({ getService }: FtrProviderContext) => {
-  const console = getService('console');
-  const supertest = getService('supertest');
+  const {
+    createIndex,
+    createAlias,
+    createLegacyTemplate,
+    createIndexTemplate,
+    createComponentTemplate,
+    createDataStream,
+    deleteIndex,
+    deleteAlias,
+    deleteLegacyTemplate,
+    deleteIndexTemplate,
+    deleteComponentTemplate,
+    deleteDataStream,
+  } = helpers(getService);
 
+  const supertest = getService('supertest');
   const sendRequest = (query: object) =>
     supertest.get('/api/console/autocomplete_entities').query(query);
 
@@ -26,26 +40,22 @@ export default ({ getService }: FtrProviderContext) => {
 
     before(async () => {
       // Setup indices, aliases, templates, and data streams
-      await console.createIndex(indexName);
-      await console.createAlias(indexName, aliasName);
-      await console.createComponentTemplate(componentTemplateName);
-      await console.createIndexTemplate(
-        indexTemplateName,
-        [dataStreamName],
-        [componentTemplateName]
-      );
-      await console.createDataStream(dataStreamName);
-      await console.createLegacyTemplate(legacyTemplateName);
+      await createIndex(indexName);
+      await createAlias(indexName, aliasName);
+      await createComponentTemplate(componentTemplateName);
+      await createIndexTemplate(indexTemplateName, [dataStreamName], [componentTemplateName]);
+      await createDataStream(dataStreamName);
+      await createLegacyTemplate(legacyTemplateName);
     });
 
     after(async () => {
       // Cleanup indices, aliases, templates, and data streams
-      await console.deleteAlias(indexName, aliasName);
-      await console.deleteIndex(indexName);
-      await console.deleteDataStream(dataStreamName);
-      await console.deleteIndexTemplate(indexTemplateName);
-      await console.deleteComponentTemplate(componentTemplateName);
-      await console.deleteLegacyTemplate(legacyTemplateName);
+      await deleteAlias(indexName, aliasName);
+      await deleteIndex(indexName);
+      await deleteDataStream(dataStreamName);
+      await deleteIndexTemplate(indexTemplateName);
+      await deleteComponentTemplate(componentTemplateName);
+      await deleteLegacyTemplate(legacyTemplateName);
     });
 
     it('should not succeed if no settings are provided in query params', async () => {

test/api_integration/apis/console/helpers.ts

@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { FtrProviderContext } from './ftr_provider_context';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
-export function ConsoleProvider({ getService }: FtrProviderContext) {
+export function helpers(getService: FtrProviderContext['getService']) {
   const client = getService('es');
 
   const createIndex = async (indexName: string) => {

test/api_integration/services/index.ts

@@ -6,13 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
+import { services as commonServices } from '../../common/services';
+
 import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
 
 export const services = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
+  ...commonServices,
   supertest: KibanaSupertestProvider,
   esSupertest: ElasticsearchSupertestProvider,
 };

test/common/config.js

@@ -9,6 +9,7 @@
 import path from 'path';
 import { format as formatUrl } from 'url';
 import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test';
+import { services } from './services';
 
 export default function () {
   const servers = {
@@ -84,5 +85,6 @@ export default function () {
         })}`,
       ],
     },
+    services,
   };
 }

test/common/ftr_provider_context.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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { GenericFtrProviderContext, GenericFtrService } from '@kbn/test';
+
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
+export class FtrService extends GenericFtrService<FtrProviderContext> {}

test/common/services/bsearch.ts

@@ -12,7 +12,7 @@ import type SuperTest from 'supertest';
 import type { IEsSearchResponse } from '@kbn/search-types';
 import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
 import { BFETCH_ROUTE_VERSION_LATEST } from '@kbn/bfetch-plugin/common';
-import { FtrService } from './ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 /**
  * Function copied from here:
@@ -62,7 +62,6 @@ export interface SendOptions {
  * });
  * expect(response).eql({ ... your value ... });
  */
-
 export class BsearchService extends FtrService {
   private readonly retry = this.ctx.getService('retry');
 

test/common/services/console.ts

@@ -0,0 +1,15 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { FtrProviderContext } from '../ftr_provider_context';
+import { helpers } from '../../api_integration/apis/console/helpers';
+export function ConsoleProvider({ getService }: FtrProviderContext) {
+  return {
+    helpers: helpers(getService),
+  };
+}

test/common/services/deployment.ts

@@ -11,7 +11,7 @@ import { Agent } from 'https';
 import fetch from 'node-fetch';
 import { getUrl } from '@kbn/test';
 
-import { FtrService } from './ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 export class DeploymentService extends FtrService {
   private readonly config = this.ctx.getService('config');

test/common/services/es_delete_all_indices.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from './ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export function EsDeleteAllIndicesProvider({ getService }: FtrProviderContext) {
   const log = getService('log');

test/common/services/index.ts

@@ -7,26 +7,17 @@
  */
 
 import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
+import { DeploymentService } from './deployment';
+import { RandomnessService } from './randomness';
+import { SecurityServiceProvider } from './security';
+import { EsDeleteAllIndicesProvider } from './es_delete_all_indices';
+import { SavedObjectInfoService } from './saved_object_info';
+import { IndexPatternsService } from './index_patterns';
+import { BsearchService } from './bsearch';
+import { ConsoleProvider } from './console';
 
 // pick only services that work for any FTR config, e.g. 'samlAuth' requires SAML setup in config file
-const {
-  es,
-  esArchiver,
-  kibanaServer,
-  retry,
-  supertestWithoutAuth,
-  deployment,
-  randomness,
-  esDeleteAllIndices,
-  savedObjectInfo,
-  indexPatterns,
-  bsearch,
-  console,
-} = commonFunctionalServices;
-
-// pick what was there previously
-const { security } = commonFunctionalUIServices;
+const { es, esArchiver, kibanaServer, retry, supertestWithoutAuth } = commonFunctionalServices;
 
 export const services = {
   es,
@@ -34,12 +25,12 @@ export const services = {
   kibanaServer,
   retry,
   supertestWithoutAuth,
-  deployment,
-  randomness,
-  security,
-  esDeleteAllIndices,
-  savedObjectInfo,
-  indexPatterns,
-  bsearch,
-  console,
+  deployment: DeploymentService,
+  randomness: RandomnessService,
+  security: SecurityServiceProvider,
+  esDeleteAllIndices: EsDeleteAllIndicesProvider,
+  savedObjectInfo: SavedObjectInfoService,
+  indexPatterns: IndexPatternsService,
+  bsearch: BsearchService,
+  console: ConsoleProvider,
 };

test/common/services/index_patterns.ts

@@ -6,11 +6,10 @@
  * Side Public License, v 1.
  */
 
-import type { DataViewSpec } from '@kbn/data-plugin/common';
-
-import { INITIAL_REST_VERSION } from '@kbn/data-views-plugin/server/constants';
 import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
-import { FtrService } from './ftr_provider_context';
+import { INITIAL_REST_VERSION } from '@kbn/data-views-plugin/server/constants';
+import { DataViewSpec } from '@kbn/data-plugin/common';
+import { FtrService } from '../ftr_provider_context';
 
 export class IndexPatternsService extends FtrService {
   private readonly kibanaServer = this.ctx.getService('kibanaServer');

test/common/services/randomness.ts

@@ -9,7 +9,7 @@
 import Chance from 'chance';
 import { ToolingLog } from '@kbn/tooling-log';
 
-import { FtrService } from './ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 let __CACHED_SEED__: number | undefined;
 function getSeed(log: ToolingLog) {

test/common/services/saved_object_info/saved_object_info.ts

@@ -13,7 +13,7 @@ import { flow, pipe } from 'fp-ts/function';
 import * as TE from 'fp-ts/lib/TaskEither';
 import * as T from 'fp-ts/lib/Task';
 import { ToolingLog } from '@kbn/tooling-log';
-import { FtrService } from '../ftr_provider_context';
+import { FtrService } from '../../ftr_provider_context';
 import { print } from './utils';
 
 const pluck =

test/common/services/security/index.ts

@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { SecurityService, SecurityServiceProvider } from './security';
+export { SecurityServiceProvider } from './security';

test/common/services/security/security.ts

@@ -9,7 +9,7 @@
 import { Role } from './role';
 import { User } from './user';
 import { RoleMappings } from './role_mappings';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrProviderContext } from '../../ftr_provider_context';
 import { createTestUserService, TestUserSupertestProvider, TestUser } from './test_user';
 import { createSystemIndicesUser } from './system_indices_user';
 

test/common/services/security/system_indices_user.ts

@@ -13,7 +13,7 @@ import {
   createEsClientForFtrConfig,
   createRemoteEsClientForFtrConfig,
 } from '@kbn/test';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 const SYSTEM_INDICES_SUPERUSER_ROLE = 'system_indices_superuser';
 

test/common/services/security/test_user.ts

@@ -9,11 +9,10 @@
 import { format as formatUrl } from 'url';
 import supertest from 'supertest';
 
-import type { Browser } from '../browser';
-import type { TestSubjects } from '../test_subjects';
+import { type Browser, TestSubjects } from '@kbn/ftr-common-functional-ui-services';
 import { Role } from './role';
 import { User } from './user';
-import { FtrService, FtrProviderContext } from '../ftr_provider_context';
+import { FtrService, FtrProviderContext } from '../../ftr_provider_context';
 
 const TEST_USER_NAME = 'test_user';
 const TEST_USER_PASSWORD = 'changeme';

test/functional/apps/discover/ftr_provider_context.d.ts

@@ -7,13 +7,7 @@
  */
 
 import { GenericFtrProviderContext } from '@kbn/test';
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { services as functionalServces } from '../../services';
+import { services } from '../../services';
 import { pageObjects } from '../../page_objects';
 
-const services = {
-  ...functionalServces,
-  ...commonFunctionalServices,
-};
-
 export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;

test/functional/services/index.ts

@@ -7,7 +7,7 @@
  */
 
 import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
+import { services as commonServiceProviders } from '../../common/services';
 
 import { AppsMenuService } from './apps_menu';
 import {
@@ -57,7 +57,7 @@ import { ESQLService } from './esql';
 import { DataViewsService } from './data_views';
 
 export const services = {
-  ...commonFunctionalServices,
+  ...commonServiceProviders,
   ...commonFunctionalUIServices,
   filterBar: FilterBarService,
   queryBar: QueryBarService,

test/health_gateway/services/index.ts

@@ -6,13 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
+import { services as commonServices } from '../../common/services';
 
 import { HealthGatewayService } from './health_gateway';
 
 export const services = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
+  ...commonServices,
   healthGateway: HealthGatewayService,
 };

test/server_integration/config.base.js

@@ -12,15 +12,13 @@ import {
   ElasticsearchSupertestProvider,
 } from './services';
 
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-
 export default async function ({ readConfigFile }) {
   const commonConfig = await readConfigFile(require.resolve('../common/config'));
   const functionalConfig = await readConfigFile(require.resolve('../functional/config.base.js'));
 
   return {
     services: {
-      ...commonFunctionalServices,
+      ...commonConfig.get('services'),
       supertest: createKibanaSupertestProvider(),
       supertestWithoutAuth: KibanaSupertestWithoutAuthProvider,
       esSupertest: ElasticsearchSupertestProvider,

test/server_integration/services/types.d.ts

@@ -7,14 +7,7 @@
  */
 
 import { GenericFtrProviderContext } from '@kbn/test';
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
-
-export const kibanaCommonServices = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
-} as const;
-
+import { services as kibanaCommonServices } from '../../common/services';
 import { services as kibanaApiIntegrationServices } from '../../api_integration/services';
 
 export type FtrProviderContext = GenericFtrProviderContext<

test/tsconfig.json

@@ -47,6 +47,8 @@
     "@kbn/controls-plugin",
     "@kbn/field-formats-plugin",
     "@kbn/axe-config",
+    "@kbn/dev-cli-runner",
+    "@kbn/dev-cli-errors",
     "@kbn/data-view-field-editor-plugin",
     "@kbn/data-views-plugin",
     "@kbn/guided-onboarding-plugin",
@@ -69,6 +71,7 @@
     "@kbn/links-plugin",
     "@kbn/ftr-common-functional-ui-services",
     "@kbn/monaco",
+    "@kbn/search-types",
     "@kbn/console-plugin",
     "@kbn/core-chrome-browser",
     "@kbn/default-nav-ml",

x-pack/test/api_integration/apis/cloud_security_posture/helper.ts

@@ -11,7 +11,7 @@ import expect from '@kbn/expect';
 import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
 import type { IndexDetails } from '@kbn/cloud-security-posture-common';
 import { CLOUD_SECURITY_PLUGIN_VERSION } from '@kbn/cloud-security-posture-plugin/common/constants';
-import { SecurityService } from '@kbn/ftr-common-functional-ui-services';
+import { SecurityService } from '@kbn/test-suites-src/common/services/security/security';
 
 export interface RoleCredentials {
   apiKey: { id: string; name: string };

x-pack/test/api_integration/apis/telemetry/telemetry.ts

@@ -26,7 +26,7 @@ import {
   ELASTIC_HTTP_VERSION_HEADER,
   X_ELASTIC_INTERNAL_ORIGIN_REQUEST,
 } from '@kbn/core-http-common';
-import type { SecurityService } from '@kbn/ftr-common-functional-ui-services';
+import type { SecurityService } from '@kbn/test-suites-src/common/services/security/security';
 import basicClusterFixture from './fixtures/basiccluster.json';
 import multiClusterFixture from './fixtures/multicluster.json';
 import type { FtrProviderContext } from '../../ftr_provider_context';

x-pack/test/common/services/bsearch_secure.ts

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-// NOTE: This is pretty much a copy/paste from packages/kbn-ftr-common-functional-services/services/bsearch.ts
-// but with the ability to provide custom auth
+// NOTE: This is pretty much a copy/paste from test/common/services/bsearch.ts but with the ability
+// to provide custom auth
 
 import expect from '@kbn/expect';
 import request from 'superagent';

x-pack/test/common/services/index.ts

@@ -6,8 +6,7 @@
  */
 
 import { services as kibanaApiIntegrationServices } from '@kbn/test-suites-src/api_integration/services';
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
+import { services as kibanaCommonServices } from '@kbn/test-suites-src/common/services';
 import { InfraLogViewsServiceProvider } from './infra_log_views';
 import { SpacesServiceProvider } from './spaces';
 import { BsearchSecureService } from './bsearch_secure';
@@ -15,8 +14,7 @@ import { ApmSynthtraceKibanaClientProvider } from './apm_synthtrace_kibana_clien
 import { InfraSynthtraceKibanaClientProvider } from './infra_synthtrace_kibana_client';
 
 export const services = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
+  ...kibanaCommonServices,
   infraLogViews: InfraLogViewsServiceProvider,
   supertest: kibanaApiIntegrationServices.supertest,
   spaces: SpacesServiceProvider,

x-pack/test/fleet_api_integration/apis/test_users.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SecurityService } from '@kbn/ftr-common-functional-ui-services';
+import type { SecurityService } from '@kbn/test-suites-src/common/services/security/security';
 
 export const testUsers: {
   [rollName: string]: { username: string; password: string; permissions?: any };

x-pack/test/fleet_cypress/services.ts

@@ -4,10 +4,5 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
 
-export const services = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
-} as const;
+export * from '@kbn/test-suites-src/common/services';

x-pack/test/osquery_cypress/services.ts

@@ -5,10 +5,4 @@
  * 2.0.
  */
 
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-import { commonFunctionalUIServices } from '@kbn/ftr-common-functional-ui-services';
-
-export const services = {
-  ...commonFunctionalServices,
-  ...commonFunctionalUIServices,
-} as const;
+export * from '@kbn/test-suites-src/common/services';

x-pack/test/profiling_api_integration/common/create_profiling_users/helpers/create_or_update_user.ts

@@ -8,7 +8,7 @@
 /* eslint-disable no-console */
 
 import { difference, union } from 'lodash';
-import type { SecurityService } from '@kbn/ftr-common-functional-ui-services';
+import { SecurityService } from '@kbn/test-suites-src/common/services/security/security';
 import { Elasticsearch, Kibana } from '..';
 import { callKibana, isAxiosError } from './call_kibana';
 

x-pack/test/profiling_api_integration/common/create_profiling_users/index.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { asyncForEach } from '@kbn/std';
-import type { SecurityService } from '@kbn/ftr-common-functional-ui-services';
+import { SecurityService } from '@kbn/test-suites-src/common/services/security/security';
 import { ProfilingUsername, profilingUsers } from './authentication';
 import { AbortError, callKibana } from './helpers/call_kibana';
 import { createOrUpdateUser } from './helpers/create_or_update_user';

x-pack/test/saved_objects_field_count/config.ts

@@ -6,7 +6,6 @@
  */
 
 import { FtrConfigProviderContext } from '@kbn/test';
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const kibanaCommonTestsConfig = await readConfigFile(
@@ -16,10 +15,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...kibanaCommonTestsConfig.getAll(),
 
-    services: {
-      ...commonFunctionalServices,
-    },
-
     testFiles: [require.resolve('./test')],
 
     esTestCluster: {

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

@@ -9,7 +9,7 @@ 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 type { SendOptions } from '@kbn/ftr-common-functional-services';
+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';

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

@@ -9,7 +9,7 @@ import TestAgent from 'supertest/lib/agent';
 import type { IEsSearchResponse } from '@kbn/search-types';
 
 import type { BsearchSecureService } from '@kbn/test-suites-serverless/shared/services/bsearch_secure';
-import type { BsearchService, SendOptions } from '@kbn/ftr-common-functional-services';
+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>;

x-pack/test/security_solution_api_integration/test_suites/entity_analytics/utils/users_and_roles.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { SecurityService } from '@kbn/ftr-common-functional-ui-services';
+import { SecurityService } from '@kbn/test-suites-src/common/services/security/security';
 
 export const usersAndRolesFactory = (security: SecurityService) => ({
   createRole: async ({ name, privileges }: { name: string; privileges: any }) => {

x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/tests/host_details.ts

@@ -11,7 +11,7 @@ import {
   HostsQueries,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 import { hostDetailsFilebeatExpectedResult } from '../mocks/host_details';
 

x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/tests/hosts.ts

@@ -16,7 +16,7 @@ import {
   FirstLastSeenStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 

x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/tests/uncommon_processes.ts

@@ -12,7 +12,7 @@ import {
   HostsUncommonProcessesStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 
 const FROM = '2000-01-01T00:00:00.000Z';

x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_details.ts

@@ -11,7 +11,7 @@ import {
   NetworkQueries,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 

x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_dns.ts

@@ -14,7 +14,7 @@ import {
   NetworkDnsStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 
 export default function ({ getService }: FtrProviderContextWithSpaces) {

x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/network_top_n_flow.ts

@@ -15,7 +15,7 @@ import {
   NetworkTopNFlowStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 

x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/tests/tls.ts

@@ -14,8 +14,7 @@ import {
   NetworkTlsStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 

x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/tests/overview_host.ts

@@ -12,7 +12,7 @@ import {
   HostsOverviewStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 
 export default function ({ getService }: FtrProviderContextWithSpaces) {

x-pack/test/security_solution_api_integration/test_suites/explore/overview/trial_license_complete_tier/tests/overview_network.ts

@@ -11,7 +11,7 @@ import {
   NetworkQueries,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 
 export default function ({ getService }: FtrProviderContextWithSpaces) {

x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/tests/authentications.ts

@@ -15,7 +15,7 @@ import {
 import type { UserAuthenticationsRequestOptions } from '@kbn/security-solution-plugin/common/api/search_strategy';
 import TestAgent from 'supertest/lib/agent';
 
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 
 const FROM = '2000-01-01T00:00:00.000Z';

x-pack/test/security_solution_api_integration/test_suites/explore/users/trial_license_complete_tier/tests/users.ts

@@ -14,8 +14,7 @@ import {
   NetworkUsersStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 

x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/tests/events.ts

@@ -14,9 +14,8 @@ import {
   TimelineEventsAllStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
-
 import { getFieldsToRequest, getFilterValue } from '../../../../utils';
 
 const TO = '3000-01-01T00:00:00.000Z';

x-pack/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/tests/timeline_details.ts

@@ -13,8 +13,7 @@ import {
   TimelineKpiStrategyResponse,
 } from '@kbn/security-solution-plugin/common/search_strategy';
 import TestAgent from 'supertest/lib/agent';
-
-import { BsearchService } from '@kbn/ftr-common-functional-services';
+import { BsearchService } from '@kbn/test-suites-src/common/services/bsearch';
 import { FtrProviderContextWithSpaces } from '../../../../../ftr_provider_context_with_spaces';
 import { timelineDetailsFilebeatExpectedResults as EXPECTED_DATA } from '../mocks/timeline_details';
 

x-pack/test/security_solution_api_integration/tsconfig.json

@@ -49,6 +49,6 @@
     "@kbn/dev-cli-runner",
     "@kbn/search-types",
     "@kbn/security-plugin",
-    "@kbn/ftr-common-functional-ui-services",
+    "@kbn/test-suites-src",
   ]
 }

x-pack/test/threat_intelligence_cypress/config.ts

@@ -6,8 +6,9 @@
  */
 
 import { FtrConfigProviderContext } from '@kbn/test';
+
 import { CA_CERT_PATH } from '@kbn/dev-utils';
-import { services } from './services';
+
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const kibanaCommonTestsConfig = await readConfigFile(
     require.resolve('@kbn/test-suites-src/common/config')
@@ -19,8 +20,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...kibanaCommonTestsConfig.getAll(),
 
-    services,
-
     esTestCluster: {
       ...xpackFunctionalTestsConfig.get('esTestCluster'),
       serverArgs: [

x-pack/test/upgrade_assistant_integration/config.js

@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
-
 export default async function ({ readConfigFile }) {
   // Read the Kibana API integration tests config file so that we can utilize its services.
   const kibanaAPITestsConfig = await readConfigFile(
@@ -15,12 +13,15 @@ export default async function ({ readConfigFile }) {
   const xPackFunctionalTestsConfig = await readConfigFile(
     require.resolve('../functional/config.base.js')
   );
+  const kibanaCommonConfig = await readConfigFile(
+    require.resolve('@kbn/test-suites-src/common/config')
+  );
 
   return {
     testFiles: [require.resolve('./upgrade_assistant')],
     servers: xPackFunctionalTestsConfig.get('servers'),
     services: {
-      ...commonFunctionalServices,
+      ...kibanaCommonConfig.get('services'),
       supertest: kibanaAPITestsConfig.get('services.supertest'),
     },
     junit: {

x-pack/test_serverless/api_integration/test_suites/common/console/autocomplete_entities.ts

@@ -11,7 +11,7 @@ import { InternalRequestHeader, RoleCredentials } from '../../../../shared/servi
 
 export default ({ getService }: FtrProviderContext) => {
   const svlCommonApi = getService('svlCommonApi');
-  const console = getService('console');
+  const consoleService = getService('console');
 
   const svlUserManager = getService('svlUserManager');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
@@ -27,6 +27,17 @@ export default ({ getService }: FtrProviderContext) => {
   };
 
   describe('/api/console/autocomplete_entities', function () {
+    let createIndex: (typeof consoleService)['helpers']['createIndex'];
+    let createAlias: (typeof consoleService)['helpers']['createAlias'];
+    let createIndexTemplate: (typeof consoleService)['helpers']['createIndexTemplate'];
+    let createComponentTemplate: (typeof consoleService)['helpers']['createComponentTemplate'];
+    let createDataStream: (typeof consoleService)['helpers']['createDataStream'];
+    let deleteIndex: (typeof consoleService)['helpers']['deleteIndex'];
+    let deleteAlias: (typeof consoleService)['helpers']['deleteAlias'];
+    let deleteIndexTemplate: (typeof consoleService)['helpers']['deleteIndexTemplate'];
+    let deleteComponentTemplate: (typeof consoleService)['helpers']['deleteComponentTemplate'];
+    let deleteDataStream: (typeof consoleService)['helpers']['deleteDataStream'];
+
     const indexName = 'test-index-1';
     const aliasName = 'test-alias-1';
     const indexTemplateName = 'test-index-template-1';
@@ -36,26 +47,36 @@ export default ({ getService }: FtrProviderContext) => {
     before(async () => {
       roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
       internalRequestHeader = svlCommonApi.getInternalRequestHeader();
+      ({
+        helpers: {
+          createIndex,
+          createAlias,
+          createIndexTemplate,
+          createComponentTemplate,
+          createDataStream,
+          deleteIndex,
+          deleteAlias,
+          deleteIndexTemplate,
+          deleteComponentTemplate,
+          deleteDataStream,
+        },
+      } = consoleService);
 
       // Setup indices, aliases, templates, and data streams
-      await console.createIndex(indexName);
-      await console.createAlias(indexName, aliasName);
-      await console.createComponentTemplate(componentTemplateName);
-      await console.createIndexTemplate(
-        indexTemplateName,
-        [dataStreamName],
-        [componentTemplateName]
-      );
-      await console.createDataStream(dataStreamName);
+      await createIndex(indexName);
+      await createAlias(indexName, aliasName);
+      await createComponentTemplate(componentTemplateName);
+      await createIndexTemplate(indexTemplateName, [dataStreamName], [componentTemplateName]);
+      await createDataStream(dataStreamName);
     });
 
     after(async () => {
       // Cleanup indices, aliases, templates, and data streams
-      await console.deleteAlias(indexName, aliasName);
-      await console.deleteIndex(indexName);
-      await console.deleteDataStream(dataStreamName);
-      await console.deleteIndexTemplate(indexTemplateName);
-      await console.deleteComponentTemplate(componentTemplateName);
+      await deleteAlias(indexName, aliasName);
+      await deleteIndex(indexName);
+      await deleteDataStream(dataStreamName);
+      await deleteIndexTemplate(indexTemplateName);
+      await deleteComponentTemplate(componentTemplateName);
 
       await svlUserManager.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });

x-pack/test_serverless/shared/services/bsearch_secure.ts

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-// NOTE: This is pretty much a copy/paste from packages/kbn-ftr-common-functional-services/services/bsearch.ts
-// but with the ability to provide custom auth
+// NOTE: This is pretty much a copy/paste from test/common/services/bsearch.ts but with the ability
+// to provide custom auth
 
 import expect from '@kbn/expect';
 import { GenericFtrService } from '@kbn/test';