storage: Fix default Azure bucket endpoint #3821
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
colega
reviewed
Dec 28, 2022
|
Is there any way we can write a test for this? |
colega
reviewed
Dec 28, 2022
|
Please add this PR to the changelog line where thanos was updated. Line 24 in 96905d9 |
@colega I was thinking the same. Will look into it after testing the fix. Update: Added a couple of tests. |
aknuds1
force-pushed
the
bugfix/azure-storage-default-endpoint
branch
5 times, most recently
from
ce219fa
to
2dfbde3
Compare
colega
approved these changes
Dec 28, 2022
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
aknuds1
force-pushed
the
bugfix/azure-storage-default-endpoint
branch
from
1fd597a
to
3537726
Compare
aknuds1
added a commit
that referenced
this pull request
Dec 28, 2022
* storage: Fix default Azure bucket endpoint Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
pracucci
reviewed
Jan 2, 2023
| "github.com/thanos-io/objstore" | ||
| "github.com/thanos-io/objstore/providers/azure" | ||
| yaml "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| func NewBucketClient(cfg Config, name string, logger log.Logger) (objstore.Bucket, error) { | ||
| func NewBucketClient(cfg Config, name string, logger log.Logger, factory func(log.Logger, []byte, string) (*azure.Bucket, error)) (objstore.Bucket, error) { |
There was a problem hiding this comment.
A post-merge comment. There's no need to take the factory in the exported function. What we do in other places is:
- Create
newBucketClient()(non exported) taking thefactory. Test this. - Keep
NewBucketClient()(exported) with nofactory. It just callsnewBucketClient()passing thefactorytoo.
1 task
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.
What this PR does
In pkg/storage/bucket/azure, fix setting of default bucket endpoint. An empty string for this parameter used to be replaced by Thanos' default, but that's no longer the case in our current version of the dependency.
Also add tests, plus give
azure.NewBucketClienta factory parameter, so the tests can fake objstore's bucket factory.Which issue(s) this PR fixes or relates to
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]