Add China region for s3 and ec2

China region name is `cn-north-1`.

Closes #156.

Author: dadoonet

README.md

@@ -85,8 +85,8 @@ The `cloud.aws.region` can be set to a region and will automatically use the rel
 * `ap-northeast` (`ap-northeast-1`)
 * `eu-west` (`eu-west-1`)
 * `eu-central` (`eu-central-1`)
-* `sa-east` (`sa-east-1`).
-
+* `sa-east` (`sa-east-1`)
+* `cn-north` (`cn-north-1`)
 
 ## EC2 Discovery
 

src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java

@@ -125,6 +125,8 @@ public synchronized AmazonEC2 client() {
                 endpoint = "ec2.eu-central-1.amazonaws.com";
             } else if (region.equals("sa-east") || region.equals("sa-east-1")) {
                 endpoint = "ec2.sa-east-1.amazonaws.com";
+            } else if (region.equals("cn-north") || region.equals("cn-north-1")) {
+                endpoint = "ec2.cn-north-1.amazonaws.com";
             } else {
                 throw new ElasticsearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
             }

src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java

@@ -191,6 +191,10 @@ private static String getEndpoint(String region) {
             return "s3-sa-east-1.amazonaws.com";
         } else if ("sa-east-1".equals(region)) {
             return "s3-sa-east-1.amazonaws.com";
+        } else if ("cn-north".equals(region)) {
+            return "s3-cn-north-1.amazonaws.com";
+        } else if ("cn-north-1".equals(region)) {
+            return "s3-cn-north-1.amazonaws.com";
         } else {
             throw new ElasticsearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");
         }

src/main/java/org/elasticsearch/repositories/s3/S3Repository.java

@@ -121,6 +121,10 @@ public S3Repository(RepositoryName name, RepositorySettings repositorySettings,
                     region = "sa-east-1";
                 } else if ("sa-east-1".equals(regionSetting)) {
                     region = "sa-east-1";
+                } else if ("cn-north".equals(regionSetting)) {
+                    region = "cn-north-1";
+                } else if ("cn-north-1".equals(regionSetting)) {
+                    region = "cn-north-1";
                 }
             }
         }