Added bucket-lookup-type field to s3 config #3788
Open
+78
−3
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
|
|
devmentality
force-pushed
the
bucket-lookup-type
branch
from
c5bc5e8 to
ce5b13f
Compare
simonswine
reviewed
Jan 2, 2025
pkg/objstore/providers/s3/config.go
Outdated
| @@ -108,6 +121,14 @@ func (cfg *Config) Validate() error { | |||
| return errUnsupportedSignatureVersion | |||
| } | |||
|
|
|||
| if cfg.ForcePathStyle && cfg.BucketLookupType == VirtualHostedStyleLookup { | |||
There was a problem hiding this comment.
Nit: Might be slightly more failsafe, once there is another lookup type added (I hope not 😆 )
Suggested change
| if cfg.ForcePathStyle && cfg.BucketLookupType == VirtualHostedStyleLookup { | |
| if cfg.ForcePathStyle && cfg.BucketLookupType != AutoLookup && cfg.BucketLookupType != PathStyleLookup { |
There was a problem hiding this comment.
Nit: Might be slightly more failsafe, once there is another lookup type added (I hope not 😆 )
Fixed
| @@ -39,8 +39,10 @@ func newS3Config(cfg Config) (s3.Config, error) { | |||
| } | |||
|
|
|||
| bucketLookupType := s3.AutoLookup | |||
| if cfg.ForcePathStyle { | |||
| if cfg.ForcePathStyle || cfg.BucketLookupType == PathStyleLookup { | |||
There was a problem hiding this comment.
I wonder if we also should add a deprecation log warning when ForcePath argument is used, so users can notice it and migrate to BucketLookupType
Wdyt?
There was a problem hiding this comment.
Yeah, that's a great idea. I have tried to add a warning on bucket client initialization. Maybe there is a better place for such logic?
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.
Hi Pyroscope Team!
This pull request targets the issue.
There are a few details I would like to point out:
a warning if force-path is set to true, that this flag is deprecated and might be removed going forward. Unfortunately, I haven't found an elegant solution to do that and just put a deprecation message to flag's usage. There are flagext package, but it is used to replace deprecated flag completely. Pflag library has deprecation feature, but you use plain flag library here.