-
Notifications
You must be signed in to change notification settings - Fork 24.7k
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
Add enterprise mode and refactor #51864
Merged
ywangd
merged 12 commits into
elastic:master
from
ywangd:es-51081-enterprise-operation-mode
Feb 9, 2020
Merged
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
588acf8
Add enterprise mode and refactor
ywangd e2622da
Fix test failure
ywangd ff12f91
Fix broken IT tests
ywangd f311e7a
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd 5805cde
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd 23e265e
Fix more test failure due to missing enterprise handling
ywangd 25411e3
Remove unnecessary javadocs
ywangd b599f82
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd 0fe8af1
Address feedbacks
ywangd e6a1ac2
Address feedback to consolidate OperationMode logic
ywangd d413b0c
Address feedbacks
ywangd 540538e
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -138,9 +138,9 @@ public RemoteClusterLicenseChecker(final Client client, final Predicate<License. | |||||
this.predicate = predicate; | ||||||
} | ||||||
|
||||||
public static boolean isLicensePlatinumOrTrial(final XPackInfoResponse.LicenseInfo licenseInfo) { | ||||||
public static boolean isAllowedByLicenseInfo(final XPackInfoResponse.LicenseInfo licenseInfo) { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit:
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated |
||||||
final License.OperationMode mode = License.OperationMode.parse(licenseInfo.getMode()); | ||||||
return mode == License.OperationMode.PLATINUM || mode == License.OperationMode.TRIAL; | ||||||
return XPackLicenseState.isAllowedByOperationMode(mode, License.OperationMode.PLATINUM, true); | ||||||
} | ||||||
|
||||||
/** | ||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer that we change this to either be
< PLATINUM
, or use methods on XPackLicenseState so that we don't have a bunch of code that assumes the set of licenses and their ordering.