fix: Fix regression in S3 client configuration (backport release-3.6.x) #20118
+249
−116
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
### Summary This PR fixes a regression in how Loki's S3 configuration options are handled to create the S3 client which was introduced with the upgrade of the AWS SDK from v1 to v2 (#19205). With the v1 SDK the `s3` field of the `aws` configuration block was parsed to extract credentials, region, host, and schema. ``` storage_config: aws: s3: s3://<accesskey>:<secret>@<endpoint_or_region>/<bucketnames> ``` After the upgrade, only credentials were extraced, leaving all other parts of the URL as default, which would require explicit overrides. This was a breaking change and not documented in the upgrade notes. We want to keep backwards compatibility, even though the Thanos object client is going to supersed the custom S3/GCS/... clients. ref: #19908 Signed-off-by: Christian Haudum <christian.haudum@gmail.com> (cherry picked from commit d3f9532)
loki-gh-app
bot
added
backport
size/L
type/bug
loki-gh-app
bot
added
size/L
backport
type/bug
chaudum
approved these changes
Dec 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Backport d3f9532 from #20110
Summary
This PR fixes a regression in how Loki's S3 configuration options are handled to create the S3 client which was introduced with the upgrade of the AWS SDK from v1 to v2 (#19205).
With the v1 SDK the
s3field of theawsconfiguration block was parsed to extract credentials, region, host, and schema.After the upgrade, only credentials were extraced, leaving all other parts of the URL as default, which would require explicit overrides.
This was a breaking change and not documented in the upgrade notes. We want to keep backwards compatibility, even though the Thanos object client is going to supersed the custom S3/GCS/... clients.
ref: #19908
Additionally, a second regression was fixed, which was caused in 7fc68b3