Skip to content

fix(cos): [122768436] tencentcloud_cos_bucket Support multi zone deletion #3267

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

Merged
merged 2 commits into from
Apr 3, 2025
Merged

fix(cos): [122768436] tencentcloud_cos_bucket Support multi zone deletion #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99a8365
add
SevenEarth Apr 3, 2025
9ae78c0
add
SevenEarth Apr 3, 2025
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/3267.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_cos_bucket: Support multi zone deletion
```
3 changes: 2 additions & 1 deletion tencentcloud/services/cos/resource_tc_cos_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,11 +1042,12 @@ func resourceTencentCloudCosBucketDelete(d *schema.ResourceData, meta interface{
bucket := d.Id()
forced := d.Get("force_clean").(bool)
versioned := d.Get("versioning_enable").(bool)
multiAz := d.Get("multi_az").(bool)
cosService := CosService{
client: meta.(tccommon.ProviderMeta).GetAPIV3Conn(),
}
cdcId := d.Get("cdc_id").(string)
err := cosService.DeleteBucket(ctx, bucket, forced, versioned, cdcId)
err := cosService.DeleteBucket(ctx, bucket, forced, versioned, cdcId, multiAz)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/services/cos/resource_tc_cos_bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func testSweepCosBuckets(region string) error {
}
log.Printf("[INFO] deleting cos bucket: %s", bucket)

if err = cosService.DeleteBucket(ctx, bucket, true, true, ""); err != nil {
if err = cosService.DeleteBucket(ctx, bucket, true, true, "", true); err != nil {
log.Printf("[ERROR] delete bucket %s error: %s", bucket, err.Error())
}
}
Expand Down
8 changes: 4 additions & 4 deletions tencentcloud/services/cos/service_tencentcloud_cos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,13 +353,13 @@ func (me *CosService) TencentcloudHeadBucket(ctx context.Context, bucket string,
return
}

func (me *CosService) DeleteBucket(ctx context.Context, bucket string, forced bool, versioned bool, cdcId string) (errRet error) {
func (me *CosService) DeleteBucket(ctx context.Context, bucket string, forced bool, versioned bool, cdcId string, multiAz bool) (errRet error) {
logId := tccommon.GetLogId(ctx)

if forced {
log.Printf("[DEBUG]%s api[%s] triggered, bucket [%s], versioned [%v]\n",
logId, "ForceCleanObject", bucket, versioned)
err := me.ForceCleanObject(ctx, bucket, versioned, cdcId)
err := me.ForceCleanObject(ctx, bucket, versioned, cdcId, multiAz)
if err != nil {
return err
}
Expand All @@ -381,7 +381,7 @@ func (me *CosService) DeleteBucket(ctx context.Context, bucket string, forced bo
return nil
}

func (me *CosService) ForceCleanObject(ctx context.Context, bucket string, versioned bool, cdcId string) error {
func (me *CosService) ForceCleanObject(ctx context.Context, bucket string, versioned bool, cdcId string, multiAz bool) error {
logId := tccommon.GetLogId(ctx)

// Get the object list of bucket with all versions
Expand All @@ -407,7 +407,7 @@ func (me *CosService) ForceCleanObject(ctx context.Context, bucket string, versi
}

delObjs := make([]cos.Object, 0, delCnt)
if versioned {
if versioned || multiAz {
//add the versions
for _, v := range objList.Version {
delObjs = append(delObjs, cos.Object{
Expand Down
Loading