add

Author: SevenEarth

go.mod

@@ -45,8 +45,8 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.1073
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.13
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.3.14
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.14
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.11

go.sum

@@ -867,8 +867,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8 h1:JIvn+IybK
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.3.8/go.mod h1:imjZp7E7FUvqzH2b+qnWffVixP+77NsWJZFY18VYgvM=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 h1:dIr+MVsZeUBiKZELfJh5HRJdI+BI6lCp5pv/2oXekuk=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033/go.mod h1:7oFlNimGSTHFy6JV7W/IZKuJWr+NUjCnGLTvb9MWNrY=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 h1:tPQHJE07DGCJWrQJklrkrF0CasB86M7AEb0PrkXNjAM=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148/go.mod h1:dnj7aObyt7kqbM7vgHsvSpubXLjGc70Wos708PsdcEo=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.3.14 h1:OrgOKg+w3daPrOW/TqGeX9Y7rM7wt2um4U94P/w8HC4=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.3.14/go.mod h1:bPKdKc5dbnQHC9ByKunV2+F76O4V+k7gYzGMv3hI2W8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.414/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.486/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.533/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
@@ -915,7 +915,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1127/go.mod
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1136/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1142/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1145/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1148/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1156/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1206/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -939,8 +938,9 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3/go.mod h1
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.8/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.11/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
-github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.13 h1:jB/0fwy3k35sshktv7MZ4H7lNLlzBDM7rj+QuK1Rvl0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.13/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.14 h1:d33UHW0N5ZKidbPLhsDyLK4ZSN1ejW6qK79UyACIuro=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.14/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51 h1:pGwrfCBBCt1u+EDHwfNj9NLQpvk5MVKVMcsE7SvwqM4=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.1.51/go.mod h1:aTEdZDUTIOTS0CMDMMpKIkoc0HqtQ5+dRlaZO1KF/gg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=

tencentcloud/services/cls/resource_tc_cls_topic.go

@@ -139,6 +139,12 @@ func ResourceTencentCloudClsTopic() *schema.Resource {
 					},
 				},
 			},
+			"encryption": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "Encryption-related parameters. This parameter is supported for users with an open access list and from encrypted regions; it cannot be passed in other scenarios. 0 or not passed: No encryption. 1: KMS-CLS cloud product key encryption. Once enabled, it cannot be disabled.\nSupported regions: ap-beijing, ap-guangzhou, ap-shanghai, ap-singapore, ap-bangkok, ap-jakarta, eu-frankfurt, ap-seoul, ap-tokyo.",
+			},
 		},
 	}
 }
@@ -254,6 +260,10 @@ func resourceTencentCloudClsTopicCreate(d *schema.ResourceData, meta interface{}
 		}
 	}
 
+	if v, ok := d.GetOkExists("encryption"); ok {
+		request.Encryption = helper.IntUint64(v.(int))
+	}
+
 	err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 		result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClsClient().CreateTopic(request)
 		if e != nil {
@@ -263,9 +273,8 @@ func resourceTencentCloudClsTopicCreate(d *schema.ResourceData, meta interface{}
 				logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
 		}
 
-		if result == nil {
-			e = fmt.Errorf("create cls topic failed")
-			return resource.NonRetryableError(e)
+		if result == nil || result.Response == nil {
+			return resource.NonRetryableError(fmt.Errorf("Create cls topic failed, Response is nil"))
 		}
 
 		response = result
@@ -277,8 +286,11 @@ func resourceTencentCloudClsTopicCreate(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
-	id := *response.Response.TopicId
-	d.SetId(id)
+	if response.Response.TopicId == nil {
+		return fmt.Errorf("TopicId is nil.")
+	}
+
+	d.SetId(*response.Response.TopicId)
 	return resourceTencentCloudClsTopicRead(d, meta)
 }
 
@@ -300,7 +312,7 @@ func resourceTencentCloudClsTopicRead(d *schema.ResourceData, meta interface{})
 
 	if topic == nil {
 		d.SetId("")
-		return fmt.Errorf("resource `Topic` %s does not exist", id)
+		return fmt.Errorf("resource `tencentcloud_cls_topic` %s does not exist", id)
 	}
 
 	_ = d.Set("logset_id", topic.LogsetId)
@@ -364,6 +376,11 @@ func resourceTencentCloudClsTopicRead(d *schema.ResourceData, meta interface{})
 		}
 	}
 
+	_ = d.Set("encryption", 0)
+	if topic.KeyId != nil && *topic.KeyId != "" {
+		_ = d.Set("encryption", 1)
+	}
+
 	return nil
 }
 
@@ -486,6 +503,14 @@ func resourceTencentCloudClsTopicUpdate(d *schema.ResourceData, meta interface{}
 		hasChange = true
 	}
 
+	if d.HasChange("encryption") {
+		if v, ok := d.GetOkExists("encryption"); ok {
+			request.Encryption = helper.IntUint64(v.(int))
+		}
+
+		hasChange = true
+	}
+
 	if hasChange {
 		err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError {
 			result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseClsClient().ModifyTopic(request)

tencentcloud/services/cls/resource_tc_cls_topic.md

@@ -1,5 +1,7 @@
 Provides a resource to create a cls topic.
 
+~> **NOTE:** Field `encryption` can only be enabled, not disabled.
+
 Example Usage
 
 Create a standard cls topic

tencentcloud/services/cls/service_tencentcloud_cls.go

@@ -249,7 +249,7 @@ func (me *ClsService) DescribeClsTopicById(ctx context.Context, topicId string)
 			Values: []*string{&topicId},
 		},
 	}
-	ratelimit.Check(request.GetAction())
+
 	var iacExtInfo connectivity.IacExtInfo
 	iacExtInfo.InstanceId = topicId
 	var (