Skip to content
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

Conversation

tvernum
Copy link
Contributor

@tvernum tvernum commented Nov 22, 2019

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

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
@tvernum tvernum added :Security/License License functionality for commercial features backport labels Nov 22, 2019
@tvernum tvernum requested a review from jkakavas November 22, 2019 03:57
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-security (:Security/License)

@tvernum
Copy link
Contributor Author

tvernum commented Nov 22, 2019

@jkakavas This is mostly a pure backport.
The 6ec22eb commit contains the new "accept_enterprise" parameter and the BWC layer for review.

@tvernum
Copy link
Contributor Author

tvernum commented Nov 22, 2019

I will forward-port the new parameter (deprecated, and only accepting "true") to master along with a modified version of the new rest test.

Copy link
Member

@jkakavas jkakavas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tvernum
Copy link
Contributor Author

tvernum commented Dec 10, 2019

@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 tvernum merged commit 47e5e34 into elastic:7.x Dec 12, 2019
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
Labels
backport :Security/License License functionality for commercial features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants