Skip to content

fix: ignore local disk describe status #938

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.

Sign up for GitHub

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
Apr 7, 2022
Merged

fix: ignore local disk describe status #938

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions tencentcloud/resource_tc_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,8 +924,16 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
if len(instance.DataDisks) > 0 {
var diskIds []*string
for i := range instance.DataDisks {
disk := instance.DataDisks[i]
diskIds = append(diskIds, disk.DiskId)
id := instance.DataDisks[i].DiskId
size := instance.DataDisks[i].DiskSize
if id == nil {
continue
}
if strings.HasPrefix(*id, "disk-") {
diskIds = append(diskIds, id)
} else {
diskSizeMap[*id] = helper.Int64Uint64(*size)
}
}
err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
disks, err := cbsService.DescribeDiskList(ctx, diskIds)
Expand All @@ -947,10 +955,14 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
}
for _, disk := range instance.DataDisks {
dataDisk := make(map[string]interface{}, 5)
dataDisk["data_disk_snapshot_id"] = disk.SnapshotId
dataDisk["data_disk_type"] = disk.DiskType
dataDisk["data_disk_size"] = diskSizeMap[*disk.DiskId]
dataDisk["data_disk_id"] = disk.DiskId
if disk.DiskId == nil {
dataDisk["data_disk_size"] = disk.DiskSize
} else if size, ok := diskSizeMap[*disk.DiskId]; ok {
dataDisk["data_disk_size"] = size
}
dataDisk["data_disk_type"] = disk.DiskType
dataDisk["data_disk_snapshot_id"] = disk.SnapshotId
dataDisk["delete_with_instance"] = disk.DeleteWithInstance
dataDisk["encrypt"] = disk.Encrypt
dataDisk["throughput_performance"] = disk.ThroughputPerformance
Expand Down