From b304786f1bfb82727bb54780259fdf016ff7fe08 Mon Sep 17 00:00:00 2001 From: Ophir Yokatan Date: Tue, 4 Jul 2017 17:06:45 +0300 Subject: [PATCH 1/2] Handle missing credentials file --- dvc/data_cloud.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py index 59fc6efed..b1fbeddcb 100644 --- a/dvc/data_cloud.py +++ b/dvc/data_cloud.py @@ -222,12 +222,15 @@ class DataCloudAWS(DataCloudBase): def sanity_check(self): creds = self.get_aws_credentials() if creds is None: - raise ConfigError('can\'t find aws credentials.') + logger.info("can't find aws credetials, assuming envirment variables or iam role") self._aws_creds = creds def _get_bucket_aws(self): """ get a bucket object, aws """ - conn = S3Connection(self.aws_access_key_id, self.aws_secret_access_key, host=self.aws_region_host) + if all([self.aws_access_key_id, self.aws_secret_access_key, self.aws_region_host]): + conn = S3Connection(self.aws_access_key_id, self.aws_secret_access_key, host=self.aws_region_host) + else: + conn = S3Connection() bucket_name = self.storage_bucket bucket = conn.lookup(bucket_name) if bucket is None: From ba845878c0cdc6a0149af85e41e5e4aca7cdc3dd Mon Sep 17 00:00:00 2001 From: Ophir Yokatan Date: Tue, 4 Jul 2017 17:11:24 +0300 Subject: [PATCH 2/2] fix typo --- dvc/data_cloud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py index b1fbeddcb..c99e194d0 100644 --- a/dvc/data_cloud.py +++ b/dvc/data_cloud.py @@ -222,7 +222,7 @@ class DataCloudAWS(DataCloudBase): def sanity_check(self): creds = self.get_aws_credentials() if creds is None: - logger.info("can't find aws credetials, assuming envirment variables or iam role") + Logger.info("can't find aws credetials, assuming envirment variables or iam role") self._aws_creds = creds def _get_bucket_aws(self):