Kaynağa Gözat

HUE-7165 [aws] hue s3 browser should provide accessibility for all
buckets in v2 regions

jdesjean 8 yıl önce
ebeveyn
işleme
457158c

+ 3 - 3
desktop/libs/aws/src/aws/client.py

@@ -23,7 +23,7 @@ import boto.s3
 import boto.s3.connection
 import boto.utils
 
-from aws.conf import get_default_region, has_iam_metadata, DEFAULT_CALLING_FORMAT
+from aws.conf import get_default_region, has_iam_metadata, DEFAULT_CALLING_FORMAT, AWS_ACCOUNT_REGION_DEFAULT
 from aws.s3.s3fs import S3FileSystemException
 
 
@@ -34,13 +34,13 @@ HTTP_SOCKET_TIMEOUT_S = 60
 
 
 class Client(object):
-  def __init__(self, aws_access_key_id=None, aws_secret_access_key=None, aws_security_token=None, region=None,
+  def __init__(self, aws_access_key_id=None, aws_secret_access_key=None, aws_security_token=None, region=AWS_ACCOUNT_REGION_DEFAULT,
                timeout=HTTP_SOCKET_TIMEOUT_S, host=None, proxy_address=None, proxy_port=None, proxy_user=None,
                proxy_pass=None, calling_format=None, is_secure=True):
     self._access_key_id = aws_access_key_id
     self._secret_access_key = aws_secret_access_key
     self._security_token = aws_security_token
-    self._region = region.lower() if region is not None else None
+    self._region = region.lower()
     self._timeout = timeout
     self._host = host
     self._proxy_address = proxy_address

+ 2 - 1
desktop/libs/aws/src/aws/conf.py

@@ -35,6 +35,7 @@ DEFAULT_CALLING_FORMAT = 'boto.s3.connection.OrdinaryCallingFormat'
 SUBDOMAIN_ENDPOINT_RE = 's3.(?P<region>[a-z0-9-]+).amazonaws.com'
 HYPHEN_ENDPOINT_RE = 's3-(?P<region>[a-z0-9-]+).amazonaws.com'
 DUALSTACK_ENDPOINT_RE = 's3.dualstack.(?P<region>[a-z0-9-]+).amazonaws.com'
+AWS_ACCOUNT_REGION_DEFAULT = Location.USEast
 
 
 def get_locations():
@@ -127,7 +128,7 @@ AWS_ACCOUNTS = UnspecifiedConfigSection(
       ),
       REGION=Config(
         key='region',
-        default='us-east-1',
+        default=AWS_ACCOUNT_REGION_DEFAULT,
         type=str
       ),
       HOST=Config(