From b49fba6b61886a4226738325ddd86d939f9351ff Mon Sep 17 00:00:00 2001
From: Phil Frost <phil.frost@paperg.com>
Date: Fri, 20 Mar 2015 14:44:42 -0400
Subject: [PATCH] Don't error when enabling DNS hostnames in a VPC

The AWS API call ModifyVpcAttribute will allow only one attribute to be
modified at a time. Modifying both results in the error:

    Fields for multiple attribute types specified: enableDnsHostnames, enableDnsSupport

Retructure the provider to honor this restriction.

Also, enable DNS support before attempting to enable DNS hostnames,
since the former is a prerequisite of the latter.

Additionally, fix what must have been a copy&paste error, setting
enable_dns_support to the value of enable_dns_hostnames.
---
 builtin/providers/aws/resource_aws_vpc.go | 46 ++++++++++++-----------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_vpc.go b/builtin/providers/aws/resource_aws_vpc.go
index 727287039..7b27f3b6e 100644
--- a/builtin/providers/aws/resource_aws_vpc.go
+++ b/builtin/providers/aws/resource_aws_vpc.go
@@ -185,29 +185,14 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
 	// Turn on partial mode
 	d.Partial(true)
 	vpcid := d.Id()
-	modifyOpts := &ec2.ModifyVPCAttributeRequest{
-		VPCID: &vpcid,
-	}
-	if d.HasChange("enable_dns_hostnames") {
-		val := d.Get("enable_dns_hostnames").(bool)
-		modifyOpts.EnableDNSHostnames = &ec2.AttributeBooleanValue{
-			Value: &val,
-		}
-
-		log.Printf(
-			"[INFO] Modifying enable_dns_hostnames vpc attribute for %s: %#v",
-			d.Id(), modifyOpts)
-		if err := ec2conn.ModifyVPCAttribute(modifyOpts); err != nil {
-			return err
-		}
-
-		d.SetPartial("enable_dns_hostnames")
-	}
 
 	if d.HasChange("enable_dns_support") {
-		val := d.Get("enable_dns_hostnames").(bool)
-		modifyOpts.EnableDNSSupport = &ec2.AttributeBooleanValue{
-			Value: &val,
+		val := d.Get("enable_dns_support").(bool)
+		modifyOpts := &ec2.ModifyVPCAttributeRequest{
+			VPCID: &vpcid,
+			EnableDNSSupport: &ec2.AttributeBooleanValue{
+				Value: &val,
+			},
 		}
 
 		log.Printf(
@@ -220,6 +205,25 @@ func resourceAwsVpcUpdate(d *schema.ResourceData, meta interface{}) error {
 		d.SetPartial("enable_dns_support")
 	}
 
+	if d.HasChange("enable_dns_hostnames") {
+		val := d.Get("enable_dns_hostnames").(bool)
+		modifyOpts := &ec2.ModifyVPCAttributeRequest{
+			VPCID: &vpcid,
+			EnableDNSHostnames: &ec2.AttributeBooleanValue{
+				Value: &val,
+			},
+		}
+
+		log.Printf(
+			"[INFO] Modifying enable_dns_hostnames vpc attribute for %s: %#v",
+			d.Id(), modifyOpts)
+		if err := ec2conn.ModifyVPCAttribute(modifyOpts); err != nil {
+			return err
+		}
+
+		d.SetPartial("enable_dns_hostnames")
+	}
+
 	if err := setTags(ec2conn, d); err != nil {
 		return err
 	} else {