Merge pull request #4597 from tpounds/support-aws-elb-az-and-subnet-u…

…pdates

provider/aws: Support updating ELB availability zones and subnets

builtin/providers/aws/resource_aws_elb.go

@@ -48,7 +48,6 @@ func resourceAwsElb() *schema.Resource {
  Type: schema.TypeSet,
  Elem: &schema.Schema{Type: schema.TypeString},
  Optional: true,
- ForceNew: true,
  Computed: true,
  Set: schema.HashString,
  },
@@ -84,7 +83,6 @@ func resourceAwsElb() *schema.Resource {
  Type: schema.TypeSet,
  Elem: &schema.Schema{Type: schema.TypeString},
  Optional: true,
- ForceNew: true,
  Computed: true,
  Set: schema.HashString,
  },
@@ -338,10 +336,10 @@ func resourceAwsElbRead(d *schema.ResourceData, meta interface{}) error {
  d.Set("dns_name", *lb.DNSName)
  d.Set("zone_id", *lb.CanonicalHostedZoneNameID)
  d.Set("internal", *lb.Scheme == "internal")
- d.Set("availability_zones", lb.AvailabilityZones)
+ d.Set("availability_zones", flattenStringList(lb.AvailabilityZones))
  d.Set("instances", flattenInstances(lb.Instances))
  d.Set("listener", flattenListeners(lb.ListenerDescriptions))
- d.Set("security_groups", lb.SecurityGroups)
+ d.Set("security_groups", flattenStringList(lb.SecurityGroups))
  if lb.SourceSecurityGroup != nil {
  d.Set("source_security_group", lb.SourceSecurityGroup.GroupName)
 
@@ -357,7 +355,7 @@ func resourceAwsElbRead(d *schema.ResourceData, meta interface{}) error {
  }
  }
  }
- d.Set("subnets", lb.Subnets)
+ d.Set("subnets", flattenStringList(lb.Subnets))
  d.Set("idle_timeout", lbAttrs.ConnectionSettings.IdleTimeout)
  d.Set("connection_draining", lbAttrs.ConnectionDraining.Enabled)
  d.Set("connection_draining_timeout", lbAttrs.ConnectionDraining.Timeout)
@@ -599,6 +597,80 @@ func resourceAwsElbUpdate(d *schema.ResourceData, meta interface{}) error {
  d.SetPartial("security_groups")
  }
 
+ if d.HasChange("availability_zones") {
+ o, n := d.GetChange("availability_zones")
+ os := o.(*schema.Set)
+ ns := n.(*schema.Set)
+
+ removed := expandStringList(os.Difference(ns).List())
+ added := expandStringList(ns.Difference(os).List())
+
+ if len(added) > 0 {
+ enableOpts := &elb.EnableAvailabilityZonesForLoadBalancerInput{
+ LoadBalancerName: aws.String(d.Id()),
+ AvailabilityZones: added,
+ }
+
+ log.Printf("[DEBUG] ELB enable availability zones opts: %s", enableOpts)
+ _, err := elbconn.EnableAvailabilityZonesForLoadBalancer(enableOpts)
+ if err != nil {
+ return fmt.Errorf("Failure enabling ELB availability zones: %s", err)
+ }
+ }
+
+ if len(removed) > 0 {
+ disableOpts := &elb.DisableAvailabilityZonesForLoadBalancerInput{
+ LoadBalancerName: aws.String(d.Id()),
+ AvailabilityZones: removed,
+ }
+
+ log.Printf("[DEBUG] ELB disable availability zones opts: %s", disableOpts)
+ _, err := elbconn.DisableAvailabilityZonesForLoadBalancer(disableOpts)
+ if err != nil {
+ return fmt.Errorf("Failure disabling ELB availability zones: %s", err)
+ }
+ }
+
+ d.SetPartial("availability_zones")
+ }
+
+ if d.HasChange("subnets") {
+ o, n := d.GetChange("subnets")
+ os := o.(*schema.Set)
+ ns := n.(*schema.Set)
+
+ removed := expandStringList(os.Difference(ns).List())
+ added := expandStringList(ns.Difference(os).List())
+
+ if len(added) > 0 {
+ attachOpts := &elb.AttachLoadBalancerToSubnetsInput{
+ LoadBalancerName: aws.String(d.Id()),
+ Subnets: added,
+ }
+
+ log.Printf("[DEBUG] ELB attach subnets opts: %s", attachOpts)
+ _, err := elbconn.AttachLoadBalancerToSubnets(attachOpts)
+ if err != nil {
+ return fmt.Errorf("Failure adding ELB subnets: %s", err)
+ }
+ }
+
+ if len(removed) > 0 {
+ detachOpts := &elb.DetachLoadBalancerFromSubnetsInput{
+ LoadBalancerName: aws.String(d.Id()),
+ Subnets: removed,
+ }
+
+ log.Printf("[DEBUG] ELB detach subnets opts: %s", detachOpts)
+ _, err := elbconn.DetachLoadBalancerFromSubnets(detachOpts)
+ if err != nil {
+ return fmt.Errorf("Failure removing ELB subnets: %s", err)
+ }
+ }
+
+ d.SetPartial("subnets")
+ }
+
  if err := setTagsELB(elbconn, d); err != nil {
  return err
  }

