-
Notifications
You must be signed in to change notification settings - Fork 25k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support "enterprise" license types #49474
Merged
tvernum
merged 3 commits into
elastic:7.x
from
tvernum:backport/7.x/49223-Support-enterprise-license-types
Dec 12, 2019
Merged
Support "enterprise" license types #49474
tvernum
merged 3 commits into
elastic:7.x
from
tvernum:backport/7.x/49223-Support-enterprise-license-types
Dec 12, 2019
Conversation
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 adds "enterprise" as an acceptable type for a license loaded through the PUT _license API. Internally an enterprise license is treated as having a "platinum" operating mode. The handling of License types was refactored to have a new explicit "LicenseType" enum in addition to the existing "OperatingMode" enum. Backport of: elastic#49223
Pinging @elastic/es-security (:Security/License) |
I will forward-port the new parameter (deprecated, and only accepting "true") to master along with a modified version of the new rest test. |
jkakavas
approved these changes
Nov 26, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@elasticmachine update branch |
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Dec 11, 2019
In 7.6 (elastic#49474) we added an "accept_enterprise" parameter to the GET _license endpoint. This commit adds the same parameter to 8.0, except that (a) it is deprecated (b) the only acceptable value is "true" This change also updates the license service to recognise 7.6 as a supported cluster version for the enterprise license type.
tvernum
added a commit
that referenced
this pull request
Dec 12, 2019
In 7.6 (#49474) we added an "accept_enterprise" parameter to the GET _license endpoint. This commit adds the same parameter to 8.0, except that (a) it is deprecated (b) the only acceptable value is "true" This change also updates the license service to recognise 7.6 as a supported cluster version for the enterprise license type.
SivagurunathanV
pushed a commit
to SivagurunathanV/elasticsearch
that referenced
this pull request
Jan 23, 2020
In 7.6 (elastic#49474) we added an "accept_enterprise" parameter to the GET _license endpoint. This commit adds the same parameter to 8.0, except that (a) it is deprecated (b) the only acceptable value is "true" This change also updates the license service to recognise 7.6 as a supported cluster version for the enterprise license type.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds "enterprise" as an acceptable type for a license loaded
through the PUT _license API.
Internally an enterprise license is treated as having a "platinum"
operating mode.
The handling of License types was refactored to have a new explicit
"LicenseType" enum in addition to the existing "OperatingMode" enum.
By default (in 7.x) the GET license API will return "platinum" when an
enterprise license is active in order to be compatible with existing
consumers of that API.
A new "accept_enterprise" flag has been introduced to allow clients to
opt-in to receive the correct "enterprise" type.
Backport of: #49223