add cam_role_name with TKE and encrypt with CVM

Author: gailwang

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 1.43.1 (Unreleased)
+
+* Resource: `tencentcloud_instance` add new argument `encrypt` to support data disk with encrypt
+* Resource: `tencentcloud_kubernetes_cluster` add new argument `cam_role_name` to support authorization with instances
+
 ## 1.43.0 (September 18, 2020)
 
 FEATURES:

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.15
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.25
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -458,8 +458,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.15 h1:tH8E3LWSRu4g0egqRNDWzHp6MRqRaNMOnxrgAnQfvYU=
-github.com/tencentcloud/tencentcloud-sdk-go v1.0.15/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.25 h1:tLExcllerEwYTIx/58PA9r5v69uPfpc2yf6DLtDggTo=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.25/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/resource_tc_instance.go

@@ -57,6 +57,7 @@ resource "tencentcloud_instance" "my_awesome_app" {
   data_disks {
     data_disk_type = "CLOUD_PREMIUM"
     data_disk_size = 50
+	encrypt = false
   }
 
   tags = {
@@ -301,6 +302,13 @@ func resourceTencentCloudInstance() *schema.Resource {
 							ForceNew:    true,
 							Description: "Decides whether the disk is deleted with instance(only applied to `CLOUD_BASIC`, `CLOUD_SSD` and `CLOUD_PREMIUM` disk with `POSTPAID_BY_HOUR` instance), default is true.",
 						},
+						"encrypt": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Default:     false,
+							ForceNew:    true,
+							Description: "Decides whether the disk is encrypted. Default is `false`.",
+						},
 					},
 				},
 			},
@@ -515,6 +523,10 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 				dataDisk.DeleteWithInstance = &deleteWithInstanceBool
 			}
 
+			if encrypt, ok := value["encrypt"]; ok {
+				encryptBool := encrypt.(bool)
+				dataDisk.Encrypt = &encryptBool
+			}
 			request.DataDisks = append(request.DataDisks, &dataDisk)
 		}
 	}
@@ -719,6 +731,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 			var (
 				snapshotId, diskId     string
 				deleteWithInstanceBool bool
+				encryptBool            bool
 			)
 			diskType := value["data_disk_type"].(string)
 			diskSize := int64(value["data_disk_size"].(int))
@@ -728,7 +741,9 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 			if deleteWithInstance, ok := value["delete_with_instance"]; ok {
 				deleteWithInstanceBool = deleteWithInstance.(bool)
 			}
-
+			if encrypt, ok := value["encrypt"]; ok {
+				encryptBool = encrypt.(bool)
+			}
 			// find the disk id value
 			for _, disk := range instance.DataDisks {
 				if diskType == *disk.DiskType && diskSize == *disk.DiskSize &&
@@ -746,6 +761,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 			dataDisk["data_disk_size"] = diskSize
 			dataDisk["data_disk_id"] = diskId
 			dataDisk["delete_with_instance"] = deleteWithInstanceBool
+			dataDisk["encrypt"] = encryptBool
 			dataDiskList = append(dataDiskList, dataDisk)
 		}
 	}

tencentcloud/resource_tc_instance_test.go

@@ -570,6 +570,7 @@ resource "tencentcloud_instance" "foo" {
     data_disk_type        = "CLOUD_PREMIUM"
     data_disk_size        = 100
     delete_with_instance  = true
+	encrypt = true
   } 
    
   data_disks {

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -83,6 +83,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
     enhanced_monitor_service  = false
     user_data                 = "dGVzdA=="
     password                  = "ZZXXccvv1212"
+	cam_role_name			  = "CVM_QcsRole"
   }
 
   labels = {
@@ -348,6 +349,12 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "ase64-encoded User Data text, the length limit is 16KB.",
 		},
+		"cam_role_name": {
+			Type:        schema.TypeString,
+			ForceNew:    true,
+			Optional:    true,
+			Description: "CAM role name authorized to access.",
+		},
 	}
 }
 
@@ -791,6 +798,10 @@ func tkeGetCvmRunInstancesPara(dMap map[string]interface{}, meta interface{},
 
 	}
 
+	if v, ok := dMap["cam_role_name"]; ok {
+		request.CamRoleName = helper.String(v.(string))
+	}
+
 	if v, ok := dMap["data_disk"]; ok {
 
 		dataDisks := v.([]interface{})

tencentcloud/resource_tc_kubernetes_cluster_test.go

@@ -181,6 +181,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
     enhanced_monitor_service  = false
     user_data                 = "dGVzdA=="
     password                  = "ZZXXccvv1212"
+	cam_role_name			= "CVM_QcsRole"
   }
 
   cluster_deploy_type = "MANAGED_CLUSTER"