From d234b3cdc88b3957a56a527adc31055167ad1fa4 Mon Sep 17 00:00:00 2001
From: Holden Karau <holden@foursquare.com>
Date: Mon, 5 Mar 2012 14:10:24 -0800
Subject: [PATCH] Fix region parsing

* Fix invalid host names and remove \t's from region
  hostnames.
---
 .../cloud/aws/AwsEc2Service.java              | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java b/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
index 551cb194b76..c6be4b31733 100644
--- a/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
+++ b/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
@@ -94,29 +94,21 @@ public class AwsEc2Service extends AbstractLifecycleComponent<AwsEc2Service> {
         if (componentSettings.get("ec2.endpoint") != null) {
             client.setEndpoint(componentSettings.get("ec2.endpoint"));
         } else if (componentSettings.get("region") != null) {
+            String region = componentSettings.get("region").toLowerCase();
             String endpoint;
-            String region = componentSettings.get("region");
-            if ("us-east".equals(region.toLowerCase())) {
+            if (region.equals("us-east-1") || region.equals("us-east")) {
                 endpoint = "ec2.us-east-1.amazonaws.com";
-            } else if ("us-east-1".equals(region.toLowerCase())) {
-                endpoint = "ec2.us-east-1.amazonaws.com";
-            } else if ("us-west".equals(region.toLowerCase())) {
+            } else if (region.equals("us-west") || region.equals("us-west-1")) {
                 endpoint = "ec2.us-west-1.amazonaws.com";
-            } else if ("us-west-1".equals(region.toLowerCase())) {
-                endpoint = "ec2.us-west-1.amazonaws.com";
-            } else if ("us-west-2".equals(region.toLowerCase())) {
+            } else if (region.equals("us-west-2")) {
                 endpoint = "ec2.us-west-2.amazonaws.com";
-            } else if ("ap-southeast".equals(region.toLowerCase())) {
+            } else if (region.equals("ap-southeast")) {
                 endpoint = "ec2.ap-southeast-1.amazonaws.com";
-            } else if ("ap-southeast-1".equals(region.toLowerCase())) {
+            } else if (region.equals("ap-southeast-1")) {
                 endpoint = "ec2.ap-southeast-1.amazonaws.com";
-            } else if ("ap-northeast".equals(region.toLowerCase())) {
-                endpoint = "ec2.ap-northeast.amazonaws.com\t";
-            } else if ("ap-northeast-1".equals(region.toLowerCase())) {
-                endpoint = "ec2.ap-northeast-1.amazonaws.com\t";
-            } else if ("eu-west".equals(region.toLowerCase())) {
-                endpoint = "ec2.eu-west-1.amazonaws.com";
-            } else if ("eu-west-1".equals(region.toLowerCase())) {
+            } else if (region.equals("ap-northeast") || region.equals("ap-northeast-1")) {
+                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 {
                 throw new ElasticSearchIllegalArgumentException("No automatic endpoint could be derived from region [" + region + "]");