satellite/internalpb: for StreamID rename EncryptedPath to EncryptedObjectKey
We should be using object naming insted of path. This is one place where we can easiliy change it. To regenerate protbuf I had to remove gogo.proto. Most probably it was confilicting with gogo.proto from common/pb. Change-Id: Ia5972f77994765c8f26bf1c3dc8205d2eadd70fa
This commit is contained in:
Michał Niewrzał
Michal Niewrzal
parent
f93dc5a166
commit
e5bb897364
@ -1,5 +1,5 @@
|
||||
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
|
||||
// protoc-gen-go-drpc version: v0.0.20
|
||||
// protoc-gen-go-drpc version: v0.0.24
|
||||
// source: delegated_repair.proto
|
||||
|
||||
package internalpb
|
||||
@ -71,7 +71,7 @@ type DRPCRepairCoordinatorServer interface {
|
||||
type DRPCRepairCoordinatorUnimplementedServer struct{}
|
||||
|
||||
func (s *DRPCRepairCoordinatorUnimplementedServer) RepairJob(context.Context, *RepairJobRequest) (*RepairJobResponse, error) {
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12)
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
|
||||
}
|
||||
|
||||
type DRPCRepairCoordinatorDescription struct{}
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
// Protocol Buffers for Go with Gadgets
|
||||
//
|
||||
// Copyright (c) 2013, The GoGo Authors. All rights reserved.
|
||||
// http://github.com/gogo/protobuf
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
syntax = "proto2";
|
||||
package gogoproto;
|
||||
|
||||
import "google/protobuf/descriptor.proto";
|
||||
|
||||
option java_package = "com.google.protobuf";
|
||||
option java_outer_classname = "GoGoProtos";
|
||||
|
||||
extend google.protobuf.EnumOptions {
|
||||
optional bool goproto_enum_prefix = 62001;
|
||||
optional bool goproto_enum_stringer = 62021;
|
||||
optional bool enum_stringer = 62022;
|
||||
optional string enum_customname = 62023;
|
||||
optional bool enumdecl = 62024;
|
||||
}
|
||||
|
||||
extend google.protobuf.EnumValueOptions {
|
||||
optional string enumvalue_customname = 66001;
|
||||
}
|
||||
|
||||
extend google.protobuf.FileOptions {
|
||||
optional bool goproto_getters_all = 63001;
|
||||
optional bool goproto_enum_prefix_all = 63002;
|
||||
optional bool goproto_stringer_all = 63003;
|
||||
optional bool verbose_equal_all = 63004;
|
||||
optional bool face_all = 63005;
|
||||
optional bool gostring_all = 63006;
|
||||
optional bool populate_all = 63007;
|
||||
optional bool stringer_all = 63008;
|
||||
optional bool onlyone_all = 63009;
|
||||
|
||||
optional bool equal_all = 63013;
|
||||
optional bool description_all = 63014;
|
||||
optional bool testgen_all = 63015;
|
||||
optional bool benchgen_all = 63016;
|
||||
optional bool marshaler_all = 63017;
|
||||
optional bool unmarshaler_all = 63018;
|
||||
optional bool stable_marshaler_all = 63019;
|
||||
|
||||
optional bool sizer_all = 63020;
|
||||
|
||||
optional bool goproto_enum_stringer_all = 63021;
|
||||
optional bool enum_stringer_all = 63022;
|
||||
|
||||
optional bool unsafe_marshaler_all = 63023;
|
||||
optional bool unsafe_unmarshaler_all = 63024;
|
||||
|
||||
optional bool goproto_extensions_map_all = 63025;
|
||||
optional bool goproto_unrecognized_all = 63026;
|
||||
optional bool gogoproto_import = 63027;
|
||||
optional bool protosizer_all = 63028;
|
||||
optional bool compare_all = 63029;
|
||||
optional bool typedecl_all = 63030;
|
||||
optional bool enumdecl_all = 63031;
|
||||
|
||||
optional bool goproto_registration = 63032;
|
||||
optional bool messagename_all = 63033;
|
||||
|
||||
optional bool goproto_sizecache_all = 63034;
|
||||
optional bool goproto_unkeyed_all = 63035;
|
||||
}
|
||||
|
||||
extend google.protobuf.MessageOptions {
|
||||
optional bool goproto_getters = 64001;
|
||||
optional bool goproto_stringer = 64003;
|
||||
optional bool verbose_equal = 64004;
|
||||
optional bool face = 64005;
|
||||
optional bool gostring = 64006;
|
||||
optional bool populate = 64007;
|
||||
optional bool stringer = 67008;
|
||||
optional bool onlyone = 64009;
|
||||
|
||||
optional bool equal = 64013;
|
||||
optional bool description = 64014;
|
||||
optional bool testgen = 64015;
|
||||
optional bool benchgen = 64016;
|
||||
optional bool marshaler = 64017;
|
||||
optional bool unmarshaler = 64018;
|
||||
optional bool stable_marshaler = 64019;
|
||||
|
||||
optional bool sizer = 64020;
|
||||
|
||||
optional bool unsafe_marshaler = 64023;
|
||||
optional bool unsafe_unmarshaler = 64024;
|
||||
|
||||
optional bool goproto_extensions_map = 64025;
|
||||
optional bool goproto_unrecognized = 64026;
|
||||
|
||||
optional bool protosizer = 64028;
|
||||
|
||||
optional bool typedecl = 64030;
|
||||
|
||||
optional bool messagename = 64033;
|
||||
|
||||
optional bool goproto_sizecache = 64034;
|
||||
optional bool goproto_unkeyed = 64035;
|
||||
}
|
||||
|
||||
extend google.protobuf.FieldOptions {
|
||||
optional bool nullable = 65001;
|
||||
optional bool embed = 65002;
|
||||
optional string customtype = 65003;
|
||||
optional string customname = 65004;
|
||||
optional string jsontag = 65005;
|
||||
optional string moretags = 65006;
|
||||
optional string casttype = 65007;
|
||||
optional string castkey = 65008;
|
||||
optional string castvalue = 65009;
|
||||
|
||||
optional bool stdtime = 65010;
|
||||
optional bool stdduration = 65011;
|
||||
optional bool wktpointer = 65012;
|
||||
optional bool compare = 65013;
|
||||
|
||||
}
|
||||
@ -307,39 +307,38 @@ func init() {
|
||||
func init() { proto.RegisterFile("inspector.proto", fileDescriptor_a07d9034b2dd9d26) }
|
||||
|
||||
var fileDescriptor_a07d9034b2dd9d26 = []byte{
|
||||
// 529 bytes of a gzipped FileDescriptorProto
|
||||
// 524 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x8f, 0xd3, 0x30,
|
||||
0x10, 0xc5, 0xdb, 0x6d, 0x81, 0x69, 0x4a, 0xc1, 0x2d, 0x28, 0x2a, 0x42, 0x54, 0x59, 0xad, 0xd4,
|
||||
0x65, 0x51, 0x2a, 0x95, 0x1b, 0x48, 0x48, 0x54, 0x1c, 0xe8, 0x05, 0x50, 0xf6, 0xc6, 0x25, 0x4a,
|
||||
0xe2, 0x69, 0x93, 0x25, 0xb5, 0x83, 0xed, 0x4a, 0xf4, 0x5f, 0x20, 0x71, 0xe2, 0x7f, 0xf0, 0x6b,
|
||||
0x38, 0x70, 0xe0, 0xc2, 0xdf, 0x40, 0x75, 0xdc, 0x6c, 0xbf, 0x0e, 0x95, 0xb8, 0x79, 0xe6, 0xbd,
|
||||
0x79, 0x9e, 0xbe, 0xe7, 0x06, 0xda, 0x19, 0x57, 0x05, 0x26, 0x5a, 0x48, 0xbf, 0x90, 0x42, 0x0b,
|
||||
0x38, 0x70, 0xe0, 0xc2, 0xdf, 0x40, 0x75, 0xdc, 0x6c, 0xbf, 0x0e, 0x95, 0xb8, 0x65, 0xe6, 0xbd,
|
||||
0x79, 0x9e, 0xbc, 0xe7, 0x04, 0xda, 0x19, 0x57, 0x05, 0x26, 0x5a, 0x48, 0xbf, 0x90, 0x42, 0x0b,
|
||||
0xda, 0x51, 0x91, 0xc6, 0x3c, 0xcf, 0x34, 0xfa, 0x15, 0xd4, 0x83, 0x99, 0x98, 0x89, 0x92, 0xd0,
|
||||
0x03, 0x2e, 0x18, 0xda, 0x73, 0xbb, 0x10, 0x19, 0xd7, 0x28, 0x59, 0x5c, 0x36, 0xbc, 0xbf, 0x04,
|
||||
0x3a, 0x1f, 0xe2, 0x6b, 0x4c, 0xf4, 0x3b, 0x8c, 0x72, 0x9d, 0x06, 0xf8, 0x65, 0x81, 0x4a, 0xd3,
|
||||
0x73, 0xb8, 0x87, 0x3c, 0x91, 0xcb, 0x42, 0x23, 0x0b, 0x8b, 0x48, 0xa7, 0x2e, 0xe9, 0x93, 0x81,
|
||||
0x13, 0xb4, 0xaa, 0xee, 0xc7, 0x48, 0xa7, 0xf4, 0x11, 0x34, 0xe2, 0x45, 0xf2, 0x19, 0xb5, 0x7b,
|
||||
0x62, 0x60, 0x5b, 0xd1, 0x27, 0x00, 0x85, 0x14, 0x2b, 0xd9, 0x30, 0x63, 0x6e, 0xcd, 0x60, 0x77,
|
||||
0x6d, 0x67, 0xc2, 0xa8, 0x0f, 0x1d, 0xa5, 0x23, 0xa9, 0xc3, 0x68, 0xaa, 0x51, 0x86, 0x0a, 0x67,
|
||||
0x73, 0xe4, 0xda, 0x3d, 0xed, 0x93, 0x41, 0x2d, 0x78, 0x60, 0xa0, 0x37, 0x2b, 0xe4, 0xaa, 0x04,
|
||||
0xe8, 0x73, 0xa0, 0xc8, 0x59, 0x18, 0xe3, 0x54, 0x48, 0xac, 0xe8, 0x75, 0x43, 0xbf, 0x8f, 0x9c,
|
||||
0x8d, 0x0d, 0xb0, 0x66, 0x77, 0xa1, 0x9e, 0x67, 0xf3, 0x4c, 0xbb, 0x8d, 0x3e, 0x19, 0xd4, 0x83,
|
||||
0xb2, 0xf0, 0xbe, 0x13, 0xe8, 0x6e, 0xff, 0x52, 0x55, 0x08, 0xae, 0x90, 0xbe, 0x86, 0x3b, 0x56,
|
||||
0x51, 0xb9, 0xa4, 0x5f, 0x1b, 0x34, 0x47, 0x9e, 0x7f, 0xc0, 0x53, 0xdf, 0xca, 0xdb, 0xe9, 0x6a,
|
||||
0x86, 0xbe, 0x02, 0x90, 0xc8, 0x16, 0x9c, 0x45, 0x3c, 0x59, 0x1a, 0x1f, 0x9a, 0xa3, 0xc7, 0xfe,
|
||||
0x8d, 0xd1, 0x41, 0x05, 0x5e, 0x25, 0x29, 0xce, 0x31, 0xd8, 0xa0, 0x7b, 0x3f, 0x08, 0x74, 0xb7,
|
||||
0x85, 0x6d, 0x00, 0x37, 0xce, 0x92, 0x2d, 0x67, 0xf7, 0x83, 0x39, 0x39, 0x14, 0xcc, 0x19, 0xb4,
|
||||
0xec, 0x82, 0x61, 0xc6, 0x19, 0x7e, 0x35, 0x19, 0xd4, 0x02, 0xc7, 0x36, 0x27, 0xab, 0xde, 0x4e,
|
||||
0x4a, 0xa7, 0x3b, 0x29, 0x79, 0xdf, 0x08, 0x3c, 0xdc, 0xd9, 0xcd, 0x5a, 0xf6, 0x12, 0x1a, 0xa9,
|
||||
0xe9, 0x98, 0xe5, 0x8e, 0x33, 0xcc, 0x4e, 0xfc, 0x9f, 0x5d, 0x3f, 0x09, 0xb4, 0xb6, 0x64, 0xe9,
|
||||
0x25, 0x34, 0x4b, 0xe1, 0x65, 0x98, 0xb1, 0x32, 0x40, 0x67, 0x0c, 0xbf, 0x7e, 0x3f, 0x6d, 0xbc,
|
||||
0x17, 0x0c, 0x27, 0x6f, 0x03, 0xb0, 0xf0, 0x84, 0x29, 0x3a, 0x84, 0xd6, 0x82, 0x6f, 0xd2, 0x4f,
|
||||
0xf6, 0xe8, 0x4e, 0x45, 0x58, 0x0d, 0x5c, 0x42, 0x53, 0x4c, 0xa7, 0x79, 0xc6, 0xd1, 0xd0, 0x6b,
|
||||
0xfb, 0xea, 0x16, 0x5e, 0x91, 0x5d, 0xb8, 0xbd, 0xf9, 0x92, 0x9d, 0x60, 0x5d, 0x8e, 0xfe, 0x10,
|
||||
0x68, 0x97, 0xfb, 0x4e, 0xd6, 0xee, 0x50, 0x04, 0x67, 0xf3, 0x39, 0xd2, 0xc1, 0x41, 0x0f, 0x0f,
|
||||
0xfc, 0x37, 0x7b, 0x17, 0x47, 0x30, 0xcb, 0xa0, 0xbc, 0x5b, 0x34, 0xdd, 0x35, 0xec, 0xe2, 0x88,
|
||||
0xac, 0xec, 0x45, 0xcf, 0x8e, 0xa1, 0xae, 0x6f, 0x1a, 0x9f, 0x7f, 0x3a, 0x53, 0x5a, 0xc8, 0x6b,
|
||||
0x3f, 0x13, 0x43, 0x73, 0x18, 0x56, 0xd3, 0x43, 0x13, 0x2e, 0x8f, 0xf2, 0x22, 0x8e, 0x1b, 0xe6,
|
||||
0xc3, 0xf3, 0xe2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x7e, 0x66, 0x26, 0xc9, 0x04, 0x00,
|
||||
0x00,
|
||||
0x6b, 0x17, 0x22, 0xe3, 0x1a, 0x25, 0x8b, 0xcb, 0x86, 0xf7, 0x97, 0x40, 0xe7, 0x43, 0x7c, 0x8d,
|
||||
0x89, 0x7e, 0x87, 0x51, 0xae, 0xd3, 0x00, 0xbf, 0x2c, 0x50, 0x69, 0x7a, 0x0e, 0xf7, 0x90, 0x27,
|
||||
0x72, 0x59, 0x68, 0x64, 0x61, 0x11, 0xe9, 0xd4, 0x25, 0x7d, 0x32, 0x70, 0x82, 0x56, 0xd5, 0xfd,
|
||||
0x18, 0xe9, 0x94, 0x3e, 0x82, 0x46, 0xbc, 0x48, 0x3e, 0xa3, 0x76, 0x4f, 0x0c, 0x6c, 0x2b, 0xfa,
|
||||
0x04, 0xa0, 0x90, 0x62, 0x25, 0x1b, 0x66, 0xcc, 0xad, 0x19, 0xec, 0xae, 0xed, 0x4c, 0x18, 0xf5,
|
||||
0xa1, 0xa3, 0x74, 0x24, 0x75, 0x18, 0x4d, 0x35, 0xca, 0x50, 0xe1, 0x6c, 0x8e, 0x5c, 0xbb, 0xa7,
|
||||
0x7d, 0x32, 0xa8, 0x05, 0x0f, 0x0c, 0xf4, 0x66, 0x85, 0x5c, 0x95, 0x00, 0x7d, 0x0e, 0x14, 0x39,
|
||||
0x0b, 0x63, 0x9c, 0x0a, 0x89, 0x15, 0xbd, 0x6e, 0xe8, 0xf7, 0x91, 0xb3, 0xb1, 0x01, 0xd6, 0xec,
|
||||
0x2e, 0xd4, 0xf3, 0x6c, 0x9e, 0x69, 0xb7, 0xd1, 0x27, 0x83, 0x7a, 0x50, 0x16, 0xde, 0x77, 0x02,
|
||||
0xdd, 0xed, 0x37, 0x55, 0x85, 0xe0, 0x0a, 0xe9, 0x6b, 0xb8, 0x63, 0x15, 0x95, 0x4b, 0xfa, 0xb5,
|
||||
0x41, 0x73, 0xe4, 0xf9, 0x07, 0x7c, 0xf4, 0xad, 0xbc, 0x9d, 0xae, 0x66, 0xe8, 0x2b, 0x00, 0x89,
|
||||
0x6c, 0xc1, 0x59, 0xc4, 0x93, 0xa5, 0xf1, 0xa1, 0x39, 0x7a, 0xec, 0xdf, 0x18, 0x1d, 0x54, 0xe0,
|
||||
0x55, 0x92, 0xe2, 0x1c, 0x83, 0x0d, 0xba, 0xf7, 0x83, 0x40, 0x77, 0x5b, 0xd8, 0x06, 0x70, 0xe3,
|
||||
0x2c, 0xd9, 0x72, 0x76, 0x3f, 0x98, 0x93, 0x43, 0xc1, 0x9c, 0x41, 0xcb, 0x2e, 0x18, 0x66, 0x9c,
|
||||
0xe1, 0x57, 0x93, 0x41, 0x2d, 0x70, 0x6c, 0x73, 0xb2, 0xea, 0xed, 0xa4, 0x74, 0xba, 0x93, 0x92,
|
||||
0xf7, 0x8d, 0xc0, 0xc3, 0x9d, 0xdd, 0xac, 0x65, 0x2f, 0xa1, 0x91, 0x9a, 0x8e, 0x59, 0xee, 0x38,
|
||||
0xc3, 0xec, 0xc4, 0xff, 0xd9, 0xf5, 0x93, 0x40, 0x6b, 0x4b, 0x96, 0x5e, 0x42, 0xb3, 0x14, 0x5e,
|
||||
0x86, 0x19, 0x2b, 0x03, 0x74, 0xc6, 0xf0, 0xeb, 0xf7, 0xd3, 0xc6, 0x7b, 0xc1, 0x70, 0xf2, 0x36,
|
||||
0x00, 0x0b, 0x4f, 0x98, 0xa2, 0x43, 0x68, 0x2d, 0xf8, 0x26, 0xfd, 0x64, 0x8f, 0xee, 0x54, 0x84,
|
||||
0xd5, 0xc0, 0x25, 0x34, 0xc5, 0x74, 0x9a, 0x67, 0x1c, 0x0d, 0xbd, 0xb6, 0xaf, 0x6e, 0xe1, 0x15,
|
||||
0xd9, 0x85, 0xdb, 0x9b, 0x37, 0xd9, 0x09, 0xd6, 0xe5, 0xe8, 0x0f, 0x81, 0x76, 0xb9, 0xef, 0x64,
|
||||
0xed, 0x0e, 0x45, 0x70, 0x36, 0xaf, 0x23, 0x1d, 0x1c, 0xf4, 0xf0, 0xc0, 0xb7, 0xd9, 0xbb, 0x38,
|
||||
0x82, 0x59, 0x06, 0xe5, 0xdd, 0xa2, 0xe9, 0xae, 0x61, 0x17, 0x47, 0x64, 0x65, 0x0f, 0x7a, 0x76,
|
||||
0x0c, 0x75, 0x7d, 0xd2, 0xf8, 0xfc, 0xd3, 0x99, 0xd2, 0x42, 0x5e, 0xfb, 0x99, 0x18, 0x9a, 0x87,
|
||||
0x61, 0x35, 0x3d, 0x34, 0xe1, 0xf2, 0x28, 0x2f, 0xe2, 0xb8, 0x61, 0x7e, 0x3c, 0x2f, 0xfe, 0x05,
|
||||
0x00, 0x00, 0xff, 0xff, 0x03, 0xb4, 0x8a, 0x34, 0xbd, 0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -5,7 +5,6 @@ syntax = "proto3";
|
||||
option go_package = "storj.io/storj/satellite/internalpb";
|
||||
|
||||
import "gogo.proto";
|
||||
import "node.proto";
|
||||
import "pointerdb.proto";
|
||||
|
||||
package satellite.inspector;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
|
||||
// protoc-gen-go-drpc version: v0.0.20
|
||||
// protoc-gen-go-drpc version: v0.0.24
|
||||
// source: inspector.proto
|
||||
|
||||
package internalpb
|
||||
@ -82,11 +82,11 @@ type DRPCHealthInspectorServer interface {
|
||||
type DRPCHealthInspectorUnimplementedServer struct{}
|
||||
|
||||
func (s *DRPCHealthInspectorUnimplementedServer) ObjectHealth(context.Context, *ObjectHealthRequest) (*ObjectHealthResponse, error) {
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12)
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
|
||||
}
|
||||
|
||||
func (s *DRPCHealthInspectorUnimplementedServer) SegmentHealth(context.Context, *SegmentHealthRequest) (*SegmentHealthResponse, error) {
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), 12)
|
||||
return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
|
||||
}
|
||||
|
||||
type DRPCHealthInspectorDescription struct{}
|
||||
|
||||
@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||
|
||||
type StreamID struct {
|
||||
Bucket []byte `protobuf:"bytes,1,opt,name=bucket,proto3" json:"bucket,omitempty"`
|
||||
EncryptedPath []byte `protobuf:"bytes,2,opt,name=encrypted_path,json=encryptedPath,proto3" json:"encrypted_path,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"`
|
||||
Redundancy *pb.RedundancyScheme `protobuf:"bytes,4,opt,name=redundancy,proto3" json:"redundancy,omitempty"`
|
||||
EncryptionParameters *pb.EncryptionParameters `protobuf:"bytes,12,opt,name=encryption_parameters,json=encryptionParameters,proto3" json:"encryption_parameters,omitempty"`
|
||||
@ -72,9 +72,9 @@ func (m *StreamID) GetBucket() []byte {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *StreamID) GetEncryptedPath() []byte {
|
||||
func (m *StreamID) GetEncryptedObjectKey() []byte {
|
||||
if m != nil {
|
||||
return m.EncryptedPath
|
||||
return m.EncryptedObjectKey
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -222,41 +222,41 @@ func init() {
|
||||
func init() { proto.RegisterFile("metainfo_sat.proto", fileDescriptor_47c60bd892d94aaf) }
|
||||
|
||||
var fileDescriptor_47c60bd892d94aaf = []byte{
|
||||
// 562 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
|
||||
0x10, 0xc5, 0xb4, 0x49, 0xd3, 0x4d, 0xda, 0x54, 0xdb, 0x16, 0x59, 0x2d, 0x28, 0x56, 0x51, 0xa5,
|
||||
0x70, 0xb1, 0xa5, 0xf6, 0x84, 0x38, 0x51, 0x85, 0x43, 0x24, 0xa0, 0xc1, 0x81, 0x0b, 0x17, 0x6b,
|
||||
0xed, 0x9d, 0x3a, 0x5b, 0xec, 0x5d, 0x6b, 0x3d, 0x46, 0xed, 0x91, 0x2b, 0x27, 0x7e, 0x16, 0xbf,
|
||||
0x81, 0x43, 0xf9, 0x2b, 0xc8, 0xeb, 0xaf, 0x48, 0xb4, 0x07, 0xb8, 0xed, 0xbc, 0x79, 0xf3, 0x32,
|
||||
0x79, 0xf3, 0x4c, 0x68, 0x0a, 0xc8, 0x84, 0xbc, 0x52, 0x41, 0xce, 0xd0, 0xcd, 0xb4, 0x42, 0x45,
|
||||
0x69, 0xce, 0x10, 0x92, 0x44, 0x20, 0xb8, 0x4d, 0xf7, 0x68, 0x0f, 0x64, 0xa4, 0x6f, 0x33, 0x14,
|
||||
0x4a, 0x56, 0xac, 0x23, 0x12, 0xab, 0x58, 0xd5, 0xef, 0x49, 0xac, 0x54, 0x9c, 0x80, 0x67, 0xaa,
|
||||
0xb0, 0xb8, 0xf2, 0x50, 0xa4, 0x90, 0x23, 0x4b, 0xb3, 0x9a, 0x30, 0xce, 0x94, 0x90, 0x08, 0x9a,
|
||||
0x87, 0x35, 0xb0, 0xdb, 0x28, 0x57, 0xf5, 0xc9, 0xf7, 0x4d, 0x32, 0x58, 0xa2, 0x06, 0x96, 0xce,
|
||||
0x67, 0xf4, 0x09, 0xe9, 0x87, 0x45, 0xf4, 0x05, 0xd0, 0xb6, 0x1c, 0x6b, 0x3a, 0xf2, 0xeb, 0x8a,
|
||||
0x9e, 0x92, 0xdd, 0x7a, 0x0d, 0xe0, 0x41, 0xc6, 0x70, 0x65, 0x3f, 0x36, 0xfd, 0x9d, 0x16, 0x5d,
|
||||
0x30, 0x5c, 0x51, 0x9b, 0x6c, 0x7d, 0x05, 0x9d, 0x0b, 0x25, 0xed, 0x0d, 0xc7, 0x9a, 0xf6, 0xfc,
|
||||
0xa6, 0xa4, 0xaf, 0x08, 0xd1, 0xc0, 0x0b, 0xc9, 0x99, 0x8c, 0x6e, 0xed, 0x4d, 0xc7, 0x9a, 0x0e,
|
||||
0xcf, 0x8e, 0xdd, 0x6e, 0x37, 0xbf, 0x6d, 0x2e, 0xa3, 0x15, 0xa4, 0xe0, 0xaf, 0xd1, 0xe9, 0x27,
|
||||
0x72, 0xd8, 0x99, 0x10, 0x64, 0x4c, 0xb3, 0x14, 0x10, 0x74, 0x6e, 0x8f, 0x8c, 0x8e, 0xe3, 0xae,
|
||||
0x59, 0xf4, 0xa6, 0x7d, 0x2e, 0x5a, 0x9e, 0x7f, 0x00, 0xf7, 0xa0, 0x74, 0x4e, 0x76, 0x22, 0x0d,
|
||||
0xcc, 0x88, 0x72, 0x86, 0x60, 0xf7, 0x8c, 0xdc, 0x91, 0x5b, 0x79, 0xea, 0x36, 0x9e, 0xba, 0x1f,
|
||||
0x1b, 0x4f, 0x2f, 0x06, 0x3f, 0xef, 0x26, 0x8f, 0x7e, 0xfc, 0x9e, 0x58, 0xfe, 0xa8, 0x19, 0x9d,
|
||||
0x31, 0x04, 0xfa, 0x8e, 0x8c, 0xe1, 0x26, 0x13, 0x7a, 0x4d, 0xac, 0xff, 0x0f, 0x62, 0xbb, 0xdd,
|
||||
0xb0, 0x91, 0x7b, 0x41, 0xf6, 0xd2, 0x22, 0x41, 0x91, 0x31, 0x8d, 0x81, 0x0a, 0xaf, 0x21, 0x42,
|
||||
0x7b, 0xe8, 0x58, 0xd3, 0x81, 0x3f, 0x6e, 0xf1, 0x4b, 0x03, 0x53, 0x8f, 0xec, 0xb7, 0xa1, 0x09,
|
||||
0x72, 0x11, 0x4b, 0x86, 0x85, 0x06, 0x7b, 0xdb, 0x9c, 0xa7, 0xcb, 0xd3, 0xb2, 0xe9, 0xd0, 0x63,
|
||||
0xb2, 0x9d, 0x9b, 0x73, 0x07, 0x82, 0xdb, 0xc4, 0xd0, 0x06, 0x15, 0x30, 0xe7, 0x27, 0xdf, 0x36,
|
||||
0xc8, 0xf6, 0x12, 0xe2, 0x14, 0x24, 0xce, 0x67, 0xf4, 0xe5, 0x3a, 0xd5, 0x32, 0xff, 0xe7, 0xa9,
|
||||
0xfb, 0x77, 0x44, 0xdd, 0x26, 0x3e, 0x9d, 0x10, 0x9d, 0x90, 0xa1, 0x59, 0x5e, 0x16, 0x69, 0x08,
|
||||
0xda, 0xa4, 0xa5, 0xe7, 0x93, 0x12, 0x7a, 0x6f, 0x10, 0x7a, 0x40, 0x7a, 0x42, 0x72, 0xb8, 0xa9,
|
||||
0x83, 0x52, 0x15, 0xf4, 0x9c, 0xec, 0x68, 0xa5, 0x30, 0xc8, 0x04, 0x44, 0x50, 0xfe, 0x6a, 0x79,
|
||||
0x92, 0xd1, 0xc5, 0xb8, 0x74, 0xea, 0xd7, 0xdd, 0x64, 0x6b, 0x51, 0xe2, 0xf3, 0x99, 0x3f, 0x2c,
|
||||
0x59, 0x55, 0xc1, 0xe9, 0x07, 0x72, 0xa8, 0xb4, 0x88, 0x85, 0x64, 0x49, 0xa0, 0x34, 0x07, 0x1d,
|
||||
0x24, 0x22, 0x15, 0x98, 0xdb, 0x7d, 0x67, 0x63, 0x3a, 0x3c, 0x7b, 0xd6, 0x2d, 0xfa, 0x9a, 0x73,
|
||||
0x0d, 0x79, 0x0e, 0xfc, 0xb2, 0xa4, 0xbd, 0x2d, 0x59, 0xfe, 0x7e, 0x33, 0xdb, 0x61, 0xf7, 0x44,
|
||||
0x63, 0xeb, 0xbf, 0xa3, 0xf1, 0xc0, 0x81, 0x06, 0x0f, 0x1d, 0xe8, 0xe2, 0xf4, 0xf3, 0xf3, 0x1c,
|
||||
0x95, 0xbe, 0x76, 0x85, 0xf2, 0xcc, 0xc3, 0x6b, 0x49, 0x9e, 0xf9, 0x5c, 0x24, 0x4b, 0xb2, 0x30,
|
||||
0xec, 0x9b, 0x1d, 0xce, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x7a, 0x28, 0xd2, 0x48, 0x04,
|
||||
0x00, 0x00,
|
||||
// 566 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c,
|
||||
0x14, 0xfd, 0xfc, 0xb5, 0xf9, 0x9b, 0xa4, 0x4d, 0x35, 0x4d, 0x91, 0x95, 0x82, 0x62, 0x15, 0x21,
|
||||
0x85, 0x8d, 0x8d, 0xda, 0x15, 0x62, 0x45, 0x14, 0x16, 0x11, 0x3f, 0x2d, 0x0e, 0x6c, 0xd8, 0x58,
|
||||
0x63, 0xcf, 0xad, 0x99, 0xd6, 0x9e, 0xb1, 0x66, 0xc6, 0xa8, 0x59, 0xf2, 0x06, 0x6c, 0x78, 0x27,
|
||||
0x9e, 0x81, 0x45, 0x79, 0x15, 0xe4, 0xf1, 0x5f, 0x24, 0xda, 0x05, 0xec, 0xe6, 0x9e, 0x7b, 0xee,
|
||||
0xc9, 0xcd, 0xb9, 0xc7, 0x08, 0xa7, 0xa0, 0x09, 0xe3, 0x97, 0x22, 0x50, 0x44, 0xbb, 0x99, 0x14,
|
||||
0x5a, 0x60, 0xac, 0x88, 0x86, 0x24, 0x61, 0x1a, 0xdc, 0xba, 0x3b, 0x3d, 0x00, 0x1e, 0xc9, 0x4d,
|
||||
0xa6, 0x99, 0xe0, 0x25, 0x6b, 0x8a, 0x62, 0x11, 0x8b, 0xea, 0x3d, 0x8b, 0x85, 0x88, 0x13, 0xf0,
|
||||
0x4c, 0x15, 0xe6, 0x97, 0x9e, 0x66, 0x29, 0x28, 0x4d, 0xd2, 0xac, 0x22, 0x8c, 0x33, 0xc1, 0xb8,
|
||||
0x06, 0x49, 0xc3, 0x0a, 0xd8, 0xaf, 0x95, 0xcb, 0xfa, 0xe4, 0xfb, 0x2e, 0xea, 0xaf, 0xb5, 0x04,
|
||||
0x92, 0xae, 0x96, 0xf8, 0x01, 0xea, 0x86, 0x79, 0x74, 0x0d, 0xda, 0xb6, 0x1c, 0x6b, 0x3e, 0xf2,
|
||||
0xab, 0x0a, 0x3f, 0x43, 0x93, 0x6a, 0x0d, 0xa0, 0x81, 0x08, 0xaf, 0x20, 0xd2, 0xc1, 0x35, 0x6c,
|
||||
0xec, 0xff, 0x0d, 0x0b, 0x37, 0xbd, 0x73, 0xd3, 0x7a, 0x0d, 0x1b, 0x6c, 0xa3, 0xde, 0x17, 0x90,
|
||||
0x8a, 0x09, 0x6e, 0xef, 0x38, 0xd6, 0xbc, 0xe3, 0xd7, 0x25, 0x7e, 0x81, 0x90, 0x04, 0x9a, 0x73,
|
||||
0x4a, 0x78, 0xb4, 0xb1, 0x77, 0x1d, 0x6b, 0x3e, 0x3c, 0x3d, 0x76, 0xdb, 0x35, 0xfd, 0xa6, 0xb9,
|
||||
0x8e, 0x3e, 0x43, 0x0a, 0xfe, 0x16, 0x1d, 0x7f, 0x44, 0x47, 0xad, 0x1f, 0x41, 0x46, 0x24, 0x49,
|
||||
0x41, 0x83, 0x54, 0xf6, 0xc8, 0xe8, 0x38, 0xee, 0x96, 0x5b, 0xaf, 0x9a, 0xe7, 0x45, 0xc3, 0xf3,
|
||||
0x27, 0x70, 0x07, 0x8a, 0x57, 0x68, 0x2f, 0x92, 0x40, 0x8c, 0x28, 0x25, 0x1a, 0xec, 0x8e, 0x91,
|
||||
0x9b, 0xba, 0xa5, 0xbd, 0x6e, 0x6d, 0xaf, 0xfb, 0xa1, 0xb6, 0x77, 0xd1, 0xff, 0x71, 0x3b, 0xfb,
|
||||
0xef, 0xdb, 0xaf, 0x99, 0xe5, 0x8f, 0xea, 0xd1, 0x25, 0xd1, 0x80, 0xdf, 0xa2, 0x31, 0xdc, 0x64,
|
||||
0x4c, 0x6e, 0x89, 0x75, 0xff, 0x42, 0x6c, 0xbf, 0x1d, 0x36, 0x72, 0x4f, 0xd1, 0x41, 0x9a, 0x27,
|
||||
0x9a, 0x65, 0x44, 0xea, 0xca, 0x79, 0x7b, 0xe8, 0x58, 0xf3, 0xbe, 0x3f, 0x6e, 0xf0, 0xd2, 0x75,
|
||||
0xec, 0xa1, 0xc3, 0x26, 0x3f, 0x81, 0x62, 0x31, 0x27, 0x3a, 0x97, 0x60, 0x0f, 0xca, 0x1b, 0x35,
|
||||
0xad, 0x75, 0xdd, 0xc1, 0xc7, 0x68, 0xa0, 0xcc, 0xe5, 0x03, 0x46, 0x6d, 0x64, 0x68, 0xfd, 0x12,
|
||||
0x58, 0xd1, 0x93, 0xaf, 0x3b, 0x68, 0xb0, 0x86, 0x38, 0x05, 0xae, 0x57, 0x4b, 0xfc, 0x7c, 0x9b,
|
||||
0x6a, 0x99, 0xff, 0xf3, 0xd0, 0xfd, 0x33, 0xad, 0x6e, 0x9d, 0xa4, 0x56, 0x08, 0xcf, 0xd0, 0xd0,
|
||||
0x2c, 0xcf, 0xf3, 0x34, 0x04, 0x69, 0x22, 0xd3, 0xf1, 0x51, 0x01, 0xbd, 0x33, 0x08, 0x9e, 0xa0,
|
||||
0x0e, 0xe3, 0x14, 0x6e, 0xaa, 0xa0, 0x94, 0x05, 0x3e, 0x43, 0x7b, 0x52, 0x08, 0x1d, 0x64, 0x0c,
|
||||
0x22, 0x28, 0x7e, 0xb5, 0x38, 0xc9, 0x68, 0x31, 0x2e, 0x9c, 0xfa, 0x79, 0x3b, 0xeb, 0x5d, 0x14,
|
||||
0xf8, 0x6a, 0xe9, 0x0f, 0x0b, 0x56, 0x59, 0x50, 0xfc, 0x1e, 0x1d, 0x09, 0xc9, 0x62, 0xc6, 0x49,
|
||||
0x12, 0x08, 0x49, 0x41, 0x06, 0x09, 0x4b, 0x99, 0x56, 0x76, 0xd7, 0xd9, 0x99, 0x0f, 0x4f, 0x1f,
|
||||
0xb5, 0x8b, 0xbe, 0xa4, 0x54, 0x82, 0x52, 0x40, 0xcf, 0x0b, 0xda, 0x9b, 0x82, 0xe5, 0x1f, 0xd6,
|
||||
0xb3, 0x2d, 0x76, 0x47, 0x34, 0x7a, 0xff, 0x1c, 0x8d, 0x7b, 0x0e, 0xd4, 0xbf, 0xef, 0x40, 0x8b,
|
||||
0x27, 0x9f, 0x1e, 0x2b, 0x2d, 0xe4, 0x95, 0xcb, 0x84, 0x67, 0x1e, 0x5e, 0x43, 0xf2, 0xcc, 0xe7,
|
||||
0xc2, 0x49, 0x92, 0x85, 0x61, 0xd7, 0xec, 0x70, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x89, 0x67,
|
||||
0x88, 0xd3, 0x53, 0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@ import "metainfo.proto";
|
||||
|
||||
message StreamID {
|
||||
bytes bucket = 1;
|
||||
bytes encrypted_path = 2;
|
||||
bytes encrypted_object_key = 2;
|
||||
int32 version = 3;
|
||||
|
||||
pointerdb.RedundancyScheme redundancy = 4;
|
||||
|
||||
@ -725,7 +725,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
|
||||
|
||||
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
|
||||
Bucket: req.Bucket,
|
||||
EncryptedPath: req.EncryptedPath,
|
||||
EncryptedObjectKey: req.EncryptedPath,
|
||||
Version: int32(object.Version),
|
||||
Redundancy: pbRS,
|
||||
CreationDate: object.CreatedAt,
|
||||
@ -768,7 +768,7 @@ func (endpoint *Endpoint) CommitObject(ctx context.Context, req *pb.ObjectCommit
|
||||
keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionWrite,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -799,7 +799,7 @@ func (endpoint *Endpoint) CommitObject(ctx context.Context, req *pb.ObjectCommit
|
||||
ObjectStream: metabase.ObjectStream{
|
||||
ProjectID: keyInfo.ProjectID,
|
||||
BucketName: string(streamID.Bucket),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedPath),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
|
||||
StreamID: id,
|
||||
Version: metabase.Version(1),
|
||||
},
|
||||
@ -1695,7 +1695,7 @@ func (endpoint *Endpoint) BeginSegment(ctx context.Context, req *pb.SegmentBegin
|
||||
keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionWrite,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -1752,7 +1752,7 @@ func (endpoint *Endpoint) BeginSegment(ctx context.Context, req *pb.SegmentBegin
|
||||
ObjectStream: metabase.ObjectStream{
|
||||
ProjectID: keyInfo.ProjectID,
|
||||
BucketName: string(streamID.Bucket),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedPath),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
|
||||
StreamID: id,
|
||||
Version: 1,
|
||||
},
|
||||
@ -1807,7 +1807,7 @@ func (endpoint *Endpoint) CommitSegment(ctx context.Context, req *pb.SegmentComm
|
||||
keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionWrite,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -1903,7 +1903,7 @@ func (endpoint *Endpoint) CommitSegment(ctx context.Context, req *pb.SegmentComm
|
||||
ObjectStream: metabase.ObjectStream{
|
||||
ProjectID: keyInfo.ProjectID,
|
||||
BucketName: string(streamID.Bucket),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedPath),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
|
||||
StreamID: id,
|
||||
Version: 1,
|
||||
},
|
||||
@ -1992,7 +1992,7 @@ func (endpoint *Endpoint) MakeInlineSegment(ctx context.Context, req *pb.Segment
|
||||
keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionWrite,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -2037,7 +2037,7 @@ func (endpoint *Endpoint) MakeInlineSegment(ctx context.Context, req *pb.Segment
|
||||
ObjectStream: metabase.ObjectStream{
|
||||
ProjectID: keyInfo.ProjectID,
|
||||
BucketName: string(streamID.Bucket),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedPath),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
|
||||
StreamID: id,
|
||||
Version: 1,
|
||||
},
|
||||
@ -2088,7 +2088,7 @@ func (endpoint *Endpoint) ListSegments(ctx context.Context, req *pb.SegmentListR
|
||||
_, err = endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionRead,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -2176,7 +2176,7 @@ func (endpoint *Endpoint) DownloadSegment(ctx context.Context, req *pb.SegmentDo
|
||||
keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionRead,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -2211,7 +2211,7 @@ func (endpoint *Endpoint) DownloadSegment(ctx context.Context, req *pb.SegmentDo
|
||||
ObjectLocation: metabase.ObjectLocation{
|
||||
ProjectID: keyInfo.ProjectID,
|
||||
BucketName: string(streamID.Bucket),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedPath),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
|
||||
},
|
||||
})
|
||||
} else {
|
||||
@ -2329,7 +2329,7 @@ func (endpoint *Endpoint) DeletePart(ctx context.Context, req *pb.PartDeleteRequ
|
||||
_, err = endpoint.validateAuth(ctx, req.Header, macaroon.Action{
|
||||
Op: macaroon.ActionDelete,
|
||||
Bucket: streamID.Bucket,
|
||||
EncryptedPath: streamID.EncryptedPath,
|
||||
EncryptedPath: streamID.EncryptedObjectKey,
|
||||
Time: time.Now(),
|
||||
})
|
||||
if err != nil {
|
||||
@ -2569,14 +2569,14 @@ func (endpoint *Endpoint) objectToProto(ctx context.Context, object metabase.Obj
|
||||
// TotalPlainSize != 0 means object was uploaded with newer uplink
|
||||
multipartObject := object.TotalPlainSize != 0 && object.FixedSegmentSize <= 0
|
||||
streamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
|
||||
Bucket: []byte(object.BucketName),
|
||||
EncryptedPath: []byte(object.ObjectKey),
|
||||
Version: int32(object.Version), // TODO incomatible types
|
||||
CreationDate: object.CreatedAt,
|
||||
ExpirationDate: expires,
|
||||
StreamId: object.StreamID[:],
|
||||
MultipartObject: multipartObject,
|
||||
Redundancy: rs,
|
||||
Bucket: []byte(object.BucketName),
|
||||
EncryptedObjectKey: []byte(object.ObjectKey),
|
||||
Version: int32(object.Version), // TODO incomatible types
|
||||
CreationDate: object.CreatedAt,
|
||||
ExpirationDate: expires,
|
||||
StreamId: object.StreamID[:],
|
||||
MultipartObject: multipartObject,
|
||||
Redundancy: rs,
|
||||
EncryptionParameters: &pb.EncryptionParameters{
|
||||
CipherSuite: pb.CipherSuite(object.Encryption.CipherSuite),
|
||||
BlockSize: int64(object.Encryption.BlockSize),
|
||||
@ -2707,13 +2707,13 @@ func (endpoint *Endpoint) objectEntryToProtoListItem(ctx context.Context, bucket
|
||||
// The client requires the Stream ID to use in the MultipartInfo.
|
||||
if entry.Status == metabase.Pending {
|
||||
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
|
||||
Bucket: bucket,
|
||||
EncryptedPath: append([]byte(prefixToPrependInSatStreamID), item.EncryptedPath...),
|
||||
Version: item.Version,
|
||||
CreationDate: item.CreatedAt,
|
||||
ExpirationDate: item.ExpiresAt,
|
||||
StreamId: entry.StreamID[:],
|
||||
MultipartObject: entry.FixedSegmentSize <= 0,
|
||||
Bucket: bucket,
|
||||
EncryptedObjectKey: append([]byte(prefixToPrependInSatStreamID), item.EncryptedPath...),
|
||||
Version: item.Version,
|
||||
CreationDate: item.CreatedAt,
|
||||
ExpirationDate: item.ExpiresAt,
|
||||
StreamId: entry.StreamID[:],
|
||||
MultipartObject: entry.FixedSegmentSize <= 0,
|
||||
// TODO: defaultRS may change while the upload is pending.
|
||||
// Ideally, we should remove redundancy from satStreamID.
|
||||
Redundancy: endpoint.defaultRS,
|
||||
@ -2879,11 +2879,11 @@ func (endpoint *Endpoint) BeginMoveObject(ctx context.Context, req *pb.ObjectBeg
|
||||
}
|
||||
|
||||
satStreamID, err := endpoint.packStreamID(ctx, &internalpb.StreamID{
|
||||
Bucket: req.Bucket,
|
||||
EncryptedPath: req.EncryptedObjectKey,
|
||||
Version: int32(metabase.DefaultVersion),
|
||||
Redundancy: endpoint.defaultRS,
|
||||
StreamId: result.StreamID[:],
|
||||
Bucket: req.Bucket,
|
||||
EncryptedObjectKey: req.EncryptedObjectKey,
|
||||
Version: int32(metabase.DefaultVersion),
|
||||
Redundancy: endpoint.defaultRS,
|
||||
StreamId: result.StreamID[:],
|
||||
EncryptionParameters: &pb.EncryptionParameters{
|
||||
CipherSuite: pb.CipherSuite(result.EncryptionParameters.CipherSuite),
|
||||
BlockSize: int64(result.EncryptionParameters.BlockSize),
|
||||
@ -2990,7 +2990,7 @@ func (endpoint *Endpoint) FinishMoveObject(ctx context.Context, req *pb.ObjectFi
|
||||
ObjectStream: metabase.ObjectStream{
|
||||
ProjectID: keyInfo.ProjectID,
|
||||
BucketName: string(streamID.Bucket),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedPath),
|
||||
ObjectKey: metabase.ObjectKey(streamID.EncryptedObjectKey),
|
||||
Version: metabase.DefaultVersion,
|
||||
StreamID: streamUUID,
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user