fix bug about setting tags in resource tencentcloud_tcr_instance and add cam_role_name to resource tencentcloud_instance

Author: ChrisdeR

CHANGELOG.md

@@ -1,4 +1,13 @@
 ## 1.53.8 (Unreleased)
+
+ENHANCEMENTS:
+
+* Resource `tencentcloud_instance` add `cam_role_name` to support binding role to cvm instance.
+
+BUG FIXES:
+
+* Resource: `tencentcloud_tcr_instance` fix bug that only one tag is effective when setting multiple tags.
+
 ## 1.53.7 (March 10, 2021)
 
 ENHANCEMENTS:

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"
@@ -383,6 +384,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 +442,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)

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