update to go-proxmox 0.7.0

app/proxmox.go

@@ -148,8 +148,8 @@ func (host *Node) VirtualMachine(VMID uint) (*Instance, error) {
 	}
 
 	config := vm.VirtualMachineConfig
-	instance.configHostPCIs = config.MergeHostPCIs()
+	instance.configHostPCIs = config.HostPCIs
-	instance.configNets = config.MergeNets()
+	instance.configNets = config.Nets
 	instance.configDisks = MergeVMDisksAndUnused(config)
 	instance.configBoot = config.Boot
 
@@ -158,7 +158,7 @@ func (host *Node) VirtualMachine(VMID uint) (*Instance, error) {
 
 	instance.Name = vm.Name
 	instance.Proctype = vm.VirtualMachineConfig.CPU
-	instance.Cores = SafeUint64(vm.VirtualMachineConfig.Cores)
+	instance.Cores = SafeUint64(*vm.VirtualMachineConfig.Cores)
 	instance.Memory = SafeUint64(int(vm.VirtualMachineConfig.Memory)) * MiB
 	instance.Volumes = make(map[VolumeID]*Volume)
 	instance.Nets = make(map[NetID]*Net)
@@ -169,7 +169,7 @@ func (host *Node) VirtualMachine(VMID uint) (*Instance, error) {
 
 func MergeVMDisksAndUnused(vmc *proxmox.VirtualMachineConfig) map[string]string {
 	mergedDisks := vmc.MergeDisks()
-	for k, v := range vmc.MergeUnuseds() {
+	for k, v := range vmc.Unuseds {
 		mergedDisks[k] = v
 	}
 	return mergedDisks
@@ -198,7 +198,7 @@ func (host *Node) Container(VMID uint) (*Instance, error) {
 
 	config := ct.ContainerConfig
 	instance.configHostPCIs = make(map[string]string)
-	instance.configNets = config.MergeNets()
+	instance.configNets = config.Nets
 	instance.configDisks = MergeCTDisksAndUnused(config)
 
 	instance.pveconfig = config
@@ -206,8 +206,8 @@ func (host *Node) Container(VMID uint) (*Instance, error) {
 
 	instance.Name = ct.Name
 	instance.Cores = SafeUint64(ct.ContainerConfig.Cores)
-	instance.Memory = SafeUint64(ct.ContainerConfig.Memory) * MiB
+	instance.Memory = SafeUint64(*ct.ContainerConfig.Memory) * MiB
-	instance.Swap = SafeUint64(ct.ContainerConfig.Swap) * MiB
+	instance.Swap = SafeUint64(*ct.ContainerConfig.Swap) * MiB
 	instance.Volumes = make(map[VolumeID]*Volume)
 	instance.Nets = make(map[NetID]*Net)
 
@@ -216,10 +216,10 @@ func (host *Node) Container(VMID uint) (*Instance, error) {
 
 func MergeCTDisksAndUnused(cc *proxmox.ContainerConfig) map[string]string {
 	mergedDisks := make(map[string]string)
-	for k, v := range cc.MergeUnuseds() {
+	for k, v := range cc.Unuseds {
 		mergedDisks[k] = v
 	}
-	for k, v := range cc.MergeMps() {
+	for k, v := range cc.Mps {
 		mergedDisks[k] = v
 	}
 	mergedDisks["rootfs"] = cc.RootFS

go.mod

@@ -4,13 +4,14 @@ go 1.26.2
 
 require (
 	github.com/gin-gonic/gin v1.12.0
-	github.com/luthermonson/go-proxmox v0.6.0
+	github.com/luthermonson/go-proxmox v0.7.0
 	proxmoxaas-common-lib v0.0.0
 )
 
 replace proxmoxaas-common-lib => ./proxmoxaas-common-lib
 
 require (
+	github.com/anchore/go-lzo v0.1.0 // indirect
 	github.com/buger/goterm v1.0.4 // indirect
 	github.com/bytedance/gopkg v0.1.4 // indirect
 	github.com/bytedance/sonic v1.15.1 // indirect
@@ -18,16 +19,19 @@ require (
 	github.com/cloudwego/base64x v0.1.7 // indirect
 	github.com/diskfs/go-diskfs v1.9.3 // indirect
 	github.com/djherbis/times v1.6.0 // indirect
+	github.com/elliotwutingfeng/asciiset v0.0.0-20260129054604-cfde2086bc57 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/gin-contrib/sse v1.1.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.30.2 // indirect
+	github.com/go-playground/validator/v10 v10.30.3 // indirect
 	github.com/goccy/go-json v0.10.6 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.18.5 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/magefile/mage v1.17.2 // indirect
@@ -35,10 +39,14 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.3.1 // indirect
+	github.com/pierrec/lz4/v4 v4.1.26 // indirect
+	github.com/pkg/xattr v0.4.12 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/quic-go/quic-go v0.59.1 // indirect
+	github.com/sirupsen/logrus v1.9.4 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.1 // indirect
+	github.com/ulikunitz/xz v0.5.15 // indirect
 	go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect
 	golang.org/x/arch v0.27.0 // indirect
 	golang.org/x/crypto v0.52.0 // indirect