Merge pull request #2 from terraform-providers/master

Merge

Author: woodylic

CHANGELOG.md

@@ -1,14 +1,15 @@
-## 1.23.0 (Unreleased)
+## 1.24.0 (Unreleased)
+## 1.23.0 (November 14, 2019)
 
 FEATURES:
 
+* **New Data Source**: `tencentcloud_images`
 * **New Data Source**: `tencentcloud_vpn_gateways`
 * **New Data Source**: `tencentcloud_customer_gateways`
 * **New Data Source**: `tencentcloud_vpn_connections`
 * **New Resource**: `tencentcloud_vpn_gateway`
 * **New Resource**: `tencentcloud_customer_gateway`
 * **New Resource**: `tencentcloud_vpn_connection`
-* **New Data Source**: `tencentcloud_images`
 * **Provider TencentCloud**: add `security_token` argument
 
 ENHANCEMENTS:

tencentcloud/extension_cvm.go

@@ -31,6 +31,8 @@ const (
 
 	ZONE_STATE_AVAILABLE   = "AVAILABLE"
 	ZONE_STATE_UNAVAILABLE = "UNAVAILABLE"
+
+	CVM_NOT_FOUND_ERROR = "InvalidInstanceId.NotFound"
 )
 
 var CVM_CHARGE_TYPE = []string{

tencentcloud/extension_vpc.go

@@ -268,4 +268,3 @@ var VPN_IPSEC_ENCRY_ALGORITHM = []string{
 const (
 	VPCNotFound = "ResourceNotFound"
 )
-

tencentcloud/resource_tc_key_pair.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
@@ -186,6 +187,11 @@ func resourceTencentCloudKeyPairDelete(d *schema.ResourceData, meta interface{})
 		err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 			errRet := cvmService.UnbindKeyPair(ctx, keyId, keyPair.AssociatedInstanceIds)
 			if errRet != nil {
+				if sdkErr, ok := errRet.(*errors.TencentCloudSDKError); ok {
+					if sdkErr.Code == CVM_NOT_FOUND_ERROR {
+						return nil
+					}
+				}
 				return retryError(errRet)
 			}
 			return nil
@@ -198,7 +204,7 @@ func resourceTencentCloudKeyPairDelete(d *schema.ResourceData, meta interface{})
 	err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		errRet := cvmService.DeleteKeyPair(ctx, keyId)
 		if errRet != nil {
-			return retryError(errRet)
+			return retryError(errRet, "InvalidKeyPair")
 		}
 		return nil
 	})

tencentcloud/resource_tc_vpn_connection.go

@@ -222,14 +222,14 @@ 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,
 				Optional:     true,
 				Default:      1843200,
-				ValidateFunc: validateIntegerInRange(2560, 4294967295),
-				Description:  "SA lifetime of the IPSEC operation specification, unit is `KB`. The value ranges from 2560 to 4294967295. Default value is 1843200.",
+				ValidateFunc: validateIntegerMin(2560),
+				Description:  "SA lifetime of the IPSEC operation specification, unit is `KB`. The value should not be less then 2560. Default value is 1843200.",
 			},
 			"tags": {
 				Type:        schema.TypeMap,

website/docs/d/nat_gateways.html.markdown

@@ -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.
 
 

website/docs/r/nat_gateway.html.markdown

@@ -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.

website/docs/r/vpn_connection.html.markdown

@@ -68,9 +68,9 @@ 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.
+* `ipsec_sa_lifetime_traffic` - (Optional) SA lifetime of the IPSEC operation specification, unit is `KB`. The value should not be less then 2560. Default value is 1843200.
 * `tags` - (Optional) A list of tags used to associate different resources.
 
 The `security_group_policy` object supports the following: