Skip to content

fix(cvm): [123456789] tencentcloud_instance update code #3033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 48 additions & 3 deletions tencentcloud/services/cvm/resource_tc_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -1010,27 +1010,68 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
}

// set data_disks
var hasDataDisks, isCombineDataDisks, hasDataDisksName bool
var hasDataDisks, isCombineDataDisks, hasDataDisksId, hasDataDisksName bool
dataDiskList := make([]map[string]interface{}, 0, len(instance.DataDisks))
diskSizeMap := map[string]*uint64{}
diskOrderMap := make(map[string]int)
dataDiskIds := make([]*string, 0, len(instance.DataDisks))
refreshDataDisks := make([]interface{}, 0, len(instance.DataDisks))

if v, ok := d.GetOk("data_disks"); ok {
hasDataDisks = true
// check has data disk name
// check has data disk id and name
dataDisks := v.([]interface{})
for _, item := range dataDisks {
value := item.(map[string]interface{})
if v, ok := value["data_disk_id"]; ok && v != nil {
diskId := v.(string)
if diskId != "" {
dataDiskIds = append(dataDiskIds, &diskId)
hasDataDisksId = true
}
}

if v, ok := value["data_disk_name"]; ok && v != nil {
diskName := v.(string)
if diskName != "" {
hasDataDisksName = true
break
}
}
}
}

// refresh data disk name and size
if hasDataDisksId && len(dataDiskIds) > 0 {
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
disks, err := cbsService.DescribeDiskList(ctx, dataDiskIds)
if err != nil {
return resource.NonRetryableError(err)
}

if v, ok := d.GetOk("data_disks"); ok {
dataDisks := v.([]interface{})
for _, item := range dataDisks {
value := item.(map[string]interface{})
for _, item := range disks {
if value["data_disk_id"].(string) == *item.DiskId {
value["data_disk_name"] = *item.DiskName
value["data_disk_size"] = int(*item.DiskSize)
break
}
}
}

refreshDataDisks = dataDisks
}

return nil
})

if err != nil {
return err
}
}

// scene with has disks name
if len(instance.DataDisks) > 0 && !hasDataDisksName {
var diskIds []*string
Expand Down Expand Up @@ -1162,6 +1203,10 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
// get source disk hash
if v, ok := d.GetOk("data_disks"); ok {
dataDisks := v.([]interface{})
if hasDataDisksId {
dataDisks = refreshDataDisks
}

for index, item := range dataDisks {
value := item.(map[string]interface{})
tmpMap := make(map[string]interface{})
Expand Down
Loading