From ea9609c642c84309b6df08bc6103cf227719c2ab Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Fri, 2 Jan 2015 22:28:50 +0100
Subject: [PATCH] Add China region for s3 and ec2

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

Closes #156.
---
 README.md                                                     | 4 ++--
 src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java  | 2 ++
 .../org/elasticsearch/cloud/aws/InternalAwsS3Service.java     | 4 ++++
 .../java/org/elasticsearch/repositories/s3/S3Repository.java  | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a3077f150aa..1b31170018e 100644
--- a/README.md
+++ b/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
 
diff --git a/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java b/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
index dd15e608e21..8174e169c20 100644
--- a/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
+++ b/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
@@ -125,6 +125,8 @@ public class AwsEc2Service extends AbstractLifecycleComponent<AwsEc2Service> {
                 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 + "]");
             }
diff --git a/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java b/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java
index e436c107fcf..4c17c921888 100644
--- a/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java
+++ b/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java
@@ -191,6 +191,10 @@ public class InternalAwsS3Service extends AbstractLifecycleComponent<AwsS3Servic
             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 + "]");
         }
diff --git a/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java b/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
index 6b19a550ccc..f93f30392ab 100644
--- a/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
+++ b/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
@@ -121,6 +121,10 @@ public class S3Repository extends BlobStoreRepository {
                     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";
                 }
             }
         }