Skip to content

Commit

Permalink
Added eu-central-1 to various services
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyleknap
kyleknap committed Oct 21, 2014
1 parent 4e0b218 commit 6e36871
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 33 deletions.
5 changes: 3 additions & 2 deletions boto/auth.py
View file
Expand Up @@ -1000,7 +1000,8 @@ def _wrapper(self):
# ``boto/iam/connection.py``, as several things there are also
# endpoint-related.
if getattr(self.region, 'endpoint', ''):
if '.cn-' in self.region.endpoint:
if '.cn-' in self.region.endpoint or \
'.eu-central' in self.region.endpoint:
return ['hmac-v4']

return func(self)
Expand All @@ -1019,7 +1020,7 @@ def _wrapper(self):
# If you're making changes here, you should also check
# ``boto/iam/connection.py``, as several things there are also
# endpoint-related.
if '.cn-' in self.host:
if '.cn-' in self.host or '.eu-central' in self.host:
return ['hmac-v4-s3']

return func(self)
Expand Down
87 changes: 58 additions & 29 deletions boto/endpoints.json
View file
Expand Up @@ -9,7 +9,8 @@
"us-east-1": "autoscaling.us-east-1.amazonaws.com",
"us-gov-west-1": "autoscaling.us-gov-west-1.amazonaws.com",
"us-west-1": "autoscaling.us-west-1.amazonaws.com",
"us-west-2": "autoscaling.us-west-2.amazonaws.com"
"us-west-2": "autoscaling.us-west-2.amazonaws.com",
"eu-central-1": "autoscaling.eu-central-1.amazonaws.com"
},
"cloudformation": {
"ap-northeast-1": "cloudformation.ap-northeast-1.amazonaws.com",
Expand All @@ -21,7 +22,8 @@
"us-east-1": "cloudformation.us-east-1.amazonaws.com",
"us-gov-west-1": "cloudformation.us-gov-west-1.amazonaws.com",
"us-west-1": "cloudformation.us-west-1.amazonaws.com",
"us-west-2": "cloudformation.us-west-2.amazonaws.com"
"us-west-2": "cloudformation.us-west-2.amazonaws.com",
"eu-central-1": "cloudformation.eu-central-1.amazonaws.com"
},
"cloudfront": {
"ap-northeast-1": "cloudfront.amazonaws.com",
Expand All @@ -31,7 +33,8 @@
"sa-east-1": "cloudfront.amazonaws.com",
"us-east-1": "cloudfront.amazonaws.com",
"us-west-1": "cloudfront.amazonaws.com",
"us-west-2": "cloudfront.amazonaws.com"
"us-west-2": "cloudfront.amazonaws.com",
"eu-central-1": "cloudfront.amazonaws.com"
},
"cloudsearch": {
"ap-southeast-1": "cloudsearch.ap-southeast-1.amazonaws.com",
Expand All @@ -41,7 +44,8 @@
"eu-west-1": "cloudsearch.eu-west-1.amazonaws.com",
"us-east-1": "cloudsearch.us-east-1.amazonaws.com",
"us-west-1": "cloudsearch.us-west-1.amazonaws.com",
"us-west-2": "cloudsearch.us-west-2.amazonaws.com"
"us-west-2": "cloudsearch.us-west-2.amazonaws.com",
"eu-central-1": "cloudsearch.eu-central-1.amazonaws.com"
},
"cloudtrail": {
"ap-northeast-1": "cloudtrail.ap-northeast-1.amazonaws.com",
Expand All @@ -51,7 +55,8 @@
"sa-east-1": "cloudtrail.sa-east-1.amazonaws.com",
"us-east-1": "cloudtrail.us-east-1.amazonaws.com",
"us-west-1": "cloudtrail.us-west-1.amazonaws.com",
"us-west-2": "cloudtrail.us-west-2.amazonaws.com"
"us-west-2": "cloudtrail.us-west-2.amazonaws.com",
"eu-central-1": "cloudtrail.eu-central-1.amazonaws.com"
},
"cloudwatch": {
"ap-northeast-1": "monitoring.ap-northeast-1.amazonaws.com",
Expand All @@ -63,7 +68,8 @@
"us-east-1": "monitoring.us-east-1.amazonaws.com",
"us-gov-west-1": "monitoring.us-gov-west-1.amazonaws.com",
"us-west-1": "monitoring.us-west-1.amazonaws.com",
"us-west-2": "monitoring.us-west-2.amazonaws.com"
"us-west-2": "monitoring.us-west-2.amazonaws.com",
"eu-central-1": "monitoring.eu-central-1.amazonaws.com"
},
"cognito-identity": {
"us-east-1": "cognito-identity.us-east-1.amazonaws.com"
Expand All @@ -76,7 +82,8 @@
"us-west-2": "datapipeline.us-west-2.amazonaws.com",
"eu-west-1": "datapipeline.eu-west-1.amazonaws.com",
"ap-southeast-2": "datapipeline.ap-southeast-2.amazonaws.com",
"ap-northeast-1": "datapipeline.ap-northeast-1.amazonaws.com"
"ap-northeast-1": "datapipeline.ap-northeast-1.amazonaws.com",
"eu-central-1": "datapipeline.eu-central-1.amazonaws.com"
},
"directconnect": {
"ap-northeast-1": "directconnect.ap-northeast-1.amazonaws.com",
Expand All @@ -86,7 +93,8 @@
"sa-east-1": "directconnect.sa-east-1.amazonaws.com",
"us-east-1": "directconnect.us-east-1.amazonaws.com",
"us-west-1": "directconnect.us-west-1.amazonaws.com",
"us-west-2": "directconnect.us-west-2.amazonaws.com"
"us-west-2": "directconnect.us-west-2.amazonaws.com",
"eu-central-1": "directconnect.eu-central-1.amazonaws.com"
},
"dynamodb": {
"ap-northeast-1": "dynamodb.ap-northeast-1.amazonaws.com",
Expand All @@ -98,7 +106,8 @@
"us-east-1": "dynamodb.us-east-1.amazonaws.com",
"us-gov-west-1": "dynamodb.us-gov-west-1.amazonaws.com",
"us-west-1": "dynamodb.us-west-1.amazonaws.com",
"us-west-2": "dynamodb.us-west-2.amazonaws.com"
"us-west-2": "dynamodb.us-west-2.amazonaws.com",
"eu-central-1": "dynamodb.eu-central-1.amazonaws.com"
},
"ec2": {
"ap-northeast-1": "ec2.ap-northeast-1.amazonaws.com",
Expand All @@ -110,7 +119,8 @@
"us-east-1": "ec2.us-east-1.amazonaws.com",
"us-gov-west-1": "ec2.us-gov-west-1.amazonaws.com",
"us-west-1": "ec2.us-west-1.amazonaws.com",
"us-west-2": "ec2.us-west-2.amazonaws.com"
"us-west-2": "ec2.us-west-2.amazonaws.com",
"eu-central-1": "ec2.eu-central-1.amazonaws.com"
},
"elasticache": {
"ap-northeast-1": "elasticache.ap-northeast-1.amazonaws.com",
Expand All @@ -121,7 +131,8 @@
"sa-east-1": "elasticache.sa-east-1.amazonaws.com",
"us-east-1": "elasticache.us-east-1.amazonaws.com",
"us-west-1": "elasticache.us-west-1.amazonaws.com",
"us-west-2": "elasticache.us-west-2.amazonaws.com"
"us-west-2": "elasticache.us-west-2.amazonaws.com",
"eu-central-1": "elasticache.eu-central-1.amazonaws.com"
},
"elasticbeanstalk": {
"ap-northeast-1": "elasticbeanstalk.ap-northeast-1.amazonaws.com",
Expand All @@ -131,7 +142,8 @@
"sa-east-1": "elasticbeanstalk.sa-east-1.amazonaws.com",
"us-east-1": "elasticbeanstalk.us-east-1.amazonaws.com",
"us-west-1": "elasticbeanstalk.us-west-1.amazonaws.com",
"us-west-2": "elasticbeanstalk.us-west-2.amazonaws.com"
"us-west-2": "elasticbeanstalk.us-west-2.amazonaws.com",
"eu-central-1": "elasticbeanstalk.eu-central-1.amazonaws.com"
},
"elasticloadbalancing": {
"ap-northeast-1": "elasticloadbalancing.ap-northeast-1.amazonaws.com",
Expand All @@ -143,7 +155,8 @@
"us-east-1": "elasticloadbalancing.us-east-1.amazonaws.com",
"us-gov-west-1": "elasticloadbalancing.us-gov-west-1.amazonaws.com",
"us-west-1": "elasticloadbalancing.us-west-1.amazonaws.com",
"us-west-2": "elasticloadbalancing.us-west-2.amazonaws.com"
"us-west-2": "elasticloadbalancing.us-west-2.amazonaws.com",
"eu-central-1": "elasticloadbalancing.eu-central-1.amazonaws.com"
},
"elasticmapreduce": {
"ap-northeast-1": "ap-northeast-1.elasticmapreduce.amazonaws.com",
Expand All @@ -155,15 +168,17 @@
"us-east-1": "elasticmapreduce.us-east-1.amazonaws.com",
"us-gov-west-1": "us-gov-west-1.elasticmapreduce.amazonaws.com",
"us-west-1": "us-west-1.elasticmapreduce.amazonaws.com",
"us-west-2": "us-west-2.elasticmapreduce.amazonaws.com"
"us-west-2": "us-west-2.elasticmapreduce.amazonaws.com",
"eu-central-1": "eu-central-1.elasticmapreduce.amazonaws.com"
},
"elastictranscoder": {
"ap-northeast-1": "elastictranscoder.ap-northeast-1.amazonaws.com",
"ap-southeast-1": "elastictranscoder.ap-southeast-1.amazonaws.com",
"eu-west-1": "elastictranscoder.eu-west-1.amazonaws.com",
"us-east-1": "elastictranscoder.us-east-1.amazonaws.com",
"us-west-1": "elastictranscoder.us-west-1.amazonaws.com",
"us-west-2": "elastictranscoder.us-west-2.amazonaws.com"
"us-west-2": "elastictranscoder.us-west-2.amazonaws.com",
"eu-central-1": "elastictranscoder.eu-central-1.amazonaws.com"
},
"glacier": {
"ap-northeast-1": "glacier.ap-northeast-1.amazonaws.com",
Expand All @@ -172,7 +187,8 @@
"eu-west-1": "glacier.eu-west-1.amazonaws.com",
"us-east-1": "glacier.us-east-1.amazonaws.com",
"us-west-1": "glacier.us-west-1.amazonaws.com",
"us-west-2": "glacier.us-west-2.amazonaws.com"
"us-west-2": "glacier.us-west-2.amazonaws.com",
"eu-central-1": "glacier.eu-central-1.amazonaws.com"
},
"iam": {
"ap-northeast-1": "iam.amazonaws.com",
Expand Down Expand Up @@ -202,15 +218,18 @@
"eu-west-1": "kinesis.eu-west-1.amazonaws.com",
"ap-southeast-1": "kinesis.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "kinesis.ap-southeast-2.amazonaws.com",
"ap-northeast-1": "kinesis.ap-northeast-1.amazonaws.com"
"ap-northeast-1": "kinesis.ap-northeast-1.amazonaws.com",
"eu-central-1": "kinesis.eu-central-1.amazonaws.com"
},
"logs": {
"us-east-1": "logs.us-east-1.amazonaws.com",
"us-west-2": "logs.us-west-2.amazonaws.com",
"eu-west-1": "logs.eu-west-1.amazonaws.com"
"eu-west-1": "logs.eu-west-1.amazonaws.com",
"eu-central-1": "logs.eu-central-1.amazonaws.com"
},
"opsworks": {
"us-east-1": "opsworks.us-east-1.amazonaws.com"
"us-east-1": "opsworks.us-east-1.amazonaws.com",
"eu-central-1": "opsworks.eu-central-1.amazonaws.com"
},
"rds": {
"ap-northeast-1": "rds.ap-northeast-1.amazonaws.com",
Expand All @@ -222,15 +241,17 @@
"us-east-1": "rds.amazonaws.com",
"us-gov-west-1": "rds.us-gov-west-1.amazonaws.com",
"us-west-1": "rds.us-west-1.amazonaws.com",
"us-west-2": "rds.us-west-2.amazonaws.com"
"us-west-2": "rds.us-west-2.amazonaws.com",
"eu-central-1": "rds.eu-central-1.amazonaws.com"
},
"redshift": {
"ap-northeast-1": "redshift.ap-northeast-1.amazonaws.com",
"ap-southeast-1": "redshift.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "redshift.ap-southeast-2.amazonaws.com",
"eu-west-1": "redshift.eu-west-1.amazonaws.com",
"us-east-1": "redshift.us-east-1.amazonaws.com",
"us-west-2": "redshift.us-west-2.amazonaws.com"
"us-west-2": "redshift.us-west-2.amazonaws.com",
"eu-central-1": "redshift.eu-central-1.amazonaws.com"
},
"route53": {
"ap-northeast-1": "route53.amazonaws.com",
Expand All @@ -255,7 +276,8 @@
"us-east-1": "s3.amazonaws.com",
"us-gov-west-1": "s3-us-gov-west-1.amazonaws.com",
"us-west-1": "s3-us-west-1.amazonaws.com",
"us-west-2": "s3-us-west-2.amazonaws.com"
"us-west-2": "s3-us-west-2.amazonaws.com",
"eu-central-1": "s3.eu-central-1.amazonaws.com"
},
"sdb": {
"ap-northeast-1": "sdb.ap-northeast-1.amazonaws.com",
Expand All @@ -265,12 +287,14 @@
"sa-east-1": "sdb.sa-east-1.amazonaws.com",
"us-east-1": "sdb.amazonaws.com",
"us-west-1": "sdb.us-west-1.amazonaws.com",
"us-west-2": "sdb.us-west-2.amazonaws.com"
"us-west-2": "sdb.us-west-2.amazonaws.com",
"eu-central-1": "sdb.eu-central-1.amazonaws.com"
},
"ses": {
"eu-west-1": "email.eu-west-1.amazonaws.com",
"us-east-1": "email.us-east-1.amazonaws.com",
"us-west-2": "email.us-west-2.amazonaws.com"
"us-west-2": "email.us-west-2.amazonaws.com",
"eu-central-1": "email.eu-central-1.amazonaws.com"
},
"sns": {
"ap-northeast-1": "sns.ap-northeast-1.amazonaws.com",
Expand All @@ -282,7 +306,8 @@
"us-east-1": "sns.us-east-1.amazonaws.com",
"us-gov-west-1": "sns.us-gov-west-1.amazonaws.com",
"us-west-1": "sns.us-west-1.amazonaws.com",
"us-west-2": "sns.us-west-2.amazonaws.com"
"us-west-2": "sns.us-west-2.amazonaws.com",
"eu-central-1": "sns.eu-central-1.amazonaws.com"
},
"sqs": {
"ap-northeast-1": "ap-northeast-1.queue.amazonaws.com",
Expand All @@ -294,7 +319,8 @@
"us-east-1": "queue.amazonaws.com",
"us-gov-west-1": "us-gov-west-1.queue.amazonaws.com",
"us-west-1": "us-west-1.queue.amazonaws.com",
"us-west-2": "us-west-2.queue.amazonaws.com"
"us-west-2": "us-west-2.queue.amazonaws.com",
"eu-central-1": "eu-central-1.queue.amazonaws.com"
},
"storagegateway": {
"ap-northeast-1": "storagegateway.ap-northeast-1.amazonaws.com",
Expand All @@ -304,7 +330,8 @@
"sa-east-1": "storagegateway.sa-east-1.amazonaws.com",
"us-east-1": "storagegateway.us-east-1.amazonaws.com",
"us-west-1": "storagegateway.us-west-1.amazonaws.com",
"us-west-2": "storagegateway.us-west-2.amazonaws.com"
"us-west-2": "storagegateway.us-west-2.amazonaws.com",
"eu-central-1": "storagegateway.eu-central-1.amazonaws.com"
},
"sts": {
"ap-northeast-1": "sts.amazonaws.com",
Expand All @@ -319,7 +346,8 @@
"us-west-2": "sts.amazonaws.com"
},
"support": {
"us-east-1": "support.us-east-1.amazonaws.com"
"us-east-1": "support.us-east-1.amazonaws.com",
"eu-central-1": "support.eu-central-1.amazonaws.com"
},
"swf": {
"ap-northeast-1": "swf.ap-northeast-1.amazonaws.com",
Expand All @@ -331,6 +359,7 @@
"us-east-1": "swf.us-east-1.amazonaws.com",
"us-gov-west-1": "swf.us-gov-west-1.amazonaws.com",
"us-west-1": "swf.us-west-1.amazonaws.com",
"us-west-2": "swf.us-west-2.amazonaws.com"
"us-west-2": "swf.us-west-2.amazonaws.com",
"eu-central-1": "swf.eu-central-1.amazonaws.com"
}
}
4 changes: 2 additions & 2 deletions tests/unit/test_regioninfo.py
View file
Expand Up @@ -104,7 +104,7 @@ def test_load_regions(self):
def test_get_regions(self):
# With defaults.
ec2_regions = get_regions('ec2')
self.assertEqual(len(ec2_regions), 10)
self.assertTrue(len(ec2_regions) >= 10)
west_2 = None

for region_info in ec2_regions:
Expand All @@ -124,7 +124,7 @@ def test_get_regions_overrides(self):
region_cls=TestRegionInfo,
connection_cls=FakeConn
)
self.assertEqual(len(ec2_regions), 10)
self.assertTrue(len(ec2_regions) >= 10)
west_2 = None

for region_info in ec2_regions:
Expand Down

0 comments on commit 6e36871

Please sign in to comment.