Merge branch 'master' into feature/cvm_cam_role

Author: ChrisdeR

CHANGELOG.md

@@ -6,6 +6,7 @@ ENHANCEMENTS:
 
 BUG FIXES:
 
+* Resource `tencentcloud_instance` fix bug that waiting 5 minutes when cloud disk sold out.
 * Resource: `tencentcloud_tcr_instance` fix bug that only one tag is effective when setting multiple tags.
 
 ## 1.53.7 (March 10, 2021)

tencentcloud/extension_cvm.go

@@ -48,7 +48,8 @@ const (
 	CVM_IMAGE_LOGIN     = "TRUE"
 	CVM_IMAGE_LOGIN_NOT = "FALSE"
 
-	CVM_ZONE_NOT_SUPPORT_ERROR = "InvalidParameterValue.ZoneNotSupported"
+	CVM_ZONE_NOT_SUPPORT_ERROR    = "InvalidParameterValue.ZoneNotSupported"
+	CVM_CLOUD_DISK_SOLD_OUT_ERROR = "ResourceInsufficient.CloudDiskSoldOut"
 )
 
 var CVM_CHARGE_TYPE = []string{

tencentcloud/resource_tc_instance.go

@@ -88,6 +88,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+	sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
 	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit"
@@ -610,6 +611,10 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 		if err != nil {
 			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
 				logId, request.GetAction(), request.ToJsonString(), err.Error())
+			e, ok := err.(*sdkErrors.TencentCloudSDKError)
+			if ok && e.Code == CVM_CLOUD_DISK_SOLD_OUT_ERROR {
+				return resource.NonRetryableError(e)
+			}
 			return retryError(err)
 		}
 		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -1078,7 +1078,10 @@ func tkeGetCvmRunInstancesPara(dMap map[string]interface{}, meta interface{},
 	request.InstanceCount = &count
 
 	if v, ok := dMap["hostname"]; ok {
-		request.HostName = helper.String(v.(string))
+		hostname := v.(string)
+		if hostname != "" {
+			request.HostName = &hostname
+		}
 	}
 
 	cvmJson = request.ToJsonString()

tencentcloud/service_tencentcloud_postgresql.go

@@ -227,7 +227,7 @@ func (me *PostgresqlService) DescribePostgresqlInstanceById(ctx context.Context,
 			errRet = err
 			return
 		}
-		if ee.Code == "InvalidParameter" {
+		if ee.Code == "InvalidParameter" || ee.Code == "ResourceNotFound.InstanceNotFoundError" {
 			errRet = nil
 		} else {
 			errRet = err