Merge pull request #731 from tencentcloudstack/feat/clb-logset

Feat/clb logset

Author: Kagashino

go.mod

@@ -28,6 +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/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.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=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264 h1:USf7I8ohzoqCwAcCHz5rz0hD57mmNXZgrLfxFLx1WmA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.264/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=

tencentcloud/connectivity/client.go

@@ -24,6 +24,7 @@ import (
 	ckafka "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka/v20190819"
 	clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
 	audit "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319"
+	cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
@@ -96,6 +97,7 @@ type TencentCloudClient struct {
 	kmsConn            *kms.Client
 	ssmConn            *ssm.Client
 	apiConn            *api.Client
+	clsConn            *cls.Client
 }
 
 // NewClientProfile returns a new ClientProfile
@@ -621,3 +623,16 @@ 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 {
+		return me.clsConn
+	}
+	cpf := me.NewClientProfile(300)
+	me.clsConn, _ = cls.NewClient(me.Credential, me.Region, cpf)
+	me.clsConn.WithHttpTransport(&LogRoundTripper{})
+
+	return me.clsConn
+}

tencentcloud/provider.go

@@ -215,6 +215,7 @@ Cloud Load Balancer(CLB)
     tencentcloud_clb_target_group
     tencentcloud_clb_target_group_instance_attachment
     tencentcloud_clb_target_group_attachment
+    tencentcloud_clb_logset
 
 Cloud Object Storage(COS)
   Data Source
@@ -866,6 +867,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_clb_target_group":                        resourceTencentCloudClbTargetGroup(),
 			"tencentcloud_clb_target_group_instance_attachment":    resourceTencentCloudClbTGAttachmentInstance(),
 			"tencentcloud_clb_target_group_attachment":             resourceTencentCloudClbTargetGroupAttachment(),
+			"tencentcloud_clb_logset":                              resourceTencentCloudClbLogSet(),
 			"tencentcloud_container_cluster":                       resourceTencentCloudContainerCluster(),
 			"tencentcloud_container_cluster_instance":              resourceTencentCloudContainerClusterInstance(),
 			"tencentcloud_kubernetes_cluster":                      resourceTencentCloudTkeCluster(),

tencentcloud/resource_tc_clb_logset.go

