Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1181 from jeepkd/fix-aws-env

Browse Source 
s3: fix dvc not loading AWS settings from environment variables
This commit is contained in:
Ruslan Kuprieiev
2018-10-01 21:32:22 +03:00
committed by GitHub
parent aea92e0bdf 9528ad6a1d
commit e63ae3d676
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/remote/s3.py
+9 -7
View File
@@ -57,19 +57,13 @@ class RemoteS3(RemoteBase):
creds_conf = configobj.ConfigObj(credentialpath)
creds = creds_conf.get(self.profile, {})
else:
creds = {}
creds = self._get_aws_config_from_env()
self.creds = creds
self.region = creds.get('region', self.region)
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
@@ -89,6 +83,14 @@ class RemoteS3(RemoteBase):
region_name=self.region)
return session.client('s3', endpoint_url=self.endpoint_url)
def _get_aws_config_from_env(self):
creds = {
'region': os.getenv('AWS_DEFAULT_REGION'),
'aws_access_key_id': os.getenv('AWS_ACCESS_KEY_ID'),
'aws_secret_access_key': os.getenv('AWS_SECRET_ACCESS_KEY'),
}
return {k: v for k, v in creds.items() if v is not None}
def get_etag(self, bucket, key):
try:
obj = self.s3.head_object(Bucket=bucket, Key=key)