From 9fc775e41cc34cdcd00c162651bde45fdcf75db5 Mon Sep 17 00:00:00 2001
From: Jack Pearkes <jackpearkes@gmail.com>
Date: Tue, 16 Sep 2014 10:37:22 -0400
Subject: [PATCH] providers/aws: fix tests for subnet map_public_ip, add docs

This working depends on merging mitchellh/goamz#109

Related: #285

cc/ @hden
---
 builtin/providers/aws/resource_aws_subnet.go             | 6 ++----
 builtin/providers/aws/resource_aws_subnet_test.go        | 2 +-
 website/source/docs/providers/aws/r/subnet.html.markdown | 3 +++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_subnet.go b/builtin/providers/aws/resource_aws_subnet.go
index 1d49787c3..a645e74d0 100644
--- a/builtin/providers/aws/resource_aws_subnet.go
+++ b/builtin/providers/aws/resource_aws_subnet.go
@@ -55,12 +55,10 @@ func resource_aws_subnet_create(
 			s.ID, err)
 	}
 
-	var attr string
-
 	// Map public ip on launch must be set in another API call
-	if attr = s.Attributes["map_public_ip_on_launch"]; attr == "true" {
+	if attr := s.Attributes["map_public_ip_on_launch"]; attr == "true" {
 		modifyOpts := &ec2.ModifySubnetAttribute{
-			SubnetId: s.ID,
+			SubnetId:            s.ID,
 			MapPublicIpOnLaunch: true,
 		}
 		log.Printf("[DEBUG] Subnet modify attributes: %#v", modifyOpts)
diff --git a/builtin/providers/aws/resource_aws_subnet_test.go b/builtin/providers/aws/resource_aws_subnet_test.go
index bf62401ba..6d00ceb29 100644
--- a/builtin/providers/aws/resource_aws_subnet_test.go
+++ b/builtin/providers/aws/resource_aws_subnet_test.go
@@ -20,7 +20,7 @@ func TestAccAWSSubnet(t *testing.T) {
 		if v.MapPublicIpOnLaunch != true {
 			return fmt.Errorf("bad MapPublicIpOnLaunch: %s", v.MapPublicIpOnLaunch)
 		}
-		return fmt.Errorf("bad MapPublicIpOnLaunch: %s", v.MapPublicIpOnLaunch)
+
 		return nil
 	}
 
diff --git a/website/source/docs/providers/aws/r/subnet.html.markdown b/website/source/docs/providers/aws/r/subnet.html.markdown
index 9daf9d8a7..73d6e5628 100644
--- a/website/source/docs/providers/aws/r/subnet.html.markdown
+++ b/website/source/docs/providers/aws/r/subnet.html.markdown
@@ -23,6 +23,9 @@ The following arguments are supported:
 
 * `availability_zone`- (Optional) The AZ for the subnet.
 * `cidr_block` - (Required) The CIDR block for the subnet.
+* `map_public_ip_on_launch` -  (Optional) Specify true to indicate
+    that instances launched into the subnet should be assigned
+    a public IP address.
 * `vpc_id` - (Required) The VPC ID.
 
 ## Attributes Reference