From 7a6b04dfa2f59efccf8de5fa169b58155609d9d5 Mon Sep 17 00:00:00 2001 From: Eric Rutherford Date: Tue, 6 Sep 2016 12:25:42 -0500 Subject: [PATCH] adding missing failed states for the NAT Gateways --- builtin/providers/aws/resource_aws_nat_gateway.go | 2 +- builtin/providers/aws/resource_aws_nat_gateway_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_nat_gateway.go b/builtin/providers/aws/resource_aws_nat_gateway.go index 4ad23ad8f5..4d54152e7e 100644 --- a/builtin/providers/aws/resource_aws_nat_gateway.go +++ b/builtin/providers/aws/resource_aws_nat_gateway.go @@ -101,7 +101,7 @@ func resourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } - if ngRaw == nil || strings.ToLower(state) == "deleted" { + if ngRaw == nil || strings.ToLower(state) == "deleted" || strings.ToLower(state) == "deleting" || strings.ToLower(state) == "failed" { log.Printf("[INFO] Removing %s from Terraform state as it is not found or in the deleted state.", d.Id()) d.SetId("") return nil diff --git a/builtin/providers/aws/resource_aws_nat_gateway_test.go b/builtin/providers/aws/resource_aws_nat_gateway_test.go index c4dd8b6f68..8914ff2846 100644 --- a/builtin/providers/aws/resource_aws_nat_gateway_test.go +++ b/builtin/providers/aws/resource_aws_nat_gateway_test.go @@ -44,7 +44,7 @@ func testAccCheckNatGatewayDestroy(s *terraform.State) error { NatGatewayIds: []*string{aws.String(rs.Primary.ID)}, }) if err == nil { - if len(resp.NatGateways) > 0 && strings.ToLower(*resp.NatGateways[0].State) != "deleted" { + if len(resp.NatGateways) > 0 && strings.ToLower(*resp.NatGateways[0].State) != "deleted" && strings.ToLower(*resp.NatGateways[0].State) != "deleting" && strings.ToLower(*resp.NatGateways[0].State) != "failed" { return fmt.Errorf("still exists") }