chore: update changelog and format code

Author: Kagashino

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.59.4 (September 28, 2021)
+
+ENHANCEMENTS:
+
+* Resource `resource_tc_kubernetes_node_pool_test.go` extend relative auto-scaling group arguments in node pool resource
+
+DEPRECATED:
+
+* Resource `resource_tc_cam_group_membership.go` argument `user_ids` was deprecated, replace by `user_names`
+* Resource `resource_tc_cam_user_policy_attachment.go` argument `user_id` was deprecated, replace by `user_name`
+
+
+## 1.59.3 (September 24, 2021)
+
+BUGFIXES:
+* Resource `resource_tc_tcr_instance.go` support modify tags
+* Resource `service_tencentcloud_postgresql.go` support security group
+* Resource `service_tencentcloud_monitor.go` fix binding policy query limit
+* Resource `resource_tc_api_gateway_api.go` fix destroy limitNumber
+
+
 ## 1.59.2 (September 18, 2021)
 
 BUGFIXES:

tencentcloud/data_source_tc_cam_group_memberships.go

@@ -52,7 +52,7 @@ func dataSourceTencentCloudCamGroupMemberships() *schema.Resource {
 							Elem: &schema.Schema{
 								Type: schema.TypeString,
 							},
-							Deprecated: "It has been deprecated from version 1.59.5. Use `user_names` instead.",
+							Deprecated:  "It has been deprecated from version 1.59.5. Use `user_names` instead.",
 							Description: "ID set of the CAM group members.",
 						},
 						"user_names": {
@@ -96,8 +96,8 @@ func dataSourceTencentCloudCamGroupMembershipsRead(d *schema.ResourceData, meta
 	groupList := make([]map[string]interface{}, 0, 1)
 	ids := make([]string, 0, 1)
 	mapping := map[string]interface{}{
-		"group_id": groupId,
-		"user_ids": memberships,
+		"group_id":   groupId,
+		"user_ids":   memberships,
 		"user_names": memberships,
 	}
 	groupList = append(groupList, mapping)

tencentcloud/resource_tc_cam_group_membership.go

@@ -50,18 +50,18 @@ func resourceTencentCloudCamGroupMembership() *schema.Resource {
 				Description: "ID of CAM group.",
 			},
 			"user_ids": {
-				Type:     schema.TypeSet,
-				Optional: true,
+				Type:         schema.TypeSet,
+				Optional:     true,
 				AtLeastOneOf: []string{"user_ids", "user_names"},
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
-				Deprecated: "It has been deprecated from version 1.59.5. Use `user_names` instead.",
+				Deprecated:  "It has been deprecated from version 1.59.5. Use `user_names` instead.",
 				Description: "ID set of the CAM group members.",
 			},
 			"user_names": {
-				Type:     schema.TypeSet,
-				Optional: true,
+				Type:         schema.TypeSet,
+				Optional:     true,
 				AtLeastOneOf: []string{"user_ids", "user_names"},
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
@@ -375,4 +375,4 @@ func processChange(d *schema.ResourceData, groupId string, logId string, meta in
 		}
 	}
 	return nil
-}
+}

tencentcloud/resource_tc_cam_user_policy_attachment.go

@@ -43,19 +43,19 @@ func resourceTencentCloudCamUserPolicyAttachment() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"user_id": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				ForceNew:    true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
 				AtLeastOneOf: []string{"user_name", "user_id"},
-				Deprecated: "It has been deprecated from version 1.59.5. Use `user_name` instead.",
-				Description: "ID of the attached CAM user.",
+				Deprecated:   "It has been deprecated from version 1.59.5. Use `user_name` instead.",
+				Description:  "ID of the attached CAM user.",
 			},
 			"user_name": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				ForceNew:    true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
 				AtLeastOneOf: []string{"user_name", "user_id"},
-				Description: "Name of the attached CAM user as uniq key.",
+				Description:  "Name of the attached CAM user as uniq key.",
 			},
 			"policy_id": {
 				Type:        schema.TypeString,
@@ -218,4 +218,4 @@ func getUserId(d *schema.ResourceData) (value string, usingName bool, err error)
 		return id.(string), false, nil
 	}
 	return "", false, fmt.Errorf("no user name provided")
