Skip to content

fix(cls): [129069040] tencentcloud_cls_topic support encryption #3661

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
hellertang merged 2 commits into from
Dec 18, 2025
Merged

fix(cls): [129069040] tencentcloud_cls_topic support encryption #3661

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
f57aff7
add
SevenEarth Dec 18, 2025
3feab44
add
SevenEarth Dec 18, 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/3661.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_cls_topic: support `encryption`
```
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand Down
37 changes: 31 additions & 6 deletions tencentcloud/services/cls/resource_tc_cls_topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
},
},
}
}
Expand Down Expand Up @@ -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 {
Expand All @@ -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
Expand All @@ -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)
}

Expand All @@ -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)
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions tencentcloud/services/cls/resource_tc_cls_topic.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tencentcloud/services/cls/service_tencentcloud_cls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Loading
Loading