Remove extra permission required for doing a destory in resource_storage_bucket (#13730)

modular-magician · slevenick · commit ca10412c3cf0 · 2025-04-24T16:16:56.000-04:00
[upstream:69064da3e03584ab510448426a2973d2a951d3cd]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/google-beta/services/storage/resource_storage_bucket.go b/google-beta/services/storage/resource_storage_bucket.go
@@ -1088,7 +1088,9 @@ func resourceStorageBucketDelete(d *schema.ResourceData, meta interface{}) error
 
 		cacheList, cacheListErr := getAnywhereCacheListResult(config, bucket)
 		if cacheListErr != nil {
-			return cacheListErr
+			// If we get any error, try deleting the bucket anyway in case it's empty
+			// This would help our customers to avoid requiring extra storage.anywhereCaches.list permission.
+			break
 		}
 
 		if len(res.Items) == 0 && len(cacheList) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -1088,7 +1088,9 @@ func resourceStorageBucketDelete(d *schema.ResourceData, meta interface{}) error`
`1088`	`1088`
`1089`	`1089`	`cacheList, cacheListErr := getAnywhereCacheListResult(config, bucket)`
`1090`	`1090`	`if cacheListErr != nil {`
`1091`		`- return cacheListErr`
	`1091`	`+ // If we get any error, try deleting the bucket anyway in case it's empty`
	`1092`	`+ // This would help our customers to avoid requiring extra storage.anywhereCaches.list permission.`
	`1093`	`+ break`
`1092`	`1094`	`}`
`1093`	`1095`
`1094`	`1096`	`if len(res.Items) == 0 && len(cacheList) == 0 {`