diff --git a/caps/v1/caps/caps.pb.go b/caps/v1/caps/caps.pb.go index 47c50a7..17a9877 100644 --- a/caps/v1/caps/caps.pb.go +++ b/caps/v1/caps/caps.pb.go @@ -71,6 +71,7 @@ type Cap struct { ResourceType string `protobuf:"bytes,1,opt,name=resource_type,json=resourceType,proto3" json:"resource_type,omitempty"` ResourceRemaining int64 `protobuf:"varint,2,opt,name=resource_remaining,json=resourceRemaining,proto3" json:"resource_remaining,omitempty"` + ResourceCap int64 `protobuf:"varint,3,opt,name=resource_cap,json=resourceCap,proto3" json:"resource_cap,omitempty"` } func (x *Cap) Reset() { @@ -119,6 +120,13 @@ func (x *Cap) GetResourceRemaining() int64 { return 0 } +func (x *Cap) GetResourceCap() int64 { + if x != nil { + return x.ResourceCap + } + return 0 +} + type Caps struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -182,7 +190,7 @@ var file_datatrails_common_api_caps_v1_caps_caps_proto_rawDesc = []byte{ 0x37, 0x47, 0x45, 0x54, 0x20, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x61, 0x70, 0x70, 0x65, 0x64, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x20, 0x50, 0x6c, 0x61, 0x63, - 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x22, 0xd0, 0x01, 0x0a, 0x03, 0x43, 0x61, 0x70, + 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2e, 0x22, 0x96, 0x02, 0x0a, 0x03, 0x43, 0x61, 0x70, 0x12, 0x5f, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x3a, 0x92, 0x41, 0x2d, 0x32, 0x2b, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67, @@ -195,18 +203,22 @@ var file_datatrails_common_api_caps_v1_caps_caps_proto_rawDesc = []byte{ 0x70, 0x70, 0x65, 0x64, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x20, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0xfa, 0x42, 0x0d, 0x22, 0x0b, 0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x52, 0x11, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x52, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x22, 0x55, 0x0a, 0x04, 0x43, - 0x61, 0x70, 0x73, 0x12, 0x4d, 0x0a, 0x04, 0x63, 0x61, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x11, 0x2e, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x61, 0x70, 0x42, 0x26, 0x92, 0x41, 0x23, 0x32, 0x21, 0x4c, 0x69, 0x73, 0x74, 0x20, - 0x6f, 0x66, 0x20, 0x72, 0x65, 0x6c, 0x65, 0x76, 0x61, 0x6e, 0x74, 0x20, 0x63, 0x61, 0x70, 0x70, - 0x65, 0x64, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x04, 0x63, 0x61, - 0x70, 0x73, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x64, 0x61, 0x74, 0x61, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x67, 0x6f, 0x2d, 0x64, - 0x61, 0x74, 0x61, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x73, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x65, 0x6e, 0x2f, 0x63, 0x61, 0x70, 0x73, 0x2f, 0x76, 0x31, - 0x2f, 0x63, 0x61, 0x70, 0x73, 0x3b, 0x63, 0x61, 0x70, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x63, 0x65, 0x52, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x44, 0x0a, 0x0c, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x03, 0x42, 0x21, 0x92, 0x41, 0x0e, 0x32, 0x0c, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x20, 0x63, 0x61, 0x70, 0xfa, 0x42, 0x0d, 0x22, 0x0b, 0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0x01, 0x52, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x61, + 0x70, 0x22, 0x55, 0x0a, 0x04, 0x43, 0x61, 0x70, 0x73, 0x12, 0x4d, 0x0a, 0x04, 0x63, 0x61, 0x70, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, + 0x69, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x70, 0x42, 0x26, 0x92, 0x41, 0x23, 0x32, + 0x21, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x72, 0x65, 0x6c, 0x65, 0x76, 0x61, 0x6e, + 0x74, 0x20, 0x63, 0x61, 0x70, 0x70, 0x65, 0x64, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x73, 0x52, 0x04, 0x63, 0x61, 0x70, 0x73, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x74, 0x72, 0x61, 0x69, 0x6c, + 0x73, 0x2f, 0x67, 0x6f, 0x2d, 0x64, 0x61, 0x74, 0x61, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x73, 0x2d, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2d, 0x61, 0x70, 0x69, 0x2d, 0x67, 0x65, 0x6e, 0x2f, 0x63, + 0x61, 0x70, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x70, 0x73, 0x3b, 0x63, 0x61, 0x70, 0x73, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/caps/v1/caps/caps.pb.validate.go b/caps/v1/caps/caps.pb.validate.go index 4f8636f..875b4f2 100644 --- a/caps/v1/caps/caps.pb.validate.go +++ b/caps/v1/caps/caps.pb.validate.go @@ -178,6 +178,17 @@ func (m *Cap) validate(all bool) error { errors = append(errors, err) } + if m.GetResourceCap() < -1 { + err := CapValidationError{ + field: "ResourceCap", + reason: "value must be greater than or equal to -1", + } + if !all { + return err + } + errors = append(errors, err) + } + if len(errors) > 0 { return CapMultiError(errors) }