update changelog and format code

Kagashino · Kagashino · commit 8a2e05e7a93f · 2021-11-16T19:52:56.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,60 @@
+## 1.60.9 (November 16, 2021)
+
+BUGFIXES:
+
+* Resource `tencentcloud_instance` omit `InstanceMarketOptions` field if spot arguments empty
+
+## 1.60.8 (November 16, 2021)
+
+BUGFIXES:
+
+* Resource `tencentcloud_clb_log_set` remove doc
+
+## 1.60.7 (November 16, 2021)
+
+FEATURES:
+* **New Resource**: `tencentcloud_clb_log_set`
+* **New Resource**: `tencentcloud_clb_log_topic`
+
+ENHANCEMENTS:
+
+* resource `tencentcloud_clb_instance`  support set log
+* resource `tencentcloud_instance` unlimited spot charge argument
+
+## 1.60.6 (November 12, 2021)
+
+FEATURES:
+
+* **New Resource**: `tencentcloud_monitor_policy_binding_object`
+
+ENHANCEMENTS:
+
+* fix resource `tencentcloud_kubernetes_node_pool` plan change
+* fix resource `tencentcloud_monitor_alarm_policy` import lacking eventditions
+
+DEPRECATED:
+
+* Resource: `tencentcloud_monitor_binding_object` replaced by tencentcloud_monitor_policy_binding_object
+
+## 1.60.5 (November 8, 2021)
+
+BUGFIXES:
+
+*Resource `tencentcloud_availability_zones_by_product` add dependency
+
+## 1.60.4 (November 8, 2021)
+
+FEATURES:
+* **New Resource**: `tencentcloud_vod_sub_application`
+* **New Resource**: `tencentcloud_availability_zones_by_product`
+
+ENHANCEMENTS:
+
+* resource `tencentcloud_clb_instance` support set load_balancer_pass_to_target
+
+DEPRECATED:
+* Resource: `tencentcloud_availability_zones` replaced by `tencentcloud_availability_zones_by_product`
+
 ## 1.60.3 (November 3, 2021)
 
 BUGFIXES:
