From 866fed1eab508e86c262f6ada7e756c8b2a0082a Mon Sep 17 00:00:00 2001 From: chrislu Date: Sun, 15 May 2022 21:31:29 -0700 Subject: [PATCH] avoid grpc name conflict fix https://github.com/chrislusf/seaweedfs/issues/3055 --- weed/pb/s3.proto | 8 +-- weed/pb/s3_pb/s3.pb.go | 87 +++++++++++++++++---------------- weed/pb/s3_pb/s3_grpc.pb.go | 14 +++--- weed/s3api/s3api_server_grpc.go | 6 +-- 4 files changed, 58 insertions(+), 57 deletions(-) diff --git a/weed/pb/s3.proto b/weed/pb/s3.proto index 8078f9b31..4f129b817 100644 --- a/weed/pb/s3.proto +++ b/weed/pb/s3.proto @@ -10,16 +10,16 @@ option java_outer_classname = "S3Proto"; service SeaweedS3 { - rpc Configure (ConfigureRequest) returns (ConfigureResponse) { + rpc Configure (S3ConfigureRequest) returns (S3ConfigureResponse) { } } ////////////////////////////////////////////////// -message ConfigureRequest { - bytes configuration_file_content = 1; +message S3ConfigureRequest { + bytes s3_configuration_file_content = 1; } -message ConfigureResponse { +message S3ConfigureResponse { } diff --git a/weed/pb/s3_pb/s3.pb.go b/weed/pb/s3_pb/s3.pb.go index 50c8f6a17..53f174f02 100644 --- a/weed/pb/s3_pb/s3.pb.go +++ b/weed/pb/s3_pb/s3.pb.go @@ -20,16 +20,16 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type ConfigureRequest struct { +type S3ConfigureRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ConfigurationFileContent []byte `protobuf:"bytes,1,opt,name=configuration_file_content,json=configurationFileContent,proto3" json:"configuration_file_content,omitempty"` + S3ConfigurationFileContent []byte `protobuf:"bytes,1,opt,name=s3_configuration_file_content,json=s3ConfigurationFileContent,proto3" json:"s3_configuration_file_content,omitempty"` } -func (x *ConfigureRequest) Reset() { - *x = ConfigureRequest{} +func (x *S3ConfigureRequest) Reset() { + *x = S3ConfigureRequest{} if protoimpl.UnsafeEnabled { mi := &file_s3_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -37,13 +37,13 @@ func (x *ConfigureRequest) Reset() { } } -func (x *ConfigureRequest) String() string { +func (x *S3ConfigureRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ConfigureRequest) ProtoMessage() {} +func (*S3ConfigureRequest) ProtoMessage() {} -func (x *ConfigureRequest) ProtoReflect() protoreflect.Message { +func (x *S3ConfigureRequest) ProtoReflect() protoreflect.Message { mi := &file_s3_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -55,26 +55,26 @@ func (x *ConfigureRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ConfigureRequest.ProtoReflect.Descriptor instead. -func (*ConfigureRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use S3ConfigureRequest.ProtoReflect.Descriptor instead. +func (*S3ConfigureRequest) Descriptor() ([]byte, []int) { return file_s3_proto_rawDescGZIP(), []int{0} } -func (x *ConfigureRequest) GetConfigurationFileContent() []byte { +func (x *S3ConfigureRequest) GetS3ConfigurationFileContent() []byte { if x != nil { - return x.ConfigurationFileContent + return x.S3ConfigurationFileContent } return nil } -type ConfigureResponse struct { +type S3ConfigureResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *ConfigureResponse) Reset() { - *x = ConfigureResponse{} +func (x *S3ConfigureResponse) Reset() { + *x = S3ConfigureResponse{} if protoimpl.UnsafeEnabled { mi := &file_s3_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -82,13 +82,13 @@ func (x *ConfigureResponse) Reset() { } } -func (x *ConfigureResponse) String() string { +func (x *S3ConfigureResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*ConfigureResponse) ProtoMessage() {} +func (*S3ConfigureResponse) ProtoMessage() {} -func (x *ConfigureResponse) ProtoReflect() protoreflect.Message { +func (x *S3ConfigureResponse) ProtoReflect() protoreflect.Message { mi := &file_s3_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -100,8 +100,8 @@ func (x *ConfigureResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use ConfigureResponse.ProtoReflect.Descriptor instead. -func (*ConfigureResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use S3ConfigureResponse.ProtoReflect.Descriptor instead. +func (*S3ConfigureResponse) Descriptor() ([]byte, []int) { return file_s3_proto_rawDescGZIP(), []int{1} } @@ -109,24 +109,25 @@ var File_s3_proto protoreflect.FileDescriptor var file_s3_proto_rawDesc = []byte{ 0x0a, 0x08, 0x73, 0x33, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x62, 0x22, 0x50, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3c, 0x0a, 0x1a, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x69, - 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x18, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, - 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, - 0x5b, 0x0a, 0x09, 0x53, 0x65, 0x61, 0x77, 0x65, 0x65, 0x64, 0x53, 0x33, 0x12, 0x4e, 0x0a, 0x09, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x1e, 0x2e, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, - 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, - 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x49, 0x0a, 0x10, - 0x73, 0x65, 0x61, 0x77, 0x65, 0x65, 0x64, 0x66, 0x73, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, - 0x42, 0x07, 0x53, 0x33, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, - 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x68, 0x72, 0x69, 0x73, 0x6c, 0x75, 0x73, 0x66, 0x2f, - 0x73, 0x65, 0x61, 0x77, 0x65, 0x65, 0x64, 0x66, 0x73, 0x2f, 0x77, 0x65, 0x65, 0x64, 0x2f, 0x70, - 0x62, 0x2f, 0x73, 0x33, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x67, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x62, 0x22, 0x57, 0x0a, 0x12, 0x53, 0x33, 0x43, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, + 0x0a, 0x1d, 0x73, 0x33, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x1a, 0x73, 0x33, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x33, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x5f, 0x0a, 0x09, 0x53, 0x65, 0x61, 0x77, + 0x65, 0x65, 0x64, 0x53, 0x33, 0x12, 0x52, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, + 0x72, 0x65, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x5f, 0x70, + 0x62, 0x2e, 0x53, 0x33, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, + 0x5f, 0x70, 0x62, 0x2e, 0x53, 0x33, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x49, 0x0a, 0x10, 0x73, 0x65, 0x61, + 0x77, 0x65, 0x65, 0x64, 0x66, 0x73, 0x2e, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x42, 0x07, 0x53, + 0x33, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x63, 0x68, 0x72, 0x69, 0x73, 0x6c, 0x75, 0x73, 0x66, 0x2f, 0x73, 0x65, 0x61, + 0x77, 0x65, 0x65, 0x64, 0x66, 0x73, 0x2f, 0x77, 0x65, 0x65, 0x64, 0x2f, 0x70, 0x62, 0x2f, 0x73, + 0x33, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -143,12 +144,12 @@ func file_s3_proto_rawDescGZIP() []byte { var file_s3_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_s3_proto_goTypes = []interface{}{ - (*ConfigureRequest)(nil), // 0: messaging_pb.ConfigureRequest - (*ConfigureResponse)(nil), // 1: messaging_pb.ConfigureResponse + (*S3ConfigureRequest)(nil), // 0: messaging_pb.S3ConfigureRequest + (*S3ConfigureResponse)(nil), // 1: messaging_pb.S3ConfigureResponse } var file_s3_proto_depIdxs = []int32{ - 0, // 0: messaging_pb.SeaweedS3.Configure:input_type -> messaging_pb.ConfigureRequest - 1, // 1: messaging_pb.SeaweedS3.Configure:output_type -> messaging_pb.ConfigureResponse + 0, // 0: messaging_pb.SeaweedS3.Configure:input_type -> messaging_pb.S3ConfigureRequest + 1, // 1: messaging_pb.SeaweedS3.Configure:output_type -> messaging_pb.S3ConfigureResponse 1, // [1:2] is the sub-list for method output_type 0, // [0:1] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -163,7 +164,7 @@ func file_s3_proto_init() { } if !protoimpl.UnsafeEnabled { file_s3_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConfigureRequest); i { + switch v := v.(*S3ConfigureRequest); i { case 0: return &v.state case 1: @@ -175,7 +176,7 @@ func file_s3_proto_init() { } } file_s3_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ConfigureResponse); i { + switch v := v.(*S3ConfigureResponse); i { case 0: return &v.state case 1: diff --git a/weed/pb/s3_pb/s3_grpc.pb.go b/weed/pb/s3_pb/s3_grpc.pb.go index f33e8f0df..1bc956be6 100644 --- a/weed/pb/s3_pb/s3_grpc.pb.go +++ b/weed/pb/s3_pb/s3_grpc.pb.go @@ -18,7 +18,7 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type SeaweedS3Client interface { - Configure(ctx context.Context, in *ConfigureRequest, opts ...grpc.CallOption) (*ConfigureResponse, error) + Configure(ctx context.Context, in *S3ConfigureRequest, opts ...grpc.CallOption) (*S3ConfigureResponse, error) } type seaweedS3Client struct { @@ -29,8 +29,8 @@ func NewSeaweedS3Client(cc grpc.ClientConnInterface) SeaweedS3Client { return &seaweedS3Client{cc} } -func (c *seaweedS3Client) Configure(ctx context.Context, in *ConfigureRequest, opts ...grpc.CallOption) (*ConfigureResponse, error) { - out := new(ConfigureResponse) +func (c *seaweedS3Client) Configure(ctx context.Context, in *S3ConfigureRequest, opts ...grpc.CallOption) (*S3ConfigureResponse, error) { + out := new(S3ConfigureResponse) err := c.cc.Invoke(ctx, "/messaging_pb.SeaweedS3/Configure", in, out, opts...) if err != nil { return nil, err @@ -42,7 +42,7 @@ func (c *seaweedS3Client) Configure(ctx context.Context, in *ConfigureRequest, o // All implementations must embed UnimplementedSeaweedS3Server // for forward compatibility type SeaweedS3Server interface { - Configure(context.Context, *ConfigureRequest) (*ConfigureResponse, error) + Configure(context.Context, *S3ConfigureRequest) (*S3ConfigureResponse, error) mustEmbedUnimplementedSeaweedS3Server() } @@ -50,7 +50,7 @@ type SeaweedS3Server interface { type UnimplementedSeaweedS3Server struct { } -func (UnimplementedSeaweedS3Server) Configure(context.Context, *ConfigureRequest) (*ConfigureResponse, error) { +func (UnimplementedSeaweedS3Server) Configure(context.Context, *S3ConfigureRequest) (*S3ConfigureResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Configure not implemented") } func (UnimplementedSeaweedS3Server) mustEmbedUnimplementedSeaweedS3Server() {} @@ -67,7 +67,7 @@ func RegisterSeaweedS3Server(s grpc.ServiceRegistrar, srv SeaweedS3Server) { } func _SeaweedS3_Configure_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ConfigureRequest) + in := new(S3ConfigureRequest) if err := dec(in); err != nil { return nil, err } @@ -79,7 +79,7 @@ func _SeaweedS3_Configure_Handler(srv interface{}, ctx context.Context, dec func FullMethod: "/messaging_pb.SeaweedS3/Configure", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(SeaweedS3Server).Configure(ctx, req.(*ConfigureRequest)) + return srv.(SeaweedS3Server).Configure(ctx, req.(*S3ConfigureRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/weed/s3api/s3api_server_grpc.go b/weed/s3api/s3api_server_grpc.go index a76aa2e2c..e93d0056f 100644 --- a/weed/s3api/s3api_server_grpc.go +++ b/weed/s3api/s3api_server_grpc.go @@ -5,12 +5,12 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb/s3_pb" ) -func (s3a *S3ApiServer) Configure(ctx context.Context, request *s3_pb.ConfigureRequest) (*s3_pb.ConfigureResponse, error) { +func (s3a *S3ApiServer) Configure(ctx context.Context, request *s3_pb.S3ConfigureRequest) (*s3_pb.S3ConfigureResponse, error) { - if err := s3a.iam.LoadS3ApiConfigurationFromBytes(request.ConfigurationFileContent); err != nil { + if err := s3a.iam.LoadS3ApiConfigurationFromBytes(request.S3ConfigurationFileContent); err != nil { return nil, err } - return &s3_pb.ConfigureResponse{}, nil + return &s3_pb.S3ConfigureResponse{}, nil }