Skip to content

Support "accept_enterprise" param in get license #50067

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

Merged

Conversation

tvernum
Copy link
Contributor

@tvernum tvernum commented Dec 11, 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.

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 added >enhancement :Security/License License functionality for commercial features v8.0.0 labels Dec 11, 2019
@tvernum tvernum requested a review from jkakavas December 11, 2019 06:09
@elasticmachine
Copy link
Collaborator

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

@tvernum
Copy link
Contributor Author

tvernum commented Dec 11, 2019

@jkakavas I want to get this one reviewed so that I can merge it at the same time as #49474 (enterprise license for 7.x).

@tvernum
Copy link
Contributor Author

tvernum commented Dec 11, 2019

java.lang.NullPointerException: no such build node: elasticsearch-ci-immutable-debian-10-1576044598081215110

@elasticmachine run elasticsearch-ci/bwc

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 tvernum merged commit 9a781c6 into elastic:master Dec 12, 2019
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Dec 13, 2019
The release builds use a production license key, and our rest test load
licenses that are signed by the dev license key.

This change adds the new enterprise license Rest tests to the
blacklist on release builds.

Relates: elastic#50067
Resolves: elastic#50151
tvernum added a commit that referenced this pull request Dec 13, 2019
The release builds use a production license key, and our rest test load
licenses that are signed by the dev license key.

This change adds the new enterprise license Rest tests to the
blacklist on release builds.

Relates: #50067
Resolves: #50151
tvernum added a commit to tvernum/elasticsearch that referenced this pull request Dec 13, 2019
The release builds use a production license key, and our rest test load
licenses that are signed by the dev license key.

This change adds the new enterprise license Rest tests to the
blacklist on release builds.

Relates: elastic#50067
Resolves: elastic#50151
Backport of: elastic#50163
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.
SivagurunathanV pushed a commit to SivagurunathanV/elasticsearch that referenced this pull request Jan 23, 2020
The release builds use a production license key, and our rest test load
licenses that are signed by the dev license key.

This change adds the new enterprise license Rest tests to the
blacklist on release builds.

Relates: elastic#50067
Resolves: elastic#50151
pgomulka added a commit to pgomulka/elasticsearch that referenced this pull request Jul 19, 2021
in elastic#50067 the accept_enterprise = false was no longer supported. This
commit allows it under rest compatibility and ignores.

in elastic#5073 there were changes when max_nodes and max_resource_units can
exist. This does not require compatible changes as it feels to be
behaviour change. Requires some testing transformation though

relates elastic#51816
pgomulka added a commit that referenced this pull request Jul 27, 2021
…es (#75479)

in #50067 for _license the accept_enterprise = false was no longer supported. This
commit allows it under rest compatibility and is showing enterprise licenses as platinum
The same change had to be applied to _xpack endpoint #58217

in #50735 max_resource_units was introduced to be more accurate. For v7 requests, which do not know about enterprise license we will return max_node which will be set from max_resource_units (it assumes that one resource unit is 32GB - which corresponds to 1 node)

relates #51816
ywangd pushed a commit to ywangd/elasticsearch that referenced this pull request Jul 30, 2021
…es (elastic#75479)

in elastic#50067 for _license the accept_enterprise = false was no longer supported. This
commit allows it under rest compatibility and is showing enterprise licenses as platinum
The same change had to be applied to _xpack endpoint elastic#58217

in elastic#50735 max_resource_units was introduced to be more accurate. For v7 requests, which do not know about enterprise license we will return max_node which will be set from max_resource_units (it assumes that one resource unit is 32GB - which corresponds to 1 node)

relates elastic#51816
kcm pushed a commit that referenced this pull request Oct 12, 2021
This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067
lockewritesdocs pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>
lockewritesdocs pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit to lockewritesdocs/elasticsearch that referenced this pull request Oct 15, 2021
…lastic#79256)

* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

elastic#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit that referenced this pull request Oct 15, 2021
* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
lockewritesdocs pushed a commit that referenced this pull request Oct 15, 2021
…79267)

* document accept_enterprise parameter

This was added in 7.6, will be deprecated in 8.x, and removed in 9.x+ (noted in text).

#50067

* Update wording and deprecation notice

* Incorporate review feedback

Co-authored-by: Adam Locke <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>

Co-authored-by: Ken MacInnis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement :Security/License License functionality for commercial features v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants