-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
> [!Warning] > `.github/CODEOWNERS` and `.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml` were updated as part of merge conflicts so would need a thorough review. # Backport This will backport the following commits from `main` to `8.16`: - [[Security Solution] Removing cypress folder (#197273)](#197273) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Gloria Hornero","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-24T15:26:33Z","message":"[Security Solution] Removing cypress folder (#197273)\n\n## Summary\r\n\r\nDeleting the Cypress folder that was added in `test_serverless` as a\r\nPOC.\r\n\r\nCurrently is not used and this can create misunderstandings regarding\r\nownership of it.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"86e6c74f7c39a512eaa43cc025434dc6a53d55f6","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport missing","v9.0.0","Team: SecuritySolution","v8.16.0","backport:version","v8.17.0"],"number":197273,"url":"https://github.com/elastic/kibana/pull/197273","mergeCommit":{"message":"[Security Solution] Removing cypress folder (#197273)\n\n## Summary\r\n\r\nDeleting the Cypress folder that was added in `test_serverless` as a\r\nPOC.\r\n\r\nCurrently is not used and this can create misunderstandings regarding\r\nownership of it.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"86e6c74f7c39a512eaa43cc025434dc6a53d55f6"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197273","number":197273,"mergeCommit":{"message":"[Security Solution] Removing cypress folder (#197273)\n\n## Summary\r\n\r\nDeleting the Cypress folder that was added in `test_serverless` as a\r\nPOC.\r\n\r\nCurrently is not used and this can create misunderstandings regarding\r\nownership of it.\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <[email protected]>","sha":"86e6c74f7c39a512eaa43cc025434dc6a53d55f6"}},{"branch":"8.16","label":"v8.16.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","labelRegex":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Gloria Hornero <[email protected]> Co-authored-by: kibanamachine <[email protected]>
- Loading branch information
1 parent
af3ddd0
commit 5d1e095
Showing
30 changed files
with
2,094 additions
and
723 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
.buildkite/scripts/steps/functional/security_serverless_defend_workflows.sh
This file was deleted.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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', | ||
], | ||
}, | ||
}; | ||
} |
13 changes: 0 additions & 13 deletions
13
x-pack/test_serverless/functional/test_suites/security/cypress/.eslintrc.json
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
x-pack/test_serverless/functional/test_suites/security/cypress/.gitignore
This file was deleted.
Oops, something went wrong.
65 changes: 0 additions & 65 deletions
65
x-pack/test_serverless/functional/test_suites/security/cypress/README.md
This file was deleted.
Oops, something went wrong.
40 changes: 0 additions & 40 deletions
40
x-pack/test_serverless/functional/test_suites/security/cypress/cypress.config.ts
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.