ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8689 from erutherford/master 

adding missing failed states for the NAT Gateways
This commit is contained in:
Paul Stack 2016-09-07 10:04:07 +01:00 committed by GitHub
parent 9c21a91043 2cca48a829
commit 91ade752a0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/providers/aws/resource_aws_nat_gateway.go
View File

@ -101,7 +101,14 @@ func resourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error {
if err != nil { if err != nil {
return err return err
} }
if ngRaw == nil || strings.ToLower(state) == "deleted" {
status := map[string]bool{
"deleted": true,
"deleting": true,
"failed": true,
}
if _, ok := status[strings.ToLower(state)]; ngRaw == nil || ok {
log.Printf("[INFO] Removing %s from Terraform state as it is not found or in the deleted state.", d.Id()) log.Printf("[INFO] Removing %s from Terraform state as it is not found or in the deleted state.", d.Id())
d.SetId("") d.SetId("")
return nil return nil

7
builtin/providers/aws/resource_aws_nat_gateway_test.go
View File

@ -44,7 +44,12 @@ func testAccCheckNatGatewayDestroy(s *terraform.State) error {
NatGatewayIds: []*string{aws.String(rs.Primary.ID)}, NatGatewayIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err == nil {
if len(resp.NatGateways) > 0 && strings.ToLower(*resp.NatGateways[0].State) != "deleted" { status := map[string]bool{
"deleted": true,
"deleting": true,
"failed": true,
}
if _, ok := status[strings.ToLower(*resp.NatGateways[0].State)]; len(resp.NatGateways) > 0 && !ok {
return fmt.Errorf("still exists") return fmt.Errorf("still exists")
} }