Update presign post URL resolution to use the exact result from EndpointResolverV2 #2842
+98
−23
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
wty-Bryant
approved these changes
Oct 17, 2024
lucix-aws
approved these changes
Oct 18, 2024
| @@ -50,3 +51,14 @@ func GetAttemptSkewContext(ctx context.Context) time.Duration { | |||
| x, _ := middleware.GetStackValue(ctx, clockSkew{}).(time.Duration) | |||
| return x | |||
| } | |||
|
|
|||
| // SetS3ResolvedURI sets the URI as resolved by the EndpointResolverV2 | |||
| func SetS3ResolvedURI(ctx context.Context, value string) context.Context { | |||
There was a problem hiding this comment.
If we only need this in S3 right now then let's just have it unexported in service/s3. We're still committing to a pseudo-API contract by doing this, even though it's under internal/, if we ever wanted to expand it to other services we wouldn't be able to remove it because it could break cross-module compat.
| @@ -66,6 +68,23 @@ func TestPresignPutObject(t *testing.T) { | |||
| }, | |||
| expectedURL: "https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com", | |||
| }, | |||
| "use path style bucket hosting pattern": { | |||
There was a problem hiding this comment.
Can we also add tests for:
- bucket and key are the same value
- custom BaseEndpoint has an arbitrary path segment (e.g.
locals3.com/v1)
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.
Fixes #2827
Discussed offline. Our original approach was to update
toBaseURLto fix this edge case. However, this had the pitfall of being hard to capture all corner cases. Instead of coming up with a heuristic to figure out how to best parse the URL from the bucket, use the URI directly from endpointResolverV2. This change does this by:renderPostEndpointResolutionHook, which generates the line onendpoints.goto store the URI on the contextTests are copied from a draft PR with the 1st approach
Testing