fix(libstore): improve http-binary-cache-store S3 compatibility#14209
Merged
xokdvium merged 1 commit intoNixOS:masterfrom Oct 11, 2025
Merged
fix(libstore): improve http-binary-cache-store S3 compatibility#14209xokdvium merged 1 commit intoNixOS:masterfrom
xokdvium merged 1 commit intoNixOS:masterfrom
Conversation
github-actions
bot
added
the
store
xokdvium
reviewed
Oct 10, 2025
xokdvium
reviewed
Oct 10, 2025
This commit adds two key fixes to http-binary-cache-store.cc to properly support the new curl-based S3 implementation: 1. **Consistent cache key handling**: Use `getReference().render(withParams=false)` for disk cache keys instead of `cacheUri.to_string()`. This ensures cache keys are consistent with the S3 implementation and don't include query parameters, which matches the behavior expected by Store::queryPathInfo() lookups. 2. **S3 query parameter preservation**: When generating file transfer requests for S3 URLs, preserve query parameters from the base URL (region, endpoint, etc.) when the relative path doesn't have its own query parameters. This ensures S3-specific configuration is propagated to all requests.
lovesegfault
force-pushed
the
curl-based-s3-pieces-fix
branch
from
5d91c63 to
f022188
Compare
xokdvium
approved these changes
Oct 11, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Motivation
This commit adds two key fixes to http-binary-cache-store.cc to
properly support the new curl-based S3 implementation:
Consistent cache key handling: Use
getReference().render(withParams=false)for disk cache keys instead of
cacheUri.to_string(). This ensures cachekeys are consistent with the S3 implementation and don't include query
parameters, which matches the behavior expected by Store::queryPathInfo()
lookups.
S3 query parameter preservation: When generating file transfer requests
for S3 URLs, preserve query parameters from the base URL (region, endpoint,
etc.) when the relative path doesn't have its own query parameters. This
ensures S3-specific configuration is propagated to all requests.
Context
Carve out of #13752, should have made it onto #14198 but I missed it.
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.