Merge remote-tracking branch 'upstream/master'

Author: gailwang

CHANGELOG.md

@@ -53,13 +53,13 @@ func dataSourceTencentCloudCamPolicies() *schema.Resource {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				ValidateFunc: validateAllowedIntValue([]int{1, 2}),
-				Description:  "Type of the policy strategy. 1 means customer strategy and 2 means preset strategy.",
+				Description:  "Type of the policy strategy. Valid values: 1, 2. 1 means customer strategy and 2 means preset strategy.",
 			},
 			"create_mode": {
 				Type:         schema.TypeInt,
 				Optional:     true,
 				ValidateFunc: validateAllowedIntValue([]int{1, 2}),
-				Description:  "Mode of creation of policy strategy. 1 means policy was created with console, and 2 means it was created by strategies.",
+				Description:  "Mode of creation of policy strategy. Valid values: 1, 2. 1 means policy was created with console, and 2 means it was created by strategies.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,

tencentcloud/data_source_tc_cam_policies.go

@@ -54,7 +54,7 @@ func dataSourceTencentCloudCamRolePolicyAttachments() *schema.Resource {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ValidateFunc: validateAllowedStringValue(CAM_POLICY_CREATE_STRATEGY),
-				Description:  "Type of the policy strategy. Valid values are 'User', 'QCS', '', 'User' means customer strategy and 'QCS' means preset strategy.",
+				Description:  "Type of the policy strategy. Valid values are 'User', 'QCS'. 'User' means customer strategy and 'QCS' means preset strategy.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,

tencentcloud/data_source_tc_cam_role_policy_attachments.go

@@ -49,7 +49,6 @@ func dataSourceTencentCloudCcnBandwidthLimits() *schema.Resource {
 				Optional:    true,
 				Description: "Used to save results.",
 			},
-
 			// Computed values
 			"limits": {
 				Type:        schema.TypeList,

tencentcloud/data_source_tc_ccn_bandwidth_limits.go

@@ -48,13 +48,13 @@ func dataSourceTencentCloudCdnDomains() *schema.Resource {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ValidateFunc: validateAllowedStringValue(CDN_ORIGIN_PULL_PROTOCOL),
-				Description:  "Origin-pull protocol configuration. The available value include `http`, `https` and `follow`.",
+				Description:  "Origin-pull protocol configuration. Valid values: `http`, `https` and `follow`.",
 			},
 			"https_switch": {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ValidateFunc: validateAllowedStringValue(CDN_HTTPS_SWITCH),
-				Description:  "HTTPS configuration. The available value include `on`, `off` and `processing`.",
+				Description:  "HTTPS configuration. Valid values: `on`, `off` and `processing`.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,

tencentcloud/data_source_tc_cdn_domains.go

@@ -88,17 +88,17 @@ func dataSourceTencentCloudDcGatewayInstances() *schema.Resource {
 						"network_instance_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Type of associated network, the available value include 'VPC' and 'CCN'.",
+							Description: "Type of associated network. Valid values: 'VPC' and 'CCN'.",
 						},
 						"gateway_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Type of the gateway, the available value include 'NORMAL' and 'NAT'. Default is 'NORMAL'.",
+							Description: "Type of the gateway. Valid values: 'NORMAL' and 'NAT'. Default is 'NORMAL'.",
 						},
 						"cnn_route_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Type of CCN route, the available value include 'BGP' and 'STATIC'.",
+							Description: "Type of CCN route. Valid values: 'BGP' and 'STATIC'.",
 						},
 						"enable_bgp": {
 							Type:        schema.TypeBool,

tencentcloud/data_source_tc_dc_gateway_instances.go

@@ -66,7 +66,7 @@ func dataSourceTencentCloudDcxInstances() *schema.Resource {
 						"network_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Type of the network, and available values include VPC, BMVPC and CCN. The default value is VPC.",
+							Description: "Type of the network. Valid values: VPC, BMVPC and CCN. The default value is VPC.",
 						},
 						"dcg_id": {
 							Type:        schema.TypeString,
@@ -91,7 +91,7 @@ func dataSourceTencentCloudDcxInstances() *schema.Resource {
 						"route_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Type of the route, and available values include BGP and STATIC. The default value is BGP.",
+							Description: "Type of the route. Valid values: BGP and STATIC. The default value is BGP.",
 						},
 						"bgp_asn": {
 							Type:        schema.TypeInt,
@@ -114,7 +114,7 @@ func dataSourceTencentCloudDcxInstances() *schema.Resource {
 						"vlan": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "Vlan of the dedicated tunnels, and the range of values is [0-3000]. '0' means that only one tunnel can be created for the physical connect.",
+							Description: "Vlan of the dedicated tunnels.  Valid value ranges: [0-3000]. '0' means that only one tunnel can be created for the physical connect.",
 						},
 						"tencent_address": {
 							Type:        schema.TypeString,
@@ -134,7 +134,7 @@ func dataSourceTencentCloudDcxInstances() *schema.Resource {
 						"state": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "State of the dedicated tunnels, and available values include PENDING, ALLOCATING, ALLOCATED, ALTERING, DELETING, DELETED, COMFIRMING and REJECTED.",
+							Description: "State of the dedicated tunnels. Valid values: PENDING, ALLOCATING, ALLOCATED, ALTERING, DELETING, DELETED, COMFIRMING and REJECTED.",
 						},
 						"create_time": {
 							Type:        schema.TypeString,

tencentcloud/data_source_tc_dcx_instances.go

@@ -102,7 +102,7 @@ func dataSourceTencentCloudDnats() *schema.Resource {
 						"protocol": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Type of the network protocol, the available values include: `TCP` and `UDP`.",
+							Description: "Type of the network protocol. Valid values: `TCP` and `UDP`.",
 						},
 						"elastic_ip": {
 							Type:        schema.TypeString,

tencentcloud/data_source_tc_dnats.go

@@ -45,7 +45,7 @@ func dataSourceTencentCloudGaapCertificates() *schema.Resource {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ValidateFunc: validateAllowedStringValue([]string{"BASIC", "CLIENT", "SERVER", "REALSERVER", "PROXY"}),
-				Description:  "Type of the certificate to be queried, the available values include `BASIC`, `CLIENT`, `SERVER`, `REALSERVER` and `PROXY`; `BASIC` means basic certificate; `CLIENT` means client CA certificate; `SERVER` means server SSL certificate; `REALSERVER` means realserver CA certificate; `PROXY` means proxy SSL certificate.",
+				Description:  "Type of the certificate to be queried. Valid values: `BASIC`, `CLIENT`, `SERVER`, `REALSERVER` and `PROXY`. `BASIC` means basic certificate; `CLIENT` means client CA certificate; `SERVER` means server SSL certificate; `REALSERVER` means realserver CA certificate; `PROXY` means proxy SSL certificate.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,

tencentcloud/data_source_tc_gaap_certificates.go

@@ -61,7 +61,7 @@ func dataSourceTencentCloudGaapLayer4Listeners() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ValidateFunc: validateAllowedStringValue([]string{"TCP", "UDP"}),
-				Description:  "Protocol of the layer4 listener to be queried, the available values include `TCP` and `UDP`.",
+				Description:  "Protocol of the layer4 listener to be queried. Valid values: `TCP` and `UDP`.",
 			},
 			"proxy_id": {
 				Type:        schema.TypeString,