fix timeout issues aws_route_table_association

.changelog/30755.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_route_table_association: Add configurable timeouts
+```
+
+```release-note:enhancement
+resource/aws_main_route_table_association: Add configurable timeouts
+```

internal/service/ec2/vpc_main_route_table_association.go

@@ -3,6 +3,7 @@ package ec2
 import (
 	"context"
 	"log"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -21,6 +22,12 @@ func ResourceMainRouteTableAssociation() *schema.Resource {
 		UpdateWithoutTimeout: resourceMainRouteTableAssociationUpdate,
 		DeleteWithoutTimeout: resourceMainRouteTableAssociationDelete,
 
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(5 * time.Minute),
+			Update: schema.DefaultTimeout(2 * time.Minute),
+			Delete: schema.DefaultTimeout(5 * time.Minute),
+		},
+
 		Schema: map[string]*schema.Schema{
 			// We use this field to record the main route table that is automatically
 			// created when the VPC is created. We need this to be able to "destroy"
@@ -72,7 +79,7 @@ func resourceMainRouteTableAssociationCreate(ctx context.Context, d *schema.Reso
 	d.SetId(aws.StringValue(output.NewAssociationId))
 
 	log.Printf("[DEBUG] Waiting for Main Route Table Association (%s) creation", d.Id())
-	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, d.Id()); err != nil {
+	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for Main Route Table Association (%s) create: %s", d.Id(), err)
 	}
 
@@ -122,7 +129,7 @@ func resourceMainRouteTableAssociationUpdate(ctx context.Context, d *schema.Reso
 	d.SetId(aws.StringValue(output.NewAssociationId))
 
 	log.Printf("[DEBUG] Waiting for Main Route Table Association (%s) update", d.Id())
-	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, d.Id()); err != nil {
+	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for Main Route Table Association (%s) update: %s", d.Id(), err)
 	}
 
@@ -146,7 +153,7 @@ func resourceMainRouteTableAssociationDelete(ctx context.Context, d *schema.Reso
 	}
 
 	log.Printf("[DEBUG] Waiting for Main Route Table Association (%s) deletion", d.Id())
-	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, aws.StringValue(output.NewAssociationId)); err != nil {
+	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, aws.StringValue(output.NewAssociationId), d.Timeout(schema.TimeoutDelete)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for Main Route Table Association (%s) delete: %s", d.Id(), err)
 	}
 

internal/service/ec2/vpc_route_table.go

@@ -358,7 +358,7 @@ func resourceRouteTableDelete(ctx context.Context, d *schema.ResourceData, meta
 	for _, v := range routeTable.Associations {
 		v := aws.StringValue(v.RouteTableAssociationId)
 
-		if err := routeTableAssociationDelete(ctx, conn, v); err != nil {
+		if err := routeTableAssociationDelete(ctx, conn, v, d.Timeout(schema.TimeoutDelete)); err != nil {
 			return sdkdiag.AppendErrorf(diags, "deleting Route Table (%s): %s", d.Id(), err)
 		}
 	}

internal/service/ec2/vpc_route_table_association.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -27,6 +28,12 @@ func ResourceRouteTableAssociation() *schema.Resource {
 			StateContext: resourceRouteTableAssociationImport,
 		},
 
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(5 * time.Minute),
+			Update: schema.DefaultTimeout(2 * time.Minute),
+			Delete: schema.DefaultTimeout(5 * time.Minute),
+		},
+
 		Schema: map[string]*schema.Schema{
 			"gateway_id": {
 				Type:         schema.TypeString,
@@ -80,7 +87,7 @@ func resourceRouteTableAssociationCreate(ctx context.Context, d *schema.Resource
 	d.SetId(aws.StringValue(output.(*ec2.AssociateRouteTableOutput).AssociationId))
 
 	log.Printf("[DEBUG] Waiting for Route Table Association (%s) creation", d.Id())
-	if _, err := WaitRouteTableAssociationCreated(ctx, conn, d.Id()); err != nil {
+	if _, err := WaitRouteTableAssociationCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for Route Table Association (%s) create: %s", d.Id(), err)
 	}
 
@@ -144,7 +151,7 @@ func resourceRouteTableAssociationUpdate(ctx context.Context, d *schema.Resource
 	d.SetId(aws.StringValue(output.NewAssociationId))
 
 	log.Printf("[DEBUG] Waiting for Route Table Association (%s) update", d.Id())
-	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, d.Id()); err != nil {
+	if _, err := WaitRouteTableAssociationUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
 		return sdkdiag.AppendErrorf(diags, "waiting for Route Table Association (%s) update: %s", d.Id(), err)
 	}
 
@@ -155,7 +162,7 @@ func resourceRouteTableAssociationDelete(ctx context.Context, d *schema.Resource
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).EC2Conn()
 
-	if err := routeTableAssociationDelete(ctx, conn, d.Id()); err != nil {
+	if err := routeTableAssociationDelete(ctx, conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil {
 		return sdkdiag.AppendFromErr(diags, err)
 	}
 	return diags
@@ -209,7 +216,7 @@ func resourceRouteTableAssociationImport(ctx context.Context, d *schema.Resource
 }
 
 // routeTableAssociationDelete attempts to delete a route table association.
-func routeTableAssociationDelete(ctx context.Context, conn *ec2.EC2, associationID string) error {
+func routeTableAssociationDelete(ctx context.Context, conn *ec2.EC2, associationID string, timeout time.Duration) error {
 	log.Printf("[INFO] Deleting Route Table Association: %s", associationID)
 	_, err := conn.DisassociateRouteTableWithContext(ctx, &ec2.DisassociateRouteTableInput{
 		AssociationId: aws.String(associationID),
@@ -224,7 +231,7 @@ func routeTableAssociationDelete(ctx context.Context, conn *ec2.EC2, association
 	}
 
 	log.Printf("[DEBUG] Waiting for Route Table Association (%s) deletion", associationID)
-	if _, err := WaitRouteTableAssociationDeleted(ctx, conn, associationID); err != nil {
+	if _, err := WaitRouteTableAssociationDeleted(ctx, conn, associationID, timeout); err != nil {
 		return fmt.Errorf("deleting Route Table Association (%s): waiting for completion: %w", associationID, err)
 	}
 

internal/service/ec2/wait.go

@@ -733,12 +733,12 @@ func WaitRouteTableDeleted(ctx context.Context, conn *ec2.EC2, id string, timeou
 	return nil, err
 }
 
-func WaitRouteTableAssociationCreated(ctx context.Context, conn *ec2.EC2, id string) (*ec2.RouteTableAssociationState, error) {
+func WaitRouteTableAssociationCreated(ctx context.Context, conn *ec2.EC2, id string, timeout time.Duration) (*ec2.RouteTableAssociationState, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending:        []string{ec2.RouteTableAssociationStateCodeAssociating},
 		Target:         []string{ec2.RouteTableAssociationStateCodeAssociated},
 		Refresh:        StatusRouteTableAssociationState(ctx, conn, id),
-		Timeout:        RouteTableAssociationCreatedTimeout,
+		Timeout:        timeout,
 		NotFoundChecks: RouteTableAssociationCreatedNotFoundChecks,
 	}
 
@@ -755,12 +755,12 @@ func WaitRouteTableAssociationCreated(ctx context.Context, conn *ec2.EC2, id str
 	return nil, err
 }
 
-func WaitRouteTableAssociationDeleted(ctx context.Context, conn *ec2.EC2, id string) (*ec2.RouteTableAssociationState, error) {
+func WaitRouteTableAssociationDeleted(ctx context.Context, conn *ec2.EC2, id string, timeout time.Duration) (*ec2.RouteTableAssociationState, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending: []string{ec2.RouteTableAssociationStateCodeDisassociating, ec2.RouteTableAssociationStateCodeAssociated},
 		Target:  []string{},
 		Refresh: StatusRouteTableAssociationState(ctx, conn, id),
-		Timeout: RouteTableAssociationDeletedTimeout,
+		Timeout: timeout,
 	}
 
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
@@ -776,12 +776,12 @@ func WaitRouteTableAssociationDeleted(ctx context.Context, conn *ec2.EC2, id str
 	return nil, err
 }
 
-func WaitRouteTableAssociationUpdated(ctx context.Context, conn *ec2.EC2, id string) (*ec2.RouteTableAssociationState, error) {
+func WaitRouteTableAssociationUpdated(ctx context.Context, conn *ec2.EC2, id string, timeout time.Duration) (*ec2.RouteTableAssociationState, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending: []string{ec2.RouteTableAssociationStateCodeAssociating},
 		Target:  []string{ec2.RouteTableAssociationStateCodeAssociated},
 		Refresh: StatusRouteTableAssociationState(ctx, conn, id),
-		Timeout: RouteTableAssociationUpdatedTimeout,
+		Timeout: timeout,
 	}
 
 	outputRaw, err := stateConf.WaitForStateContext(ctx)

website/docs/r/main_route_table_association.html.markdown

@@ -49,3 +49,11 @@ the `main_route_table_association` delete to work properly.
 [aws-route-tables]: http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_Route_Tables.html#Route_Replacing_Main_Table
 [tf-route-tables]: /docs/providers/aws/r/route_table.html
 [tf-default-route-table]: /docs/providers/aws/r/default_route_table.html
+
+## Timeouts
+
+[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts):
+
+- `create` - (Default `5m`)
+- `update` - (Default `2m`)
+- `delete` - (Default `5m`)

website/docs/r/route_table_association.html.markdown

@@ -43,6 +43,14 @@ In addition to all arguments above, the following attributes are exported:
 
 * `id` - The ID of the association
 
+## Timeouts
+
+[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts):
+
+- `create` - (Default `5m`)
+- `update` - (Default `2m`)
+- `delete` - (Default `5m`)
+
 ## Import
 
 ~> **NOTE:** Attempting to associate a route table with a subnet or gateway, where either