From 298dd728e6265a804a381be077410aa42e552d28 Mon Sep 17 00:00:00 2001 From: Mike Fridman Date: Mon, 16 Sep 2024 08:51:11 -0400 Subject: [PATCH 1/2] Upgrade google.golang.org/protobuf/proto and buf to latest --- make/go/dep_buf.mk | 4 ++-- make/go/dep_protoc_gen_go.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/make/go/dep_buf.mk b/make/go/dep_buf.mk index 3620833..e827b50 100644 --- a/make/go/dep_buf.mk +++ b/make/go/dep_buf.mk @@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS) $(call _assert_var,CACHE_BIN) # Settable -# https://github.com/bufbuild/buf/releases 20240822 checked 20240826 -BUF_VERSION ?= v1.38.0 +# https://github.com/bufbuild/buf/releases 20240911 checked 20240916 +BUF_VERSION ?= v1.41.0 # Settable # # If set, this path will be installed every time someone depends on $(BUF) diff --git a/make/go/dep_protoc_gen_go.mk b/make/go/dep_protoc_gen_go.mk index 9f9520b..17ea695 100644 --- a/make/go/dep_protoc_gen_go.mk +++ b/make/go/dep_protoc_gen_go.mk @@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS) $(call _assert_var,CACHE_BIN) # Settable -# https://github.com/protocolbuffers/protobuf-go/releases 20240611 checked 20240612 -PROTOC_GEN_GO_VERSION ?= v1.34.2 +# https://github.com/protocolbuffers/protobuf-go/releases 20240906 checked 20240916 +PROTOC_GEN_GO_VERSION ?= v1.34.3-0.20240906163944-03df6c145d96 GO_GET_PKGS := $(GO_GET_PKGS) \ google.golang.org/protobuf/proto@$(PROTOC_GEN_GO_VERSION) From 31080e0a379c59ac5fe3091b02e9a90d21658582 Mon Sep 17 00:00:00 2001 From: Mike Fridman Date: Mon, 16 Sep 2024 08:56:26 -0400 Subject: [PATCH 2/2] commit generated code --- internal/gen/proto/go/org/foo/v1/foo.pb.go | 26 +++++----------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/internal/gen/proto/go/org/foo/v1/foo.pb.go b/internal/gen/proto/go/org/foo/v1/foo.pb.go index c403a2d..ada919d 100644 --- a/internal/gen/proto/go/org/foo/v1/foo.pb.go +++ b/internal/gen/proto/go/org/foo/v1/foo.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.2 +// protoc-gen-go v1.34.2-devel // protoc (unknown) // source: org/foo/v1/foo.proto @@ -44,11 +44,9 @@ type Bar struct { func (x *Bar) Reset() { *x = Bar{} - if protoimpl.UnsafeEnabled { - mi := &file_org_foo_v1_foo_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } + mi := &file_org_foo_v1_foo_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } func (x *Bar) String() string { @@ -59,7 +57,7 @@ func (*Bar) ProtoMessage() {} func (x *Bar) ProtoReflect() protoreflect.Message { mi := &file_org_foo_v1_foo_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) @@ -130,20 +128,6 @@ func file_org_foo_v1_foo_proto_init() { if File_org_foo_v1_foo_proto != nil { return } - if !protoimpl.UnsafeEnabled { - file_org_foo_v1_foo_proto_msgTypes[0].Exporter = func(v any, i int) any { - switch v := v.(*Bar); 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{