Skip to content

[Backport 7.x] Add max_resource_units to enterprise license#50910

Merged
tvernum merged 2 commits intoelastic:7.xfrom
tvernum:backport/7.x/50735-Add-max-resource-units
Jan 14, 2020
Merged

[Backport 7.x] Add max_resource_units to enterprise license#50910
tvernum merged 2 commits intoelastic:7.xfrom
tvernum:backport/7.x/50735-Add-max-resource-units

Conversation

@tvernum
Copy link
Copy Markdown
Contributor

@tvernum tvernum commented Jan 13, 2020

The enterprise license type must have "max_resource_units" and may not
have "max_nodes".

This change adds support for this new field, validation that the field
is present if-and-only-if the license is enterprise and bumps the
license version number to reflect the new field.

Includes a BWC layer to return "max_nodes: ${max_resource_units}" in
the GET license API.

Backport of: #50735

The enterprise license type must have "max_resource_units" and may not
have "max_nodes".

This change adds support for this new field, validation that the field
is present if-and-only-if the license is enterprise and bumps the
license version number to reflect the new field.

Includes a BWC layer to return "max_nodes: ${max_resource_units}" in
the GET license API.

Backport of: elastic#50735
@tvernum tvernum added :Security/License License functionality for commercial features backport labels Jan 13, 2020
@tvernum tvernum requested a review from jkakavas January 13, 2020 12:15
@elasticmachine
Copy link
Copy Markdown
Collaborator

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

@tvernum
Copy link
Copy Markdown
Contributor Author

tvernum commented Jan 13, 2020

@jkakavas This is a pretty simple backport, with the addition of BWC so that the rest API shows a v4 license format, unless accept_enterprise=true.

Copy link
Copy Markdown
Contributor

@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 tvernum merged commit c2acb88 into elastic:7.x Jan 14, 2020
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