-}
+}

tencentcloud/resource_tc_kubernetes_node_pool.go

@@ -636,11 +636,11 @@ func resourceKubernetesNodePoolRead(d *schema.ResourceData, meta interface{}) er
 	defer logElapsed("resource.tencentcloud_kubernetes_node_pool.read")()
 
 	var (
-		logId   = getLogId(contextNil)
-		ctx     = context.WithValue(context.TODO(), logIdKey, logId)
-		service = TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
+		logId     = getLogId(contextNil)
+		ctx       = context.WithValue(context.TODO(), logIdKey, logId)
+		service   = TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 		asService = AsService{client: meta.(*TencentCloudClient).apiV3Conn}
-		items   = strings.Split(d.Id(), FILED_SP)
+		items     = strings.Split(d.Id(), FILED_SP)
 	)
 	if len(items) != 2 {
 		return fmt.Errorf("resource_tc_kubernetes_node_pool id  is broken")
@@ -849,11 +849,11 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 	defer logElapsed("resource.tencentcloud_kubernetes_node_pool.update")()
 
 	var (
-		logId   = getLogId(contextNil)
-		ctx     = context.WithValue(context.TODO(), logIdKey, logId)
-		service = TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
+		logId     = getLogId(contextNil)
+		ctx       = context.WithValue(context.TODO(), logIdKey, logId)
+		service   = TkeService{client: meta.(*TencentCloudClient).apiV3Conn}
 		asService = AsService{client: meta.(*TencentCloudClient).apiV3Conn}
-		items   = strings.Split(d.Id(), FILED_SP)
+		items     = strings.Split(d.Id(), FILED_SP)
 	)
 	if len(items) != 2 {
 		return fmt.Errorf("resource_tc_kubernetes_node_pool id  is broken")
@@ -904,9 +904,9 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 		}
 
 		var (
-			scalingGroupId	  = *nodePool.AutoscalingGroupId
+			scalingGroupId    = *nodePool.AutoscalingGroupId
 			name              = d.Get("scaling_group_name").(string)
-			projectId		  = d.Get("scaling_group_project_id").(int)
+			projectId         = d.Get("scaling_group_project_id").(int)
 			defaultCooldown   = d.Get("default_cooldown").(int)
 			zones             []*string
 			terminationPolicy []*string
@@ -924,7 +924,6 @@ func resourceKubernetesNodePoolUpdate(d *schema.ResourceData, meta interface{})
 			}
 		}
 
-
 		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 			errRet := asService.ModifyScalingGroup(ctx, scalingGroupId, name, projectId, defaultCooldown, zones, terminationPolicy)
 			if errRet != nil {

tencentcloud/resource_tc_postgresql_instance.go

@@ -215,19 +215,19 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 	postgresqlService := PostgresqlService{client: meta.(*TencentCloudClient).apiV3Conn}
 
 	var (
-		name      = d.Get("name").(string)
-		dbVersion = d.Get("engine_version").(string)
-		payType   = d.Get("charge_type").(string)
-		projectId = d.Get("project_id").(int)
-		subnetId  = d.Get("subnet_id").(string)
-		vpcId     = d.Get("vpc_id").(string)
+		name           = d.Get("name").(string)
+		dbVersion      = d.Get("engine_version").(string)
+		payType        = d.Get("charge_type").(string)
+		projectId      = d.Get("project_id").(int)
+		subnetId       = d.Get("subnet_id").(string)
+		vpcId          = d.Get("vpc_id").(string)
 		securityGroups = d.Get("security_groups").(*schema.Set).List()
-		zone      = d.Get("availability_zone").(string)
-		storage   = d.Get("storage").(int)
-		memory    = d.Get("memory").(int)
-		username  = d.Get("root_user").(string)
-		password  = d.Get("root_password").(string)
-		charset   = d.Get("charset").(string)
+		zone           = d.Get("availability_zone").(string)
+		storage        = d.Get("storage").(int)
+		memory         = d.Get("memory").(int)
+		username       = d.Get("root_user").(string)
+		password       = d.Get("root_password").(string)
+		charset        = d.Get("charset").(string)
 	)
 
 	var period = 1