JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/metainfo: align satellite StreamID protobuf version with metabase

Browse Source 
For object Version in different places we are using different types.
Satellite StreamID is using int32 but metabase accepts int64. Metabase
type is correct one and we should align other places with it.

As a small addition this change is also passing version correctly
between requests instead of using hardcoded value.

Change-Id: I63634d73c0a48c009e4db5f203ff18b7f3218b02
This commit is contained in:
Michał Niewrzał 2022-05-17 15:50:12 +02:00 committed by Michal Niewrzal
parent 2139d3966b
commit ea38860aab
6 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
satellite/internalpb/delegated_repair_drpc.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
// protoc-gen-go-drpc version: v0.0.24
// protoc-gen-go-drpc version: v0.0.28
// source: delegated_repair.proto
package internalpb

2
satellite/internalpb/inspector_drpc.pb.go
View File

@ -1,5 +1,5 @@
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
// protoc-gen-go-drpc version: v0.0.24
// protoc-gen-go-drpc version: v0.0.28
// source: inspector.proto
package internalpb

75
satellite/internalpb/metainfo_sat.pb.go
View File

@ -28,7 +28,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type StreamID struct {
Bucket []byte `protobuf:"bytes,1,opt,name=bucket,proto3" json:"bucket,omitempty"`
EncryptedObjectKey []byte `protobuf:"bytes,2,opt,name=encrypted_object_key,json=encryptedObjectKey,proto3" json:"encrypted_object_key,omitempty"`
Version int32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
Version int64 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
EncryptionParameters *pb.EncryptionParameters `protobuf:"bytes,12,opt,name=encryption_parameters,json=encryptionParameters,proto3" json:"encryption_parameters,omitempty"`
CreationDate time.Time `protobuf:"bytes,5,opt,name=creation_date,json=creationDate,proto3,stdtime" json:"creation_date"`
ExpirationDate time.Time `protobuf:"bytes,6,opt,name=expiration_date,json=expirationDate,proto3,stdtime" json:"expiration_date"`
@ -79,7 +79,7 @@ func (m *StreamID) GetEncryptedObjectKey() []byte {
return nil
}
func (m *StreamID) GetVersion() int32 {
func (m *StreamID) GetVersion() int64 {
if m != nil {
return m.Version
}
@ -222,39 +222,40 @@ func init() {
func init() { proto.RegisterFile("metainfo_sat.proto", fileDescriptor_47c60bd892d94aaf) }
var fileDescriptor_47c60bd892d94aaf = []byte{
// 544 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x4d, 0x6f, 0xd3, 0x4c,
0x10, 0x7e, 0xfd, 0x46, 0xf9, 0xda, 0x24, 0x4d, 0xb5, 0x4d, 0x91, 0x15, 0x8a, 0x62, 0x15, 0x21,
0x85, 0x8b, 0x8d, 0xda, 0x13, 0x47, 0xa2, 0x70, 0x88, 0xf8, 0x68, 0x71, 0xe0, 0xc2, 0xc5, 0x5a,
0xdb, 0x53, 0x6b, 0x5b, 0x7b, 0xd7, 0xda, 0x9d, 0xa0, 0xe6, 0xc8, 0x3f, 0xe0, 0x67, 0xf1, 0x1b,
0x38, 0x94, 0x7f, 0xc1, 0x19, 0x79, 0xfd, 0x91, 0x48, 0xb4, 0x07, 0xb8, 0xcd, 0x3c, 0xf3, 0xec,
0x33, 0x3b, 0xcf, 0x0c, 0xa1, 0x19, 0x20, 0xe3, 0xe2, 0x4a, 0x06, 0x9a, 0xa1, 0x9b, 0x2b, 0x89,
0x92, 0x52, 0xcd, 0x10, 0xd2, 0x94, 0x23, 0xb8, 0x75, 0x75, 0x7a, 0x08, 0x22, 0x52, 0xdb, 0x1c,
0xb9, 0x14, 0x25, 0x6b, 0x4a, 0x12, 0x99, 0xc8, 0x2a, 0x9e, 0x25, 0x52, 0x26, 0x29, 0x78, 0x26,
0x0b, 0x37, 0x57, 0x1e, 0xf2, 0x0c, 0x34, 0xb2, 0x2c, 0xaf, 0x08, 0x07, 0xb5, 0x50, 0x99, 0x9f,
0xfe, 0x6a, 0x91, 0xde, 0x1a, 0x15, 0xb0, 0x6c, 0xb5, 0xa4, 0x8f, 0x48, 0x27, 0xdc, 0x44, 0x37,
0x80, 0xb6, 0xe5, 0x58, 0xf3, 0xa1, 0x5f, 0x65, 0xf4, 0x05, 0x99, 0x54, 0x5d, 0x21, 0x0e, 0x64,
0x78, 0x0d, 0x11, 0x06, 0x37, 0xb0, 0xb5, 0xff, 0x37, 0x2c, 0xda, 0xd4, 0x2e, 0x4c, 0xe9, 0x0d,
0x6c, 0xa9, 0x4d, 0xba, 0x5f, 0x40, 0x69, 0x2e, 0x85, 0xdd, 0x72, 0xac, 0x79, 0xdb, 0xaf, 0x53,
0xfa, 0x89, 0x1c, 0xef, 0x26, 0x08, 0x72, 0xa6, 0x58, 0x06, 0x08, 0x4a, 0xdb, 0x43, 0xc7, 0x9a,
0x0f, 0xce, 0x1c, 0x77, 0x6f, 0xbe, 0xd7, 0x4d, 0x78, 0xd9, 0xf0, 0xfc, 0x09, 0xdc, 0x83, 0xd2,
0x15, 0x19, 0x45, 0x0a, 0x98, 0x11, 0x8d, 0x19, 0x82, 0xdd, 0x36, 0x72, 0x53, 0xb7, 0x34, 0xc4,
0xad, 0x0d, 0x71, 0x3f, 0xd6, 0x86, 0x2c, 0x7a, 0xdf, 0xef, 0x66, 0xff, 0x7d, 0xfb, 0x39, 0xb3,
0xfc, 0x61, 0xfd, 0x74, 0xc9, 0x10, 0xe8, 0x3b, 0x32, 0x86, 0xdb, 0x9c, 0xab, 0x3d, 0xb1, 0xce,
0x5f, 0x88, 0x1d, 0xec, 0x1e, 0x1b, 0xb9, 0xe7, 0xe4, 0x30, 0xdb, 0xa4, 0xc8, 0x73, 0xa6, 0xb0,
0x32, 0xcf, 0x1e, 0x38, 0xd6, 0xbc, 0xe7, 0x8f, 0x1b, 0xbc, 0x34, 0x8e, 0x7a, 0xe4, 0xa8, 0xd9,
0x78, 0xa0, 0x79, 0x22, 0x18, 0x6e, 0x14, 0xd8, 0xfd, 0xd2, 0xe6, 0xa6, 0xb4, 0xae, 0x2b, 0xf4,
0x31, 0xe9, 0x6b, 0xb3, 0xbc, 0x80, 0xc7, 0x36, 0x31, 0xb4, 0x5e, 0x09, 0xac, 0x62, 0x7a, 0x42,
0xfa, 0x79, 0xca, 0x22, 0xc8, 0x40, 0xa0, 0x3d, 0x32, 0x5b, 0xd8, 0x01, 0xa7, 0x5f, 0x5b, 0xa4,
0xbf, 0x86, 0xa4, 0x88, 0x57, 0x4b, 0xfa, 0x72, 0x5f, 0xc8, 0x32, 0xd3, 0x9e, 0xb8, 0x7f, 0x5e,
0x9f, 0x5b, 0x9f, 0xca, 0x5e, 0x9b, 0x19, 0x19, 0x98, 0xd1, 0xc4, 0x26, 0x0b, 0x41, 0x99, 0x9b,
0x68, 0xfb, 0xa4, 0x80, 0xde, 0x1b, 0x84, 0x4e, 0x48, 0x9b, 0x8b, 0x18, 0x6e, 0xab, 0x4b, 0x28,
0x13, 0x7a, 0x4e, 0x46, 0x4a, 0x4a, 0x0c, 0x72, 0x0e, 0x11, 0x14, 0x5d, 0x8b, 0x85, 0x0d, 0x17,
0xe3, 0xc2, 0xc7, 0x1f, 0x77, 0xb3, 0xee, 0x65, 0x81, 0xaf, 0x96, 0xfe, 0xa0, 0x60, 0x95, 0x49,
0x4c, 0x3f, 0x90, 0x63, 0xa9, 0x78, 0xc2, 0x05, 0x4b, 0x03, 0xa9, 0x62, 0x50, 0x41, 0xca, 0x33,
0x8e, 0xda, 0xee, 0x38, 0xad, 0xf9, 0xe0, 0xec, 0xc9, 0xee, 0xa3, 0xaf, 0xe2, 0x58, 0x81, 0xd6,
0x10, 0x5f, 0x14, 0xb4, 0xb7, 0x05, 0xcb, 0x3f, 0xaa, 0xdf, 0xee, 0xb0, 0x7b, 0x0e, 0xa7, 0xfb,
0xcf, 0x87, 0xf3, 0xc0, 0xfa, 0x7a, 0x0f, 0xad, 0x6f, 0xf1, 0xec, 0xf3, 0x53, 0x8d, 0x52, 0x5d,
0xbb, 0x5c, 0x7a, 0x26, 0xf0, 0x1a, 0x92, 0xc7, 0x05, 0x82, 0x12, 0x2c, 0xcd, 0xc3, 0xb0, 0x63,
0xfe, 0x70, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x1c, 0x56, 0xf6, 0x23, 0x04, 0x00, 0x00,
// 548 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xcf, 0x6e, 0xd3, 0x4e,
0x10, 0xfe, 0xf9, 0x17, 0xe5, 0xdf, 0x26, 0x69, 0xaa, 0x6d, 0x8a, 0xac, 0x50, 0x14, 0xab, 0x08,
0xc9, 0x5c, 0x6c, 0xd4, 0x9e, 0x38, 0x12, 0x85, 0x43, 0xc4, 0x9f, 0x16, 0x07, 0x2e, 0x5c, 0xac,
0xb5, 0x3d, 0xb5, 0xb6, 0xb5, 0x77, 0xad, 0xdd, 0x09, 0x6a, 0x8e, 0xbc, 0x01, 0x8f, 0xc5, 0x33,
0x70, 0x28, 0x6f, 0xc1, 0x19, 0x79, 0x1d, 0x3b, 0x91, 0x68, 0x0f, 0x70, 0x9b, 0xf9, 0xe6, 0xdb,
0x6f, 0x76, 0xbe, 0x19, 0x42, 0x73, 0x40, 0xc6, 0xc5, 0x95, 0x0c, 0x35, 0x43, 0xaf, 0x50, 0x12,
0x25, 0xa5, 0x9a, 0x21, 0x64, 0x19, 0x47, 0xf0, 0xea, 0xea, 0xf4, 0x10, 0x44, 0xac, 0x36, 0x05,
0x72, 0x29, 0x2a, 0xd6, 0x94, 0xa4, 0x32, 0x95, 0xdb, 0x78, 0x96, 0x4a, 0x99, 0x66, 0xe0, 0x9b,
0x2c, 0x5a, 0x5f, 0xf9, 0xc8, 0x73, 0xd0, 0xc8, 0xf2, 0x62, 0x4b, 0x38, 0xa8, 0x85, 0xaa, 0xfc,
0xf4, 0x57, 0x8b, 0xf4, 0x56, 0xa8, 0x80, 0xe5, 0xcb, 0x05, 0x7d, 0x44, 0x3a, 0xd1, 0x3a, 0xbe,
0x01, 0xb4, 0x2d, 0xc7, 0x72, 0x87, 0xc1, 0x36, 0xa3, 0x2f, 0xc8, 0x64, 0xdb, 0x15, 0x92, 0x50,
0x46, 0xd7, 0x10, 0x63, 0x78, 0x03, 0x1b, 0xfb, 0x7f, 0xc3, 0xa2, 0x4d, 0xed, 0xc2, 0x94, 0xde,
0xc0, 0x86, 0xda, 0xa4, 0xfb, 0x05, 0x94, 0xe6, 0x52, 0xd8, 0x2d, 0xc7, 0x72, 0x5b, 0x41, 0x9d,
0xd2, 0x4f, 0xe4, 0x78, 0x37, 0x41, 0x58, 0x30, 0xc5, 0x72, 0x40, 0x50, 0xda, 0x1e, 0x3a, 0x96,
0x3b, 0x38, 0x73, 0xbc, 0xbd, 0xf9, 0x5e, 0x37, 0xe1, 0x65, 0xc3, 0x0b, 0x26, 0x70, 0x0f, 0x4a,
0x97, 0x64, 0x14, 0x2b, 0x60, 0x46, 0x34, 0x61, 0x08, 0x76, 0xdb, 0xc8, 0x4d, 0xbd, 0xca, 0x10,
0xaf, 0x36, 0xc4, 0xfb, 0x58, 0x1b, 0x32, 0xef, 0x7d, 0xbf, 0x9b, 0xfd, 0xf7, 0xed, 0xe7, 0xcc,
0x0a, 0x86, 0xf5, 0xd3, 0x05, 0x43, 0xa0, 0xef, 0xc8, 0x18, 0x6e, 0x0b, 0xae, 0xf6, 0xc4, 0x3a,
0x7f, 0x21, 0x76, 0xb0, 0x7b, 0x6c, 0xe4, 0x9e, 0x93, 0xc3, 0x7c, 0x9d, 0x21, 0x2f, 0x98, 0xc2,
0xad, 0x79, 0xf6, 0xc0, 0xb1, 0xdc, 0x5e, 0x30, 0x6e, 0xf0, 0xca, 0x38, 0xea, 0x93, 0xa3, 0x66,
0xe3, 0xa1, 0xe6, 0xa9, 0x60, 0xb8, 0x56, 0x60, 0xf7, 0x2b, 0x9b, 0x9b, 0xd2, 0xaa, 0xae, 0xd0,
0xc7, 0xa4, 0xaf, 0xcd, 0xf2, 0x42, 0x9e, 0xd8, 0xc4, 0xd0, 0x7a, 0x15, 0xb0, 0x4c, 0xe8, 0x09,
0xe9, 0x17, 0x19, 0x8b, 0x21, 0x07, 0x81, 0xf6, 0xc8, 0xb1, 0xdc, 0x76, 0xb0, 0x03, 0x4e, 0xbf,
0xb6, 0x48, 0x7f, 0x05, 0x69, 0x19, 0x2f, 0x17, 0xf4, 0xe5, 0xbe, 0x90, 0x65, 0xa6, 0x3d, 0xf1,
0xfe, 0xbc, 0x3e, 0xaf, 0x3e, 0x95, 0xbd, 0x36, 0x33, 0x32, 0x30, 0xa3, 0x89, 0x75, 0x1e, 0x81,
0x32, 0x37, 0xd1, 0x0e, 0x48, 0x09, 0xbd, 0x37, 0x08, 0x9d, 0x90, 0x36, 0x17, 0x09, 0xdc, 0x9a,
0x4b, 0x68, 0x07, 0x55, 0x42, 0xcf, 0xc9, 0x48, 0x49, 0x89, 0x61, 0xc1, 0x21, 0x86, 0xb2, 0x6b,
0xb9, 0xb0, 0xe1, 0x7c, 0x5c, 0xfa, 0xf8, 0xe3, 0x6e, 0xd6, 0xbd, 0x2c, 0xf1, 0xe5, 0x22, 0x18,
0x94, 0xac, 0x2a, 0x49, 0xe8, 0x07, 0x72, 0x2c, 0x15, 0x4f, 0xb9, 0x60, 0x59, 0x28, 0x55, 0x02,
0x2a, 0xcc, 0x78, 0xce, 0x51, 0xdb, 0x1d, 0xa7, 0xe5, 0x0e, 0xce, 0x9e, 0xec, 0x3e, 0xfa, 0x2a,
0x49, 0x14, 0x68, 0x0d, 0xc9, 0x45, 0x49, 0x7b, 0x5b, 0xb2, 0x82, 0xa3, 0xfa, 0xed, 0x0e, 0xbb,
0xe7, 0x70, 0xba, 0xff, 0x7c, 0x38, 0x0f, 0xac, 0xaf, 0xf7, 0xd0, 0xfa, 0xe6, 0xcf, 0x3e, 0x3f,
0xd5, 0x28, 0xd5, 0xb5, 0xc7, 0xa5, 0x6f, 0x02, 0xbf, 0x21, 0xf9, 0x5c, 0x20, 0x28, 0xc1, 0xb2,
0x22, 0x8a, 0x3a, 0xe6, 0x0f, 0xe7, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x43, 0x2e, 0x40, 0x6c,
0x23, 0x04, 0x00, 0x00,
}

2
satellite/internalpb/metainfo_sat.proto
View File

@ -14,7 +14,7 @@ import "metainfo.proto";
message StreamID {
bytes bucket = 1;
bytes encrypted_object_key = 2;
int32 version = 3;
int64 version = 3;
encryption.EncryptionParameters encryption_parameters = 12;

10
satellite/metainfo/endpoint_object.go
View File

@ -162,7 +162,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
Bucket: req.Bucket,
EncryptedObjectKey: req.EncryptedPath,
Version: int32(object.Version),
Version: int64(object.Version),
CreationDate: object.CreatedAt,
ExpirationDate: req.ExpiresAt,
StreamId: streamID[:],
@ -1126,7 +1126,7 @@ func (endpoint *Endpoint) objectToProto(ctx context.Context, object metabase.Obj
streamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
Bucket: []byte(object.BucketName),
EncryptedObjectKey: []byte(object.ObjectKey),
Version: int32(object.Version), // TODO incompatible types
Version: int64(object.Version),
CreationDate: object.CreatedAt,
ExpirationDate: expires,
StreamId: object.StreamID[:],
@ -1268,7 +1268,7 @@ func (endpoint *Endpoint) objectEntryToProtoListItem(ctx context.Context, bucket
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
Bucket: bucket,
EncryptedObjectKey: append([]byte(prefixToPrependInSatStreamID), item.EncryptedPath...),
Version: item.Version,
Version: int64(item.Version),
CreationDate: item.CreatedAt,
ExpirationDate: item.ExpiresAt,
StreamId: entry.StreamID[:],
@ -1534,7 +1534,7 @@ func (endpoint *Endpoint) BeginMoveObject(ctx context.Context, req *pb.ObjectBeg
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
Bucket: req.Bucket,
EncryptedObjectKey: req.EncryptedObjectKey,
Version: int32(metabase.DefaultVersion),
Version: int64(metabase.DefaultVersion),
StreamId: result.StreamID[:],
EncryptionParameters: &pb.EncryptionParameters{
CipherSuite: pb.CipherSuite(result.EncryptionParameters.CipherSuite),
@ -1763,7 +1763,7 @@ func (endpoint *Endpoint) BeginCopyObject(ctx context.Context, req *pb.ObjectBeg
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
Bucket: req.Bucket,
EncryptedObjectKey: req.EncryptedObjectKey,
Version: int32(metabase.DefaultVersion),
Version: int64(metabase.DefaultVersion),
StreamId: result.StreamID[:],
EncryptionParameters: &pb.EncryptionParameters{
CipherSuite: pb.CipherSuite(result.EncryptionParameters.CipherSuite),

6
satellite/metainfo/endpoint_segment.go
View File

@ -102,7 +102,7 @@ func (endpoint *Endpoint) BeginSegment(ctx context.Context, req *pb.SegmentBegin
BucketName: string(streamID.Bucket),
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
StreamID: id,
Version: 1,
Version: metabase.Version(streamID.Version),
},
Position: metabase.SegmentPosition{
Part: uint32(req.Position.PartNumber),
@ -248,7 +248,7 @@ func (endpoint *Endpoint) CommitSegment(ctx context.Context, req *pb.SegmentComm
BucketName: string(streamID.Bucket),
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
StreamID: id,
Version: 1,
Version: metabase.Version(streamID.Version),
},
ExpiresAt: expiresAt,
EncryptedKey: req.EncryptedKey,
@ -364,7 +364,7 @@ func (endpoint *Endpoint) MakeInlineSegment(ctx context.Context, req *pb.Segment
BucketName: string(streamID.Bucket),
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
StreamID: id,
Version: 1,
Version: metabase.Version(streamID.Version),
},
ExpiresAt: expiresAt,
EncryptedKey: req.EncryptedKey,