Improve version checking for 8.0.0-alpha1 #610
Merged
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
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
scunningham
approved these changes
Aug 2, 2021
| @@ -66,8 +66,8 @@ func validateUserAgent(r *http.Request, verConst version.Constraints) error { | |||
| if !strings.HasPrefix(userAgent, userAgentPrefix) { | |||
| return ErrInvalidUserAgent | |||
| } | |||
| verStr := strings.TrimSpace(strings.TrimSuffix(strings.TrimPrefix(userAgent, userAgentPrefix), "-snapshot")) | |||
| ver, err := version.NewVersion(verStr) | |||
| verSep := strings.Split(strings.TrimPrefix(userAgent, userAgentPrefix), "-") | |||
There was a problem hiding this comment.
Is ok for now. Prefer to see this logic centralized and better commented.
@aleksmaus has a PR that conflicts so can be fixed up then.
|
Thanks for reviewing Sean. As approved, I'm pushing this in since it prevents Fleet usage in 8.0 - we'll see if we rebuild the 8.0 Alpha BC or not. |
mergify bot
added a commit
that referenced
this pull request
Aug 2, 2021
* Improve version checking. (cherry picked from commit f99312d) * Fix alpha check on elasticsearch version. (cherry picked from commit 92285c1) Co-authored-by: Blake Rouse <[email protected]>
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.
What does this PR do?
This updates the user-agent version checking to remove anything after the version
-and ignores it.Why is it important?
8.0.0-alpha1is a testing release of the stack and this causes issue with the version constraint checks in Fleet Server.Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration filesRelated issues