fix: cos - lifecycle rule id and delete marker (#910)

Author: Kagashino

tencentcloud/resource_tc_cos_bucket.go

@@ -619,6 +619,11 @@ func resourceTencentCloudCosBucket() *schema.Resource {
 										ValidateFunc: validateIntegerMin(0),
 										Description:  "Specifies the number of days after object creation when the specific rule action takes effect.",
 									},
+									"delete_marker": {
+										Type:        schema.TypeBool,
+										Optional:    true,
+										Description: "Indicates whether the delete marker of an expired object will be removed.",
+									},
 								},
 							},
 						},
@@ -1288,7 +1293,11 @@ func resourceTencentCloudCosBucketLifecycleUpdate(ctx context.Context, client *s
 		for i, lifecycleRule := range lifecycleRules {
 			r := lifecycleRule.(map[string]interface{})
 			rule := &s3.LifecycleRule{}
-			rule.Status = aws.String(s3.ExpirationStatusEnabled)
+			id, ok := r["id"].(string)
+			if ok {
+				rule.ID = &id
+			}
+			rule.Status = helper.String(s3.ExpirationStatusEnabled)
 			prefix := r["filter_prefix"].(string)
 			rule.Filter = &s3.LifecycleRuleFilter{
 				Prefix: &prefix,
@@ -1324,7 +1333,7 @@ func resourceTencentCloudCosBucketLifecycleUpdate(ctx context.Context, client *s
 				expiration := expirations[0].(map[string]interface{})
 				e := &s3.LifecycleExpiration{}
 
-				if val, ok := expiration["data"].(string); ok && val != "" {
+				if val, ok := expiration["date"].(string); ok && val != "" {
 					date, err := time.Parse(time.RFC3339, fmt.Sprintf("%sT00:00:00Z", val))
 					if err != nil {
 						return fmt.Errorf("parsing cos bucket lifecycle expiration data(%s) error: %s", val, err.Error())
@@ -1334,6 +1343,10 @@ func resourceTencentCloudCosBucketLifecycleUpdate(ctx context.Context, client *s
 					e.Days = aws.Int64(int64(val))
 				}
 
+				if val, ok := expiration["delete_marker"].(bool); ok && val {
+					e.ExpiredObjectDeleteMarker = helper.Bool(true)
+				}
+
 				rule.Expiration = e
 			}
 

tencentcloud/resource_tc_cos_bucket_test.go

@@ -225,6 +225,7 @@ func TestAccTencentCloudCosBucket_lifecycle(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckCosBucketExists("tencentcloud_cos_bucket.bucket_lifecycle"),
 					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_lifecycle", "lifecycle_rules.#", "1"),
+					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_lifecycle", "lifecycle_rules.0.id", "rule1"),
 					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_lifecycle", "lifecycle_rules.0.filter_prefix", "test/"),
 					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_lifecycle", "lifecycle_rules.0.expiration.#", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_cos_bucket.bucket_lifecycle", "lifecycle_rules.0.expiration.3672460294.days", "365"),
@@ -654,7 +655,9 @@ func testAccBucket_lifecycle(appid string) string {
 resource "tencentcloud_cos_bucket" "bucket_lifecycle" {
   bucket = "tf-bucket-lifecycle-%s"
   acl    = "public-read"
+  versioning_enable = true
   lifecycle_rules {
+    id = "rule1"
     filter_prefix = "test/"
     expiration {
       days = 365
@@ -677,7 +680,9 @@ func testAccBucket_lifecycleUpdate(appid string) string {
 resource "tencentcloud_cos_bucket" "bucket_lifecycle" {
   bucket = "tf-bucket-lifecycle-%s"
   acl    = "public-read"
+  versioning_enable = true
   lifecycle_rules {
+    id = "rule1"
     filter_prefix = "test/"
     expiration {
       days = 300

tencentcloud/service_tencentcloud_cos.go

@@ -340,6 +340,10 @@ func (me *CosService) GetBucketLifecycle(ctx context.Context, bucket string) (li
 		for _, value := range response.Rules {
 			rule := make(map[string]interface{})
 
+			if value.ID != nil {
+				rule["id"] = *value.ID
+			}
+
 			// filter_prefix
 			if value.Filter != nil {
 				if value.Filter.And != nil && value.Filter.And.Prefix != nil &&
@@ -376,6 +380,9 @@ func (me *CosService) GetBucketLifecycle(ctx context.Context, bucket string) (li
 				if value.Expiration.Days != nil {
 					e["days"] = int(*value.Expiration.Days)
 				}
+				if value.Expiration.ExpiredObjectDeleteMarker != nil {
+					e["delete_marker"] = *value.Expiration.ExpiredObjectDeleteMarker
+				}
 				rule["expiration"] = schema.NewSet(expirationHash, []interface{}{e})
 			}
 

website/docs/r/cos_bucket.html.markdown

@@ -266,6 +266,7 @@ The `expiration` object supports the following:
 
 * `date` - (Optional) Specifies the date after which you want the corresponding action to take effect.
 * `days` - (Optional) Specifies the number of days after object creation when the specific rule action takes effect.
+* `delete_marker` - (Optional) Indicates whether the delete marker of an expired object will be removed.
 
 The `lifecycle_rules` object supports the following: