From 3b0b41c9a185d109e5c1571d33e54dafd8d3746b Mon Sep 17 00:00:00 2001 From: jba Date: Tue, 10 Feb 2015 17:50:29 +0100 Subject: [PATCH 1/3] allow vpc_peering_connection_id in aws_route_table --- .../providers/aws/resource_aws_route_table.go | 19 +++- .../aws/resource_aws_route_table_test.go | 93 +++++++++++++++---- .../providers/aws/r/route_table.html.markdown | 3 +- 3 files changed, 92 insertions(+), 23 deletions(-) diff --git a/builtin/providers/aws/resource_aws_route_table.go b/builtin/providers/aws/resource_aws_route_table.go index 58afa016ec5c..5c85a926642f 100644 --- a/builtin/providers/aws/resource_aws_route_table.go +++ b/builtin/providers/aws/resource_aws_route_table.go @@ -47,6 +47,11 @@ func resourceAwsRouteTable() *schema.Resource { Type: schema.TypeString, Optional: true, }, + + "vpc_peering_connection_id": &schema.Schema{ + Type: schema.TypeString, + Optional: true, + }, }, }, Set: resourceAwsRouteTableHash, @@ -125,6 +130,7 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error { m["gateway_id"] = r.GatewayId m["instance_id"] = r.InstanceId + m["vpc_peering_connection_id"] = r.VpcPeeringConnectionId route.Add(m) } @@ -166,10 +172,11 @@ func resourceAwsRouteTableUpdate(d *schema.ResourceData, meta interface{}) error m := route.(map[string]interface{}) opts := ec2.CreateRoute{ - RouteTableId: d.Id(), - DestinationCidrBlock: m["cidr_block"].(string), - GatewayId: m["gateway_id"].(string), - InstanceId: m["instance_id"].(string), + RouteTableId: d.Id(), + DestinationCidrBlock: m["cidr_block"].(string), + GatewayId: m["gateway_id"].(string), + InstanceId: m["instance_id"].(string), + VpcPeeringConnectionId: m["vpc_peering_connection_id"].(string), } _, err := ec2conn.CreateRoute(&opts) @@ -257,6 +264,10 @@ func resourceAwsRouteTableHash(v interface{}) int { buf.WriteString(fmt.Sprintf("%s-", v.(string))) } + if v, ok := m["vpc_peering_connection_id"]; ok { + buf.WriteString(fmt.Sprintf("%s-", v.(string))) + } + return hashcode.String(buf.String()) } diff --git a/builtin/providers/aws/resource_aws_route_table_test.go b/builtin/providers/aws/resource_aws_route_table_test.go index 0cc8b22f0d49..2f4dfab2e566 100644 --- a/builtin/providers/aws/resource_aws_route_table_test.go +++ b/builtin/providers/aws/resource_aws_route_table_test.go @@ -129,27 +129,26 @@ func TestAccAWSRouteTable_tags(t *testing.T) { Providers: testAccProviders, CheckDestroy: testAccCheckRouteTableDestroy, Steps: []resource.TestStep{ - resource.TestStep{ - Config: testAccRouteTableConfigTags, - Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists("aws_route_table.foo", &route_table), - testAccCheckTags(&route_table.Tags, "foo", "bar"), - ), - }, - - resource.TestStep{ - Config: testAccRouteTableConfigTagsUpdate, - Check: resource.ComposeTestCheckFunc( - testAccCheckRouteTableExists("aws_route_table.foo", &route_table), - testAccCheckTags(&route_table.Tags, "foo", ""), - testAccCheckTags(&route_table.Tags, "bar", "baz"), - ), - }, - }, + resource.TestStep{ + Config: testAccRouteTableConfigTags, + Check: resource.ComposeTestCheckFunc( + testAccCheckRouteTableExists("aws_route_table.foo", &route_table), + testAccCheckTags(&route_table.Tags, "foo", "bar"), + ), + }, + + resource.TestStep{ + Config: testAccRouteTableConfigTagsUpdate, + Check: resource.ComposeTestCheckFunc( + testAccCheckRouteTableExists("aws_route_table.foo", &route_table), + testAccCheckTags(&route_table.Tags, "foo", ""), + testAccCheckTags(&route_table.Tags, "bar", "baz"), + ), + }, + }, }) } - func testAccCheckRouteTableDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*AWSClient).ec2conn @@ -209,6 +208,45 @@ func testAccCheckRouteTableExists(n string, v *ec2.RouteTable) resource.TestChec } } +func TestAccAWSRouteTable_vpcPeering(t *testing.T) { + var v ec2.RouteTable + + testCheck := func(*terraform.State) error { + if len(v.Routes) != 2 { + return fmt.Errorf("bad routes: %#v", v.Routes) + } + + routes := make(map[string]ec2.Route) + for _, r := range v.Routes { + routes[r.DestinationCidrBlock] = r + } + + if _, ok := routes["10.1.0.0/16"]; !ok { + return fmt.Errorf("bad routes: %#v", v.Routes) + } + if _, ok := routes["10.2.0.0/16"]; !ok { + return fmt.Errorf("bad routes: %#v", v.Routes) + } + + return nil + } + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckRouteTableDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccRouteTableVpcPeeringConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckRouteTableExists( + "aws_route_table.foo", &v), + testCheck, + ), + }, + }, + }) +} + const testAccRouteTableConfig = ` resource "aws_vpc" "foo" { cidr_block = "10.1.0.0/16" @@ -306,3 +344,22 @@ resource "aws_route_table" "foo" { } } ` + +const testAccRouteTableVpcPeeringConfig = ` +resource "aws_vpc" "foo" { + cidr_block = "10.1.0.0/16" +} + +resource "aws_internet_gateway" "foo" { + vpc_id = "${aws_vpc.foo.id}" +} + +resource "aws_route_table" "foo" { + vpc_id = "${aws_vpc.foo.id}" + + route { + cidr_block = "10.2.0.0/16" + vpc_peering_connection_id = "vpc-12345" + } +} +` diff --git a/website/source/docs/providers/aws/r/route_table.html.markdown b/website/source/docs/providers/aws/r/route_table.html.markdown index 2080e192d401..9d25e9779ea7 100644 --- a/website/source/docs/providers/aws/r/route_table.html.markdown +++ b/website/source/docs/providers/aws/r/route_table.html.markdown @@ -39,8 +39,9 @@ Each route supports the following: * `cidr_block` - (Required) The CIDR block of the route. * `gateway_id` - (Optional) The Internet Gateway ID. * `instance_id` - (Optional) The EC2 instance ID. +* `vpc_peering_connection_id` - (Optional) The VPC Peering ID. -Each route must contain either a `gateway_id` or an `instance_id`. Note that the +Each route must contain either a `gateway_id`, an `instance_id` or a `vpc_peering_connection_id`. Note that the default route, mapping the VPC's CIDR block to "local", is created implicitly and cannot be specified. From 101f801846a9baf239a2e0edf93dbdd0f96941a0 Mon Sep 17 00:00:00 2001 From: jba Date: Thu, 12 Feb 2015 10:45:29 +0100 Subject: [PATCH 2/3] add aws_vpc_peering_connection --- builtin/providers/aws/provider.go | 1 + .../resource_aws_vpc_peering_connection.go | 129 ++++++++++++++++++ ...esource_aws_vpc_peering_connection_test.go | 79 +++++++++++ .../providers/aws/r/vpc_peering.html.markdown | 58 ++++++++ 4 files changed, 267 insertions(+) create mode 100644 builtin/providers/aws/resource_aws_vpc_peering_connection.go create mode 100644 builtin/providers/aws/resource_aws_vpc_peering_connection_test.go create mode 100644 website/source/docs/providers/aws/r/vpc_peering.html.markdown diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 90e43011a7cd..0ab2919fd857 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -66,6 +66,7 @@ func Provider() terraform.ResourceProvider { "aws_security_group": resourceAwsSecurityGroup(), "aws_subnet": resourceAwsSubnet(), "aws_vpc": resourceAwsVpc(), + "aws_vpc_peering_connection": resourceAwsVpcPeeringConnection(), }, ConfigureFunc: providerConfigure, diff --git a/builtin/providers/aws/resource_aws_vpc_peering_connection.go b/builtin/providers/aws/resource_aws_vpc_peering_connection.go new file mode 100644 index 000000000000..8d9711d7bd2f --- /dev/null +++ b/builtin/providers/aws/resource_aws_vpc_peering_connection.go @@ -0,0 +1,129 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/helper/schema" + "github.com/mitchellh/goamz/ec2" +) + +func resourceAwsVpcPeeringConnection() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsVpcPeeringCreate, + Read: resourceAwsVpcPeeringConnectionRead, + Update: nil, + Delete: resourceAwsVpcPeeringDelete, + + Schema: map[string]*schema.Schema{ + "peer_owner_id": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + "peer_vpc_id": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + "vpc_id": &schema.Schema{ + Type: schema.TypeString, + Required: true, + }, + "tags": tagsSchema(), + }, + } +} + +func resourceAwsVpcPeeringCreate(d *schema.ResourceData, meta interface{}) error { + ec2conn := meta.(*AWSClient).ec2conn + + // Create the vpc peering connection + createOpts := &ec2.CreateVpcPeeringConnection{ + PeerOwnerId: d.Get("peer_owner_id").(string), + PeerVpcId: d.Get("peer_vpc_id").(string), + VpcId: d.Get("vpc_id").(string), + } + log.Printf("[DEBUG] VpcPeeringCreate create config: %#v", createOpts) + resp, err := ec2conn.CreateVpcPeeringConnection(createOpts) + if err != nil { + return fmt.Errorf("Error creating vpc peering connection: %s", err) + } + + // Get the ID and store it + rt := &resp.VpcPeeringConnection + d.SetId(rt.VpcPeeringConnectionId) + log.Printf("[INFO] Vpc Peering Connection ID: %s", d.Id()) + + // Wait for the vpc peering connection to become available + log.Printf( + "[DEBUG] Waiting for vpc peering connection (%s) to become available", + d.Id()) + stateConf := &resource.StateChangeConf{ + Pending: []string{"pending"}, + Target: "ready", + Refresh: resourceAwsVpcPeeringConnectionStateRefreshFunc(ec2conn, d.Id()), + Timeout: 1 * time.Minute, + } + if _, err := stateConf.WaitForState(); err != nil { + return fmt.Errorf( + "Error waiting for vpc peering (%s) to become available: %s", + d.Id(), err) + } + + return nil +} + +func resourceAwsVpcPeeringConnectionRead(d *schema.ResourceData, meta interface{}) error { + ec2conn := meta.(*AWSClient).ec2conn + pcRaw, _, err := resourceAwsVpcPeeringConnectionStateRefreshFunc(ec2conn, d.Id())() + if err != nil { + return err + } + if pcRaw == nil { + d.SetId("") + return nil + } + + pc := pcRaw.(*ec2.VpcPeeringConnection) + + d.Set("peer_owner_id", pc.AccepterVpcInfo.OwnerId) + d.Set("peer_vpc_id", pc.AccepterVpcInfo.VpcId) + d.Set("vpc_id", pc.RequesterVpcInfo.VpcId) + d.Set("tags", tagsToMap(pc.Tags)) + + return nil +} +func resourceAwsVpcPeeringDelete(d *schema.ResourceData, meta interface{}) error { + ec2conn := meta.(*AWSClient).ec2conn + + _, err := ec2conn.DeleteVpcPeeringConnection(d.Id()) + return err +} + +// resourceAwsVpcPeeringConnectionStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch +// a VpcPeeringConnection. +func resourceAwsVpcPeeringConnectionStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + + resp, err := conn.DescribeVpcPeeringConnection([]string{id}, ec2.NewFilter()) + if err != nil { + if ec2err, ok := err.(*ec2.Error); ok && ec2err.Code == "InvalidVpcPeeringConnectionID.NotFound" { + resp = nil + } else { + log.Printf("Error on VpcPeeringConnectionStateRefresh: %s", err) + return nil, "", err + } + } + + if resp == nil { + // Sometimes AWS just has consistency issues and doesn't see + // our instance yet. Return an empty state. + return nil, "", nil + } + + pc := &resp.VpcPeeringConnections[0] + + return pc, "ready", nil + } +} diff --git a/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go b/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go new file mode 100644 index 000000000000..2b4b71e338b8 --- /dev/null +++ b/builtin/providers/aws/resource_aws_vpc_peering_connection_test.go @@ -0,0 +1,79 @@ +package aws + +import ( + "fmt" + "testing" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" + "github.com/mitchellh/goamz/ec2" +) + +func TestAccAWSVPCPeeringConnection_normal(t *testing.T) { + var conf ec2.Address + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckAWSVpcPeeringConnectionDestroy, + Steps: []resource.TestStep{ + resource.TestStep{ + Config: testAccVpcPeeringConfig, + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSVpcPeeringConnectionExists("aws_vpc_peering_connection.foo", &conf), + ), + }, + }, + }) +} + +func testAccCheckAWSVpcPeeringConnectionDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).ec2conn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_vpc_peering_connection" { + continue + } + + describe, err := conn.DescribeVpcPeeringConnection([]string{rs.Primary.ID}, ec2.NewFilter()) + + if err == nil { + if len(describe.VpcPeeringConnections) != 0 { + return fmt.Errorf("vpc peering connection still exists") + } + } + } + + return nil +} + +func testAccCheckAWSVpcPeeringConnectionExists(n string, res *ec2.Address) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No vpc peering connection id is set") + } + + return nil + } +} + +const testAccVpcPeeringConfig = ` +resource "aws_vpc" "foo" { + cidr_block = "10.0.0.0/16" +} + +resource "aws_vpc" "bar" { + cidr_block = "10.0.1.0/16" +} + +resource "aws_vpc_peering_connection" "foo" { + peer_owner_id = "12345" + vpc_id = "${aws_vpc.foo.id}" + peer_vpc_id = "${aws_vpc.bar.id}" +} +` diff --git a/website/source/docs/providers/aws/r/vpc_peering.html.markdown b/website/source/docs/providers/aws/r/vpc_peering.html.markdown new file mode 100644 index 000000000000..9fa2fa60da5b --- /dev/null +++ b/website/source/docs/providers/aws/r/vpc_peering.html.markdown @@ -0,0 +1,58 @@ +--- +layout: "aws" +page_title: "AWS: aws_vpc_peering_connection" +sidebar_current: "docs-aws-resource-vpc-peering-connection" +description: |- + Provides an VPC Peering Connection resource. +--- + +# aws\_vpc\_peering\_connection + +Provides an VPC Peering Connection resource. + +## Example Usage + +Basic usage: + +``` +resource "aws_vpc" "main" { + cidr_block = "10.0.0.0/16" +} +``` + +Basic usage with tags: + +``` + +resource "aws_vpc_peering_connection" "foo" { + peer_owner_id = "${var.peer_owner_id}" + peer_vpc_id = "${aws_vpc.bar.id}" + vpc_id = "${aws_vpc.foo.id}" +} + +resource "aws_vpc" "foo" { + cidr_block = "10.1.0.0/16" +} + +resource "aws_vpc" "bar" { + cidr_block = "10.2.0.0/16" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `peer_owner_id` - (Required) The AWS account ID of the owner of the peer VPC. +* `peer_vpc_id` - (Required) The ID of the VPC with which you are creating the VPC peering connection. +* `vpc_id` - (Required) The ID of the requester VPC. +* `tags` - (Optional) A mapping of tags to assign to the resource. + + +Note: You still have to accept the peering with the aws console, aws-cli or goamz + +## Attributes Reference + +The following attributes are exported: + +* `id` - The ID of the VPC Peering Connection From 372035368f38919111cefec94730c2bacb1ed7fb Mon Sep 17 00:00:00 2001 From: jba Date: Wed, 18 Feb 2015 10:45:12 +0100 Subject: [PATCH 3/3] allow update --- .../resource_aws_vpc_peering_connection.go | 22 ++++++++++++++++--- .../providers/aws/r/vpc_peering.html.markdown | 9 ++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/builtin/providers/aws/resource_aws_vpc_peering_connection.go b/builtin/providers/aws/resource_aws_vpc_peering_connection.go index 8d9711d7bd2f..a8316c11477a 100644 --- a/builtin/providers/aws/resource_aws_vpc_peering_connection.go +++ b/builtin/providers/aws/resource_aws_vpc_peering_connection.go @@ -13,22 +13,25 @@ import ( func resourceAwsVpcPeeringConnection() *schema.Resource { return &schema.Resource{ Create: resourceAwsVpcPeeringCreate, - Read: resourceAwsVpcPeeringConnectionRead, - Update: nil, + Read: resourceAwsVpcPeeringRead, + Update: resourceAwsVpcPeeringUpdate, Delete: resourceAwsVpcPeeringDelete, Schema: map[string]*schema.Schema{ "peer_owner_id": &schema.Schema{ Type: schema.TypeString, Required: true, + ForceNew: true, }, "peer_vpc_id": &schema.Schema{ Type: schema.TypeString, Required: true, + ForceNew: true, }, "vpc_id": &schema.Schema{ Type: schema.TypeString, Required: true, + ForceNew: true, }, "tags": tagsSchema(), }, @@ -74,7 +77,7 @@ func resourceAwsVpcPeeringCreate(d *schema.ResourceData, meta interface{}) error return nil } -func resourceAwsVpcPeeringConnectionRead(d *schema.ResourceData, meta interface{}) error { +func resourceAwsVpcPeeringRead(d *schema.ResourceData, meta interface{}) error { ec2conn := meta.(*AWSClient).ec2conn pcRaw, _, err := resourceAwsVpcPeeringConnectionStateRefreshFunc(ec2conn, d.Id())() if err != nil { @@ -94,6 +97,19 @@ func resourceAwsVpcPeeringConnectionRead(d *schema.ResourceData, meta interface{ return nil } + +func resourceAwsVpcPeeringUpdate(d *schema.ResourceData, meta interface{}) error { + ec2conn := meta.(*AWSClient).ec2conn + + if err := setTags(ec2conn, d); err != nil { + return err + } else { + d.SetPartial("tags") + } + + return resourceAwsRouteTableRead(d, meta) +} + func resourceAwsVpcPeeringDelete(d *schema.ResourceData, meta interface{}) error { ec2conn := meta.(*AWSClient).ec2conn diff --git a/website/source/docs/providers/aws/r/vpc_peering.html.markdown b/website/source/docs/providers/aws/r/vpc_peering.html.markdown index 9fa2fa60da5b..59af3c0ca259 100644 --- a/website/source/docs/providers/aws/r/vpc_peering.html.markdown +++ b/website/source/docs/providers/aws/r/vpc_peering.html.markdown @@ -48,11 +48,12 @@ The following arguments are supported: * `vpc_id` - (Required) The ID of the requester VPC. * `tags` - (Optional) A mapping of tags to assign to the resource. - -Note: You still have to accept the peering with the aws console, aws-cli or goamz - ## Attributes Reference The following attributes are exported: -* `id` - The ID of the VPC Peering Connection +* `id` - The ID of the VPC Peering Connectiona + + +## Notes +You still have to accept the peering with the aws console, aws-cli or goamz