fix conflicts

Author: ChrisdeR

CHANGELOG.md

@@ -6,6 +6,15 @@ FEATURES:
 * **New Resource**: `tencentcloud_kms_external_key`
 * **New Data Source**: `tencentcloud_kms_keys` 
 
+ENHANCEMENTS:
+
+* Resource `tencentcloud_instance` add `cam_role_name` to support binding role to cvm instance.
+
+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)
 
 ENHANCEMENTS:

tencentcloud/data_source_tc_instances.go

@@ -231,6 +231,11 @@ func dataSourceTencentCloudInstances() *schema.Resource {
 							Computed:    true,
 							Description: "The way that CVM instance will be renew automatically or not when it reach the end of the prepaid tenancy.",
 						},
+						"cam_role_name": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "CAM role name authorized to access.",
+						},
 					},
 				},
 			},
@@ -311,6 +316,7 @@ func dataSourceTencentCloudInstancesRead(d *schema.ResourceData, meta interface{
 			"create_time":                instance.CreatedTime,
 			"expired_time":               instance.ExpiredTime,
 			"instance_charge_type_prepaid_renew_flag": instance.RenewFlag,
+			"cam_role_name": instance.CamRoleName,
 		}
 		if len(instance.PublicIpAddresses) > 0 {
 			mapping["public_ip"] = *instance.PublicIpAddresses[0]

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

@@ -53,6 +53,7 @@ resource "tencentcloud_instance" "my_awesome_app" {
   subnet_id                  = tencentcloud_subnet.app.id
   internet_max_bandwidth_out = 20
   count                      = 2
+  cam_role_name              = "CVM_QcsRole"
 
   data_disks {
     data_disk_type = "CLOUD_PREMIUM"
@@ -87,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"
@@ -383,6 +385,13 @@ func resourceTencentCloudInstance() *schema.Resource {
 				Default:     false,
 				Description: "Indicate whether to force delete the instance. Default is `false`. If set true, the instance will be permanently deleted instead of being moved into the recycle bin. Note: only works for `PREPAID` instance.",
 			},
+			// role
+			"cam_role_name": {
+				Type:        schema.TypeString,
+				ForceNew:    true,
+				Optional:    true,
+				Description: "CAM role name authorized to access.",
+			},
 			// Computed values.
 			"instance_status": {
 				Type:        schema.TypeString,
@@ -434,6 +443,9 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 	if v, ok := d.GetOk("hostname"); ok {
 		request.HostName = helper.String(v.(string))
 	}
+	if v, ok := d.GetOk("cam_role_name"); ok {
+		request.CamRoleName = helper.String(v.(string))
+	}
 
 	if v, ok := d.GetOk("instance_charge_type"); ok {
 		instanceChargeType := v.(string)
@@ -599,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",
@@ -775,6 +791,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 	_ = d.Set("instance_status", instance.InstanceState)
 	_ = d.Set("create_time", instance.CreatedTime)
 	_ = d.Set("expired_time", instance.ExpiredTime)
+	_ = d.Set("cam_role_name", instance.CamRoleName)
 
 	if _, ok := d.GetOkExists("allocate_public_ip"); !ok {
 		_ = d.Set("allocate_public_ip", len(instance.PublicIpAddresses) > 0)

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/resource_tc_postgresql_instance.go

@@ -278,7 +278,10 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 		return outErr
 	}
 	//check init status
-
+	checkErr := postgresqlService.CheckDBInstanceStatus(ctx, instanceId)
+	if checkErr != nil {
+		return checkErr
+	}
 	//set open public access
 	public_access_switch := false
 	if v, ok := d.GetOkExists("public_access_switch"); ok {
@@ -298,6 +301,11 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 		}
 	}
 
+	//check creation done
+	checkErr = postgresqlService.CheckDBInstanceStatus(ctx, instanceId)
+	if checkErr != nil {
+		return checkErr
+	}
 	//set name
 	outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
 		inErr := postgresqlService.ModifyPostgresqlInstanceName(ctx, instanceId, name)
@@ -311,7 +319,7 @@ func resourceTencentCloudPostgresqlInstanceCreate(d *schema.ResourceData, meta i
 	}
 
 	//check creation done
-	checkErr := postgresqlService.CheckDBInstanceStatus(ctx, instanceId)
+	checkErr = postgresqlService.CheckDBInstanceStatus(ctx, instanceId)
 	if checkErr != nil {
 		return checkErr
 	}
@@ -483,6 +491,10 @@ func resourceTencentCloudPostgresqlInstanceRead(d *schema.ResourceData, meta int
 		outErr = resource.Retry(readRetryTimeout, func() *resource.RetryError {
 			instance, has, inErr = postgresqlService.DescribePostgresqlInstanceById(ctx, d.Id())
 			if inErr != nil {
+				ee, ok := inErr.(*sdkErrors.TencentCloudSDKError)
+				if ok && ee.GetCode() == "ResourceNotFound.InstanceNotFoundError" {
+					return nil
+				}
 				return retryError(inErr)
 			}
 			return nil

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

tencentcloud/service_tencentcloud_tcr.go

@@ -30,7 +30,8 @@ func (me *TCRService) CreateTCRInstance(ctx context.Context, name string, instan
 	if len(tags) > 0 {
 		tagSpec := tcr.TagSpecification{ResourceType: helper.String("instance"), Tags: make([]*tcr.Tag, 0)}
 		for k, v := range tags {
-			tag := tcr.Tag{Value: &v, Key: &k}
+			key, value := k, v
+			tag := tcr.Tag{Value: &value, Key: &key}
 			tagSpec.Tags = append(tagSpec.Tags, &tag)
 		}
 		request.TagSpecification = &tagSpec

website/docs/d/instances.html.markdown

@@ -39,6 +39,7 @@ In addition to all arguments above, the following attributes are exported:
 * `instance_list` - An information list of cvm instance. Each element contains the following attributes:
   * `allocate_public_ip` - Indicates whether public ip is assigned.
   * `availability_zone` - The available zone that the CVM instance locates at.
+  * `cam_role_name` - CAM role name authorized to access.
   * `cpu` - The number of CPU cores of the instance.
   * `create_time` - Creation time of the instance.
   * `data_disks` - An information list of data disk. Each element contains the following attributes:

website/docs/r/instance.html.markdown

@@ -63,6 +63,7 @@ resource "tencentcloud_instance" "my_awesome_app" {
   subnet_id                  = tencentcloud_subnet.app.id
   internet_max_bandwidth_out = 20
   count                      = 2
+  cam_role_name              = "CVM_QcsRole"
 
   data_disks {
     data_disk_type = "CLOUD_PREMIUM"
@@ -83,6 +84,7 @@ The following arguments are supported:
 * `availability_zone` - (Required, ForceNew) The available zone for the CVM instance.
 * `image_id` - (Required, ForceNew) The image to use for the instance. Changing `image_id` will cause the instance to be destroyed and re-created.
 * `allocate_public_ip` - (Optional, ForceNew) Associate a public IP address with an instance in a VPC or Classic. Boolean value, Default is false.
+* `cam_role_name` - (Optional, ForceNew) CAM role name authorized to access.
 * `data_disks` - (Optional, ForceNew) Settings for data disks.
 * `disable_monitor_service` - (Optional) Disable enhance service for monitor, it is enabled by default. When this options is set, monitor agent won't be installed.
 * `disable_security_service` - (Optional) Disable enhance service for security, it is enabled by default. When this options is set, security agent won't be installed.