Generalize S3HttpHandler request matching
#125670
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 pattern-matching in `S3HttpHandler` is overly specific and carefully crafted to handle the exact requests that the AWS SDK v1 makes. It turns out that the AWS SDK v2 makes requests that are slightly different. This commit generalizes the pattern-matching to handle both SDKs.
DaveCTurner
added
>test
elasticsearchmachine
added
the
Team:Distributed Coordination
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
mhl-b
approved these changes
Mar 26, 2025
| || Regex.simpleMatch("GET /" + bucket + "/?uploads&max-uploads=*&prefix=*", request); | ||
| || Regex.simpleMatch("GET /" + bucket + "/?uploads&max-uploads=*&prefix=*", request) | ||
| || Regex.simpleMatch("GET /" + bucket + "?uploads&prefix=*", request) | ||
| || Regex.simpleMatch("GET /" + bucket + "?uploads&max-uploads=*&prefix=*", request); |
There was a problem hiding this comment.
A duplicate match for /?uploads&max-uploads=*&prefix=*? line 358.
Pattern.compile("GET \/bucket(\/)?\?uploads&(max-uploads=.*&)?prefix=.*")? Who needs simpleMatch when you can do complex match?:)
There was a problem hiding this comment.
not a duplicate, one has an extra / :)
DiannaHohensee
approved these changes
Mar 26, 2025
|
|
||
| private boolean isUploadPartRequest(String request) { | ||
| return Regex.simpleMatch("PUT /" + path + "/*?uploadId=*&partNumber=*", request) | ||
| || Regex.simpleMatch("PUT /" + path + "/*?partNumber=*&uploadId=*", request); |
There was a problem hiding this comment.
Could you distinguish between the V1 vs V2 request formats in the methods, and add a todo someplace? I'm imagining that we should clean up and remove the V1 formats after the upgrade.
There was a problem hiding this comment.
I opened ES-11379. Honestly this is all hideous, we should be parsing the request properly, but it's only a test fixture...
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Mar 26, 2025
The pattern-matching in `S3HttpHandler` is overly specific and carefully crafted to handle the exact requests that the AWS SDK v1 makes. It turns out that the AWS SDK v2 makes requests that are slightly different. This commit generalizes the pattern-matching to handle both SDKs.
💚 Backport successful
|
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 26, 2025
The pattern-matching in `S3HttpHandler` is overly specific and carefully crafted to handle the exact requests that the AWS SDK v1 makes. It turns out that the AWS SDK v2 makes requests that are slightly different. This commit generalizes the pattern-matching to handle both SDKs.
omricohenn
pushed a commit
to omricohenn/elasticsearch
that referenced
this pull request
Mar 28, 2025
The pattern-matching in `S3HttpHandler` is overly specific and carefully crafted to handle the exact requests that the AWS SDK v1 makes. It turns out that the AWS SDK v2 makes requests that are slightly different. This commit generalizes the pattern-matching to handle both SDKs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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 pattern-matching in
S3HttpHandleris overly specific and carefullycrafted to handle the exact requests that the AWS SDK v1 makes. It turns
out that the AWS SDK v2 makes requests that are slightly different. This
commit generalizes the pattern-matching to handle both SDKs.