From f913048fefb0f5e0703d32f7aa116ffed8ea41ac Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Tue, 6 Apr 2021 19:03:34 -0700 Subject: [PATCH] nit: regenerate server API using newer version of protoc, this removes dependency on deprecated github.com/golang/protobuf (#949) --- internal/grpcapi/repository_server.pb.go | 9 ++------- internal/grpcapi/repository_server_grpc.pb.go | 10 +++++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/grpcapi/repository_server.pb.go b/internal/grpcapi/repository_server.pb.go index 1c3a6b231..7c02b3566 100644 --- a/internal/grpcapi/repository_server.pb.go +++ b/internal/grpcapi/repository_server.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.15.7 // source: repository_server.proto package grpcapi import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ErrorResponse_Code int32 const ( diff --git a/internal/grpcapi/repository_server_grpc.pb.go b/internal/grpcapi/repository_server_grpc.pb.go index 7114d7f41..887bfedf5 100644 --- a/internal/grpcapi/repository_server_grpc.pb.go +++ b/internal/grpcapi/repository_server_grpc.pb.go @@ -11,6 +11,7 @@ // 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 // KopiaRepositoryClient is the client API for KopiaRepository service. @@ -30,7 +31,7 @@ func NewKopiaRepositoryClient(cc grpc.ClientConnInterface) KopiaRepositoryClient } func (c *kopiaRepositoryClient) Session(ctx context.Context, opts ...grpc.CallOption) (KopiaRepository_SessionClient, error) { - stream, err := c.cc.NewStream(ctx, &_KopiaRepository_serviceDesc.Streams[0], "/kopia_repository.KopiaRepository/Session", opts...) + stream, err := c.cc.NewStream(ctx, &KopiaRepository_ServiceDesc.Streams[0], "/kopia_repository.KopiaRepository/Session", opts...) if err != nil { return nil, err } @@ -86,7 +87,7 @@ type UnsafeKopiaRepositoryServer interface { } func RegisterKopiaRepositoryServer(s grpc.ServiceRegistrar, srv KopiaRepositoryServer) { - s.RegisterService(&_KopiaRepository_serviceDesc, srv) + s.RegisterService(&KopiaRepository_ServiceDesc, srv) } func _KopiaRepository_Session_Handler(srv interface{}, stream grpc.ServerStream) error { @@ -115,7 +116,10 @@ func (x *kopiaRepositorySessionServer) Recv() (*SessionRequest, error) { return m, nil } -var _KopiaRepository_serviceDesc = grpc.ServiceDesc{ +// KopiaRepository_ServiceDesc is the grpc.ServiceDesc for KopiaRepository service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var KopiaRepository_ServiceDesc = grpc.ServiceDesc{ ServiceName: "kopia_repository.KopiaRepository", HandlerType: (*KopiaRepositoryServer)(nil), Methods: []grpc.MethodDesc{},