Fix S3 bucket validation for inter-region storage #7896
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
itaigilo
added
bug
E2E Test Results - DynamoDB Local - Local Block Adapter |
itaigilo
requested review from
a team
and removed request for
N-o-Z,
guy-har and
eladlachmi
arielshaqed
requested changes
Jun 20, 2024
pkg/block/s3/adapter.go
Outdated
| @@ -870,11 +870,13 @@ func (a *Adapter) ResolveNamespace(storageNamespace, key string, identifierType | |||
| } | |||
|
|
|||
| func (a *Adapter) GetRegion(ctx context.Context, storageNamespace string) (string, error) { | |||
| bucket, found := strings.CutPrefix(storageNamespace, fmt.Sprintf("%s://", block.BlockstoreTypeS3)) | |||
| namespace, found := strings.CutPrefix(storageNamespace, fmt.Sprintf("%s://", block.BlockstoreTypeS3)) | |||
There was a problem hiding this comment.
This seems somewhat fragile. Proposal: I think you can use "net/url".Parse and then the bucket is the Host field of the URL. Here's an example of how this can work.
N-o-Z
reviewed
Jun 20, 2024
N-o-Z
reviewed
Jun 20, 2024
Co-authored-by: N-o-Z <[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.
Closes #7846
Change Description
For the validation of inter-region storage (if it's not allowed):
When getting storage namespace region from S3, the code was trying to get the region (from the S3 API) for the whole namespace (for example,
bucket-name/path-1/), instead of using only the bucket name (i.ebucket-name).This fix is about getting the region only for the bucket name (which the S3 API can handle).
Testing Details
Tested this manually on a local server (configured with S3 of course).