fix(tke): [118647966] fix worker_config.data_disk cannot work (#2769)

* fix(tke): [118647966] fix worker_config.data_disk cannot work

* add changelog and doc

* add e2e test

Author: lyu571

.changelog/2769.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/tencentcloud_kubernetes_scale_worker: fix param `data_disk` of worker_config cannot work
+```

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker.go

@@ -136,7 +136,7 @@ func resourceTencentCloudKubernetesScaleWorkerReadPostRequest1(ctx context.Conte
 					dataDisks = append(dataDisks, disk)
 				}
 				if importFlag1 {
-					_ = d.Set("data_disk", dataDisks)
+					_ = d.Set("data_disk", dataDisks) // out layer data_disk
 				}
 			}
 
@@ -260,7 +260,7 @@ func resourceTencentCloudKubernetesScaleWorkerReadPostRequest2(ctx context.Conte
 			dataDisks = append(dataDisks, dataDisk)
 		}
 
-		mapping["data_disk"] = dataDisks
+		mapping["data_disk"] = dataDisks // worker_config.data_disk
 		instanceList = append(instanceList, mapping)
 	}
 	if importFlag1 {

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_extension.go

@@ -114,7 +114,11 @@ func TestAccTencentCloudKubernetesScaleWorkerResource(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckTkeScaleWorkerExists(testTkeScaleWorkerResourceKey),
 					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "cluster_id"),
+					resource.TestCheckResourceAttr(testTkeScaleWorkerResourceKey, "data_disk.0.file_system", "xfs"),
+					resource.TestCheckResourceAttr(testTkeScaleWorkerResourceKey, "data_disk.0.mount_target", "/data1"),
+					resource.TestCheckResourceAttr(testTkeScaleWorkerResourceKey, "data_disk.0.auto_format_and_mount", "true"),
 					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_config.#"),
+					resource.TestCheckResourceAttr(testTkeScaleWorkerResourceKey, "worker_config.0.data_disk.0.encrypt", "true"),
 					resource.TestCheckResourceAttr(testTkeScaleWorkerResourceKey, "worker_instances_list.#", "1"),
 					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_instances_list.0.instance_id"),
 					resource.TestCheckResourceAttrSet(testTkeScaleWorkerResourceKey, "worker_instances_list.0.instance_role"),
@@ -248,6 +252,14 @@ resource "tencentcloud_kubernetes_scale_worker" "test_scale" {
   pre_start_user_script   = "IyEvYmluL3NoIGVjaG8gImhlbGxvIHdvcmxkIg=="
   user_script   = "IyEvYmluL3NoIGVjaG8gImhlbGxvIHdvcmxkIg=="
 
+  data_disk {
+    disk_type = "CLOUD_PREMIUM"
+    disk_size = 50
+    file_system           = "xfs"
+    mount_target          = "/data1"
+    auto_format_and_mount = true
+  }
+
   worker_config {
     count                      				= 1
     availability_zone          				= "ap-guangzhou-3"
@@ -261,6 +273,7 @@ resource "tencentcloud_kubernetes_scale_worker" "test_scale" {
     data_disk {
       disk_type = "CLOUD_PREMIUM"
       disk_size = 50
+	  encrypt = true
     }
 
     enhanced_security_service 				= false

tencentcloud/services/tke/resource_tc_kubernetes_scale_worker_test.go

@@ -118,7 +118,7 @@ The following arguments are supported:
 
 * `cluster_id` - (Required, String, ForceNew) ID of the cluster.
 * `worker_config` - (Required, List, ForceNew) Deploy the machine configuration information of the 'WORK' service, and create <=20 units for common users.
-* `data_disk` - (Optional, List, ForceNew) Configurations of data disk.
+* `data_disk` - (Optional, List, ForceNew) Configurations of tke data disk.
 * `desired_pod_num` - (Optional, Int, ForceNew) Indicate to set desired pod number in current node. Valid when the cluster enable customized pod cidr.
 * `docker_graph_path` - (Optional, String, ForceNew) Docker graph path. Default is `/var/lib/docker`.
 * `extra_args` - (Optional, List: [`String`], ForceNew) Custom parameter information related to the node.
@@ -131,19 +131,20 @@ The following arguments are supported:
 
 The `data_disk` object of `worker_config` supports the following:
 
-* `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
-* `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount.
+* `auto_format_and_mount` - (Optional, Bool, ForceNew, **Deprecated**) This argument was deprecated, use `data_disk` instead. Indicate whether to auto format and mount or not. Default is `false`.
+* `disk_partition` - (Optional, String, ForceNew, **Deprecated**) This argument was deprecated, use `data_disk` instead. The name of the device or partition to mount.
 * `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
 * `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
 * `encrypt` - (Optional, Bool) Indicates whether to encrypt data disk, default `false`.
-* `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
+* `file_system` - (Optional, String, ForceNew, **Deprecated**) This argument was deprecated, use `data_disk` instead. File system, e.g. `ext3/ext4/xfs`.
 * `kms_key_id` - (Optional, String) ID of the custom CMK in the format of UUID or `kms-abcd1234`. This parameter is used to encrypt cloud disks.
-* `mount_target` - (Optional, String, ForceNew) Mount target.
+* `mount_target` - (Optional, String, ForceNew, **Deprecated**) This argument was deprecated, use `data_disk` instead. Mount target.
 * `snapshot_id` - (Optional, String, ForceNew) Data disk snapshot ID.
 
 The `data_disk` object supports the following:
 
 * `auto_format_and_mount` - (Optional, Bool, ForceNew) Indicate whether to auto format and mount or not. Default is `false`.
+* `disk_partition` - (Optional, String, ForceNew) The name of the device or partition to mount.
 * `disk_size` - (Optional, Int, ForceNew) Volume of disk in GB. Default is `0`.
 * `disk_type` - (Optional, String, ForceNew) Types of disk, available values: `CLOUD_PREMIUM` and `CLOUD_SSD` and `CLOUD_HSSD` and `CLOUD_TSSD`.
 * `file_system` - (Optional, String, ForceNew) File system, e.g. `ext3/ext4/xfs`.
@@ -165,7 +166,7 @@ The `worker_config` object supports the following:
 * `bandwidth_package_id` - (Optional, String) bandwidth package id. if user is standard user, then the bandwidth_package_id is needed, or default has bandwidth_package_id.
 * `cam_role_name` - (Optional, String, ForceNew) CAM role name authorized to access.
 * `count` - (Optional, Int, ForceNew) Number of cvm.
-* `data_disk` - (Optional, List, ForceNew) Configurations of data disk.
+* `data_disk` - (Optional, List, ForceNew) Configurations of cvm data disk.
 * `desired_pod_num` - (Optional, Int, ForceNew) Indicate to set desired pod number in node. valid when enable_customized_pod_cidr=true, and it override `[globe_]desired_pod_num` for current node. Either all the fields `desired_pod_num` or none.
 * `disaster_recover_group_ids` - (Optional, List, ForceNew) Disaster recover groups to which a CVM instance belongs. Only support maximum 1.
 * `enhanced_monitor_service` - (Optional, Bool, ForceNew) To specify whether to enable cloud monitor service. Default is TRUE.