Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3597.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_clb_instance: optimiz delete code logic.
```
7 changes: 7 additions & 0 deletions tencentcloud/services/clb/resource_tc_clb_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/pkg/errors"
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"

"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
Expand Down Expand Up @@ -1111,6 +1112,12 @@ func resourceTencentCloudClbInstanceDelete(d *schema.ResourceData, meta interfac
err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
e := clbService.DeleteLoadBalancerById(ctx, clbId)
if e != nil {
if ve, ok := e.(*sdkErrors.TencentCloudSDKError); ok {
if ve.GetCode() == "FailedOperation.ResourceInOperating" {
return tccommon.RetryError(e, "FailedOperation.ResourceInOperating")
}
}

return tccommon.RetryError(e)
}

Expand Down
5 changes: 5 additions & 0 deletions tencentcloud/services/clb/service_tencentcloud_clb.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,12 @@ func (me *ClbService) DeleteLoadBalancerById(ctx context.Context, clbId string)
if e.GetCode() == "InvalidParameter.LBIdNotFound" {
return nil
}

if e.GetCode() == "FailedOperation.ResourceInOperating" {
return err
}
}

return errors.WithStack(err)
}
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
Expand Down
Loading