Skip to content

Commit

Permalink
[8.12] Reverts erroneous addition of security plugin enabled config o…
Browse files Browse the repository at this point in the history
…ption (#175565) (#175692)

# Backport

This will backport the following commits from `main` to `8.12`:
- [Reverts erroneous addition of security plugin enabled config option
(#175565)](#175565)

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

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

<!--BACKPORT [{"author":{"name":"Jeramy
Soucy","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-01-26T15:16:03Z","message":"Reverts
erroneous addition of security plugin enabled config option
(#175565)\n\n## Summary\r\n\r\nIn #155582, an `enabled` option was added
to the `Security` plugin. This\r\noption is not supported or documented.
This PR reverts that
change.","sha":"4385dc157bccc42cf8a61801db582c41b6e9b297","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Security","release_note:skip","backport:prev-minor","v8.13.0"],"title":"Reverts
erroneous addition of security plugin enabled config
option","number":175565,"url":"https://github.com/elastic/kibana/pull/175565","mergeCommit":{"message":"Reverts
erroneous addition of security plugin enabled config option
(#175565)\n\n## Summary\r\n\r\nIn #155582, an `enabled` option was added
to the `Security` plugin. This\r\noption is not supported or documented.
This PR reverts that
change.","sha":"4385dc157bccc42cf8a61801db582c41b6e9b297"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","branchLabelMappingKey":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/175565","number":175565,"mergeCommit":{"message":"Reverts
erroneous addition of security plugin enabled config option
(#175565)\n\n## Summary\r\n\r\nIn #155582, an `enabled` option was added
to the `Security` plugin. This\r\noption is not supported or documented.
This PR reverts that
change.","sha":"4385dc157bccc42cf8a61801db582c41b6e9b297"}}]}]
BACKPORT-->

Co-authored-by: Jeramy Soucy <[email protected]>
  • Loading branch information
kibanamachine and jeramysoucy authored Jan 26, 2024
1 parent 9419256 commit 5535353
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
4 changes: 0 additions & 4 deletions x-pack/plugins/security/server/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ describe('config schema', () => {
"selector": Object {},
},
"cookieName": "sid",
"enabled": true,
"encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"loginAssistanceMessage": "",
"public": Object {},
Expand Down Expand Up @@ -115,7 +114,6 @@ describe('config schema', () => {
"selector": Object {},
},
"cookieName": "sid",
"enabled": true,
"encryptionKey": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"loginAssistanceMessage": "",
"public": Object {},
Expand Down Expand Up @@ -170,7 +168,6 @@ describe('config schema', () => {
"selector": Object {},
},
"cookieName": "sid",
"enabled": true,
"loginAssistanceMessage": "",
"public": Object {},
"secureCookies": false,
Expand Down Expand Up @@ -227,7 +224,6 @@ describe('config schema', () => {
"selector": Object {},
},
"cookieName": "sid",
"enabled": true,
"loginAssistanceMessage": "",
"public": Object {},
"secureCookies": false,
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/security/server/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ export const ConfigSchema = schema.object({
)
),
}),
enabled: schema.boolean({ defaultValue: true }),

// Setting only allowed in the Serverless offering
ui: offeringBasedSchema({
Expand Down

0 comments on commit 5535353

Please sign in to comment.