Merge pull request #22713 from ialidzhikov/fix/igw-not-found-checks

r/internet_gateway: Prevent giving up on wait for attachement too early
hashicorp · Jan 21, 2022 · de458c3 · de458c3
2 parents 99ce18e + cacfa08
commit de458c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.changelog/22713.txt b/.changelog/22713.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_internet_gateway: No longer give up before the attachment timeout (4m) is exceeded (previously it was giving up after 20 not found checks).
+```
diff --git a/internal/service/ec2/wait.go b/internal/service/ec2/wait.go
@@ -25,8 +25,8 @@ const (
 	RouteNotFoundChecks                        = 1000 // Should exceed any reasonable custom timeout value.
 	RouteTableNotFoundChecks                   = 1000 // Should exceed any reasonable custom timeout value.
 	RouteTableAssociationCreatedNotFoundChecks = 1000 // Should exceed any reasonable custom timeout value.
-
-	SecurityGroupNotFoundChecks = 1000 // Should exceed any reasonable custom timeout value.
+	SecurityGroupNotFoundChecks                = 1000 // Should exceed any reasonable custom timeout value.
+	InternetGatewayNotFoundChecks              = 1000 // Should exceed any reasonable custom timeout value.
 )
 
 const (
@@ -1148,10 +1148,11 @@ const (
 
 func WaitInternetGatewayAttached(conn *ec2.EC2, internetGatewayID, vpcID string, timeout time.Duration) (*ec2.InternetGatewayAttachment, error) {
 	stateConf := &resource.StateChangeConf{
-		Pending: []string{ec2.AttachmentStatusAttaching},
-		Target:  []string{InternetGatewayAttachmentStateAvailable},
-		Timeout: timeout,
-		Refresh: StatusInternetGatewayAttachmentState(conn, internetGatewayID, vpcID),
+		Pending:        []string{ec2.AttachmentStatusAttaching},
+		Target:         []string{InternetGatewayAttachmentStateAvailable},
+		Timeout:        timeout,
+		NotFoundChecks: InternetGatewayNotFoundChecks,
+		Refresh:        StatusInternetGatewayAttachmentState(conn, internetGatewayID, vpcID),
 	}
 
 	outputRaw, err := stateConf.WaitForState()