From 83b9c87dd2a774e555f3f7281ba43f4cc59cb4fd Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 21 Sep 2020 20:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8D=E5=90=91=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=AE=9E=E7=8E=B0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/rpc/pb/model_origin_server.pb.go | 54 +-- pkg/rpc/pb/service_origin_server.pb.go | 446 +++++++++--------- pkg/rpc/protos/model_origin_server.proto | 2 +- pkg/rpc/protos/service_origin_server.proto | 26 +- ...igin_server_config.go => origin_config.go} | 12 +- ...gin_server_ftp.go => origin_ftp_config.go} | 2 +- pkg/serverconfigs/origin_ref.go | 6 + .../origin_server_group_config.go | 4 +- pkg/serverconfigs/reverse_proxy_config.go | 20 +- 9 files changed, 286 insertions(+), 286 deletions(-) rename pkg/serverconfigs/{origin_server_config.go => origin_config.go} (94%) rename pkg/serverconfigs/{origin_server_ftp.go => origin_ftp_config.go} (86%) create mode 100644 pkg/serverconfigs/origin_ref.go diff --git a/pkg/rpc/pb/model_origin_server.pb.go b/pkg/rpc/pb/model_origin_server.pb.go index 86c0bd8..ec19197 100644 --- a/pkg/rpc/pb/model_origin_server.pb.go +++ b/pkg/rpc/pb/model_origin_server.pb.go @@ -25,7 +25,7 @@ const ( // of the legacy proto package is being used. const _ = proto.ProtoPackageIsVersion4 -type OriginServer struct { +type Origin struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -37,8 +37,8 @@ type OriginServer struct { Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` } -func (x *OriginServer) Reset() { - *x = OriginServer{} +func (x *Origin) Reset() { + *x = Origin{} if protoimpl.UnsafeEnabled { mi := &file_model_origin_server_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -46,13 +46,13 @@ func (x *OriginServer) Reset() { } } -func (x *OriginServer) String() string { +func (x *Origin) String() string { return protoimpl.X.MessageStringOf(x) } -func (*OriginServer) ProtoMessage() {} +func (*Origin) ProtoMessage() {} -func (x *OriginServer) ProtoReflect() protoreflect.Message { +func (x *Origin) ProtoReflect() protoreflect.Message { mi := &file_model_origin_server_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -64,40 +64,40 @@ func (x *OriginServer) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use OriginServer.ProtoReflect.Descriptor instead. -func (*OriginServer) Descriptor() ([]byte, []int) { +// Deprecated: Use Origin.ProtoReflect.Descriptor instead. +func (*Origin) Descriptor() ([]byte, []int) { return file_model_origin_server_proto_rawDescGZIP(), []int{0} } -func (x *OriginServer) GetId() int64 { +func (x *Origin) GetId() int64 { if x != nil { return x.Id } return 0 } -func (x *OriginServer) GetIsOn() bool { +func (x *Origin) GetIsOn() bool { if x != nil { return x.IsOn } return false } -func (x *OriginServer) GetName() string { +func (x *Origin) GetName() string { if x != nil { return x.Name } return "" } -func (x *OriginServer) GetAddr() *NetworkAddress { +func (x *Origin) GetAddr() *NetworkAddress { if x != nil { return x.Addr } return nil } -func (x *OriginServer) GetDescription() string { +func (x *Origin) GetDescription() string { if x != nil { return x.Description } @@ -110,17 +110,17 @@ var file_model_origin_server_proto_rawDesc = []byte{ 0x0a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x1b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x90, 0x01, 0x0a, - 0x0c, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, - 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, - 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, - 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, 0x12, 0x20, 0x0a, - 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x01, 0x0a, + 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x26, 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, + 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -137,11 +137,11 @@ func file_model_origin_server_proto_rawDescGZIP() []byte { var file_model_origin_server_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_model_origin_server_proto_goTypes = []interface{}{ - (*OriginServer)(nil), // 0: pb.OriginServer + (*Origin)(nil), // 0: pb.Origin (*NetworkAddress)(nil), // 1: pb.NetworkAddress } var file_model_origin_server_proto_depIdxs = []int32{ - 1, // 0: pb.OriginServer.addr:type_name -> pb.NetworkAddress + 1, // 0: pb.Origin.addr:type_name -> pb.NetworkAddress 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 @@ -157,7 +157,7 @@ func file_model_origin_server_proto_init() { file_model_network_address_proto_init() if !protoimpl.UnsafeEnabled { file_model_origin_server_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OriginServer); i { + switch v := v.(*Origin); i { case 0: return &v.state case 1: diff --git a/pkg/rpc/pb/service_origin_server.pb.go b/pkg/rpc/pb/service_origin_server.pb.go index 882df70..2257306 100644 --- a/pkg/rpc/pb/service_origin_server.pb.go +++ b/pkg/rpc/pb/service_origin_server.pb.go @@ -30,7 +30,7 @@ const ( const _ = proto.ProtoPackageIsVersion4 // 创建源站 -type CreateOriginServerRequest struct { +type CreateOriginRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -40,8 +40,8 @@ type CreateOriginServerRequest struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` } -func (x *CreateOriginServerRequest) Reset() { - *x = CreateOriginServerRequest{} +func (x *CreateOriginRequest) Reset() { + *x = CreateOriginRequest{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -49,13 +49,13 @@ func (x *CreateOriginServerRequest) Reset() { } } -func (x *CreateOriginServerRequest) String() string { +func (x *CreateOriginRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*CreateOriginServerRequest) ProtoMessage() {} +func (*CreateOriginRequest) ProtoMessage() {} -func (x *CreateOriginServerRequest) ProtoReflect() protoreflect.Message { +func (x *CreateOriginRequest) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -67,33 +67,33 @@ func (x *CreateOriginServerRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use CreateOriginServerRequest.ProtoReflect.Descriptor instead. -func (*CreateOriginServerRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use CreateOriginRequest.ProtoReflect.Descriptor instead. +func (*CreateOriginRequest) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{0} } -func (x *CreateOriginServerRequest) GetName() string { +func (x *CreateOriginRequest) GetName() string { if x != nil { return x.Name } return "" } -func (x *CreateOriginServerRequest) GetAddr() *NetworkAddress { +func (x *CreateOriginRequest) GetAddr() *NetworkAddress { if x != nil { return x.Addr } return nil } -func (x *CreateOriginServerRequest) GetDescription() string { +func (x *CreateOriginRequest) GetDescription() string { if x != nil { return x.Description } return "" } -type CreateOriginServerResponse struct { +type CreateOriginResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -101,8 +101,8 @@ type CreateOriginServerResponse struct { OriginId int64 `protobuf:"varint,1,opt,name=originId,proto3" json:"originId,omitempty"` } -func (x *CreateOriginServerResponse) Reset() { - *x = CreateOriginServerResponse{} +func (x *CreateOriginResponse) Reset() { + *x = CreateOriginResponse{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -110,13 +110,13 @@ func (x *CreateOriginServerResponse) Reset() { } } -func (x *CreateOriginServerResponse) String() string { +func (x *CreateOriginResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*CreateOriginServerResponse) ProtoMessage() {} +func (*CreateOriginResponse) ProtoMessage() {} -func (x *CreateOriginServerResponse) ProtoReflect() protoreflect.Message { +func (x *CreateOriginResponse) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -128,12 +128,12 @@ func (x *CreateOriginServerResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use CreateOriginServerResponse.ProtoReflect.Descriptor instead. -func (*CreateOriginServerResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use CreateOriginResponse.ProtoReflect.Descriptor instead. +func (*CreateOriginResponse) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{1} } -func (x *CreateOriginServerResponse) GetOriginId() int64 { +func (x *CreateOriginResponse) GetOriginId() int64 { if x != nil { return x.OriginId } @@ -141,7 +141,7 @@ func (x *CreateOriginServerResponse) GetOriginId() int64 { } // 修改源站 -type UpdateOriginServerRequest struct { +type UpdateOriginRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -152,8 +152,8 @@ type UpdateOriginServerRequest struct { Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` } -func (x *UpdateOriginServerRequest) Reset() { - *x = UpdateOriginServerRequest{} +func (x *UpdateOriginRequest) Reset() { + *x = UpdateOriginRequest{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -161,13 +161,13 @@ func (x *UpdateOriginServerRequest) Reset() { } } -func (x *UpdateOriginServerRequest) String() string { +func (x *UpdateOriginRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*UpdateOriginServerRequest) ProtoMessage() {} +func (*UpdateOriginRequest) ProtoMessage() {} -func (x *UpdateOriginServerRequest) ProtoReflect() protoreflect.Message { +func (x *UpdateOriginRequest) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -179,33 +179,33 @@ func (x *UpdateOriginServerRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use UpdateOriginServerRequest.ProtoReflect.Descriptor instead. -func (*UpdateOriginServerRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use UpdateOriginRequest.ProtoReflect.Descriptor instead. +func (*UpdateOriginRequest) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{2} } -func (x *UpdateOriginServerRequest) GetOriginId() int64 { +func (x *UpdateOriginRequest) GetOriginId() int64 { if x != nil { return x.OriginId } return 0 } -func (x *UpdateOriginServerRequest) GetName() string { +func (x *UpdateOriginRequest) GetName() string { if x != nil { return x.Name } return "" } -func (x *UpdateOriginServerRequest) GetAddr() *NetworkAddress { +func (x *UpdateOriginRequest) GetAddr() *NetworkAddress { if x != nil { return x.Addr } return nil } -func (x *UpdateOriginServerRequest) GetDescription() string { +func (x *UpdateOriginRequest) GetDescription() string { if x != nil { return x.Description } @@ -213,7 +213,7 @@ func (x *UpdateOriginServerRequest) GetDescription() string { } // 查找单个源站信息 -type FindEnabledOriginServerRequest struct { +type FindEnabledOriginRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -221,8 +221,8 @@ type FindEnabledOriginServerRequest struct { OriginId int64 `protobuf:"varint,1,opt,name=originId,proto3" json:"originId,omitempty"` } -func (x *FindEnabledOriginServerRequest) Reset() { - *x = FindEnabledOriginServerRequest{} +func (x *FindEnabledOriginRequest) Reset() { + *x = FindEnabledOriginRequest{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -230,13 +230,13 @@ func (x *FindEnabledOriginServerRequest) Reset() { } } -func (x *FindEnabledOriginServerRequest) String() string { +func (x *FindEnabledOriginRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FindEnabledOriginServerRequest) ProtoMessage() {} +func (*FindEnabledOriginRequest) ProtoMessage() {} -func (x *FindEnabledOriginServerRequest) ProtoReflect() protoreflect.Message { +func (x *FindEnabledOriginRequest) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -248,28 +248,28 @@ func (x *FindEnabledOriginServerRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FindEnabledOriginServerRequest.ProtoReflect.Descriptor instead. -func (*FindEnabledOriginServerRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use FindEnabledOriginRequest.ProtoReflect.Descriptor instead. +func (*FindEnabledOriginRequest) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{3} } -func (x *FindEnabledOriginServerRequest) GetOriginId() int64 { +func (x *FindEnabledOriginRequest) GetOriginId() int64 { if x != nil { return x.OriginId } return 0 } -type FindEnabledOriginServerResponse struct { +type FindEnabledOriginResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Origin *OriginServer `protobuf:"bytes,1,opt,name=Origin,proto3" json:"Origin,omitempty"` + Origin *Origin `protobuf:"bytes,1,opt,name=Origin,proto3" json:"Origin,omitempty"` } -func (x *FindEnabledOriginServerResponse) Reset() { - *x = FindEnabledOriginServerResponse{} +func (x *FindEnabledOriginResponse) Reset() { + *x = FindEnabledOriginResponse{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -277,13 +277,13 @@ func (x *FindEnabledOriginServerResponse) Reset() { } } -func (x *FindEnabledOriginServerResponse) String() string { +func (x *FindEnabledOriginResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FindEnabledOriginServerResponse) ProtoMessage() {} +func (*FindEnabledOriginResponse) ProtoMessage() {} -func (x *FindEnabledOriginServerResponse) ProtoReflect() protoreflect.Message { +func (x *FindEnabledOriginResponse) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -295,12 +295,12 @@ func (x *FindEnabledOriginServerResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use FindEnabledOriginServerResponse.ProtoReflect.Descriptor instead. -func (*FindEnabledOriginServerResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use FindEnabledOriginResponse.ProtoReflect.Descriptor instead. +func (*FindEnabledOriginResponse) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{4} } -func (x *FindEnabledOriginServerResponse) GetOrigin() *OriginServer { +func (x *FindEnabledOriginResponse) GetOrigin() *Origin { if x != nil { return x.Origin } @@ -308,7 +308,7 @@ func (x *FindEnabledOriginServerResponse) GetOrigin() *OriginServer { } // 查找源站配置 -type FindEnabledOriginServerConfigRequest struct { +type FindEnabledOriginConfigRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -316,8 +316,8 @@ type FindEnabledOriginServerConfigRequest struct { OriginId int64 `protobuf:"varint,1,opt,name=originId,proto3" json:"originId,omitempty"` } -func (x *FindEnabledOriginServerConfigRequest) Reset() { - *x = FindEnabledOriginServerConfigRequest{} +func (x *FindEnabledOriginConfigRequest) Reset() { + *x = FindEnabledOriginConfigRequest{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -325,13 +325,13 @@ func (x *FindEnabledOriginServerConfigRequest) Reset() { } } -func (x *FindEnabledOriginServerConfigRequest) String() string { +func (x *FindEnabledOriginConfigRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FindEnabledOriginServerConfigRequest) ProtoMessage() {} +func (*FindEnabledOriginConfigRequest) ProtoMessage() {} -func (x *FindEnabledOriginServerConfigRequest) ProtoReflect() protoreflect.Message { +func (x *FindEnabledOriginConfigRequest) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -343,19 +343,19 @@ func (x *FindEnabledOriginServerConfigRequest) ProtoReflect() protoreflect.Messa return mi.MessageOf(x) } -// Deprecated: Use FindEnabledOriginServerConfigRequest.ProtoReflect.Descriptor instead. -func (*FindEnabledOriginServerConfigRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use FindEnabledOriginConfigRequest.ProtoReflect.Descriptor instead. +func (*FindEnabledOriginConfigRequest) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{5} } -func (x *FindEnabledOriginServerConfigRequest) GetOriginId() int64 { +func (x *FindEnabledOriginConfigRequest) GetOriginId() int64 { if x != nil { return x.OriginId } return 0 } -type FindEnabledOriginServerConfigResponse struct { +type FindEnabledOriginConfigResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -363,8 +363,8 @@ type FindEnabledOriginServerConfigResponse struct { OriginJSON []byte `protobuf:"bytes,1,opt,name=originJSON,proto3" json:"originJSON,omitempty"` } -func (x *FindEnabledOriginServerConfigResponse) Reset() { - *x = FindEnabledOriginServerConfigResponse{} +func (x *FindEnabledOriginConfigResponse) Reset() { + *x = FindEnabledOriginConfigResponse{} if protoimpl.UnsafeEnabled { mi := &file_service_origin_server_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -372,13 +372,13 @@ func (x *FindEnabledOriginServerConfigResponse) Reset() { } } -func (x *FindEnabledOriginServerConfigResponse) String() string { +func (x *FindEnabledOriginConfigResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*FindEnabledOriginServerConfigResponse) ProtoMessage() {} +func (*FindEnabledOriginConfigResponse) ProtoMessage() {} -func (x *FindEnabledOriginServerConfigResponse) ProtoReflect() protoreflect.Message { +func (x *FindEnabledOriginConfigResponse) ProtoReflect() protoreflect.Message { mi := &file_service_origin_server_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -390,12 +390,12 @@ func (x *FindEnabledOriginServerConfigResponse) ProtoReflect() protoreflect.Mess return mi.MessageOf(x) } -// Deprecated: Use FindEnabledOriginServerConfigResponse.ProtoReflect.Descriptor instead. -func (*FindEnabledOriginServerConfigResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use FindEnabledOriginConfigResponse.ProtoReflect.Descriptor instead. +func (*FindEnabledOriginConfigResponse) Descriptor() ([]byte, []int) { return file_service_origin_server_proto_rawDescGZIP(), []int{6} } -func (x *FindEnabledOriginServerConfigResponse) GetOriginJSON() []byte { +func (x *FindEnabledOriginConfigResponse) GetOriginJSON() []byte { if x != nil { return x.OriginJSON } @@ -411,72 +411,64 @@ var file_service_origin_server_proto_rawDesc = []byte{ 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x72, 0x70, 0x63, 0x5f, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x79, 0x0a, - 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, - 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, - 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x73, 0x0a, + 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, + 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x32, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, + 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, + 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, + 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, + 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, + 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x38, 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x49, 0x64, 0x22, 0x95, 0x01, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, - 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x12, 0x26, 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, - 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x1e, 0x46, 0x69, - 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, - 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, - 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x4b, 0x0a, 0x1f, 0x46, 0x69, 0x6e, 0x64, - 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, - 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x4f, - 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, - 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x06, 0x4f, - 0x72, 0x69, 0x67, 0x69, 0x6e, 0x22, 0x42, 0x0a, 0x24, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, - 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, - 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x25, 0x46, 0x69, 0x6e, - 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, - 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, + 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x36, 0x0a, 0x18, 0x46, 0x69, 0x6e, 0x64, + 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, + 0x22, 0x3f, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, + 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, + 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, + 0x70, 0x62, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, + 0x6e, 0x22, 0x3c, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, + 0x41, 0x0a, 0x1f, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, + 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x4a, 0x53, - 0x4f, 0x4e, 0x32, 0x8f, 0x03, 0x0a, 0x13, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, - 0x76, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x12, 0x63, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, - 0x12, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, - 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, - 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x49, 0x0a, 0x12, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, - 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x62, 0x0a, 0x17, 0x66, 0x69, - 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, - 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, - 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x46, + 0x4f, 0x4e, 0x32, 0xc7, 0x02, 0x0a, 0x0d, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x0c, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, + 0x69, 0x67, 0x69, 0x6e, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, + 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, + 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x50, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x1c, 0x2e, 0x70, 0x62, + 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, + 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x74, - 0x0a, 0x1d, 0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, - 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, - 0x28, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x70, 0x62, 0x2e, 0x46, - 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x62, 0x0a, 0x17, 0x66, 0x69, 0x6e, 0x64, + 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, + 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, + 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -493,29 +485,29 @@ func file_service_origin_server_proto_rawDescGZIP() []byte { var file_service_origin_server_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_service_origin_server_proto_goTypes = []interface{}{ - (*CreateOriginServerRequest)(nil), // 0: pb.CreateOriginServerRequest - (*CreateOriginServerResponse)(nil), // 1: pb.CreateOriginServerResponse - (*UpdateOriginServerRequest)(nil), // 2: pb.UpdateOriginServerRequest - (*FindEnabledOriginServerRequest)(nil), // 3: pb.FindEnabledOriginServerRequest - (*FindEnabledOriginServerResponse)(nil), // 4: pb.FindEnabledOriginServerResponse - (*FindEnabledOriginServerConfigRequest)(nil), // 5: pb.FindEnabledOriginServerConfigRequest - (*FindEnabledOriginServerConfigResponse)(nil), // 6: pb.FindEnabledOriginServerConfigResponse - (*NetworkAddress)(nil), // 7: pb.NetworkAddress - (*OriginServer)(nil), // 8: pb.OriginServer - (*RPCUpdateSuccess)(nil), // 9: pb.RPCUpdateSuccess + (*CreateOriginRequest)(nil), // 0: pb.CreateOriginRequest + (*CreateOriginResponse)(nil), // 1: pb.CreateOriginResponse + (*UpdateOriginRequest)(nil), // 2: pb.UpdateOriginRequest + (*FindEnabledOriginRequest)(nil), // 3: pb.FindEnabledOriginRequest + (*FindEnabledOriginResponse)(nil), // 4: pb.FindEnabledOriginResponse + (*FindEnabledOriginConfigRequest)(nil), // 5: pb.FindEnabledOriginConfigRequest + (*FindEnabledOriginConfigResponse)(nil), // 6: pb.FindEnabledOriginConfigResponse + (*NetworkAddress)(nil), // 7: pb.NetworkAddress + (*Origin)(nil), // 8: pb.Origin + (*RPCUpdateSuccess)(nil), // 9: pb.RPCUpdateSuccess } var file_service_origin_server_proto_depIdxs = []int32{ - 7, // 0: pb.CreateOriginServerRequest.addr:type_name -> pb.NetworkAddress - 7, // 1: pb.UpdateOriginServerRequest.addr:type_name -> pb.NetworkAddress - 8, // 2: pb.FindEnabledOriginServerResponse.Origin:type_name -> pb.OriginServer - 0, // 3: pb.OriginServerService.createOriginServer:input_type -> pb.CreateOriginServerRequest - 2, // 4: pb.OriginServerService.updateOriginServer:input_type -> pb.UpdateOriginServerRequest - 3, // 5: pb.OriginServerService.findEnabledOriginServer:input_type -> pb.FindEnabledOriginServerRequest - 5, // 6: pb.OriginServerService.findEnabledOriginServerConfig:input_type -> pb.FindEnabledOriginServerConfigRequest - 1, // 7: pb.OriginServerService.createOriginServer:output_type -> pb.CreateOriginServerResponse - 9, // 8: pb.OriginServerService.updateOriginServer:output_type -> pb.RPCUpdateSuccess - 4, // 9: pb.OriginServerService.findEnabledOriginServer:output_type -> pb.FindEnabledOriginServerResponse - 6, // 10: pb.OriginServerService.findEnabledOriginServerConfig:output_type -> pb.FindEnabledOriginServerConfigResponse + 7, // 0: pb.CreateOriginRequest.addr:type_name -> pb.NetworkAddress + 7, // 1: pb.UpdateOriginRequest.addr:type_name -> pb.NetworkAddress + 8, // 2: pb.FindEnabledOriginResponse.Origin:type_name -> pb.Origin + 0, // 3: pb.OriginService.createOrigin:input_type -> pb.CreateOriginRequest + 2, // 4: pb.OriginService.updateOrigin:input_type -> pb.UpdateOriginRequest + 3, // 5: pb.OriginService.findEnabledOrigin:input_type -> pb.FindEnabledOriginRequest + 5, // 6: pb.OriginService.findEnabledOriginConfig:input_type -> pb.FindEnabledOriginConfigRequest + 1, // 7: pb.OriginService.createOrigin:output_type -> pb.CreateOriginResponse + 9, // 8: pb.OriginService.updateOrigin:output_type -> pb.RPCUpdateSuccess + 4, // 9: pb.OriginService.findEnabledOrigin:output_type -> pb.FindEnabledOriginResponse + 6, // 10: pb.OriginService.findEnabledOriginConfig:output_type -> pb.FindEnabledOriginConfigResponse 7, // [7:11] is the sub-list for method output_type 3, // [3:7] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -533,7 +525,7 @@ func file_service_origin_server_proto_init() { file_rpc_messages_proto_init() if !protoimpl.UnsafeEnabled { file_service_origin_server_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateOriginServerRequest); i { + switch v := v.(*CreateOriginRequest); i { case 0: return &v.state case 1: @@ -545,7 +537,7 @@ func file_service_origin_server_proto_init() { } } file_service_origin_server_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateOriginServerResponse); i { + switch v := v.(*CreateOriginResponse); i { case 0: return &v.state case 1: @@ -557,7 +549,7 @@ func file_service_origin_server_proto_init() { } } file_service_origin_server_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateOriginServerRequest); i { + switch v := v.(*UpdateOriginRequest); i { case 0: return &v.state case 1: @@ -569,7 +561,7 @@ func file_service_origin_server_proto_init() { } } file_service_origin_server_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FindEnabledOriginServerRequest); i { + switch v := v.(*FindEnabledOriginRequest); i { case 0: return &v.state case 1: @@ -581,7 +573,7 @@ func file_service_origin_server_proto_init() { } } file_service_origin_server_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FindEnabledOriginServerResponse); i { + switch v := v.(*FindEnabledOriginResponse); i { case 0: return &v.state case 1: @@ -593,7 +585,7 @@ func file_service_origin_server_proto_init() { } } file_service_origin_server_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FindEnabledOriginServerConfigRequest); i { + switch v := v.(*FindEnabledOriginConfigRequest); i { case 0: return &v.state case 1: @@ -605,7 +597,7 @@ func file_service_origin_server_proto_init() { } } file_service_origin_server_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FindEnabledOriginServerConfigResponse); i { + switch v := v.(*FindEnabledOriginConfigResponse); i { case 0: return &v.state case 1: @@ -645,188 +637,188 @@ var _ grpc.ClientConnInterface // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion6 -// OriginServerServiceClient is the client API for OriginServerService service. +// OriginServiceClient is the client API for OriginService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type OriginServerServiceClient interface { +type OriginServiceClient interface { // 创建源站 - CreateOriginServer(ctx context.Context, in *CreateOriginServerRequest, opts ...grpc.CallOption) (*CreateOriginServerResponse, error) + CreateOrigin(ctx context.Context, in *CreateOriginRequest, opts ...grpc.CallOption) (*CreateOriginResponse, error) // 修改源站 - UpdateOriginServer(ctx context.Context, in *UpdateOriginServerRequest, opts ...grpc.CallOption) (*RPCUpdateSuccess, error) + UpdateOrigin(ctx context.Context, in *UpdateOriginRequest, opts ...grpc.CallOption) (*RPCUpdateSuccess, error) // 查找单个源站信息 - FindEnabledOriginServer(ctx context.Context, in *FindEnabledOriginServerRequest, opts ...grpc.CallOption) (*FindEnabledOriginServerResponse, error) + FindEnabledOrigin(ctx context.Context, in *FindEnabledOriginRequest, opts ...grpc.CallOption) (*FindEnabledOriginResponse, error) // 查找源站配置 - FindEnabledOriginServerConfig(ctx context.Context, in *FindEnabledOriginServerConfigRequest, opts ...grpc.CallOption) (*FindEnabledOriginServerConfigResponse, error) + FindEnabledOriginConfig(ctx context.Context, in *FindEnabledOriginConfigRequest, opts ...grpc.CallOption) (*FindEnabledOriginConfigResponse, error) } -type originServerServiceClient struct { +type originServiceClient struct { cc grpc.ClientConnInterface } -func NewOriginServerServiceClient(cc grpc.ClientConnInterface) OriginServerServiceClient { - return &originServerServiceClient{cc} +func NewOriginServiceClient(cc grpc.ClientConnInterface) OriginServiceClient { + return &originServiceClient{cc} } -func (c *originServerServiceClient) CreateOriginServer(ctx context.Context, in *CreateOriginServerRequest, opts ...grpc.CallOption) (*CreateOriginServerResponse, error) { - out := new(CreateOriginServerResponse) - err := c.cc.Invoke(ctx, "/pb.OriginServerService/createOriginServer", in, out, opts...) +func (c *originServiceClient) CreateOrigin(ctx context.Context, in *CreateOriginRequest, opts ...grpc.CallOption) (*CreateOriginResponse, error) { + out := new(CreateOriginResponse) + err := c.cc.Invoke(ctx, "/pb.OriginService/createOrigin", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *originServerServiceClient) UpdateOriginServer(ctx context.Context, in *UpdateOriginServerRequest, opts ...grpc.CallOption) (*RPCUpdateSuccess, error) { +func (c *originServiceClient) UpdateOrigin(ctx context.Context, in *UpdateOriginRequest, opts ...grpc.CallOption) (*RPCUpdateSuccess, error) { out := new(RPCUpdateSuccess) - err := c.cc.Invoke(ctx, "/pb.OriginServerService/updateOriginServer", in, out, opts...) + err := c.cc.Invoke(ctx, "/pb.OriginService/updateOrigin", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *originServerServiceClient) FindEnabledOriginServer(ctx context.Context, in *FindEnabledOriginServerRequest, opts ...grpc.CallOption) (*FindEnabledOriginServerResponse, error) { - out := new(FindEnabledOriginServerResponse) - err := c.cc.Invoke(ctx, "/pb.OriginServerService/findEnabledOriginServer", in, out, opts...) +func (c *originServiceClient) FindEnabledOrigin(ctx context.Context, in *FindEnabledOriginRequest, opts ...grpc.CallOption) (*FindEnabledOriginResponse, error) { + out := new(FindEnabledOriginResponse) + err := c.cc.Invoke(ctx, "/pb.OriginService/findEnabledOrigin", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *originServerServiceClient) FindEnabledOriginServerConfig(ctx context.Context, in *FindEnabledOriginServerConfigRequest, opts ...grpc.CallOption) (*FindEnabledOriginServerConfigResponse, error) { - out := new(FindEnabledOriginServerConfigResponse) - err := c.cc.Invoke(ctx, "/pb.OriginServerService/findEnabledOriginServerConfig", in, out, opts...) +func (c *originServiceClient) FindEnabledOriginConfig(ctx context.Context, in *FindEnabledOriginConfigRequest, opts ...grpc.CallOption) (*FindEnabledOriginConfigResponse, error) { + out := new(FindEnabledOriginConfigResponse) + err := c.cc.Invoke(ctx, "/pb.OriginService/findEnabledOriginConfig", in, out, opts...) if err != nil { return nil, err } return out, nil } -// OriginServerServiceServer is the server API for OriginServerService service. -type OriginServerServiceServer interface { +// OriginServiceServer is the server API for OriginService service. +type OriginServiceServer interface { // 创建源站 - CreateOriginServer(context.Context, *CreateOriginServerRequest) (*CreateOriginServerResponse, error) + CreateOrigin(context.Context, *CreateOriginRequest) (*CreateOriginResponse, error) // 修改源站 - UpdateOriginServer(context.Context, *UpdateOriginServerRequest) (*RPCUpdateSuccess, error) + UpdateOrigin(context.Context, *UpdateOriginRequest) (*RPCUpdateSuccess, error) // 查找单个源站信息 - FindEnabledOriginServer(context.Context, *FindEnabledOriginServerRequest) (*FindEnabledOriginServerResponse, error) + FindEnabledOrigin(context.Context, *FindEnabledOriginRequest) (*FindEnabledOriginResponse, error) // 查找源站配置 - FindEnabledOriginServerConfig(context.Context, *FindEnabledOriginServerConfigRequest) (*FindEnabledOriginServerConfigResponse, error) + FindEnabledOriginConfig(context.Context, *FindEnabledOriginConfigRequest) (*FindEnabledOriginConfigResponse, error) } -// UnimplementedOriginServerServiceServer can be embedded to have forward compatible implementations. -type UnimplementedOriginServerServiceServer struct { +// UnimplementedOriginServiceServer can be embedded to have forward compatible implementations. +type UnimplementedOriginServiceServer struct { } -func (*UnimplementedOriginServerServiceServer) CreateOriginServer(context.Context, *CreateOriginServerRequest) (*CreateOriginServerResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateOriginServer not implemented") +func (*UnimplementedOriginServiceServer) CreateOrigin(context.Context, *CreateOriginRequest) (*CreateOriginResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateOrigin not implemented") } -func (*UnimplementedOriginServerServiceServer) UpdateOriginServer(context.Context, *UpdateOriginServerRequest) (*RPCUpdateSuccess, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateOriginServer not implemented") +func (*UnimplementedOriginServiceServer) UpdateOrigin(context.Context, *UpdateOriginRequest) (*RPCUpdateSuccess, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateOrigin not implemented") } -func (*UnimplementedOriginServerServiceServer) FindEnabledOriginServer(context.Context, *FindEnabledOriginServerRequest) (*FindEnabledOriginServerResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindEnabledOriginServer not implemented") +func (*UnimplementedOriginServiceServer) FindEnabledOrigin(context.Context, *FindEnabledOriginRequest) (*FindEnabledOriginResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindEnabledOrigin not implemented") } -func (*UnimplementedOriginServerServiceServer) FindEnabledOriginServerConfig(context.Context, *FindEnabledOriginServerConfigRequest) (*FindEnabledOriginServerConfigResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method FindEnabledOriginServerConfig not implemented") +func (*UnimplementedOriginServiceServer) FindEnabledOriginConfig(context.Context, *FindEnabledOriginConfigRequest) (*FindEnabledOriginConfigResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FindEnabledOriginConfig not implemented") } -func RegisterOriginServerServiceServer(s *grpc.Server, srv OriginServerServiceServer) { - s.RegisterService(&_OriginServerService_serviceDesc, srv) +func RegisterOriginServiceServer(s *grpc.Server, srv OriginServiceServer) { + s.RegisterService(&_OriginService_serviceDesc, srv) } -func _OriginServerService_CreateOriginServer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateOriginServerRequest) +func _OriginService_CreateOrigin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateOriginRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(OriginServerServiceServer).CreateOriginServer(ctx, in) + return srv.(OriginServiceServer).CreateOrigin(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/pb.OriginServerService/CreateOriginServer", + FullMethod: "/pb.OriginService/CreateOrigin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OriginServerServiceServer).CreateOriginServer(ctx, req.(*CreateOriginServerRequest)) + return srv.(OriginServiceServer).CreateOrigin(ctx, req.(*CreateOriginRequest)) } return interceptor(ctx, in, info, handler) } -func _OriginServerService_UpdateOriginServer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateOriginServerRequest) +func _OriginService_UpdateOrigin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateOriginRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(OriginServerServiceServer).UpdateOriginServer(ctx, in) + return srv.(OriginServiceServer).UpdateOrigin(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/pb.OriginServerService/UpdateOriginServer", + FullMethod: "/pb.OriginService/UpdateOrigin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OriginServerServiceServer).UpdateOriginServer(ctx, req.(*UpdateOriginServerRequest)) + return srv.(OriginServiceServer).UpdateOrigin(ctx, req.(*UpdateOriginRequest)) } return interceptor(ctx, in, info, handler) } -func _OriginServerService_FindEnabledOriginServer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(FindEnabledOriginServerRequest) +func _OriginService_FindEnabledOrigin_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindEnabledOriginRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(OriginServerServiceServer).FindEnabledOriginServer(ctx, in) + return srv.(OriginServiceServer).FindEnabledOrigin(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/pb.OriginServerService/FindEnabledOriginServer", + FullMethod: "/pb.OriginService/FindEnabledOrigin", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OriginServerServiceServer).FindEnabledOriginServer(ctx, req.(*FindEnabledOriginServerRequest)) + return srv.(OriginServiceServer).FindEnabledOrigin(ctx, req.(*FindEnabledOriginRequest)) } return interceptor(ctx, in, info, handler) } -func _OriginServerService_FindEnabledOriginServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(FindEnabledOriginServerConfigRequest) +func _OriginService_FindEnabledOriginConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(FindEnabledOriginConfigRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(OriginServerServiceServer).FindEnabledOriginServerConfig(ctx, in) + return srv.(OriginServiceServer).FindEnabledOriginConfig(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/pb.OriginServerService/FindEnabledOriginServerConfig", + FullMethod: "/pb.OriginService/FindEnabledOriginConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OriginServerServiceServer).FindEnabledOriginServerConfig(ctx, req.(*FindEnabledOriginServerConfigRequest)) + return srv.(OriginServiceServer).FindEnabledOriginConfig(ctx, req.(*FindEnabledOriginConfigRequest)) } return interceptor(ctx, in, info, handler) } -var _OriginServerService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "pb.OriginServerService", - HandlerType: (*OriginServerServiceServer)(nil), +var _OriginService_serviceDesc = grpc.ServiceDesc{ + ServiceName: "pb.OriginService", + HandlerType: (*OriginServiceServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "createOriginServer", - Handler: _OriginServerService_CreateOriginServer_Handler, + MethodName: "createOrigin", + Handler: _OriginService_CreateOrigin_Handler, }, { - MethodName: "updateOriginServer", - Handler: _OriginServerService_UpdateOriginServer_Handler, + MethodName: "updateOrigin", + Handler: _OriginService_UpdateOrigin_Handler, }, { - MethodName: "findEnabledOriginServer", - Handler: _OriginServerService_FindEnabledOriginServer_Handler, + MethodName: "findEnabledOrigin", + Handler: _OriginService_FindEnabledOrigin_Handler, }, { - MethodName: "findEnabledOriginServerConfig", - Handler: _OriginServerService_FindEnabledOriginServerConfig_Handler, + MethodName: "findEnabledOriginConfig", + Handler: _OriginService_FindEnabledOriginConfig_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/pkg/rpc/protos/model_origin_server.proto b/pkg/rpc/protos/model_origin_server.proto index 00e5d91..6d6e97c 100644 --- a/pkg/rpc/protos/model_origin_server.proto +++ b/pkg/rpc/protos/model_origin_server.proto @@ -5,7 +5,7 @@ package pb; import "model_network_address.proto"; -message OriginServer { +message Origin { int64 id = 1; bool isOn = 2; string name = 3; diff --git a/pkg/rpc/protos/service_origin_server.proto b/pkg/rpc/protos/service_origin_server.proto index f8f3741..8171dc1 100644 --- a/pkg/rpc/protos/service_origin_server.proto +++ b/pkg/rpc/protos/service_origin_server.proto @@ -7,33 +7,33 @@ import "model_origin_server.proto"; import "model_network_address.proto"; import "rpc_messages.proto"; -service OriginServerService { +service OriginService { // 创建源站 - rpc createOriginServer (CreateOriginServerRequest) returns (CreateOriginServerResponse); + rpc createOrigin (CreateOriginRequest) returns (CreateOriginResponse); // 修改源站 - rpc updateOriginServer (UpdateOriginServerRequest) returns (RPCUpdateSuccess); + rpc updateOrigin (UpdateOriginRequest) returns (RPCUpdateSuccess); // 查找单个源站信息 - rpc findEnabledOriginServer (FindEnabledOriginServerRequest) returns (FindEnabledOriginServerResponse); + rpc findEnabledOrigin (FindEnabledOriginRequest) returns (FindEnabledOriginResponse); // 查找源站配置 - rpc findEnabledOriginServerConfig (FindEnabledOriginServerConfigRequest) returns (FindEnabledOriginServerConfigResponse); + rpc findEnabledOriginConfig (FindEnabledOriginConfigRequest) returns (FindEnabledOriginConfigResponse); } // 创建源站 -message CreateOriginServerRequest { +message CreateOriginRequest { string name = 1; NetworkAddress addr = 2; string description = 3; } -message CreateOriginServerResponse { +message CreateOriginResponse { int64 originId = 1; } // 修改源站 -message UpdateOriginServerRequest { +message UpdateOriginRequest { int64 originId = 1; string name = 2; NetworkAddress addr = 3; @@ -41,19 +41,19 @@ message UpdateOriginServerRequest { } // 查找单个源站信息 -message FindEnabledOriginServerRequest { +message FindEnabledOriginRequest { int64 originId = 1; } -message FindEnabledOriginServerResponse { - OriginServer Origin = 1; +message FindEnabledOriginResponse { + Origin Origin = 1; } // 查找源站配置 -message FindEnabledOriginServerConfigRequest { +message FindEnabledOriginConfigRequest { int64 originId = 1; } -message FindEnabledOriginServerConfigResponse { +message FindEnabledOriginConfigResponse { bytes originJSON = 1; } \ No newline at end of file diff --git a/pkg/serverconfigs/origin_server_config.go b/pkg/serverconfigs/origin_config.go similarity index 94% rename from pkg/serverconfigs/origin_server_config.go rename to pkg/serverconfigs/origin_config.go index 5b45ec8..f22d4be 100644 --- a/pkg/serverconfigs/origin_server_config.go +++ b/pkg/serverconfigs/origin_config.go @@ -13,7 +13,7 @@ import ( ) // 源站服务配置 -type OriginServerConfig struct { +type OriginConfig struct { Id int64 `yaml:"id" json:"id"` // ID IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用 TODO Version int `yaml:"version" json:"version"` // 版本 @@ -43,7 +43,7 @@ type OriginServerConfig struct { Cert *sslconfigs.SSLCertConfig `yaml:"cert" json:"cert"` // 请求源服务器用的证书 // ftp - FTP *OriginServerFTPConfig `yaml:"ftp" json:"ftp"` + FTP *OriginFTPConfig `yaml:"ftp" json:"ftp"` connTimeoutDuration time.Duration readTimeoutDuration time.Duration @@ -64,7 +64,7 @@ type OriginServerConfig struct { } // 校验 -func (this *OriginServerConfig) Init() error { +func (this *OriginConfig) Init() error { // 证书 if this.Cert != nil { err := this.Cert.Init() @@ -131,7 +131,7 @@ func (this *OriginServerConfig) Init() error { } // 候选对象代号 -func (this *OriginServerConfig) CandidateCodes() []string { +func (this *OriginConfig) CandidateCodes() []string { codes := []string{strconv.FormatInt(this.Id, 10)} if len(this.Code) > 0 { codes = append(codes, this.Code) @@ -140,12 +140,12 @@ func (this *OriginServerConfig) CandidateCodes() []string { } // 候选对象权重 -func (this *OriginServerConfig) CandidateWeight() uint { +func (this *OriginConfig) CandidateWeight() uint { return this.Weight } // 连接源站 -func (this *OriginServerConfig) Connect() (net.Conn, error) { +func (this *OriginConfig) Connect() (net.Conn, error) { if this.Addr == nil { return nil, errors.New("origin server address should not be empty") } diff --git a/pkg/serverconfigs/origin_server_ftp.go b/pkg/serverconfigs/origin_ftp_config.go similarity index 86% rename from pkg/serverconfigs/origin_server_ftp.go rename to pkg/serverconfigs/origin_ftp_config.go index 4d4f309..b513ab1 100644 --- a/pkg/serverconfigs/origin_server_ftp.go +++ b/pkg/serverconfigs/origin_ftp_config.go @@ -1,7 +1,7 @@ package serverconfigs // FTP源站配置 -type OriginServerFTPConfig struct { +type OriginFTPConfig struct { Username string `yaml:"username" json:"username"` // 用户名 Password string `yaml:"password" json:"password"` // 密码 Dir string `yaml:"dir" json:"dir"` // 目录 diff --git a/pkg/serverconfigs/origin_ref.go b/pkg/serverconfigs/origin_ref.go new file mode 100644 index 0000000..266c3c5 --- /dev/null +++ b/pkg/serverconfigs/origin_ref.go @@ -0,0 +1,6 @@ +package serverconfigs + +type OriginRef struct { + IsOn bool `yaml:"isOn" json:"isOn"` + OriginId int64 `yaml:"originId" json:"originId"` +} diff --git a/pkg/serverconfigs/origin_server_group_config.go b/pkg/serverconfigs/origin_server_group_config.go index 08701ea..b7c91b6 100644 --- a/pkg/serverconfigs/origin_server_group_config.go +++ b/pkg/serverconfigs/origin_server_group_config.go @@ -1,6 +1,6 @@ package serverconfigs // TODO 需要实现 -type OriginServerGroupConfig struct { - Origins []*OriginServerConfig `yaml:"origins" json:"origins"` // 源站列表 +type OriginGroupConfig struct { + Origins []*OriginConfig `yaml:"origins" json:"origins"` // 源站列表 } diff --git a/pkg/serverconfigs/reverse_proxy_config.go b/pkg/serverconfigs/reverse_proxy_config.go index 811b777..51669a6 100644 --- a/pkg/serverconfigs/reverse_proxy_config.go +++ b/pkg/serverconfigs/reverse_proxy_config.go @@ -8,11 +8,13 @@ import ( // 反向代理设置 type ReverseProxyConfig struct { - Id int64 `yaml:"id" json:"id"` // ID - IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用 - PrimaryOrigins []*OriginServerConfig `yaml:"primaryOrigins" json:"primaryOrigins"` // 主要源站列表 - BackupOrigins []*OriginServerConfig `yaml:"backupOrigins" json:"backupOrigins"` // 备用源站列表 - Scheduling *SchedulingConfig `yaml:"scheduling" json:"scheduling"` // 调度算法选项 + Id int64 `yaml:"id" json:"id"` // ID + IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用 + PrimaryOrigins []*OriginConfig `yaml:"primaryOrigins" json:"primaryOrigins"` // 主要源站列表 + PrimaryOriginRefs []*OriginRef `yaml:"primaryOriginRefs" json:"primaryOriginRefs"` // 主要源站引用 + BackupOrigins []*OriginConfig `yaml:"backupOrigins" json:"backupOrigins"` // 备用源站列表 + BackupOriginRefs []*OriginRef `yaml:"backupOriginRefs" json:"backupOriginRefs"` // 备用源站引用 + Scheduling *SchedulingConfig `yaml:"scheduling" json:"scheduling"` // 调度算法选项 hasPrimaryOrigins bool hasBackupOrigins bool @@ -47,17 +49,17 @@ func (this *ReverseProxyConfig) Init() error { } // 添加主源站配置 -func (this *ReverseProxyConfig) AddPrimaryOrigin(origin *OriginServerConfig) { +func (this *ReverseProxyConfig) AddPrimaryOrigin(origin *OriginConfig) { this.PrimaryOrigins = append(this.PrimaryOrigins, origin) } // 添加备用源站配置 -func (this *ReverseProxyConfig) AddBackupOrigin(origin *OriginServerConfig) { +func (this *ReverseProxyConfig) AddBackupOrigin(origin *OriginConfig) { this.BackupOrigins = append(this.BackupOrigins, origin) } // 取得下一个可用的后端服务 -func (this *ReverseProxyConfig) NextOrigin(call *shared.RequestCall) *OriginServerConfig { +func (this *ReverseProxyConfig) NextOrigin(call *shared.RequestCall) *OriginConfig { this.schedulingLocker.Lock() defer this.schedulingLocker.Unlock() @@ -88,7 +90,7 @@ func (this *ReverseProxyConfig) NextOrigin(call *shared.RequestCall) *OriginServ } } - return candidate.(*OriginServerConfig) + return candidate.(*OriginConfig) } // 设置调度算法