Skip to content

Commit 21e9ba4

Browse files
Handled async operation of Folder deletion (#7011) (#13377)
Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]>
1 parent ea5767b commit 21e9ba4

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.changelog/7011.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
cloudplatform: handled async operation for `google_folder` deletion
3+
```

google/resource_google_folder.go

+14-1
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,26 @@ func resourceGoogleFolderDelete(d *schema.ResourceData, meta interface{}) error
215215
}
216216
displayName := d.Get("display_name").(string)
217217

218+
var op *resourceManagerV3.Operation
218219
err = retryTimeDuration(func() error {
219-
_, reqErr := config.NewResourceManagerV3Client(userAgent).Folders.Delete(d.Id()).Do()
220+
var reqErr error
221+
op, reqErr = config.NewResourceManagerV3Client(userAgent).Folders.Delete(d.Id()).Do()
220222
return reqErr
221223
}, d.Timeout(schema.TimeoutDelete))
222224
if err != nil {
223225
return fmt.Errorf("Error deleting folder '%s': %s", displayName, err)
224226
}
227+
228+
opAsMap, err := ConvertToMap(op)
229+
if err != nil {
230+
return err
231+
}
232+
233+
err = resourceManagerOperationWaitTime(config, opAsMap, "deleting folder", userAgent, d.Timeout(schema.TimeoutDelete))
234+
if err != nil {
235+
return fmt.Errorf("Error deleting folder '%s': %s", displayName, err)
236+
}
237+
225238
return nil
226239
}
227240

0 commit comments

Comments
 (0)