diff --git a/.buildkite/ftr_platform_stateful_configs.yml b/.buildkite/ftr_platform_stateful_configs.yml index 314baaab3298..b2af62af2097 100644 --- a/.buildkite/ftr_platform_stateful_configs.yml +++ b/.buildkite/ftr_platform_stateful_configs.yml @@ -154,7 +154,6 @@ enabled: - x-pack/platform/test/alerting_api_integration/spaces_only/tests/alerting/group4/config_with_schedule_circuit_breaker.ts - x-pack/platform/test/alerting_api_integration/spaces_only/tests/actions/config.ts - x-pack/platform/test/alerting_api_integration/spaces_only/tests/action_task_params/config.ts - - x-pack/test/api_integration_basic/config.ts - x-pack/test/api_integration/apis/cases/config.ts - x-pack/test/api_integration/apis/security/config.ts - x-pack/test/banners_functional/config.ts diff --git a/.buildkite/ftr_security_serverless_configs.yml b/.buildkite/ftr_security_serverless_configs.yml index 3ba2225f5763..ea80f5af9b47 100644 --- a/.buildkite/ftr_security_serverless_configs.yml +++ b/.buildkite/ftr_security_serverless_configs.yml @@ -4,11 +4,11 @@ disabled: - 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/security_solution_api_integration/config/serverless/config.base.ai4dsoc.ts - - x-pack/test/defend_workflows_cypress/serverless_config.base.ts + - x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.base.ts - x-pack/solutions/security/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/solutions/security/test/defend_workflows_cypress/serverless_config.ts - x-pack/solutions/security/test/osquery_cypress/serverless_cli_config.ts - x-pack/test/security_solution_cypress/serverless_config.ts - x-pack/test/security_solution_cypress/ai4dsoc_serverless_config.ts diff --git a/.buildkite/ftr_security_stateful_configs.yml b/.buildkite/ftr_security_stateful_configs.yml index 6e26b5022bc3..bc34f6c74d78 100644 --- a/.buildkite/ftr_security_stateful_configs.yml +++ b/.buildkite/ftr_security_stateful_configs.yml @@ -15,8 +15,8 @@ disabled: - x-pack/solutions/security/test/cloud_security_posture_functional/config.cloud.ts # Cypress configs, for now these are still run manually - - x-pack/test/defend_workflows_cypress/cli_config.ts - - x-pack/test/defend_workflows_cypress/config.ts + - x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts + - x-pack/solutions/security/test/defend_workflows_cypress/config.ts - x-pack/solutions/security/test/osquery_cypress/cli_config.ts - x-pack/solutions/security/test/osquery_cypress/config.ts - x-pack/solutions/security/test/osquery_cypress/visual_config.ts @@ -125,3 +125,4 @@ enabled: - x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/config_non_dedicated_task_runner.ts - x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial.ts - x-pack/solutions/security/test/cases_api_integration/security_and_spaces/config_trial_common.ts + - x-pack/solutions/security/test/api_integration_basic/config.ts diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index d5a4efb29e72..cd69ace6994e 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -224,7 +224,7 @@ const getPipeline = (filename: string, removeSteps = true) => { /^src\/platform\/packages\/shared\/kbn-securitysolution-.*/, /^x-pack\/solutions\/security\/packages\/kbn-securitysolution-.*/, /^x-pack\/solutions\/security\/plugins\/security_solution/, - /^x-pack\/test\/defend_workflows_cypress/, + /^x-pack\/solutions\/security\/test\/defend_workflows_cypress/, /^x-pack\/test\/security_solution_cypress/, /^fleet_packages\.json/, ])) || diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6d8a245285cf..d80b861f320e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1760,9 +1760,6 @@ x-pack/platform/plugins/shared/ml/server/models/data_recognizer/modules/security /x-pack/test/common/services/index.ts @elastic/appex-qa /x-pack/test/common/services/bsearch_secure.ts @elastic/appex-qa /x-pack/test/common/ftr_provider_context.ts @elastic/appex-qa -/x-pack/test/api_integration_basic/ftr_provider_context.d.ts @elastic/appex-qa -/x-pack/test/api_integration_basic/config.ts @elastic/appex-qa -/x-pack/test/api_integration_basic/apis/index.ts @elastic/appex-qa /x-pack/test/api_integration/services/index.ts @elastic/appex-qa /x-pack/test/api_integration/services/es_supertest_without_auth.js @elastic/appex-qa /x-pack/test/api_integration/config.ts @elastic/appex-qa @@ -2115,8 +2112,8 @@ x-pack/platform/plugins/private/cloud_integrations/cloud_full_story/server/confi /x-pack/test/functional_with_es_ssl/lib/object_remover.ts @elastic/response-ops /x-pack/test/stack_functional_integration/apps/alerts @elastic/response-ops /x-pack/test/functional/services/actions @elastic/response-ops -/x-pack/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops -/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops +/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops @elastic/kibana-cases +/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops @elastic/kibana-cases /x-pack/test/upgrade/services/rules_upgrade_services.ts @elastic/response-ops /x-pack/test/upgrade/apps/rules @elastic/response-ops /x-pack/test/examples/triggers_actions_ui_examples @elastic/response-ops # Assigned per https://github.com/elastic/kibana/blob/main/x-pack/examples/triggers_actions_ui_example/kibana.jsonc#L4 @@ -2540,6 +2537,7 @@ x-pack/test/security_solution_api_integration/test_suites/investigations @elasti /x-pack/platform/plugins/shared/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/server/connector_types/sentinelone @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/common/sentinelone @elastic/security-defend-workflows +/x-pack/solutions/security/test/api_integration_basic @elastic/security-defend-workflows /x-pack/solutions/security/test/alerting_api_integration/security_and_spaces @elastic/security-defend-workflows /x-pack/solutions/security/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/sentinelone.ts @elastic/security-defend-workflows /x-pack/platform/plugins/shared/stack_connectors/server/connector_types/crowdstrike @elastic/security-defend-workflows @@ -2637,7 +2635,7 @@ x-pack/test/security_solution_api_integration/test_suites/investigations @elasti /x-pack/solutions/security/plugins/security_solution/public/common/components/threat_match @elastic/security-detection-engine ## Security Solution sub teams - security-defend-workflows -/x-pack/test/defend_workflows_cypress @elastic/security-defend-workflows +/x-pack/solutions/security/test/defend_workflows_cypress @elastic/security-defend-workflows /x-pack/platform/test/api_integration/apis/osquery @elastic/security-defend-workflows /x-pack/solutions/security/plugins/security_solution/public/management/ @elastic/security-defend-workflows /x-pack/solutions/security/plugins/security_solution/public/common/lib/endpoint/ @elastic/security-defend-workflows diff --git a/x-pack/solutions/security/plugins/security_solution/package.json b/x-pack/solutions/security/plugins/security_solution/package.json index 719311d0fc88..b2817651dc6d 100644 --- a/x-pack/solutions/security/plugins/security_solution/package.json +++ b/x-pack/solutions/security/plugins/security_solution/package.json @@ -10,10 +10,10 @@ "cypress": "../../../../../node_modules/.bin/cypress", "cypress:burn": "yarn cypress:dw run --env burn=2 --headed", "cypress:changed-specs-only": "yarn cypress:dw run --changed-specs-only --env burn=2", - "cypress:dw": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/cli_config", + "cypress:dw": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress.config.ts --ftr-config-file ../../../../solutions/security/test/defend_workflows_cypress/cli_config", "cypress:dw:open": "yarn cypress:dw open", "cypress:dw:run": "yarn cypress:dw run", - "cypress:dw:serverless": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress_serverless.config.ts --ftr-config-file ../../../../test/defend_workflows_cypress/serverless_config", + "cypress:dw:serverless": "node ./scripts/start_cypress_parallel --config-file plugins/security_solution/public/management/cypress/cypress_serverless.config.ts --ftr-config-file ../../../../solutions/security/test/defend_workflows_cypress/serverless_config", "cypress:dw:serverless:open": "yarn cypress:dw:serverless open", "cypress:dw:serverless:run": "yarn cypress:dw:serverless run", "cypress:dw:qa:serverless": "node ./scripts/start_cypress_parallel_serverless --config-file plugins/security_solution/public/management/cypress/cypress_serverless_qa.config.ts", diff --git a/x-pack/solutions/security/plugins/security_solution/public/management/cypress/README.md b/x-pack/solutions/security/plugins/security_solution/public/management/cypress/README.md index f6bac6d11618..63b47fb40187 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/management/cypress/README.md +++ b/x-pack/solutions/security/plugins/security_solution/public/management/cypress/README.md @@ -102,7 +102,7 @@ finished. This is the configuration used by CI. It uses the FTR to spawn both a Kibana instance (http://localhost:5620) and an Elasticsearch instance (http://localhost:9220) with a preloaded minimum set of data (see preceding "Test data" section), -and then executes cypress against this stack. You can find this configuration in `x-pack/test/defend_workflows_cypress` +and then executes cypress against this stack. You can find this configuration in `x-pack/solutions/security/test/defend_workflows_cypress` ### Test Execution: Examples diff --git a/x-pack/test/api_integration_basic/apis/index.ts b/x-pack/solutions/security/test/api_integration_basic/apis/index.ts similarity index 100% rename from x-pack/test/api_integration_basic/apis/index.ts rename to x-pack/solutions/security/test/api_integration_basic/apis/index.ts diff --git a/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts b/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts similarity index 100% rename from x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts rename to x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts diff --git a/x-pack/test/api_integration_basic/apis/security_solution/index.ts b/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts similarity index 87% rename from x-pack/test/api_integration_basic/apis/security_solution/index.ts rename to x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts index 90560c6c677d..312302241454 100644 --- a/x-pack/test/api_integration_basic/apis/security_solution/index.ts +++ b/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ loadTestFile }: FtrProviderContext) { - describe('SecuritySolution Endpoints basic licsense', () => { + describe('Security Solution Endpoints basic license', () => { loadTestFile(require.resolve('./cases_privileges')); }); } diff --git a/x-pack/test/api_integration_basic/config.ts b/x-pack/solutions/security/test/api_integration_basic/config.ts similarity index 100% rename from x-pack/test/api_integration_basic/config.ts rename to x-pack/solutions/security/test/api_integration_basic/config.ts diff --git a/x-pack/test/api_integration_basic/ftr_provider_context.d.ts b/x-pack/solutions/security/test/api_integration_basic/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/api_integration_basic/ftr_provider_context.d.ts rename to x-pack/solutions/security/test/api_integration_basic/ftr_provider_context.d.ts diff --git a/x-pack/test/defend_workflows_cypress/cli_config.ts b/x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts similarity index 100% rename from x-pack/test/defend_workflows_cypress/cli_config.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/cli_config.ts diff --git a/x-pack/test/defend_workflows_cypress/config.ts b/x-pack/solutions/security/test/defend_workflows_cypress/config.ts similarity index 95% rename from x-pack/test/defend_workflows_cypress/config.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/config.ts index a65cba195804..0d0af04ede89 100644 --- a/x-pack/test/defend_workflows_cypress/config.ts +++ b/x-pack/solutions/security/test/defend_workflows_cypress/config.ts @@ -15,7 +15,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) { require.resolve('@kbn/test-suites-src/common/config') ); const xpackFunctionalTestsConfig = await readConfigFile( - require.resolve('../functional/config.base.js') + require.resolve('@kbn/test-suites-xpack-platform/functional/config.base') ); const hostIp = getLocalhostRealIp(); diff --git a/x-pack/test/defend_workflows_cypress/ftr_provider_context.d.ts b/x-pack/solutions/security/test/defend_workflows_cypress/ftr_provider_context.d.ts similarity index 100% rename from x-pack/test/defend_workflows_cypress/ftr_provider_context.d.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/ftr_provider_context.d.ts diff --git a/x-pack/test/defend_workflows_cypress/runner.ts b/x-pack/solutions/security/test/defend_workflows_cypress/runner.ts similarity index 100% rename from x-pack/test/defend_workflows_cypress/runner.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/runner.ts diff --git a/x-pack/test/defend_workflows_cypress/serverless_config.base.ts b/x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.base.ts similarity index 100% rename from x-pack/test/defend_workflows_cypress/serverless_config.base.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.base.ts diff --git a/x-pack/test/defend_workflows_cypress/serverless_config.ts b/x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.ts similarity index 100% rename from x-pack/test/defend_workflows_cypress/serverless_config.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.ts diff --git a/x-pack/test/defend_workflows_cypress/services.ts b/x-pack/solutions/security/test/defend_workflows_cypress/services.ts similarity index 100% rename from x-pack/test/defend_workflows_cypress/services.ts rename to x-pack/solutions/security/test/defend_workflows_cypress/services.ts