remove extra space line and enchance descriptions

gailwang · gailwang · commit f199607c2103 · 2021-01-23T21:41:23.000+08:00
diff --git a/tencentcloud/resource_tc_gaap_proxy.go b/tencentcloud/resource_tc_gaap_proxy.go
@@ -147,8 +147,6 @@ func resourceTencentCloudGaapProxy() *schema.Resource {
 
 func resourceTencentCloudGaapProxyCreate(d *schema.ResourceData, m interface{}) error {
 	defer logElapsed("resource.tencentcloud_gaap_proxy.create")()
-	//gaapActionMu.Lock()
-	//defer gaapActionMu.Unlock()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
@@ -295,8 +293,6 @@ func resourceTencentCloudGaapProxyRead(d *schema.ResourceData, m interface{}) er
 
 func resourceTencentCloudGaapProxyUpdate(d *schema.ResourceData, m interface{}) error {
 	defer logElapsed("resource.tencentcloud_gaap_proxy.update")()
-	//gaapActionMu.Lock()
-	//defer gaapActionMu.Unlock()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
diff --git a/tencentcloud/resource_tc_gaap_security_rule.go b/tencentcloud/resource_tc_gaap_security_rule.go
@@ -144,7 +144,6 @@ func resourceTencentCloudGaapSecurityRuleCreate(d *schema.ResourceData, m interf
 
 func resourceTencentCloudGaapSecurityRuleRead(d *schema.ResourceData, m interface{}) error {
 	defer logElapsed("resource.tencentcloud_gaap_security_rule.read")()
-
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), logIdKey, logId)
 
diff --git a/tencentcloud/resource_tc_instance.go b/tencentcloud/resource_tc_instance.go
@@ -270,10 +270,9 @@ func resourceTencentCloudInstance() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"data_disk_type": {
-							Type:     schema.TypeString,
-							Required: true,
-							ForceNew: true,
-							//ValidateFunc: validateAllowedStringValue(CVM_DISK_TYPE),
+							Type:        schema.TypeString,
+							Required:    true,
+							ForceNew:    true,
 							Description: "Data disk type. For more information about limits on different data disk types, see [Storage Overview](https://intl.cloud.tencent.com/document/product/213/4952). Valid values: `LOCAL_BASIC`: local disk, `LOCAL_SSD`: local SSD disk, `CLOUD_BASIC`: HDD cloud disk, `CLOUD_PREMIUM`: Premium Cloud Storage, `CLOUD_SSD`: SSD, `CLOUD_HSSD`: Enhanced SSD. NOTE: `LOCAL_BASIC` and `LOCAL_SSD` are deprecated.",
 						},
 						"data_disk_size": {
@@ -314,7 +313,7 @@ func resourceTencentCloudInstance() *schema.Resource {
 							Optional:    true,
 							Default:     0,
 							ForceNew:    true,
-							Description: "This parameter used to make extra performance of the data disk. It's only supported with `CLOUD_TSSD` and `CLOUD_HSSD` disk type.",
+							Description: "Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.",
 						},
 					},
 				},
diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go
@@ -1843,7 +1843,7 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface
 			return err
 		}
 		if !isOk {
-			return fmt.Errorf("This version %s is not supported", newVersion)
+			return fmt.Errorf("version %s is unsupported", newVersion)
 		}
 
 		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
diff --git a/tencentcloud/resource_tc_kubernetes_cluster_attachment.go b/tencentcloud/resource_tc_kubernetes_cluster_attachment.go
@@ -151,14 +151,14 @@ func TkeInstanceAdvancedSetting() map[string]*schema.Schema {
 						ForceNew:    true,
 						Optional:    true,
 						Default:     "",
-						Description: "File system. E.g.(`ext3/ext4/xfs`).",
+						Description: "File system, e.g. `ext3/ext4/xfs`.",
 					},
 					"auto_format_and_mount": {
 						Type:        schema.TypeBool,
 						Optional:    true,
 						ForceNew:    true,
 						Default:     false,
-						Description: "Indicate to auto format and mount or not. Default is `false`.",
+						Description: "Indicate whether to auto format and mount or not. Default is `false`.",
 					},
 					"mount_target": {
 						Type:        schema.TypeString,
diff --git a/tencentcloud/resource_tc_kubernetes_node_pool.go b/tencentcloud/resource_tc_kubernetes_node_pool.go
@@ -283,7 +283,7 @@ func ResourceTencentCloudKubernetesNodePool() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				ForceNew: true,
-				Description: "Auto scaling mode. Valid values are `CLASSIC_SCALING`(scaling by create/detroy instances), " +
+				Description: "Auto scaling mode. Valid values are `CLASSIC_SCALING`(scaling by create/destroy instances), " +
 					"`WAKE_UP_STOPPED_SCALING`(Boot priority for expansion. When expanding the capacity, the shutdown operation is given priority to the shutdown of the instance." +
 					" If the number of instances is still lower than the expected number of instances after the startup, the instance will be created, and the method of destroying the instance will still be used for shrinking)" +
 					".",
diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown
@@ -122,7 +122,7 @@ The `data_disks` object supports the following:
 * `data_disk_snapshot_id` - (Optional, ForceNew) Snapshot ID of the data disk. The selected data disk snapshot size must be smaller than the data disk size.
 * `delete_with_instance` - (Optional, ForceNew) Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `POSTPAID_BY_HOUR` instance), default is true.
 * `encrypt` - (Optional, ForceNew) Decides whether the disk is encrypted. Default is `false`.
-* `throughput_performance` - (Optional, ForceNew) This parameter used to make extra performance of the data disk. It's only supported with `CLOUD_TSSD` and `CLOUD_HSSD` disk type.
+* `throughput_performance` - (Optional, ForceNew) Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.
 
 ## Attributes Reference
 
diff --git a/website/docs/r/kubernetes_cluster_attachment.html.markdown b/website/docs/r/kubernetes_cluster_attachment.html.markdown
@@ -113,10 +113,10 @@ The following arguments are supported:
 
 The `data_disk` object supports the following:
 
-* `auto_format_and_mount` - (Optional, ForceNew) Indicate to auto format and mount or not. Default is `false`.
+* `auto_format_and_mount` - (Optional, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
 * `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
 * `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
-* `file_system` - (Optional, ForceNew) File system. E.g.(`ext3/ext4/xfs`).
+* `file_system` - (Optional, ForceNew) File system, e.g. `ext3/ext4/xfs`.
 * `mount_target` - (Optional, ForceNew) Mount target.
 
 The `worker_config` object supports the following:
diff --git a/website/docs/r/kubernetes_node_pool.html.markdown b/website/docs/r/kubernetes_node_pool.html.markdown
@@ -118,7 +118,7 @@ The following arguments are supported:
 * `node_os_type` - (Optional) The image version of the node. Valida values are `DOCKER_CUSTOMIZE` and `GENERAL`. Default is `GENERAL`. This parameter will only affect new nodes, not including the existing nodes.
 * `node_os` - (Optional) Operating system of the cluster, the available values include: `tlinux2.4x86_64`, `ubuntu18.04.1x86_64`, `ubuntu16.04.1 LTSx86_64`, `centos7.6.0_x64` and `centos7.2x86_64`. Default is 'tlinux2.4x86_64'. This parameter will only affect new nodes, not including the existing nodes.
 * `retry_policy` - (Optional, ForceNew) Available values for retry policies include `IMMEDIATE_RETRY` and `INCREMENTAL_INTERVALS`.
-* `scaling_mode` - (Optional, ForceNew) Auto scaling mode. Valid values are `CLASSIC_SCALING`(scaling by create/detroy instances), `WAKE_UP_STOPPED_SCALING`(Boot priority for expansion. When expanding the capacity, the shutdown operation is given priority to the shutdown of the instance. If the number of instances is still lower than the expected number of instances after the startup, the instance will be created, and the method of destroying the instance will still be used for shrinking).
+* `scaling_mode` - (Optional, ForceNew) Auto scaling mode. Valid values are `CLASSIC_SCALING`(scaling by create/destroy instances), `WAKE_UP_STOPPED_SCALING`(Boot priority for expansion. When expanding the capacity, the shutdown operation is given priority to the shutdown of the instance. If the number of instances is still lower than the expected number of instances after the startup, the instance will be created, and the method of destroying the instance will still be used for shrinking).
 * `subnet_ids` - (Optional, ForceNew) ID list of subnet, and for VPC it is required.
 * `taints` - (Optional) Taints of kubernetes node pool created nodes.
 
@@ -137,10 +137,10 @@ The `auto_scaling_config` object supports the following:
 
 The `data_disk` object supports the following:
 
-* `auto_format_and_mount` - (Optional, ForceNew) Indicate to auto format and mount or not. Default is `false`.
+* `auto_format_and_mount` - (Optional, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
 * `disk_size` - (Optional, ForceNew) Volume of disk in GB. Default is `0`.
 * `disk_type` - (Optional, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD`.
-* `file_system` - (Optional, ForceNew) File system. E.g.(`ext3/ext4/xfs`).
+* `file_system` - (Optional, ForceNew) File system, e.g. `ext3/ext4/xfs`.
 * `mount_target` - (Optional, ForceNew) Mount target.
 
 The `data_disk` object supports the following:

Original file line number	Diff line number	Diff line change
`@@ -1843,7 +1843,7 @@ func resourceTencentCloudTkeClusterUpdate(d *schema.ResourceData, meta interface`
`1843`	`1843`	`return err`
`1844`	`1844`	`}`
`1845`	`1845`	`if !isOk {`
`1846`		`- return fmt.Errorf("This version %s is not supported", newVersion)`
	`1846`	`+ return fmt.Errorf("version %s is unsupported", newVersion)`
`1847`	`1847`	`}`
`1848`	`1848`
`1849`	`1849`	`err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {`