Merge pull request #733 from tencentcloudstack/feat/cls-topic

Feat/cls topic

Author: tongyiming

.gitignore

@@ -16,4 +16,5 @@ terraform.tfstate
 terraform.tfstate.backup
 terraform.tfstate.lock.info
 dist/
-gendoc/gendoc
+gendoc/gendoc
+.vscode/

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.290
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.199

go.sum

@@ -468,6 +468,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283 h1:8pML0Ut
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283/go.mod h1:zgARzAnsLzpLhdpAHrHTUilOXytH9aEJy5ssCdizVV0=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199 h1:o41qFAFJGPDTLNWXs7nLw4fsDxFUCe5gkO2YXI9Ye6Q=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199/go.mod h1:b7dNjabPys0/iLwRFd8MVE5EkJTNAh4qtaHQOOLchx4=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291 h1:r7GSk4v8od8srrBrpnsHz9Hxrq0fLNO2u1m4ABQVX5g=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291/go.mod h1:O5PQ2JoBWhmSNVils3vZyS1GPeRdXA8Lu23ZEjiUfZ8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.290 h1:PJ/XwIXHUVIi/OwvtUKOSWB+x5qn42oJettG6bhHfNQ=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.290/go.mod h1:O5PQ2JoBWhmSNVils3vZyS1GPeRdXA8Lu23ZEjiUfZ8=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=

tencentcloud/connectivity/client.go

@@ -624,7 +624,6 @@ func (me *TencentCloudClient) UseApiClient() *api.Client {
 	return me.apiConn
 }
 
-
 // UseClsClient return CLS client for service
 func (me *TencentCloudClient) UseClsClient() *cls.Client {
 	if me.clsConn != nil {
@@ -635,4 +634,4 @@ func (me *TencentCloudClient) UseClsClient() *cls.Client {
 	me.clsConn.WithHttpTransport(&LogRoundTripper{})
 
 	return me.clsConn
-}
+}

tencentcloud/provider.go

@@ -206,6 +206,7 @@ Cloud Load Balancer(CLB)
 
   Resource
     tencentcloud_clb_instance
+	tencentcloud_clb_log_topic
     tencentcloud_clb_listener
     tencentcloud_clb_listener_rule
     tencentcloud_clb_attachment
@@ -860,6 +861,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_lb":                                      resourceTencentCloudLB(),
 			"tencentcloud_alb_server_attachment":                   resourceTencentCloudAlbServerAttachment(),
 			"tencentcloud_clb_instance":                            resourceTencentCloudClbInstance(),
+			"tencentcloud_clb_log_topic":                           resourceTencentCloudClbLogTopic(),
 			"tencentcloud_clb_listener":                            resourceTencentCloudClbListener(),
 			"tencentcloud_clb_listener_rule":                       resourceTencentCloudClbListenerRule(),
 			"tencentcloud_clb_attachment":                          resourceTencentCloudClbServerAttachment(),

tencentcloud/resource_tc_clb_instance.go

@@ -360,7 +360,7 @@ func resourceTencentCloudClbInstanceCreate(d *schema.ResourceData, meta interfac
 		request.SlaveZoneId = helper.String(v.(string))
 	}
 
-	if v, ok := d.GetOk("load_balancer_pass_to_target"); ok{
+	if v, ok := d.GetOk("load_balancer_pass_to_target"); ok {
 		request.LoadBalancerPassToTarget = helper.Bool(v.(bool))
 	}
 	clbId := ""

tencentcloud/resource_tc_clb_instance_topic_test.go

@@ -0,0 +1,63 @@
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+)
+
+func TestAccTencentCloudClbInstanceTopic(t *testing.T) {
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckClbListenerRuleDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClbInstanceTopic,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckClbInstanceTopicExists("tencentcloud_clb_instances_topic.topic"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_instances_topic.topic", "topic_name", "clb-topic-test"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_instances_topic.topic", "partition_count", "3"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckClbInstanceTopicExists(n string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		logId := getLogId(contextNil)
+		ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("[CHECK][CLB topic][Exists] check: CLB topic %s is not found", n)
+		}
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("[CHECK][CLB topic][Exists] check: CLB topic id is not set")
+		}
+		clsService := ClsService{
+			client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
+		}
+		topicName := rs.Primary.Attributes["topic_name"]
+		instance, err := clsService.DeleteTopicsByTopicName(ctx, topicName)
+		if err != nil {
+			return err
+		}
+		if instance == nil {
+			return fmt.Errorf("[CHECK][CLB topic][Exists] id %s is not exist", rs.Primary.ID)
+		}
+		return nil
+	}
+}
+
+const testAccClbInstanceTopic = `
+resource "tencentcloud_clb_instances_topic" "topic" {
+    topic_name="clb-topic-test"
+    partition_count=3
+}
+`

tencentcloud/resource_tc_clb_log_topic.go

