From 41023254303657d70b8e6073219e372d8f7a646a Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Sun, 3 Nov 2024 07:42:47 +1100
Subject: [PATCH] [8.x] [EDR Workflows] Add missing services to Osquery Cypress
 (#197213) (#197272)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[EDR Workflows] Add missing services to Osquery Cypress
(#197213)](https://github.com/elastic/kibana/pull/197213)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"tomasz.ciecierski@elastic.co"},"sourceCommit":{"committedDate":"2024-10-22T15:05:14Z","message":"[EDR
Workflows] Add missing services to Osquery Cypress
(#197213)","sha":"a3ba90c025c5b443c7d5d3e234f6f0abd17ca569","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Defend
Workflows","v8.16.0","backport:version","v8.17.0"],"title":"[EDR
Workflows] Add missing services to Osquery
Cypress","number":197213,"url":"https://github.com/elastic/kibana/pull/197213","mergeCommit":{"message":"[EDR
Workflows] Add missing services to Osquery Cypress
(#197213)","sha":"a3ba90c025c5b443c7d5d3e234f6f0abd17ca569"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197213","number":197213,"mergeCommit":{"message":"[EDR
Workflows] Add missing services to Osquery Cypress
(#197213)","sha":"a3ba90c025c5b443c7d5d3e234f6f0abd17ca569"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Tomasz Ciecierski <tomasz.ciecierski@elastic.co>
---
 x-pack/test/osquery_cypress/cli_config.ts | 4 ++--
 x-pack/test/osquery_cypress/services.ts   | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/x-pack/test/osquery_cypress/cli_config.ts b/x-pack/test/osquery_cypress/cli_config.ts
index a61951e405960..711bbe266db9f 100644
--- a/x-pack/test/osquery_cypress/cli_config.ts
+++ b/x-pack/test/osquery_cypress/cli_config.ts
@@ -6,14 +6,14 @@
  */
 
 import { FtrConfigProviderContext } from '@kbn/test';
-
+import { services } from './services';
 import { startOsqueryCypress } from './runner';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const osqueryCypressConfig = await readConfigFile(require.resolve('./config.ts'));
   return {
     ...osqueryCypressConfig.getAll(),
-
+    services,
     testRunner: startOsqueryCypress,
   };
 }
diff --git a/x-pack/test/osquery_cypress/services.ts b/x-pack/test/osquery_cypress/services.ts
index 95fd493e6f668..272cf7eb8da4e 100644
--- a/x-pack/test/osquery_cypress/services.ts
+++ b/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';