lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Extend S3 URL parsing with parameters extraction

Browse source
This commit is contained in:
Dzmitry Zaitsau 2019-02-25 17:56:52 +01:00
parent 07f992a74b
commit 56c18c67d9
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libstore/download.cc
View file

@ -614,6 +614,22 @@ struct CurlDownloader : public Downloader
writeFull(wakeupPipe.writeSide.get(), " "); writeFull(wakeupPipe.writeSide.get(), " ");
} }
#ifdef ENABLE_S3
std::tuple<std::string, std::string, Store::Params> parseS3Uri(std::string uri)
{
auto [path, params] = splitUriAndParams(uri);
auto slash = path.find('/', 5); // 5 is the length of "s3://" prefix
if (slash == std::string::npos)
throw nix::Error("bad S3 URI '%s'", path);
std::string bucketName(path, 5, slash - 5);
std::string key(path, slash + 1);
return {bucketName, key, params};
}
#endif
void enqueueDownload(const DownloadRequest & request, void enqueueDownload(const DownloadRequest & request,
Callback<DownloadResult> callback) override Callback<DownloadResult> callback) override
{ {
@ -622,12 +638,8 @@ struct CurlDownloader : public Downloader
// FIXME: do this on a worker thread // FIXME: do this on a worker thread
try { try {
#ifdef ENABLE_S3 #ifdef ENABLE_S3
auto [bucketName, key, params] = parseS3Uri(request.uri);
S3Helper s3Helper("", Aws::Region::US_EAST_1, "", ""); // FIXME: make configurable S3Helper s3Helper("", Aws::Region::US_EAST_1, "", ""); // FIXME: make configurable
auto slash = request.uri.find('/', 5);
if (slash == std::string::npos)
throw nix::Error("bad S3 URI '%s'", request.uri);
std::string bucketName(request.uri, 5, slash - 5);
std::string key(request.uri, slash + 1);
// FIXME: implement ETag // FIXME: implement ETag
auto s3Res = s3Helper.getObject(bucketName, key); auto s3Res = s3Helper.getObject(bucketName, key);
DownloadResult res; DownloadResult res;