From 80d0615c7c549c077bd7ea30ce7e25cbf97fbcb7 Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 3 Jan 2025 19:22:55 +0800 Subject: [PATCH 1/3] update read --- tencentcloud/services/emr/extension_emr.go | 21 ++- .../services/emr/resource_tc_emr_cluster.go | 166 ++++++------------ 2 files changed, 68 insertions(+), 119 deletions(-) diff --git a/tencentcloud/services/emr/extension_emr.go b/tencentcloud/services/emr/extension_emr.go index 087d01af67..d80be75610 100644 --- a/tencentcloud/services/emr/extension_emr.go +++ b/tencentcloud/services/emr/extension_emr.go @@ -228,6 +228,17 @@ func validateMultiDisks(r map[string]interface{}) error { return nil } +func translateDiskType(diskType int64) (diskTypeStr string) { + switch diskType { + case 4: + diskTypeStr = "CLOUD_SSD" + case 5: + diskTypeStr = "CLOUD_PREMIUM" + case 6: + diskTypeStr = "CLOUD_HSSD" + } + return +} func fetchMultiDisks(v *emr.NodeHardwareInfo, r *emr.OutterResource) (multiDisks []interface{}) { var inputDataDiskTag string if r.DiskType != nil && r.DiskSize != nil { @@ -238,15 +249,7 @@ func fetchMultiDisks(v *emr.NodeHardwareInfo, r *emr.OutterResource) (multiDisks multiDisk := make(map[string]interface{}) if item.Type != nil { var diskType string - if *item.Type == 4 { - diskType = "CLOUD_SSD" - } - if *item.Type == 5 { - diskType = "CLOUD_PREMIUM" - } - if *item.Type == 6 { - diskType = "CLOUD_HSSD" - } + diskType = translateDiskType(*item.Type) multiDisk["disk_type"] = diskType outputDataDiskTag = diskType } diff --git a/tencentcloud/services/emr/resource_tc_emr_cluster.go b/tencentcloud/services/emr/resource_tc_emr_cluster.go index 5d44ae9940..8a242359cb 100644 --- a/tencentcloud/services/emr/resource_tc_emr_cluster.go +++ b/tencentcloud/services/emr/resource_tc_emr_cluster.go @@ -598,6 +598,7 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} _ = d.Set("instance_id", instanceId) clusterNodeMap := make(map[string]*emr.NodeHardwareInfo) + clusterNodeNum := make(map[string]int) err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, err := emrService.DescribeClusterNodes(ctx, instanceId, "all", "all", 0, 10) @@ -611,8 +612,16 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} node := item // 节点类型 0:common节点；1:master节点；2:core节点；3:task节点 if node.Flag != nil { - clusterNodeMap[strconv.FormatInt(*node.Flag, 10)] = node + nodeFlag := strconv.FormatInt(*node.Flag, 10) + clusterNodeMap[nodeFlag] = node + if v, ok := clusterNodeNum[nodeFlag]; ok { + clusterNodeNum[nodeFlag] = v + 1 + } else { + clusterNodeNum[nodeFlag] = 1 + } + } + } } @@ -646,144 +655,81 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} } resourceSpec := make(map[string]interface{}) - var masterCount int64 - if instance.Config.MasterNodeSize != nil { - masterCount = *instance.Config.MasterNodeSize - resourceSpec["master_count"] = masterCount + if v, ok := clusterNodeNum["1"]; ok { + resourceSpec["master_count"] = v } - if masterCount != 0 && instance.Config.MasterResource != nil { - masterResource := instance.Config.MasterResource + + if v, ok := clusterNodeMap["1"]; ok && v != nil { masterResourceSpec := make(map[string]interface{}) - if masterResource.MemSize != nil { - masterResourceSpec["mem_size"] = *masterResource.MemSize - } - if masterResource.Cpu != nil { - masterResourceSpec["cpu"] = *masterResource.Cpu - } - if masterResource.DiskSize != nil { + masterResourceSpec["mem_size"] = int(*v.MemSize / 1024 / 1024) + masterResourceSpec["cpu"] = v.CpuNum + if instance.Config.MasterResource != nil { + masterResource := instance.Config.MasterResource masterResourceSpec["disk_size"] = *masterResource.DiskSize - } - if masterResource.DiskType != nil { - masterResourceSpec["disk_type"] = *masterResource.DiskType - } - if masterResource.Spec != nil { - masterResourceSpec["spec"] = *masterResource.Spec - } - if masterResource.StorageType != nil { - masterResourceSpec["storage_type"] = *masterResource.StorageType - } - if masterResource.RootSize != nil { - masterResourceSpec["root_size"] = *masterResource.RootSize - } - if v, ok := clusterNodeMap["1"]; ok { masterResourceSpec["multi_disks"] = fetchMultiDisks(v, masterResource) + } + masterResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + masterResourceSpec["spec"] = v.Spec + masterResourceSpec["storage_type"] = v.RootStorageType + masterResourceSpec["root_size"] = v.RootSize resourceSpec["master_resource_spec"] = []interface{}{masterResourceSpec} } - var coreCount int64 - if instance.Config.CoreNodeSize != nil { - coreCount = *instance.Config.CoreNodeSize - resourceSpec["core_count"] = coreCount + if v, ok := clusterNodeNum["2"]; ok { + resourceSpec["core_count"] = v } - if coreCount != 0 && instance.Config.CoreResource != nil { - coreResource := instance.Config.CoreResource + if v, ok := clusterNodeMap["2"]; ok && v != nil { coreResourceSpec := make(map[string]interface{}) - if coreResource.MemSize != nil { - coreResourceSpec["mem_size"] = *coreResource.MemSize - } - if coreResource.Cpu != nil { - coreResourceSpec["cpu"] = *coreResource.Cpu - } - if coreResource.DiskSize != nil { + coreResourceSpec["mem_size"] = int(*v.MemSize / 1024 / 1024) + coreResourceSpec["cpu"] = v.CpuNum + if instance.Config.CoreResource != nil { + coreResource := instance.Config.CoreResource coreResourceSpec["disk_size"] = *coreResource.DiskSize - } - if coreResource.DiskType != nil { - coreResourceSpec["disk_type"] = *coreResource.DiskType - } - if coreResource.Spec != nil { - coreResourceSpec["spec"] = *coreResource.Spec - } - if coreResource.StorageType != nil { - coreResourceSpec["storage_type"] = *coreResource.StorageType - } - if coreResource.RootSize != nil { - coreResourceSpec["root_size"] = *coreResource.RootSize - } - if v, ok := clusterNodeMap["2"]; ok { coreResourceSpec["multi_disks"] = fetchMultiDisks(v, coreResource) } - + coreResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + coreResourceSpec["spec"] = v.Spec + coreResourceSpec["storage_type"] = v.RootStorageType + coreResourceSpec["root_size"] = v.RootSize resourceSpec["core_resource_spec"] = []interface{}{coreResourceSpec} } - var taskCount int64 - if instance.Config.TaskNodeSize != nil { - taskCount = *instance.Config.TaskNodeSize - resourceSpec["task_count"] = taskCount + if v, ok := clusterNodeNum["3"]; ok { + resourceSpec["task_count"] = v } - if taskCount != 0 && instance.Config.TaskResource != nil { - taskResource := instance.Config.TaskResource + if v, ok := clusterNodeMap["3"]; ok && v != nil { taskResourceSpec := make(map[string]interface{}) - if taskResource.MemSize != nil { - taskResourceSpec["mem_size"] = *taskResource.MemSize - } - if taskResource.Cpu != nil { - taskResourceSpec["cpu"] = *taskResource.Cpu - } - if taskResource.DiskSize != nil { + taskResourceSpec["mem_size"] = int(*v.MemSize / 1024 / 1024) + taskResourceSpec["cpu"] = v.CpuNum + if instance.Config.TaskResource != nil { + taskResource := instance.Config.TaskResource taskResourceSpec["disk_size"] = *taskResource.DiskSize - } - if taskResource.DiskType != nil { - taskResourceSpec["disk_type"] = *taskResource.DiskType - } - if taskResource.Spec != nil { - taskResourceSpec["spec"] = *taskResource.Spec - } - if taskResource.StorageType != nil { - taskResourceSpec["storage_type"] = *taskResource.StorageType - } - if taskResource.RootSize != nil { - taskResourceSpec["root_size"] = *taskResource.RootSize - } - if v, ok := clusterNodeMap["3"]; ok { taskResourceSpec["multi_disks"] = fetchMultiDisks(v, taskResource) } + taskResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + taskResourceSpec["spec"] = v.Spec + taskResourceSpec["storage_type"] = v.RootStorageType + taskResourceSpec["root_size"] = v.RootSize resourceSpec["task_resource_spec"] = []interface{}{taskResourceSpec} } - var commonCount int64 - if instance.Config.ComNodeSize != nil { - commonCount = *instance.Config.ComNodeSize - resourceSpec["common_count"] = commonCount + if v, ok := clusterNodeNum["0"]; ok { + resourceSpec["common_count"] = v } - if commonCount != 0 && instance.Config.ComResource != nil { - comResource := instance.Config.ComResource + if v, ok := clusterNodeMap["0"]; ok && v != nil { comResourceSpec := make(map[string]interface{}) - if comResource.MemSize != nil { - comResourceSpec["mem_size"] = *comResource.MemSize - } - if comResource.Cpu != nil { - comResourceSpec["cpu"] = *comResource.Cpu - } - if comResource.DiskSize != nil { + comResourceSpec["mem_size"] = int(*v.MemSize / 1024 / 1024) + comResourceSpec["cpu"] = v.CpuNum + if instance.Config.ComResource != nil { + comResource := instance.Config.ComResource comResourceSpec["disk_size"] = *comResource.DiskSize - } - if comResource.DiskType != nil { - comResourceSpec["disk_type"] = *comResource.DiskType - } - if comResource.Spec != nil { - comResourceSpec["spec"] = *comResource.Spec - } - if comResource.StorageType != nil { - comResourceSpec["storage_type"] = *comResource.StorageType - } - if comResource.RootSize != nil { - comResourceSpec["root_size"] = *comResource.RootSize - } - if v, ok := clusterNodeMap["0"]; ok { comResourceSpec["multi_disks"] = fetchMultiDisks(v, comResource) } + comResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + comResourceSpec["spec"] = v.Spec + comResourceSpec["storage_type"] = v.RootStorageType + comResourceSpec["root_size"] = v.RootSize resourceSpec["common_resource_spec"] = []interface{}{comResourceSpec} } From f0ce3edd81decebdf4a8fecc2b984038b11a2a5e Mon Sep 17 00:00:00 2001 From: mikatong Date: Fri, 3 Jan 2025 19:25:25 +0800 Subject: [PATCH 2/3] add changelog --- .changelog/3054.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/3054.txt diff --git a/.changelog/3054.txt b/.changelog/3054.txt new file mode 100644 index 0000000000..efaea33a9a --- /dev/null +++ b/.changelog/3054.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_emr_cluster: update read +``` From 07339d656cf1c8a90c6a08a6ae726c6c63b317d5 Mon Sep 17 00:00:00 2001 From: mikatong Date: Wed, 8 Jan 2025 14:31:02 +0800 Subject: [PATCH 3/3] update --- .../services/emr/resource_tc_emr_cluster.go | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tencentcloud/services/emr/resource_tc_emr_cluster.go b/tencentcloud/services/emr/resource_tc_emr_cluster.go index 8a242359cb..d36a878524 100644 --- a/tencentcloud/services/emr/resource_tc_emr_cluster.go +++ b/tencentcloud/services/emr/resource_tc_emr_cluster.go @@ -665,11 +665,13 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} masterResourceSpec["cpu"] = v.CpuNum if instance.Config.MasterResource != nil { masterResource := instance.Config.MasterResource - masterResourceSpec["disk_size"] = *masterResource.DiskSize + masterResourceSpec["disk_size"] = masterResource.DiskSize masterResourceSpec["multi_disks"] = fetchMultiDisks(v, masterResource) } - masterResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + if v.StorageType != nil { + masterResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + } masterResourceSpec["spec"] = v.Spec masterResourceSpec["storage_type"] = v.RootStorageType masterResourceSpec["root_size"] = v.RootSize @@ -685,10 +687,12 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} coreResourceSpec["cpu"] = v.CpuNum if instance.Config.CoreResource != nil { coreResource := instance.Config.CoreResource - coreResourceSpec["disk_size"] = *coreResource.DiskSize + coreResourceSpec["disk_size"] = coreResource.DiskSize coreResourceSpec["multi_disks"] = fetchMultiDisks(v, coreResource) } - coreResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + if v.StorageType != nil { + coreResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + } coreResourceSpec["spec"] = v.Spec coreResourceSpec["storage_type"] = v.RootStorageType coreResourceSpec["root_size"] = v.RootSize @@ -704,10 +708,12 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} taskResourceSpec["cpu"] = v.CpuNum if instance.Config.TaskResource != nil { taskResource := instance.Config.TaskResource - taskResourceSpec["disk_size"] = *taskResource.DiskSize + taskResourceSpec["disk_size"] = taskResource.DiskSize taskResourceSpec["multi_disks"] = fetchMultiDisks(v, taskResource) } - taskResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + if v.StorageType != nil { + taskResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + } taskResourceSpec["spec"] = v.Spec taskResourceSpec["storage_type"] = v.RootStorageType taskResourceSpec["root_size"] = v.RootSize @@ -723,10 +729,12 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{} comResourceSpec["cpu"] = v.CpuNum if instance.Config.ComResource != nil { comResource := instance.Config.ComResource - comResourceSpec["disk_size"] = *comResource.DiskSize + comResourceSpec["disk_size"] = comResource.DiskSize comResourceSpec["multi_disks"] = fetchMultiDisks(v, comResource) } - comResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + if v.StorageType != nil { + comResourceSpec["disk_type"] = translateDiskType(*v.StorageType) + } comResourceSpec["spec"] = v.Spec comResourceSpec["storage_type"] = v.RootStorageType comResourceSpec["root_size"] = v.RootSize