Skip to content

Commit 07339d6

Browse files
author
mikatong
committed
update
1 parent f0ce3ed commit 07339d6

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

tencentcloud/services/emr/resource_tc_emr_cluster.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,13 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{}
665665
masterResourceSpec["cpu"] = v.CpuNum
666666
if instance.Config.MasterResource != nil {
667667
masterResource := instance.Config.MasterResource
668-
masterResourceSpec["disk_size"] = *masterResource.DiskSize
668+
masterResourceSpec["disk_size"] = masterResource.DiskSize
669669
masterResourceSpec["multi_disks"] = fetchMultiDisks(v, masterResource)
670670

671671
}
672-
masterResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
672+
if v.StorageType != nil {
673+
masterResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
674+
}
673675
masterResourceSpec["spec"] = v.Spec
674676
masterResourceSpec["storage_type"] = v.RootStorageType
675677
masterResourceSpec["root_size"] = v.RootSize
@@ -685,10 +687,12 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{}
685687
coreResourceSpec["cpu"] = v.CpuNum
686688
if instance.Config.CoreResource != nil {
687689
coreResource := instance.Config.CoreResource
688-
coreResourceSpec["disk_size"] = *coreResource.DiskSize
690+
coreResourceSpec["disk_size"] = coreResource.DiskSize
689691
coreResourceSpec["multi_disks"] = fetchMultiDisks(v, coreResource)
690692
}
691-
coreResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
693+
if v.StorageType != nil {
694+
coreResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
695+
}
692696
coreResourceSpec["spec"] = v.Spec
693697
coreResourceSpec["storage_type"] = v.RootStorageType
694698
coreResourceSpec["root_size"] = v.RootSize
@@ -704,10 +708,12 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{}
704708
taskResourceSpec["cpu"] = v.CpuNum
705709
if instance.Config.TaskResource != nil {
706710
taskResource := instance.Config.TaskResource
707-
taskResourceSpec["disk_size"] = *taskResource.DiskSize
711+
taskResourceSpec["disk_size"] = taskResource.DiskSize
708712
taskResourceSpec["multi_disks"] = fetchMultiDisks(v, taskResource)
709713
}
710-
taskResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
714+
if v.StorageType != nil {
715+
taskResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
716+
}
711717
taskResourceSpec["spec"] = v.Spec
712718
taskResourceSpec["storage_type"] = v.RootStorageType
713719
taskResourceSpec["root_size"] = v.RootSize
@@ -723,10 +729,12 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{}
723729
comResourceSpec["cpu"] = v.CpuNum
724730
if instance.Config.ComResource != nil {
725731
comResource := instance.Config.ComResource
726-
comResourceSpec["disk_size"] = *comResource.DiskSize
732+
comResourceSpec["disk_size"] = comResource.DiskSize
727733
comResourceSpec["multi_disks"] = fetchMultiDisks(v, comResource)
728734
}
729-
comResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
735+
if v.StorageType != nil {
736+
comResourceSpec["disk_type"] = translateDiskType(*v.StorageType)
737+
}
730738
comResourceSpec["spec"] = v.Spec
731739
comResourceSpec["storage_type"] = v.RootStorageType
732740
comResourceSpec["root_size"] = v.RootSize

0 commit comments

Comments
 (0)