Merge pull request #181 from svanharmelen/f-fix-elb-availability-zones

Fixing the AvailabilityZones attribute

elb/elb.go

@@ -118,11 +118,6 @@ type InstanceState struct {
 	ReasonCode  string `xml:"ReasonCode"`
 }
 
-// An Instance attaches to an elb
-type AvailabilityZone struct {
-	AvailabilityZone string `xml:"member"`
-}
-
 // ----------------------------------------------------------------------------
 // AddTags
 
@@ -277,16 +272,15 @@ func (elb *ELB) DeleteLoadBalancer(options *DeleteLoadBalancer) (resp *SimpleRes
 
 // An individual load balancer
 type LoadBalancer struct {
-	LoadBalancerName  string             `xml:"LoadBalancerName"`
-	Listeners         []Listener         `xml:"ListenerDescriptions>member"`
-	Instances         []Instance         `xml:"Instances>member"`
-	HealthCheck       HealthCheck        `xml:"HealthCheck"`
-	AvailabilityZones []AvailabilityZone `xml:"AvailabilityZones"`
-	HostedZoneNameID  string             `xml:"CanonicalHostedZoneNameID"`
-	DNSName           string             `xml:"DNSName"`
-	SecurityGroups    []string           `xml:"SecurityGroups>member"`
-	Scheme            string             `xml:"Scheme"`
-	Subnets           []string           `xml:"Subnets>member"`
+	LoadBalancerName  string      `xml:"LoadBalancerName"`
+	Listeners         []Listener  `xml:"ListenerDescriptions>member"`
+	Instances         []Instance  `xml:"Instances>member"`
+	HealthCheck       HealthCheck `xml:"HealthCheck"`
+	AvailabilityZones []string    `xml:"AvailabilityZones>member"`
+	DNSName           string      `xml:"DNSName"`
+	SecurityGroups    []string    `xml:"SecurityGroups>member"`
+	Scheme            string      `xml:"Scheme"`
+	Subnets           []string    `xml:"Subnets>member"`
 }
 
 // DescribeLoadBalancer request params