From 65cc6a58ee57d0a9d55ef656b6ed9d8b93f72ffe Mon Sep 17 00:00:00 2001 From: Chetan Pandey <163017526+chetan-spheron@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:47:26 +0530 Subject: [PATCH] Port Range added (#5) * porta reange added in the expose ports * port range added --- docs/proto/provider.md | 2 + go/manifest/v2beta2/serviceexpose.pb.go | 166 ++++++++++++++---- .../manifest/v2beta2/serviceexpose.proto | 10 ++ 3 files changed, 142 insertions(+), 36 deletions(-) diff --git a/docs/proto/provider.md b/docs/proto/provider.md index f35127a3..22a58a8e 100644 --- a/docs/proto/provider.md +++ b/docs/proto/provider.md @@ -355,6 +355,8 @@ | `http_options` | [ServiceExposeHTTPOptions](#akash.manifest.v2beta2.ServiceExposeHTTPOptions) | | | | `ip` | [string](#string) | | The name of the IP address associated with this, if any | | `endpoint_sequence_number` | [uint32](#uint32) | | The sequence number of the associated endpoint in the on-chain data | + | `port_range` | [string](#string) | | | + | `port_range_as` | [string](#string) | | | diff --git a/go/manifest/v2beta2/serviceexpose.pb.go b/go/manifest/v2beta2/serviceexpose.pb.go index af4ae621..e5cae464 100644 --- a/go/manifest/v2beta2/serviceexpose.pb.go +++ b/go/manifest/v2beta2/serviceexpose.pb.go @@ -40,6 +40,8 @@ type ServiceExpose struct { IP string `protobuf:"bytes,8,opt,name=ip,proto3" json:"ip" yaml:"ip"` // The sequence number of the associated endpoint in the on-chain data EndpointSequenceNumber uint32 `protobuf:"varint,9,opt,name=endpoint_sequence_number,json=endpointSequenceNumber,proto3" json:"endpointSequenceNumber" yaml:"endpointSequenceNumber"` + PortRange string `protobuf:"bytes,10,opt,name=port_range,json=portRange,proto3" json:"portRange" yaml:"portRange"` + PortRangeAs string `protobuf:"bytes,11,opt,name=port_range_as,json=portRangeAs,proto3" json:"portRangeAs" yaml:"portRangeAs"` } func (m *ServiceExpose) Reset() { *m = ServiceExpose{} } @@ -83,42 +85,46 @@ func init() { } var fileDescriptor_e8dad39b3d78f39d = []byte{ - // 545 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0xed, 0xb4, 0x49, 0x9b, 0x4b, 0x02, 0xd2, 0x81, 0x8a, 0x5b, 0x54, 0x5f, 0xe4, 0x05, - 0xf3, 0xa7, 0x36, 0x4a, 0x07, 0xaa, 0xb2, 0x59, 0x02, 0x81, 0x84, 0x20, 0x72, 0x3b, 0x75, 0x89, - 0x9c, 0xf4, 0x9a, 0x9c, 0x9a, 0xf8, 0x0e, 0xfb, 0x52, 0x95, 0x8d, 0x91, 0x05, 0x89, 0x8f, 0xc0, - 0xc2, 0x77, 0xe9, 0xd8, 0xb1, 0xd3, 0x09, 0x9c, 0xcd, 0xa3, 0x47, 0x26, 0xe4, 0xbb, 0xb3, 0x9a, - 0x8a, 0x76, 0xf3, 0xfb, 0xbc, 0xbf, 0xe7, 0xbd, 0x47, 0xf7, 0x9e, 0xc1, 0xb3, 0xe8, 0x34, 0x4a, - 0x27, 0xfe, 0x2c, 0x8a, 0xc9, 0x09, 0x4e, 0xb9, 0x7f, 0xd6, 0x1b, 0x62, 0x1e, 0xf5, 0xfc, 0x14, - 0x27, 0x67, 0x64, 0x84, 0xf1, 0x39, 0xa3, 0x29, 0xf6, 0x58, 0x42, 0x39, 0x85, 0x1b, 0x92, 0xf5, - 0x2a, 0xd6, 0xd3, 0xec, 0xd6, 0xc3, 0x31, 0x1d, 0x53, 0x89, 0xf8, 0xe5, 0x97, 0xa2, 0xb7, 0xdc, - 0x3b, 0x26, 0x4f, 0x38, 0x67, 0x94, 0x71, 0x42, 0xe3, 0x54, 0x91, 0xce, 0xaf, 0x3a, 0xe8, 0x1c, - 0xa8, 0xf3, 0xde, 0xc8, 0xf3, 0xe0, 0x73, 0xb0, 0xca, 0x68, 0xc2, 0x2d, 0xb3, 0x6b, 0xba, 0x9d, - 0xe0, 0x51, 0x2e, 0x90, 0xac, 0x0b, 0x81, 0x5a, 0x5f, 0xa2, 0xd9, 0x74, 0xdf, 0x29, 0x2b, 0x27, - 0x94, 0x22, 0xfc, 0x00, 0x3a, 0xf8, 0x9c, 0xe3, 0x24, 0x8e, 0xa6, 0x03, 0xe9, 0xaa, 0x49, 0xd7, - 0x93, 0x5c, 0xa0, 0x76, 0xd5, 0xe8, 0x2b, 0xf7, 0x03, 0xe5, 0x5e, 0x56, 0x9d, 0xf0, 0x06, 0x04, - 0x03, 0x50, 0x97, 0xa9, 0xac, 0x95, 0xae, 0xe9, 0x36, 0x83, 0x17, 0xb9, 0x40, 0x4a, 0x28, 0x04, - 0x6a, 0xeb, 0xc3, 0x65, 0xea, 0xbf, 0x02, 0xdd, 0xd7, 0xa9, 0xfb, 0xa5, 0x30, 0xa2, 0xd3, 0x50, - 0x91, 0xf0, 0x15, 0x58, 0xd3, 0xf7, 0x67, 0xad, 0xca, 0x29, 0xdb, 0xb9, 0x40, 0x95, 0x54, 0x08, - 0x74, 0x4f, 0xcd, 0xd1, 0x82, 0x13, 0x56, 0x2d, 0xb8, 0x0b, 0x1a, 0xe3, 0x29, 0x1d, 0x46, 0x53, - 0xab, 0xde, 0x35, 0xdd, 0xf5, 0xe0, 0x71, 0x2e, 0x90, 0x56, 0x0a, 0x81, 0x3a, 0xca, 0xa6, 0x6a, - 0x27, 0xd4, 0x0d, 0xe8, 0x83, 0xfa, 0x84, 0xa6, 0x3c, 0xb5, 0x1a, 0xdd, 0x15, 0xb7, 0x19, 0x6c, - 0x96, 0x89, 0xa5, 0x70, 0x9d, 0x58, 0x96, 0x4e, 0xa8, 0x64, 0xf8, 0xdd, 0x04, 0xed, 0x72, 0x0b, - 0x03, 0xbd, 0x06, 0x6b, 0xad, 0x6b, 0xba, 0xad, 0xde, 0x4b, 0xef, 0xf6, 0xfd, 0x7a, 0x37, 0x76, - 0xf3, 0xee, 0xf0, 0xb0, 0xff, 0x49, 0xf9, 0x82, 0xbd, 0x0b, 0x81, 0x8c, 0x4c, 0xa0, 0xd6, 0x92, - 0x98, 0x0b, 0xd4, 0x2a, 0x87, 0xeb, 0xb2, 0x10, 0x08, 0xea, 0x0c, 0xd7, 0xa2, 0x13, 0x2e, 0x23, - 0xf0, 0x29, 0xa8, 0x11, 0x66, 0xad, 0xcb, 0x9b, 0xda, 0xcc, 0x04, 0xaa, 0xbd, 0xef, 0xe7, 0x02, - 0xd5, 0x08, 0x2b, 0x04, 0x6a, 0x2a, 0x33, 0x61, 0x4e, 0x58, 0x23, 0x0c, 0xce, 0x81, 0x85, 0xe3, - 0x63, 0x46, 0x49, 0xcc, 0x07, 0x29, 0xfe, 0x3c, 0xc7, 0xf1, 0x08, 0x0f, 0xe2, 0xf9, 0x6c, 0x88, - 0x13, 0xab, 0x29, 0xd7, 0xfe, 0x3a, 0x17, 0x68, 0xa3, 0x62, 0x0e, 0x34, 0xf2, 0x51, 0x12, 0x85, - 0x40, 0xdb, 0xfa, 0x01, 0xdc, 0xda, 0x77, 0xc2, 0x3b, 0x8c, 0xfb, 0xab, 0xdf, 0x7e, 0x22, 0x23, - 0x38, 0xba, 0xfa, 0x63, 0x1b, 0x5f, 0x33, 0xdb, 0xbc, 0xc8, 0x6c, 0xf3, 0x32, 0xb3, 0xcd, 0xdf, - 0x99, 0x6d, 0xfe, 0x58, 0xd8, 0xc6, 0xe5, 0xc2, 0x36, 0xae, 0x16, 0xb6, 0x71, 0xb4, 0x37, 0x26, - 0x7c, 0x32, 0x1f, 0x7a, 0x23, 0x3a, 0xf3, 0x53, 0x36, 0xc1, 0x09, 0x8d, 0xdf, 0x1e, 0xc7, 0xbe, - 0xbc, 0xd7, 0x9d, 0x88, 0x91, 0x9d, 0x13, 0x9a, 0x9c, 0xfa, 0x63, 0xfa, 0xdf, 0x5f, 0x31, 0x6c, - 0xc8, 0x97, 0xb3, 0xfb, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xc6, 0x90, 0x8e, 0x90, 0x03, 0x00, - 0x00, + // 613 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xbf, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0xe3, 0xb4, 0x4d, 0x9b, 0x4b, 0x03, 0xe8, 0x40, 0xc5, 0x2d, 0xaa, 0x2f, 0xba, 0x85, + 0xf0, 0xa3, 0x36, 0x6a, 0x91, 0xa8, 0xca, 0x84, 0x25, 0x10, 0x48, 0xfc, 0x88, 0xae, 0x1d, 0x50, + 0x97, 0xc8, 0x49, 0xaf, 0x8e, 0xd5, 0xc4, 0x77, 0xd8, 0x4e, 0x55, 0x36, 0x46, 0x16, 0x24, 0xfe, + 0x04, 0xfe, 0x9c, 0x4e, 0xa8, 0x63, 0xa7, 0x13, 0xb8, 0x9b, 0x47, 0x8f, 0x4c, 0xc8, 0x77, 0x67, + 0x9c, 0x8a, 0x76, 0xf3, 0xfb, 0xbc, 0xef, 0xf7, 0xdd, 0xd3, 0x7b, 0xcf, 0xe0, 0xa1, 0x77, 0xe4, + 0xc5, 0x23, 0x67, 0xe2, 0x85, 0xc1, 0x21, 0x8d, 0x13, 0xe7, 0x78, 0x73, 0x40, 0x13, 0x6f, 0xd3, + 0x89, 0x69, 0x74, 0x1c, 0x0c, 0x29, 0x3d, 0xe1, 0x2c, 0xa6, 0x36, 0x8f, 0x58, 0xc2, 0xe0, 0x8a, + 0xd4, 0xda, 0xa5, 0xd6, 0xd6, 0xda, 0xb5, 0x3b, 0x3e, 0xf3, 0x99, 0x94, 0x38, 0xc5, 0x97, 0x52, + 0xaf, 0x75, 0xaf, 0xa9, 0x3c, 0x4a, 0x12, 0xce, 0x78, 0x12, 0xb0, 0x30, 0x56, 0x4a, 0xfc, 0xb3, + 0x01, 0xda, 0xbb, 0xea, 0xbd, 0x97, 0xf2, 0x3d, 0xf8, 0x08, 0xcc, 0x73, 0x16, 0x25, 0xa6, 0xd1, + 0x31, 0xba, 0x6d, 0xf7, 0x6e, 0x26, 0x90, 0x8c, 0x73, 0x81, 0x5a, 0x9f, 0xbd, 0xc9, 0x78, 0x07, + 0x17, 0x11, 0x26, 0x12, 0xc2, 0xb7, 0xa0, 0x4d, 0x4f, 0x12, 0x1a, 0x85, 0xde, 0xb8, 0x2f, 0x5d, + 0x75, 0xe9, 0xba, 0x9f, 0x09, 0xb4, 0x5c, 0x26, 0x7a, 0xca, 0x7d, 0x5b, 0xb9, 0x67, 0x29, 0x26, + 0x97, 0x44, 0xd0, 0x05, 0x0b, 0xb2, 0x2b, 0x73, 0xae, 0x63, 0x74, 0x9b, 0xee, 0xe3, 0x4c, 0x20, + 0x05, 0x72, 0x81, 0x96, 0xf5, 0xe3, 0xb2, 0xeb, 0x3f, 0x02, 0xdd, 0xd4, 0x5d, 0xf7, 0x0a, 0x30, + 0x64, 0x63, 0xa2, 0x94, 0xf0, 0x19, 0x58, 0xd4, 0xf3, 0x33, 0xe7, 0x65, 0x95, 0xf5, 0x4c, 0xa0, + 0x12, 0xe5, 0x02, 0xdd, 0x50, 0x75, 0x34, 0xc0, 0xa4, 0x4c, 0xc1, 0x2d, 0xd0, 0xf0, 0xc7, 0x6c, + 0xe0, 0x8d, 0xcd, 0x85, 0x8e, 0xd1, 0x5d, 0x72, 0xef, 0x65, 0x02, 0x69, 0x92, 0x0b, 0xd4, 0x56, + 0x36, 0x15, 0x63, 0xa2, 0x13, 0xd0, 0x01, 0x0b, 0x23, 0x16, 0x27, 0xb1, 0xd9, 0xe8, 0xcc, 0x75, + 0x9b, 0xee, 0x6a, 0xd1, 0xb1, 0x04, 0x55, 0xc7, 0x32, 0xc4, 0x44, 0x61, 0xf8, 0xcd, 0x00, 0xcb, + 0xc5, 0x16, 0xfa, 0x7a, 0x0d, 0xe6, 0x62, 0xc7, 0xe8, 0xb6, 0x36, 0x9f, 0xd8, 0x57, 0xef, 0xd7, + 0xbe, 0xb4, 0x9b, 0xd7, 0x7b, 0x7b, 0xbd, 0x0f, 0xca, 0xe7, 0x6e, 0x9f, 0x0a, 0x54, 0x4b, 0x05, + 0x6a, 0xcd, 0xc0, 0x4c, 0xa0, 0x56, 0x51, 0x5c, 0x87, 0xb9, 0x40, 0x50, 0xf7, 0x50, 0x41, 0x4c, + 0x66, 0x25, 0xf0, 0x01, 0xa8, 0x07, 0xdc, 0x5c, 0x92, 0x93, 0x5a, 0x4d, 0x05, 0xaa, 0xbf, 0xe9, + 0x65, 0x02, 0xd5, 0x03, 0x9e, 0x0b, 0xd4, 0x54, 0xe6, 0x80, 0x63, 0x52, 0x0f, 0x38, 0x9c, 0x02, + 0x93, 0x86, 0x07, 0x9c, 0x05, 0x61, 0xd2, 0x8f, 0xe9, 0xa7, 0x29, 0x0d, 0x87, 0xb4, 0x1f, 0x4e, + 0x27, 0x03, 0x1a, 0x99, 0x4d, 0xb9, 0xf6, 0xe7, 0x99, 0x40, 0x2b, 0xa5, 0x66, 0x57, 0x4b, 0xde, + 0x4b, 0x45, 0x2e, 0xd0, 0xba, 0x3e, 0x80, 0x2b, 0xf3, 0x98, 0x5c, 0x63, 0x84, 0xef, 0x00, 0x28, + 0x2e, 0xab, 0x1f, 0x79, 0xa1, 0x4f, 0x4d, 0x20, 0x3b, 0xb5, 0x53, 0x81, 0x9a, 0xc5, 0xc9, 0x90, + 0x02, 0x66, 0x02, 0x35, 0x79, 0x19, 0xe4, 0x02, 0xdd, 0xaa, 0xee, 0x54, 0x22, 0x4c, 0xaa, 0x34, + 0xfc, 0x08, 0xda, 0x55, 0xb9, 0xbe, 0x17, 0x9b, 0x2d, 0x59, 0xf1, 0x69, 0x31, 0xca, 0x7f, 0x15, + 0x5f, 0xc8, 0x51, 0xf2, 0x2a, 0xac, 0x46, 0x39, 0x03, 0x31, 0x99, 0x95, 0xec, 0xcc, 0x7f, 0xfd, + 0x81, 0x6a, 0xee, 0xfe, 0xf9, 0x6f, 0xab, 0xf6, 0x25, 0xb5, 0x8c, 0xd3, 0xd4, 0x32, 0xce, 0x52, + 0xcb, 0xf8, 0x95, 0x5a, 0xc6, 0xf7, 0x0b, 0xab, 0x76, 0x76, 0x61, 0xd5, 0xce, 0x2f, 0xac, 0xda, + 0xfe, 0xb6, 0x1f, 0x24, 0xa3, 0xe9, 0xc0, 0x1e, 0xb2, 0x89, 0x13, 0xf3, 0x11, 0x8d, 0x58, 0xf8, + 0xea, 0x20, 0x74, 0xe4, 0x01, 0x6c, 0x78, 0x3c, 0xd8, 0x38, 0x64, 0xd1, 0x91, 0xe3, 0xb3, 0xff, + 0x7e, 0xdf, 0x41, 0x43, 0x9e, 0xf8, 0xd6, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0x3b, 0x8c, + 0x58, 0x39, 0x04, 0x00, 0x00, } func (m *ServiceExpose) Marshal() (dAtA []byte, err error) { @@ -141,6 +147,20 @@ func (m *ServiceExpose) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.PortRangeAs) > 0 { + i -= len(m.PortRangeAs) + copy(dAtA[i:], m.PortRangeAs) + i = encodeVarintServiceexpose(dAtA, i, uint64(len(m.PortRangeAs))) + i-- + dAtA[i] = 0x5a + } + if len(m.PortRange) > 0 { + i -= len(m.PortRange) + copy(dAtA[i:], m.PortRange) + i = encodeVarintServiceexpose(dAtA, i, uint64(len(m.PortRange))) + i-- + dAtA[i] = 0x52 + } if m.EndpointSequenceNumber != 0 { i = encodeVarintServiceexpose(dAtA, i, uint64(m.EndpointSequenceNumber)) i-- @@ -258,6 +278,14 @@ func (m *ServiceExpose) Size() (n int) { if m.EndpointSequenceNumber != 0 { n += 1 + sovServiceexpose(uint64(m.EndpointSequenceNumber)) } + l = len(m.PortRange) + if l > 0 { + n += 1 + l + sovServiceexpose(uint64(l)) + } + l = len(m.PortRangeAs) + if l > 0 { + n += 1 + l + sovServiceexpose(uint64(l)) + } return n } @@ -281,6 +309,8 @@ func (this *ServiceExpose) String() string { `HTTPOptions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.HTTPOptions), "ServiceExposeHTTPOptions", "ServiceExposeHTTPOptions", 1), `&`, ``, 1) + `,`, `IP:` + fmt.Sprintf("%v", this.IP) + `,`, `EndpointSequenceNumber:` + fmt.Sprintf("%v", this.EndpointSequenceNumber) + `,`, + `PortRange:` + fmt.Sprintf("%v", this.PortRange) + `,`, + `PortRangeAs:` + fmt.Sprintf("%v", this.PortRangeAs) + `,`, `}`, }, "") return s @@ -560,6 +590,70 @@ func (m *ServiceExpose) Unmarshal(dAtA []byte) error { break } } + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PortRange", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowServiceexpose + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthServiceexpose + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceexpose + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PortRange = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PortRangeAs", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowServiceexpose + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthServiceexpose + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthServiceexpose + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PortRangeAs = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipServiceexpose(dAtA[iNdEx:]) diff --git a/proto/provider/akash/manifest/v2beta2/serviceexpose.proto b/proto/provider/akash/manifest/v2beta2/serviceexpose.proto index c6b6e734..6684d276 100644 --- a/proto/provider/akash/manifest/v2beta2/serviceexpose.proto +++ b/proto/provider/akash/manifest/v2beta2/serviceexpose.proto @@ -68,4 +68,14 @@ message ServiceExpose { (gogoproto.jsontag) = "endpointSequenceNumber", (gogoproto.moretags) = "yaml:\"endpointSequenceNumber\"" ]; + string port_range = 10 [ + (gogoproto.customname) = "PortRange", + (gogoproto.jsontag) = "portRange", + (gogoproto.moretags) = "yaml:\"portRange\"" + ]; + string port_range_as = 11 [ + (gogoproto.customname) = "PortRangeAs", + (gogoproto.jsontag) = "portRangeAs", + (gogoproto.moretags) = "yaml:\"portRangeAs\"" + ]; }