From 6f6ca0433fa35a278e5d95c3fe79e07d0c162a53 Mon Sep 17 00:00:00 2001
From: Adam Sunderland <iterion@gmail.com>
Date: Thu, 14 May 2015 19:24:27 -0500
Subject: [PATCH] Fixing Tests

---
 pkg/cloudprovider/aws/aws.go      | 18 +++++++++++++++++-
 pkg/cloudprovider/aws/aws_test.go |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go
index 4d7b2d03e1b..3b1f10d4f52 100644
--- a/pkg/cloudprovider/aws/aws.go
+++ b/pkg/cloudprovider/aws/aws.go
@@ -293,7 +293,23 @@ func getAvailabilityZone(metadata AWSMetadata) (string, error) {
 }
 
 func isRegionValid(region string) bool {
-	return true
+	regions := [...]string{
+		"us-east-1",
+		"us-west-1",
+		"us-west-2",
+		"eu-west-1",
+		"eu-central-1",
+		"ap-southeast-1",
+		"ap-southeast-2",
+		"ap-northeast-1",
+		"sa-east-1",
+	}
+	for _, r := range regions {
+		if r == region {
+			return true
+		}
+	}
+	return false
 }
 
 // newAWSCloud creates a new instance of AWSCloud.
diff --git a/pkg/cloudprovider/aws/aws_test.go b/pkg/cloudprovider/aws/aws_test.go
index 3621d4613fe..e5eeb929ee5 100644
--- a/pkg/cloudprovider/aws/aws_test.go
+++ b/pkg/cloudprovider/aws/aws_test.go
@@ -347,7 +347,7 @@ func TestNodeAddresses(t *testing.T) {
 	instance0.State = &state0
 
 	//1
-	instance1.PrivateDNSName = aws.String("instance2")
+	instance1.PrivateDNSName = aws.String("instance1")
 	instance1.PrivateIPAddress = aws.String("192.168.0.2")
 	instance1.InstanceType = aws.String("c3.large")
 	state1 := ec2.InstanceState{