diff --git a/tencentcloud/extension_vod.go b/tencentcloud/extension_vod.go
@@ -8,8 +8,8 @@ const (
 	VOD_AUDIO_CHANNEL_STEREO = "stereo"
 
 	VOD_SUB_APPLICATION_RUNNING = "On"
-	VOD_SUB_APPLICATION_STOPPED  = "Off"
-	VOD_SUB_APPLICATION_DESTROY   = "Destroyed"
+	VOD_SUB_APPLICATION_STOPPED = "Off"
+	VOD_SUB_APPLICATION_DESTROY = "Destroyed"
 
 	VOD_DEFAULT_OFFSET = 0
 	VOD_MAX_LIMIT      = 100
@@ -21,7 +21,6 @@ var VOD_SUB_APPLICATION_STATUS = []string{
 	VOD_SUB_APPLICATION_DESTROY,
 }
 
-
 var (
 	VOD_AUDIO_CHANNEL_TYPE_TO_INT = map[string]int64{
 		VOD_AUDIO_CHANNEL_MONO:   1,
diff --git a/tencentcloud/resource_tc_monitor_binding_object.go b/tencentcloud/resource_tc_monitor_binding_object.go
@@ -53,9 +53,9 @@ import (
 func resourceTencentMonitorBindingObject() *schema.Resource {
 	return &schema.Resource{
 		DeprecationMessage: "This resource has been deprecated in Terraform TencentCloud provider version 1.60.5. Please use 'tencentcloud_monitor_policy_binding_object' instead.",
-		Create: resourceTencentMonitorBindingObjectCreate,
-		Read:   resourceTencentMonitorBindingObjectRead,
-		Delete: resourceTencentMonitorBindingObjectDelete,
+		Create:             resourceTencentMonitorBindingObjectCreate,
+		Read:               resourceTencentMonitorBindingObjectRead,
+		Delete:             resourceTencentMonitorBindingObjectDelete,
 		Schema: map[string]*schema.Schema{
 			"group_id": {
 				Type:        schema.TypeInt,
diff --git a/tencentcloud/resource_tc_postgresql_instance.go b/tencentcloud/resource_tc_postgresql_instance.go
@@ -625,7 +625,7 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
 
 	// security groups
 	// Only redis service support modify Generic DB instance security groups
-	redisService := RedisService{client:meta.(*TencentCloudClient).apiV3Conn}
+	redisService := RedisService{client: meta.(*TencentCloudClient).apiV3Conn}
 	sg, err := redisService.DescribeDBSecurityGroups(ctx, "postgres", d.Id())
 	if err != nil {
 		return err
diff --git a/tencentcloud/resource_tc_scf_function.go b/tencentcloud/resource_tc_scf_function.go
@@ -188,19 +188,19 @@ func resourceTencentCloudScfFunction() *schema.Resource {
 				Description: "Enable L5 for SCF function, default is `false`.",
 			},
 			"layers": {
-				Type:     schema.TypeList,
-				Optional: true,
+				Type:        schema.TypeList,
+				Optional:    true,
 				Description: "The list of association layers.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"layer_name": {
-							Type: schema.TypeString,
-							Required: true,
+							Type:        schema.TypeString,
+							Required:    true,
 							Description: "The name of Layer.",
 						},
 						"layer_version": {
-							Type: schema.TypeInt,
-							Required: true,
+							Type:        schema.TypeInt,
+							Required:    true,
 							Description: "The version of layer.",
 						},
 					},
@@ -599,7 +599,6 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 		functionInfo.imageConfig = imageConfigs[0]
 	}
 
-
 	switch codeType {
 	case scfFunctionCosCode:
 		if err := helper.CheckIfSetTogether(d, "cos_bucket_name", "cos_object_name", "cos_bucket_region"); err != nil {
diff --git a/tencentcloud/resource_tc_scf_layer.go b/tencentcloud/resource_tc_scf_layer.go
@@ -185,7 +185,7 @@ func resourceTencentCloudScfLayerCreate(d *schema.ResourceData, meta interface{}
 		if item["cos_bucket_region"] != "" {
 			content.CosBucketRegion = helper.String(item["cos_bucket_region"].(string))
 		}
-		if item["zip_file"] != ""  {
+		if item["zip_file"] != "" {
 			path, err := homedir.Expand(item["zip_file"].(string))
 			if err != nil {
 				return fmt.Errorf("zip file (%s) homedir expand error: %s", item["zip_file"].(string), err.Error())
diff --git a/tencentcloud/resource_tc_tcr_instance.go b/tencentcloud/resource_tc_tcr_instance.go
@@ -224,7 +224,7 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac
 				var (
 					status string
 				)
-				status, _, err =  tcrService.DescribeExternalEndpointStatus(ctx, instanceId)
+				status, _, err = tcrService.DescribeExternalEndpointStatus(ctx, instanceId)
 				if err != nil {
 					return resource.NonRetryableError(fmt.Errorf("an error occured during DescribeExternalEndpointStatus: %s", err.Error()))
 				}
@@ -392,7 +392,7 @@ func resourceTencentCloudTcrInstanceUpdate(d *schema.ResourceData, meta interfac
 			var (
 				status string
 			)
-			status, _, err =  tcrService.DescribeExternalEndpointStatus(ctx, instanceId)
+			status, _, err = tcrService.DescribeExternalEndpointStatus(ctx, instanceId)
 			if err != nil {
 				return resource.NonRetryableError(fmt.Errorf("an error occured during DescribeExternalEndpointStatus: %s", err.Error()))
 			}
diff --git a/tencentcloud/resource_tc_tcr_instance_test.go b/tencentcloud/resource_tc_tcr_instance_test.go
@@ -134,7 +134,6 @@ resource "tencentcloud_tcr_instance" "mytcr_instance" {
   }
 }`
 
-
 const testAccTCRInstance_basic_update_security = `
 resource "tencentcloud_tcr_instance" "mytcr_instance" {
   name        = "testacctcrinstance1"
@@ -150,4 +149,4 @@ resource "tencentcloud_tcr_instance" "mytcr_instance" {
 	test = "test"
   }
 }
-`
+`
diff --git a/tencentcloud/resource_tc_tcr_repository.go b/tencentcloud/resource_tc_tcr_repository.go
@@ -64,16 +64,16 @@ func resourceTencentCloudTcrRepository() *schema.Resource {
 				Description: "Name of the TCR repository. Valid length is [2~200]. It can only contain lowercase letters, numbers and separators (`.`, `_`, `-`, `/`), and cannot start, end or continue with separators. Support the use of multi-level address formats, such as `sub1/sub2/repo`.",
 			},
 			"brief_desc": {
-				Type:        schema.TypeString,
-				Optional:    true,
+				Type:         schema.TypeString,
+				Optional:     true,
 				ValidateFunc: validateStringLengthInRange(1, 100),
-				Description: "Brief description of the repository. Valid length is [1~100].",
+				Description:  "Brief description of the repository. Valid length is [1~100].",
 			},
 			"description": {
-				Type:        schema.TypeString,
-				Optional:    true,
+				Type:         schema.TypeString,
+				Optional:     true,
 				ValidateFunc: validateStringLengthInRange(1, 1000),
-				Description: "Description of the repository. Valid length is [1~1000].",
+				Description:  "Description of the repository. Valid length is [1~1000].",
 			},
 			//computed
 			"is_public": {
diff --git a/tencentcloud/service_tencentcloud_clb.go b/tencentcloud/service_tencentcloud_clb.go
@@ -1378,7 +1378,7 @@ func (me *ClbService) ModifyTargetGroupInstancesWeight(ctx context.Context, targ
 func (me *ClbService) DescribeClbLogSet(ctx context.Context) (logSetId string, healthId string, errRet error) {
 	logId := getLogId(ctx)
 	request := clb.NewDescribeClsLogSetRequest()
-		defer func() {
+	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())
@@ -1399,7 +1399,7 @@ func (me *ClbService) DescribeClbLogSet(ctx context.Context) (logSetId string, h
 	return
 }
 
-func (me *ClbService) CreateClbLogSet(ctx context.Context, name string, logsetType string, period int) (id string, errRet error){
+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)
@@ -1420,4 +1420,4 @@ func (me *ClbService) CreateClbLogSet(ctx context.Context, name string, logsetTy
 		id = *response.Response.LogsetId
 	}
 	return
-}
+}
diff --git a/tencentcloud/service_tencentcloud_scf.go b/tencentcloud/service_tencentcloud_scf.go
@@ -82,7 +82,7 @@ func (me *ScfService) CreateFunction(ctx context.Context, info scfFunctionInfo)
 	request.Role = info.role
 	request.ClsLogsetId = info.clsLogsetId
 	request.ClsTopicId = info.clsTopicId
-	request.Layers =info.layers
+	request.Layers = info.layers
 	request.Type = helper.String(SCF_FUNCTION_TYPE_EVENT)
 
 	request.Code = &scf.Code{

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func resourceTencentCloudScfLayerCreate(d *schema.ResourceData, meta interface{}`
`185`	`185`	`if item["cos_bucket_region"] != "" {`
`186`	`186`	`content.CosBucketRegion = helper.String(item["cos_bucket_region"].(string))`
`187`	`187`	`}`
`188`		`- if item["zip_file"] != "" {`
	`188`	`+ if item["zip_file"] != "" {`
`189`	`189`	`path, err := homedir.Expand(item["zip_file"].(string))`
`190`	`190`	`if err != nil {`
`191`	`191`	`return fmt.Errorf("zip file (%s) homedir expand error: %s", item["zip_file"].(string), err.Error())`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac`
`224`	`224`	`var (`
`225`	`225`	`status string`
`226`	`226`	`)`
`227`		`- status, _, err = tcrService.DescribeExternalEndpointStatus(ctx, instanceId)`
	`227`	`+ status, _, err = tcrService.DescribeExternalEndpointStatus(ctx, instanceId)`
`228`	`228`	`if err != nil {`
`229`	`229`	`return resource.NonRetryableError(fmt.Errorf("an error occured during DescribeExternalEndpointStatus: %s", err.Error()))`
`230`	`230`	`}`
`@@ -392,7 +392,7 @@ func resourceTencentCloudTcrInstanceUpdate(d *schema.ResourceData, meta interfac`
`392`	`392`	`var (`
`393`	`393`	`status string`
`394`	`394`	`)`
`395`		`- status, _, err = tcrService.DescribeExternalEndpointStatus(ctx, instanceId)`
	`395`	`+ status, _, err = tcrService.DescribeExternalEndpointStatus(ctx, instanceId)`
`396`	`396`	`if err != nil {`
`397`	`397`	`return resource.NonRetryableError(fmt.Errorf("an error occured during DescribeExternalEndpointStatus: %s", err.Error()))`
`398`	`398`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,6 @@ resource "tencentcloud_tcr_instance" "mytcr_instance" {`
`134`	`134`	`}`
`135`	`135`	}`
`136`	`136`
`137`		`-`
`138`	`137`	const testAccTCRInstance_basic_update_security = `
`139`	`138`	`resource "tencentcloud_tcr_instance" "mytcr_instance" {`
`140`	`139`	`name = "testacctcrinstance1"`
`@@ -150,4 +149,4 @@ resource "tencentcloud_tcr_instance" "mytcr_instance" {`
`150`	`149`	`test = "test"`
`151`	`150`	`}`
`152`	`151`	`}`
`153`		-`
	`152`	+`