import node (#2246)

Co-authored-by: alantlliu <alantlliu@tencent.com>

Author: xiaokouliu

.changelog/2246.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+resource/tencentcloud_kubernetes_scale_worker: set up the node and import it into Terraform
+```
+```release-note:bug
+resource/tencentcloud_kubernetes_cluster_attachment: fix the null pointer issue in data_disk
+```

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -924,7 +924,7 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
 			Type:         schema.TypeString,
 			Optional:     true,
 			ForceNew:     true,
-			Default:      CVM_PREPAID_RENEW_FLAG_NOTIFY_AND_MANUAL_RENEW,
+			Computed:     true,
 			ValidateFunc: validateAllowedStringValue(CVM_PREPAID_RENEW_FLAG),
 			Description:  "Auto renewal flag. Valid values: `NOTIFY_AND_AUTO_RENEW`: notify upon expiration and renew automatically, `NOTIFY_AND_MANUAL_RENEW`: notify upon expiration but do not renew automatically, `DISABLE_NOTIFY_AND_MANUAL_RENEW`: neither notify upon expiration nor renew automatically. Default value: `NOTIFY_AND_MANUAL_RENEW`. If this parameter is specified as `NOTIFY_AND_AUTO_RENEW`, the instance will be automatically renewed on a monthly basis if the account balance is sufficient. NOTE: it only works when instance_charge_type is set to `PREPAID`.",
 		},

tencentcloud/resource_tc_kubernetes_cluster_attachment.go

@@ -355,31 +355,37 @@ func tkeGetInstanceAdvancedPara(dMap map[string]interface{}, meta interface{}) (
 	}
 
 	if v, ok := dMap["data_disk"]; ok {
-
 		dataDisks := v.([]interface{})
-		setting.DataDisks = make([]*tke.DataDisk, 0, len(dataDisks))
-
-		for _, d := range dataDisks {
-			var (
-				value              = d.(map[string]interface{})
-				diskType           = value["disk_type"].(string)
-				diskSize           = int64(value["disk_size"].(int))
-				fileSystem         = value["file_system"].(string)
-				autoFormatAndMount = value["auto_format_and_mount"].(bool)
-				mountTarget        = value["mount_target"].(string)
-				diskPartition      = value["disk_partition"].(string)
-				dataDisk           = tke.DataDisk{
-					DiskType:           &diskType,
-					FileSystem:         &fileSystem,
-					AutoFormatAndMount: &autoFormatAndMount,
-					MountTarget:        &mountTarget,
-					DiskPartition:      &diskPartition,
-				}
-			)
+		setting.DataDisks = make([]*tke.DataDisk, len(dataDisks))
+		for i, d := range dataDisks {
+			value := d.(map[string]interface{})
+			var diskType, fileSystem, mountTarget, diskPartition string
+			if v, ok := value["disk_type"].(string); ok {
+				diskType = v
+			}
+			if v, ok := value["file_system"].(string); ok {
+				fileSystem = v
+			}
+			if v, ok := value["mount_target"].(string); ok {
+				mountTarget = v
+			}
+			if v, ok := value["disk_partition"].(string); ok {
+				diskPartition = v
+			}
+
+			diskSize := int64(value["disk_size"].(int))
+			autoFormatAndMount := value["auto_format_and_mount"].(bool)
+			dataDisk := &tke.DataDisk{
+				DiskType:           &diskType,
+				FileSystem:         &fileSystem,
+				AutoFormatAndMount: &autoFormatAndMount,
+				MountTarget:        &mountTarget,
+				DiskPartition:      &diskPartition,
+			}
 			if diskSize > 0 {
 				dataDisk.DiskSize = &diskSize
 			}
-			setting.DataDisks = append(setting.DataDisks, &dataDisk)
+			setting.DataDisks[i] = dataDisk
 		}
 	}
 	if v, ok := dMap["is_schedule"]; ok {