From e759b2e4c28abf63646c5b7dc9ea3ee667984eb1 Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 2 Jan 2024 12:40:45 +0800 Subject: [PATCH] feat: remove object storage message (#244) Signed-off-by: Gaius --- Cargo.toml | 2 +- pkg/apis/common/v2/common.pb.go | 17 +- pkg/apis/common/v2/common.pb.validate.go | 15 - pkg/apis/common/v2/common.proto | 2 - pkg/apis/manager/v2/manager.pb.go | 943 +++--------------- pkg/apis/manager/v2/manager.pb.validate.go | 1007 -------------------- pkg/apis/manager/v2/manager.proto | 85 +- pkg/apis/manager/v2/manager_grpc.pb.go | 114 --- pkg/apis/manager/v2/mocks/manager_mock.go | 105 -- proto/common.proto | 2 - proto/manager.proto | 83 +- src/common.v2.rs | 3 - src/descriptor.bin | Bin 76040 -> 71762 bytes src/manager.v2.rs | 340 ------- 14 files changed, 161 insertions(+), 2557 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24897ab..fc75fcb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dragonfly-api" -version = "2.0.72" +version = "2.0.73" authors = ["Gaius "] edition = "2021" license = "Apache-2.0" diff --git a/pkg/apis/common/v2/common.pb.go b/pkg/apis/common/v2/common.pb.go index 8e5c75b..eeeec83 100644 --- a/pkg/apis/common/v2/common.pb.go +++ b/pkg/apis/common/v2/common.pb.go @@ -671,8 +671,6 @@ type Host struct { Build *Build `protobuf:"bytes,16,opt,name=build,proto3,oneof" json:"build,omitempty"` // ID of the cluster to which the host belongs. SchedulerClusterId uint64 `protobuf:"varint,17,opt,name=scheduler_cluster_id,json=schedulerClusterId,proto3" json:"scheduler_cluster_id,omitempty"` - // Port of object storage server. - ObjectStoragePort int32 `protobuf:"varint,18,opt,name=object_storage_port,json=objectStoragePort,proto3" json:"object_storage_port,omitempty"` } func (x *Host) Reset() { @@ -826,13 +824,6 @@ func (x *Host) GetSchedulerClusterId() uint64 { return 0 } -func (x *Host) GetObjectStoragePort() int32 { - if x != nil { - return x.ObjectStoragePort - } - return 0 -} - // CPU Stat. type CPU struct { state protoimpl.MessageState @@ -1867,7 +1858,7 @@ var file_pkg_apis_common_v2_common_proto_rawDesc = []byte{ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x74, 0x61, 0x67, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0xfb, 0x05, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x02, + 0x69, 0x6f, 0x6e, 0x22, 0xbb, 0x05, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x18, 0x03, 0x52, 0x04, 0x74, 0x79, @@ -1907,11 +1898,7 @@ var file_pkg_apis_common_v2_common_proto_rawDesc = []byte{ 0x64, 0x48, 0x04, 0x52, 0x05, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x14, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x73, 0x63, 0x68, - 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, - 0x3e, 0x0a, 0x13, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, - 0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0e, 0xfa, 0x42, - 0x0b, 0x1a, 0x09, 0x10, 0xff, 0xff, 0x03, 0x28, 0x80, 0x08, 0x40, 0x01, 0x52, 0x11, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x42, + 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x63, 0x70, 0x75, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x64, 0x69, 0x73, 0x6b, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x62, 0x75, 0x69, 0x6c, diff --git a/pkg/apis/common/v2/common.pb.validate.go b/pkg/apis/common/v2/common.pb.validate.go index 21e7be9..ad82543 100644 --- a/pkg/apis/common/v2/common.pb.validate.go +++ b/pkg/apis/common/v2/common.pb.validate.go @@ -737,21 +737,6 @@ func (m *Host) validate(all bool) error { // no validation rules for SchedulerClusterId - if m.GetObjectStoragePort() != 0 { - - if val := m.GetObjectStoragePort(); val < 1024 || val >= 65535 { - err := HostValidationError{ - field: "ObjectStoragePort", - reason: "value must be inside range [1024, 65535)", - } - if !all { - return err - } - errors = append(errors, err) - } - - } - if m.Cpu != nil { if all { diff --git a/pkg/apis/common/v2/common.proto b/pkg/apis/common/v2/common.proto index c2ed817..df20eb5 100644 --- a/pkg/apis/common/v2/common.proto +++ b/pkg/apis/common/v2/common.proto @@ -208,8 +208,6 @@ message Host { optional Build build = 16; // ID of the cluster to which the host belongs. uint64 scheduler_cluster_id = 17; - // Port of object storage server. - int32 object_storage_port = 18 [(validate.rules).int32 = {gte: 1024, lt: 65535, ignore_empty: true}]; } // CPU Stat. diff --git a/pkg/apis/manager/v2/manager.pb.go b/pkg/apis/manager/v2/manager.pb.go index 179075d..5270eb1 100644 --- a/pkg/apis/manager/v2/manager.pb.go +++ b/pkg/apis/manager/v2/manager.pb.go @@ -197,8 +197,6 @@ type SeedPeer struct { SeedPeerCluster *SeedPeerCluster `protobuf:"bytes,11,opt,name=seed_peer_cluster,json=seedPeerCluster,proto3" json:"seed_peer_cluster,omitempty"` // Schedulers included in seed peer. Schedulers []*Scheduler `protobuf:"bytes,12,rep,name=schedulers,proto3" json:"schedulers,omitempty"` - // Seed peer object storage port. - ObjectStoragePort int32 `protobuf:"varint,13,opt,name=object_storage_port,json=objectStoragePort,proto3" json:"object_storage_port,omitempty"` } func (x *SeedPeer) Reset() { @@ -317,13 +315,6 @@ func (x *SeedPeer) GetSchedulers() []*Scheduler { return nil } -func (x *SeedPeer) GetObjectStoragePort() int32 { - if x != nil { - return x.ObjectStoragePort - } - return 0 -} - // GetSeedPeerRequest represents request of GetSeedPeer. type GetSeedPeerRequest struct { state protoimpl.MessageState @@ -558,8 +549,6 @@ type UpdateSeedPeerRequest struct { DownloadPort int32 `protobuf:"varint,8,opt,name=download_port,json=downloadPort,proto3" json:"download_port,omitempty"` // ID of the cluster to which the seed peer belongs. SeedPeerClusterId uint64 `protobuf:"varint,9,opt,name=seed_peer_cluster_id,json=seedPeerClusterId,proto3" json:"seed_peer_cluster_id,omitempty"` - // Seed peer object storage port. - ObjectStoragePort int32 `protobuf:"varint,10,opt,name=object_storage_port,json=objectStoragePort,proto3" json:"object_storage_port,omitempty"` } func (x *UpdateSeedPeerRequest) Reset() { @@ -657,13 +646,6 @@ func (x *UpdateSeedPeerRequest) GetSeedPeerClusterId() uint64 { return 0 } -func (x *UpdateSeedPeerRequest) GetObjectStoragePort() int32 { - if x != nil { - return x.ObjectStoragePort - } - return 0 -} - // DeleteSeedPeerRequest represents request of DeleteSeedPeer. type DeleteSeedPeerRequest struct { state protoimpl.MessageState @@ -1304,346 +1286,6 @@ func (x *ListSchedulersResponse) GetSchedulers() []*Scheduler { return nil } -// ObjectStorage represents config of object storage. -type ObjectStorage struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // name is object storage name of type, it can be s3, oss or obs. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - // Region is storage region. - Region string `protobuf:"bytes,2,opt,name=region,proto3" json:"region,omitempty"` - // Endpoint is datacenter endpoint. - Endpoint string `protobuf:"bytes,3,opt,name=endpoint,proto3" json:"endpoint,omitempty"` - // AccessKey is access key ID. - AccessKey string `protobuf:"bytes,4,opt,name=access_key,json=accessKey,proto3" json:"access_key,omitempty"` - // SecretKey is access key secret. - SecretKey string `protobuf:"bytes,5,opt,name=secret_key,json=secretKey,proto3" json:"secret_key,omitempty"` - // S3ForcePathStyle sets force path style for s3, true by default. - // Set this to `true` to force the request to use path-style addressing, - // i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client - // will use virtual hosted bucket addressing when possible - // (`http://BUCKET.s3.amazonaws.com/KEY`). - // Refer to https://github.com/aws/aws-sdk-go/blob/main/aws/config.go#L118. - S3ForcePathStyle bool `protobuf:"varint,6,opt,name=s3_force_path_style,json=s3ForcePathStyle,proto3" json:"s3_force_path_style,omitempty"` - // Scheme is the scheme of the http client. - Scheme string `protobuf:"bytes,7,opt,name=scheme,proto3" json:"scheme,omitempty"` -} - -func (x *ObjectStorage) Reset() { - *x = ObjectStorage{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ObjectStorage) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ObjectStorage) ProtoMessage() {} - -func (x *ObjectStorage) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[13] - 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) -} - -// Deprecated: Use ObjectStorage.ProtoReflect.Descriptor instead. -func (*ObjectStorage) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{13} -} - -func (x *ObjectStorage) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *ObjectStorage) GetRegion() string { - if x != nil { - return x.Region - } - return "" -} - -func (x *ObjectStorage) GetEndpoint() string { - if x != nil { - return x.Endpoint - } - return "" -} - -func (x *ObjectStorage) GetAccessKey() string { - if x != nil { - return x.AccessKey - } - return "" -} - -func (x *ObjectStorage) GetSecretKey() string { - if x != nil { - return x.SecretKey - } - return "" -} - -func (x *ObjectStorage) GetS3ForcePathStyle() bool { - if x != nil { - return x.S3ForcePathStyle - } - return false -} - -func (x *ObjectStorage) GetScheme() string { - if x != nil { - return x.Scheme - } - return "" -} - -// GetObjectStorageRequest represents request of GetObjectStorage. -type GetObjectStorageRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Request source type. - SourceType SourceType `protobuf:"varint,1,opt,name=source_type,json=sourceType,proto3,enum=manager.v2.SourceType" json:"source_type,omitempty"` - // Source service hostname. - Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3" json:"hostname,omitempty"` - // Source service ip. - Ip string `protobuf:"bytes,3,opt,name=ip,proto3" json:"ip,omitempty"` -} - -func (x *GetObjectStorageRequest) Reset() { - *x = GetObjectStorageRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GetObjectStorageRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetObjectStorageRequest) ProtoMessage() {} - -func (x *GetObjectStorageRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[14] - 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) -} - -// Deprecated: Use GetObjectStorageRequest.ProtoReflect.Descriptor instead. -func (*GetObjectStorageRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{14} -} - -func (x *GetObjectStorageRequest) GetSourceType() SourceType { - if x != nil { - return x.SourceType - } - return SourceType_SCHEDULER_SOURCE -} - -func (x *GetObjectStorageRequest) GetHostname() string { - if x != nil { - return x.Hostname - } - return "" -} - -func (x *GetObjectStorageRequest) GetIp() string { - if x != nil { - return x.Ip - } - return "" -} - -// Bucket represents config of bucket. -type Bucket struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Bucket name. - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` -} - -func (x *Bucket) Reset() { - *x = Bucket{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Bucket) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Bucket) ProtoMessage() {} - -func (x *Bucket) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[15] - 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) -} - -// Deprecated: Use Bucket.ProtoReflect.Descriptor instead. -func (*Bucket) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{15} -} - -func (x *Bucket) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -// ListSchedulersRequest represents request of ListBuckets. -type ListBucketsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Request source type. - SourceType SourceType `protobuf:"varint,1,opt,name=source_type,json=sourceType,proto3,enum=manager.v2.SourceType" json:"source_type,omitempty"` - // Source service hostname. - Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3" json:"hostname,omitempty"` - // Source service ip. - Ip string `protobuf:"bytes,3,opt,name=ip,proto3" json:"ip,omitempty"` -} - -func (x *ListBucketsRequest) Reset() { - *x = ListBucketsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListBucketsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListBucketsRequest) ProtoMessage() {} - -func (x *ListBucketsRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[16] - 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) -} - -// Deprecated: Use ListBucketsRequest.ProtoReflect.Descriptor instead. -func (*ListBucketsRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{16} -} - -func (x *ListBucketsRequest) GetSourceType() SourceType { - if x != nil { - return x.SourceType - } - return SourceType_SCHEDULER_SOURCE -} - -func (x *ListBucketsRequest) GetHostname() string { - if x != nil { - return x.Hostname - } - return "" -} - -func (x *ListBucketsRequest) GetIp() string { - if x != nil { - return x.Ip - } - return "" -} - -// ListBucketsResponse represents response of ListBuckets. -type ListBucketsResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Bucket configs. - Buckets []*Bucket `protobuf:"bytes,1,rep,name=buckets,proto3" json:"buckets,omitempty"` -} - -func (x *ListBucketsResponse) Reset() { - *x = ListBucketsResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListBucketsResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListBucketsResponse) ProtoMessage() {} - -func (x *ListBucketsResponse) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[17] - 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) -} - -// Deprecated: Use ListBucketsResponse.ProtoReflect.Descriptor instead. -func (*ListBucketsResponse) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{17} -} - -func (x *ListBucketsResponse) GetBuckets() []*Bucket { - if x != nil { - return x.Buckets - } - return nil -} - // URLPriority represents config of url priority. type URLPriority struct { state protoimpl.MessageState @@ -1659,7 +1301,7 @@ type URLPriority struct { func (x *URLPriority) Reset() { *x = URLPriority{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[18] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1672,7 +1314,7 @@ func (x *URLPriority) String() string { func (*URLPriority) ProtoMessage() {} func (x *URLPriority) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[18] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1685,7 +1327,7 @@ func (x *URLPriority) ProtoReflect() protoreflect.Message { // Deprecated: Use URLPriority.ProtoReflect.Descriptor instead. func (*URLPriority) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{18} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{13} } func (x *URLPriority) GetRegex() string { @@ -1717,7 +1359,7 @@ type ApplicationPriority struct { func (x *ApplicationPriority) Reset() { *x = ApplicationPriority{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[19] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1730,7 +1372,7 @@ func (x *ApplicationPriority) String() string { func (*ApplicationPriority) ProtoMessage() {} func (x *ApplicationPriority) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[19] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1743,7 +1385,7 @@ func (x *ApplicationPriority) ProtoReflect() protoreflect.Message { // Deprecated: Use ApplicationPriority.ProtoReflect.Descriptor instead. func (*ApplicationPriority) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{19} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{14} } func (x *ApplicationPriority) GetValue() v2.Priority { @@ -1781,7 +1423,7 @@ type Application struct { func (x *Application) Reset() { *x = Application{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[20] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1794,7 +1436,7 @@ func (x *Application) String() string { func (*Application) ProtoMessage() {} func (x *Application) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[20] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1807,7 +1449,7 @@ func (x *Application) ProtoReflect() protoreflect.Message { // Deprecated: Use Application.ProtoReflect.Descriptor instead. func (*Application) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{20} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{15} } func (x *Application) GetId() uint64 { @@ -1862,7 +1504,7 @@ type ListApplicationsRequest struct { func (x *ListApplicationsRequest) Reset() { *x = ListApplicationsRequest{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[21] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1875,7 +1517,7 @@ func (x *ListApplicationsRequest) String() string { func (*ListApplicationsRequest) ProtoMessage() {} func (x *ListApplicationsRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[21] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1888,7 +1530,7 @@ func (x *ListApplicationsRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListApplicationsRequest.ProtoReflect.Descriptor instead. func (*ListApplicationsRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{21} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{16} } func (x *ListApplicationsRequest) GetSourceType() SourceType { @@ -1925,7 +1567,7 @@ type ListApplicationsResponse struct { func (x *ListApplicationsResponse) Reset() { *x = ListApplicationsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[22] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1938,7 +1580,7 @@ func (x *ListApplicationsResponse) String() string { func (*ListApplicationsResponse) ProtoMessage() {} func (x *ListApplicationsResponse) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[22] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1951,7 +1593,7 @@ func (x *ListApplicationsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListApplicationsResponse.ProtoReflect.Descriptor instead. func (*ListApplicationsResponse) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{22} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{17} } func (x *ListApplicationsResponse) GetApplications() []*Application { @@ -1980,7 +1622,7 @@ type CreateGNNRequest struct { func (x *CreateGNNRequest) Reset() { *x = CreateGNNRequest{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[23] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1993,7 +1635,7 @@ func (x *CreateGNNRequest) String() string { func (*CreateGNNRequest) ProtoMessage() {} func (x *CreateGNNRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[23] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2006,7 +1648,7 @@ func (x *CreateGNNRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateGNNRequest.ProtoReflect.Descriptor instead. func (*CreateGNNRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{23} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{18} } func (x *CreateGNNRequest) GetData() []byte { @@ -2054,7 +1696,7 @@ type CreateMLPRequest struct { func (x *CreateMLPRequest) Reset() { *x = CreateMLPRequest{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[24] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2067,7 +1709,7 @@ func (x *CreateMLPRequest) String() string { func (*CreateMLPRequest) ProtoMessage() {} func (x *CreateMLPRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[24] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2080,7 +1722,7 @@ func (x *CreateMLPRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateMLPRequest.ProtoReflect.Descriptor instead. func (*CreateMLPRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{24} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{19} } func (x *CreateMLPRequest) GetData() []byte { @@ -2104,106 +1746,6 @@ func (x *CreateMLPRequest) GetMae() float64 { return 0 } -// CreateModelRequest represents request of CreateModel. -type CreateModelRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Scheduler hostname. - Hostname string `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"` - // Scheduler ip. - Ip string `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` - // Types that are assignable to Request: - // - // *CreateModelRequest_CreateGnnRequest - // *CreateModelRequest_CreateMlpRequest - Request isCreateModelRequest_Request `protobuf_oneof:"request"` -} - -func (x *CreateModelRequest) Reset() { - *x = CreateModelRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[25] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CreateModelRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CreateModelRequest) ProtoMessage() {} - -func (x *CreateModelRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[25] - 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) -} - -// Deprecated: Use CreateModelRequest.ProtoReflect.Descriptor instead. -func (*CreateModelRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{25} -} - -func (x *CreateModelRequest) GetHostname() string { - if x != nil { - return x.Hostname - } - return "" -} - -func (x *CreateModelRequest) GetIp() string { - if x != nil { - return x.Ip - } - return "" -} - -func (m *CreateModelRequest) GetRequest() isCreateModelRequest_Request { - if m != nil { - return m.Request - } - return nil -} - -func (x *CreateModelRequest) GetCreateGnnRequest() *CreateGNNRequest { - if x, ok := x.GetRequest().(*CreateModelRequest_CreateGnnRequest); ok { - return x.CreateGnnRequest - } - return nil -} - -func (x *CreateModelRequest) GetCreateMlpRequest() *CreateMLPRequest { - if x, ok := x.GetRequest().(*CreateModelRequest_CreateMlpRequest); ok { - return x.CreateMlpRequest - } - return nil -} - -type isCreateModelRequest_Request interface { - isCreateModelRequest_Request() -} - -type CreateModelRequest_CreateGnnRequest struct { - CreateGnnRequest *CreateGNNRequest `protobuf:"bytes,3,opt,name=create_gnn_request,json=createGnnRequest,proto3,oneof"` -} - -type CreateModelRequest_CreateMlpRequest struct { - CreateMlpRequest *CreateMLPRequest `protobuf:"bytes,4,opt,name=create_mlp_request,json=createMlpRequest,proto3,oneof"` -} - -func (*CreateModelRequest_CreateGnnRequest) isCreateModelRequest_Request() {} - -func (*CreateModelRequest_CreateMlpRequest) isCreateModelRequest_Request() {} - // KeepAliveRequest represents request of KeepAlive. type KeepAliveRequest struct { state protoimpl.MessageState @@ -2223,7 +1765,7 @@ type KeepAliveRequest struct { func (x *KeepAliveRequest) Reset() { *x = KeepAliveRequest{} if protoimpl.UnsafeEnabled { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[26] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2236,7 +1778,7 @@ func (x *KeepAliveRequest) String() string { func (*KeepAliveRequest) ProtoMessage() {} func (x *KeepAliveRequest) ProtoReflect() protoreflect.Message { - mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[26] + mi := &file_pkg_apis_manager_v2_manager_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2249,7 +1791,7 @@ func (x *KeepAliveRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use KeepAliveRequest.ProtoReflect.Descriptor instead. func (*KeepAliveRequest) Descriptor() ([]byte, []int) { - return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{26} + return file_pkg_apis_manager_v2_manager_proto_rawDescGZIP(), []int{20} } func (x *KeepAliveRequest) GetSourceType() SourceType { @@ -2297,7 +1839,7 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, - 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xd7, 0x03, 0x0a, 0x08, 0x53, 0x65, 0x65, 0x64, + 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xa7, 0x03, 0x0a, 0x08, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, @@ -2322,10 +1864,7 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x35, 0x0a, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, - 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x13, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x70, - 0x6f, 0x72, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x42, 0x06, 0x0a, 0x04, + 0x52, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x69, 0x64, 0x63, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xd2, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, @@ -2359,8 +1898,8 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x33, 0x0a, 0x0a, 0x73, 0x65, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x65, 0x65, 0x64, 0x50, - 0x65, 0x65, 0x72, 0x52, 0x09, 0x73, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x73, 0x22, 0x80, - 0x04, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, + 0x65, 0x65, 0x72, 0x52, 0x09, 0x73, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x73, 0x22, 0xc0, + 0x03, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, @@ -2386,11 +1925,7 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x72, 0x74, 0x12, 0x38, 0x0a, 0x14, 0x73, 0x65, 0x65, 0x64, 0x5f, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x32, 0x02, 0x28, 0x01, 0x52, 0x11, 0x73, 0x65, 0x65, 0x64, 0x50, - 0x65, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x3e, 0x0a, 0x13, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x70, - 0x6f, 0x72, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x1a, 0x09, - 0x10, 0xff, 0xff, 0x03, 0x28, 0x80, 0x08, 0x40, 0x01, 0x52, 0x11, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x42, 0x06, 0x0a, 0x04, + 0x65, 0x65, 0x72, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x69, 0x64, 0x63, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xd5, 0x01, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, @@ -2502,129 +2037,67 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x0a, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x52, 0x0a, - 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x22, 0xb8, 0x02, 0x0a, 0x0d, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x1e, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, - 0x05, 0x10, 0x01, 0x18, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x06, - 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, - 0x0a, 0x72, 0x08, 0x10, 0x01, 0x18, 0x80, 0x08, 0xd0, 0x01, 0x01, 0x52, 0x06, 0x72, 0x65, 0x67, - 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0x18, 0x80, - 0x08, 0xd0, 0x01, 0x01, 0x52, 0x08, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x2c, - 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0x18, 0x80, 0x08, 0xd0, 0x01, - 0x01, 0x52, 0x09, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x12, 0x2c, 0x0a, 0x0a, - 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0x18, 0x80, 0x08, 0xd0, 0x01, 0x01, 0x52, - 0x09, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x12, 0x2d, 0x0a, 0x13, 0x73, 0x33, - 0x5f, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x73, 0x33, 0x46, 0x6f, 0x72, 0x63, 0x65, - 0x50, 0x61, 0x74, 0x68, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x2a, 0x0a, 0x06, 0x73, 0x63, 0x68, - 0x65, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x42, 0x12, 0xfa, 0x42, 0x0f, 0x72, 0x0d, - 0x52, 0x04, 0x68, 0x74, 0x74, 0x70, 0x52, 0x05, 0x68, 0x74, 0x74, 0x70, 0x73, 0x52, 0x06, 0x73, - 0x63, 0x68, 0x65, 0x6d, 0x65, 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, - 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, - 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x68, 0x01, 0x52, - 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x70, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x70, 0x01, 0x52, 0x02, - 0x69, 0x70, 0x22, 0x28, 0x0a, 0x06, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, - 0x05, 0x10, 0x01, 0x18, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x95, 0x01, 0x0a, - 0x12, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, - 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, - 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x68, - 0x01, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x02, 0x69, - 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x70, 0x01, - 0x52, 0x02, 0x69, 0x70, 0x22, 0x43, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x75, 0x63, 0x6b, - 0x65, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x07, 0x62, - 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6d, - 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, - 0x52, 0x07, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x22, 0x57, 0x0a, 0x0b, 0x55, 0x52, 0x4c, - 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, - 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, - 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, - 0x76, 0x32, 0x2e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x22, 0x6d, 0x0a, 0x13, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2b, 0x0a, 0x04, 0x75, 0x72, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, - 0x55, 0x52, 0x4c, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x04, 0x75, 0x72, 0x6c, - 0x73, 0x22, 0xbb, 0x01, 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x07, 0xfa, - 0x42, 0x04, 0x32, 0x02, 0x28, 0x01, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, 0x10, - 0x01, 0x18, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x03, 0x75, 0x72, - 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x88, 0x01, - 0x01, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x6f, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x6f, 0x12, 0x45, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, - 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x61, 0x6e, - 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, - 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, - 0x9a, 0x01, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x16, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, - 0x10, 0x01, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, - 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x68, 0x01, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x70, 0x01, 0x52, 0x02, 0x69, 0x70, 0x22, 0x57, 0x0a, 0x18, - 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x61, 0x70, 0x70, 0x6c, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xcb, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x47, 0x4e, 0x4e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02, 0x10, - 0x01, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x61, 0x6c, - 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12, 0x12, 0x19, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x52, 0x06, 0x72, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x12, 0x35, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x63, - 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x42, 0x17, 0xfa, 0x42, 0x14, - 0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x29, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x52, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, - 0x32, 0x0a, 0x08, 0x66, 0x31, 0x5f, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x01, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, - 0x3f, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x07, 0x66, 0x31, 0x53, 0x63, - 0x6f, 0x72, 0x65, 0x22, 0x73, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x4c, 0x50, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02, 0x10, 0x01, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x03, 0x6d, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x01, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x12, 0x09, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x52, 0x03, 0x6d, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x03, 0x6d, 0x61, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x01, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x12, 0x09, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x52, 0x03, 0x6d, 0x61, 0x65, 0x22, 0xfe, 0x01, 0x0a, 0x12, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x23, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x70, 0x01, 0x52, 0x02, 0x69, 0x70, 0x12, 0x4c, 0x0a, - 0x12, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x67, 0x6e, 0x6e, 0x5f, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x61, 0x6e, 0x61, - 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x47, 0x4e, 0x4e, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x10, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x47, 0x6e, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x12, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x6c, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, - 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x4c, 0x50, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x10, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, - 0x6c, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x0e, 0x0a, 0x07, 0x72, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xbe, 0x01, 0x0a, 0x10, 0x4b, 0x65, + 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x22, 0x57, 0x0a, 0x0b, 0x55, 0x52, + 0x4c, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x72, 0x65, 0x67, + 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, + 0x01, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x22, 0x6d, 0x0a, 0x13, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x29, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x2e, 0x76, 0x32, 0x2e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2b, 0x0a, 0x04, 0x75, 0x72, 0x6c, 0x73, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, + 0x2e, 0x55, 0x52, 0x4c, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x04, 0x75, 0x72, + 0x6c, 0x73, 0x22, 0xbb, 0x01, 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x42, 0x07, + 0xfa, 0x42, 0x04, 0x32, 0x02, 0x28, 0x01, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0a, 0xfa, 0x42, 0x07, 0x72, 0x05, + 0x10, 0x01, 0x18, 0x80, 0x08, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x03, 0x75, + 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x88, + 0x01, 0x01, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x6f, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x6f, 0x12, 0x45, 0x0a, 0x08, 0x70, 0x72, 0x69, + 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6d, 0x61, + 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x08, 0xfa, 0x42, + 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, + 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x16, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x53, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, + 0x02, 0x10, 0x01, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x23, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x68, 0x01, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x70, 0x01, 0x52, 0x02, 0x69, 0x70, 0x22, 0x57, 0x0a, + 0x18, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3b, 0x0a, 0x0c, 0x61, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xcb, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x47, 0x4e, 0x4e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02, + 0x10, 0x01, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x61, + 0x6c, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12, 0x12, 0x19, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x52, 0x06, 0x72, 0x65, 0x63, 0x61, 0x6c, 0x6c, 0x12, 0x35, 0x0a, 0x09, 0x70, 0x72, 0x65, + 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01, 0x42, 0x17, 0xfa, 0x42, + 0x14, 0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x29, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, + 0x12, 0x32, 0x0a, 0x08, 0x66, 0x31, 0x5f, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x01, 0x42, 0x17, 0xfa, 0x42, 0x14, 0x12, 0x12, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xf0, 0x3f, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x07, 0x66, 0x31, 0x53, + 0x63, 0x6f, 0x72, 0x65, 0x22, 0x73, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x4c, + 0x50, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02, 0x10, 0x01, 0x52, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x03, 0x6d, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x01, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x12, 0x09, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x52, 0x03, 0x6d, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x03, 0x6d, 0x61, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x01, 0x42, 0x0e, 0xfa, 0x42, 0x0b, 0x12, 0x09, 0x29, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x52, 0x03, 0x6d, 0x61, 0x65, 0x22, 0xbe, 0x01, 0x0a, 0x10, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x41, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, @@ -2641,7 +2114,7 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x44, 0x55, 0x4c, 0x45, 0x52, 0x5f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x45, 0x45, 0x52, 0x5f, 0x53, 0x4f, 0x55, 0x52, 0x43, 0x45, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x45, 0x45, 0x44, 0x5f, 0x50, 0x45, 0x45, 0x52, 0x5f, 0x53, 0x4f, 0x55, - 0x52, 0x43, 0x45, 0x10, 0x02, 0x32, 0xba, 0x07, 0x0a, 0x07, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, + 0x52, 0x43, 0x45, 0x10, 0x02, 0x32, 0xcf, 0x05, 0x0a, 0x07, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x12, 0x43, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x12, 0x1e, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x65, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, @@ -2676,35 +2149,20 @@ var file_pkg_apis_manager_v2_manager_proto_rawDesc = []byte{ 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x52, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x23, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, - 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x74, - 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x6d, - 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x4e, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x42, - 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x1e, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, - 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, - 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, - 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x6d, 0x61, - 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, - 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x24, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x45, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x1e, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, - 0x76, 0x32, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 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, 0x12, 0x43, 0x0a, - 0x09, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 0x12, 0x1c, 0x2e, 0x6d, 0x61, 0x6e, - 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, - 0x65, 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, - 0x28, 0x01, 0x42, 0x2b, 0x5a, 0x29, 0x64, 0x37, 0x79, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, - 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x2f, 0x6d, 0x61, 0x6e, - 0x61, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x3b, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, + 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x6d, + 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, + 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x43, 0x0a, 0x09, 0x4b, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 0x12, + 0x1c, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x4b, 0x65, 0x65, + 0x70, 0x41, 0x6c, 0x69, 0x76, 0x65, 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, 0x28, 0x01, 0x42, 0x2b, 0x5a, 0x29, 0x64, 0x37, 0x79, 0x2e, 0x69, + 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, + 0x73, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x3b, 0x6d, 0x61, 0x6e, + 0x61, 0x67, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2720,7 +2178,7 @@ func file_pkg_apis_manager_v2_manager_proto_rawDescGZIP() []byte { } var file_pkg_apis_manager_v2_manager_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_pkg_apis_manager_v2_manager_proto_msgTypes = make([]protoimpl.MessageInfo, 27) +var file_pkg_apis_manager_v2_manager_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_pkg_apis_manager_v2_manager_proto_goTypes = []interface{}{ (SourceType)(0), // 0: manager.v2.SourceType (*SeedPeerCluster)(nil), // 1: manager.v2.SeedPeerCluster @@ -2736,22 +2194,16 @@ var file_pkg_apis_manager_v2_manager_proto_goTypes = []interface{}{ (*UpdateSchedulerRequest)(nil), // 11: manager.v2.UpdateSchedulerRequest (*ListSchedulersRequest)(nil), // 12: manager.v2.ListSchedulersRequest (*ListSchedulersResponse)(nil), // 13: manager.v2.ListSchedulersResponse - (*ObjectStorage)(nil), // 14: manager.v2.ObjectStorage - (*GetObjectStorageRequest)(nil), // 15: manager.v2.GetObjectStorageRequest - (*Bucket)(nil), // 16: manager.v2.Bucket - (*ListBucketsRequest)(nil), // 17: manager.v2.ListBucketsRequest - (*ListBucketsResponse)(nil), // 18: manager.v2.ListBucketsResponse - (*URLPriority)(nil), // 19: manager.v2.URLPriority - (*ApplicationPriority)(nil), // 20: manager.v2.ApplicationPriority - (*Application)(nil), // 21: manager.v2.Application - (*ListApplicationsRequest)(nil), // 22: manager.v2.ListApplicationsRequest - (*ListApplicationsResponse)(nil), // 23: manager.v2.ListApplicationsResponse - (*CreateGNNRequest)(nil), // 24: manager.v2.CreateGNNRequest - (*CreateMLPRequest)(nil), // 25: manager.v2.CreateMLPRequest - (*CreateModelRequest)(nil), // 26: manager.v2.CreateModelRequest - (*KeepAliveRequest)(nil), // 27: manager.v2.KeepAliveRequest - (v2.Priority)(0), // 28: common.v2.Priority - (*emptypb.Empty)(nil), // 29: google.protobuf.Empty + (*URLPriority)(nil), // 14: manager.v2.URLPriority + (*ApplicationPriority)(nil), // 15: manager.v2.ApplicationPriority + (*Application)(nil), // 16: manager.v2.Application + (*ListApplicationsRequest)(nil), // 17: manager.v2.ListApplicationsRequest + (*ListApplicationsResponse)(nil), // 18: manager.v2.ListApplicationsResponse + (*CreateGNNRequest)(nil), // 19: manager.v2.CreateGNNRequest + (*CreateMLPRequest)(nil), // 20: manager.v2.CreateMLPRequest + (*KeepAliveRequest)(nil), // 21: manager.v2.KeepAliveRequest + (v2.Priority)(0), // 22: common.v2.Priority + (*emptypb.Empty)(nil), // 23: google.protobuf.Empty } var file_pkg_apis_manager_v2_manager_proto_depIdxs = []int32{ 1, // 0: manager.v2.SeedPeer.seed_peer_cluster:type_name -> manager.v2.SeedPeerCluster @@ -2767,47 +2219,36 @@ var file_pkg_apis_manager_v2_manager_proto_depIdxs = []int32{ 0, // 10: manager.v2.UpdateSchedulerRequest.source_type:type_name -> manager.v2.SourceType 0, // 11: manager.v2.ListSchedulersRequest.source_type:type_name -> manager.v2.SourceType 9, // 12: manager.v2.ListSchedulersResponse.schedulers:type_name -> manager.v2.Scheduler - 0, // 13: manager.v2.GetObjectStorageRequest.source_type:type_name -> manager.v2.SourceType - 0, // 14: manager.v2.ListBucketsRequest.source_type:type_name -> manager.v2.SourceType - 16, // 15: manager.v2.ListBucketsResponse.buckets:type_name -> manager.v2.Bucket - 28, // 16: manager.v2.URLPriority.value:type_name -> common.v2.Priority - 28, // 17: manager.v2.ApplicationPriority.value:type_name -> common.v2.Priority - 19, // 18: manager.v2.ApplicationPriority.urls:type_name -> manager.v2.URLPriority - 20, // 19: manager.v2.Application.priority:type_name -> manager.v2.ApplicationPriority - 0, // 20: manager.v2.ListApplicationsRequest.source_type:type_name -> manager.v2.SourceType - 21, // 21: manager.v2.ListApplicationsResponse.applications:type_name -> manager.v2.Application - 24, // 22: manager.v2.CreateModelRequest.create_gnn_request:type_name -> manager.v2.CreateGNNRequest - 25, // 23: manager.v2.CreateModelRequest.create_mlp_request:type_name -> manager.v2.CreateMLPRequest - 0, // 24: manager.v2.KeepAliveRequest.source_type:type_name -> manager.v2.SourceType - 3, // 25: manager.v2.Manager.GetSeedPeer:input_type -> manager.v2.GetSeedPeerRequest - 4, // 26: manager.v2.Manager.ListSeedPeers:input_type -> manager.v2.ListSeedPeersRequest - 6, // 27: manager.v2.Manager.UpdateSeedPeer:input_type -> manager.v2.UpdateSeedPeerRequest - 7, // 28: manager.v2.Manager.DeleteSeedPeer:input_type -> manager.v2.DeleteSeedPeerRequest - 10, // 29: manager.v2.Manager.GetScheduler:input_type -> manager.v2.GetSchedulerRequest - 11, // 30: manager.v2.Manager.UpdateScheduler:input_type -> manager.v2.UpdateSchedulerRequest - 12, // 31: manager.v2.Manager.ListSchedulers:input_type -> manager.v2.ListSchedulersRequest - 15, // 32: manager.v2.Manager.GetObjectStorage:input_type -> manager.v2.GetObjectStorageRequest - 17, // 33: manager.v2.Manager.ListBuckets:input_type -> manager.v2.ListBucketsRequest - 22, // 34: manager.v2.Manager.ListApplications:input_type -> manager.v2.ListApplicationsRequest - 26, // 35: manager.v2.Manager.CreateModel:input_type -> manager.v2.CreateModelRequest - 27, // 36: manager.v2.Manager.KeepAlive:input_type -> manager.v2.KeepAliveRequest - 2, // 37: manager.v2.Manager.GetSeedPeer:output_type -> manager.v2.SeedPeer - 5, // 38: manager.v2.Manager.ListSeedPeers:output_type -> manager.v2.ListSeedPeersResponse - 2, // 39: manager.v2.Manager.UpdateSeedPeer:output_type -> manager.v2.SeedPeer - 29, // 40: manager.v2.Manager.DeleteSeedPeer:output_type -> google.protobuf.Empty - 9, // 41: manager.v2.Manager.GetScheduler:output_type -> manager.v2.Scheduler - 9, // 42: manager.v2.Manager.UpdateScheduler:output_type -> manager.v2.Scheduler - 13, // 43: manager.v2.Manager.ListSchedulers:output_type -> manager.v2.ListSchedulersResponse - 14, // 44: manager.v2.Manager.GetObjectStorage:output_type -> manager.v2.ObjectStorage - 18, // 45: manager.v2.Manager.ListBuckets:output_type -> manager.v2.ListBucketsResponse - 23, // 46: manager.v2.Manager.ListApplications:output_type -> manager.v2.ListApplicationsResponse - 29, // 47: manager.v2.Manager.CreateModel:output_type -> google.protobuf.Empty - 29, // 48: manager.v2.Manager.KeepAlive:output_type -> google.protobuf.Empty - 37, // [37:49] is the sub-list for method output_type - 25, // [25:37] is the sub-list for method input_type - 25, // [25:25] is the sub-list for extension type_name - 25, // [25:25] is the sub-list for extension extendee - 0, // [0:25] is the sub-list for field type_name + 22, // 13: manager.v2.URLPriority.value:type_name -> common.v2.Priority + 22, // 14: manager.v2.ApplicationPriority.value:type_name -> common.v2.Priority + 14, // 15: manager.v2.ApplicationPriority.urls:type_name -> manager.v2.URLPriority + 15, // 16: manager.v2.Application.priority:type_name -> manager.v2.ApplicationPriority + 0, // 17: manager.v2.ListApplicationsRequest.source_type:type_name -> manager.v2.SourceType + 16, // 18: manager.v2.ListApplicationsResponse.applications:type_name -> manager.v2.Application + 0, // 19: manager.v2.KeepAliveRequest.source_type:type_name -> manager.v2.SourceType + 3, // 20: manager.v2.Manager.GetSeedPeer:input_type -> manager.v2.GetSeedPeerRequest + 4, // 21: manager.v2.Manager.ListSeedPeers:input_type -> manager.v2.ListSeedPeersRequest + 6, // 22: manager.v2.Manager.UpdateSeedPeer:input_type -> manager.v2.UpdateSeedPeerRequest + 7, // 23: manager.v2.Manager.DeleteSeedPeer:input_type -> manager.v2.DeleteSeedPeerRequest + 10, // 24: manager.v2.Manager.GetScheduler:input_type -> manager.v2.GetSchedulerRequest + 11, // 25: manager.v2.Manager.UpdateScheduler:input_type -> manager.v2.UpdateSchedulerRequest + 12, // 26: manager.v2.Manager.ListSchedulers:input_type -> manager.v2.ListSchedulersRequest + 17, // 27: manager.v2.Manager.ListApplications:input_type -> manager.v2.ListApplicationsRequest + 21, // 28: manager.v2.Manager.KeepAlive:input_type -> manager.v2.KeepAliveRequest + 2, // 29: manager.v2.Manager.GetSeedPeer:output_type -> manager.v2.SeedPeer + 5, // 30: manager.v2.Manager.ListSeedPeers:output_type -> manager.v2.ListSeedPeersResponse + 2, // 31: manager.v2.Manager.UpdateSeedPeer:output_type -> manager.v2.SeedPeer + 23, // 32: manager.v2.Manager.DeleteSeedPeer:output_type -> google.protobuf.Empty + 9, // 33: manager.v2.Manager.GetScheduler:output_type -> manager.v2.Scheduler + 9, // 34: manager.v2.Manager.UpdateScheduler:output_type -> manager.v2.Scheduler + 13, // 35: manager.v2.Manager.ListSchedulers:output_type -> manager.v2.ListSchedulersResponse + 18, // 36: manager.v2.Manager.ListApplications:output_type -> manager.v2.ListApplicationsResponse + 23, // 37: manager.v2.Manager.KeepAlive:output_type -> google.protobuf.Empty + 29, // [29:38] is the sub-list for method output_type + 20, // [20:29] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_pkg_apis_manager_v2_manager_proto_init() } @@ -2973,66 +2414,6 @@ func file_pkg_apis_manager_v2_manager_proto_init() { } } file_pkg_apis_manager_v2_manager_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ObjectStorage); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_apis_manager_v2_manager_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetObjectStorageRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_apis_manager_v2_manager_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Bucket); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_apis_manager_v2_manager_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListBucketsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_apis_manager_v2_manager_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListBucketsResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_apis_manager_v2_manager_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*URLPriority); i { case 0: return &v.state @@ -3044,7 +2425,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ApplicationPriority); i { case 0: return &v.state @@ -3056,7 +2437,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Application); i { case 0: return &v.state @@ -3068,7 +2449,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListApplicationsRequest); i { case 0: return &v.state @@ -3080,7 +2461,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListApplicationsResponse); i { case 0: return &v.state @@ -3092,7 +2473,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateGNNRequest); i { case 0: return &v.state @@ -3104,7 +2485,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateMLPRequest); i { case 0: return &v.state @@ -3116,19 +2497,7 @@ func file_pkg_apis_manager_v2_manager_proto_init() { return nil } } - file_pkg_apis_manager_v2_manager_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateModelRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pkg_apis_manager_v2_manager_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_pkg_apis_manager_v2_manager_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*KeepAliveRequest); i { case 0: return &v.state @@ -3146,17 +2515,13 @@ func file_pkg_apis_manager_v2_manager_proto_init() { file_pkg_apis_manager_v2_manager_proto_msgTypes[8].OneofWrappers = []interface{}{} file_pkg_apis_manager_v2_manager_proto_msgTypes[10].OneofWrappers = []interface{}{} file_pkg_apis_manager_v2_manager_proto_msgTypes[11].OneofWrappers = []interface{}{} - file_pkg_apis_manager_v2_manager_proto_msgTypes[25].OneofWrappers = []interface{}{ - (*CreateModelRequest_CreateGnnRequest)(nil), - (*CreateModelRequest_CreateMlpRequest)(nil), - } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pkg_apis_manager_v2_manager_proto_rawDesc, NumEnums: 1, - NumMessages: 27, + NumMessages: 21, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/apis/manager/v2/manager.pb.validate.go b/pkg/apis/manager/v2/manager.pb.validate.go index 880f321..1cf4e7b 100644 --- a/pkg/apis/manager/v2/manager.pb.validate.go +++ b/pkg/apis/manager/v2/manager.pb.validate.go @@ -248,8 +248,6 @@ func (m *SeedPeer) validate(all bool) error { } - // no validation rules for ObjectStoragePort - if m.Idc != nil { // no validation rules for Idc } @@ -948,21 +946,6 @@ func (m *UpdateSeedPeerRequest) validate(all bool) error { errors = append(errors, err) } - if m.GetObjectStoragePort() != 0 { - - if val := m.GetObjectStoragePort(); val < 1024 || val >= 65535 { - err := UpdateSeedPeerRequestValidationError{ - field: "ObjectStoragePort", - reason: "value must be inside range [1024, 65535)", - } - if !all { - return err - } - errors = append(errors, err) - } - - } - if m.Idc != nil { if m.GetIdc() != "" { @@ -2371,772 +2354,6 @@ var _ interface { ErrorName() string } = ListSchedulersResponseValidationError{} -// Validate checks the field values on ObjectStorage with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *ObjectStorage) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ObjectStorage with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in ObjectStorageMultiError, or -// nil if none found. -func (m *ObjectStorage) ValidateAll() error { - return m.validate(true) -} - -func (m *ObjectStorage) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if l := utf8.RuneCountInString(m.GetName()); l < 1 || l > 1024 { - err := ObjectStorageValidationError{ - field: "Name", - reason: "value length must be between 1 and 1024 runes, inclusive", - } - if !all { - return err - } - errors = append(errors, err) - } - - if m.GetRegion() != "" { - - if l := utf8.RuneCountInString(m.GetRegion()); l < 1 || l > 1024 { - err := ObjectStorageValidationError{ - field: "Region", - reason: "value length must be between 1 and 1024 runes, inclusive", - } - if !all { - return err - } - errors = append(errors, err) - } - - } - - if m.GetEndpoint() != "" { - - if l := utf8.RuneCountInString(m.GetEndpoint()); l < 1 || l > 1024 { - err := ObjectStorageValidationError{ - field: "Endpoint", - reason: "value length must be between 1 and 1024 runes, inclusive", - } - if !all { - return err - } - errors = append(errors, err) - } - - } - - if m.GetAccessKey() != "" { - - if l := utf8.RuneCountInString(m.GetAccessKey()); l < 1 || l > 1024 { - err := ObjectStorageValidationError{ - field: "AccessKey", - reason: "value length must be between 1 and 1024 runes, inclusive", - } - if !all { - return err - } - errors = append(errors, err) - } - - } - - if m.GetSecretKey() != "" { - - if l := utf8.RuneCountInString(m.GetSecretKey()); l < 1 || l > 1024 { - err := ObjectStorageValidationError{ - field: "SecretKey", - reason: "value length must be between 1 and 1024 runes, inclusive", - } - if !all { - return err - } - errors = append(errors, err) - } - - } - - // no validation rules for S3ForcePathStyle - - if _, ok := _ObjectStorage_Scheme_InLookup[m.GetScheme()]; !ok { - err := ObjectStorageValidationError{ - field: "Scheme", - reason: "value must be in list [http https]", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return ObjectStorageMultiError(errors) - } - - return nil -} - -// ObjectStorageMultiError is an error wrapping multiple validation errors -// returned by ObjectStorage.ValidateAll() if the designated constraints -// aren't met. -type ObjectStorageMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ObjectStorageMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ObjectStorageMultiError) AllErrors() []error { return m } - -// ObjectStorageValidationError is the validation error returned by -// ObjectStorage.Validate if the designated constraints aren't met. -type ObjectStorageValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ObjectStorageValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ObjectStorageValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ObjectStorageValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ObjectStorageValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ObjectStorageValidationError) ErrorName() string { return "ObjectStorageValidationError" } - -// Error satisfies the builtin error interface -func (e ObjectStorageValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sObjectStorage.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ObjectStorageValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ObjectStorageValidationError{} - -var _ObjectStorage_Scheme_InLookup = map[string]struct{}{ - "http": {}, - "https": {}, -} - -// Validate checks the field values on GetObjectStorageRequest with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *GetObjectStorageRequest) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on GetObjectStorageRequest with the -// rules defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// GetObjectStorageRequestMultiError, or nil if none found. -func (m *GetObjectStorageRequest) ValidateAll() error { - return m.validate(true) -} - -func (m *GetObjectStorageRequest) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if _, ok := SourceType_name[int32(m.GetSourceType())]; !ok { - err := GetObjectStorageRequestValidationError{ - field: "SourceType", - reason: "value must be one of the defined enum values", - } - if !all { - return err - } - errors = append(errors, err) - } - - if err := m._validateHostname(m.GetHostname()); err != nil { - err = GetObjectStorageRequestValidationError{ - field: "Hostname", - reason: "value must be a valid hostname", - cause: err, - } - if !all { - return err - } - errors = append(errors, err) - } - - if ip := net.ParseIP(m.GetIp()); ip == nil { - err := GetObjectStorageRequestValidationError{ - field: "Ip", - reason: "value must be a valid IP address", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return GetObjectStorageRequestMultiError(errors) - } - - return nil -} - -func (m *GetObjectStorageRequest) _validateHostname(host string) error { - s := strings.ToLower(strings.TrimSuffix(host, ".")) - - if len(host) > 253 { - return errors.New("hostname cannot exceed 253 characters") - } - - for _, part := range strings.Split(s, ".") { - if l := len(part); l == 0 || l > 63 { - return errors.New("hostname part must be non-empty and cannot exceed 63 characters") - } - - if part[0] == '-' { - return errors.New("hostname parts cannot begin with hyphens") - } - - if part[len(part)-1] == '-' { - return errors.New("hostname parts cannot end with hyphens") - } - - for _, r := range part { - if (r < 'a' || r > 'z') && (r < '0' || r > '9') && r != '-' { - return fmt.Errorf("hostname parts can only contain alphanumeric characters or hyphens, got %q", string(r)) - } - } - } - - return nil -} - -// GetObjectStorageRequestMultiError is an error wrapping multiple validation -// errors returned by GetObjectStorageRequest.ValidateAll() if the designated -// constraints aren't met. -type GetObjectStorageRequestMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m GetObjectStorageRequestMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m GetObjectStorageRequestMultiError) AllErrors() []error { return m } - -// GetObjectStorageRequestValidationError is the validation error returned by -// GetObjectStorageRequest.Validate if the designated constraints aren't met. -type GetObjectStorageRequestValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e GetObjectStorageRequestValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e GetObjectStorageRequestValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e GetObjectStorageRequestValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e GetObjectStorageRequestValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e GetObjectStorageRequestValidationError) ErrorName() string { - return "GetObjectStorageRequestValidationError" -} - -// Error satisfies the builtin error interface -func (e GetObjectStorageRequestValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sGetObjectStorageRequest.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = GetObjectStorageRequestValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = GetObjectStorageRequestValidationError{} - -// Validate checks the field values on Bucket with the rules defined in the -// proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *Bucket) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on Bucket with the rules defined in the -// proto definition for this message. If any rules are violated, the result is -// a list of violation errors wrapped in BucketMultiError, or nil if none found. -func (m *Bucket) ValidateAll() error { - return m.validate(true) -} - -func (m *Bucket) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if l := utf8.RuneCountInString(m.GetName()); l < 1 || l > 1024 { - err := BucketValidationError{ - field: "Name", - reason: "value length must be between 1 and 1024 runes, inclusive", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return BucketMultiError(errors) - } - - return nil -} - -// BucketMultiError is an error wrapping multiple validation errors returned by -// Bucket.ValidateAll() if the designated constraints aren't met. -type BucketMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m BucketMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m BucketMultiError) AllErrors() []error { return m } - -// BucketValidationError is the validation error returned by Bucket.Validate if -// the designated constraints aren't met. -type BucketValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e BucketValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e BucketValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e BucketValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e BucketValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e BucketValidationError) ErrorName() string { return "BucketValidationError" } - -// Error satisfies the builtin error interface -func (e BucketValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sBucket.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = BucketValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = BucketValidationError{} - -// Validate checks the field values on ListBucketsRequest with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *ListBucketsRequest) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ListBucketsRequest with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// ListBucketsRequestMultiError, or nil if none found. -func (m *ListBucketsRequest) ValidateAll() error { - return m.validate(true) -} - -func (m *ListBucketsRequest) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if _, ok := SourceType_name[int32(m.GetSourceType())]; !ok { - err := ListBucketsRequestValidationError{ - field: "SourceType", - reason: "value must be one of the defined enum values", - } - if !all { - return err - } - errors = append(errors, err) - } - - if err := m._validateHostname(m.GetHostname()); err != nil { - err = ListBucketsRequestValidationError{ - field: "Hostname", - reason: "value must be a valid hostname", - cause: err, - } - if !all { - return err - } - errors = append(errors, err) - } - - if ip := net.ParseIP(m.GetIp()); ip == nil { - err := ListBucketsRequestValidationError{ - field: "Ip", - reason: "value must be a valid IP address", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return ListBucketsRequestMultiError(errors) - } - - return nil -} - -func (m *ListBucketsRequest) _validateHostname(host string) error { - s := strings.ToLower(strings.TrimSuffix(host, ".")) - - if len(host) > 253 { - return errors.New("hostname cannot exceed 253 characters") - } - - for _, part := range strings.Split(s, ".") { - if l := len(part); l == 0 || l > 63 { - return errors.New("hostname part must be non-empty and cannot exceed 63 characters") - } - - if part[0] == '-' { - return errors.New("hostname parts cannot begin with hyphens") - } - - if part[len(part)-1] == '-' { - return errors.New("hostname parts cannot end with hyphens") - } - - for _, r := range part { - if (r < 'a' || r > 'z') && (r < '0' || r > '9') && r != '-' { - return fmt.Errorf("hostname parts can only contain alphanumeric characters or hyphens, got %q", string(r)) - } - } - } - - return nil -} - -// ListBucketsRequestMultiError is an error wrapping multiple validation errors -// returned by ListBucketsRequest.ValidateAll() if the designated constraints -// aren't met. -type ListBucketsRequestMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ListBucketsRequestMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ListBucketsRequestMultiError) AllErrors() []error { return m } - -// ListBucketsRequestValidationError is the validation error returned by -// ListBucketsRequest.Validate if the designated constraints aren't met. -type ListBucketsRequestValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ListBucketsRequestValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ListBucketsRequestValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ListBucketsRequestValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ListBucketsRequestValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ListBucketsRequestValidationError) ErrorName() string { - return "ListBucketsRequestValidationError" -} - -// Error satisfies the builtin error interface -func (e ListBucketsRequestValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sListBucketsRequest.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ListBucketsRequestValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ListBucketsRequestValidationError{} - -// Validate checks the field values on ListBucketsResponse with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *ListBucketsResponse) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on ListBucketsResponse with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// ListBucketsResponseMultiError, or nil if none found. -func (m *ListBucketsResponse) ValidateAll() error { - return m.validate(true) -} - -func (m *ListBucketsResponse) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - for idx, item := range m.GetBuckets() { - _, _ = idx, item - - if all { - switch v := interface{}(item).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, ListBucketsResponseValidationError{ - field: fmt.Sprintf("Buckets[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, ListBucketsResponseValidationError{ - field: fmt.Sprintf("Buckets[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(item).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return ListBucketsResponseValidationError{ - field: fmt.Sprintf("Buckets[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - - if len(errors) > 0 { - return ListBucketsResponseMultiError(errors) - } - - return nil -} - -// ListBucketsResponseMultiError is an error wrapping multiple validation -// errors returned by ListBucketsResponse.ValidateAll() if the designated -// constraints aren't met. -type ListBucketsResponseMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m ListBucketsResponseMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m ListBucketsResponseMultiError) AllErrors() []error { return m } - -// ListBucketsResponseValidationError is the validation error returned by -// ListBucketsResponse.Validate if the designated constraints aren't met. -type ListBucketsResponseValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e ListBucketsResponseValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e ListBucketsResponseValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e ListBucketsResponseValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e ListBucketsResponseValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e ListBucketsResponseValidationError) ErrorName() string { - return "ListBucketsResponseValidationError" -} - -// Error satisfies the builtin error interface -func (e ListBucketsResponseValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sListBucketsResponse.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = ListBucketsResponseValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = ListBucketsResponseValidationError{} - // Validate checks the field values on URLPriority with the rules defined in // the proto definition for this message. If any rules are violated, the first // error encountered is returned, or nil if there are no violations. @@ -4150,230 +3367,6 @@ var _ interface { ErrorName() string } = CreateMLPRequestValidationError{} -// Validate checks the field values on CreateModelRequest with the rules -// defined in the proto definition for this message. If any rules are -// violated, the first error encountered is returned, or nil if there are no violations. -func (m *CreateModelRequest) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on CreateModelRequest with the rules -// defined in the proto definition for this message. If any rules are -// violated, the result is a list of violation errors wrapped in -// CreateModelRequestMultiError, or nil if none found. -func (m *CreateModelRequest) ValidateAll() error { - return m.validate(true) -} - -func (m *CreateModelRequest) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if utf8.RuneCountInString(m.GetHostname()) < 1 { - err := CreateModelRequestValidationError{ - field: "Hostname", - reason: "value length must be at least 1 runes", - } - if !all { - return err - } - errors = append(errors, err) - } - - if ip := net.ParseIP(m.GetIp()); ip == nil { - err := CreateModelRequestValidationError{ - field: "Ip", - reason: "value must be a valid IP address", - } - if !all { - return err - } - errors = append(errors, err) - } - - oneofRequestPresent := false - switch v := m.Request.(type) { - case *CreateModelRequest_CreateGnnRequest: - if v == nil { - err := CreateModelRequestValidationError{ - field: "Request", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - oneofRequestPresent = true - - if all { - switch v := interface{}(m.GetCreateGnnRequest()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, CreateModelRequestValidationError{ - field: "CreateGnnRequest", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, CreateModelRequestValidationError{ - field: "CreateGnnRequest", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetCreateGnnRequest()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return CreateModelRequestValidationError{ - field: "CreateGnnRequest", - reason: "embedded message failed validation", - cause: err, - } - } - } - - case *CreateModelRequest_CreateMlpRequest: - if v == nil { - err := CreateModelRequestValidationError{ - field: "Request", - reason: "oneof value cannot be a typed-nil", - } - if !all { - return err - } - errors = append(errors, err) - } - oneofRequestPresent = true - - if all { - switch v := interface{}(m.GetCreateMlpRequest()).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, CreateModelRequestValidationError{ - field: "CreateMlpRequest", - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, CreateModelRequestValidationError{ - field: "CreateMlpRequest", - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(m.GetCreateMlpRequest()).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return CreateModelRequestValidationError{ - field: "CreateMlpRequest", - reason: "embedded message failed validation", - cause: err, - } - } - } - - default: - _ = v // ensures v is used - } - if !oneofRequestPresent { - err := CreateModelRequestValidationError{ - field: "Request", - reason: "value is required", - } - if !all { - return err - } - errors = append(errors, err) - } - - if len(errors) > 0 { - return CreateModelRequestMultiError(errors) - } - - return nil -} - -// CreateModelRequestMultiError is an error wrapping multiple validation errors -// returned by CreateModelRequest.ValidateAll() if the designated constraints -// aren't met. -type CreateModelRequestMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m CreateModelRequestMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m CreateModelRequestMultiError) AllErrors() []error { return m } - -// CreateModelRequestValidationError is the validation error returned by -// CreateModelRequest.Validate if the designated constraints aren't met. -type CreateModelRequestValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e CreateModelRequestValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e CreateModelRequestValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e CreateModelRequestValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e CreateModelRequestValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e CreateModelRequestValidationError) ErrorName() string { - return "CreateModelRequestValidationError" -} - -// Error satisfies the builtin error interface -func (e CreateModelRequestValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sCreateModelRequest.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = CreateModelRequestValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = CreateModelRequestValidationError{} - // Validate checks the field values on KeepAliveRequest with the rules defined // in the proto definition for this message. If any rules are violated, the // first error encountered is returned, or nil if there are no violations. diff --git a/pkg/apis/manager/v2/manager.proto b/pkg/apis/manager/v2/manager.proto index 0c6ae55..c6dabb4 100644 --- a/pkg/apis/manager/v2/manager.proto +++ b/pkg/apis/manager/v2/manager.proto @@ -28,8 +28,10 @@ option go_package = "d7y.io/api/v2/pkg/apis/manager/v2;manager"; enum SourceType { // Scheduler service. SCHEDULER_SOURCE = 0; + // Peer service. PEER_SOURCE = 1; + // SeedPeer service. SEED_PEER_SOURCE = 2; } @@ -72,8 +74,6 @@ message SeedPeer { SeedPeerCluster seed_peer_cluster = 11; // Schedulers included in seed peer. repeated Scheduler schedulers = 12; - // Seed peer object storage port. - int32 object_storage_port = 13; } // GetSeedPeerRequest represents request of GetSeedPeer. @@ -128,8 +128,6 @@ message UpdateSeedPeerRequest { int32 download_port = 8 [(validate.rules).int32 = {gte: 1024, lt: 65535}]; // ID of the cluster to which the seed peer belongs. uint64 seed_peer_cluster_id = 9 [(validate.rules).uint64 = {gte: 1}]; - // Seed peer object storage port. - int32 object_storage_port = 10 [(validate.rules).int32 = {gte: 1024, lt: 65535, ignore_empty: true}]; } // DeleteSeedPeerRequest represents request of DeleteSeedPeer. @@ -240,61 +238,6 @@ message ListSchedulersResponse { repeated Scheduler schedulers = 1; } -// ObjectStorage represents config of object storage. -message ObjectStorage { - // name is object storage name of type, it can be s3, oss or obs. - string name = 1 [(validate.rules).string = {min_len: 1, max_len: 1024}]; - // Region is storage region. - string region = 2 [(validate.rules).string = {min_len: 1, max_len: 1024, ignore_empty: true}]; - // Endpoint is datacenter endpoint. - string endpoint = 3 [(validate.rules).string = {min_len: 1, max_len: 1024, ignore_empty: true}]; - // AccessKey is access key ID. - string access_key = 4 [(validate.rules).string = {min_len: 1, max_len: 1024, ignore_empty: true}]; - // SecretKey is access key secret. - string secret_key = 5 [(validate.rules).string = {min_len: 1, max_len: 1024, ignore_empty: true}]; - // S3ForcePathStyle sets force path style for s3, true by default. - // Set this to `true` to force the request to use path-style addressing, - // i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client - // will use virtual hosted bucket addressing when possible - // (`http://BUCKET.s3.amazonaws.com/KEY`). - // Refer to https://github.com/aws/aws-sdk-go/blob/main/aws/config.go#L118. - bool s3_force_path_style = 6; - // Scheme is the scheme of the http client. - string scheme = 7 [(validate.rules).string = {in: ["http", "https"]}]; -} - -// GetObjectStorageRequest represents request of GetObjectStorage. -message GetObjectStorageRequest { - // Request source type. - SourceType source_type = 1 [(validate.rules).enum.defined_only = true]; - // Source service hostname. - string hostname = 2 [(validate.rules).string.hostname = true]; - // Source service ip. - string ip = 3 [(validate.rules).string.ip = true]; -} - -// Bucket represents config of bucket. -message Bucket { - // Bucket name. - string name = 1 [(validate.rules).string = {min_len: 1, max_len: 1024}]; -} - -// ListSchedulersRequest represents request of ListBuckets. -message ListBucketsRequest { - // Request source type. - SourceType source_type = 1 [(validate.rules).enum.defined_only = true]; - // Source service hostname. - string hostname = 2 [(validate.rules).string.hostname = true]; - // Source service ip. - string ip = 3 [(validate.rules).string.ip = true]; -} - -// ListBucketsResponse represents response of ListBuckets. -message ListBucketsResponse { - // Bucket configs. - repeated Bucket buckets = 1; -} - // URLPriority represents config of url priority. message URLPriority { // URL regex. @@ -363,21 +306,6 @@ message CreateMLPRequest { double mae = 3 [(validate.rules).double = {gte: 0}]; } -// CreateModelRequest represents request of CreateModel. -message CreateModelRequest { - // Scheduler hostname. - string hostname = 1 [(validate.rules).string.min_len = 1]; - // Scheduler ip. - string ip = 2 [(validate.rules).string.ip = true]; - - oneof request { - option (validate.required) = true; - - CreateGNNRequest create_gnn_request = 3; - CreateMLPRequest create_mlp_request = 4; - } -} - // KeepAliveRequest represents request of KeepAlive. message KeepAliveRequest { // Request source type. @@ -413,18 +341,9 @@ service Manager { // List acitve schedulers configuration. rpc ListSchedulers(ListSchedulersRequest)returns(ListSchedulersResponse); - // Get ObjectStorage configuration. - rpc GetObjectStorage(GetObjectStorageRequest) returns(ObjectStorage); - - // List buckets configuration. - rpc ListBuckets(ListBucketsRequest)returns(ListBucketsResponse); - // List applications configuration. rpc ListApplications(ListApplicationsRequest)returns(ListApplicationsResponse); - // Create model and update data of model to object storage. - rpc CreateModel(CreateModelRequest)returns(google.protobuf.Empty); - // KeepAlive with manager. rpc KeepAlive(stream KeepAliveRequest)returns(google.protobuf.Empty); } diff --git a/pkg/apis/manager/v2/manager_grpc.pb.go b/pkg/apis/manager/v2/manager_grpc.pb.go index ddfee9c..cfd7923 100644 --- a/pkg/apis/manager/v2/manager_grpc.pb.go +++ b/pkg/apis/manager/v2/manager_grpc.pb.go @@ -37,14 +37,8 @@ type ManagerClient interface { UpdateScheduler(ctx context.Context, in *UpdateSchedulerRequest, opts ...grpc.CallOption) (*Scheduler, error) // List acitve schedulers configuration. ListSchedulers(ctx context.Context, in *ListSchedulersRequest, opts ...grpc.CallOption) (*ListSchedulersResponse, error) - // Get ObjectStorage configuration. - GetObjectStorage(ctx context.Context, in *GetObjectStorageRequest, opts ...grpc.CallOption) (*ObjectStorage, error) - // List buckets configuration. - ListBuckets(ctx context.Context, in *ListBucketsRequest, opts ...grpc.CallOption) (*ListBucketsResponse, error) // List applications configuration. ListApplications(ctx context.Context, in *ListApplicationsRequest, opts ...grpc.CallOption) (*ListApplicationsResponse, error) - // Create model and update data of model to object storage. - CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) // KeepAlive with manager. KeepAlive(ctx context.Context, opts ...grpc.CallOption) (Manager_KeepAliveClient, error) } @@ -120,24 +114,6 @@ func (c *managerClient) ListSchedulers(ctx context.Context, in *ListSchedulersRe return out, nil } -func (c *managerClient) GetObjectStorage(ctx context.Context, in *GetObjectStorageRequest, opts ...grpc.CallOption) (*ObjectStorage, error) { - out := new(ObjectStorage) - err := c.cc.Invoke(ctx, "/manager.v2.Manager/GetObjectStorage", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *managerClient) ListBuckets(ctx context.Context, in *ListBucketsRequest, opts ...grpc.CallOption) (*ListBucketsResponse, error) { - out := new(ListBucketsResponse) - err := c.cc.Invoke(ctx, "/manager.v2.Manager/ListBuckets", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *managerClient) ListApplications(ctx context.Context, in *ListApplicationsRequest, opts ...grpc.CallOption) (*ListApplicationsResponse, error) { out := new(ListApplicationsResponse) err := c.cc.Invoke(ctx, "/manager.v2.Manager/ListApplications", in, out, opts...) @@ -147,15 +123,6 @@ func (c *managerClient) ListApplications(ctx context.Context, in *ListApplicatio return out, nil } -func (c *managerClient) CreateModel(ctx context.Context, in *CreateModelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, "/manager.v2.Manager/CreateModel", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *managerClient) KeepAlive(ctx context.Context, opts ...grpc.CallOption) (Manager_KeepAliveClient, error) { stream, err := c.cc.NewStream(ctx, &Manager_ServiceDesc.Streams[0], "/manager.v2.Manager/KeepAlive", opts...) if err != nil { @@ -208,14 +175,8 @@ type ManagerServer interface { UpdateScheduler(context.Context, *UpdateSchedulerRequest) (*Scheduler, error) // List acitve schedulers configuration. ListSchedulers(context.Context, *ListSchedulersRequest) (*ListSchedulersResponse, error) - // Get ObjectStorage configuration. - GetObjectStorage(context.Context, *GetObjectStorageRequest) (*ObjectStorage, error) - // List buckets configuration. - ListBuckets(context.Context, *ListBucketsRequest) (*ListBucketsResponse, error) // List applications configuration. ListApplications(context.Context, *ListApplicationsRequest) (*ListApplicationsResponse, error) - // Create model and update data of model to object storage. - CreateModel(context.Context, *CreateModelRequest) (*emptypb.Empty, error) // KeepAlive with manager. KeepAlive(Manager_KeepAliveServer) error } @@ -245,18 +206,9 @@ func (UnimplementedManagerServer) UpdateScheduler(context.Context, *UpdateSchedu func (UnimplementedManagerServer) ListSchedulers(context.Context, *ListSchedulersRequest) (*ListSchedulersResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListSchedulers not implemented") } -func (UnimplementedManagerServer) GetObjectStorage(context.Context, *GetObjectStorageRequest) (*ObjectStorage, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetObjectStorage not implemented") -} -func (UnimplementedManagerServer) ListBuckets(context.Context, *ListBucketsRequest) (*ListBucketsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method ListBuckets not implemented") -} func (UnimplementedManagerServer) ListApplications(context.Context, *ListApplicationsRequest) (*ListApplicationsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListApplications not implemented") } -func (UnimplementedManagerServer) CreateModel(context.Context, *CreateModelRequest) (*emptypb.Empty, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateModel not implemented") -} func (UnimplementedManagerServer) KeepAlive(Manager_KeepAliveServer) error { return status.Errorf(codes.Unimplemented, "method KeepAlive not implemented") } @@ -398,42 +350,6 @@ func _Manager_ListSchedulers_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } -func _Manager_GetObjectStorage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetObjectStorageRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ManagerServer).GetObjectStorage(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/manager.v2.Manager/GetObjectStorage", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ManagerServer).GetObjectStorage(ctx, req.(*GetObjectStorageRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Manager_ListBuckets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListBucketsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ManagerServer).ListBuckets(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/manager.v2.Manager/ListBuckets", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ManagerServer).ListBuckets(ctx, req.(*ListBucketsRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Manager_ListApplications_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListApplicationsRequest) if err := dec(in); err != nil { @@ -452,24 +368,6 @@ func _Manager_ListApplications_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _Manager_CreateModel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateModelRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ManagerServer).CreateModel(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/manager.v2.Manager/CreateModel", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ManagerServer).CreateModel(ctx, req.(*CreateModelRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Manager_KeepAlive_Handler(srv interface{}, stream grpc.ServerStream) error { return srv.(ManagerServer).KeepAlive(&managerKeepAliveServer{stream}) } @@ -531,22 +429,10 @@ var Manager_ServiceDesc = grpc.ServiceDesc{ MethodName: "ListSchedulers", Handler: _Manager_ListSchedulers_Handler, }, - { - MethodName: "GetObjectStorage", - Handler: _Manager_GetObjectStorage_Handler, - }, - { - MethodName: "ListBuckets", - Handler: _Manager_ListBuckets_Handler, - }, { MethodName: "ListApplications", Handler: _Manager_ListApplications_Handler, }, - { - MethodName: "CreateModel", - Handler: _Manager_CreateModel_Handler, - }, }, Streams: []grpc.StreamDesc{ { diff --git a/pkg/apis/manager/v2/mocks/manager_mock.go b/pkg/apis/manager/v2/mocks/manager_mock.go index c1d8283..fabcb07 100644 --- a/pkg/apis/manager/v2/mocks/manager_mock.go +++ b/pkg/apis/manager/v2/mocks/manager_mock.go @@ -42,26 +42,6 @@ func (m *MockManagerClient) EXPECT() *MockManagerClientMockRecorder { return m.recorder } -// CreateModel mocks base method. -func (m *MockManagerClient) CreateModel(ctx context.Context, in *manager.CreateModelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - m.ctrl.T.Helper() - varargs := []any{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "CreateModel", varargs...) - ret0, _ := ret[0].(*emptypb.Empty) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// CreateModel indicates an expected call of CreateModel. -func (mr *MockManagerClientMockRecorder) CreateModel(ctx, in any, opts ...any) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateModel", reflect.TypeOf((*MockManagerClient)(nil).CreateModel), varargs...) -} - // DeleteSeedPeer mocks base method. func (m *MockManagerClient) DeleteSeedPeer(ctx context.Context, in *manager.DeleteSeedPeerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { m.ctrl.T.Helper() @@ -82,26 +62,6 @@ func (mr *MockManagerClientMockRecorder) DeleteSeedPeer(ctx, in any, opts ...any return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSeedPeer", reflect.TypeOf((*MockManagerClient)(nil).DeleteSeedPeer), varargs...) } -// GetObjectStorage mocks base method. -func (m *MockManagerClient) GetObjectStorage(ctx context.Context, in *manager.GetObjectStorageRequest, opts ...grpc.CallOption) (*manager.ObjectStorage, error) { - m.ctrl.T.Helper() - varargs := []any{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "GetObjectStorage", varargs...) - ret0, _ := ret[0].(*manager.ObjectStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetObjectStorage indicates an expected call of GetObjectStorage. -func (mr *MockManagerClientMockRecorder) GetObjectStorage(ctx, in any, opts ...any) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetObjectStorage", reflect.TypeOf((*MockManagerClient)(nil).GetObjectStorage), varargs...) -} - // GetScheduler mocks base method. func (m *MockManagerClient) GetScheduler(ctx context.Context, in *manager.GetSchedulerRequest, opts ...grpc.CallOption) (*manager.Scheduler, error) { m.ctrl.T.Helper() @@ -182,26 +142,6 @@ func (mr *MockManagerClientMockRecorder) ListApplications(ctx, in any, opts ...a return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListApplications", reflect.TypeOf((*MockManagerClient)(nil).ListApplications), varargs...) } -// ListBuckets mocks base method. -func (m *MockManagerClient) ListBuckets(ctx context.Context, in *manager.ListBucketsRequest, opts ...grpc.CallOption) (*manager.ListBucketsResponse, error) { - m.ctrl.T.Helper() - varargs := []any{ctx, in} - for _, a := range opts { - varargs = append(varargs, a) - } - ret := m.ctrl.Call(m, "ListBuckets", varargs...) - ret0, _ := ret[0].(*manager.ListBucketsResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// ListBuckets indicates an expected call of ListBuckets. -func (mr *MockManagerClientMockRecorder) ListBuckets(ctx, in any, opts ...any) *gomock.Call { - mr.mock.ctrl.T.Helper() - varargs := append([]any{ctx, in}, opts...) - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuckets", reflect.TypeOf((*MockManagerClient)(nil).ListBuckets), varargs...) -} - // ListSchedulers mocks base method. func (m *MockManagerClient) ListSchedulers(ctx context.Context, in *manager.ListSchedulersRequest, opts ...grpc.CallOption) (*manager.ListSchedulersResponse, error) { m.ctrl.T.Helper() @@ -442,21 +382,6 @@ func (m *MockManagerServer) EXPECT() *MockManagerServerMockRecorder { return m.recorder } -// CreateModel mocks base method. -func (m *MockManagerServer) CreateModel(arg0 context.Context, arg1 *manager.CreateModelRequest) (*emptypb.Empty, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateModel", arg0, arg1) - ret0, _ := ret[0].(*emptypb.Empty) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// CreateModel indicates an expected call of CreateModel. -func (mr *MockManagerServerMockRecorder) CreateModel(arg0, arg1 any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateModel", reflect.TypeOf((*MockManagerServer)(nil).CreateModel), arg0, arg1) -} - // DeleteSeedPeer mocks base method. func (m *MockManagerServer) DeleteSeedPeer(arg0 context.Context, arg1 *manager.DeleteSeedPeerRequest) (*emptypb.Empty, error) { m.ctrl.T.Helper() @@ -472,21 +397,6 @@ func (mr *MockManagerServerMockRecorder) DeleteSeedPeer(arg0, arg1 any) *gomock. return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteSeedPeer", reflect.TypeOf((*MockManagerServer)(nil).DeleteSeedPeer), arg0, arg1) } -// GetObjectStorage mocks base method. -func (m *MockManagerServer) GetObjectStorage(arg0 context.Context, arg1 *manager.GetObjectStorageRequest) (*manager.ObjectStorage, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetObjectStorage", arg0, arg1) - ret0, _ := ret[0].(*manager.ObjectStorage) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// GetObjectStorage indicates an expected call of GetObjectStorage. -func (mr *MockManagerServerMockRecorder) GetObjectStorage(arg0, arg1 any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetObjectStorage", reflect.TypeOf((*MockManagerServer)(nil).GetObjectStorage), arg0, arg1) -} - // GetScheduler mocks base method. func (m *MockManagerServer) GetScheduler(arg0 context.Context, arg1 *manager.GetSchedulerRequest) (*manager.Scheduler, error) { m.ctrl.T.Helper() @@ -546,21 +456,6 @@ func (mr *MockManagerServerMockRecorder) ListApplications(arg0, arg1 any) *gomoc return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListApplications", reflect.TypeOf((*MockManagerServer)(nil).ListApplications), arg0, arg1) } -// ListBuckets mocks base method. -func (m *MockManagerServer) ListBuckets(arg0 context.Context, arg1 *manager.ListBucketsRequest) (*manager.ListBucketsResponse, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListBuckets", arg0, arg1) - ret0, _ := ret[0].(*manager.ListBucketsResponse) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// ListBuckets indicates an expected call of ListBuckets. -func (mr *MockManagerServerMockRecorder) ListBuckets(arg0, arg1 any) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBuckets", reflect.TypeOf((*MockManagerServer)(nil).ListBuckets), arg0, arg1) -} - // ListSchedulers mocks base method. func (m *MockManagerServer) ListSchedulers(arg0 context.Context, arg1 *manager.ListSchedulersRequest) (*manager.ListSchedulersResponse, error) { m.ctrl.T.Helper() diff --git a/proto/common.proto b/proto/common.proto index d2ad2c8..f52068c 100644 --- a/proto/common.proto +++ b/proto/common.proto @@ -202,8 +202,6 @@ message Host { optional Build build = 16; // ID of the cluster to which the host belongs. uint64 scheduler_cluster_id = 17; - // Port of object storage server. - int32 object_storage_port = 18; } // CPU Stat. diff --git a/proto/manager.proto b/proto/manager.proto index a3c4685..d25820b 100644 --- a/proto/manager.proto +++ b/proto/manager.proto @@ -25,8 +25,10 @@ import "google/protobuf/empty.proto"; enum SourceType { // Scheduler service. SCHEDULER_SOURCE = 0; + // Peer service. PEER_SOURCE = 1; + // SeedPeer service. SEED_PEER_SOURCE = 2; } @@ -69,8 +71,6 @@ message SeedPeer { SeedPeerCluster seed_peer_cluster = 11; // Schedulers included in seed peer. repeated Scheduler schedulers = 12; - // Seed peer object storage port. - int32 object_storage_port = 13; } // GetSeedPeerRequest represents request of GetSeedPeer. @@ -125,8 +125,6 @@ message UpdateSeedPeerRequest { int32 download_port = 8; // ID of the cluster to which the seed peer belongs. uint64 seed_peer_cluster_id = 9; - // Seed peer object storage port. - int32 object_storage_port = 10; } // DeleteSeedPeerRequest represents request of DeleteSeedPeer. @@ -237,61 +235,6 @@ message ListSchedulersResponse { repeated Scheduler schedulers = 1; } -// ObjectStorage represents config of object storage. -message ObjectStorage { - // name is object storage name of type, it can be s3, oss or obs. - string name = 1; - // Region is storage region. - string region = 2; - // Endpoint is datacenter endpoint. - string endpoint = 3; - // AccessKey is access key ID. - string access_key = 4; - // SecretKey is access key secret. - string secret_key = 5; - // S3ForcePathStyle sets force path style for s3, true by default. - // Set this to `true` to force the request to use path-style addressing, - // i.e., `http://s3.amazonaws.com/BUCKET/KEY`. By default, the S3 client - // will use virtual hosted bucket addressing when possible - // (`http://BUCKET.s3.amazonaws.com/KEY`). - // Refer to https://github.com/aws/aws-sdk-go/blob/main/aws/config.go#L118. - bool s3_force_path_style = 6; - // Scheme is the scheme of the http client. - string scheme = 7; -} - -// GetObjectStorageRequest represents request of GetObjectStorage. -message GetObjectStorageRequest { - // Request source type. - SourceType source_type = 1; - // Source service hostname. - string hostname = 2; - // Source service ip. - string ip = 3; -} - -// Bucket represents config of bucket. -message Bucket { - // Bucket name. - string name = 1; -} - -// ListSchedulersRequest represents request of ListBuckets. -message ListBucketsRequest { - // Request source type. - SourceType source_type = 1; - // Source service hostname. - string hostname = 2; - // Source service ip. - string ip = 3; -} - -// ListBucketsResponse represents response of ListBuckets. -message ListBucketsResponse { - // Bucket configs. - repeated Bucket buckets = 1; -} - // URLPriority represents config of url priority. message URLPriority { // URL regex. @@ -360,19 +303,6 @@ message CreateMLPRequest { double mae = 3; } -// CreateModelRequest represents request of CreateModel. -message CreateModelRequest { - // Scheduler hostname. - string hostname = 1; - // Scheduler ip. - string ip = 2; - - oneof request { - CreateGNNRequest create_gnn_request = 3; - CreateMLPRequest create_mlp_request = 4; - } -} - // KeepAliveRequest represents request of KeepAlive. message KeepAliveRequest { // Request source type. @@ -408,18 +338,9 @@ service Manager { // List acitve schedulers configuration. rpc ListSchedulers(ListSchedulersRequest)returns(ListSchedulersResponse); - // Get ObjectStorage configuration. - rpc GetObjectStorage(GetObjectStorageRequest) returns(ObjectStorage); - - // List buckets configuration. - rpc ListBuckets(ListBucketsRequest)returns(ListBucketsResponse); - // List applications configuration. rpc ListApplications(ListApplicationsRequest)returns(ListApplicationsResponse); - // Create model and update data of model to object storage. - rpc CreateModel(CreateModelRequest)returns(google.protobuf.Empty); - // KeepAlive with manager. rpc KeepAlive(stream KeepAliveRequest)returns(google.protobuf.Empty); } diff --git a/src/common.v2.rs b/src/common.v2.rs index 268861d..6907647 100644 --- a/src/common.v2.rs +++ b/src/common.v2.rs @@ -156,9 +156,6 @@ pub struct Host { /// ID of the cluster to which the host belongs. #[prost(uint64, tag = "17")] pub scheduler_cluster_id: u64, - /// Port of object storage server. - #[prost(int32, tag = "18")] - pub object_storage_port: i32, } /// CPU Stat. #[derive(serde::Serialize, serde::Deserialize)] diff --git a/src/descriptor.bin b/src/descriptor.bin index a1a4b1070c8d8265bc37fe2c7f80f38cd83b2f91..afbfa1a2683593c7b96a88af3f05fc91f479792b 100644 GIT binary patch delta 9518 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 delta 13185 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 diff --git a/src/manager.v2.rs b/src/manager.v2.rs index 0395434..f11892e 100644 --- a/src/manager.v2.rs +++ b/src/manager.v2.rs @@ -57,9 +57,6 @@ pub struct SeedPeer { /// Schedulers included in seed peer. #[prost(message, repeated, tag = "12")] pub schedulers: ::prost::alloc::vec::Vec, - /// Seed peer object storage port. - #[prost(int32, tag = "13")] - pub object_storage_port: i32, } /// GetSeedPeerRequest represents request of GetSeedPeer. #[derive(serde::Serialize, serde::Deserialize)] @@ -141,9 +138,6 @@ pub struct UpdateSeedPeerRequest { /// ID of the cluster to which the seed peer belongs. #[prost(uint64, tag = "9")] pub seed_peer_cluster_id: u64, - /// Seed peer object storage port. - #[prost(int32, tag = "10")] - pub object_storage_port: i32, } /// DeleteSeedPeerRequest represents request of DeleteSeedPeer. #[derive(serde::Serialize, serde::Deserialize)] @@ -307,86 +301,6 @@ pub struct ListSchedulersResponse { #[prost(message, repeated, tag = "1")] pub schedulers: ::prost::alloc::vec::Vec, } -/// ObjectStorage represents config of object storage. -#[derive(serde::Serialize, serde::Deserialize)] -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ObjectStorage { - /// name is object storage name of type, it can be s3, oss or obs. - #[prost(string, tag = "1")] - pub name: ::prost::alloc::string::String, - /// Region is storage region. - #[prost(string, tag = "2")] - pub region: ::prost::alloc::string::String, - /// Endpoint is datacenter endpoint. - #[prost(string, tag = "3")] - pub endpoint: ::prost::alloc::string::String, - /// AccessKey is access key ID. - #[prost(string, tag = "4")] - pub access_key: ::prost::alloc::string::String, - /// SecretKey is access key secret. - #[prost(string, tag = "5")] - pub secret_key: ::prost::alloc::string::String, - /// S3ForcePathStyle sets force path style for s3, true by default. - /// Set this to `true` to force the request to use path-style addressing, - /// i.e., ` By default, the S3 client - /// will use virtual hosted bucket addressing when possible - /// (`). - /// Refer to - #[prost(bool, tag = "6")] - pub s3_force_path_style: bool, - /// Scheme is the scheme of the http client. - #[prost(string, tag = "7")] - pub scheme: ::prost::alloc::string::String, -} -/// GetObjectStorageRequest represents request of GetObjectStorage. -#[derive(serde::Serialize, serde::Deserialize)] -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct GetObjectStorageRequest { - /// Request source type. - #[prost(enumeration = "SourceType", tag = "1")] - pub source_type: i32, - /// Source service hostname. - #[prost(string, tag = "2")] - pub hostname: ::prost::alloc::string::String, - /// Source service ip. - #[prost(string, tag = "3")] - pub ip: ::prost::alloc::string::String, -} -/// Bucket represents config of bucket. -#[derive(serde::Serialize, serde::Deserialize)] -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct Bucket { - /// Bucket name. - #[prost(string, tag = "1")] - pub name: ::prost::alloc::string::String, -} -/// ListSchedulersRequest represents request of ListBuckets. -#[derive(serde::Serialize, serde::Deserialize)] -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ListBucketsRequest { - /// Request source type. - #[prost(enumeration = "SourceType", tag = "1")] - pub source_type: i32, - /// Source service hostname. - #[prost(string, tag = "2")] - pub hostname: ::prost::alloc::string::String, - /// Source service ip. - #[prost(string, tag = "3")] - pub ip: ::prost::alloc::string::String, -} -/// ListBucketsResponse represents response of ListBuckets. -#[derive(serde::Serialize, serde::Deserialize)] -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ListBucketsResponse { - /// Bucket configs. - #[prost(message, repeated, tag = "1")] - pub buckets: ::prost::alloc::vec::Vec, -} /// URLPriority represents config of url priority. #[derive(serde::Serialize, serde::Deserialize)] #[allow(clippy::derive_partial_eq_without_eq)] @@ -489,32 +403,6 @@ pub struct CreateMlpRequest { #[prost(double, tag = "3")] pub mae: f64, } -/// CreateModelRequest represents request of CreateModel. -#[derive(serde::Serialize, serde::Deserialize)] -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct CreateModelRequest { - /// Scheduler hostname. - #[prost(string, tag = "1")] - pub hostname: ::prost::alloc::string::String, - /// Scheduler ip. - #[prost(string, tag = "2")] - pub ip: ::prost::alloc::string::String, - #[prost(oneof = "create_model_request::Request", tags = "3, 4")] - pub request: ::core::option::Option, -} -/// Nested message and enum types in `CreateModelRequest`. -pub mod create_model_request { - #[derive(serde::Serialize, serde::Deserialize)] - #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] - pub enum Request { - #[prost(message, tag = "3")] - CreateGnnRequest(super::CreateGnnRequest), - #[prost(message, tag = "4")] - CreateMlpRequest(super::CreateMlpRequest), - } -} /// KeepAliveRequest represents request of KeepAlive. #[derive(serde::Serialize, serde::Deserialize)] #[allow(clippy::derive_partial_eq_without_eq)] @@ -820,55 +708,6 @@ pub mod manager_client { .insert(GrpcMethod::new("manager.v2.Manager", "ListSchedulers")); self.inner.unary(req, path, codec).await } - /// Get ObjectStorage configuration. - pub async fn get_object_storage( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result, tonic::Status> { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic::codec::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/manager.v2.Manager/GetObjectStorage", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("manager.v2.Manager", "GetObjectStorage")); - self.inner.unary(req, path, codec).await - } - /// List buckets configuration. - pub async fn list_buckets( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic::codec::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/manager.v2.Manager/ListBuckets", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("manager.v2.Manager", "ListBuckets")); - self.inner.unary(req, path, codec).await - } /// List applications configuration. pub async fn list_applications( &mut self, @@ -895,29 +734,6 @@ pub mod manager_client { .insert(GrpcMethod::new("manager.v2.Manager", "ListApplications")); self.inner.unary(req, path, codec).await } - /// Create model and update data of model to object storage. - pub async fn create_model( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result, tonic::Status> { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic::codec::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/manager.v2.Manager/CreateModel", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert(GrpcMethod::new("manager.v2.Manager", "CreateModel")); - self.inner.unary(req, path, codec).await - } /// KeepAlive with manager. pub async fn keep_alive( &mut self, @@ -991,19 +807,6 @@ pub mod manager_server { tonic::Response, tonic::Status, >; - /// Get ObjectStorage configuration. - async fn get_object_storage( - &self, - request: tonic::Request, - ) -> std::result::Result, tonic::Status>; - /// List buckets configuration. - async fn list_buckets( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; /// List applications configuration. async fn list_applications( &self, @@ -1012,11 +815,6 @@ pub mod manager_server { tonic::Response, tonic::Status, >; - /// Create model and update data of model to object storage. - async fn create_model( - &self, - request: tonic::Request, - ) -> std::result::Result, tonic::Status>; /// KeepAlive with manager. async fn keep_alive( &self, @@ -1425,98 +1223,6 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.v2.Manager/GetObjectStorage" => { - #[allow(non_camel_case_types)] - struct GetObjectStorageSvc(pub Arc); - impl< - T: Manager, - > tonic::server::UnaryService - for GetObjectStorageSvc { - type Response = super::ObjectStorage; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - (*inner).get_object_storage(request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let inner = inner.0; - let method = GetObjectStorageSvc(inner); - let codec = tonic::codec::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } - "/manager.v2.Manager/ListBuckets" => { - #[allow(non_camel_case_types)] - struct ListBucketsSvc(pub Arc); - impl< - T: Manager, - > tonic::server::UnaryService - for ListBucketsSvc { - type Response = super::ListBucketsResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - (*inner).list_buckets(request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let inner = inner.0; - let method = ListBucketsSvc(inner); - let codec = tonic::codec::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/manager.v2.Manager/ListApplications" => { #[allow(non_camel_case_types)] struct ListApplicationsSvc(pub Arc); @@ -1563,52 +1269,6 @@ pub mod manager_server { }; Box::pin(fut) } - "/manager.v2.Manager/CreateModel" => { - #[allow(non_camel_case_types)] - struct CreateModelSvc(pub Arc); - impl< - T: Manager, - > tonic::server::UnaryService - for CreateModelSvc { - type Response = (); - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - (*inner).create_model(request).await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let inner = inner.0; - let method = CreateModelSvc(inner); - let codec = tonic::codec::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } "/manager.v2.Manager/KeepAlive" => { #[allow(non_camel_case_types)] struct KeepAliveSvc(pub Arc);