add

Author: SevenEarth

.changelog/3334.txt

@@ -1,3 +1,15 @@
 ```release-note:enhancement
 resource/tencentcloud_cbs_storage: support `kms_key_id`
 ```
+
+```release-note:enhancement
+resource/tencentcloud_cbs_storage_set: support `kms_key_id`
+```
+
+```release-note:enhancement
+datasource/tencentcloud_cbs_storages: add return value `kms_key_id`
+```
+
+```release-note:enhancement
+datasource/tencentcloud_cbs_storages_set: add return value `kms_key_id`
+```

tencentcloud/services/cbs/data_source_tc_cbs_storages.go

@@ -156,6 +156,11 @@ func DataSourceTencentCloudCbsStorages() *schema.Resource {
 							Computed:    true,
 							Description: "ID of the CVM instance that be mounted by this CBS.",
 						},
+						"kms_key_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Kms key ID.",
+						},
 						"encrypt": {
 							Type:        schema.TypeBool,
 							Computed:    true,
@@ -288,6 +293,7 @@ func dataSourceTencentCloudCbsStoragesRead(d *schema.ResourceData, meta interfac
 				"storage_size":           storage.DiskSize,
 				"attached":               storage.Attached,
 				"instance_id":            storage.InstanceId,
+				"kms_key_id":             storage.KmsKeyId,
 				"encrypt":                storage.Encrypt,
 				"create_time":            storage.CreateTime,
 				"status":                 storage.DiskState,

tencentcloud/services/cbs/data_source_tc_cbs_storages.md

@@ -3,6 +3,7 @@ Use this data source to query detailed information of CBS storages.
 Example Usage
 
 Query all CBS storages
+
 ```hcl
 data "tencentcloud_cbs_storages" "example" {}
 ```
@@ -17,6 +18,7 @@ data "tencentcloud_cbs_storages" "example" {
 ```
 
 Query CBS by dedicated cluster id
+
 ```hcl
 data "tencentcloud_cbs_storages" "example" {
   dedicated_cluster_id = "cluster-262n63e8"
@@ -26,7 +28,7 @@ data "tencentcloud_cbs_storages" "example" {
 The following snippet shows the new supported query params
 
 ```hcl
-data "tencentcloud_cbs_storages" "whats_new" {
+data "tencentcloud_cbs_storages" "example" {
   charge_type   = ["POSTPAID_BY_HOUR", "PREPAID", "CDCPAID", "DEDICATED_CLUSTER_PAID"]
   storage_state = ["ATTACHED"]
   instance_ips  = ["10.0.0.2"]

tencentcloud/services/cbs/data_source_tc_cbs_storages_set.go

@@ -155,6 +155,11 @@ func DataSourceTencentCloudCbsStoragesSet() *schema.Resource {
 							Computed:    true,
 							Description: "ID of the CVM instance that be mounted by this CBS.",
 						},
+						"kms_key_id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "Kms key ID.",
+						},
 						"encrypt": {
 							Type:        schema.TypeBool,
 							Computed:    true,
@@ -286,6 +291,7 @@ func dataSourceTencentCloudCbsStoragesSetRead(d *schema.ResourceData, meta inter
 			"storage_size":           storage.DiskSize,
 			"attached":               storage.Attached,
 			"instance_id":            storage.InstanceId,
+			"kms_key_id":             storage.KmsKeyId,
 			"encrypt":                storage.Encrypt,
 			"create_time":            storage.CreateTime,
 			"status":                 storage.DiskState,

tencentcloud/services/cbs/resource_tc_cbs_storage_set.go

@@ -80,6 +80,13 @@ func ResourceTencentCloudCbsStorageSet() *schema.Resource {
 				Default:     0,
 				Description: "ID of the project to which the instance belongs.",
 			},
+			"kms_key_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Computed:    true,
+				Description: "Optional parameters. When purchasing an encryption disk, customize the key. When this parameter is passed in, the `encrypt` parameter need be set.",
+			},
 			"encrypt": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -148,6 +155,10 @@ func resourceTencentCloudCbsStorageSetCreate(d *schema.ResourceData, meta interf
 		request.SnapshotId = helper.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("kms_key_id"); ok {
+		request.KmsKeyId = helper.String(v.(string))
+	}
+
 	if _, ok := d.GetOk("encrypt"); ok {
 		request.Encrypt = helper.String("ENCRYPT")
 	}
@@ -234,6 +245,10 @@ func resourceTencentCloudCbsStorageSetRead(d *schema.ResourceData, meta interfac
 	_ = d.Set("charge_type", storage.DiskChargeType)
 	_ = d.Set("throughput_performance", storage.ThroughputPerformance)
 
+	if storage.KmsKeyId != nil {
+		_ = d.Set("kms_key_id", storage.KmsKeyId)
+	}
+
 	return nil
 }
 

tencentcloud/services/cbs/resource_tc_cbs_storage_set.md

@@ -1,5 +1,7 @@
 Provides a resource to create CBS set.
 
+-> **NOTE:** When creating encrypted disks, if `kms_key_id` is not entered, the product side will generate a key by default.
+
 Example Usage
 
 Create 3 standard CBS storages
@@ -16,6 +18,35 @@ resource "tencentcloud_cbs_storage_set" "example" {
 }
 ```
 
+Create 3 standard CBS storages with customize kms_key_id
+
+```hcl
+resource "tencentcloud_cbs_storage_set" "example" {
+  disk_count        = 3
+  storage_name      = "tf-example"
+  storage_type      = "CLOUD_SSD"
+  storage_size      = 100
+  availability_zone = "ap-guangzhou-3"
+  project_id        = 0
+  kms_key_id        = "b60b328d-7ed5-11ef-8836-5254009ad364"
+  encrypt           = true
+}
+```
+
+Create 3 encrypted CBS storage with default generated kms_key_id
+
+```hcl
+resource "tencentcloud_cbs_storage_set" "example" {
+  disk_count        = 3
+  storage_name      = "tf-example"
+  storage_type      = "CLOUD_SSD"
+  storage_size      = 100
+  availability_zone = "ap-guangzhou-3"
+  project_id        = 0
+  encrypt           = true
+}
+```
+
 Create 3 dedicated cluster CBS storages
 
 ```hcl

website/docs/d/cbs_storages.html.markdown

@@ -39,7 +39,7 @@ data "tencentcloud_cbs_storages" "example" {
 ### The following snippet shows the new supported query params
 
 ```hcl
-data "tencentcloud_cbs_storages" "whats_new" {
+data "tencentcloud_cbs_storages" "example" {
   charge_type   = ["POSTPAID_BY_HOUR", "PREPAID", "CDCPAID", "DEDICATED_CLUSTER_PAID"]
   storage_state = ["ATTACHED"]
   instance_ips  = ["10.0.0.2"]
@@ -82,6 +82,7 @@ In addition to all arguments above, the following attributes are exported:
   * `dedicated_cluster_id` - Exclusive cluster id.
   * `encrypt` - Indicates whether CBS is encrypted.
   * `instance_id` - ID of the CVM instance that be mounted by this CBS.
+  * `kms_key_id` - Kms key ID.
   * `prepaid_renew_flag` - The way that CBS instance will be renew automatically or not when it reach the end of the prepaid tenancy.
   * `project_id` - ID of the project.
   * `status` - Status of CBS.

website/docs/d/cbs_storages_set.html.markdown

@@ -53,6 +53,7 @@ In addition to all arguments above, the following attributes are exported:
   * `dedicated_cluster_id` - Exclusive cluster id.
   * `encrypt` - Indicates whether CBS is encrypted.
   * `instance_id` - ID of the CVM instance that be mounted by this CBS.
+  * `kms_key_id` - Kms key ID.
   * `prepaid_renew_flag` - The way that CBS instance will be renew automatically or not when it reach the end of the prepaid tenancy.
   * `project_id` - ID of the project.
   * `status` - Status of CBS.

website/docs/r/cbs_storage.html.markdown

@@ -11,6 +11,8 @@ description: |-
 
 Provides a resource to create a CBS storage.
 
+-> **NOTE:** When creating an encrypted disk, if `kms_key_id` is not entered, the product side will generate a key by default.
+
 ## Example Usage
 
 ### Create a standard CBS storage
@@ -25,7 +27,42 @@ resource "tencentcloud_cbs_storage" "example" {
   encrypt           = false
 
   tags = {
-    createBy = "terraform"
+    createBy = "Terraform"
+  }
+}
+```
+
+### Create an encrypted CBS storage with customize kms_key_id
+
+```hcl
+resource "tencentcloud_cbs_storage" "example" {
+  storage_name      = "tf-example"
+  storage_type      = "CLOUD_SSD"
+  storage_size      = 100
+  availability_zone = "ap-guangzhou-3"
+  project_id        = 0
+  kms_key_id        = "2e860789-7ef0-11ef-8d1c-5254001955d1"
+  encrypt           = true
+
+  tags = {
+    createBy = "Terraform"
+  }
+}
+```
+
+### Create an encrypted CBS storage with default generated kms_key_id
+
+```hcl
+resource "tencentcloud_cbs_storage" "example" {
+  storage_name      = "tf-example"
+  storage_type      = "CLOUD_SSD"
+  storage_size      = 100
+  availability_zone = "ap-guangzhou-3"
+  project_id        = 0
+  encrypt           = true
+
+  tags = {
+    createBy = "Terraform"
   }
 }
 ```
@@ -44,7 +81,7 @@ resource "tencentcloud_cbs_storage" "example" {
   encrypt              = false
 
   tags = {
-    createBy = "terraform"
+    createBy = "Terraform"
   }
 }
 ```
@@ -60,8 +97,9 @@ The following arguments are supported:
 * `charge_type` - (Optional, String) The charge type of CBS instance. Valid values are `PREPAID`, `POSTPAID_BY_HOUR`, `CDCPAID` and `DEDICATED_CLUSTER_PAID`. The default is `POSTPAID_BY_HOUR`.
 * `dedicated_cluster_id` - (Optional, String, ForceNew) Exclusive cluster id.
 * `disk_backup_quota` - (Optional, Int) The quota of backup points of cloud disk.
-* `encrypt` - (Optional, Bool, ForceNew) Indicates whether CBS is encrypted.
+* `encrypt` - (Optional, Bool, ForceNew) Pass in this parameter to create an encrypted cloud disk.
 * `force_delete` - (Optional, Bool) Indicate whether to delete CBS instance directly or not. Default is false. If set true, the instance will be deleted instead of staying recycle bin.
+* `kms_key_id` - (Optional, String, ForceNew) Optional parameters. When purchasing an encryption disk, customize the key. When this parameter is passed in, the `encrypt` parameter need be set.
 * `period` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.33.0. Set `prepaid_period` instead. The purchased usage period of CBS. Valid values: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36].
 * `prepaid_period` - (Optional, Int) The tenancy (time unit is month) of the prepaid instance, NOTE: it only works when charge_type is set to `PREPAID`. Valid values are 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 24, 36.
 * `prepaid_renew_flag` - (Optional, String) Auto Renewal flag. Value range: `NOTIFY_AND_AUTO_RENEW`: Notify expiry and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: Notify expiry but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: Neither notify expiry nor renew automatically. Default value range: `NOTIFY_AND_MANUAL_RENEW`: Notify expiry but do not renew automatically. NOTE: it only works when charge_type is set to `PREPAID`.

website/docs/r/cbs_storage_set.html.markdown

@@ -11,6 +11,8 @@ description: |-
 
 Provides a resource to create CBS set.
 
+-> **NOTE:** When creating encrypted disks, if `kms_key_id` is not entered, the product side will generate a key by default.
+
 ## Example Usage
 
 ### Create 3 standard CBS storages
@@ -27,6 +29,35 @@ resource "tencentcloud_cbs_storage_set" "example" {
 }
 ```
 
+### Create 3 standard CBS storages with customize kms_key_id
+
+```hcl
+resource "tencentcloud_cbs_storage_set" "example" {
+  disk_count        = 3
+  storage_name      = "tf-example"
+  storage_type      = "CLOUD_SSD"
+  storage_size      = 100
+  availability_zone = "ap-guangzhou-3"
+  project_id        = 0
+  kms_key_id        = "b60b328d-7ed5-11ef-8836-5254009ad364"
+  encrypt           = true
+}
+```
+
+### Create 3 encrypted CBS storage with default generated kms_key_id
+
+```hcl
+resource "tencentcloud_cbs_storage_set" "example" {
+  disk_count        = 3
+  storage_name      = "tf-example"
+  storage_type      = "CLOUD_SSD"
+  storage_size      = 100
+  availability_zone = "ap-guangzhou-3"
+  project_id        = 0
+  encrypt           = true
+}
+```
+
 ### Create 3 dedicated cluster CBS storages
 
 ```hcl
@@ -55,6 +86,7 @@ The following arguments are supported:
 * `dedicated_cluster_id` - (Optional, String, ForceNew) Exclusive cluster id.
 * `disk_count` - (Optional, Int, ForceNew) The number of disks to be purchased. Default 1.
 * `encrypt` - (Optional, Bool, ForceNew) Indicates whether CBS is encrypted.
+* `kms_key_id` - (Optional, String, ForceNew) Optional parameters. When purchasing an encryption disk, customize the key. When this parameter is passed in, the `encrypt` parameter need be set.
 * `project_id` - (Optional, Int) ID of the project to which the instance belongs.
 * `snapshot_id` - (Optional, String) ID of the snapshot. If specified, created the CBS by this snapshot.
 * `throughput_performance` - (Optional, Int) Add extra performance to the data disk. Only works when disk type is `CLOUD_TSSD` or `CLOUD_HSSD`.