Merge elastic#137

Closes elastic#136

Author: tlrx

README.md

@@ -84,6 +84,7 @@ The `cloud.aws.region` can be set to a region and will automatically use the rel
 * `ap-southeast-2`
 * `ap-northeast` (`ap-northeast-1`)
 * `eu-west` (`eu-west-1`)
+* `eu-central` (`eu-central-1`)
 * `sa-east` (`sa-east-1`).
 
 

pom.xml

@@ -35,7 +35,7 @@
  <elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
  <lucene.version>5.0.0</lucene.version>
  <lucene.maven.version>5.0.0-snapshot-1641343</lucene.maven.version>
- <amazonaws.version>1.7.13</amazonaws.version>
+ <amazonaws.version>1.9.4</amazonaws.version>
  <tests.output>onerror</tests.output>
  <tests.shuffle>true</tests.shuffle>
  <tests.output>onerror</tests.output>

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

@@ -121,6 +121,8 @@ public synchronized AmazonEC2 client() {
  endpoint = "ec2.ap-northeast-1.amazonaws.com";
  } else if (region.equals("eu-west") || region.equals("eu-west-1")) {
  endpoint = "ec2.eu-west-1.amazonaws.com";
+ } else if (region.equals("eu-central") || region.equals("eu-central-1")) {
+ 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 {

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

@@ -183,6 +183,10 @@ private static String getEndpoint(String region) {
  return "s3-eu-west-1.amazonaws.com";
  } else if ("eu-west-1".equals(region)) {
  return "s3-eu-west-1.amazonaws.com";
+ } else if ("eu-central".equals(region)) {
+ return "s3.eu-central-1.amazonaws.com";
+ } else if ("eu-central-1".equals(region)) {
+ return "s3.eu-central-1.amazonaws.com";
  } else if ("sa-east".equals(region)) {
  return "s3-sa-east-1.amazonaws.com";
  } else if ("sa-east-1".equals(region)) {

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

@@ -113,6 +113,10 @@ public S3Repository(RepositoryName name, RepositorySettings repositorySettings,
  region = "EU";
  } else if ("eu-west-1".equals(regionSetting)) {
  region = "EU";
+ } else if ("eu-central".equals(regionSetting)) {
+ region = "eu-central-1";
+ } else if ("eu-central-1".equals(regionSetting)) {
+ region = "eu-central-1";
  } else if ("sa-east".equals(regionSetting)) {
  region = "sa-east-1";
  } else if ("sa-east-1".equals(regionSetting)) {

src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java

@@ -27,17 +27,51 @@
 import org.elasticsearch.env.FailedToResolveConfigException;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.junit.After;
+import org.junit.Before;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
  */
 public abstract class AbstractAwsTest extends ElasticsearchIntegrationTest {
 
+ /**
+ * Those properties are set by the AWS SDK v1.9.4 and if not ignored,
+ * lead to tests failure (see AbstractRandomizedTest#IGNORED_INVARIANT_PROPERTIES)
+ */
+ private static final String[] AWS_INVARIANT_PROPERTIES = {
+ "com.sun.org.apache.xml.internal.dtm.DTMManager",
+ "javax.xml.parsers.DocumentBuilderFactory"
+ };
+
+ private Map<String, String> properties = new HashMap<>();
+
+ @Before
+ public void saveProperties() {
+ for (String p : AWS_INVARIANT_PROPERTIES) {
+ properties.put(p, System.getProperty(p));
+ }
+ }
+
+ @After
+ public void restoreProperties() {
+ for (String p : AWS_INVARIANT_PROPERTIES) {
+ if (properties.get(p) != null) {
+ System.setProperty(p, properties.get(p));
+ } else {
+ System.clearProperty(p);
+ }
+ }
+ }
+
+
  /**
  * Annotation for tests that require AWS to run. AWS tests are disabled by default.
  * Look at README file for details on how to run tests