data/aws_vpc: Expose enable_dns_* in aws_vpc data_source

aws/data_source_aws_vpc.go

@@ -61,6 +61,16 @@ func dataSourceAwsVpc() *schema.Resource {
 				Computed: true,
 			},
 
+			"enable_dns_hostnames": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+
+			"enable_dns_support": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+
 			"tags": tagsSchemaComputed(),
 		},
 	}
@@ -132,5 +142,17 @@ func dataSourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("ipv6_cidr_block", vpc.Ipv6CidrBlockAssociationSet[0].Ipv6CidrBlock)
 	}
 
+	attResp, err := awsVpcDescribeVpcAttribute("enableDnsSupport", *vpc.VpcId, conn)
+	if err != nil {
+		return err
+	}
+	d.Set("enable_dns_support", attResp.EnableDnsSupport.Value)
+
+	attResp, err = awsVpcDescribeVpcAttribute("enableDnsHostnames", *vpc.VpcId, conn)
+	if err != nil {
+		return err
+	}
+	d.Set("enable_dns_hostnames", attResp.EnableDnsHostnames.Value)
+
 	return nil
 }

aws/data_source_aws_vpc_test.go

@@ -26,6 +26,10 @@ func TestAccDataSourceAwsVpc_basic(t *testing.T) {
 					testAccDataSourceAwsVpcCheck("data.aws_vpc.by_cidr", cidr, tag),
 					testAccDataSourceAwsVpcCheck("data.aws_vpc.by_tag", cidr, tag),
 					testAccDataSourceAwsVpcCheck("data.aws_vpc.by_filter", cidr, tag),
+					resource.TestCheckResourceAttr(
+						"data.aws_vpc.by_id", "enable_dns_support", "true"),
+					resource.TestCheckResourceAttr(
+						"data.aws_vpc.by_id", "enable_dns_hostnames", "false"),
 				),
 			},
 		},

aws/resource_aws_vpc.go

@@ -194,27 +194,17 @@ func resourceAwsVpcRead(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	// Attributes
-	attribute := "enableDnsSupport"
-	describeAttrOpts := &ec2.DescribeVpcAttributeInput{
-		Attribute: aws.String(attribute),
-		VpcId:     aws.String(vpcid),
-	}
-	resp, err := conn.DescribeVpcAttribute(describeAttrOpts)
+	resp, err := awsVpcDescribeVpcAttribute("enableDnsSupport", vpcid, conn)
 	if err != nil {
 		return err
 	}
-	d.Set("enable_dns_support", *resp.EnableDnsSupport.Value)
-	attribute = "enableDnsHostnames"
-	describeAttrOpts = &ec2.DescribeVpcAttributeInput{
-		Attribute: &attribute,
-		VpcId:     &vpcid,
-	}
-	resp, err = conn.DescribeVpcAttribute(describeAttrOpts)
+	d.Set("enable_dns_support", resp.EnableDnsSupport.Value)
+
+	resp, err = awsVpcDescribeVpcAttribute("enableDnsHostnames", vpcid, conn)
 	if err != nil {
 		return err
 	}
-	d.Set("enable_dns_hostnames", *resp.EnableDnsHostnames.Value)
+	d.Set("enable_dns_hostnames", resp.EnableDnsHostnames.Value)
 
 	describeClassiclinkOpts := &ec2.DescribeVpcClassicLinkInput{
 		VpcIds: []*string{&vpcid},
@@ -647,3 +637,16 @@ func resourceAwsVpcInstanceImport(
 	d.Set("assign_generated_ipv6_cidr_block", false)
 	return []*schema.ResourceData{d}, nil
 }
+
+func awsVpcDescribeVpcAttribute(attribute string, vpcId string, conn *ec2.EC2) (*ec2.DescribeVpcAttributeOutput, error) {
+	describeAttrOpts := &ec2.DescribeVpcAttributeInput{
+		Attribute: aws.String(attribute),
+		VpcId:     aws.String(vpcId),
+	}
+	resp, err := conn.DescribeVpcAttribute(describeAttrOpts)
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

website/docs/d/vpc.html.markdown

@@ -77,7 +77,7 @@ The following attribute is additionally exported:
 
 * `instance_tenancy` - The allowed tenancy of instances launched into the
   selected VPC. May be any of `"default"`, `"dedicated"`, or `"host"`.
-
 * `ipv6_association_id` - The association ID for the IPv6 CIDR block.
-
 * `ipv6_cidr_block` - The IPv6 CIDR block.
+* `enable_dns_support` - Whether or not the VPC has DNS support
+* `enable_dns_hostnames` - Whether or not the VPC has DNS hostname support