From 2ef36e191b65e9d5362c92e443b67ceb2a8a9a69 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 7 Jul 2014 15:44:08 -0700 Subject: [PATCH] providers/aws: wait for resource to be gon --- builtin/providers/aws/resource_aws_subnet.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/builtin/providers/aws/resource_aws_subnet.go b/builtin/providers/aws/resource_aws_subnet.go index 5ef2b763a..44180d143 100644 --- a/builtin/providers/aws/resource_aws_subnet.go +++ b/builtin/providers/aws/resource_aws_subnet.go @@ -81,6 +81,20 @@ func resource_aws_subnet_destroy( return fmt.Errorf("Error deleting subnet: %s", err) } + // Wait for the Subnet to actually delete + log.Printf("[DEBUG] Waiting for subnet (%s) to delete", s.ID) + stateConf := &resource.StateChangeConf{ + Pending: []string{"available", "pending"}, + Target: "", + Refresh: SubnetStateRefreshFunc(ec2conn, s.ID), + Timeout: 10 * time.Minute, + } + if _, err := stateConf.WaitForState(); err != nil { + return fmt.Errorf( + "Error waiting for subnet (%s) to destroy", + s.ID, err) + } + return nil }