Skip to content

Commit 4215c25

Browse files
author
Harshavardhana
committed
Merge pull request #283 from harshavardhana/region
region: Remove 'milkyway' region.
2 parents 23d05d9 + 004f2fb commit 4215c25

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

minio/helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def get_region(hostname):
2929
"""
30-
Get region based on hostname, defaults to "milkyway" if KeyError
30+
Get region based on hostname, defaults to "us-east-1" if KeyError
3131
"""
3232
region = {
3333
's3.amazonaws.com': 'us-east-1',
@@ -46,7 +46,7 @@ def get_region(hostname):
4646
try:
4747
return region[hostname]
4848
except KeyError:
49-
return 'milkyway'
49+
return 'us-east-1'
5050

5151
def get_target_url(url, bucket=None, key=None, query=None):
5252
"""

minio/minio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def make_bucket(self, bucket, acl=None):
140140
region = get_region(self._location)
141141

142142
content = ''
143-
if not (region == 'us-east-1' or region == 'milkyway'):
143+
if not (region == 'us-east-1'):
144144
content = bucket_constraint(region)
145145
headers['Content-Length'] = str(len(content))
146146

tests/unit/sign_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ def test_request_with_query(self):
7777
class StringToSignTest(TestCase):
7878
def test_signing_key(self):
7979
expected_signing_key_list = ['AWS4-HMAC-SHA256', '20150620T010203Z',
80-
'20150620/milkyway/s3/aws4_request',
80+
'20150620/us-east-1/s3/aws4_request',
8181
'request_hash']
8282

83-
actual_signing_key = generate_string_to_sign(dt, 'milkyway', 'request_hash')
83+
actual_signing_key = generate_string_to_sign(dt, 'us-east-1', 'request_hash')
8484
eq_('\n'.join(expected_signing_key_list), actual_signing_key)
8585

8686

0 commit comments

Comments
 (0)