report bucket name when not empty while deleting (#3501) (#6355)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · May 12, 2020 · 4b47d26 · 4b47d26
1 parent 0c6a726
commit 4b47d26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.changelog/3501.txt b/.changelog/3501.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+storage: added `google_storage_bucket` bucket name to the error message when the bucket can't be deleted because it's not empty
+```
diff --git a/google/resource_storage_bucket.go b/google/resource_storage_bucket.go
@@ -645,7 +645,7 @@ func resourceStorageBucketDelete(d *schema.ResourceData, meta interface{}) error
 		}
 
 		if !d.Get("force_destroy").(bool) {
-			deleteErr := errors.New("Error trying to delete a bucket containing objects without `force_destroy` set to true")
+			deleteErr := fmt.Errorf("Error trying to delete bucket %s containing objects without `force_destroy` set to true", bucket)
 			log.Printf("Error! %s : %s\n\n", bucket, deleteErr)
 			return deleteErr
 		}