Skip to content

fixed lint check #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from Nov 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tencentcloud/extension_vpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,3 @@ var VPN_IPSEC_ENCRY_ALGORITHM = []string{
const (
VPCNotFound = "ResourceNotFound"
)

2 changes: 1 addition & 1 deletion tencentcloud/resource_tc_vpn_connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ func resourceTencentCloudVpnConnection() *schema.Resource {
Optional: true,
Default: "NULL",
ValidateFunc: validateAllowedStringValue(VPN_IPSEC_PFS_DH_GROUP_NAME),
Description: "PFS DH group , valid values are `GROUP1`, `GROUP2`, `GROUP5`, `GROUP14`, `GROUP24`, `NULL`. Default value is `NULL`.",
Description: "PFS DH group, valid values are `GROUP1`, `GROUP2`, `GROUP5`, `GROUP14`, `GROUP24`, `NULL`. Default value is `NULL`.",
},
"ipsec_sa_lifetime_traffic": {
Type: schema.TypeInt,
Expand Down
18 changes: 9 additions & 9 deletions website/docs/d/nat_gateways.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ data "tencentcloud_nat_gateways" "foo" {

The following arguments are supported:

* `id` - (Optional) ID of the nat gateway.
* `name` - (Optional) Name of the nat gateway.
* `id` - (Optional) ID of the NAT gateway.
* `name` - (Optional) Name of the NAT gateway.
* `result_output_file` - (Optional) Used to save results.
* `vpc_id` - (Optional) ID of the vpc.

## Attributes Reference

In addition to all arguments above, the following attributes are exported:

* `nats` - Information list of the dedicated tunnels.
* `nats` - Information list of the dedicated nats.
* `assigned_eip_set` - EIP arrays bound to the gateway. The value of at least 1.
* `bandwidth` - The maximum public network output bandwidth of nat gateway (unit: Mbps), the available values include: 20,50,100,200,500,1000,2000,5000. Default is 100.
* `create_time` - Create time of the nat gateway.
* `id` - ID of the nat gateway.
* `max_concurrent` - The upper limit of concurrent connection of nat gateway, the available values include: 1000000,3000000,10000000. Default is 1000000.
* `name` - Name of the nat gateway.
* `state` - State of the nat gateway.
* `bandwidth` - The maximum public network output bandwidth of NAT gateway (unit: Mbps), the available values include: 20,50,100,200,500,1000,2000,5000. Default is 100.
* `create_time` - Create time of the NAT gateway.
* `id` - ID of the NAT gateway.
* `max_concurrent` - The upper limit of concurrent connection of NAT gateway, the available values include: 1000000,3000000,10000000. Default is 1000000.
* `name` - Name of the NAT gateway.
* `state` - State of the NAT gateway.
* `vpc_id` - ID of the vpc.


4 changes: 2 additions & 2 deletions website/docs/r/nat_gateway.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ resource "tencentcloud_nat_gateway" "foo" {

The following arguments are supported:

* `name` - (Required) Name of the NAT gateway.
* `vpc_id` - (Required, ForceNew) Id of the VPC.
* `name` - (Required) Name of the nat gateway.
* `vpc_id` - (Required, ForceNew) ID of the vpc.
* `assigned_eip_set` - (Optional) EIP arrays bound to the gateway. The value of at least 1.
* `bandwidth` - (Optional) The maximum public network output bandwidth of nat gateway (unit: Mbps), the available values include: 20,50,100,200,500,1000,2000,5000. Default is 100.
* `max_concurrent` - (Optional) The upper limit of concurrent connection of nat gateway, the available values include: 1000000,3000000,10000000. Default is 1000000.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/vpn_connection.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ The following arguments are supported:
* `ike_version` - (Optional) Version of the IKE operation specification. Default value is `IKEV1`.
* `ipsec_encrypt_algorithm` - (Optional) Encrypt algorithm of the IPSEC operation specification, valid values are `3DES-CBC`, `AES-CBC-128`, `AES-CBC-128`, `AES-CBC-256`, `DES-CBC`. Default value is `3DES-CBC`.
* `ipsec_integrity_algorithm` - (Optional) Integrity algorithm of the IPSEC operation specification, valid values are `SHA1`, `MD5`. Default value is `MD5`.
* `ipsec_pfs_dh_group` - (Optional) PFS DH group , valid values are `GROUP1`, `GROUP2`, `GROUP5`, `GROUP14`, `GROUP24`, `NULL`. Default value is `NULL`.
* `ipsec_pfs_dh_group` - (Optional) PFS DH group, valid values are `GROUP1`, `GROUP2`, `GROUP5`, `GROUP14`, `GROUP24`, `NULL`. Default value is `NULL`.
* `ipsec_sa_lifetime_seconds` - (Optional) SA lifetime of the IPSEC operation specification, unit is `second`. The value ranges from 180 to 604800. Default value is 3600 seconds.
* `ipsec_sa_lifetime_traffic` - (Optional) SA lifetime of the IPSEC operation specification, unit is `KB`. The value ranges from 2560 to 4294967295. Default value is 1843200.
* `tags` - (Optional) A list of tags used to associate different resources.
Expand Down