merge master

Author: likexian

CHANGELOG.md

@@ -1,7 +1,16 @@
 ## 1.36.0 (Unreleased)
 
+FEATURES:
+
 * **New Data Source**: `tencentcloud_availability_regions`
 
+## 1.35.1 (Unreleased)
+
+ENHANCEMENTS: 
+
+* Resource: `tencentcloud_as_scaling_config`, `tencentcloud_eip` and `tencentcloud_kubernetes_cluster` remove the validate function of `internet_max_bandwidth_out`.
+* Resource: `tencentcloud_vpn_gateway` update available value of `bandwidth`.
+
 ## 1.35.0 (June 01, 2020)
 
 FEATURES:

tencentcloud/resource_tc_as_scaling_config.go

@@ -138,11 +138,10 @@ func resourceTencentCloudAsScalingConfig() *schema.Resource {
 				Description:  "Charge types for network traffic. Available values include `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
 			},
 			"internet_max_bandwidth_out": {
-				Type:         schema.TypeInt,
-				Optional:     true,
-				Default:      0,
-				ValidateFunc: validateIntegerInRange(0, 100),
-				Description:  "Max bandwidth of Internet access in Mbps. Default is 0.",
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     0,
+				Description: "Max bandwidth of Internet access in Mbps. Default is 0.",
 			},
 			"public_ip_assigned": {
 				Type:        schema.TypeBool,

tencentcloud/resource_tc_eip.go

@@ -85,11 +85,10 @@ func resourceTencentCloudEip() *schema.Resource {
 				Description:  "The charge type of eip, and available values include `BANDWIDTH_PACKAGE`, `BANDWIDTH_POSTPAID_BY_HOUR` and `TRAFFIC_POSTPAID_BY_HOUR`.",
 			},
 			"internet_max_bandwidth_out": {
-				Type:         schema.TypeInt,
-				Optional:     true,
-				ForceNew:     true,
-				ValidateFunc: validateIntegerInRange(1, 1000),
-				Description:  "The bandwidth limit of eip, unit is Mbps, and the range is 1-1000.",
+				Type:        schema.TypeInt,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "The bandwidth limit of eip, unit is Mbps.",
 			},
 			"tags": {
 				Type:        schema.TypeMap,

tencentcloud/resource_tc_gaap_proxy.go

@@ -63,10 +63,9 @@ func resourceTencentCloudGaapProxy() *schema.Resource {
 				Description: "ID of the project within the GAAP proxy, '0' means is default project.",
 			},
 			"bandwidth": {
-				Type:         schema.TypeInt,
-				Required:     true,
-				ValidateFunc: validateAllowedIntValue([]int{10, 20, 50, 100, 200, 500, 1000}),
-				Description:  "Maximum bandwidth of the GAAP proxy, unit is Mbps, the available values include `10`, `20`, `50`, `100`, `200`, `500` and `1000`.",
+				Type:        schema.TypeInt,
+				Required:    true,
+				Description: "Maximum bandwidth of the GAAP proxy, unit is Mbps, the available values include `10`, `20`, `50`, `100`, `200`, `500` and `1000`.",
 			},
 			"concurrent": {
 				Type:         schema.TypeInt,

tencentcloud/resource_tc_kubernetes_as_scaling_group.go

@@ -184,12 +184,11 @@ func kubernetesAsScalingConfigPara() map[string]*schema.Schema {
 			Description:  "Charge types for network traffic. Available values include `BANDWIDTH_PREPAID`, `TRAFFIC_POSTPAID_BY_HOUR`, `TRAFFIC_POSTPAID_BY_HOUR` and `BANDWIDTH_PACKAGE`.",
 		},
 		"internet_max_bandwidth_out": {
-			Type:         schema.TypeInt,
-			Optional:     true,
-			ForceNew:     true,
-			Default:      0,
-			ValidateFunc: validateIntegerInRange(0, 100),
-			Description:  "Max bandwidth of Internet access in Mbps. Default is 0.",
+			Type:        schema.TypeInt,
+			Optional:    true,
+			ForceNew:    true,
+			Default:     0,
+			Description: "Max bandwidth of Internet access in Mbps. Default is 0.",
 		},
 		"public_ip_assigned": {
 			Type:        schema.TypeBool,

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -312,12 +312,11 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 			Description:  "Charge types for network traffic. Available values include TRAFFIC_POSTPAID_BY_HOUR.",
 		},
 		"internet_max_bandwidth_out": {
-			Type:         schema.TypeInt,
-			ForceNew:     true,
-			Optional:     true,
-			Default:      0,
-			ValidateFunc: validateIntegerInRange(0, 100),
-			Description:  "Max bandwidth of Internet access in Mbps. Default is 0.",
+			Type:        schema.TypeInt,
+			ForceNew:    true,
+			Optional:    true,
+			Default:     0,
+			Description: "Max bandwidth of Internet access in Mbps. Default is 0.",
 		},
 		"public_ip_assigned": {
 			Type:        schema.TypeBool,

tencentcloud/resource_tc_vpn_gateway.go

@@ -82,11 +82,10 @@ func resourceTencentCloudVpnGateway() *schema.Resource {
 				Description: "ID of the VPC.",
 			},
 			"bandwidth": {
-				Type:         schema.TypeInt,
-				Optional:     true,
-				Default:      5,
-				ValidateFunc: validateAllowedIntValue([]int{5, 10, 20, 50, 100}),
-				Description:  "The maximum public network output bandwidth of VPN gateway (unit: Mbps), the available values include: 5,10,20,50,100. Default is 5. When charge type is `PREPAID`, bandwidth degradation operation is unsupported.",
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Default:     5,
+				Description: "The maximum public network output bandwidth of VPN gateway (unit: Mbps), the available values include: 5,10,20,50,100,200,500,1000. Default is 5. When charge type is `PREPAID`, bandwidth degradation operation is unsupported.",
 			},
 			"public_ip_address": {
 				Type:        schema.TypeString,

website/docs/r/eip.html.markdown

@@ -25,7 +25,7 @@ The following arguments are supported:
 * `anycast_zone` - (Optional, ForceNew) The zone of anycast, and available values include `ANYCAST_ZONE_GLOBAL` and `ANYCAST_ZONE_OVERSEAS`.
 * `applicable_for_clb` - (Optional, **Deprecated**) It has been deprecated from version 1.27.0. Indicates whether the anycast eip can be associated to a CLB.
 * `internet_charge_type` - (Optional, ForceNew) The charge type of eip, and available values include `BANDWIDTH_PACKAGE`, `BANDWIDTH_POSTPAID_BY_HOUR` and `TRAFFIC_POSTPAID_BY_HOUR`.
-* `internet_max_bandwidth_out` - (Optional, ForceNew) The bandwidth limit of eip, unit is Mbps, and the range is 1-1000.
+* `internet_max_bandwidth_out` - (Optional, ForceNew) The bandwidth limit of eip, unit is Mbps.
 * `internet_service_provider` - (Optional, ForceNew) Internet service provider of eip, and available values include `BGP`, `CMCC`, `CTCC` and `CUCC`.
 * `name` - (Optional) The name of eip.
 * `tags` - (Optional) The tags of eip.

website/docs/r/vpn_gateway.html.markdown

@@ -53,7 +53,7 @@ The following arguments are supported:
 * `name` - (Required) Name of the VPN gateway. The length of character is limited to 1-60.
 * `vpc_id` - (Required, ForceNew) ID of the VPC.
 * `zone` - (Required, ForceNew) Zone of the VPN gateway.
-* `bandwidth` - (Optional) The maximum public network output bandwidth of VPN gateway (unit: Mbps), the available values include: 5,10,20,50,100. Default is 5. When charge type is `PREPAID`, bandwidth degradation operation is unsupported.
+* `bandwidth` - (Optional) The maximum public network output bandwidth of VPN gateway (unit: Mbps), the available values include: 5,10,20,50,100,200,500,1000. Default is 5. When charge type is `PREPAID`, bandwidth degradation operation is unsupported.
 * `charge_type` - (Optional) Charge Type of the VPN gateway, valid values are `PREPAID`, `POSTPAID_BY_HOUR` and default is `POSTPAID_BY_HOUR`.
 * `prepaid_period` - (Optional) Period of instance to be prepaid. Valid values are 1, 2, 3, 4, 6, 7, 8, 9, 12, 24, 36 and unit is month. Caution: when this para and renew_flag para are valid, the request means to renew several months more pre-paid period. This para can only be set to take effect in create operation.
 * `prepaid_renew_flag` - (Optional) Flag indicates whether to renew or not, valid values are `NOTIFY_AND_RENEW`, `NOTIFY_AND_AUTO_RENEW`, `NOT_NOTIFY_AND_NOT_RENEW`. This para can only be set to take effect in create operation.