Clean up request parsing in S3HttpHandler
#126034
Merged
Conversation
This file contains hidden or 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
The `METHOD /path/components?and=query` string representation of a request is becoming increasingly difficult to parse, with slight variations in parsing between the implementation in `S3HttpHandler` and the various other implementations. This commit gets rid of the string-concatenate-and-split behaviour in favour of a proper object that has predicates for testing all the different kinds of request that might be made against S3.
DaveCTurner
added
>test
elasticsearchmachine
added
the
Team:Distributed Coordination
Collaborator
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
DiannaHohensee
approved these changes
Apr 1, 2025
Contributor
DiannaHohensee
left a comment
DiannaHohensee
left a comment
There was a problem hiding this comment.
Couple nits, lgtm 👍
| } | ||
|
|
||
| public boolean isHeadObjectRequest() { | ||
| return "HEAD".equals(method) && path.startsWith("/" + S3HttpHandler.this.bucketAndBasePath + "/"); |
Contributor
There was a problem hiding this comment.
Is path.startsWith("/" + S3HttpHandler.this.bucketAndBasePath + "/") the same as isUnderBucketRootAndBasePath()?
Contributor
Author
There was a problem hiding this comment.
Ah yeah missed that one
| this.bucketAndBasePath = bucket + (Strings.hasText(basePath) ? "/" + basePath : ""); | ||
| } | ||
|
|
||
| private static final Set<String> NO_REQUEST_BODY_METHODS = Set.of("GET", "HEAD", "DELETE"); |
Contributor
There was a problem hiding this comment.
This name doesn't make sense. It's only a list of method strings. Maybe document how it's used instead?
Contributor
Author
There was a problem hiding this comment.
Fair, yeah, renamed & commented in dc61076
DaveCTurner
added
auto-merge-without-approval
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Apr 2, 2025
The `METHOD /path/components?and=query` string representation of a request is becoming increasingly difficult to parse, with slight variations in parsing between the implementation in `S3HttpHandler` and the various other implementations. This commit gets rid of the string-concatenate-and-split behaviour in favour of a proper object that has predicates for testing all the different kinds of request that might be made against S3. Backport of elastic#126034 to 8.x
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 2, 2025
The `METHOD /path/components?and=query` string representation of a request is becoming increasingly difficult to parse, with slight variations in parsing between the implementation in `S3HttpHandler` and the various other implementations. This commit gets rid of the string-concatenate-and-split behaviour in favour of a proper object that has predicates for testing all the different kinds of request that might be made against S3. Backport of #126034 to 8.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The
METHOD /path/components?and=querystring representation of arequest is becoming increasingly difficult to parse, with slight
variations in parsing between the implementation in
S3HttpHandlerandthe various other implementations. This commit gets rid of the
string-concatenate-and-split behaviour in favour of a proper object that
has predicates for testing all the different kinds of request that might
be made against S3.