Skip to content
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

Jump to bottom

Fix Invalid address to set for hostpci configuration #1070

Merged
merged 2 commits into from
Aug 15, 2024
+11 −5
Merged

Fix Invalid address to set for hostpci configuration #1070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96af623
Handle 'id' for hostpci config
lucian-tx Aug 7, 2024
cf1e2e6
Merge branch 'master' into hostpci-patch
lucian-tx Aug 8, 2024
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
16 changes: 11 additions & 5 deletions proxmox/resource_vm_qemu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ import (
"time"

pxapi "github.com/Telmate/proxmox-api-go/proxmox"
"github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/pxapi/dns/nameservers"
"github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/pxapi/guest/sshkeys"
"github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/pxapi/guest/tags"

"github.com/google/uuid"
"github.com/hashicorp/go-cty/cty"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"

"github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/pxapi/dns/nameservers"
"github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/pxapi/guest/sshkeys"
"github.com/Telmate/terraform-provider-proxmox/v2/proxmox/Internal/pxapi/guest/tags"
)

// using a global variable here so that we have an internally accessible
Expand Down Expand Up @@ -1469,10 +1471,14 @@ func resourceVmQemuRead(ctx context.Context, d *schema.ResourceData, meta interf
d.Set("full_clone", d.Get("full_clone"))

// read in the qemu hostpci
qemuPCIDevices, _ := FlattenDevicesList(config.QemuPCIDevices)
qemuPCIDevices, err := FlattenDevicesList(config.QemuPCIDevices)
if err != nil {
return diag.FromErr(fmt.Errorf("unable to flatten QEMU PCI devices: %w", err))
}
qemuPCIDevices, _ = DropElementsFromMap([]string{"id"}, qemuPCIDevices)
logger.Debug().Int("vmid", vmID).Msgf("Hostpci Block Processed '%v'", config.QemuPCIDevices)
if err = d.Set("hostpci", qemuPCIDevices); err != nil {
return diag.FromErr(err)
return diag.FromErr(fmt.Errorf("unable to set hostpci: %w", err))
}

// read in the qemu hostpci
Expand Down
Loading