Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resource/alicloud_resource_manager_account: update delete timeout to five minutes #7018

Merged
merged 1 commit into from
Mar 4, 2024
Merged

resource/alicloud_resource_manager_account: update delete timeout to five minutes #7018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions alicloud/resource_alicloud_resource_manager_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func resourceAlicloudResourceManagerAccount() *schema.Resource {
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(3 * time.Minute),
Update: schema.DefaultTimeout(3 * time.Minute),
Delete: schema.DefaultTimeout(3 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
},
Schema: map[string]*schema.Schema{
"account_name_prefix": {
Expand Down Expand Up @@ -265,7 +265,7 @@ func resourceAlicloudResourceManagerAccountDelete(d *schema.ResourceData, meta i
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}

stateConf := BuildStateConf([]string{"Checking"}, []string{"Success", "Deleting"}, d.Timeout(schema.TimeoutDelete), 5*time.Second, resourcemanagerService.AccountDeletionStateRefreshFunc(d.Id(), []string{"CheckFailed", "DeleteFailed"}))
stateConf := BuildStateConf([]string{"Checking", "Deleting"}, []string{"Success"}, d.Timeout(schema.TimeoutDelete), 5*time.Second, resourcemanagerService.AccountDeletionStateRefreshFunc(d.Id(), []string{"CheckFailed", "DeleteFailed"}))
if _, err := stateConf.WaitForState(); err != nil {
return WrapErrorf(err, IdMsg, d.Id())
}
Expand Down
9 changes: 7 additions & 2 deletions website/docs/r/resource_manager_account.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,17 @@ variable "display_name" {
default = "EAccount"
}

resource "random_integer" "default" {
min = 10000
max = 99999
}

resource "alicloud_resource_manager_folder" "example" {
folder_name = var.name
folder_name = "${var.name}-${random_integer.default.result}"
}

resource "alicloud_resource_manager_account" "example" {
display_name = var.display_name
display_name = "${var.display_name}-${random_integer.default.result}"
folder_id = alicloud_resource_manager_folder.example.id
}
```
Expand Down