maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a "profile" option to S3BinaryCacheStore

Browse source 
This allows specifying the AWS configuration profile to use. E.g.

  nix copy --from s3://my-cache?profile=aws-dev-account /nix/store/cf3isrlqavvd5w7rpky1fa8j9lcnlggm-...
This commit is contained in:
Eelco Dolstra 2017-11-15 14:16:04 +01:00
parent 897ca33a1c
commit 8956ae1987
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/download.cc
View file

@ -533,7 +533,7 @@ struct CurlDownloader : public Downloader
// FIXME: do this on a worker thread // FIXME: do this on a worker thread
sync2async<DownloadResult>(success, failure, [&]() -> DownloadResult { sync2async<DownloadResult>(success, failure, [&]() -> DownloadResult {
#ifdef ENABLE_S3 #ifdef ENABLE_S3
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); auto slash = request.uri.find('/', 5);
if (slash == std::string::npos) if (slash == std::string::npos)
throw nix::Error("bad S3 URI '%s'", request.uri); throw nix::Error("bad S3 URI '%s'", request.uri);

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

@ -10,6 +10,8 @@
#include "istringstream_nocopy.hh" #include "istringstream_nocopy.hh"
#include <aws/core/Aws.h> #include <aws/core/Aws.h>
#include <aws/core/auth/AWSCredentialsProvider.h>
#include <aws/core/auth/AWSCredentialsProviderChain.h>
#include <aws/core/client/ClientConfiguration.h> #include <aws/core/client/ClientConfiguration.h>
#include <aws/core/client/DefaultRetryStrategy.h> #include <aws/core/client/DefaultRetryStrategy.h>
#include <aws/core/utils/logging/FormattedLogSystem.h> #include <aws/core/utils/logging/FormattedLogSystem.h>
@ -77,9 +79,15 @@ static void initAWS()
}); });
} }
S3Helper::S3Helper(const string & region) S3Helper::S3Helper(const std::string & profile, const std::string & region)
: config(makeConfig(region)) : config(makeConfig(region))
, client(make_ref<Aws::S3::S3Client>(*config, true, false)) , client(make_ref<Aws::S3::S3Client>(
profile == ""
? std::dynamic_pointer_cast<Aws::Auth::AWSCredentialsProvider>(
std::make_shared<Aws::Auth::DefaultAWSCredentialsProviderChain>())
: std::dynamic_pointer_cast<Aws::Auth::AWSCredentialsProvider>(
std::make_shared<Aws::Auth::ProfileConfigFileAWSCredentialsProvider>(profile.c_str())),
*config, true, false))
{ {
} }
@ -148,6 +156,7 @@ S3Helper::DownloadResult S3Helper::getObject(
struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
{ {
const Setting<std::string> profile{this, "", "profile", "The name of the AWS configuration profile to use."};
const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}}; const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}};
const Setting<std::string> narinfoCompression{this, "", "narinfo-compression", "compression method for .narinfo files"}; const Setting<std::string> narinfoCompression{this, "", "narinfo-compression", "compression method for .narinfo files"};
const Setting<std::string> lsCompression{this, "", "ls-compression", "compression method for .ls files"}; const Setting<std::string> lsCompression{this, "", "ls-compression", "compression method for .ls files"};
@ -163,7 +172,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
const Params & params, const std::string & bucketName) const Params & params, const std::string & bucketName)
: S3BinaryCacheStore(params) : S3BinaryCacheStore(params)
, bucketName(bucketName) , bucketName(bucketName)
, s3Helper(region) , s3Helper(profile, region)
{ {
diskCache = getNarInfoDiskCache(); diskCache = getNarInfoDiskCache();
} }

2
src/libstore/s3.hh
View file

@ -14,7 +14,7 @@ struct S3Helper
ref<Aws::Client::ClientConfiguration> config; ref<Aws::Client::ClientConfiguration> config;
ref<Aws::S3::S3Client> client; ref<Aws::S3::S3Client> client;
S3Helper(const std::string & region); S3Helper(const std::string & profile, const std::string & region);
ref<Aws::Client::ClientConfiguration> makeConfig(const std::string & region); ref<Aws::Client::ClientConfiguration> makeConfig(const std::string & region);