From da636085cd1d33ec0618865c3abdafc1349757a0 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Mon, 11 Nov 2024 10:24:44 +0100 Subject: [PATCH] Update buf and all proto related deps --- go.mod | 18 +- go.sum | 40 +-- pkg/api/v1/boot.pb.go | 510 +++++++----------------------------- pkg/api/v1/boot_grpc.pb.go | 90 +++---- pkg/api/v1/event.pb.go | 70 +---- pkg/api/v1/event_grpc.pb.go | 28 +- proto/Makefile | 2 +- proto/buf.gen.yaml | 4 +- proto/buf.yaml | 2 +- 9 files changed, 201 insertions(+), 563 deletions(-) diff --git a/go.mod b/go.mod index e0d3fcb86..bc26fa383 100644 --- a/go.mod +++ b/go.mod @@ -19,22 +19,22 @@ require ( github.com/klauspost/connect-compress/v2 v2.0.0 github.com/looplab/fsm v1.0.2 github.com/metal-stack/go-ipam v1.14.7 - github.com/metal-stack/masterdata-api v0.11.4 + github.com/metal-stack/masterdata-api v0.11.5 github.com/metal-stack/metal-lib v0.19.0 github.com/metal-stack/security v0.9.0 github.com/metal-stack/v v1.0.3 github.com/nsqio/go-nsq v1.1.0 - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/samber/lo v1.47.0 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.20.0-alpha.6 github.com/stretchr/testify v1.9.0 - github.com/testcontainers/testcontainers-go v0.33.0 + github.com/testcontainers/testcontainers-go v0.34.0 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba - golang.org/x/crypto v0.28.0 - golang.org/x/sync v0.8.0 - google.golang.org/grpc v1.67.0 - google.golang.org/protobuf v1.34.2 + golang.org/x/crypto v0.29.0 + golang.org/x/sync v0.9.0 + google.golang.org/grpc v1.68.0 + google.golang.org/protobuf v1.35.1 gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2 ) @@ -182,8 +182,8 @@ require ( golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.20.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect diff --git a/go.sum b/go.sum index 33ff5b6eb..ca62836ce 100644 --- a/go.sum +++ b/go.sum @@ -254,8 +254,8 @@ github.com/meilisearch/meilisearch-go v0.27.2 h1:3G21dJ5i208shnLPDsIEZ0L0Geg/5oe github.com/meilisearch/meilisearch-go v0.27.2/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= github.com/metal-stack/go-ipam v1.14.7 h1:DA+uP72rAqGechwDJ3EzjI/snaMc77lGqoQYsyE4DUk= github.com/metal-stack/go-ipam v1.14.7/go.mod h1:YxQhPVl9cXFSs3/DpyYa4qVsYT+aDIlwfCFLt4znTqI= -github.com/metal-stack/masterdata-api v0.11.4 h1:bgRk7PbD5BjYbmAReaV7gTKKKrW5x/ZzCwj98VSWoJk= -github.com/metal-stack/masterdata-api v0.11.4/go.mod h1:fD0AtsoNNaOLqRMBeZzDFljiQW9RlrOnxeZ20Pqhxas= +github.com/metal-stack/masterdata-api v0.11.5 h1:r7bYdhdVgOjCk6k7K/SCLlHALH23ZuMGY8E4udk4wXQ= +github.com/metal-stack/masterdata-api v0.11.5/go.mod h1:Xk8kqxAp3NkAc2BX8yTIWgSlD77T897QSdRSluWvP4w= github.com/metal-stack/metal-lib v0.19.0 h1:4yBnp/jPGgX9KeCje3A4MFL2oDjgjOjgsIK391LltRI= github.com/metal-stack/metal-lib v0.19.0/go.mod h1:fCMaWwVGA/xAoGvBk72/nfzqBkHly0iOzrWpc55Fau4= github.com/metal-stack/security v0.9.0 h1:FYBXJfNJwUw2E0HBa+jay37XF7b6EikEuf4Mw8u04EY= @@ -320,8 +320,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0= @@ -387,8 +387,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a h1:SJy1Pu0eH1C29XwJucQo73FrleVK6t4kYz4NVhp34Yw= github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a/go.mod h1:DFSS3NAGHthKo1gTlmEcSBiZrRJXi28rLNd/1udP1c8= -github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw= -github.com/testcontainers/testcontainers-go v0.33.0/go.mod h1:W80YpTa8D5C3Yy16icheD01UTDu+LmXIA2Keo+jWtT8= +github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo= +github.com/testcontainers/testcontainers-go v0.34.0/go.mod h1:6P/kMkQe8yqPHfPWNulFGdFHTD8HB2vLq/231xY2iPQ= github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY= @@ -452,8 +452,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -480,8 +480,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -503,19 +503,19 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= +golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -533,10 +533,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61/go.mod h1:O6rP0uBq4k0mdi/b4ZEMAZjkhYWhS815kCvaMha4VN8= google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 h1:N9BgCIAUvn/M+p4NJccWPWb3BWh88+zyL0ll9HgbEeM= google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= -google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= +google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/cenkalti/backoff.v2 v2.2.1 h1:eJ9UAg01/HIHG987TwxvnzK2MgxXq97YY6rYDpY9aII= gopkg.in/cenkalti/backoff.v2 v2.2.1/go.mod h1:S0QdOvT2AlerfSBkp0O+dk+bbIMaNbEmVk876gPCthU= diff --git a/pkg/api/v1/boot.pb.go b/pkg/api/v1/boot.pb.go index b1c9ede3f..dc54b142c 100644 --- a/pkg/api/v1/boot.pb.go +++ b/pkg/api/v1/boot.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: api/v1/boot.proto @@ -30,11 +30,9 @@ type BootServiceDhcpRequest struct { func (x *BootServiceDhcpRequest) Reset() { *x = BootServiceDhcpRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceDhcpRequest) String() string { @@ -45,7 +43,7 @@ func (*BootServiceDhcpRequest) ProtoMessage() {} func (x *BootServiceDhcpRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -75,11 +73,9 @@ type BootServiceDhcpResponse struct { func (x *BootServiceDhcpResponse) Reset() { *x = BootServiceDhcpResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceDhcpResponse) String() string { @@ -90,7 +86,7 @@ func (*BootServiceDhcpResponse) ProtoMessage() {} func (x *BootServiceDhcpResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -116,11 +112,9 @@ type BootServiceBootRequest struct { func (x *BootServiceBootRequest) Reset() { *x = BootServiceBootRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceBootRequest) String() string { @@ -131,7 +125,7 @@ func (*BootServiceBootRequest) ProtoMessage() {} func (x *BootServiceBootRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -172,11 +166,9 @@ type BootServiceBootResponse struct { func (x *BootServiceBootResponse) Reset() { *x = BootServiceBootResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceBootResponse) String() string { @@ -187,7 +179,7 @@ func (*BootServiceBootResponse) ProtoMessage() {} func (x *BootServiceBootResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -238,11 +230,9 @@ type BootServiceRegisterRequest struct { func (x *BootServiceRegisterRequest) Reset() { *x = BootServiceRegisterRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceRegisterRequest) String() string { @@ -253,7 +243,7 @@ func (*BootServiceRegisterRequest) ProtoMessage() {} func (x *BootServiceRegisterRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -322,11 +312,9 @@ type BootServiceRegisterResponse struct { func (x *BootServiceRegisterResponse) Reset() { *x = BootServiceRegisterResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceRegisterResponse) String() string { @@ -337,7 +325,7 @@ func (*BootServiceRegisterResponse) ProtoMessage() {} func (x *BootServiceRegisterResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -383,11 +371,9 @@ type BootServiceWaitRequest struct { func (x *BootServiceWaitRequest) Reset() { *x = BootServiceWaitRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceWaitRequest) String() string { @@ -398,7 +384,7 @@ func (*BootServiceWaitRequest) ProtoMessage() {} func (x *BootServiceWaitRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -428,11 +414,9 @@ type BootServiceWaitResponse struct { func (x *BootServiceWaitResponse) Reset() { *x = BootServiceWaitResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceWaitResponse) String() string { @@ -443,7 +427,7 @@ func (*BootServiceWaitResponse) ProtoMessage() {} func (x *BootServiceWaitResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -472,11 +456,9 @@ type MachineHardware struct { func (x *MachineHardware) Reset() { *x = MachineHardware{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineHardware) String() string { @@ -487,7 +469,7 @@ func (*MachineHardware) ProtoMessage() {} func (x *MachineHardware) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -550,11 +532,9 @@ type MachineCPU struct { func (x *MachineCPU) Reset() { *x = MachineCPU{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineCPU) String() string { @@ -565,7 +545,7 @@ func (*MachineCPU) ProtoMessage() {} func (x *MachineCPU) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -619,11 +599,9 @@ type MachineGPU struct { func (x *MachineGPU) Reset() { *x = MachineGPU{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineGPU) String() string { @@ -634,7 +612,7 @@ func (*MachineGPU) ProtoMessage() {} func (x *MachineGPU) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -677,11 +655,9 @@ type MachineNic struct { func (x *MachineNic) Reset() { *x = MachineNic{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineNic) String() string { @@ -692,7 +668,7 @@ func (*MachineNic) ProtoMessage() {} func (x *MachineNic) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -753,11 +729,9 @@ type MachineBlockDevice struct { func (x *MachineBlockDevice) Reset() { *x = MachineBlockDevice{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineBlockDevice) String() string { @@ -768,7 +742,7 @@ func (*MachineBlockDevice) ProtoMessage() {} func (x *MachineBlockDevice) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -809,11 +783,9 @@ type MachineBIOS struct { func (x *MachineBIOS) Reset() { *x = MachineBIOS{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineBIOS) String() string { @@ -824,7 +796,7 @@ func (*MachineBIOS) ProtoMessage() {} func (x *MachineBIOS) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[13] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -877,11 +849,9 @@ type MachineIPMI struct { func (x *MachineIPMI) Reset() { *x = MachineIPMI{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineIPMI) String() string { @@ -892,7 +862,7 @@ func (*MachineIPMI) ProtoMessage() {} func (x *MachineIPMI) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[14] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -980,11 +950,9 @@ type MachineFRU struct { func (x *MachineFRU) Reset() { *x = MachineFRU{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineFRU) String() string { @@ -995,7 +963,7 @@ func (*MachineFRU) ProtoMessage() {} func (x *MachineFRU) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[15] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1080,11 +1048,9 @@ type BootServiceReportRequest struct { func (x *BootServiceReportRequest) Reset() { *x = BootServiceReportRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceReportRequest) String() string { @@ -1095,7 +1061,7 @@ func (*BootServiceReportRequest) ProtoMessage() {} func (x *BootServiceReportRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[16] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1153,11 +1119,9 @@ type BootServiceReportResponse struct { func (x *BootServiceReportResponse) Reset() { *x = BootServiceReportResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceReportResponse) String() string { @@ -1168,7 +1132,7 @@ func (*BootServiceReportResponse) ProtoMessage() {} func (x *BootServiceReportResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[17] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1199,11 +1163,9 @@ type BootInfo struct { func (x *BootInfo) Reset() { *x = BootInfo{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootInfo) String() string { @@ -1214,7 +1176,7 @@ func (*BootInfo) ProtoMessage() {} func (x *BootInfo) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[18] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1289,11 +1251,9 @@ type BootServiceAbortReinstallRequest struct { func (x *BootServiceAbortReinstallRequest) Reset() { *x = BootServiceAbortReinstallRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceAbortReinstallRequest) String() string { @@ -1304,7 +1264,7 @@ func (*BootServiceAbortReinstallRequest) ProtoMessage() {} func (x *BootServiceAbortReinstallRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[19] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1343,11 +1303,9 @@ type BootServiceAbortReinstallResponse struct { func (x *BootServiceAbortReinstallResponse) Reset() { *x = BootServiceAbortReinstallResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[20] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceAbortReinstallResponse) String() string { @@ -1358,7 +1316,7 @@ func (*BootServiceAbortReinstallResponse) ProtoMessage() {} func (x *BootServiceAbortReinstallResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[20] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1388,11 +1346,9 @@ type BootServiceSuperUserPasswordRequest struct { func (x *BootServiceSuperUserPasswordRequest) Reset() { *x = BootServiceSuperUserPasswordRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[21] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceSuperUserPasswordRequest) String() string { @@ -1403,7 +1359,7 @@ func (*BootServiceSuperUserPasswordRequest) ProtoMessage() {} func (x *BootServiceSuperUserPasswordRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[21] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1429,11 +1385,9 @@ type BootServiceSuperUserPasswordResponse struct { func (x *BootServiceSuperUserPasswordResponse) Reset() { *x = BootServiceSuperUserPasswordResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_boot_proto_msgTypes[22] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_boot_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BootServiceSuperUserPasswordResponse) String() string { @@ -1444,7 +1398,7 @@ func (*BootServiceSuperUserPasswordResponse) ProtoMessage() {} func (x *BootServiceSuperUserPasswordResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_boot_proto_msgTypes[22] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -1786,284 +1740,6 @@ func file_api_v1_boot_proto_init() { if File_api_v1_boot_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_api_v1_boot_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceDhcpRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceDhcpResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceBootRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[3].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceBootResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[4].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceRegisterRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[5].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceRegisterResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[6].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceWaitRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[7].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceWaitResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[8].Exporter = func(v any, i int) any { - switch v := v.(*MachineHardware); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[9].Exporter = func(v any, i int) any { - switch v := v.(*MachineCPU); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[10].Exporter = func(v any, i int) any { - switch v := v.(*MachineGPU); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[11].Exporter = func(v any, i int) any { - switch v := v.(*MachineNic); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[12].Exporter = func(v any, i int) any { - switch v := v.(*MachineBlockDevice); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[13].Exporter = func(v any, i int) any { - switch v := v.(*MachineBIOS); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[14].Exporter = func(v any, i int) any { - switch v := v.(*MachineIPMI); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[15].Exporter = func(v any, i int) any { - switch v := v.(*MachineFRU); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[16].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceReportRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[17].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceReportResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[18].Exporter = func(v any, i int) any { - switch v := v.(*BootInfo); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[19].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceAbortReinstallRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[20].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceAbortReinstallResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[21].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceSuperUserPasswordRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_boot_proto_msgTypes[22].Exporter = func(v any, i int) any { - switch v := v.(*BootServiceSuperUserPasswordResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } file_api_v1_boot_proto_msgTypes[3].OneofWrappers = []any{} file_api_v1_boot_proto_msgTypes[15].OneofWrappers = []any{} type x struct{} diff --git a/pkg/api/v1/boot_grpc.pb.go b/pkg/api/v1/boot_grpc.pb.go index 31009281f..981bd6eec 100644 --- a/pkg/api/v1/boot_grpc.pb.go +++ b/pkg/api/v1/boot_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc (unknown) // source: api/v1/boot.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( BootService_Dhcp_FullMethodName = "/api.v1.BootService/Dhcp" @@ -41,7 +41,7 @@ type BootServiceClient interface { // Register is called from metal-hammer after hardware inventory is finished, tells metal-api all glory details about that machine Register(ctx context.Context, in *BootServiceRegisterRequest, opts ...grpc.CallOption) (*BootServiceRegisterResponse, error) // Wait is a hanging call that waits until the machine gets allocated by a user - Wait(ctx context.Context, in *BootServiceWaitRequest, opts ...grpc.CallOption) (BootService_WaitClient, error) + Wait(ctx context.Context, in *BootServiceWaitRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[BootServiceWaitResponse], error) // Report tells metal-api installation was either successful or failed Report(ctx context.Context, in *BootServiceReportRequest, opts ...grpc.CallOption) (*BootServiceReportResponse, error) // If reinstall failed and tell metal-api to restore to previous state @@ -57,8 +57,9 @@ func NewBootServiceClient(cc grpc.ClientConnInterface) BootServiceClient { } func (c *bootServiceClient) Dhcp(ctx context.Context, in *BootServiceDhcpRequest, opts ...grpc.CallOption) (*BootServiceDhcpResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BootServiceDhcpResponse) - err := c.cc.Invoke(ctx, BootService_Dhcp_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, BootService_Dhcp_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -66,8 +67,9 @@ func (c *bootServiceClient) Dhcp(ctx context.Context, in *BootServiceDhcpRequest } func (c *bootServiceClient) Boot(ctx context.Context, in *BootServiceBootRequest, opts ...grpc.CallOption) (*BootServiceBootResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BootServiceBootResponse) - err := c.cc.Invoke(ctx, BootService_Boot_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, BootService_Boot_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -75,8 +77,9 @@ func (c *bootServiceClient) Boot(ctx context.Context, in *BootServiceBootRequest } func (c *bootServiceClient) SuperUserPassword(ctx context.Context, in *BootServiceSuperUserPasswordRequest, opts ...grpc.CallOption) (*BootServiceSuperUserPasswordResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BootServiceSuperUserPasswordResponse) - err := c.cc.Invoke(ctx, BootService_SuperUserPassword_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, BootService_SuperUserPassword_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -84,20 +87,22 @@ func (c *bootServiceClient) SuperUserPassword(ctx context.Context, in *BootServi } func (c *bootServiceClient) Register(ctx context.Context, in *BootServiceRegisterRequest, opts ...grpc.CallOption) (*BootServiceRegisterResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BootServiceRegisterResponse) - err := c.cc.Invoke(ctx, BootService_Register_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, BootService_Register_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } return out, nil } -func (c *bootServiceClient) Wait(ctx context.Context, in *BootServiceWaitRequest, opts ...grpc.CallOption) (BootService_WaitClient, error) { - stream, err := c.cc.NewStream(ctx, &BootService_ServiceDesc.Streams[0], BootService_Wait_FullMethodName, opts...) +func (c *bootServiceClient) Wait(ctx context.Context, in *BootServiceWaitRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[BootServiceWaitResponse], error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + stream, err := c.cc.NewStream(ctx, &BootService_ServiceDesc.Streams[0], BootService_Wait_FullMethodName, cOpts...) if err != nil { return nil, err } - x := &bootServiceWaitClient{stream} + x := &grpc.GenericClientStream[BootServiceWaitRequest, BootServiceWaitResponse]{ClientStream: stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -107,26 +112,13 @@ func (c *bootServiceClient) Wait(ctx context.Context, in *BootServiceWaitRequest return x, nil } -type BootService_WaitClient interface { - Recv() (*BootServiceWaitResponse, error) - grpc.ClientStream -} - -type bootServiceWaitClient struct { - grpc.ClientStream -} - -func (x *bootServiceWaitClient) Recv() (*BootServiceWaitResponse, error) { - m := new(BootServiceWaitResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type BootService_WaitClient = grpc.ServerStreamingClient[BootServiceWaitResponse] func (c *bootServiceClient) Report(ctx context.Context, in *BootServiceReportRequest, opts ...grpc.CallOption) (*BootServiceReportResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BootServiceReportResponse) - err := c.cc.Invoke(ctx, BootService_Report_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, BootService_Report_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -134,8 +126,9 @@ func (c *bootServiceClient) Report(ctx context.Context, in *BootServiceReportReq } func (c *bootServiceClient) AbortReinstall(ctx context.Context, in *BootServiceAbortReinstallRequest, opts ...grpc.CallOption) (*BootServiceAbortReinstallResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BootServiceAbortReinstallResponse) - err := c.cc.Invoke(ctx, BootService_AbortReinstall_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, BootService_AbortReinstall_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -144,7 +137,7 @@ func (c *bootServiceClient) AbortReinstall(ctx context.Context, in *BootServiceA // BootServiceServer is the server API for BootService service. // All implementations should embed UnimplementedBootServiceServer -// for forward compatibility +// for forward compatibility. type BootServiceServer interface { // Dhcp is the first dhcp request (option 97). A ProvisioningEventPXEBooting is fired Dhcp(context.Context, *BootServiceDhcpRequest) (*BootServiceDhcpResponse, error) @@ -155,16 +148,19 @@ type BootServiceServer interface { // Register is called from metal-hammer after hardware inventory is finished, tells metal-api all glory details about that machine Register(context.Context, *BootServiceRegisterRequest) (*BootServiceRegisterResponse, error) // Wait is a hanging call that waits until the machine gets allocated by a user - Wait(*BootServiceWaitRequest, BootService_WaitServer) error + Wait(*BootServiceWaitRequest, grpc.ServerStreamingServer[BootServiceWaitResponse]) error // Report tells metal-api installation was either successful or failed Report(context.Context, *BootServiceReportRequest) (*BootServiceReportResponse, error) // If reinstall failed and tell metal-api to restore to previous state AbortReinstall(context.Context, *BootServiceAbortReinstallRequest) (*BootServiceAbortReinstallResponse, error) } -// UnimplementedBootServiceServer should be embedded to have forward compatible implementations. -type UnimplementedBootServiceServer struct { -} +// UnimplementedBootServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedBootServiceServer struct{} func (UnimplementedBootServiceServer) Dhcp(context.Context, *BootServiceDhcpRequest) (*BootServiceDhcpResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Dhcp not implemented") @@ -178,7 +174,7 @@ func (UnimplementedBootServiceServer) SuperUserPassword(context.Context, *BootSe func (UnimplementedBootServiceServer) Register(context.Context, *BootServiceRegisterRequest) (*BootServiceRegisterResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Register not implemented") } -func (UnimplementedBootServiceServer) Wait(*BootServiceWaitRequest, BootService_WaitServer) error { +func (UnimplementedBootServiceServer) Wait(*BootServiceWaitRequest, grpc.ServerStreamingServer[BootServiceWaitResponse]) error { return status.Errorf(codes.Unimplemented, "method Wait not implemented") } func (UnimplementedBootServiceServer) Report(context.Context, *BootServiceReportRequest) (*BootServiceReportResponse, error) { @@ -187,6 +183,7 @@ func (UnimplementedBootServiceServer) Report(context.Context, *BootServiceReport func (UnimplementedBootServiceServer) AbortReinstall(context.Context, *BootServiceAbortReinstallRequest) (*BootServiceAbortReinstallResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AbortReinstall not implemented") } +func (UnimplementedBootServiceServer) testEmbeddedByValue() {} // UnsafeBootServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to BootServiceServer will @@ -196,6 +193,13 @@ type UnsafeBootServiceServer interface { } func RegisterBootServiceServer(s grpc.ServiceRegistrar, srv BootServiceServer) { + // If the following call pancis, it indicates UnimplementedBootServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&BootService_ServiceDesc, srv) } @@ -276,21 +280,11 @@ func _BootService_Wait_Handler(srv interface{}, stream grpc.ServerStream) error if err := stream.RecvMsg(m); err != nil { return err } - return srv.(BootServiceServer).Wait(m, &bootServiceWaitServer{stream}) -} - -type BootService_WaitServer interface { - Send(*BootServiceWaitResponse) error - grpc.ServerStream + return srv.(BootServiceServer).Wait(m, &grpc.GenericServerStream[BootServiceWaitRequest, BootServiceWaitResponse]{ServerStream: stream}) } -type bootServiceWaitServer struct { - grpc.ServerStream -} - -func (x *bootServiceWaitServer) Send(m *BootServiceWaitResponse) error { - return x.ServerStream.SendMsg(m) -} +// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name. +type BootService_WaitServer = grpc.ServerStreamingServer[BootServiceWaitResponse] func _BootService_Report_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(BootServiceReportRequest) diff --git a/pkg/api/v1/event.pb.go b/pkg/api/v1/event.pb.go index d01f79512..28a8c1414 100644 --- a/pkg/api/v1/event.pb.go +++ b/pkg/api/v1/event.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.35.1 // protoc (unknown) // source: api/v1/event.proto @@ -31,11 +31,9 @@ type EventServiceSendRequest struct { func (x *EventServiceSendRequest) Reset() { *x = EventServiceSendRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_event_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_event_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EventServiceSendRequest) String() string { @@ -46,7 +44,7 @@ func (*EventServiceSendRequest) ProtoMessage() {} func (x *EventServiceSendRequest) ProtoReflect() protoreflect.Message { mi := &file_api_v1_event_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -81,11 +79,9 @@ type EventServiceSendResponse struct { func (x *EventServiceSendResponse) Reset() { *x = EventServiceSendResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_event_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_event_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *EventServiceSendResponse) String() string { @@ -96,7 +92,7 @@ func (*EventServiceSendResponse) ProtoMessage() {} func (x *EventServiceSendResponse) ProtoReflect() protoreflect.Message { mi := &file_api_v1_event_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -142,11 +138,9 @@ type MachineProvisioningEvent struct { func (x *MachineProvisioningEvent) Reset() { *x = MachineProvisioningEvent{} - if protoimpl.UnsafeEnabled { - mi := &file_api_v1_event_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_api_v1_event_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MachineProvisioningEvent) String() string { @@ -157,7 +151,7 @@ func (*MachineProvisioningEvent) ProtoMessage() {} func (x *MachineProvisioningEvent) ProtoReflect() protoreflect.Message { mi := &file_api_v1_event_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { + if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { ms.StoreMessageInfo(mi) @@ -271,44 +265,6 @@ func file_api_v1_event_proto_init() { if File_api_v1_event_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_api_v1_event_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*EventServiceSendRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_event_proto_msgTypes[1].Exporter = func(v any, i int) any { - switch v := v.(*EventServiceSendResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_api_v1_event_proto_msgTypes[2].Exporter = func(v any, i int) any { - switch v := v.(*MachineProvisioningEvent); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/pkg/api/v1/event_grpc.pb.go b/pkg/api/v1/event_grpc.pb.go index 29dcddc86..7605677a7 100644 --- a/pkg/api/v1/event_grpc.pb.go +++ b/pkg/api/v1/event_grpc.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 +// - protoc-gen-go-grpc v1.5.1 // - protoc (unknown) // source: api/v1/event.proto @@ -15,8 +15,8 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.32.0 or later. -const _ = grpc.SupportPackageIsVersion7 +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 const ( EventService_Send_FullMethodName = "/api.v1.EventService/Send" @@ -38,8 +38,9 @@ func NewEventServiceClient(cc grpc.ClientConnInterface) EventServiceClient { } func (c *eventServiceClient) Send(ctx context.Context, in *EventServiceSendRequest, opts ...grpc.CallOption) (*EventServiceSendResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(EventServiceSendResponse) - err := c.cc.Invoke(ctx, EventService_Send_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, EventService_Send_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -48,18 +49,22 @@ func (c *eventServiceClient) Send(ctx context.Context, in *EventServiceSendReque // EventServiceServer is the server API for EventService service. // All implementations should embed UnimplementedEventServiceServer -// for forward compatibility +// for forward compatibility. type EventServiceServer interface { Send(context.Context, *EventServiceSendRequest) (*EventServiceSendResponse, error) } -// UnimplementedEventServiceServer should be embedded to have forward compatible implementations. -type UnimplementedEventServiceServer struct { -} +// UnimplementedEventServiceServer should be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedEventServiceServer struct{} func (UnimplementedEventServiceServer) Send(context.Context, *EventServiceSendRequest) (*EventServiceSendResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Send not implemented") } +func (UnimplementedEventServiceServer) testEmbeddedByValue() {} // UnsafeEventServiceServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to EventServiceServer will @@ -69,6 +74,13 @@ type UnsafeEventServiceServer interface { } func RegisterEventServiceServer(s grpc.ServiceRegistrar, srv EventServiceServer) { + // If the following call pancis, it indicates UnimplementedEventServiceServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } s.RegisterService(&EventService_ServiceDesc, srv) } diff --git a/proto/Makefile b/proto/Makefile index a8ae72a97..4c9204f6f 100644 --- a/proto/Makefile +++ b/proto/Makefile @@ -1,5 +1,5 @@ MAKEFLAGS += --no-print-directory -BUF_VERSION := 1.34.0 +BUF_VERSION := 1.46.0 _buf: docker run --rm \ diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml index 22c1eb9c2..8a502fab9 100644 --- a/proto/buf.gen.yaml +++ b/proto/buf.gen.yaml @@ -1,7 +1,7 @@ version: v2 plugins: - - remote: buf.build/protocolbuffers/go:v1.34.2 + - remote: buf.build/protocolbuffers/go:v1.35.1 out: ../pkg/api - - remote: buf.build/grpc/go:v1.3.0 + - remote: buf.build/grpc/go:v1.5.1 out: ../pkg/api opt: require_unimplemented_servers=false diff --git a/proto/buf.yaml b/proto/buf.yaml index b9dd0e436..4bca7c97c 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,7 +1,7 @@ version: v2 lint: use: - - DEFAULT + - STANDARD except: - FIELD_NOT_REQUIRED - PACKAGE_NO_IMPORT_CYCLE