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

Convert token service license object to LicensedFeature #79284

Merged
merged 9 commits into from
Oct 19, 2021

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Oct 15, 2021

This commit moves the token service license checks to use the new
LicensedFeature class.

This commit moves the token service license checks to use the new
LicensedFeature class.
@rjernst rjernst added >refactoring :Security/License License functionality for commercial features v8.0.0 v7.16.0 labels Oct 15, 2021
@rjernst rjernst requested a review from ywangd October 15, 2021 18:09
@elasticmachine elasticmachine added the Team:Security Meta label for security team label Oct 15, 2021
@elasticmachine
Copy link
Collaborator

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

Copy link
Member

@ywangd ywangd left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines +358 to +359
public static final LicensedFeature.Momentary TOKEN_SERVICE_FEATURE =
LicensedFeature.momentaryLenient(null, "security-token-service", License.OperationMode.STANDARD);
Copy link
Member

Choose a reason for hiding this comment

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

We need to remove the old constant from XPackLicenseState.java.

@rjernst
Copy link
Member Author

rjernst commented Oct 18, 2021

@elasticmachine run elasticsearch-ci/part-2-fips

@rjernst rjernst merged commit 6192cb2 into elastic:master Oct 19, 2021
@rjernst rjernst deleted the license/token branch October 19, 2021 00:34
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
7.x Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 79284

rjernst added a commit to rjernst/elasticsearch that referenced this pull request Oct 19, 2021
This commit moves the token service license checks to use the new
LicensedFeature class.
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Oct 19, 2021
* upstream/master: (34 commits)
  Add extensionName() to security extension (elastic#79329)
  More robust and consistent allowAll indicesAccessControl (elastic#79415)
  Fix circuit breaker leak in MultiTerms aggregation (elastic#79362)
  guard geoline aggregation from parents aggegator that emit empty buckets (elastic#79129)
  Vector tiles: increase the size of the envelope used to clip geometries (elastic#79030)
  Revert "[ML] Add queue_capacity setting to start deployment API (elastic#79369)" (elastic#79374)
  Convert token service license object to LicensedFeature (elastic#79284)
  [TEST] Fix ShardPathTests for MDP (elastic#79393)
  Fix fleet search API with no checkpints (elastic#79400)
  Reduce BWC version for transient settings (elastic#79396)
  EQL: Rename a test class for eclipse (elastic#79254)
  Use search_coordination threadpool in field caps (elastic#79378)
  Use query param instead of a system property for opting in for new cluster health response code (elastic#79351)
  Add new kNN search endpoint (elastic#79013)
  Disable BWC tests
  Convert auditing license object to LicensedFeature (elastic#79280)
  Update BWC versions after backport of elastic#78551
  Enable InstantiatingObjectParser to pass context as a first argument (elastic#79206)
  Move xcontent filtering tests (elastic#79298)
  Update links to Fleet/Agent docs (elastic#79303)
  ...
elasticsearchmachine pushed a commit that referenced this pull request Oct 19, 2021
)

* Convert token service license object to LicensedFeature (#79284)

This commit moves the token service license checks to use the new
LicensedFeature class.

* fix compile

* checkstyle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>refactoring :Security/License License functionality for commercial features Team:Security Meta label for security team v7.16.0 v8.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants