From 35065fc8c857349e841fa5e28e5ac8689cbf301d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 11 Oct 2014 11:02:11 -0700 Subject: [PATCH] providers/aws: properly report errors if DB instance destroy fails [GH-310] --- builtin/providers/aws/resource_aws_db_instance.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/builtin/providers/aws/resource_aws_db_instance.go b/builtin/providers/aws/resource_aws_db_instance.go index 829532b8d0..0f2cb9e870 100644 --- a/builtin/providers/aws/resource_aws_db_instance.go +++ b/builtin/providers/aws/resource_aws_db_instance.go @@ -163,11 +163,12 @@ func resource_aws_db_instance_destroy( } log.Printf("[DEBUG] DB Instance destroy configuration: %v", opts) - _, err := conn.DeleteDBInstance(&opts) + if _, err := conn.DeleteDBInstance(&opts); err != nil { + return err + } log.Println( "[INFO] Waiting for DB Instance to be destroyed") - stateConf := &resource.StateChangeConf{ Pending: []string{"creating", "backing-up", "modifying", "deleting", "available"}, @@ -177,10 +178,7 @@ func resource_aws_db_instance_destroy( MinTimeout: 10 * time.Second, Delay: 30 * time.Second, // Wait 30 secs before starting } - - // Wait, catching any errors - _, err = stateConf.WaitForState() - if err != nil { + if _, err := stateConf.WaitForState(); err != nil { return err }