r/aws_ec2_carrier_gateway: Better handling of carrier gateway deletion.

hashicorp · Dec 7, 2020 · bcee37a · bcee37a
1 parent 337c75e
commit bcee37a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/aws/internal/service/ec2/waiter/status.go b/aws/internal/service/ec2/waiter/status.go
@@ -32,7 +32,13 @@ func CarrierGatewayState(conn *ec2.EC2, carrierGatewayID string) resource.StateR
 			return nil, carrierGatewayStateNotFound, nil
 		}
 
-		return carrierGateway, aws.StringValue(carrierGateway.State), nil
+		state := aws.StringValue(carrierGateway.State)
+
+		if state == ec2.CarrierGatewayStateDeleted {
+			return nil, carrierGatewayStateNotFound, nil
+		}
+
+		return carrierGateway, state, nil
 	}
 }
 

diff --git a/aws/internal/service/ec2/waiter/waiter.go b/aws/internal/service/ec2/waiter/waiter.go
@@ -38,7 +38,7 @@ func CarrierGatewayAvailable(conn *ec2.EC2, carrierGatewayID string) (*ec2.Carri
 func CarrierGatewayDeleted(conn *ec2.EC2, carrierGatewayID string) (*ec2.CarrierGateway, error) {
 	stateConf := &resource.StateChangeConf{
 		Pending: []string{ec2.CarrierGatewayStateDeleting},
-		Target:  []string{ec2.CarrierGatewayStateDeleted},
+		Target:  []string{},
 		Refresh: CarrierGatewayState(conn, carrierGatewayID),
 		Timeout: CarrierGatewayDeletedTimeout,
 	}