Permalink
Browse files

Merge pull request #3649 from JordonPhillips/ca-central

Update endpoints
  • Loading branch information...
2 parents dc4bf34 + c48e141 commit a1eae117174a51e855f260950de5d96edf4fd3d7 @JordonPhillips JordonPhillips committed on GitHub Dec 8, 2016
Showing with 61 additions and 5 deletions.
  1. +2 −0 boto/auth.py
  2. +54 −3 boto/endpoints.json
  3. +5 −2 tests/unit/auth/test_sigv4.py
View
@@ -64,6 +64,8 @@
'-ap-south-1',
'.us-east-2',
'-us-east-2',
+ '-ca-central',
+ '.ca-central'
]
View
@@ -5,6 +5,7 @@
"ap-south-1": "autoscaling.ap-south-1.amazonaws.com",
"ap-southeast-1": "autoscaling.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "autoscaling.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "autoscaling.ca-central-1.amazonaws.com",
"cn-north-1": "autoscaling.cn-north-1.amazonaws.com.cn",
"eu-central-1": "autoscaling.eu-central-1.amazonaws.com",
"eu-west-1": "autoscaling.eu-west-1.amazonaws.com",
@@ -24,6 +25,7 @@
"eu-west-1": "lambda.eu-west-1.amazonaws.com",
"us-east-1": "lambda.us-east-1.amazonaws.com",
"us-east-2": "lambda.us-east-2.amazonaws.com",
+ "us-west-1": "lambda.us-west-1.amazonaws.com",
"us-west-2": "lambda.us-west-2.amazonaws.com"
},
"cloudformation": {
@@ -32,6 +34,7 @@
"ap-south-1": "cloudformation.ap-south-1.amazonaws.com",
"ap-southeast-1": "cloudformation.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "cloudformation.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "cloudformation.ca-central-1.amazonaws.com",
"cn-north-1": "cloudformation.cn-north-1.amazonaws.com.cn",
"eu-central-1": "cloudformation.eu-central-1.amazonaws.com",
"eu-west-1": "cloudformation.eu-west-1.amazonaws.com",
@@ -48,6 +51,7 @@
"ap-south-1": "cloudfront.amazonaws.com",
"ap-southeast-1": "cloudfront.amazonaws.com",
"ap-southeast-2": "cloudfront.amazonaws.com",
+ "ca-central-1": "cloudfront.amazonaws.com",
"eu-central-1": "cloudfront.amazonaws.com",
"eu-west-1": "cloudfront.amazonaws.com",
"sa-east-1": "cloudfront.amazonaws.com",
@@ -60,6 +64,7 @@
"ap-northeast-1": "cloudhsm.ap-northeast-1.amazonaws.com",
"ap-southeast-1": "cloudhsm.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "cloudhsm.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "cloudhsm.ca-central-1.amazonaws.com",
"eu-central-1": "cloudhsm.eu-central-1.amazonaws.com",
"eu-west-1": "cloudhsm.eu-west-1.amazonaws.com",
"us-east-1": "cloudhsm.us-east-1.amazonaws.com",
@@ -98,6 +103,7 @@
"ap-south-1": "cloudtrail.ap-south-1.amazonaws.com",
"ap-southeast-1": "cloudtrail.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "cloudtrail.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "cloudtrail.ca-central-1.amazonaws.com",
"cn-north-1": "cloudtrail.cn-north-1.amazonaws.com.cn",
"eu-central-1": "cloudtrail.eu-central-1.amazonaws.com",
"eu-west-1": "cloudtrail.eu-west-1.amazonaws.com",
@@ -114,6 +120,7 @@
"ap-south-1": "monitoring.ap-south-1.amazonaws.com",
"ap-southeast-1": "monitoring.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "monitoring.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "monitoring.ca-central-1.amazonaws.com",
"cn-north-1": "monitoring.cn-north-1.amazonaws.com.cn",
"eu-central-1": "monitoring.eu-central-1.amazonaws.com",
"eu-west-1": "monitoring.eu-west-1.amazonaws.com",
@@ -130,6 +137,7 @@
"ap-south-1": "codedeploy.ap-south-1.amazonaws.com",
"ap-southeast-1": "codedeploy.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "codedeploy.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "codedeploy.ca-central-1.amazonaws.com",
"eu-central-1": "codedeploy.eu-central-1.amazonaws.com",
"eu-west-1": "codedeploy.eu-west-1.amazonaws.com",
"sa-east-1": "codedeploy.sa-east-1.amazonaws.com",
@@ -160,11 +168,14 @@
"ap-south-1": "config.ap-south-1.amazonaws.com",
"ap-southeast-1": "config.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "config.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "config.ca-central-1.amazonaws.com",
+ "cn-north-1": "config.cn-north-1.amazonaws.com.cn",
"eu-central-1": "config.eu-central-1.amazonaws.com",
"eu-west-1": "config.eu-west-1.amazonaws.com",
"sa-east-1": "config.sa-east-1.amazonaws.com",
"us-east-1": "config.us-east-1.amazonaws.com",
"us-east-2": "config.us-east-2.amazonaws.com",
+ "us-gov-west-1": "config.us-gov-west-1.amazonaws.com",
"us-west-1": "config.us-west-1.amazonaws.com",
"us-west-2": "config.us-west-2.amazonaws.com"
},
@@ -181,12 +192,14 @@
"ap-south-1": "directconnect.ap-south-1.amazonaws.com",
"ap-southeast-1": "directconnect.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "directconnect.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "directconnect.ca-central-1.amazonaws.com",
"cn-north-1": "directconnect.cn-north-1.amazonaws.com.cn",
"eu-central-1": "directconnect.eu-central-1.amazonaws.com",
"eu-west-1": "directconnect.eu-west-1.amazonaws.com",
"sa-east-1": "directconnect.sa-east-1.amazonaws.com",
"us-east-1": "directconnect.us-east-1.amazonaws.com",
"us-east-2": "directconnect.us-east-2.amazonaws.com",
+ "us-gov-west-1": "directconnect.us-gov-west-1.amazonaws.com",
"us-west-1": "directconnect.us-west-1.amazonaws.com",
"us-west-2": "directconnect.us-west-2.amazonaws.com"
},
@@ -196,6 +209,7 @@
"ap-south-1": "dynamodb.ap-south-1.amazonaws.com",
"ap-southeast-1": "dynamodb.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "dynamodb.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "dynamodb.ca-central-1.amazonaws.com",
"cn-north-1": "dynamodb.cn-north-1.amazonaws.com.cn",
"eu-central-1": "dynamodb.eu-central-1.amazonaws.com",
"eu-west-1": "dynamodb.eu-west-1.amazonaws.com",
@@ -212,6 +226,7 @@
"ap-south-1": "ec2.ap-south-1.amazonaws.com",
"ap-southeast-1": "ec2.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "ec2.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "ec2.ca-central-1.amazonaws.com",
"cn-north-1": "ec2.cn-north-1.amazonaws.com.cn",
"eu-central-1": "ec2.eu-central-1.amazonaws.com",
"eu-west-1": "ec2.eu-west-1.amazonaws.com",
@@ -226,6 +241,7 @@
"ap-northeast-1": "ecs.ap-northeast-1.amazonaws.com",
"ap-southeast-1": "ecs.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "ecs.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "ecs.ca-central-1.amazonaws.com",
"eu-central-1": "ecs.eu-central-1.amazonaws.com",
"eu-west-1": "ecs.eu-west-1.amazonaws.com",
"us-east-1": "ecs.us-east-1.amazonaws.com",
@@ -239,6 +255,7 @@
"ap-south-1": "elasticache.ap-south-1.amazonaws.com",
"ap-southeast-1": "elasticache.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "elasticache.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "elasticache.ca-central-1.amazonaws.com",
"cn-north-1": "elasticache.cn-north-1.amazonaws.com.cn",
"eu-central-1": "elasticache.eu-central-1.amazonaws.com",
"eu-west-1": "elasticache.eu-west-1.amazonaws.com",
@@ -255,6 +272,7 @@
"ap-south-1": "elasticbeanstalk.ap-south-1.amazonaws.com",
"ap-southeast-1": "elasticbeanstalk.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "elasticbeanstalk.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "elasticbeanstalk.ca-central-1.amazonaws.com",
"cn-north-1": "elasticbeanstalk.cn-north-1.amazonaws.com.cn",
"eu-central-1": "elasticbeanstalk.eu-central-1.amazonaws.com",
"eu-west-1": "elasticbeanstalk.eu-west-1.amazonaws.com",
@@ -270,6 +288,7 @@
"ap-south-1": "elasticloadbalancing.ap-south-1.amazonaws.com",
"ap-southeast-1": "elasticloadbalancing.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "elasticloadbalancing.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "elasticloadbalancing.ca-central-1.amazonaws.com",
"cn-north-1": "elasticloadbalancing.cn-north-1.amazonaws.com.cn",
"eu-central-1": "elasticloadbalancing.eu-central-1.amazonaws.com",
"eu-west-1": "elasticloadbalancing.eu-west-1.amazonaws.com",
@@ -286,6 +305,7 @@
"ap-south-1": "ap-south-1.elasticmapreduce.amazonaws.com",
"ap-southeast-1": "ap-southeast-1.elasticmapreduce.amazonaws.com",
"ap-southeast-2": "ap-southeast-2.elasticmapreduce.amazonaws.com",
+ "ca-central-1": "ca-central-1.elasticmapreduce.amazonaws.com",
"cn-north-1": "elasticmapreduce.cn-north-1.amazonaws.com.cn",
"eu-central-1": "elasticmapreduce.eu-central-1.amazonaws.com",
"eu-west-1": "eu-west-1.elasticmapreduce.amazonaws.com",
@@ -311,6 +331,7 @@
"ap-northeast-2": "glacier.ap-northeast-2.amazonaws.com",
"ap-south-1": "glacier.ap-south-1.amazonaws.com",
"ap-southeast-2": "glacier.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "glacier.ca-central-1.amazonaws.com",
"cn-north-1": "glacier.cn-north-1.amazonaws.com.cn",
"eu-central-1": "glacier.eu-central-1.amazonaws.com",
"eu-west-1": "glacier.eu-west-1.amazonaws.com",
@@ -326,6 +347,7 @@
"ap-south-1": "iam.amazonaws.com",
"ap-southeast-1": "iam.amazonaws.com",
"ap-southeast-2": "iam.amazonaws.com",
+ "ca-central-1": "iam.amazonaws.com",
"cn-north-1": "iam.cn-north-1.amazonaws.com.cn",
"eu-central-1": "iam.amazonaws.com",
"eu-west-1": "iam.amazonaws.com",
@@ -342,6 +364,7 @@
"ap-south-1": "importexport.amazonaws.com",
"ap-southeast-1": "importexport.amazonaws.com",
"ap-southeast-2": "importexport.amazonaws.com",
+ "ca-central-1": "importexport.amazonaws.com",
"eu-central-1": "importexport.amazonaws.com",
"eu-west-1": "importexport.amazonaws.com",
"sa-east-1": "importexport.amazonaws.com",
@@ -356,6 +379,7 @@
"ap-south-1": "kinesis.ap-south-1.amazonaws.com",
"ap-southeast-1": "kinesis.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "kinesis.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "kinesis.ca-central-1.amazonaws.com",
"cn-north-1": "kinesis.cn-north-1.amazonaws.com.cn",
"eu-central-1": "kinesis.eu-central-1.amazonaws.com",
"eu-west-1": "kinesis.eu-west-1.amazonaws.com",
@@ -371,6 +395,7 @@
"ap-south-1": "kms.ap-south-1.amazonaws.com",
"ap-southeast-1": "kms.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "kms.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "kms.ca-central-1.amazonaws.com",
"eu-central-1": "kms.eu-central-1.amazonaws.com",
"eu-west-1": "kms.eu-west-1.amazonaws.com",
"sa-east-1": "kms.sa-east-1.amazonaws.com",
@@ -386,11 +411,14 @@
"ap-south-1": "logs.ap-south-1.amazonaws.com",
"ap-southeast-1": "logs.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "logs.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "logs.ca-central-1.amazonaws.com",
+ "cn-north-1": "logs.cn-north-1.amazonaws.com.cn",
"eu-central-1": "logs.eu-central-1.amazonaws.com",
"eu-west-1": "logs.eu-west-1.amazonaws.com",
"sa-east-1": "logs.sa-east-1.amazonaws.com",
"us-east-1": "logs.us-east-1.amazonaws.com",
"us-east-2": "logs.us-east-2.amazonaws.com",
+ "us-gov-west-1": "logs.us-gov-west-1.amazonaws.com",
"us-west-1": "logs.us-west-1.amazonaws.com",
"us-west-2": "logs.us-west-2.amazonaws.com"
},
@@ -399,14 +427,26 @@
"us-east-1": "machinelearning.us-east-1.amazonaws.com"
},
"opsworks": {
- "us-east-1": "opsworks.us-east-1.amazonaws.com"
+ "ap-northeast-1": "opsworks.ap-northeast-1.amazonaws.com",
+ "ap-northeast-2": "opsworks.ap-northeast-2.amazonaws.com",
+ "ap-south-1": "opsworks.ap-south-1.amazonaws.com",
+ "ap-southeast-1": "opsworks.ap-southeast-1.amazonaws.com",
+ "ap-southeast-2": "opsworks.ap-southeast-2.amazonaws.com",
+ "eu-central-1": "opsworks.eu-central-1.amazonaws.com",
+ "eu-west-1": "opsworks.eu-west-1.amazonaws.com",
+ "sa-east-1": "opsworks.sa-east-1.amazonaws.com",
+ "us-east-1": "opsworks.us-east-1.amazonaws.com",
+ "us-east-2": "opsworks.us-east-2.amazonaws.com",
+ "us-west-1": "opsworks.us-west-1.amazonaws.com",
+ "us-west-2": "opsworks.us-west-2.amazonaws.com"
},
"rds": {
"ap-northeast-1": "rds.ap-northeast-1.amazonaws.com",
"ap-northeast-2": "rds.ap-northeast-2.amazonaws.com",
"ap-south-1": "rds.ap-south-1.amazonaws.com",
"ap-southeast-1": "rds.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "rds.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "rds.ca-central-1.amazonaws.com",
"cn-north-1": "rds.cn-north-1.amazonaws.com.cn",
"eu-central-1": "rds.eu-central-1.amazonaws.com",
"eu-west-1": "rds.eu-west-1.amazonaws.com",
@@ -423,8 +463,11 @@
"ap-south-1": "redshift.ap-south-1.amazonaws.com",
"ap-southeast-1": "redshift.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "redshift.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "redshift.ca-central-1.amazonaws.com",
+ "cn-north-1": "redshift.cn-north-1.amazonaws.com.cn",
"eu-central-1": "redshift.eu-central-1.amazonaws.com",
"eu-west-1": "redshift.eu-west-1.amazonaws.com",
+ "sa-east-1": "redshift.sa-east-1.amazonaws.com",
"us-east-1": "redshift.us-east-1.amazonaws.com",
"us-east-2": "redshift.us-east-2.amazonaws.com",
"us-gov-west-1": "redshift.us-gov-west-1.amazonaws.com",
@@ -437,6 +480,7 @@
"ap-south-1": "route53.amazonaws.com",
"ap-southeast-1": "route53.amazonaws.com",
"ap-southeast-2": "route53.amazonaws.com",
+ "ca-central-1": "route53.amazonaws.com",
"eu-central-1": "route53.amazonaws.com",
"eu-west-1": "route53.amazonaws.com",
"sa-east-1": "route53.amazonaws.com",
@@ -451,9 +495,10 @@
"s3": {
"ap-northeast-1": "s3-ap-northeast-1.amazonaws.com",
"ap-northeast-2": "s3.ap-northeast-2.amazonaws.com",
- "ap-south-1": "s3-ap-south-1.amazonaws.com",
+ "ap-south-1": "s3.ap-south-1.amazonaws.com",
"ap-southeast-1": "s3-ap-southeast-1.amazonaws.com",
"ap-southeast-2": "s3-ap-southeast-2.amazonaws.com",
+ "ca-central-1": "s3.ca-central-1.amazonaws.com",
"cn-north-1": "s3.cn-north-1.amazonaws.com.cn",
"eu-central-1": "s3.eu-central-1.amazonaws.com",
"eu-west-1": "s3-eu-west-1.amazonaws.com",
@@ -485,6 +530,7 @@
"ap-south-1": "sns.ap-south-1.amazonaws.com",
"ap-southeast-1": "sns.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "sns.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "sns.ca-central-1.amazonaws.com",
"cn-north-1": "sns.cn-north-1.amazonaws.com.cn",
"eu-central-1": "sns.eu-central-1.amazonaws.com",
"eu-west-1": "sns.eu-west-1.amazonaws.com",
@@ -501,6 +547,7 @@
"ap-south-1": "ap-south-1.queue.amazonaws.com",
"ap-southeast-1": "ap-southeast-1.queue.amazonaws.com",
"ap-southeast-2": "ap-southeast-2.queue.amazonaws.com",
+ "ca-central-1": "ca-central-1.queue.amazonaws.com",
"cn-north-1": "cn-north-1.queue.amazonaws.com.cn",
"eu-central-1": "eu-central-1.queue.amazonaws.com",
"eu-west-1": "eu-west-1.queue.amazonaws.com",
@@ -513,8 +560,10 @@
},
"storagegateway": {
"ap-northeast-1": "storagegateway.ap-northeast-1.amazonaws.com",
+ "ap-northeast-2": "storagegateway.ap-northeast-2.amazonaws.com",
"ap-southeast-1": "storagegateway.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "storagegateway.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "storagegateway.ca-central-1.amazonaws.com",
"cn-north-1": "storagegateway.cn-north-1.amazonaws.com.cn",
"eu-central-1": "storagegateway.eu-central-1.amazonaws.com",
"eu-west-1": "storagegateway.eu-west-1.amazonaws.com",
@@ -526,10 +575,11 @@
},
"sts": {
"ap-northeast-1": "sts.amazonaws.com",
- "ap-northeast-2": "sts.amazonaws.com",
+ "ap-northeast-2": "sts.ap-northeast-2.amazonaws.com",
"ap-south-1": "sts.amazonaws.com",
"ap-southeast-1": "sts.amazonaws.com",
"ap-southeast-2": "sts.amazonaws.com",
+ "ca-central-1": "sts.amazonaws.com",
"cn-north-1": "sts.cn-north-1.amazonaws.com.cn",
"eu-central-1": "sts.amazonaws.com",
"eu-west-1": "sts.amazonaws.com",
@@ -549,6 +599,7 @@
"ap-south-1": "swf.ap-south-1.amazonaws.com",
"ap-southeast-1": "swf.ap-southeast-1.amazonaws.com",
"ap-southeast-2": "swf.ap-southeast-2.amazonaws.com",
+ "ca-central-1": "swf.ca-central-1.amazonaws.com",
"cn-north-1": "swf.cn-north-1.amazonaws.com.cn",
"eu-central-1": "swf.eu-central-1.amazonaws.com",
"eu-west-1": "swf.eu-west-1.amazonaws.com",
@@ -551,7 +551,11 @@ def test_sigv4_opt_out(self):
self.assertEqual(fake._required_auth_capability(), ['nope'])
def test_sigv4_non_optional(self):
- region_groups = ['.cn-north', '.eu-central', '-eu-central']
+ region_groups = [
+ '.cn-north',
+ '.eu-central', '-eu-central',
+ '.ca-central', '-ca-central'
+ ]
specific_regions = [
'.ap-northeast-2', '-ap-northeast-2',
'.ap-south-1', '-ap-south-1',
@@ -572,7 +576,6 @@ def test_sigv4_non_optional(self):
self.assertEqual(
fake._required_auth_capability(), ['hmac-v4-s3'])
-
def test_sigv4_opt_in_config(self):
# Opt-in via the config.
self.config = {

0 comments on commit a1eae11

Please sign in to comment.