Skip to content

Commit 2e06899

Browse files
author
hellertang
authored
add logset (#945)
1 parent 55bfbe5 commit 2e06899

27 files changed

+4969
-1165
lines changed

‎examples/tencentcloud-cls/main.tf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
resource "tencentcloud_cls_logset" "logset" {
2+
logset_name = "tf-topic-test"
3+
tags = {
4+
"test" = "test"
5+
}
6+
}
7+
8+
resource "tencentcloud_cls_topic" "topic" {
9+
auto_split = true
10+
logset_id = tencentcloud_cls_logset.logset.id
11+
max_split_partitions = 20
12+
partition_count = 1
13+
period = 10
14+
storage_type = "hot"
15+
tags = {
16+
"test" = "test"
17+
}
18+
topic_name = "tf-topic-test"
19+
}
20+
21+
resource "tencentcloud_cls_machine_group" "group" {
22+
group_name = "tf-basic-group"
23+
service_logging = true
24+
auto_update = true
25+
update_end_time = "19:05:00"
26+
update_start_time = "17:05:00"
27+
28+
machine_group_type {
29+
type = "ip"
30+
values = [
31+
"192.168.1.1",
32+
"192.168.1.2",
33+
]
34+
}
35+
}

‎examples/tencentcloud-cls/variables.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
variable "availability_zone" {
2+
default = "ap-guangzhou-3"
3+
}

‎examples/tencentcloud-cls/version.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
terraform {
2+
required_version = ">= 0.12"
3+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.376
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
32-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291
32+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.377
3333
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.378
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199 h1:
484484
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199/go.mod h1:b7dNjabPys0/iLwRFd8MVE5EkJTNAh4qtaHQOOLchx4=
485485
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291 h1:r7GSk4v8od8srrBrpnsHz9Hxrq0fLNO2u1m4ABQVX5g=
486486
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291/go.mod h1:O5PQ2JoBWhmSNVils3vZyS1GPeRdXA8Lu23ZEjiUfZ8=
487+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.377 h1:mNqLgiugl8nPbUlPANqz8BfeWbeuniF7opq20+9VL0c=
488+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.377/go.mod h1:PCNxJpu/AspnZNPhMa8fJ7rYb3Ti5hAXA6NHwU4JoXw=
487489
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
488490
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264 h1:USf7I8ohzoqCwAcCHz5rz0hD57mmNXZgrLfxFLx1WmA=
489491
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=

‎tencentcloud/internal/helper/transform.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,11 @@ func StrToUInt64(s string) (i uint64) {
148148
i = uint64(intNum)
149149
return
150150
}
151+
152+
func StrToBool(s string) (i bool) {
153+
i = false
154+
if s == "true" {
155+
i = true
156+
}
157+
return
158+
}

‎tencentcloud/provider.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,12 @@ PrivateDNS
596596
Resource
597597
tencentcloud_private_dns_zone
598598
tencentcloud_private_dns_record
599+
600+
CLS
601+
Resource
602+
tencentcloud_cls_logset
603+
tencentcloud_cls_topic
604+
tencentcloud_cls_machine_group
599605
*/
600606
package tencentcloud
601607

@@ -1078,6 +1084,9 @@ func Provider() terraform.ResourceProvider {
10781084
"tencentcloud_dnspod_record": resourceTencentCloudDnspodRecord(),
10791085
"tencentcloud_private_dns_zone": resourceTencentCloudPrivateDnsZone(),
10801086
"tencentcloud_private_dns_record": resourceTencentCloudPrivateDnsRecord(),
1087+
"tencentcloud_cls_logset": resourceTencentCloudClsLogset(),
1088+
"tencentcloud_cls_topic": resourceTencentCloudClsTopic(),
1089+
"tencentcloud_cls_machine_group": resourceTencentCloudClsMachineGroup(),
10811090
},
10821091

10831092
ConfigureFunc: providerConfigure,

‎tencentcloud/resource_tc_clb_log_set.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func resourceTencentCloudClbLogSetRead(d *schema.ResourceData, meta interface{})
7474

7575
id := d.Id()
7676

77-
info, err := service.DescribeClsLogSetById(ctx, id)
77+
info, err := service.DescribeClsLogsetById(ctx, id)
7878

7979
if err != nil {
8080
return err
@@ -128,7 +128,7 @@ func resourceTencentCloudClbLogSetUpdate(d *schema.ResourceData, meta interface{
128128
defer logElapsed("resource.tencentcloud_clb_logset.update")()
129129
logId := getLogId(contextNil)
130130
ctx := context.WithValue(context.TODO(), logIdKey, logId)
131-
service := ClsService{client: meta.(*TencentCloudClient).apiV3Conn}
131+
service := ClbService{client: meta.(*TencentCloudClient).apiV3Conn}
132132
request := cls.NewModifyLogsetRequest()
133133

134134
request.LogsetId = helper.String(d.Id())
@@ -157,7 +157,7 @@ func resourceTencentCloudClbLogSetDelete(d *schema.ResourceData, meta interface{
157157
service := ClsService{client: meta.(*TencentCloudClient).apiV3Conn}
158158
id := d.Id()
159159

160-
if err := service.DeleteClsLogSet(ctx, id); err != nil {
160+
if err := service.DeleteClsLogset(ctx, id); err != nil {
161161
return err
162162
}
163163

‎tencentcloud/resource_tc_clb_log_set_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func testAccCheckClbLogsetDestroy(s *terraform.State) error {
4949
}
5050
time.Sleep(5 * time.Second)
5151
resourceId := rs.Primary.ID
52-
info, err := clsService.DescribeClsLogSetById(ctx, resourceId)
52+
info, err := clsService.DescribeClsLogsetById(ctx, resourceId)
5353
if info != nil && err == nil {
5454
return fmt.Errorf("[CHECK][CLB logset][Destroy] check: CLB logset still exists: %s", rs.Primary.ID)
5555
}
@@ -73,7 +73,7 @@ func testAccCheckClbLogsetExists(n string) resource.TestCheckFunc {
7373
client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
7474
}
7575
resourceId := rs.Primary.ID
76-
instance, err := service.DescribeClsLogSetById(ctx, resourceId)
76+
instance, err := service.DescribeClsLogsetById(ctx, resourceId)
7777
if err != nil {
7878
return err
7979
}

‎tencentcloud/resource_tc_clb_log_topic.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func resourceTencentCloudClbInstanceTopicCreate(d *schema.ResourceData, meta int
8383
}
8484

8585
if v, ok := d.GetOk("log_set_id"); ok {
86-
info, err := clsService.DescribeClsLogSetById(ctx, v.(string))
86+
info, err := clsService.DescribeClsLogsetById(ctx, v.(string))
8787
if err != nil {
8888
return err
8989
}
@@ -121,7 +121,7 @@ func resourceTencentCloudClbInstanceTopicRead(d *schema.ResourceData, meta inter
121121
clsService := ClsService{
122122
client: meta.(*TencentCloudClient).apiV3Conn,
123123
}
124-
res, err := clsService.DescribeTopicsById(ctx, id)
124+
res, err := clsService.DescribeClsTopicById(ctx, id)
125125
if err != nil {
126126
return err
127127
}
@@ -151,7 +151,7 @@ func resourceTencentCloudClbInstanceTopicDelete(d *schema.ResourceData, meta int
151151
clsService := ClsService{
152152
client: meta.(*TencentCloudClient).apiV3Conn,
153153
}
154-
err := clsService.DeleteTopicsById(ctx, id)
154+
err := clsService.DeleteClsTopic(ctx, id)
155155
if err != nil {
156156
return err
157157
}

0 commit comments

Comments
 (0)