Skip to content

Commit 1237f3e

Browse files
report bucket name when not empty while deleting (#3501) (#2059)
Signed-off-by: Modular Magician <[email protected]>
1 parent 2b8b220 commit 1237f3e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.changelog/3501.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
storage: added `google_storage_bucket` bucket name to the error message when the bucket can't be deleted because it's not empty
3+
```

google-beta/resource_storage_bucket.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ func resourceStorageBucketDelete(d *schema.ResourceData, meta interface{}) error
645645
}
646646

647647
if !d.Get("force_destroy").(bool) {
648-
deleteErr := errors.New("Error trying to delete a bucket containing objects without `force_destroy` set to true")
648+
deleteErr := fmt.Errorf("Error trying to delete bucket %s containing objects without `force_destroy` set to true", bucket)
649649
log.Printf("Error! %s : %s\n\n", bucket, deleteErr)
650650
return deleteErr
651651
}

0 commit comments

Comments
 (0)