From 12d6292ed61fe00be44bb740af10eb581fa87281 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 28 Sep 2018 12:16:03 +0300 Subject: [PATCH] s3: support env variables Fixes #1160 Signed-off-by: Ruslan Kuprieiev --- dvc/remote/s3.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dvc/remote/s3.py b/dvc/remote/s3.py index 5f60b35e4..d66ed7fa3 100644 --- a/dvc/remote/s3.py +++ b/dvc/remote/s3.py @@ -47,7 +47,9 @@ class RemoteS3(RemoteBase): '').lstrip('/') self.url = config.get(Config.SECTION_REMOTE_URL, storagepath) self.region = config.get(Config.SECTION_AWS_REGION, None) - self.profile = config.get(Config.SECTION_AWS_PROFILE, 'default') + self.profile = os.getenv('AWS_PROFILE', + config.get(Config.SECTION_AWS_PROFILE, + 'default')) self.endpoint_url = config.get(Config.SECTION_AWS_ENDPOINT_URL, None) credentialpath = config.get(Config.SECTION_AWS_CREDENTIALPATH, None) @@ -62,6 +64,12 @@ class RemoteS3(RemoteBase): self.aws_access_key_id = creds.get('aws_access_key_id', None) self.aws_secret_access_key = creds.get('aws_secret_access_key', None) + self.region = os.getenv('AWS_DEFAULT_REGION', self.region) + self.aws_access_key_id = os.getenv('AWS_ACCESS_KEY_ID', + self.aws_access_key_id) + self.aws_secret_access_key = os.getenv('AWS_SECRET_ACCESS_KEY', + self.aws_secret_access_key) + @property def bucket(self): return urlparse(self.url).netloc