Support 7.6 and new stack level enterprise license type #2242
Conversation
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
pebrc
commented
Dec 11, 2019
| if l.Type == string(ElasticsearchLicenseTypeEnterprise) && !v.IsSameOrAfter(version.MustParse("7.6.0")) { | ||
| return false | ||
| } | ||
| return true |
There was a problem hiding this comment.
I know this statement can be collapsed into just returning directly from the comparison, but I found the intent much easier to understand by being a bit redundant here.
barkbay
approved these changes
Dec 12, 2019
| @@ -87,3 +87,84 @@ func TestExtractVersion(t *testing.T) { | |||
| }) | |||
| } | |||
| } | |||
|
|
|||
| func TestCurrentVersions(t *testing.T) { | |||
There was a problem hiding this comment.
Not really from your PR but should not it be called TestMinVersion?
| @@ -21,14 +22,16 @@ type licenseWithTimeLeft struct { | |||
| // desired license type and the remaining validity period of the license. | |||
| // Returns the license, parent license UID, a bool indicating a match was found and an optional error. | |||
| func BestMatch( | |||
| minVersion *version.Version, | |||
There was a problem hiding this comment.
Should we update the godoc to mention why there is an additional parameter ? (not 💯 % it's really worth it but it can help when we read the code)
thbkrkr
changed the title
mjmbischoff
pushed a commit
to mjmbischoff/cloud-on-k8s
that referenced
this pull request
Jan 13, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Relates to #2197