@@ -0,0 +1,163 @@
+/*
+Provides a resource to create an exclusive CLB Logset.
+
+Example Usage
+
+```hcl
+resource "tencentcloud_clb_logset" "foo" {
+  name = "clb_logset"
+  perioid = 7
+}
+```
+
+Import
+
+CLB attachment can be imported using the id, e.g.
+
+```
+$ terraform import tencentcloud_clb_logset.foo 4eb9e3a8-9c42-4b32-9ddf-e215e9c92764
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+)
+
+func resourceTencentCloudClbLogSet() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudClbLogSetCreate,
+		Read:   resourceTencentCloudClbLogSetRead,
+		Delete: resourceTencentCloudClbLogSetDelete,
+		//Update: resourceTencentCloudClbLogSetUpdate,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Schema: map[string]*schema.Schema{
+			"period": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "Logset retention period in days. Maximun value is `90`.",
+			},
+			"name": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Logset name, which unique and fixed `clb_logset` among all CLS logsets.",
+			},
+			"create_time": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Logset creation time.",
+			},
+			"topic_count": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Number of log topics in logset.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudClbLogSetRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clb_logset.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	service := ClsService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	id := d.Id()
+
+	info, err := service.DescribeClsLogSetById(ctx, id)
+
+	if err != nil {
+		return err
+	}
+
+	if info == nil {
+		d.SetId("")
+		return fmt.Errorf("resource `Logset` %s does not exist", id)
+	}
+
+	_ = d.Set("name", info.LogsetName)
+
+	//
+	//if _, ok := d.GetOk("period"); !ok {
+	//	_ = d.Set("period", info)
+	//}
+	_ = d.Set("create_time", info.CreateTime)
+	_ = d.Set("topic_count", info.TopicCount)
+
+	return nil
+}
+
+func resourceTencentCloudClbLogSetCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clb_logset.create")()
+	defer clbActionMu.Unlock()
+	clbActionMu.Lock()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	service := ClbService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	var (
+		period = d.Get("period").(int)
+	)
+
+	// We're not support specify name and health logs for now
+	id, err := service.CreateClbLogSet(ctx, "clb_logset", "", period)
+
+	if err != nil {
+		return err
+	}
+
+	d.SetId(id)
+
+	return resourceTencentCloudClbLogSetRead(d, meta)
+}
+
+// All fields are now Computed/ForceNew, means it does not support update
+func resourceTencentCloudClbLogSetUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clb_logset.update")()
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	service := ClsService{client: meta.(*TencentCloudClient).apiV3Conn}
+	request := cls.NewModifyLogsetRequest()
+
+	request.LogsetId = helper.String(d.Id())
+
+	if d.HasChange("name") {
+		request.LogsetName = helper.String(d.Get("name").(string))
+	}
+
+	err := service.UpdateClsLogSet(ctx, request)
+
+	if err != nil {
+		return err
+	}
+
+	return resourceTencentCloudClbLogSetCreate(d, meta)
+}
+
+func resourceTencentCloudClbLogSetDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_clb_logset.delete")()
+
+	clbActionMu.Lock()
+	defer clbActionMu.Unlock()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+	service := ClsService{client: meta.(*TencentCloudClient).apiV3Conn}
+	id := d.Id()
+
+	if err := service.DeleteClsLogSet(ctx, id); err != nil {
+		return err
+	}
+
+	return nil
+}

tencentcloud/resource_tc_clb_logset_test.go

@@ -0,0 +1,91 @@
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+)
+
+func TestAccTencentCloudClbLogset_basic(t *testing.T) {
+	t.Parallel()
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckClbLogsetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccClbLogset_basic,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckClbLogsetExists("tencentcloud_clb_logset.test_logset"),
+					resource.TestCheckResourceAttrSet("tencentcloud_clb_logset.test_logset", "create_time"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_logset.test_logset", "name", "clb_logset"),
+					resource.TestCheckResourceAttr("tencentcloud_clb_logset.test_logset", "period", "7"),
+				),
+			},
+			{
+				ResourceName:      "tencentcloud_clb_logset.test_logset",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccCheckClbLogsetDestroy(s *terraform.State) error {
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	clsService := ClsService{
+		client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
+	}
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "tencentcloud_clb_logset" {
+			continue
+		}
+		time.Sleep(5 * time.Second)
+		resourceId := rs.Primary.ID
+		info, err := clsService.DescribeClsLogSetById(ctx, resourceId)
+		if info != nil && err == nil {
+			return fmt.Errorf("[CHECK][CLB logset][Destroy] check: CLB logset still exists: %s", rs.Primary.ID)
+		}
+	}
+	return nil
+}
+
+func testAccCheckClbLogsetExists(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 logset][Exists] check: CLB logset %s is not found", n)
+		}
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("[CHECK][CLB logset][Exists] check: CLB logset id is not set")
+		}
+		service := ClsService{
+			client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn,
+		}
+		resourceId := rs.Primary.ID
+		instance, err := service.DescribeClsLogSetById(ctx, resourceId)
+		if err != nil {
+			return err
+		}
+		if instance == nil {
+			return fmt.Errorf("[CHECK][CLB logset][Exists] id %s is not exist", rs.Primary.ID)
+		}
+		return nil
+	}
+}
+
+const testAccClbLogset_basic = `
+resource "tencentcloud_clb_logset" "test_logset" {
+  period = 7
+}
+`

tencentcloud/service_tencentcloud_clb.go

@@ -1348,3 +1348,50 @@ func (me *ClbService) ModifyTargetGroupInstancesWeight(ctx context.Context, targ
 	}
 	return nil
 }
+
+func (me *ClbService) DescribeClbLogSet(ctx context.Context) (logSetId string, healthId string, errRet error) {
+	logId := getLogId(ctx)
+	request := clb.NewDescribeClsLogSetRequest()
+		defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+				logId, "delete object", request.ToJsonString(), errRet.Error())
+		}
+	}()
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseClbClient().DescribeClsLogSet(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	logSetId = *response.Response.LogsetId
+	healthId = *response.Response.HealthLogsetId
+	return
+}
+
+func (me *ClbService) CreateClbLogSet(ctx context.Context, name string, logsetType string, period int) (id string, errRet error){
+	logId := getLogId(ctx)
+	request := clb.NewCreateClsLogSetRequest()
+	request.Period = helper.IntUint64(period)
+	request.LogsetName = &name
+	if logsetType != "" {
+		request.LogsetType = &logsetType
+	}
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseClbClient().CreateClsLogSet(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+		logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	if response.Response != nil {
+		id = *response.Response.LogsetId
+	}
+	return
+}