diff --git a/waterbutler/providers/s3/provider.py b/waterbutler/providers/s3/provider.py index d86d9122e..587a59090 100644 --- a/waterbutler/providers/s3/provider.py +++ b/waterbutler/providers/s3/provider.py @@ -86,7 +86,7 @@ def __init__(self, auth, credentials, settings, **kwargs): credentials['secret_key'], calling_format=OrdinaryCallingFormat()) self.bucket = self.connection.get_bucket(settings['bucket'], validate=False) self.encrypt_uploads = self.settings.get('encrypt_uploads', False) - self.region = None + self.region = self.settings.get('region', None) async def validate_v1_path(self, path, **kwargs): await self._check_region() @@ -851,10 +851,10 @@ async def _check_region(self): if self.region == 'EU': self.region = 'eu-west-1' - if self.region != '': - self.connection.host = self.connection.host.replace('s3.', 's3-' + self.region + '.', 1) - self.connection._auth_handler = get_auth_handler( - self.connection.host, boto_config, self.connection.provider, self.connection._required_auth_capability()) + if self.region != '': + self.connection.host = self.connection.host.replace('s3.', 's3-' + self.region + '.', 1) + self.connection._auth_handler = get_auth_handler( + self.connection.host, boto_config, self.connection.provider, self.connection._required_auth_capability()) self.metrics.add('region', self.region)