nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 11:36:03 +01:00
Code Activity

libstore: Implement getHumanReadableURI for S3BinaryCacheStoreConfig

Browse source 
This slightly improves the logs situation by including the region/profile/endpoint
in the logs when S3 store references get printed. Instead of:

copying path '/nix/store/lxnp9cs4cfh2g9r2bs4z7gwwz9kdj2r9-test-package-c' to 's3://bucketname'...

This now includes:

copying path '/nix/store/lxnp9cs4cfh2g9r2bs4z7gwwz9kdj2r9-test-package-c' to 's3://bucketname?endpoint=http://server:9000&region=eu-west-1'...
This commit is contained in:
Sergei Zimmerman 2025-10-18 19:11:39 +03:00
parent 61fbef42a6
commit 3d147c04a5
No known key found for this signature in database
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/include/nix/store/s3-binary-cache-store.hh
View file

@ -75,6 +75,8 @@ struct S3BinaryCacheStoreConfig : HttpBinaryCacheStoreConfig
static StringSet uriSchemes();
static std::string doc();
std::string getHumanReadableURI() const override;
};
} // namespace nix

13
src/libstore/s3-binary-cache-store.cc
View file

@ -29,6 +29,19 @@ S3BinaryCacheStoreConfig::S3BinaryCacheStoreConfig(
}
}
std::string S3BinaryCacheStoreConfig::getHumanReadableURI() const
{
auto reference = getReference();
reference.params = [&]() {
Params relevantParams;
for (auto & setting : s3UriSettings)
if (setting->overridden)
relevantParams.insert({setting->name, reference.params.at(setting->name)});
return relevantParams;
}();
return reference.render();
}
std::string S3BinaryCacheStoreConfig::doc()
{
return R"(