Skip to content

Commit addecf3

Browse files
authored
fix(cos): [122768436] tencentcloud_cos_bucket Support multi zone deletion (#3267)
* add * add
1 parent 92a0c17 commit addecf3

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.changelog/3267.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_cos_bucket: Support multi zone deletion
3+
```

tencentcloud/services/cos/resource_tc_cos_bucket.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,11 +1042,12 @@ func resourceTencentCloudCosBucketDelete(d *schema.ResourceData, meta interface{
10421042
bucket := d.Id()
10431043
forced := d.Get("force_clean").(bool)
10441044
versioned := d.Get("versioning_enable").(bool)
1045+
multiAz := d.Get("multi_az").(bool)
10451046
cosService := CosService{
10461047
client: meta.(tccommon.ProviderMeta).GetAPIV3Conn(),
10471048
}
10481049
cdcId := d.Get("cdc_id").(string)
1049-
err := cosService.DeleteBucket(ctx, bucket, forced, versioned, cdcId)
1050+
err := cosService.DeleteBucket(ctx, bucket, forced, versioned, cdcId, multiAz)
10501051
if err != nil {
10511052
return err
10521053
}

tencentcloud/services/cos/resource_tc_cos_bucket_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func testSweepCosBuckets(region string) error {
7474
}
7575
log.Printf("[INFO] deleting cos bucket: %s", bucket)
7676

77-
if err = cosService.DeleteBucket(ctx, bucket, true, true, ""); err != nil {
77+
if err = cosService.DeleteBucket(ctx, bucket, true, true, "", true); err != nil {
7878
log.Printf("[ERROR] delete bucket %s error: %s", bucket, err.Error())
7979
}
8080
}

tencentcloud/services/cos/service_tencentcloud_cos.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,13 @@ func (me *CosService) TencentcloudHeadBucket(ctx context.Context, bucket string,
353353
return
354354
}
355355

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

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

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

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

409409
delObjs := make([]cos.Object, 0, delCnt)
410-
if versioned {
410+
if versioned || multiAz {
411411
//add the versions
412412
for _, v := range objList.Version {
413413
delObjs = append(delObjs, cos.Object{

0 commit comments

Comments
 (0)