Updating docs and changing state to accept_status.

Author: Brad Sickles

builtin/providers/aws/resource_aws_vpc_peering_connection_accept.go

@@ -18,7 +18,7 @@ func resourceAwsVpcPeeringConnectionAccept() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"state": &schema.Schema{
+			"accept_status": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
 			},
@@ -29,32 +29,32 @@ func resourceAwsVpcPeeringConnectionAccept() *schema.Resource {
 func resourceAwsVPCPeeringAcceptCreate(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).ec2conn
 
-	if cur, ok := d.Get("state").(string); ok && cur == ec2.VpcPeeringConnectionStateReasonCodeActive {
+	if cur, ok := d.Get("accept_status").(string); ok && cur == ec2.VpcPeeringConnectionStateReasonCodeActive {
 		// already accepted
 		return nil
 	}
 
-	state, err := resourceVPCPeeringConnectionAccept(conn, d.Id())
+	status, err := resourceVPCPeeringConnectionAccept(conn, d.Id())
 	if err != nil {
 		return err
 	}
-	d.Set("state", state)
+	d.Set("accept_status", status)
 
 	// TODO: should we poll until this resolves? VpcPeeringConnectionStateReasonCodePendingAcceptance
 
-	if state != ec2.VpcPeeringConnectionStateReasonCodeActive {
-		return fmt.Errorf("Error accepting connection, state: %s", state)
+	if status != ec2.VpcPeeringConnectionStateReasonCodeActive {
+		return fmt.Errorf("Error accepting connection, state: %s", status)
 	}
 	return nil
 }
 
 func resourceAwsVPCPeeringAcceptRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).ec2conn
-	_, state, err := resourceAwsVPCPeeringConnectionStateRefreshFunc(conn, d.Id())()
+	_, status, err := resourceAwsVPCPeeringConnectionStateRefreshFunc(conn, d.Id())()
 	if err != nil {
 		return err
 	}
-	d.Set("state", state)
+	d.Set("accept_status", status)
 	d.SetId(d.Get("peering_connection_id").(string))
 	return nil
 }

website/source/docs/providers/aws/r/vpc_peering.html.markdown

@@ -3,12 +3,12 @@ layout: "aws"
 page_title: "AWS: aws_vpc_peering_connection"
 sidebar_current: "docs-aws-resource-vpc-peering"
 description: |-
-  Provides an VPC Peering Connection resource.
+  Provides a VPC Peering Connection resource.
 ---
 
 # aws\_vpc\_peering\_connection
 
-Provides an VPC Peering Connection resource.
+Provides a VPC Peering Connection resource.
 
 ## Example Usage
 

website/source/docs/providers/aws/r/vpc_peering_accept.html.markdown

@@ -0,0 +1,57 @@
+---
+layout: "aws"
+page_title: "AWS: aws_vpc_peering_connection_accept"
+sidebar_current: "docs-aws-resource-vpc-peering-accept"
+description: |-
+  Provides a VPC Peering Connection Accept resource.
+---
+
+# aws\_vpc\_peering\_connection\_accept
+
+Provides a VPC Peering Connection Accept resource.
+
+## Example Usage
+
+Basic usage:
+
+```
+resource "aws_vpc" "main" {
+    cidr_block = "10.0.0.0/16"
+}
+
+provider "aws" {
+    // another AWS account creds
+    access_key = "..."
+    secret_key = "..."
+    alias = "peer"
+}
+
+resource "aws_vpc" "peer" {
+    provider = "aws.peer"
+    cidr_block = "10.1.0.0/16"
+}
+
+resource "aws_vpc_peering_connection" "peer" {
+    vpc_id = "${aws_vpc.main.id}"
+    peer_vpc_id = "${aws_vpc.peer.id}"
+    auto_accept = false
+}
+
+resource "aws_vpc_peering_connection_accept" "peer" {
+    provider = "aws.peer"
+    peering_connection_id = "${aws_vpc_peering_connection.peer.id}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `peering_connection_id` - (Required) The VPC Peering Connection ID to accept.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The ID of the VPC Peering Connection.
+* `accept_status` - The Status of the VPC peering connection request.

website/source/layouts/aws.erb

@@ -786,6 +786,10 @@
                             <a href="/docs/providers/aws/r/vpc_peering.html">aws_vpc_peering_connection</a>
                         </li>
 
+                        <li<%= sidebar_current("docs-aws-resource-vpc-peering-accept") %>>
+                            <a href="/docs/providers/aws/r/vpc_peering_accept.html">aws_vpc_peering_connection_accept</a>
+                        </li>
+
                         <li<%= sidebar_current("docs-aws-resource-vpn-connection") %>>
                             <a href="/docs/providers/aws/r/vpn_connection.html">aws_vpn_connection</a>
                         </li>