From 91f6f2a143f69fe7e22050658a1ce27cc479f869 Mon Sep 17 00:00:00 2001 From: Eric Rutherford Date: Tue, 6 Sep 2016 14:54:17 -0500 Subject: [PATCH] moving to using a map to clean up the error check --- builtin/providers/aws/resource_aws_nat_gateway.go | 9 ++++++++- builtin/providers/aws/resource_aws_nat_gateway_test.go | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_nat_gateway.go b/builtin/providers/aws/resource_aws_nat_gateway.go index 4d54152e7e..0457d9cdbd 100644 --- a/builtin/providers/aws/resource_aws_nat_gateway.go +++ b/builtin/providers/aws/resource_aws_nat_gateway.go @@ -101,7 +101,14 @@ func resourceAwsNatGatewayRead(d *schema.ResourceData, meta interface{}) error { if err != nil { return err } - if ngRaw == nil || strings.ToLower(state) == "deleted" || strings.ToLower(state) == "deleting" || strings.ToLower(state) == "failed" { + + status := map[string]bool { + "deleted": true, + "deleting": true, + "failed": true, + } + + if ngRaw == nil || status[strings.ToLower(state)] { 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 8914ff2846..dfe4cb532c 100644 --- a/builtin/providers/aws/resource_aws_nat_gateway_test.go +++ b/builtin/providers/aws/resource_aws_nat_gateway_test.go @@ -43,8 +43,13 @@ func testAccCheckNatGatewayDestroy(s *terraform.State) error { resp, err := conn.DescribeNatGateways(&ec2.DescribeNatGatewaysInput{ NatGatewayIds: []*string{aws.String(rs.Primary.ID)}, }) + status := map[string]bool { + "deleted": false, + "deleting": false, + "failed": false, + } if err == nil { - 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" { + if len(resp.NatGateways) > 0 && status[strings.ToLower(*resp.NatGateways[0].State)] { return fmt.Errorf("still exists") }