[8.16] [Security Solution] Removing cypress folder (#197273)

.buildkite/ftr_security_serverless_configs.yml

@@ -1,17 +1,17 @@
 disabled:
   # Base config files, only necessary to inform config finding script
-  - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
-  - x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.edr_workflows.ts
+  - x-pack/test/defend_workflows_cypress/serverless_config.base.ts
+  - x-pack/test/osquery_cypress/serverless_config.base.ts
 
   # Cypress configs, for now these are still run manually
   - x-pack/test/defend_workflows_cypress/serverless_config.ts
   - x-pack/test/osquery_cypress/serverless_cli_config.ts
-  - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
   - x-pack/test/security_solution_cypress/serverless_config.ts
 
+
   # Playwright
   - x-pack/test/security_solution_playwright/serverless_config.ts
 

.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml

@@ -18,3 +18,20 @@ steps:
       automatic:
         - exit_status: '-1'
           limit: 1
+
+  - command: .buildkite/scripts/steps/functional/defend_workflows_serverless.sh
+    label: 'Defend Workflows Cypress Tests on Serverless'
+    agents:
+      enableNestedVirtualization: true
+      localSsds: 1
+      localSsdInterface: nvme
+      machineType: n2-standard-4
+    depends_on:
+      - build
+      - quick_checks
+    timeout_in_minutes: 60
+    parallelism: 14
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 1

x-pack/plugins/osquery/cypress/cypress_base.config.ts

@@ -10,8 +10,8 @@ import path from 'path';
 import { safeLoad as loadYaml } from 'js-yaml';
 import { readFileSync } from 'fs';
 import type { YamlRoleDefinitions } from '@kbn/test-suites-serverless/shared/lib';
-import { setupUserDataLoader } from '@kbn/test-suites-serverless/functional/test_suites/security/cypress/support/setup_data_loader_tasks';
 import { samlAuthentication } from '@kbn/security-solution-plugin/public/management/cypress/support/saml_authentication';
+import { setupUserDataLoader } from './support/setup_data_loader_tasks';
 import { getFailedSpecVideos } from './support/filter_videos';
 
 const ROLES_YAML_FILE_PATH = path.join(

x-pack/plugins/osquery/cypress/support/e2e.ts

@@ -34,11 +34,16 @@ registerCypressGrep();
 import type { SecuritySolutionDescribeBlockFtrConfig } from '@kbn/security-solution-plugin/scripts/run_cypress/utils';
 import { login } from '@kbn/security-solution-plugin/public/management/cypress/tasks/login';
 
+import type { LoadedRoleAndUser } from '@kbn/test-suites-serverless/shared/lib';
 import type { ServerlessRoleName } from './roles';
 
 import { waitUntil } from '../tasks/wait_until';
 import { isCloudServerless, isServerless } from '../tasks/serverless';
 
+export interface LoadUserAndRoleCyTaskOptions {
+  name: ServerlessRoleName;
+}
+
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Cypress {
@@ -49,6 +54,12 @@ declare global {
     }
 
     interface Chainable {
+      task(
+        name: 'loadUserAndRole',
+        arg: LoadUserAndRoleCyTaskOptions,
+        options?: Partial<Loggable & Timeoutable>
+      ): Chainable<LoadedRoleAndUser>;
+
       getBySel(...args: Parameters<Cypress.Chainable['get']>): Chainable<JQuery<HTMLElement>>;
 
       getBySelContains(

x-pack/test_serverless/functional/test_suites/security/cypress/support/setup_data_loader_tasks.ts → x-pack/plugins/osquery/cypress/support/setup_data_loader_tasks.ts

@@ -6,12 +6,12 @@
  */
 
 import { createRuntimeServices } from '@kbn/security-solution-plugin/scripts/endpoint/common/stack_services';
-import { LoadUserAndRoleCyTaskOptions } from '../cypress';
-import {
+import { SecurityRoleAndUserLoader } from '@kbn/test-suites-serverless/shared/lib';
+import type {
   LoadedRoleAndUser,
-  SecurityRoleAndUserLoader,
   YamlRoleDefinitions,
-} from '../../../../../shared/lib';
+} from '@kbn/test-suites-serverless/shared/lib';
+import type { LoadUserAndRoleCyTaskOptions } from './e2e';
 
 interface AdditionalDefinitions {
   roleDefinitions?: YamlRoleDefinitions;
@@ -33,18 +33,15 @@ export const setupUserDataLoader = (
   });
 
   const roleAndUserLoaderPromise: Promise<SecurityRoleAndUserLoader> = stackServicesPromise.then(
-    ({ kbnClient, log }) => {
-      return new SecurityRoleAndUserLoader(kbnClient, log, roleDefinitions);
-    }
+    ({ kbnClient, log }) => new SecurityRoleAndUserLoader(kbnClient, log, roleDefinitions)
   );
 
   on('task', {
     /**
      * Loads a user/role into Kibana. Used from `login()` task.
      * @param name
      */
-    loadUserAndRole: async ({ name }: LoadUserAndRoleCyTaskOptions): Promise<LoadedRoleAndUser> => {
-      return (await roleAndUserLoaderPromise).load(name, additionalRoleName);
-    },
+    loadUserAndRole: async ({ name }: LoadUserAndRoleCyTaskOptions): Promise<LoadedRoleAndUser> =>
+      (await roleAndUserLoaderPromise).load(name, additionalRoleName),
   });
 };

x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts → x-pack/test/defend_workflows_cypress/serverless_config.base.ts

@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const svlSharedConfig = await readConfigFile(
-    require.resolve('../../../../shared/config.base.ts')
+    require.resolve('@kbn/test-suites-serverless/shared/config.base')
   );
 
   return {

x-pack/test/defend_workflows_cypress/serverless_config.ts

@@ -14,9 +14,7 @@ import { DefendWorkflowsCypressCliTestRunner } from './runner';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const defendWorkflowsCypressConfig = await readConfigFile(
-    require.resolve(
-      '@kbn/test-suites-serverless/functional/test_suites/security/cypress/security_config.base'
-    )
+    require.resolve('./serverless_config.base.ts')
   );
   const config = defendWorkflowsCypressConfig.getAll();
   const hostIp = getLocalhostRealIp();

x-pack/test/osquery_cypress/serverless_cli_config.ts

@@ -12,9 +12,7 @@ import { startOsqueryCypress } from './runner';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const securitySolutionCypressConfig = await readConfigFile(
-    require.resolve(
-      '@kbn/test-suites-serverless/functional/test_suites/security/cypress/security_config.base'
-    )
+    require.resolve('./serverless_config.base.ts')
   );
 
   return {

x-pack/test/osquery_cypress/serverless_config.base.ts

@@ -0,0 +1,35 @@
+/*
+ * 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 { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const svlSharedConfig = await readConfigFile(
+    require.resolve('@kbn/test-suites-serverless/shared/config.base')
+  );
+
+  return {
+    ...svlSharedConfig.getAll(),
+    esTestCluster: {
+      ...svlSharedConfig.get('esTestCluster'),
+      serverArgs: [
+        ...svlSharedConfig.get('esTestCluster.serverArgs'),
+        // define custom es server here
+        // API Keys is enabled at the top level
+      ],
+    },
+    kbnTestServer: {
+      ...svlSharedConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...svlSharedConfig.get('kbnTestServer.serverArgs'),
+        '--csp.strict=false',
+        '--csp.warnLegacyBrowsers=false',
+        '--serverless=security',
+      ],
+    },
+  };
+}