@@ -0,0 +1,143 @@
+/*
+Provides a resource to create a CLB instance topic.
+
+Example Usage
+
+```hcl
+resource "tencentcloud_clb_log_topic" "topic" {
+    topic_name="clb-topic"
+    partition_count=3
+}
+```
+
+Import
+
+CLB log topic can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_clb_log_topic.topic lb-7a0t6zqb
+*/
+package tencentcloud
+
+import (
+	"context"
+	"log"
+	"sync"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+var clsActionMu = &sync.Mutex{}
+
+func resourceTencentCloudClbLogTopic() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudClbInstanceTopicCreate,
+		Read:   resourceTencentCloudClbInstanceTopicRead,
+		Update: resourceTencentCloudClbInstanceTopicUpdate,
+		Delete: resourceTencentCloudClbInstanceTopicDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"topic_name": {
+				Type:        schema.TypeString,
+				Required:    true,
+				Description: "Log topic of CLB instance.",
+			},
+			"partition_count": {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				ValidateFunc: validateIntegerInRange(1, 10),
+				Description:  "Topic partition count of CLB instance.(Default 1).",
+			},
+			"limit": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Fetch topic info pagination limit.",
+			},
+			"offset": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Fetch topic info pagination offset.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudClbInstanceTopicRead(d *schema.ResourceData, meta interface{}) error {
+	clsActionMu.Lock()
+	defer clsActionMu.Unlock()
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	var topicName string
+	if value, ok := d.GetOk("topic_name"); ok {
+		topicName = value.(string)
+	}
+	clsService := ClsService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+	res, ok := clsService.DescribeTopicsByTopicName(ctx, topicName)
+	if ok != nil {
+		return ok
+	}
+	_ = d.Set("logset_id", res.LogsetId)
+	_ = d.Set("topic_id", res.TopicId)
+	_ = d.Set("topic_name", res.TopicName)
+	_ = d.Set("partition_count", res.PartitionCount)
+	_ = d.Set("index", res.Index)
+	_ = d.Set("create_time", res.CreateTime)
+	_ = d.Set("status", res.Status)
+	_ = d.Set("tags", res.Tags)
+	_ = d.Set("auto_split", res.AutoSplit)
+	_ = d.Set("max_split_partitions", res.MaxSplitPartitions)
+	_ = d.Set("storage_type", res.StorageType)
+	_ = d.Set("period", res.Period)
+	return nil
+
+}
+
+func resourceTencentCloudClbInstanceTopicUpdate(d *schema.ResourceData, meta interface{}) error {
+	return nil
+}
+
+func resourceTencentCloudClbInstanceTopicDelete(d *schema.ResourceData, meta interface{}) error {
+	clsActionMu.Lock()
+	defer clsActionMu.Unlock()
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	var topicName string
+	if value, ok := d.GetOk("topic_name"); ok {
+		topicName = value.(string)
+	}
+	clsService := ClsService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+	_, ok := clsService.DeleteTopicsByTopicName(ctx, topicName)
+	if ok != nil {
+		return ok
+	}
+	return nil
+}
+
+func resourceTencentCloudClbInstanceTopicCreate(d *schema.ResourceData, meta interface{}) error {
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	params := make(map[string]interface{})
+	if topicName, ok := d.GetOk("topic_name"); ok {
+		params["topic_name"] = topicName
+	}
+	if partitionCount, ok := d.GetOk("partition_count"); ok {
+		params["partition_count"] = partitionCount
+	}
+	clbService := ClbService{
+		client: meta.(*TencentCloudClient).apiV3Conn,
+	}
+	resp, err := clbService.CreateTopic(ctx, params)
+	d.SetId(*resp.Response.TopicId)
+	if err != nil {
+		log.Printf("[CRITAL]%s create CLB topic failed, reason:%+v", logId, err)
+		return err
+	}
+	return resourceTencentCloudClbInstanceTopicRead(d, meta)
+}

tencentcloud/service_tencentcloud_clb.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/pkg/errors"
 	clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
@@ -1058,6 +1059,31 @@ func (me *ClbService) CreateTargetGroup(ctx context.Context, targetGroupName str
 	return
 }
 
+func (me *ClbService) CreateTopic(ctx context.Context, params map[string]interface{}) (response *clb.CreateTopicResponse, err error) {
+
+	request := clb.NewCreateTopicRequest()
+
+	if topicName, ok := params["topic_name"]; ok {
+		request.TopicName = common.StringPtr(topicName.(string))
+	}
+
+	if partitionCount, ok := params["partition_count"]; ok {
+		request.PartitionCount = common.Uint64Ptr((uint64)(partitionCount.(int)))
+	}
+
+	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		ratelimit.Check(request.GetAction())
+		resp, ok := me.client.UseClbClient().CreateTopic(request)
+		if ok != nil {
+			err = ok
+			return retryError(ok)
+		}
+		response = resp
+		return nil
+	})
+	return
+}
+
 func (me *ClbService) ModifyTargetGroup(ctx context.Context, targetGroupId, targetGroupName string, port uint64) (err error) {
 	request := clb.NewModifyTargetGroupAttributeRequest()
 	request.TargetGroupId = &targetGroupId