Merge pull request #22308 from nicpalmer/master

Support for eu-west-2 (London) cloud-aws plugin

See:

* http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region
* http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region

docs/plugins/discovery-ec2.asciidoc

@@ -120,6 +120,7 @@ The available values are:
 * `ap-northeast` (`ap-northeast-1`) for Asia Pacific (Tokyo)
 * `ap-northeast-2` (`ap-northeast-2`) for Asia Pacific (Seoul)
 * `eu-west` (`eu-west-1`) for EU (Ireland)
+* `eu-west-2` (`eu-west-2`) for EU (London)
 * `eu-central` (`eu-central-1`) for EU (Frankfurt)
 * `sa-east` (`sa-east-1`) for South America (São Paulo)
 * `cn-north` (`cn-north-1`) for China (Beijing)

docs/plugins/repository-s3.asciidoc

@@ -125,6 +125,7 @@ The available values are:
 * `ap-northeast` (`ap-northeast-1`) for Asia Pacific (Tokyo)
 * `ap-northeast-2` (`ap-northeast-2`) for Asia Pacific (Seoul)
 * `eu-west` (`eu-west-1`) for EU (Ireland)
+* `eu-west-2` (`eu-west-2`) for EU (London)
 * `eu-central` (`eu-central-1`) for EU (Frankfurt)
 * `sa-east` (`sa-east-1`) for South America (São Paulo)
 * `cn-north` (`cn-north-1`) for China (Beijing)

plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java

@@ -178,6 +178,9 @@ public class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Servic
                 case "eu-west-1":
                     endpoint = "ec2.eu-west-1.amazonaws.com";
                     break;
+                case "eu-west-2":
+                    endpoint = "ec2.eu-west-2.amazonaws.com";
+                    break;
                 case "eu-central":
                 case "eu-central-1":
                     endpoint = "ec2.eu-central-1.amazonaws.com";
@@ -207,4 +210,4 @@ public class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Servic
         // Ensure that IdleConnectionReaper is shutdown
         IdleConnectionReaper.shutdown();
     }
-}
+}

plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java

@@ -202,6 +202,9 @@ public class InternalAwsS3Service extends AbstractLifecycleComponent implements
             case "eu-west-1":
                 endpoint = "s3-eu-west-1.amazonaws.com";
                 break;
+            case "eu-west-2":
+                endpoint = "s3-eu-west-2.amazonaws.com";
+                break;
             case "eu-central":
             case "eu-central-1":
                 endpoint = "s3.eu-central-1.amazonaws.com";