Skip to content

Commit 34d3926

Browse files
sergelogvinovsergelogvinov
committed
refactor: optimization
This helps reduce unnecessary API calls. Signed-off-by: Serge Logvinov <serge.logvinov@sinextra.dev>
1 parent 62d0bb8 commit 34d3926

File tree

5 files changed

+40
-82
lines changed

5 files changed

+40
-82
lines changed

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ go 1.25.5
77

88
require (
99
github.com/jarcoal/httpmock v1.4.1
10-
github.com/luthermonson/go-proxmox v0.2.4
10+
github.com/luthermonson/go-proxmox v0.3.1
1111
github.com/pkg/errors v0.9.1
1212
github.com/samber/lo v1.52.0
13-
github.com/sergelogvinov/go-proxmox v0.0.0-20251223092621-b2408158419a
13+
github.com/sergelogvinov/go-proxmox v0.0.0-20260103033434-f1b40a5b6d05
1414
github.com/spf13/pflag v1.0.10
1515
github.com/stretchr/testify v1.11.1
1616
go.uber.org/multierr v1.11.0
@@ -24,7 +24,7 @@ require (
2424
)
2525

2626
require (
27-
cel.dev/expr v0.24.0 // indirect
27+
cel.dev/expr v0.25.1 // indirect
2828
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2929
github.com/NYTimes/gziphandler v1.1.1 // indirect
3030
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/google/uuid v1.6.0 // indirect
5858
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5959
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
60-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
60+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
6161
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6262
github.com/jinzhu/copier v0.4.0 // indirect
6363
github.com/josharian/intern v1.0.0 // indirect
@@ -81,7 +81,7 @@ require (
8181
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
8282
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
8383
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
84-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
84+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
8585
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
8686
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
8787
go.opentelemetry.io/otel v1.38.0 // indirect
@@ -103,10 +103,10 @@ require (
103103
golang.org/x/term v0.38.0 // indirect
104104
golang.org/x/text v0.32.0 // indirect
105105
golang.org/x/time v0.14.0 // indirect
106-
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 // indirect
107-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
108-
google.golang.org/grpc v1.76.0 // indirect
109-
google.golang.org/protobuf v1.36.10 // indirect
106+
google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
107+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
108+
google.golang.org/grpc v1.78.0 // indirect
109+
google.golang.org/protobuf v1.36.11 // indirect
110110
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
111111
gopkg.in/inf.v0 v0.9.1 // indirect
112112
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

‎go.sum‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
2-
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
1+
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
2+
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
33
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
44
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
55
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
@@ -93,8 +93,8 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/E
9393
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
9494
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
9595
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
96-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
97-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
96+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 h1:kEISI/Gx67NzH3nJxAmY/dGac80kKZgZt134u7Y/k1s=
97+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4/go.mod h1:6Nz966r3vQYCqIzWsuEl9d7cf7mRhtDmm++sOxlnfxI=
9898
github.com/h2non/gock v1.2.0 h1:K6ol8rfrRkUOefooBC8elXoaNGYkpp7y2qcxGG6BzUE=
9999
github.com/h2non/gock v1.2.0/go.mod h1:tNhoxHYW2W42cYkYb1WqzdbYIieALC99kpYr7rH/BQk=
100100
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
@@ -121,8 +121,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
121121
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
122122
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
123123
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
124-
github.com/luthermonson/go-proxmox v0.2.4 h1:XQ6YNUTVvHS7N4EJxWpuqWLW2s1VPtsIblxLV/rGHLw=
125-
github.com/luthermonson/go-proxmox v0.2.4/go.mod h1:oyFgg2WwTEIF0rP6ppjiixOHa5ebK1p8OaRiFhvICBQ=
124+
github.com/luthermonson/go-proxmox v0.3.1 h1:h64s4/zIEQ06TBo0phFKcckV441YpvUPgLfRAptYsjY=
125+
github.com/luthermonson/go-proxmox v0.3.1/go.mod h1:oyFgg2WwTEIF0rP6ppjiixOHa5ebK1p8OaRiFhvICBQ=
126126
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
127127
github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
128128
github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
@@ -162,13 +162,15 @@ github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+L
162162
github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
163163
github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
164164
github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
165-
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
166-
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
165+
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
166+
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
167167
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
168168
github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
169169
github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
170-
github.com/sergelogvinov/go-proxmox v0.0.0-20251223092621-b2408158419a h1:XuNC1nQH9VJ+LUau4fnMjIbOv+9AiKPXNumR8nrXIvg=
171-
github.com/sergelogvinov/go-proxmox v0.0.0-20251223092621-b2408158419a/go.mod h1:AO+Yjxw7jBqTXThO1UTDqwqFwx6moyrRjpSqisNBP98=
170+
github.com/sergelogvinov/go-proxmox v0.0.0-20260102042734-3efde9166fb0 h1:5+4F3J70O0SqZapUnhkNryZMKppvvZortjB78J1jEcY=
171+
github.com/sergelogvinov/go-proxmox v0.0.0-20260102042734-3efde9166fb0/go.mod h1:3v8baTO3uoOuFKEWhYVjrh6ptEUQiAH/eHOYR06nDcU=
172+
github.com/sergelogvinov/go-proxmox v0.0.0-20260103033434-f1b40a5b6d05 h1:hI4H8oJnLnbYvAf64EJ21w/jhFsbDCY7zekuUEo6FYg=
173+
github.com/sergelogvinov/go-proxmox v0.0.0-20260103033434-f1b40a5b6d05/go.mod h1:3v8baTO3uoOuFKEWhYVjrh6ptEUQiAH/eHOYR06nDcU=
172174
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0=
173175
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
174176
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
@@ -215,8 +217,8 @@ go.etcd.io/etcd/server/v3 v3.6.4 h1:LsCA7CzjVt+8WGrdsnh6RhC0XqCsLkBly3ve5rTxMAU=
215217
go.etcd.io/etcd/server/v3 v3.6.4/go.mod h1:aYCL/h43yiONOv0QIR82kH/2xZ7m+IWYjzRmyQfnCAg=
216218
go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=
217219
go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=
218-
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
219-
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
220+
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
221+
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
220222
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 h1:YH4g8lQroajqUwWbq/tr2QX1JFmEXaDLgG+ew9bLMWo=
221223
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
222224
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
@@ -297,14 +299,14 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
297299
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
298300
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
299301
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
300-
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 h1:vk5TfqZHNn0obhPIYeS+cxIFKFQgser/M2jnI+9c6MM=
301-
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101/go.mod h1:E17fc4PDhkr22dE3RgnH2hEubUaky6ZwW4VhANxyspg=
302-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 h1:tRPGkdGHuewF4UisLzzHHr1spKw92qLM98nIzxbC0wY=
303-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
304-
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
305-
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
306-
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
307-
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
302+
google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b h1:uA40e2M6fYRBf0+8uN5mLlqUtV192iiksiICIBkYJ1E=
303+
google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:Xa7le7qx2vmqB/SzWUBa7KdMjpdpAHlh5QCSnjessQk=
304+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU=
305+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
306+
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
307+
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
308+
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
309+
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
308310
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
309311
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
310312
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎pkg/proxmox/instance_addresses.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,7 @@ func (i *instances) getInstanceNics(ctx context.Context, info *instanceInfo) ([]
172172
return result, err
173173
}
174174

175-
node, err := px.Node(ctx, info.Node)
176-
if err != nil {
177-
return nil, err
178-
}
179-
180-
vm, err := node.VirtualMachine(ctx, info.ID)
175+
vm, err := px.GetVMConfig(ctx, info.ID)
181176
if err != nil {
182177
return nil, err
183178
}

‎pkg/proxmox/instances.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ func (i *instances) getInstanceInfo(ctx context.Context, node *v1.Node) (*instan
353353

354354
info := &instanceInfo{
355355
ID: vmID,
356-
UUID: i.c.pxpool.GetVMUUID(vm),
356+
UUID: goproxmox.GetVMUUID(vm),
357357
Name: vm.Name,
358358
Node: vm.Node,
359359
Region: region,
@@ -372,7 +372,7 @@ func (i *instances) getInstanceInfo(ctx context.Context, node *v1.Node) (*instan
372372
return nil, cloudprovider.InstanceNotFound
373373
}
374374

375-
info.Type = i.c.pxpool.GetVMSKU(vm)
375+
info.Type = goproxmox.GetVMSKU(vm)
376376
if !instanceTypeNameRegexp.MatchString(info.Type) {
377377
info.Type = fmt.Sprintf("%dVCPU-%dGB", vm.CPUs, vm.MaxMem/1024/1024/1024)
378378
}

‎pkg/proxmoxpool/pool.go‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ package proxmoxpool
2020
import (
2121
"context"
2222
"crypto/tls"
23-
"encoding/base64"
2423
"errors"
2524
"fmt"
2625
"net/http"
@@ -138,13 +137,10 @@ func (c *ProxmoxPool) CheckClusters(ctx context.Context) error {
138137
return fmt.Errorf("failed to initialized proxmox client in region %s, error: %v", region, err)
139138
}
140139

141-
pxCluster, err := pxClient.Cluster(ctx)
142-
if err != nil {
143-
return fmt.Errorf("failed to get cluster info in region %s, error: %v", region, err)
144-
}
140+
cluster := (&proxmox.Cluster{}).New(pxClient.Client)
145141

146142
// Check if we can have permission to list VMs
147-
vms, err := pxCluster.Resources(ctx, "vm")
143+
vms, err := cluster.Resources(ctx, "vm")
148144
if err != nil {
149145
return fmt.Errorf("failed to get list of VMs in region %s, error: %v", region, err)
150146
}
@@ -248,22 +244,12 @@ func (c *ProxmoxPool) FindVMByNode(ctx context.Context, node *v1.Node) (vmID int
248244
return false, nil //nolint: nilerr
249245
}
250246

251-
pxnode, err := px.Client.Node(ctx, rs.Node)
252-
if err != nil {
253-
errs = multierr.Append(errs, fmt.Errorf("region %s node %s: %v: %w", region, rs.Node, err, ErrNodeInaccessible))
254-
255-
return false, nil //nolint: nilerr
256-
}
257-
258-
vm, err := pxnode.VirtualMachine(ctx, int(rs.VMID))
247+
vm, err := px.GetVMConfig(ctx, int(rs.VMID))
259248
if err != nil {
260249
return false, err
261250
}
262251

263-
smbios1 := goproxmox.VMSMBIOS{}
264-
smbios1.UnmarshalString(vm.VirtualMachineConfig.SMBios1) //nolint:errcheck
265-
266-
if smbios1.UUID == node.Status.NodeInfo.SystemUUID {
252+
if goproxmox.GetVMUUID(vm) == node.Status.NodeInfo.SystemUUID {
267253
return true, nil
268254
}
269255

@@ -307,19 +293,12 @@ func (c *ProxmoxPool) FindVMByUUID(ctx context.Context, uuid string) (vmID int,
307293
return false, nil //nolint: nilerr
308294
}
309295

310-
pxnode, err := px.Client.Node(ctx, rs.Node)
311-
if err != nil {
312-
errs = multierr.Append(errs, fmt.Errorf("region %s node %s: %v: %w", region, rs.Node, err, ErrNodeInaccessible))
313-
314-
return false, nil //nolint: nilerr
315-
}
316-
317-
vm, err := pxnode.VirtualMachine(ctx, int(rs.VMID))
296+
vm, err := px.GetVMConfig(ctx, int(rs.VMID))
318297
if err != nil {
319298
return false, err
320299
}
321300

322-
if c.GetVMUUID(vm) == uuid {
301+
if goproxmox.GetVMUUID(vm) == uuid {
323302
return true, nil
324303
}
325304

@@ -343,24 +322,6 @@ func (c *ProxmoxPool) FindVMByUUID(ctx context.Context, uuid string) (vmID int,
343322
return 0, "", ErrInstanceNotFound
344323
}
345324

346-
// GetVMUUID returns the VM UUID.
347-
func (c *ProxmoxPool) GetVMUUID(vm *proxmox.VirtualMachine) string {
348-
smbios1 := goproxmox.VMSMBIOS{}
349-
smbios1.UnmarshalString(vm.VirtualMachineConfig.SMBios1) //nolint:errcheck
350-
351-
return smbios1.UUID
352-
}
353-
354-
// GetVMSKU returns the VM instance type name.
355-
func (c *ProxmoxPool) GetVMSKU(vm *proxmox.VirtualMachine) string {
356-
smbios1 := goproxmox.VMSMBIOS{}
357-
smbios1.UnmarshalString(vm.VirtualMachineConfig.SMBios1) //nolint:errcheck
358-
359-
sku, _ := base64.StdEncoding.DecodeString(smbios1.SKU) //nolint:errcheck
360-
361-
return string(sku)
362-
}
363-
364325
func readValueFromFile(path string) (string, error) {
365326
if path == "" {
366327
return "", fmt.Errorf("path cannot be empty")

0 commit comments

Comments
 (0)