builtin/providers/aws/resource_aws_elb_test.go

@@ -30,12 +30,17 @@ func TestAccAWSELB_basic(t *testing.T) {
  Check: resource.ComposeTestCheckFunc(
  testAccCheckAWSELBExists("aws_elb.bar", &conf),
  testAccCheckAWSELBAttributes(&conf),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.#", "3"),
  resource.TestCheckResourceAttr(
  "aws_elb.bar", "availability_zones.2487133097", "us-west-2a"),
  resource.TestCheckResourceAttr(
  "aws_elb.bar", "availability_zones.221770259", "us-west-2b"),
  resource.TestCheckResourceAttr(
  "aws_elb.bar", "availability_zones.2050015877", "us-west-2c"),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "subnets.#", "3"),
+ // NOTE: Subnet IDs are different across AWS accounts and cannot be checked.
  resource.TestCheckResourceAttr(
  "aws_elb.bar", "listener.206423021.instance_port", "8000"),
  resource.TestCheckResourceAttr(
@@ -136,6 +141,45 @@ func TestAccAWSELB_generatedName(t *testing.T) {
  })
 }
 
+func TestAccAWSELB_availabilityZones(t *testing.T) {
+ var conf elb.LoadBalancerDescription
+
+ resource.Test(t, resource.TestCase{
+ PreCheck: func() { testAccPreCheck(t) },
+ Providers: testAccProviders,
+ CheckDestroy: testAccCheckAWSELBDestroy,
+ Steps: []resource.TestStep{
+ resource.TestStep{
+ Config: testAccAWSELBConfig,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckAWSELBExists("aws_elb.bar", &conf),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.#", "3"),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.2487133097", "us-west-2a"),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.221770259", "us-west-2b"),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.2050015877", "us-west-2c"),
+ ),
+ },
+
+ resource.TestStep{
+ Config: testAccAWSELBConfig_AvailabilityZonesUpdate,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckAWSELBExists("aws_elb.bar", &conf),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.#", "2"),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.2487133097", "us-west-2a"),
+ resource.TestCheckResourceAttr(
+ "aws_elb.bar", "availability_zones.221770259", "us-west-2b"),
+ ),
+ },
+ },
+ })
+}
+
 func TestAccAWSELB_tags(t *testing.T) {
  var conf elb.LoadBalancerDescription
  var td elb.TagDescription
@@ -783,6 +827,19 @@ resource "aws_elb" "foo" {
 }
 `
 
+const testAccAWSELBConfig_AvailabilityZonesUpdate = `
+resource "aws_elb" "bar" {
+ availability_zones = ["us-west-2a", "us-west-2b"]
+
+ listener {
+ instance_port = 8000
+ instance_protocol = "http"
+ lb_port = 80
+ lb_protocol = "http"
+ }
+}
+`
+
 const testAccAWSELBConfig_TagUpdate = `
 resource "aws_elb" "bar" {
  availability_zones = ["us-west-2a", "us-west-2b", "us-west-2c"]