wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Merge pull request #12091 from cole-h/fixup-s3-bad-error-formatting

Browse source 
libstore: fixup unformatted uri when S3 getObject fails
This commit is contained in:
Eelco Dolstra 2024-12-19 21:16:15 +01:00 • committed by GitHub
commit 6126007859
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/filetransfer.cc
View file

@ -767,7 +767,7 @@ struct curlFileTransfer : public FileTransfer
auto s3Res = s3Helper.getObject(bucketName, key); auto s3Res = s3Helper.getObject(bucketName, key);
FileTransferResult res; FileTransferResult res;
if (!s3Res.data) if (!s3Res.data)
throw FileTransferError(NotFound, "S3 object '%s' does not exist", request.uri); throw FileTransferError(NotFound, {}, "S3 object '%s' does not exist", request.uri);
res.data = std::move(*s3Res.data); res.data = std::move(*s3Res.data);
res.urls.push_back(request.uri); res.urls.push_back(request.uri);
callback(std::move(res)); callback(std::move(res));

17
tests/nixos/s3-binary-cache-store.nix
View file

@ -10,6 +10,7 @@ let
env = "AWS_ACCESS_KEY_ID=${accessKey} AWS_SECRET_ACCESS_KEY=${secretKey}"; env = "AWS_ACCESS_KEY_ID=${accessKey} AWS_SECRET_ACCESS_KEY=${secretKey}";
storeUrl = "s3://my-cache?endpoint=http://server:9000&region=eu-west-1"; storeUrl = "s3://my-cache?endpoint=http://server:9000&region=eu-west-1";
objectThatDoesNotExist = "s3://my-cache/foo-that-does-not-exist?endpoint=http://server:9000&region=eu-west-1";
in { in {
name = "s3-binary-cache-store"; name = "s3-binary-cache-store";
@ -20,7 +21,10 @@ in {
{ virtualisation.writableStore = true; { virtualisation.writableStore = true;
virtualisation.additionalPaths = [ pkgA ]; virtualisation.additionalPaths = [ pkgA ];
environment.systemPackages = [ pkgs.minio-client ]; environment.systemPackages = [ pkgs.minio-client ];
nix.extraOptions = "experimental-features = nix-command"; nix.extraOptions = ''
experimental-features = nix-command
substituters =
'';
services.minio = { services.minio = {
enable = true; enable = true;
region = "eu-west-1"; region = "eu-west-1";
@ -35,7 +39,10 @@ in {
client = client =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ virtualisation.writableStore = true; { virtualisation.writableStore = true;
nix.extraOptions = "experimental-features = nix-command"; nix.extraOptions = ''
experimental-features = nix-command
substituters =
'';
}; };
}; };
@ -54,6 +61,12 @@ in {
# Test fetchurl on s3:// URLs while we're at it. # Test fetchurl on s3:// URLs while we're at it.
client.succeed("${env} nix eval --impure --expr 'builtins.fetchurl { name = \"foo\"; url = \"s3://my-cache/nix-cache-info?endpoint=http://server:9000&region=eu-west-1\"; }'") client.succeed("${env} nix eval --impure --expr 'builtins.fetchurl { name = \"foo\"; url = \"s3://my-cache/nix-cache-info?endpoint=http://server:9000&region=eu-west-1\"; }'")
# Test that the format string in the error message is properly setup and won't display `%s` instead of the failed URI
msg = client.fail("${env} nix eval --impure --expr 'builtins.fetchurl { name = \"foo\"; url = \"${objectThatDoesNotExist}\"; }' 2>&1")
if "S3 object '${objectThatDoesNotExist}' does not exist" not in msg:
print(msg) # So that you can see the message that was improperly formatted
raise Exception("Error message formatting didn't work")
# Copy a package from the binary cache. # Copy a package from the binary cache.
client.fail("nix path-info ${pkgA}") client.fail("nix path-info ${pkgA}")