Merge lp:~axwalk/goamz/aws-cnnorth1-endpoint into lp:goamz

[Andrew Wilkins]

aws: add cn-north-1 region

aws: add cn-north-1 region

https://codereview.appspot.com/106490043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+225995_code.launchpad.net,

Message:
Please take a look.

Description:
aws: add cn-north-1 region

https://code.launchpad.net/~axwalk/goamz/aws-cnnorth1-endpoint/+merge/225995

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/106490043/

Affected files (+16, -0 lines):
   A [revision details]
   M aws/aws.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: aws/aws.go
=== modified file 'aws/aws.go'
--- aws/aws.go 2014-02-12 13:42:33 +0000
+++ aws/aws.go 2014-07-08 15:42:26 +0000
@@ -133,6 +133,19 @@
   "https://iam.amazonaws.com",
  }

+var CNNorth = Region{
+ "cn-north-1",
+ "https://ec2.cn-north-1.amazonaws.com.cn",
+ "https://s3.cn-north-1.amazonaws.com.cn",
+ "",
+ true,
+ true,
+ "https://sdb.cn-north-1.amazonaws.com.cn",
+ "https://sns.cn-north-1.amazonaws.com.cn",
+ "https://sqs.cn-north-1.amazonaws.com.cn",
+ "https://iam.amazonaws.com.cn",
+}
+
  var Regions = map[string]Region{
   APNortheast.Name: APNortheast,
   APSoutheast.Name: APSoutheast,
@@ -142,6 +155,7 @@
   USWest.Name: USWest,
   USWest2.Name: USWest2,
   SAEast.Name: SAEast,
+ CNNorth.Name: CNNorth,
  }

  type Auth struct {

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/106490043/

=== modified file 'aws/aws.go'
--- aws/aws.go	2014-02-12 13:42:33 +0000
+++ aws/aws.go	2014-07-08 15:46:03 +0000
@@ -133,6 +133,19 @@
 	"https://iam.amazonaws.com",
 }
 
+var CNNorth = Region{
+	"cn-north-1",
+	"https://ec2.cn-north-1.amazonaws.com.cn",
+	"https://s3.cn-north-1.amazonaws.com.cn",
+	"",
+	true,
+	true,
+	"https://sdb.cn-north-1.amazonaws.com.cn",
+	"https://sns.cn-north-1.amazonaws.com.cn",
+	"https://sqs.cn-north-1.amazonaws.com.cn",
+	"https://iam.amazonaws.com.cn",
+}
+
 var Regions = map[string]Region{
 	APNortheast.Name:  APNortheast,
 	APSoutheast.Name:  APSoutheast,
@@ -142,6 +155,7 @@
 	USWest.Name:       USWest,
 	USWest2.Name:      USWest2,
 	SAEast.Name:       SAEast,
+	CNNorth.Name:      CNNorth,
 }
 
 type Auth struct {