ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retry finding route after creating it (#7463) 

The symptom is that a route "fails" to create, then every subsequent
`terraform apply` fails with RouteAlreadyExists.

CreateRoute was succeeding but the very next DescribeRouteTables
was not listing the new route.
This commit is contained in:
David Tolnay 2016-07-05 13:04:09 -07:00 committed by Clint
parent 3a177093c0
commit 4ba75bd54e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/providers/aws/resource_aws_route.go
View File

@ -179,14 +179,18 @@ func resourceAwsRouteCreate(d *schema.ResourceData, meta interface{}) error {
return fmt.Errorf("Error creating route: %s", err) return fmt.Errorf("Error creating route: %s", err)
} }
route, err := findResourceRoute(conn, d.Get("route_table_id").(string), d.Get("destination_cidr_block").(string)) var route *ec2.Route
err = resource.Retry(15*time.Second, func() *resource.RetryError {
route, err = findResourceRoute(conn, d.Get("route_table_id").(string), d.Get("destination_cidr_block").(string))
return resource.RetryableError(err)
})
if err != nil { if err != nil {
return err return fmt.Errorf("Error finding route after creating it: %s", err)
} }
d.SetId(routeIDHash(d, route)) d.SetId(routeIDHash(d, route))
resourceAwsRouteSetResourceData(d, route)
return resourceAwsRouteRead(d, meta) return nil
} }
func resourceAwsRouteRead(d *schema.ResourceData, meta interface{}) error { func resourceAwsRouteRead(d *schema.ResourceData, meta interface{}) error {
@ -195,7 +199,11 @@ func resourceAwsRouteRead(d *schema.ResourceData, meta interface{}) error {
if err != nil { if err != nil {
return err return err
} }
resourceAwsRouteSetResourceData(d, route)
return nil
}
func resourceAwsRouteSetResourceData(d *schema.ResourceData, route *ec2.Route) {
d.Set("destination_prefix_list_id", route.DestinationPrefixListId) d.Set("destination_prefix_list_id", route.DestinationPrefixListId)
d.Set("gateway_id", route.GatewayId) d.Set("gateway_id", route.GatewayId)
d.Set("nat_gateway_id", route.NatGatewayId) d.Set("nat_gateway_id", route.NatGatewayId)
@ -205,8 +213,6 @@ func resourceAwsRouteRead(d *schema.ResourceData, meta interface{}) error {
d.Set("origin", route.Origin) d.Set("origin", route.Origin)
d.Set("state", route.State) d.Set("state", route.State)
d.Set("vpc_peering_connection_id", route.VpcPeeringConnectionId) d.Set("vpc_peering_connection_id", route.VpcPeeringConnectionId)
return nil
} }
func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error { func resourceAwsRouteUpdate(d *schema.ResourceData, meta interface{}) error {
@ -380,7 +386,7 @@ func findResourceRoute(conn *ec2.EC2, rtbid string, cidr string) (*ec2.Route, er
} }
} }
return nil, fmt.Errorf(` return nil, fmt.Errorf(
error finding matching route for Route table (%s) and destination CIDR block (%s)`, `error finding matching route for Route table (%s) and destination CIDR block (%s)`,
rtbid, cidr) rtbid, cidr)
} }