Merge pull request #21062 from ryancragun/ryancragun/rtb_association_…

…max_not_found r/aws_route_table_association: Wait for 40 NotFoundChecks
hashicorp · Sep 28, 2021 · 4086370 · 4086370
2 parents 18a8835 + ea669b3
commit 4086370
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.changelog/21062.txt b/.changelog/21062.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_route_table_association: Wait for up to 40 not found checks when creating a new route table association
+```
diff --git a/aws/internal/service/ec2/waiter/waiter.go b/aws/internal/service/ec2/waiter/waiter.go
@@ -311,7 +311,8 @@ const (
 	RouteTableDeletedTimeout = 5 * time.Minute
 	RouteTableUpdatedTimeout = 5 * time.Minute
 
-	RouteTableNotFoundChecks = 40
+	RouteTableNotFoundChecks                   = 40
+	RouteTableAssociationCreatedNotFoundChecks = 40
 )
 
 func RouteTableReady(conn *ec2.EC2, id string) (*ec2.RouteTable, error) {
@@ -351,10 +352,11 @@ func RouteTableDeleted(conn *ec2.EC2, id string) (*ec2.RouteTable, error) {
 
 func RouteTableAssociationCreated(conn *ec2.EC2, id string) (*ec2.RouteTableAssociationState, error) {
 	stateConf := &resource.StateChangeConf{
-		Pending: []string{ec2.RouteTableAssociationStateCodeAssociating},
-		Target:  []string{ec2.RouteTableAssociationStateCodeAssociated},
-		Refresh: RouteTableAssociationState(conn, id),
-		Timeout: RouteTableAssociationCreatedTimeout,
+		Pending:        []string{ec2.RouteTableAssociationStateCodeAssociating},
+		Target:         []string{ec2.RouteTableAssociationStateCodeAssociated},
+		Refresh:        RouteTableAssociationState(conn, id),
+		Timeout:        RouteTableAssociationCreatedTimeout,
+		NotFoundChecks: RouteTableAssociationCreatedNotFoundChecks,
 	}
 
 	outputRaw, err := stateConf.WaitForState()