Merge pull request #398 from mumoshu/fix-ec2-public-hostnames-in-us-east-1

Fix assumed public hostnames for EC2 instances in us-east-1

Author: mumoshu

model/derived/etcd_cluster_test.go

@@ -65,7 +65,7 @@ func TestEtcdClusterDNSNames(t *testing.T) {
 		t.Run("us-east-1", func(t *testing.T) {
 			cluster := NewEtcdCluster(config, usEast1, etcdNet, etcdCount)
 			actual := cluster.DNSNames()
-			expected := []string{"*.us-east-1.compute.amazonaws.com"}
+			expected := []string{"*.compute-1.amazonaws.com"}
 			if !reflect.DeepEqual(actual, expected) {
 				t.Errorf("invalid dns names: expecetd=%v, got=%v", expected, actual)
 			}

model/region.go

@@ -28,6 +28,9 @@ func (r regionImpl) PrivateDomainName() string {
 }
 
 func (r regionImpl) PublicDomainName() string {
+	if r.name == "us-east-1" {
+		return "compute-1.amazonaws.com"
+	}
 	return fmt.Sprintf("%s.compute.amazonaws.com", r.name)
 }