Skip to content

Commit 54d5362

Browse files
majst01majst01
committed
more migrations
1 parent 2823ddf commit 54d5362

File tree

6 files changed

+97
-123
lines changed

6 files changed

+97
-123
lines changed

‎go.mod‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,30 @@ go 1.25
55
require (
66
github.com/gliderlabs/ssh v0.3.8
77
github.com/kelseyhightower/envconfig v1.4.0
8-
github.com/metal-stack/api v0.0.32-0.20251016094028-e5f26018a255
8+
github.com/metal-stack/api v0.0.37-0.20260104175152-d31839deaefb
99
github.com/metal-stack/go-hal v0.6.0
1010
github.com/metal-stack/metal-go v0.42.4
11+
github.com/metal-stack/metal-lib v0.23.5
1112
github.com/metal-stack/v v1.0.3
1213
github.com/nsqio/go-nsq v1.1.0
1314
github.com/stretchr/testify v1.11.1
14-
golang.org/x/crypto v0.43.0
15-
golang.org/x/sync v0.17.0
15+
golang.org/x/crypto v0.46.0
16+
golang.org/x/sync v0.19.0
1617
)
1718

1819
require (
19-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.10-20250912141014-52f32327d4b0.1 // indirect
20+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1 // indirect
2021
connectrpc.com/connect v1.19.1 // indirect
2122
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
2223
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2324
github.com/avast/retry-go/v4 v4.7.0 // indirect
2425
github.com/creack/pty v1.1.24 // indirect
2526
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/go-logr/logr v1.4.3 // indirect
27-
github.com/go-logr/stdr v1.2.2 // indirect
2827
github.com/go-openapi/analysis v0.24.0 // indirect
2928
github.com/go-openapi/errors v0.22.3 // indirect
3029
github.com/go-openapi/jsonpointer v0.22.1 // indirect
3130
github.com/go-openapi/jsonreference v0.21.2 // indirect
3231
github.com/go-openapi/loads v0.23.1 // indirect
33-
github.com/go-openapi/runtime v0.29.0 // indirect
3432
github.com/go-openapi/spec v0.22.0 // indirect
3533
github.com/go-openapi/strfmt v0.24.0 // indirect
3634
github.com/go-openapi/swag v0.25.1 // indirect
@@ -50,23 +48,20 @@ require (
5048
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
5149
github.com/golang/snappy v1.0.0 // indirect
5250
github.com/google/uuid v1.6.0 // indirect
53-
github.com/klauspost/compress v1.18.0 // indirect
54-
github.com/klauspost/connect-compress/v2 v2.0.0 // indirect
55-
github.com/metal-stack/metal-lib v0.23.5 // indirect
51+
github.com/klauspost/compress v1.18.2 // indirect
52+
github.com/klauspost/connect-compress/v2 v2.1.0 // indirect
53+
github.com/minio/minlz v1.0.1 // indirect
5654
github.com/oklog/ulid v1.3.1 // indirect
5755
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
56+
github.com/rogpeppe/go-internal v1.14.1 // indirect
5857
github.com/sethvargo/go-password v0.3.1 // indirect
5958
github.com/stmcginnis/gofish v0.20.0 // indirect
6059
github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702 // indirect
61-
go.mongodb.org/mongo-driver v1.17.4 // indirect
62-
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
63-
go.opentelemetry.io/otel v1.38.0 // indirect
64-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
65-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
60+
go.mongodb.org/mongo-driver v1.17.6 // indirect
6661
go.yaml.in/yaml/v3 v3.0.4 // indirect
67-
golang.org/x/net v0.46.0 // indirect
68-
golang.org/x/sys v0.37.0 // indirect
69-
golang.org/x/text v0.30.0 // indirect
70-
google.golang.org/protobuf v1.36.10 // indirect
62+
golang.org/x/net v0.48.0 // indirect
63+
golang.org/x/sys v0.39.0 // indirect
64+
golang.org/x/text v0.32.0 // indirect
65+
google.golang.org/protobuf v1.36.11 // indirect
7166
gopkg.in/yaml.v3 v3.0.1 // indirect
7267
)

‎go.sum‎

Lines changed: 26 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.10-20250912141014-52f32327d4b0.1 h1:31on4W/yPcV4nZHL4+UCiCvLPsMqe/vJcNg8Rci0scc=
2-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.10-20250912141014-52f32327d4b0.1/go.mod h1:fUl8CEN/6ZAMk6bP8ahBJPUJw7rbp+j4x+wCcYi2IG4=
1+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1 h1:j9yeqTWEFrtimt8Nng2MIeRrpoCvQzM9/g25XTvqUGg=
2+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1/go.mod h1:tvtbpgaVXZX4g6Pn+AnzFycuRK3MOz5HJfEGeEllXYM=
33
connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
44
connectrpc.com/connect v1.19.1/go.mod h1:tN20fjdGlewnSFeZxLKb0xwIZ6ozc3OQs2hTXy4du9w=
55
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
@@ -15,11 +15,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
1515
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1616
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
1717
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
18-
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
19-
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
20-
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
21-
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
22-
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
2318
github.com/go-openapi/analysis v0.24.0 h1:vE/VFFkICKyYuTWYnplQ+aVr45vlG6NcZKC7BdIXhsA=
2419
github.com/go-openapi/analysis v0.24.0/go.mod h1:GLyoJA+bvmGGaHgpfeDh8ldpGo69fAJg7eeMDMRCIrw=
2520
github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs=
@@ -30,8 +25,6 @@ github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5
3025
github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ=
3126
github.com/go-openapi/loads v0.23.1 h1:H8A0dX2KDHxDzc797h0+uiCZ5kwE2+VojaQVaTlXvS0=
3227
github.com/go-openapi/loads v0.23.1/go.mod h1:hZSXkyACCWzWPQqizAv/Ye0yhi2zzHwMmoXQ6YQml44=
33-
github.com/go-openapi/runtime v0.29.0 h1:Y7iDTFarS9XaFQ+fA+lBLngMwH6nYfqig1G+pHxMRO0=
34-
github.com/go-openapi/runtime v0.29.0/go.mod h1:52HOkEmLL/fE4Pg3Kf9nxc9fYQn0UsIWyGjGIJE9dkg=
3528
github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw=
3629
github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0=
3730
github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc=
@@ -77,16 +70,16 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
7770
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
7871
github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
7972
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
80-
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
81-
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
82-
github.com/klauspost/connect-compress/v2 v2.0.0 h1:L7TVsLa6Oo9Hkkb6r3DwSrhBbcWlXjneqBj7fCRXviU=
83-
github.com/klauspost/connect-compress/v2 v2.0.0/go.mod h1:604CD9JSAjGqtVzCM4SRgM/9TFTkWBcp+2wlQfGyJ6c=
73+
github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
74+
github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
75+
github.com/klauspost/connect-compress/v2 v2.1.0 h1:8fM8QrVeHT69e5VVSh4yjDaQASYIvOp2uMZq7nVLj2U=
76+
github.com/klauspost/connect-compress/v2 v2.1.0/go.mod h1:Ayurh2wscMMx3AwdGGVL+ylSR5316WfApREDgsqHyH8=
8477
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
8578
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
8679
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
8780
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
88-
github.com/metal-stack/api v0.0.32-0.20251016094028-e5f26018a255 h1:M1nxa7o1oK3t3J1XPUXX0RKqNb2J0MmvTLVIE/epCrc=
89-
github.com/metal-stack/api v0.0.32-0.20251016094028-e5f26018a255/go.mod h1:LcJkrJPJRdLPFaeCiWy5tL0dJXU74kq+vFe5uc/Cm9U=
81+
github.com/metal-stack/api v0.0.37-0.20260104175152-d31839deaefb h1:1258YAQeXOyYDSoWO70qYE2GjCQzmjeIT8meCox45Hc=
82+
github.com/metal-stack/api v0.0.37-0.20260104175152-d31839deaefb/go.mod h1:YwClPWPKdVnPbOO41cqdt0WSsJ/HOd3lkuE1qAXoxSk=
9083
github.com/metal-stack/go-hal v0.6.0 h1:mhe+x3HPqtud3VH4NJwJR0yNV4Kh9oOnhj9yyXDBLIc=
9184
github.com/metal-stack/go-hal v0.6.0/go.mod h1:2yeab7N8ApBd44z7mEwWCb+CL7o3ioZu41kSsra50Dw=
9285
github.com/metal-stack/metal-go v0.42.4 h1:yhXklrMkh9INNENY+Z8w8uN6wPz2di9DRdYYc/a3HEA=
@@ -95,6 +88,8 @@ github.com/metal-stack/metal-lib v0.23.5 h1:ozrkB3DNr3Cqn8nkBvmzc/KKpYqC1j1mv2OV
9588
github.com/metal-stack/metal-lib v0.23.5/go.mod h1:7uyHIrE19dkLwCZyeh2jmd7IEq5pEpzrzUGLoMN1eqY=
9689
github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs=
9790
github.com/metal-stack/v v1.0.3/go.mod h1:YTahEu7/ishwpYKnp/VaW/7nf8+PInogkfGwLcGPdXg=
91+
github.com/minio/minlz v1.0.1 h1:OUZUzXcib8diiX+JYxyRLIdomyZYzHct6EShOKtQY2A=
92+
github.com/minio/minlz v1.0.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
9893
github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
9994
github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
10095
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -113,34 +108,24 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
113108
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
114109
github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702 h1:yx587LNBbOpIxzCBHBiI94Wx8ryIAFlu1w0lDwm64cA=
115110
github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702/go.mod h1:YiWonbS/PuCtti3wt9jl+FvNEJ7c0nvmjGoEYxdjyk0=
116-
go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
117-
go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
118-
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
119-
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
120-
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
121-
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
122-
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
123-
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
124-
go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
125-
go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
126-
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
127-
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
111+
go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
112+
go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
128113
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
129114
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
130-
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
131-
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
132-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
133-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
134-
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
135-
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
136-
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
137-
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
138-
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
139-
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
140-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
141-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
142-
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
143-
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
115+
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
116+
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
117+
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
118+
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
119+
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
120+
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
121+
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
122+
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
123+
golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
124+
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
125+
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
126+
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
127+
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
128+
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
144129
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
145130
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
146131
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎internal/bmc/console.go‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,42 +90,36 @@ func (c *console) sessionHandler(s ssh.Session) {
9090
c.log.Info("ssh session handler called", "machineID", s.User())
9191
machineID := s.User()
9292

93-
resp, err := c.client.Adminv2().Machine().Get(context.Background(), &adminv2.MachineServiceGetRequest{Uuid: machineID})
93+
resp, err := c.client.Adminv2().Machine().GetBMC(context.Background(), &adminv2.MachineServiceGetBMCRequest{Uuid: machineID})
9494
if err != nil {
95-
c.log.Error("failed to receive IPMI data", "machineID", machineID, "error", err)
95+
c.log.Error("failed to receive BMC data", "machineID", machineID, "error", err)
9696
return
9797
}
98-
resp.Msg.Machine.
99-
metalIPMI := resp.Payload.Ipmi
10098

101-
c.log.Info("connection to", "machineID", machineID)
102-
if metalIPMI == nil {
103-
c.log.Error("failed to receive IPMI data", "machineID", machineID)
99+
bmc := resp.Bmc.Bmc
100+
if bmc.Address == "" {
101+
c.log.Error("failed to receive BMC.Address data", "machineID", machineID)
104102
return
105103
}
106-
if metalIPMI.Address == nil {
107-
c.log.Error("failed to receive IPMI.Address data", "machineID", machineID)
108-
return
109-
}
110-
_, err = io.WriteString(s, fmt.Sprintf("Connecting to console of %q (%s)\n", machineID, *metalIPMI.Address))
104+
_, err = io.WriteString(s, fmt.Sprintf("Connecting to console of %q (%s)\n", machineID, bmc.Address))
111105
if err != nil {
112106
c.log.Warn("failed to write to console", "machineID", machineID)
113107
}
114108

115-
host, portStr, found := strings.Cut(*metalIPMI.Address, ":")
109+
host, portStr, found := strings.Cut(bmc.Address, ":")
116110
if !found {
117-
c.log.Error("invalid ipmi address", "address", *metalIPMI.Address)
111+
c.log.Error("invalid ipmi address", "address", bmc.Address)
118112
return
119113
}
120114
port, err := strconv.Atoi(portStr)
121115
if err != nil {
122-
c.log.Error("invalid port", "port", port, "address", *metalIPMI.Address)
116+
c.log.Error("invalid port", "port", port, "address", bmc.Address)
123117
return
124118
}
125119

126-
ob, err := halconnect.OutBand(host, port, *metalIPMI.User, *metalIPMI.Password, halslog.New(c.log))
120+
ob, err := halconnect.OutBand(host, port, bmc.User, bmc.Password, halslog.New(c.log))
127121
if err != nil {
128-
c.log.Error("failed to out-band connect", "host", host, "port", port, "machineID", machineID, "ipmiuser", *metalIPMI.User)
122+
c.log.Error("failed to out-band connect", "host", host, "port", port, "machineID", machineID, "ipmiuser", bmc.User)
129123
return
130124
}
131125

‎internal/leases/bmc.go‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package leases
22

33
import (
4+
apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
45
"github.com/metal-stack/go-hal"
56
"github.com/metal-stack/go-hal/connect"
67
halslog "github.com/metal-stack/go-hal/pkg/logger/slog"
7-
"github.com/metal-stack/metal-go/api/models"
88
)
99

1010
func (i *ReportItem) EnrichWithBMCDetails(ipmiPort int, ipmiUser, ipmiPassword string) error {
@@ -17,15 +17,15 @@ func (i *ReportItem) EnrichWithBMCDetails(ipmiPort int, ipmiUser, ipmiPassword s
1717
bmcDetails, err := ob.BMCConnection().BMC()
1818
if err == nil {
1919
i.BmcVersion = &bmcDetails.FirmwareRevision
20-
i.FRU = &models.V1MachineFru{
21-
BoardMfg: bmcDetails.BoardMfg,
22-
BoardMfgSerial: bmcDetails.BoardMfgSerial,
23-
BoardPartNumber: bmcDetails.BoardPartNumber,
24-
ChassisPartNumber: bmcDetails.ChassisPartNumber,
25-
ChassisPartSerial: bmcDetails.ChassisPartSerial,
26-
ProductManufacturer: bmcDetails.ProductManufacturer,
27-
ProductPartNumber: bmcDetails.ProductPartNumber,
28-
ProductSerial: bmcDetails.ProductSerial,
20+
i.FRU = &apiv2.MachineFRU{
21+
BoardMfg: &bmcDetails.BoardMfg,
22+
BoardMfgSerial: &bmcDetails.BoardMfgSerial,
23+
BoardPartNumber: &bmcDetails.BoardPartNumber,
24+
ChassisPartNumber: &bmcDetails.ChassisPartNumber,
25+
ChassisPartSerial: &bmcDetails.ChassisPartSerial,
26+
ProductManufacturer: &bmcDetails.ProductManufacturer,
27+
ProductPartNumber: &bmcDetails.ProductPartNumber,
28+
ProductSerial: &bmcDetails.ProductSerial,
2929
}
3030
} else {
3131
i.Log.Warn("could not retrieve bmc details of device", "mac", i.Lease.Mac, "ip", i.Lease.Ip, "err", err)
@@ -44,20 +44,18 @@ func (i *ReportItem) EnrichWithBMCDetails(ipmiPort int, ipmiUser, ipmiPassword s
4444
i.BiosVersion = &board.BiosVersion
4545
i.IndicatorLED = &board.IndicatorLED
4646
if board.PowerMetric != nil {
47-
i.PowerMetric = &models.V1PowerMetric{
48-
Averageconsumedwatts: &board.PowerMetric.AverageConsumedWatts,
49-
Intervalinmin: &board.PowerMetric.IntervalInMin,
50-
Maxconsumedwatts: &board.PowerMetric.MaxConsumedWatts,
51-
Minconsumedwatts: &board.PowerMetric.MinConsumedWatts,
47+
i.PowerMetric = &apiv2.MachinePowerMetric{
48+
AverageConsumedWatts: board.PowerMetric.AverageConsumedWatts,
49+
IntervalInMin: board.PowerMetric.IntervalInMin,
50+
MaxConsumedWatts: board.PowerMetric.MaxConsumedWatts,
51+
MinConsumedWatts: board.PowerMetric.MinConsumedWatts,
5252
}
5353
}
54-
var powerSupplies []*models.V1PowerSupply
54+
var powerSupplies []*apiv2.MachinePowerSupply
5555
for _, ps := range board.PowerSupplies {
56-
powerSupplies = append(powerSupplies, &models.V1PowerSupply{
57-
Status: &models.V1PowerSupplyStatus{
58-
Health: &ps.Status.Health,
59-
State: &ps.Status.State,
60-
},
56+
powerSupplies = append(powerSupplies, &apiv2.MachinePowerSupply{
57+
Health: ps.Status.Health,
58+
State: ps.Status.State,
6159
})
6260
}
6361
i.PowerSupplies = powerSupplies

‎internal/leases/types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"log/slog"
55
"time"
66

7-
"github.com/metal-stack/metal-go/api/models"
7+
apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
88
)
99

1010
type Lease struct {
@@ -22,9 +22,9 @@ type ReportItem struct {
2222
UUID *string
2323
BmcVersion *string
2424
BiosVersion *string
25-
FRU *models.V1MachineFru
25+
FRU *apiv2.MachineFRU
2626
Powerstate *string
2727
IndicatorLED *string
28-
PowerMetric *models.V1PowerMetric
29-
PowerSupplies []*models.V1PowerSupply
28+
PowerMetric *apiv2.MachinePowerMetric
29+
PowerSupplies []*apiv2.MachinePowerSupply
3030
}

0 commit comments

Comments
 (0)