From bc153d4ab415a071ae18457f3773704ca7b03831 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 8 Sep 2021 10:46:36 -0700 Subject: [PATCH 1/5] Run protobuild on GitHub Actions Signed-off-by: Kazuyoshi Kato --- .github/workflows/ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da753a2..f636c19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,3 +41,20 @@ jobs: working-directory: src/github.com/containerd/protobuild run: | go build . + + - name: Install protoc + run: | + curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protoc-3.17.3-linux-x86_64.zip + sudo unzip -x protoc-3.17.3-linux-x86_64.zip -d /usr/local + sudo chmod -R go+rX /usr/local + sudo chmod go+x /usr/local/bin/protoc + + - name: Install protoc-gen-go + run: | + go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1 + + - name: Run protobuild + working-directory: src/github.com/containerd/protobuild + run: | + export PATH=$(go env GOBIN):$PATH + go list ./... | grep -v vendor | xargs ./protobuild From 39ce1f9634314e340c1281079088f32938241d81 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 8 Sep 2021 15:00:16 -0700 Subject: [PATCH 2/5] Remove import_path Signed-off-by: Kazuyoshi Kato --- protoc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protoc.go b/protoc.go index c8fa0de..8f81888 100644 --- a/protoc.go +++ b/protoc.go @@ -35,7 +35,7 @@ var ( {{- if $index}}+{{end}} {{- $plugin}} {{- end -}} - ,{{- end -}}import_path={{.ImportPath}} + ,{{- end -}} {{- range $proto, $gopkg := .PackageMap -}},M {{- $proto}}={{$gopkg -}} {{- end -}} From 3fce6531271f5a19a40cd0aebf2a5cf802379146 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 8 Sep 2021 15:07:20 -0700 Subject: [PATCH 3/5] Make Protobuild.toml work with the latest protobuf packages - plugins are fully deprecated. - packages may work, but gogo wouldn't. Signed-off-by: Kazuyoshi Kato --- Protobuild.toml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Protobuild.toml b/Protobuild.toml index 3f1e6cb..4a0030a 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -5,11 +5,6 @@ version = "unstable" # example that selects the ctrd vanity binary. # generator = "gogoctrd" -# Plugins allows one to specify one or more plugins for use in generation. -# -# The common example grpc is provided below. -plugins = ["grpc"] - # Control protoc include paths. Below are usually some good defaults, but feel # free to try it without them if it works for your project. [includes] @@ -53,10 +48,6 @@ plugins = ["grpc"] # # We have a few examples to map packages from the examples. [packages] - "gogoproto/gogo.proto" = "github.com/gogo/protobuf/gogoproto" - "google/protobuf/descriptor.proto" = "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - "google/protobuf/timestamp.proto" = "github.com/gogo/protobuf/types" - "google/protobuf/empty.proto" = "github.com/gogo/protobuf/types" # Overrides allows one to specify configuration overrides for specific # packages. Currently, only overriding the generator and plugin set are From 614304896d7ffecf2e6724d3fd40fd50cae073bd Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 8 Sep 2021 15:09:46 -0700 Subject: [PATCH 4/5] Commit auto-generated files Signed-off-by: Kazuyoshi Kato --- examples/bar/bar.pb.go | 273 +++++++++++++++++------------------ examples/foo/foo.pb.go | 273 +++++++++++++++++------------------ examples/next.pb.txt | 4 +- examples/nogrpc/nogrpc.pb.go | 187 +++++++++++++++++------- 4 files changed, 401 insertions(+), 336 deletions(-) diff --git a/examples/bar/bar.pb.go b/examples/bar/bar.pb.go index 223be5f..1778850 100644 --- a/examples/bar/bar.pb.go +++ b/examples/bar/bar.pb.go @@ -1,170 +1,165 @@ // Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1 +// protoc v3.17.1 // source: github.com/stevvooe/protobuild/examples/bar/bar.proto package bar import ( - context "context" - fmt "fmt" - types "github.com/gogo/protobuf/types" - proto "github.com/golang/protobuf/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - math "math" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" ) -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) type DoRequest struct { - Timestamp *types.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields -func (m *DoRequest) Reset() { *m = DoRequest{} } -func (m *DoRequest) String() string { return proto.CompactTextString(m) } -func (*DoRequest) ProtoMessage() {} -func (*DoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_818fea20c208cd0e, []int{0} + Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } -func (m *DoRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DoRequest.Unmarshal(m, b) -} -func (m *DoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DoRequest.Marshal(b, m, deterministic) -} -func (m *DoRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DoRequest.Merge(m, src) -} -func (m *DoRequest) XXX_Size() int { - return xxx_messageInfo_DoRequest.Size(m) -} -func (m *DoRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DoRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DoRequest proto.InternalMessageInfo - -func (m *DoRequest) GetTimestamp() *types.Timestamp { - if m != nil { - return m.Timestamp +func (x *DoRequest) Reset() { + *x = DoRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_github_com_stevvooe_protobuild_examples_bar_bar_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } - return nil -} - -func init() { - proto.RegisterType((*DoRequest)(nil), "protobuild.example.bar.DoRequest") -} - -func init() { - proto.RegisterFile("github.com/stevvooe/protobuild/examples/bar/bar.proto", fileDescriptor_818fea20c208cd0e) -} - -var fileDescriptor_818fea20c208cd0e = []byte{ - // 202 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4d, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x2e, 0x49, 0x2d, 0x2b, 0xcb, 0xcf, 0x4f, 0xd5, - 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0xcd, 0xcc, 0x49, 0xd1, 0x4f, 0xad, 0x48, 0xcc, 0x2d, - 0xc8, 0x49, 0x2d, 0xd6, 0x4f, 0x4a, 0x2c, 0x02, 0x61, 0x3d, 0xb0, 0x9c, 0x90, 0x18, 0x42, 0x89, - 0x1e, 0x54, 0x89, 0x5e, 0x52, 0x62, 0x91, 0x94, 0x74, 0x7a, 0x7e, 0x7e, 0x7a, 0x0e, 0xdc, 0x84, - 0x34, 0xfd, 0xd4, 0xdc, 0x82, 0x92, 0x4a, 0x88, 0x26, 0x29, 0x79, 0x74, 0xc9, 0x92, 0xcc, 0xdc, - 0xd4, 0xe2, 0x92, 0xc4, 0xdc, 0x02, 0x88, 0x02, 0x25, 0x57, 0x2e, 0x4e, 0x97, 0xfc, 0xa0, 0xd4, - 0xc2, 0xd2, 0xd4, 0xe2, 0x12, 0x21, 0x0b, 0x2e, 0x4e, 0xb8, 0xbc, 0x04, 0xb3, 0x02, 0xa3, 0x06, - 0xb7, 0x91, 0x94, 0x1e, 0xc4, 0x04, 0x3d, 0x98, 0x09, 0x7a, 0x21, 0x30, 0x15, 0x41, 0x08, 0xc5, - 0x46, 0x6e, 0x5c, 0xcc, 0x4e, 0x89, 0x45, 0x42, 0xf6, 0x5c, 0x4c, 0x2e, 0xf9, 0x42, 0x8a, 0x7a, - 0xd8, 0x9d, 0xaa, 0x07, 0xb7, 0x49, 0x4a, 0x0c, 0xc3, 0x58, 0x57, 0x90, 0xab, 0x9d, 0x8c, 0xa2, - 0x0c, 0x48, 0x09, 0x1d, 0xeb, 0xa4, 0xc4, 0xa2, 0x24, 0x36, 0xb0, 0xac, 0x31, 0x20, 0x00, 0x00, - 0xff, 0xff, 0x30, 0x29, 0xdd, 0xf7, 0x58, 0x01, 0x00, 0x00, } -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConnInterface - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 - -// BarClient is the client API for Bar service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type BarClient interface { - Do(ctx context.Context, in *DoRequest, opts ...grpc.CallOption) (*types.Empty, error) +func (x *DoRequest) String() string { + return protoimpl.X.MessageStringOf(x) } -type barClient struct { - cc grpc.ClientConnInterface -} +func (*DoRequest) ProtoMessage() {} -func NewBarClient(cc grpc.ClientConnInterface) BarClient { - return &barClient{cc} -} - -func (c *barClient) Do(ctx context.Context, in *DoRequest, opts ...grpc.CallOption) (*types.Empty, error) { - out := new(types.Empty) - err := c.cc.Invoke(ctx, "/protobuild.example.bar.Bar/Do", in, out, opts...) - if err != nil { - return nil, err +func (x *DoRequest) ProtoReflect() protoreflect.Message { + mi := &file_github_com_stevvooe_protobuild_examples_bar_bar_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms } - return out, nil -} - -// BarServer is the server API for Bar service. -type BarServer interface { - Do(context.Context, *DoRequest) (*types.Empty, error) + return mi.MessageOf(x) } -// UnimplementedBarServer can be embedded to have forward compatible implementations. -type UnimplementedBarServer struct { +// Deprecated: Use DoRequest.ProtoReflect.Descriptor instead. +func (*DoRequest) Descriptor() ([]byte, []int) { + return file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescGZIP(), []int{0} } -func (*UnimplementedBarServer) Do(ctx context.Context, req *DoRequest) (*types.Empty, error) { - return nil, status.Errorf(codes.Unimplemented, "method Do not implemented") +func (x *DoRequest) GetTimestamp() *timestamppb.Timestamp { + if x != nil { + return x.Timestamp + } + return nil } -func RegisterBarServer(s *grpc.Server, srv BarServer) { - s.RegisterService(&_Bar_serviceDesc, srv) -} +var File_github_com_stevvooe_protobuild_examples_bar_bar_proto protoreflect.FileDescriptor + +var file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDesc = []byte{ + 0x0a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x65, + 0x76, 0x76, 0x6f, 0x6f, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, + 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x62, 0x61, 0x72, 0x2f, 0x62, 0x61, + 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x69, 0x6c, 0x64, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x62, 0x61, 0x72, 0x1a, + 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x45, 0x0a, + 0x09, 0x44, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x32, 0x46, 0x0a, 0x03, 0x42, 0x61, 0x72, 0x12, 0x3f, 0x0a, 0x02, 0x44, + 0x6f, 0x12, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x65, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x62, 0x61, 0x72, 0x2e, 0x44, 0x6f, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x32, 0x5a, 0x30, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x65, 0x76, 0x76, + 0x6f, 0x6f, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2f, 0x65, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x62, 0x61, 0x72, 0x2f, 0x3b, 0x62, 0x61, 0x72, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescOnce sync.Once + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescData = file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDesc +) -func _Bar_Do_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DoRequest) - if err := dec(in); err != nil { - return nil, err +func file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescGZIP() []byte { + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescOnce.Do(func() { + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescData) + }) + return file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDescData +} + +var file_github_com_stevvooe_protobuild_examples_bar_bar_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_github_com_stevvooe_protobuild_examples_bar_bar_proto_goTypes = []interface{}{ + (*DoRequest)(nil), // 0: protobuild.example.bar.DoRequest + (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp + (*emptypb.Empty)(nil), // 2: google.protobuf.Empty +} +var file_github_com_stevvooe_protobuild_examples_bar_bar_proto_depIdxs = []int32{ + 1, // 0: protobuild.example.bar.DoRequest.timestamp:type_name -> google.protobuf.Timestamp + 0, // 1: protobuild.example.bar.Bar.Do:input_type -> protobuild.example.bar.DoRequest + 2, // 2: protobuild.example.bar.Bar.Do:output_type -> google.protobuf.Empty + 2, // [2:3] is the sub-list for method output_type + 1, // [1:2] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_github_com_stevvooe_protobuild_examples_bar_bar_proto_init() } +func file_github_com_stevvooe_protobuild_examples_bar_bar_proto_init() { + if File_github_com_stevvooe_protobuild_examples_bar_bar_proto != nil { + return } - if interceptor == nil { - return srv.(BarServer).Do(ctx, in) + if !protoimpl.UnsafeEnabled { + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DoRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/protobuild.example.bar.Bar/Do", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BarServer).Do(ctx, req.(*DoRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Bar_serviceDesc = grpc.ServiceDesc{ - ServiceName: "protobuild.example.bar.Bar", - HandlerType: (*BarServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Do", - Handler: _Bar_Do_Handler, + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 1, }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "github.com/stevvooe/protobuild/examples/bar/bar.proto", + GoTypes: file_github_com_stevvooe_protobuild_examples_bar_bar_proto_goTypes, + DependencyIndexes: file_github_com_stevvooe_protobuild_examples_bar_bar_proto_depIdxs, + MessageInfos: file_github_com_stevvooe_protobuild_examples_bar_bar_proto_msgTypes, + }.Build() + File_github_com_stevvooe_protobuild_examples_bar_bar_proto = out.File + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_rawDesc = nil + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_goTypes = nil + file_github_com_stevvooe_protobuild_examples_bar_bar_proto_depIdxs = nil } diff --git a/examples/foo/foo.pb.go b/examples/foo/foo.pb.go index b616caf..836b830 100644 --- a/examples/foo/foo.pb.go +++ b/examples/foo/foo.pb.go @@ -1,170 +1,165 @@ // Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1 +// protoc v3.17.1 // source: github.com/stevvooe/protobuild/examples/foo/foo.proto package foo import ( - context "context" - fmt "fmt" - types "github.com/gogo/protobuf/types" - proto "github.com/golang/protobuf/proto" - grpc "google.golang.org/grpc" - codes "google.golang.org/grpc/codes" - status "google.golang.org/grpc/status" - math "math" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" ) -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) type DoRequest struct { - Timestamp *types.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields -func (m *DoRequest) Reset() { *m = DoRequest{} } -func (m *DoRequest) String() string { return proto.CompactTextString(m) } -func (*DoRequest) ProtoMessage() {} -func (*DoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d680d085ff9483cd, []int{0} + Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } -func (m *DoRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DoRequest.Unmarshal(m, b) -} -func (m *DoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DoRequest.Marshal(b, m, deterministic) -} -func (m *DoRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DoRequest.Merge(m, src) -} -func (m *DoRequest) XXX_Size() int { - return xxx_messageInfo_DoRequest.Size(m) -} -func (m *DoRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DoRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DoRequest proto.InternalMessageInfo - -func (m *DoRequest) GetTimestamp() *types.Timestamp { - if m != nil { - return m.Timestamp +func (x *DoRequest) Reset() { + *x = DoRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_github_com_stevvooe_protobuild_examples_foo_foo_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) } - return nil -} - -func init() { - proto.RegisterType((*DoRequest)(nil), "protobuild.example.foo.DoRequest") -} - -func init() { - proto.RegisterFile("github.com/stevvooe/protobuild/examples/foo/foo.proto", fileDescriptor_d680d085ff9483cd) -} - -var fileDescriptor_d680d085ff9483cd = []byte{ - // 202 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0x4d, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x2e, 0x49, 0x2d, 0x2b, 0xcb, 0xcf, 0x4f, 0xd5, - 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0xcd, 0xcc, 0x49, 0xd1, 0x4f, 0xad, 0x48, 0xcc, 0x2d, - 0xc8, 0x49, 0x2d, 0xd6, 0x4f, 0xcb, 0xcf, 0x07, 0x61, 0x3d, 0xb0, 0x9c, 0x90, 0x18, 0x42, 0x89, - 0x1e, 0x54, 0x89, 0x5e, 0x5a, 0x7e, 0xbe, 0x94, 0x74, 0x7a, 0x7e, 0x7e, 0x7a, 0x0e, 0xdc, 0x84, - 0x34, 0xfd, 0xd4, 0xdc, 0x82, 0x92, 0x4a, 0x88, 0x26, 0x29, 0x79, 0x74, 0xc9, 0x92, 0xcc, 0xdc, - 0xd4, 0xe2, 0x92, 0xc4, 0xdc, 0x02, 0x88, 0x02, 0x25, 0x57, 0x2e, 0x4e, 0x97, 0xfc, 0xa0, 0xd4, - 0xc2, 0xd2, 0xd4, 0xe2, 0x12, 0x21, 0x0b, 0x2e, 0x4e, 0xb8, 0xbc, 0x04, 0xb3, 0x02, 0xa3, 0x06, - 0xb7, 0x91, 0x94, 0x1e, 0xc4, 0x04, 0x3d, 0x98, 0x09, 0x7a, 0x21, 0x30, 0x15, 0x41, 0x08, 0xc5, - 0x46, 0x6e, 0x5c, 0xcc, 0x6e, 0xf9, 0xf9, 0x42, 0xf6, 0x5c, 0x4c, 0x2e, 0xf9, 0x42, 0x8a, 0x7a, - 0xd8, 0x9d, 0xaa, 0x07, 0xb7, 0x49, 0x4a, 0x0c, 0xc3, 0x58, 0x57, 0x90, 0xab, 0x9d, 0x8c, 0xa2, - 0x0c, 0x48, 0x09, 0x1d, 0xeb, 0xb4, 0xfc, 0xfc, 0x24, 0x36, 0xb0, 0xac, 0x31, 0x20, 0x00, 0x00, - 0xff, 0xff, 0x93, 0xe1, 0xe7, 0xbc, 0x58, 0x01, 0x00, 0x00, } -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConnInterface - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 - -// FooClient is the client API for Foo service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type FooClient interface { - Do(ctx context.Context, in *DoRequest, opts ...grpc.CallOption) (*types.Empty, error) +func (x *DoRequest) String() string { + return protoimpl.X.MessageStringOf(x) } -type fooClient struct { - cc grpc.ClientConnInterface -} +func (*DoRequest) ProtoMessage() {} -func NewFooClient(cc grpc.ClientConnInterface) FooClient { - return &fooClient{cc} -} - -func (c *fooClient) Do(ctx context.Context, in *DoRequest, opts ...grpc.CallOption) (*types.Empty, error) { - out := new(types.Empty) - err := c.cc.Invoke(ctx, "/protobuild.example.foo.Foo/Do", in, out, opts...) - if err != nil { - return nil, err +func (x *DoRequest) ProtoReflect() protoreflect.Message { + mi := &file_github_com_stevvooe_protobuild_examples_foo_foo_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms } - return out, nil -} - -// FooServer is the server API for Foo service. -type FooServer interface { - Do(context.Context, *DoRequest) (*types.Empty, error) + return mi.MessageOf(x) } -// UnimplementedFooServer can be embedded to have forward compatible implementations. -type UnimplementedFooServer struct { +// Deprecated: Use DoRequest.ProtoReflect.Descriptor instead. +func (*DoRequest) Descriptor() ([]byte, []int) { + return file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescGZIP(), []int{0} } -func (*UnimplementedFooServer) Do(ctx context.Context, req *DoRequest) (*types.Empty, error) { - return nil, status.Errorf(codes.Unimplemented, "method Do not implemented") +func (x *DoRequest) GetTimestamp() *timestamppb.Timestamp { + if x != nil { + return x.Timestamp + } + return nil } -func RegisterFooServer(s *grpc.Server, srv FooServer) { - s.RegisterService(&_Foo_serviceDesc, srv) -} +var File_github_com_stevvooe_protobuild_examples_foo_foo_proto protoreflect.FileDescriptor + +var file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDesc = []byte{ + 0x0a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x65, + 0x76, 0x76, 0x6f, 0x6f, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, + 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x66, 0x6f, 0x6f, 0x2f, 0x66, 0x6f, + 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x16, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x69, 0x6c, 0x64, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x6f, 0x6f, 0x1a, + 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x45, 0x0a, + 0x09, 0x44, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x32, 0x46, 0x0a, 0x03, 0x46, 0x6f, 0x6f, 0x12, 0x3f, 0x0a, 0x02, 0x44, + 0x6f, 0x12, 0x21, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x65, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x66, 0x6f, 0x6f, 0x2e, 0x44, 0x6f, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x32, 0x5a, 0x30, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x65, 0x76, 0x76, + 0x6f, 0x6f, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2f, 0x65, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x66, 0x6f, 0x6f, 0x2f, 0x3b, 0x66, 0x6f, 0x6f, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescOnce sync.Once + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescData = file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDesc +) -func _Foo_Do_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DoRequest) - if err := dec(in); err != nil { - return nil, err +func file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescGZIP() []byte { + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescOnce.Do(func() { + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescData) + }) + return file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDescData +} + +var file_github_com_stevvooe_protobuild_examples_foo_foo_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_github_com_stevvooe_protobuild_examples_foo_foo_proto_goTypes = []interface{}{ + (*DoRequest)(nil), // 0: protobuild.example.foo.DoRequest + (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp + (*emptypb.Empty)(nil), // 2: google.protobuf.Empty +} +var file_github_com_stevvooe_protobuild_examples_foo_foo_proto_depIdxs = []int32{ + 1, // 0: protobuild.example.foo.DoRequest.timestamp:type_name -> google.protobuf.Timestamp + 0, // 1: protobuild.example.foo.Foo.Do:input_type -> protobuild.example.foo.DoRequest + 2, // 2: protobuild.example.foo.Foo.Do:output_type -> google.protobuf.Empty + 2, // [2:3] is the sub-list for method output_type + 1, // [1:2] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_github_com_stevvooe_protobuild_examples_foo_foo_proto_init() } +func file_github_com_stevvooe_protobuild_examples_foo_foo_proto_init() { + if File_github_com_stevvooe_protobuild_examples_foo_foo_proto != nil { + return } - if interceptor == nil { - return srv.(FooServer).Do(ctx, in) + if !protoimpl.UnsafeEnabled { + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DoRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/protobuild.example.foo.Foo/Do", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(FooServer).Do(ctx, req.(*DoRequest)) - } - return interceptor(ctx, in, info, handler) -} - -var _Foo_serviceDesc = grpc.ServiceDesc{ - ServiceName: "protobuild.example.foo.Foo", - HandlerType: (*FooServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Do", - Handler: _Foo_Do_Handler, + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 1, }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "github.com/stevvooe/protobuild/examples/foo/foo.proto", + GoTypes: file_github_com_stevvooe_protobuild_examples_foo_foo_proto_goTypes, + DependencyIndexes: file_github_com_stevvooe_protobuild_examples_foo_foo_proto_depIdxs, + MessageInfos: file_github_com_stevvooe_protobuild_examples_foo_foo_proto_msgTypes, + }.Build() + File_github_com_stevvooe_protobuild_examples_foo_foo_proto = out.File + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_rawDesc = nil + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_goTypes = nil + file_github_com_stevvooe_protobuild_examples_foo_foo_proto_depIdxs = nil } diff --git a/examples/next.pb.txt b/examples/next.pb.txt index 8797714..71745f7 100755 --- a/examples/next.pb.txt +++ b/examples/next.pb.txt @@ -8,7 +8,7 @@ file { java_package: "com.google.protobuf" java_outer_classname: "EmptyProto" java_multiple_files: true - go_package: "github.com/golang/protobuf/ptypes/empty" + go_package: "google.golang.org/protobuf/types/known/emptypb" cc_enable_arenas: true objc_class_prefix: "GPB" csharp_namespace: "Google.Protobuf.WellKnownTypes" @@ -39,7 +39,7 @@ file { java_package: "com.google.protobuf" java_outer_classname: "TimestampProto" java_multiple_files: true - go_package: "github.com/golang/protobuf/ptypes/timestamp" + go_package: "google.golang.org/protobuf/types/known/timestamppb" cc_enable_arenas: true objc_class_prefix: "GPB" csharp_namespace: "Google.Protobuf.WellKnownTypes" diff --git a/examples/nogrpc/nogrpc.pb.go b/examples/nogrpc/nogrpc.pb.go index 6bffa90..e3f3743 100644 --- a/examples/nogrpc/nogrpc.pb.go +++ b/examples/nogrpc/nogrpc.pb.go @@ -1,83 +1,158 @@ // Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1 +// protoc v3.17.1 // source: github.com/stevvooe/protobuild/examples/nogrpc/nogrpc.proto +// This package will be generated without the grpc plugin enabled, +// demonstrating the overrides feature. + package nogrpc import ( - fmt "fmt" - types "github.com/gogo/protobuf/types" - proto "github.com/golang/protobuf/proto" - math "math" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + reflect "reflect" + sync "sync" ) -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) type Thing struct { - Timestamp *types.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields -func (m *Thing) Reset() { *m = Thing{} } -func (m *Thing) String() string { return proto.CompactTextString(m) } -func (*Thing) ProtoMessage() {} -func (*Thing) Descriptor() ([]byte, []int) { - return fileDescriptor_d5d962b3cbb01fd4, []int{0} + Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } -func (m *Thing) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Thing.Unmarshal(m, b) -} -func (m *Thing) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Thing.Marshal(b, m, deterministic) -} -func (m *Thing) XXX_Merge(src proto.Message) { - xxx_messageInfo_Thing.Merge(m, src) +func (x *Thing) Reset() { + *x = Thing{} + if protoimpl.UnsafeEnabled { + mi := &file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } } -func (m *Thing) XXX_Size() int { - return xxx_messageInfo_Thing.Size(m) + +func (x *Thing) String() string { + return protoimpl.X.MessageStringOf(x) } -func (m *Thing) XXX_DiscardUnknown() { - xxx_messageInfo_Thing.DiscardUnknown(m) + +func (*Thing) ProtoMessage() {} + +func (x *Thing) ProtoReflect() protoreflect.Message { + mi := &file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) } -var xxx_messageInfo_Thing proto.InternalMessageInfo +// Deprecated: Use Thing.ProtoReflect.Descriptor instead. +func (*Thing) Descriptor() ([]byte, []int) { + return file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescGZIP(), []int{0} +} -func (m *Thing) GetTimestamp() *types.Timestamp { - if m != nil { - return m.Timestamp +func (x *Thing) GetTimestamp() *timestamppb.Timestamp { + if x != nil { + return x.Timestamp } return nil } -func init() { - proto.RegisterType((*Thing)(nil), "protobuild.example.nogrpc.Thing") +var File_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto protoreflect.FileDescriptor + +var file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDesc = []byte{ + 0x0a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x65, + 0x76, 0x76, 0x6f, 0x6f, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, + 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x6e, 0x6f, 0x67, 0x72, 0x70, 0x63, + 0x2f, 0x6e, 0x6f, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, + 0x65, 0x2e, 0x6e, 0x6f, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, + 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x41, 0x0a, 0x05, 0x54, 0x68, 0x69, + 0x6e, 0x67, 0x12, 0x38, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x38, 0x5a, 0x36, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x65, 0x76, 0x76, + 0x6f, 0x6f, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2f, 0x65, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x73, 0x2f, 0x6e, 0x6f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x3b, + 0x6e, 0x6f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } -func init() { - proto.RegisterFile("github.com/stevvooe/protobuild/examples/nogrpc/nogrpc.proto", fileDescriptor_d5d962b3cbb01fd4) +var ( + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescOnce sync.Once + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescData = file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDesc +) + +func file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescGZIP() []byte { + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescOnce.Do(func() { + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescData) + }) + return file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDescData } -var fileDescriptor_d5d962b3cbb01fd4 = []byte{ - // 159 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x2e, 0x49, 0x2d, 0x2b, 0xcb, 0xcf, 0x4f, 0xd5, - 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0xcd, 0xcc, 0x49, 0xd1, 0x4f, 0xad, 0x48, 0xcc, 0x2d, - 0xc8, 0x49, 0x2d, 0xd6, 0xcf, 0xcb, 0x4f, 0x2f, 0x2a, 0x48, 0x86, 0x52, 0x7a, 0x60, 0x15, 0x42, - 0x92, 0x08, 0x85, 0x7a, 0x50, 0x85, 0x7a, 0x10, 0x05, 0x52, 0xf2, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, - 0x70, 0xa3, 0xd2, 0xf4, 0x4b, 0x32, 0x73, 0x53, 0x8b, 0x4b, 0x12, 0x73, 0x0b, 0x20, 0x7a, 0x95, - 0x1c, 0xb9, 0x58, 0x43, 0x32, 0x32, 0xf3, 0xd2, 0x85, 0x2c, 0xb8, 0x38, 0xe1, 0x72, 0x12, 0xcc, - 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x52, 0x7a, 0x10, 0xdd, 0x7a, 0x30, 0xdd, 0x7a, 0x21, 0x30, 0x15, - 0x41, 0x08, 0xc5, 0x4e, 0x16, 0x51, 0x66, 0x24, 0xba, 0xde, 0x1a, 0x42, 0x27, 0xb1, 0x81, 0xd5, - 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xf5, 0xe5, 0x70, 0xfe, 0x00, 0x00, 0x00, +var file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_goTypes = []interface{}{ + (*Thing)(nil), // 0: protobuild.example.nogrpc.Thing + (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp +} +var file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_depIdxs = []int32{ + 1, // 0: protobuild.example.nogrpc.Thing.timestamp:type_name -> google.protobuf.Timestamp + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_init() } +func file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_init() { + if File_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Thing); 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{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_goTypes, + DependencyIndexes: file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_depIdxs, + MessageInfos: file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_msgTypes, + }.Build() + File_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto = out.File + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_rawDesc = nil + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_goTypes = nil + file_github_com_stevvooe_protobuild_examples_nogrpc_nogrpc_proto_depIdxs = nil } From 790c455cf64aa485d40ec1b0e9602939fb01bc69 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 8 Sep 2021 15:20:59 -0700 Subject: [PATCH 5/5] Upgrade protobuf packages and remove gogo/protobuf Signed-off-by: Kazuyoshi Kato --- descriptors.go | 2 +- go.mod | 6 ++-- go.sum | 86 +++++--------------------------------------------- 3 files changed, 12 insertions(+), 82 deletions(-) diff --git a/descriptors.go b/descriptors.go index 4840aa6..8f0b40f 100644 --- a/descriptors.go +++ b/descriptors.go @@ -26,8 +26,8 @@ import ( "os/exec" "strings" - "github.com/gogo/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" + "google.golang.org/protobuf/proto" ) type descriptorSet struct { diff --git a/go.mod b/go.mod index 953b5d8..5bb8f41 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/stevvooe/protobuild go 1.13 require ( - github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.3.5 + github.com/golang/protobuf v1.5.0 github.com/pelletier/go-toml v1.8.1 - google.golang.org/grpc v1.28.1 + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/protobuf v1.27.1 ) diff --git a/go.sum b/go.sum index 578240f..e0596e1 100644 --- a/go.sum +++ b/go.sum @@ -1,84 +1,14 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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/sys v0.0.0-20180830151530-49385e6e1522/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= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k= -google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=