Merge pull request #20265 from obourdon/fix-20216

Fix for issue #20216
hashicorp · Jul 21, 2021 · 8862a60 · 8862a60
2 parents ef6fe3a + 4eb7d60
commit 8862a60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.changelog/20265.txt b/.changelog/20265.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+aws/resource_aws_route_table_association: Correctly handle `associated` as a pending state when waiting for deletion of an association
+```
diff --git a/aws/internal/service/ec2/waiter/waiter.go b/aws/internal/service/ec2/waiter/waiter.go
@@ -370,7 +370,7 @@ func RouteTableAssociationCreated(conn *ec2.EC2, id string) (*ec2.RouteTableAsso
 
 func RouteTableAssociationDeleted(conn *ec2.EC2, id string) (*ec2.RouteTableAssociationState, error) {
 	stateConf := &resource.StateChangeConf{
-		Pending: []string{ec2.RouteTableAssociationStateCodeDisassociating},
+		Pending: []string{ec2.RouteTableAssociationStateCodeDisassociating, ec2.RouteTableAssociationStateCodeAssociated},
 		Target:  []string{},
 		Refresh: RouteTableAssociationState(conn, id),
 		Timeout: RouteTableAssociationDeletedTimeout,