Skip to content

Commit 3f8fa8c

Browse files
majst01majst01
committed
Remove Firmware Command
1 parent 54d5362 commit 3f8fa8c

File tree

5 files changed

+5
-125
lines changed

5 files changed

+5
-125
lines changed

‎go.mod‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ 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.37-0.20260104175152-d31839deaefb
8+
github.com/metal-stack/api v0.0.37-0.20260108061933-2e1aa53a60cb
99
github.com/metal-stack/go-hal v0.6.0
10-
github.com/metal-stack/metal-go v0.42.4
1110
github.com/metal-stack/metal-lib v0.23.5
1211
github.com/metal-stack/v v1.0.3
1312
github.com/nsqio/go-nsq v1.1.0
@@ -20,45 +19,20 @@ require (
2019
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20251209175733-2a1774d88802.1 // indirect
2120
connectrpc.com/connect v1.19.1 // indirect
2221
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
23-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2422
github.com/avast/retry-go/v4 v4.7.0 // indirect
2523
github.com/creack/pty v1.1.24 // indirect
2624
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27-
github.com/go-openapi/analysis v0.24.0 // indirect
28-
github.com/go-openapi/errors v0.22.3 // indirect
29-
github.com/go-openapi/jsonpointer v0.22.1 // indirect
30-
github.com/go-openapi/jsonreference v0.21.2 // indirect
31-
github.com/go-openapi/loads v0.23.1 // indirect
32-
github.com/go-openapi/spec v0.22.0 // indirect
33-
github.com/go-openapi/strfmt v0.24.0 // indirect
34-
github.com/go-openapi/swag v0.25.1 // indirect
35-
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
36-
github.com/go-openapi/swag/conv v0.25.1 // indirect
37-
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
38-
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
39-
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
40-
github.com/go-openapi/swag/loading v0.25.1 // indirect
41-
github.com/go-openapi/swag/mangling v0.25.1 // indirect
42-
github.com/go-openapi/swag/netutils v0.25.1 // indirect
43-
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
44-
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
45-
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
46-
github.com/go-openapi/validate v0.25.0 // indirect
47-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
4825
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
4926
github.com/golang/snappy v1.0.0 // indirect
5027
github.com/google/uuid v1.6.0 // indirect
5128
github.com/klauspost/compress v1.18.2 // indirect
5229
github.com/klauspost/connect-compress/v2 v2.1.0 // indirect
5330
github.com/minio/minlz v1.0.1 // indirect
54-
github.com/oklog/ulid v1.3.1 // indirect
5531
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5632
github.com/rogpeppe/go-internal v1.14.1 // indirect
5733
github.com/sethvargo/go-password v0.3.1 // indirect
5834
github.com/stmcginnis/gofish v0.20.0 // indirect
5935
github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702 // indirect
60-
go.mongodb.org/mongo-driver v1.17.6 // indirect
61-
go.yaml.in/yaml/v3 v3.0.4 // indirect
6236
golang.org/x/net v0.48.0 // indirect
6337
golang.org/x/sys v0.39.0 // indirect
6438
golang.org/x/text v0.32.0 // indirect

‎go.sum‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ 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=
66
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
7-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
8-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
97
github.com/avast/retry-go/v4 v4.7.0 h1:yjDs35SlGvKwRNSykujfjdMxMhMQQM0TnIjJaHB+Zio=
108
github.com/avast/retry-go/v4 v4.7.0/go.mod h1:ZMPDa3sY2bKgpLtap9JRUgk2yTAba7cgiFhqxY2Sg6Q=
119
github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
@@ -15,50 +13,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
1513
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1614
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
1715
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
18-
github.com/go-openapi/analysis v0.24.0 h1:vE/VFFkICKyYuTWYnplQ+aVr45vlG6NcZKC7BdIXhsA=
19-
github.com/go-openapi/analysis v0.24.0/go.mod h1:GLyoJA+bvmGGaHgpfeDh8ldpGo69fAJg7eeMDMRCIrw=
20-
github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs=
21-
github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ=
22-
github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk=
23-
github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM=
24-
github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU=
25-
github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ=
26-
github.com/go-openapi/loads v0.23.1 h1:H8A0dX2KDHxDzc797h0+uiCZ5kwE2+VojaQVaTlXvS0=
27-
github.com/go-openapi/loads v0.23.1/go.mod h1:hZSXkyACCWzWPQqizAv/Ye0yhi2zzHwMmoXQ6YQml44=
28-
github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw=
29-
github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0=
30-
github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc=
31-
github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4=
32-
github.com/go-openapi/swag v0.25.1 h1:6uwVsx+/OuvFVPqfQmOOPsqTcm5/GkBhNwLqIR916n8=
33-
github.com/go-openapi/swag v0.25.1/go.mod h1:bzONdGlT0fkStgGPd3bhZf1MnuPkf2YAys6h+jZipOo=
34-
github.com/go-openapi/swag/cmdutils v0.25.1 h1:nDke3nAFDArAa631aitksFGj2omusks88GF1VwdYqPY=
35-
github.com/go-openapi/swag/cmdutils v0.25.1/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=
36-
github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0=
37-
github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs=
38-
github.com/go-openapi/swag/fileutils v0.25.1 h1:rSRXapjQequt7kqalKXdcpIegIShhTPXx7yw0kek2uU=
39-
github.com/go-openapi/swag/fileutils v0.25.1/go.mod h1:+NXtt5xNZZqmpIpjqcujqojGFek9/w55b3ecmOdtg8M=
40-
github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU=
41-
github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo=
42-
github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8=
43-
github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo=
44-
github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1 h1:DSQGcdB6G0N9c/KhtpYc71PzzGEIc/fZ1no35x4/XBY=
45-
github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1/go.mod h1:kjmweouyPwRUEYMSrbAidoLMGeJ5p6zdHi9BgZiqmsg=
46-
github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw=
47-
github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc=
48-
github.com/go-openapi/swag/mangling v0.25.1 h1:XzILnLzhZPZNtmxKaz/2xIGPQsBsvmCjrJOWGNz/ync=
49-
github.com/go-openapi/swag/mangling v0.25.1/go.mod h1:CdiMQ6pnfAgyQGSOIYnZkXvqhnnwOn997uXZMAd/7mQ=
50-
github.com/go-openapi/swag/netutils v0.25.1 h1:2wFLYahe40tDUHfKT1GRC4rfa5T1B4GWZ+msEFA4Fl4=
51-
github.com/go-openapi/swag/netutils v0.25.1/go.mod h1:CAkkvqnUJX8NV96tNhEQvKz8SQo2KF0f7LleiJwIeRE=
52-
github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw=
53-
github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg=
54-
github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA=
55-
github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8=
56-
github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk=
57-
github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg=
58-
github.com/go-openapi/validate v0.25.0 h1:JD9eGX81hDTjoY3WOzh6WqxVBVl7xjsLnvDo1GL5WPU=
59-
github.com/go-openapi/validate v0.25.0/go.mod h1:SUY7vKrN5FiwK6LyvSwKjDfLNirSfWwHNgxd2l29Mmw=
60-
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
61-
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
6216
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
6317
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
6418
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -78,12 +32,10 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
7832
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
7933
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
8034
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
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=
35+
github.com/metal-stack/api v0.0.37-0.20260108061933-2e1aa53a60cb h1:ghytPFujYBQsgu2aONo0KBJAIuVIMnw3dpi1vS8Zi8k=
36+
github.com/metal-stack/api v0.0.37-0.20260108061933-2e1aa53a60cb/go.mod h1:YwClPWPKdVnPbOO41cqdt0WSsJ/HOd3lkuE1qAXoxSk=
8337
github.com/metal-stack/go-hal v0.6.0 h1:mhe+x3HPqtud3VH4NJwJR0yNV4Kh9oOnhj9yyXDBLIc=
8438
github.com/metal-stack/go-hal v0.6.0/go.mod h1:2yeab7N8ApBd44z7mEwWCb+CL7o3ioZu41kSsra50Dw=
85-
github.com/metal-stack/metal-go v0.42.4 h1:yhXklrMkh9INNENY+Z8w8uN6wPz2di9DRdYYc/a3HEA=
86-
github.com/metal-stack/metal-go v0.42.4/go.mod h1:GSfXrAj55LGsUSMHWGDsmq5n056NG0yb1JM8bgfvKOw=
8739
github.com/metal-stack/metal-lib v0.23.5 h1:ozrkB3DNr3Cqn8nkBvmzc/KKpYqC1j1mv2OVOj8i7Ac=
8840
github.com/metal-stack/metal-lib v0.23.5/go.mod h1:7uyHIrE19dkLwCZyeh2jmd7IEq5pEpzrzUGLoMN1eqY=
8941
github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs=
@@ -92,8 +44,6 @@ github.com/minio/minlz v1.0.1 h1:OUZUzXcib8diiX+JYxyRLIdomyZYzHct6EShOKtQY2A=
9244
github.com/minio/minlz v1.0.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
9345
github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
9446
github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
95-
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
96-
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
9747
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
9848
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
9949
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -108,10 +58,6 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
10858
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
10959
github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702 h1:yx587LNBbOpIxzCBHBiI94Wx8ryIAFlu1w0lDwm64cA=
11060
github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702/go.mod h1:YiWonbS/PuCtti3wt9jl+FvNEJ7c0nvmjGoEYxdjyk0=
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=
113-
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
114-
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
11561
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
11662
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
11763
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=

‎internal/bmc/console.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414

1515
apiclient "github.com/metal-stack/api/go/client"
16-
adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2"
16+
apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
1717
halconnect "github.com/metal-stack/go-hal/connect"
1818
halslog "github.com/metal-stack/go-hal/pkg/logger/slog"
1919
"github.com/metal-stack/metal-bmc/pkg/config"
@@ -90,7 +90,7 @@ 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().GetBMC(context.Background(), &adminv2.MachineServiceGetBMCRequest{Uuid: machineID})
93+
resp, err := c.client.Apiv2().Machine().GetBMC(context.Background(), &apiv2.MachineServiceGetBMCRequest{Uuid: machineID})
9494
if err != nil {
9595
c.log.Error("failed to receive BMC data", "machineID", machineID, "error", err)
9696
return

‎internal/bmc/firmware.go‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎internal/bmc/nsq.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ func (b *BMCService) HandleMessage(message *nsq.Message) error {
134134
return outBand.IdentifyLEDOn()
135135
case ChassisIdentifyLEDOffCmd:
136136
return outBand.IdentifyLEDOff()
137-
case UpdateFirmwareCmd:
138-
return b.UpdateFirmware(outBand, &event)
139137
default:
140138
b.log.Error("unhandled command", "topic", b.machineTopic, "channel", "core", "event", event)
141139
}

0 commit comments

Comments
 (0)