From 1c48e7ed17dea2dfff79064d5f7fba41174c7116 Mon Sep 17 00:00:00 2001 From: Francesco Torta <62566275+fra98@users.noreply.github.com> Date: Thu, 24 Oct 2024 17:23:18 +0200 Subject: [PATCH] chore: bump protoc binaries and grpc lib --- Makefile | 14 +- go.mod | 8 +- go.sum | 16 +- pkg/ipam/ipam.pb.go | 360 ++++++++------------------------------- pkg/ipam/ipam_grpc.pb.go | 51 ++++-- 5 files changed, 117 insertions(+), 332 deletions(-) diff --git a/Makefile b/Makefile index 90fee5c3c1..5261113b00 100644 --- a/Makefile +++ b/Makefile @@ -162,26 +162,18 @@ generate-groups: # Generate gRPC files grpc: protoc $(PROTOC) --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative pkg/ipam/ipam.proto - $(PROTOC) --go_out=pkg/liqo-controller-manager/resource-request-controller/resource-monitors --go_opt=paths=source_relative \ - --go-grpc_out=pkg/liqo-controller-manager/resource-request-controller/resource-monitors --go-grpc_opt=paths=source_relative \ - -I pkg/liqo-controller-manager/resource-request-controller/resource-monitors \ - pkg/liqo-controller-manager/resource-request-controller/resource-monitors/resource-reader.proto protoc: ifeq (, $(shell which protoc)) @{ \ PB_REL="https://github.com/protocolbuffers/protobuf/releases" ;\ - version=3.15.5 ;\ + version=28.3 ;\ arch=x86_64 ;\ curl -LO $${PB_REL}/download/v$${version}/protoc-$${version}-linux-$${arch}.zip ;\ unzip protoc-$${version}-linux-$${arch}.zip -d $${HOME}/.local ;\ rm protoc-$${version}-linux-$${arch}.zip ;\ - PROTOC_TMP_DIR=$$(mktemp -d) ;\ - cd $$PROTOC_TMP_DIR ;\ - go mod init tmp ;\ - go get google.golang.org/protobuf/cmd/protoc-gen-go ;\ - go get google.golang.org/grpc/cmd/protoc-gen-go-grpc ;\ - rm -rf $$PROTOC_TMP_DIR ;\ + go install google.golang.org/protobuf/cmd/protoc-gen-go@latest ;\ + go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest ;\ } endif PROTOC=$(shell which protoc) diff --git a/go.mod b/go.mod index 6637d704f1..0563f54eb9 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220504211119-3d4a969bb56b gomodules.xyz/jsonpatch/v2 v2.4.0 google.golang.org/api v0.162.0 - google.golang.org/grpc v1.65.0 + google.golang.org/grpc v1.67.1 google.golang.org/protobuf v1.35.1 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.16.2 @@ -67,7 +67,7 @@ require ( atomicgo.dev/cursor v0.2.0 // indirect atomicgo.dev/keyboard v0.2.9 // indirect atomicgo.dev/schedule v0.1.0 // indirect - cloud.google.com/go/compute/metadata v0.3.0 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect dario.cat/mergo v1.0.1 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect @@ -246,8 +246,8 @@ require ( golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.zx2c4.com/wireguard v0.0.0-20220904105730-b51010ba13f0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index bf44bf404d..ff4f8619e5 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bP cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -1097,10 +1097,10 @@ google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8= +google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1110,8 +1110,8 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/pkg/ipam/ipam.pb.go b/pkg/ipam/ipam.pb.go index 0bdb123a75..82a36e4ca4 100644 --- a/pkg/ipam/ipam.pb.go +++ b/pkg/ipam/ipam.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 -// protoc v3.15.5 +// protoc-gen-go v1.35.1 +// protoc v5.28.3 // source: pkg/ipam/ipam.proto package ipam @@ -32,11 +32,9 @@ type MapRequest struct { func (x *MapRequest) Reset() { *x = MapRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MapRequest) String() string { @@ -47,7 +45,7 @@ func (*MapRequest) ProtoMessage() {} func (x *MapRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -86,11 +84,9 @@ type MapResponse struct { func (x *MapResponse) Reset() { *x = MapResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MapResponse) String() string { @@ -101,7 +97,7 @@ func (*MapResponse) ProtoMessage() {} func (x *MapResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -134,11 +130,9 @@ type UnmapRequest struct { func (x *UnmapRequest) Reset() { *x = UnmapRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UnmapRequest) String() string { @@ -149,7 +143,7 @@ func (*UnmapRequest) ProtoMessage() {} func (x *UnmapRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -186,11 +180,9 @@ type UnmapResponse struct { func (x *UnmapResponse) Reset() { *x = UnmapResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UnmapResponse) String() string { @@ -201,7 +193,7 @@ func (*UnmapResponse) ProtoMessage() {} func (x *UnmapResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -226,11 +218,9 @@ type MapCIDRRequest struct { func (x *MapCIDRRequest) Reset() { *x = MapCIDRRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MapCIDRRequest) String() string { @@ -241,7 +231,7 @@ func (*MapCIDRRequest) ProtoMessage() {} func (x *MapCIDRRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -273,11 +263,9 @@ type MapCIDRResponse struct { func (x *MapCIDRResponse) Reset() { *x = MapCIDRResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *MapCIDRResponse) String() string { @@ -288,7 +276,7 @@ func (*MapCIDRResponse) ProtoMessage() {} func (x *MapCIDRResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -320,11 +308,9 @@ type UnmapCIDRRequest struct { func (x *UnmapCIDRRequest) Reset() { *x = UnmapCIDRRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UnmapCIDRRequest) String() string { @@ -335,7 +321,7 @@ func (*UnmapCIDRRequest) ProtoMessage() {} func (x *UnmapCIDRRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -365,11 +351,9 @@ type UnmapCIDRResponse struct { func (x *UnmapCIDRResponse) Reset() { *x = UnmapCIDRResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *UnmapCIDRResponse) String() string { @@ -380,7 +364,7 @@ func (*UnmapCIDRResponse) ProtoMessage() {} func (x *UnmapCIDRResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -406,11 +390,9 @@ type GetHomePodIPRequest struct { func (x *GetHomePodIPRequest) Reset() { *x = GetHomePodIPRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetHomePodIPRequest) String() string { @@ -421,7 +403,7 @@ func (*GetHomePodIPRequest) ProtoMessage() {} func (x *GetHomePodIPRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -460,11 +442,9 @@ type GetHomePodIPResponse struct { func (x *GetHomePodIPResponse) Reset() { *x = GetHomePodIPResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetHomePodIPResponse) String() string { @@ -475,7 +455,7 @@ func (*GetHomePodIPResponse) ProtoMessage() {} func (x *GetHomePodIPResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -507,11 +487,9 @@ type BelongsRequest struct { func (x *BelongsRequest) Reset() { *x = BelongsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BelongsRequest) String() string { @@ -522,7 +500,7 @@ func (*BelongsRequest) ProtoMessage() {} func (x *BelongsRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -554,11 +532,9 @@ type BelongsResponse struct { func (x *BelongsResponse) Reset() { *x = BelongsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *BelongsResponse) String() string { @@ -569,7 +545,7 @@ func (*BelongsResponse) ProtoMessage() {} func (x *BelongsResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -601,11 +577,9 @@ type GetOrSetExtCIDRRequest struct { func (x *GetOrSetExtCIDRRequest) Reset() { *x = GetOrSetExtCIDRRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetOrSetExtCIDRRequest) String() string { @@ -616,7 +590,7 @@ func (*GetOrSetExtCIDRRequest) ProtoMessage() {} func (x *GetOrSetExtCIDRRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -648,11 +622,9 @@ type GetOrSetExtCIDRResponse struct { func (x *GetOrSetExtCIDRResponse) Reset() { *x = GetOrSetExtCIDRResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *GetOrSetExtCIDRResponse) String() string { @@ -663,7 +635,7 @@ func (*GetOrSetExtCIDRResponse) ProtoMessage() {} func (x *GetOrSetExtCIDRResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -697,11 +669,9 @@ type SetSubnetsPerClusterRequest struct { func (x *SetSubnetsPerClusterRequest) Reset() { *x = SetSubnetsPerClusterRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetSubnetsPerClusterRequest) String() string { @@ -712,7 +682,7 @@ func (*SetSubnetsPerClusterRequest) ProtoMessage() {} func (x *SetSubnetsPerClusterRequest) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -756,11 +726,9 @@ type SetSubnetsPerClusterResponse struct { func (x *SetSubnetsPerClusterResponse) Reset() { *x = SetSubnetsPerClusterResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_ipam_ipam_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_pkg_ipam_ipam_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *SetSubnetsPerClusterResponse) String() string { @@ -771,7 +739,7 @@ func (*SetSubnetsPerClusterResponse) ProtoMessage() {} func (x *SetSubnetsPerClusterResponse) ProtoReflect() protoreflect.Message { mi := &file_pkg_ipam_ipam_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) @@ -889,7 +857,7 @@ func file_pkg_ipam_ipam_proto_rawDescGZIP() []byte { } var file_pkg_ipam_ipam_proto_msgTypes = make([]protoimpl.MessageInfo, 16) -var file_pkg_ipam_ipam_proto_goTypes = []interface{}{ +var file_pkg_ipam_ipam_proto_goTypes = []any{ (*MapRequest)(nil), // 0: MapRequest (*MapResponse)(nil), // 1: MapResponse (*UnmapRequest)(nil), // 2: UnmapRequest @@ -936,200 +904,6 @@ func file_pkg_ipam_ipam_proto_init() { if File_pkg_ipam_ipam_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_pkg_ipam_ipam_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MapRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MapResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UnmapRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UnmapResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MapCIDRRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MapCIDRResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UnmapCIDRRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UnmapCIDRResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetHomePodIPRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetHomePodIPResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BelongsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BelongsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetOrSetExtCIDRRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetOrSetExtCIDRResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetSubnetsPerClusterRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_ipam_ipam_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SetSubnetsPerClusterResponse); 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/ipam/ipam_grpc.pb.go b/pkg/ipam/ipam_grpc.pb.go index 6003b26759..533b96eec3 100644 --- a/pkg/ipam/ipam_grpc.pb.go +++ b/pkg/ipam/ipam_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.3.0 -// - protoc v3.15.5 +// - protoc-gen-go-grpc v1.5.1 +// - protoc v5.28.3 // source: pkg/ipam/ipam.proto package ipam @@ -16,8 +16,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 ( Ipam_MapEndpointIP_FullMethodName = "/ipam/MapEndpointIP" @@ -53,8 +53,9 @@ func NewIpamClient(cc grpc.ClientConnInterface) IpamClient { } func (c *ipamClient) MapEndpointIP(ctx context.Context, in *MapRequest, opts ...grpc.CallOption) (*MapResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(MapResponse) - err := c.cc.Invoke(ctx, Ipam_MapEndpointIP_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_MapEndpointIP_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -62,8 +63,9 @@ func (c *ipamClient) MapEndpointIP(ctx context.Context, in *MapRequest, opts ... } func (c *ipamClient) UnmapEndpointIP(ctx context.Context, in *UnmapRequest, opts ...grpc.CallOption) (*UnmapResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UnmapResponse) - err := c.cc.Invoke(ctx, Ipam_UnmapEndpointIP_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_UnmapEndpointIP_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -71,8 +73,9 @@ func (c *ipamClient) UnmapEndpointIP(ctx context.Context, in *UnmapRequest, opts } func (c *ipamClient) MapNetworkCIDR(ctx context.Context, in *MapCIDRRequest, opts ...grpc.CallOption) (*MapCIDRResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(MapCIDRResponse) - err := c.cc.Invoke(ctx, Ipam_MapNetworkCIDR_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_MapNetworkCIDR_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -80,8 +83,9 @@ func (c *ipamClient) MapNetworkCIDR(ctx context.Context, in *MapCIDRRequest, opt } func (c *ipamClient) UnmapNetworkCIDR(ctx context.Context, in *UnmapCIDRRequest, opts ...grpc.CallOption) (*UnmapCIDRResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(UnmapCIDRResponse) - err := c.cc.Invoke(ctx, Ipam_UnmapNetworkCIDR_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_UnmapNetworkCIDR_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -89,8 +93,9 @@ func (c *ipamClient) UnmapNetworkCIDR(ctx context.Context, in *UnmapCIDRRequest, } func (c *ipamClient) GetHomePodIP(ctx context.Context, in *GetHomePodIPRequest, opts ...grpc.CallOption) (*GetHomePodIPResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetHomePodIPResponse) - err := c.cc.Invoke(ctx, Ipam_GetHomePodIP_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_GetHomePodIP_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -98,8 +103,9 @@ func (c *ipamClient) GetHomePodIP(ctx context.Context, in *GetHomePodIPRequest, } func (c *ipamClient) BelongsToPodCIDR(ctx context.Context, in *BelongsRequest, opts ...grpc.CallOption) (*BelongsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(BelongsResponse) - err := c.cc.Invoke(ctx, Ipam_BelongsToPodCIDR_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_BelongsToPodCIDR_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -107,8 +113,9 @@ func (c *ipamClient) BelongsToPodCIDR(ctx context.Context, in *BelongsRequest, o } func (c *ipamClient) GetOrSetExternalCIDR(ctx context.Context, in *GetOrSetExtCIDRRequest, opts ...grpc.CallOption) (*GetOrSetExtCIDRResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(GetOrSetExtCIDRResponse) - err := c.cc.Invoke(ctx, Ipam_GetOrSetExternalCIDR_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_GetOrSetExternalCIDR_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -116,8 +123,9 @@ func (c *ipamClient) GetOrSetExternalCIDR(ctx context.Context, in *GetOrSetExtCI } func (c *ipamClient) SetSubnetsPerCluster(ctx context.Context, in *SetSubnetsPerClusterRequest, opts ...grpc.CallOption) (*SetSubnetsPerClusterResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(SetSubnetsPerClusterResponse) - err := c.cc.Invoke(ctx, Ipam_SetSubnetsPerCluster_FullMethodName, in, out, opts...) + err := c.cc.Invoke(ctx, Ipam_SetSubnetsPerCluster_FullMethodName, in, out, cOpts...) if err != nil { return nil, err } @@ -126,7 +134,7 @@ func (c *ipamClient) SetSubnetsPerCluster(ctx context.Context, in *SetSubnetsPer // IpamServer is the server API for Ipam service. // All implementations must embed UnimplementedIpamServer -// for forward compatibility +// for forward compatibility. type IpamServer interface { MapEndpointIP(context.Context, *MapRequest) (*MapResponse, error) UnmapEndpointIP(context.Context, *UnmapRequest) (*UnmapResponse, error) @@ -139,9 +147,12 @@ type IpamServer interface { mustEmbedUnimplementedIpamServer() } -// UnimplementedIpamServer must be embedded to have forward compatible implementations. -type UnimplementedIpamServer struct { -} +// UnimplementedIpamServer must 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 UnimplementedIpamServer struct{} func (UnimplementedIpamServer) MapEndpointIP(context.Context, *MapRequest) (*MapResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MapEndpointIP not implemented") @@ -168,6 +179,7 @@ func (UnimplementedIpamServer) SetSubnetsPerCluster(context.Context, *SetSubnets return nil, status.Errorf(codes.Unimplemented, "method SetSubnetsPerCluster not implemented") } func (UnimplementedIpamServer) mustEmbedUnimplementedIpamServer() {} +func (UnimplementedIpamServer) testEmbeddedByValue() {} // UnsafeIpamServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to IpamServer will @@ -177,6 +189,13 @@ type UnsafeIpamServer interface { } func RegisterIpamServer(s grpc.ServiceRegistrar, srv IpamServer) { + // If the following call pancis, it indicates UnimplementedIpamServer 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(&Ipam_ServiceDesc, srv) }