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 operator privilege license object to LicensedFeature #79407

Merged
merged 4 commits into from
Oct 19, 2021

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Oct 19, 2021

This commit moves the operator privilege license checks to use the new
LicensedFeature class. The XPackLicenseState.Feature enum is also
removed because it has no more uses.

This commit moves the operator privilege license checks to use the new
LicensedFeature class. The XPackLicenseState.Feature enum is also
removed because it has no more uses.
@rjernst rjernst added >refactoring :Security/License License functionality for commercial features v8.0.0 v7.16.0 labels Oct 19, 2021
@elasticmachine elasticmachine added the Team:Security Meta label for security team label Oct 19, 2021
@elasticmachine
Copy link
Collaborator

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

@rjernst rjernst requested a review from ywangd October 19, 2021 00:56
@rjernst
Copy link
Member Author

rjernst commented Oct 19, 2021

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

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

Thanks for getting all these features across the finishing line. 👍

@rjernst rjernst merged commit dfbaa66 into elastic:master Oct 19, 2021
@rjernst rjernst deleted the license/remove_feature branch October 19, 2021 12:47
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Oct 19, 2021
* upstream/master:
  Validate tsdb's routing_path (elastic#79384)
  Adjust the BWC version for the return200ForClusterHealthTimeout field (elastic#79436)
  API for adding and removing indices from a data stream (elastic#79279)
  Exposing the ability to log deprecated settings at non-critical level (elastic#79107)
  Convert operator privilege license object to LicensedFeature (elastic#79407)
  Mute SnapshotBasedIndexRecoveryIT testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver (elastic#79456)
  Create cache files with CREATE_NEW & SPARSE options (elastic#79371)
  Revert "[ML] Use a new annotations index for future annotations (elastic#79151)"
  [ML] Use a new annotations index for future annotations (elastic#79151)
  [ML] Removing legacy code from ML/transform auditor (elastic#79434)
  Fix rate agg with custom `_doc_count` (elastic#79346)
  Optimize SLM Policy Queries (elastic#79341)
  Fix execution of exists query within nested queries on field with doc_values disabled (elastic#78841)
  Stricter UpdateSettingsRequest parsing on the REST layer (elastic#79227)
  Do not release snapshot file download permit during recovery retries (elastic#79409)
  Preserve request headers in a mixed version cluster (elastic#79412)
  Adjust versions after elastic#79044 backport to 7.x (elastic#79424)
  Mute BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests (elastic#79429)
  Fail on SSPL licensed x-pack sources (elastic#79348)

# Conflicts:
#	server/src/test/java/org/elasticsearch/index/TimeSeriesModeTests.java
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Oct 19, 2021
…#79407)

This commit moves the operator privilege license checks to use the new
LicensedFeature class. The XPackLicenseState.Feature enum is also
removed because it has no more uses.
elasticsearchmachine pushed a commit that referenced this pull request Oct 19, 2021
…#79476)

* Convert operator privilege license object to LicensedFeature (#79407)

This commit moves the operator privilege license checks to use the new
LicensedFeature class. The XPackLicenseState.Feature enum is also
removed because it has no more uses.

* 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.

4 participants