From 2093bacf375338a7e4234791fd8aa449fd1ec49f Mon Sep 17 00:00:00 2001 From: cs3org-bot Date: Tue, 8 Jun 2021 09:50:03 +0000 Subject: [PATCH] Synced to https://github.com/cs3org/cs3apis/tree/0c718def15fadec73d0ff53b92f7c8defbfae080 --- cs3/app/provider/v1beta1/provider_api.pb.go | 8 +- cs3/gateway/v1beta1/gateway_api.pb.go | 4 +- .../v1beta1/collaboration_api.pb.go | 160 ++++---- .../collaboration/v1beta1/resources.pb.go | 97 ++--- cs3/sharing/link/v1beta1/link_api.pb.go | 154 +++---- cs3/sharing/link/v1beta1/resources.pb.go | 86 ++-- cs3/sharing/ocm/v1beta1/ocm_api.pb.go | 158 ++++---- cs3/sharing/ocm/v1beta1/resources.pb.go | 107 ++--- .../provider/v1beta1/provider_api.pb.go | 336 ++++++++-------- cs3/storage/provider/v1beta1/resources.pb.go | 378 +++++++----------- 10 files changed, 706 insertions(+), 782 deletions(-) diff --git a/cs3/app/provider/v1beta1/provider_api.pb.go b/cs3/app/provider/v1beta1/provider_api.pb.go index 77f6788..bdf4752 100644 --- a/cs3/app/provider/v1beta1/provider_api.pb.go +++ b/cs3/app/provider/v1beta1/provider_api.pb.go @@ -112,8 +112,8 @@ type OpenInAppRequest struct { // the storage provider to read and write. // Service implementors MUST make sure that the access token only grants // access to the requested resource. - // Service implementors should use a ResourceId rather than a filepath to grant access, as - // ResourceIds MUST NOT change when a resource is renamed. + // Service implementors should use a Reference with a storage_id, a node_id and an empty path to grant access, as + // storage_id and node_id MUST NOT change when a resource is renamed. // The access token MUST be short-lived. // TODO(labkode): investigate token derivation techniques. AccessToken string `protobuf:"bytes,4,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"` @@ -263,8 +263,8 @@ type OpenFileInAppProviderRequest struct { // the storage provider to read and write. // Service implementors MUST make sure that the access token only grants // access to the requested resource. - // Service implementors should use a ResourceId rather than a filename to grant access, as - // ResourceIds MUST NOT change when a resource is renamed. + // Service implementors should use a Reference with a storage_id, a node_id and an empty path to grant access, as + // storage_id and node_id MUST NOT change when a resource is renamed. // The access token MUST be short-lived. // TODO(labkode): investigate token derivation techniques. AccessToken string `protobuf:"bytes,4,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"` diff --git a/cs3/gateway/v1beta1/gateway_api.pb.go b/cs3/gateway/v1beta1/gateway_api.pb.go index 9745441..6b2787e 100644 --- a/cs3/gateway/v1beta1/gateway_api.pb.go +++ b/cs3/gateway/v1beta1/gateway_api.pb.go @@ -1163,7 +1163,7 @@ type GatewayAPIClient interface { // MUST return CODE_NOT_FOUND if the reference does not exist. Delete(ctx context.Context, in *v1beta13.DeleteRequest, opts ...grpc.CallOption) (*v1beta13.DeleteResponse, error) // Returns the path reference for - // the provided resource id reference. + // the provided resource reference. // MUST return CODE_NOT_FOUND if the reference does not exist GetPath(ctx context.Context, in *v1beta13.GetPathRequest, opts ...grpc.CallOption) (*v1beta13.GetPathResponse, error) // Returns the quota available under the provided @@ -2187,7 +2187,7 @@ type GatewayAPIServer interface { // MUST return CODE_NOT_FOUND if the reference does not exist. Delete(context.Context, *v1beta13.DeleteRequest) (*v1beta13.DeleteResponse, error) // Returns the path reference for - // the provided resource id reference. + // the provided resource reference. // MUST return CODE_NOT_FOUND if the reference does not exist GetPath(context.Context, *v1beta13.GetPathRequest) (*v1beta13.GetPathResponse, error) // Returns the quota available under the provided diff --git a/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go b/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go index bf96b71..44f51d2 100644 --- a/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go +++ b/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go @@ -32,27 +32,27 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ListSharesRequest_Filter_Type int32 const ( - ListSharesRequest_Filter_TYPE_INVALID ListSharesRequest_Filter_Type = 0 - ListSharesRequest_Filter_TYPE_NO ListSharesRequest_Filter_Type = 1 - ListSharesRequest_Filter_TYPE_RESOURCE_ID ListSharesRequest_Filter_Type = 2 - ListSharesRequest_Filter_TYPE_OWNER ListSharesRequest_Filter_Type = 3 - ListSharesRequest_Filter_TYPE_CREATOR ListSharesRequest_Filter_Type = 4 + ListSharesRequest_Filter_TYPE_INVALID ListSharesRequest_Filter_Type = 0 + ListSharesRequest_Filter_TYPE_NO ListSharesRequest_Filter_Type = 1 + ListSharesRequest_Filter_TYPE_REFERENCE ListSharesRequest_Filter_Type = 2 + ListSharesRequest_Filter_TYPE_OWNER ListSharesRequest_Filter_Type = 3 + ListSharesRequest_Filter_TYPE_CREATOR ListSharesRequest_Filter_Type = 4 ) var ListSharesRequest_Filter_Type_name = map[int32]string{ 0: "TYPE_INVALID", 1: "TYPE_NO", - 2: "TYPE_RESOURCE_ID", + 2: "TYPE_REFERENCE", 3: "TYPE_OWNER", 4: "TYPE_CREATOR", } var ListSharesRequest_Filter_Type_value = map[string]int32{ - "TYPE_INVALID": 0, - "TYPE_NO": 1, - "TYPE_RESOURCE_ID": 2, - "TYPE_OWNER": 3, - "TYPE_CREATOR": 4, + "TYPE_INVALID": 0, + "TYPE_NO": 1, + "TYPE_REFERENCE": 2, + "TYPE_OWNER": 3, + "TYPE_CREATOR": 4, } func (x ListSharesRequest_Filter_Type) String() string { @@ -490,7 +490,7 @@ type isListSharesRequest_Filter_Term interface { } type ListSharesRequest_Filter_ResourceId struct { - ResourceId *v1beta11.ResourceId `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3,oneof"` + ResourceId *v1beta11.Reference `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3,oneof"` } type ListSharesRequest_Filter_Owner struct { @@ -514,7 +514,7 @@ func (m *ListSharesRequest_Filter) GetTerm() isListSharesRequest_Filter_Term { return nil } -func (m *ListSharesRequest_Filter) GetResourceId() *v1beta11.ResourceId { +func (m *ListSharesRequest_Filter) GetResourceId() *v1beta11.Reference { if x, ok := m.GetTerm().(*ListSharesRequest_Filter_ResourceId); ok { return x.ResourceId } @@ -1269,74 +1269,74 @@ func init() { } var fileDescriptor_2b58cdfce2e5a7f0 = []byte{ - // 1071 bytes of a gzipped FileDescriptorProto + // 1072 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xce, 0xfa, 0x2f, 0xe5, 0x38, 0x14, 0x33, 0x2d, 0xaa, 0xbb, 0x80, 0x44, 0x16, 0x21, 0x05, - 0x04, 0x6b, 0x1c, 0x53, 0xa4, 0x52, 0x52, 0x35, 0x76, 0x9d, 0xc4, 0xa2, 0xb2, 0xad, 0x49, 0xd2, - 0x08, 0x14, 0x64, 0x6d, 0xd6, 0xe3, 0x74, 0x25, 0x7b, 0x67, 0x3b, 0xb3, 0x0e, 0xb2, 0xd4, 0x2b, - 0xee, 0x10, 0xbd, 0xa9, 0xd4, 0x27, 0x40, 0x5c, 0x21, 0x6e, 0x41, 0x82, 0x07, 0x40, 0xa2, 0xef, - 0xc0, 0x8b, 0x20, 0x2e, 0xd0, 0xcc, 0x8e, 0x7f, 0xd6, 0xb6, 0xc8, 0x24, 0x41, 0x69, 0x72, 0xe9, - 0xd9, 0xf3, 0x7d, 0xf3, 0x9d, 0x33, 0x67, 0xce, 0x39, 0x63, 0xb8, 0xed, 0xf2, 0x52, 0x81, 0x3f, - 0x72, 0x98, 0xe7, 0x1f, 0x16, 0x5c, 0xda, 0xed, 0x3a, 0x07, 0x94, 0x39, 0xa1, 0x47, 0xfd, 0xc2, - 0x51, 0xf1, 0x80, 0x84, 0x4e, 0x31, 0xbe, 0xda, 0x72, 0x02, 0xcf, 0x0e, 0x18, 0x0d, 0x29, 0x5a, - 0x76, 0x79, 0xc9, 0x56, 0x50, 0x3b, 0x66, 0x64, 0x2b, 0xa8, 0xf9, 0xbe, 0x60, 0xf7, 0xda, 0xc4, - 0x0f, 0xbd, 0x70, 0x50, 0xe8, 0x73, 0xc2, 0x46, 0xac, 0x8c, 0x70, 0xda, 0x67, 0x2e, 0xe1, 0x11, - 0x9b, 0xf9, 0x96, 0x30, 0x65, 0x81, 0x3b, 0x32, 0xe0, 0xa1, 0x13, 0xf6, 0x87, 0x5f, 0x8b, 0xc7, - 0xcb, 0x9c, 0x26, 0xfc, 0x50, 0x42, 0x42, 0xca, 0x9c, 0x43, 0x52, 0x08, 0x18, 0x3d, 0xf2, 0xda, - 0xff, 0xb1, 0xfd, 0xdb, 0xc2, 0x3a, 0x1c, 0x04, 0x84, 0x8f, 0x4c, 0xe4, 0xaf, 0xe8, 0xb3, 0xf5, - 0x97, 0x01, 0xa8, 0xc2, 0x88, 0x13, 0x92, 0xed, 0x47, 0x0e, 0x23, 0x98, 0x3c, 0xee, 0x13, 0x1e, - 0xa2, 0x22, 0x64, 0x68, 0xe0, 0x3c, 0xee, 0x93, 0xbc, 0xf1, 0x8e, 0xb1, 0x92, 0x5d, 0xbd, 0x69, - 0x8b, 0x98, 0x44, 0x40, 0x45, 0x63, 0x37, 0xa4, 0x01, 0x56, 0x86, 0xa8, 0x01, 0xaf, 0x0e, 0xf7, - 0x6e, 0x79, 0x7e, 0x87, 0xe6, 0x13, 0x12, 0xf9, 0x81, 0x44, 0x2a, 0xb9, 0xf6, 0x50, 0xee, 0x88, - 0x04, 0x2b, 0x48, 0xcd, 0xef, 0x50, 0xbc, 0xc4, 0x26, 0x7e, 0xa1, 0x0a, 0xa4, 0x0f, 0x99, 0xe3, - 0x87, 0xf9, 0xa4, 0x24, 0xfa, 0xc8, 0x3e, 0xf6, 0x58, 0x6c, 0xe9, 0xc3, 0xa6, 0x00, 0xe1, 0x08, - 0x6b, 0xfd, 0x66, 0xc0, 0xb5, 0x98, 0x7f, 0x3c, 0xa0, 0x3e, 0x27, 0xa8, 0x00, 0x99, 0xe8, 0x1c, - 0x94, 0x83, 0x37, 0x24, 0x3b, 0x0b, 0xdc, 0x31, 0x97, 0xfc, 0x8c, 0x95, 0xd9, 0x44, 0x44, 0x12, - 0xba, 0x11, 0xb9, 0x0b, 0x69, 0x21, 0x97, 0x28, 0x07, 0x56, 0x74, 0x1d, 0xc0, 0x11, 0xcc, 0xfa, - 0x27, 0x01, 0x68, 0x37, 0x68, 0xff, 0x0f, 0x67, 0x53, 0x81, 0x24, 0x23, 0x1d, 0xa5, 0xbc, 0xa8, - 0xad, 0x83, 0x74, 0x08, 0x23, 0xbe, 0x4b, 0xb0, 0x40, 0xa3, 0x3d, 0x48, 0x77, 0x3c, 0xd2, 0x6d, - 0x2b, 0x77, 0xd6, 0x35, 0x68, 0x66, 0xd5, 0xab, 0xa5, 0x0d, 0x41, 0x84, 0x23, 0x3e, 0xf3, 0xb9, - 0x01, 0xd9, 0x89, 0x65, 0xb4, 0x07, 0xd9, 0x80, 0xb0, 0x9e, 0xc7, 0xb9, 0x47, 0x7d, 0xae, 0x54, - 0x97, 0x74, 0x55, 0x37, 0xc7, 0xd0, 0xad, 0x05, 0x3c, 0xc9, 0x84, 0xde, 0x85, 0xa5, 0xb6, 0xc7, - 0x83, 0xae, 0x33, 0x68, 0xf9, 0x4e, 0x2f, 0x3a, 0x97, 0x57, 0x84, 0x91, 0x5a, 0xad, 0x3b, 0x3d, - 0x52, 0x5e, 0x54, 0x6e, 0xca, 0xd4, 0x89, 0x39, 0x70, 0x89, 0x52, 0xe7, 0xe7, 0x14, 0xbc, 0xfe, - 0xc0, 0xe3, 0xa1, 0x5c, 0xe4, 0x67, 0xc8, 0x9c, 0x5d, 0x58, 0xec, 0x78, 0xdd, 0x90, 0x30, 0x71, - 0x0e, 0xc9, 0x95, 0xec, 0xea, 0x1d, 0x0d, 0x29, 0x33, 0x3b, 0xdb, 0x1b, 0x92, 0x03, 0x0f, 0xb9, - 0xcc, 0xa7, 0x49, 0xc8, 0x44, 0x6b, 0x68, 0x07, 0x52, 0x42, 0x81, 0x8c, 0xcd, 0xd5, 0xd5, 0x7b, - 0x67, 0xa0, 0xb7, 0x77, 0x06, 0x01, 0xc1, 0x92, 0x0d, 0x7d, 0x01, 0xd9, 0x71, 0x35, 0x6a, 0xc7, - 0xc3, 0x78, 0x6c, 0x2d, 0x6a, 0x6f, 0x2d, 0x60, 0x18, 0xd5, 0xa2, 0x36, 0xba, 0x0d, 0x69, 0xfa, - 0x8d, 0x4f, 0x58, 0x3e, 0x25, 0x69, 0x96, 0x25, 0xcd, 0xb0, 0xfa, 0xdb, 0xa2, 0xfa, 0x8f, 0x33, - 0x9e, 0x13, 0x26, 0xf1, 0x11, 0x02, 0xad, 0xc1, 0xa2, 0x2b, 0xca, 0x0f, 0x65, 0xf9, 0xb4, 0x3e, - 0x78, 0x88, 0xb1, 0xbe, 0x86, 0x94, 0x70, 0x0a, 0xe5, 0x60, 0x69, 0xe7, 0xcb, 0x66, 0xb5, 0x55, - 0xab, 0x3f, 0x5c, 0x7f, 0x50, 0xbb, 0x9f, 0x5b, 0x40, 0x59, 0x58, 0x94, 0x2b, 0xf5, 0x46, 0xce, - 0x40, 0xd7, 0x21, 0x27, 0x7f, 0xe0, 0xea, 0x76, 0x63, 0x17, 0x57, 0xaa, 0xad, 0xda, 0xfd, 0x5c, - 0x02, 0x5d, 0x05, 0x90, 0xab, 0x8d, 0xbd, 0x7a, 0x15, 0xe7, 0x92, 0x23, 0x92, 0x0a, 0xae, 0xae, - 0xef, 0x34, 0x70, 0x2e, 0x55, 0xce, 0x40, 0x2a, 0x24, 0xac, 0x67, 0xfd, 0x6e, 0x00, 0x9a, 0x8c, - 0xea, 0x39, 0x66, 0xfa, 0x3d, 0xc8, 0xc8, 0x94, 0xe5, 0xf9, 0xa4, 0xcc, 0x2f, 0xfd, 0x54, 0x57, - 0x38, 0xeb, 0xa9, 0x01, 0x08, 0x93, 0x1e, 0x3d, 0xba, 0x10, 0x65, 0xd2, 0x1a, 0xc0, 0xb5, 0x98, - 0x9a, 0xf3, 0x8b, 0xa5, 0xf5, 0x9d, 0x01, 0xaf, 0x6d, 0x92, 0xf0, 0x42, 0x84, 0xe1, 0x57, 0x03, - 0x72, 0x63, 0x2d, 0x97, 0xa8, 0x74, 0xd6, 0xe1, 0xa6, 0xb8, 0x0a, 0x98, 0xb8, 0xc4, 0x3b, 0x22, - 0xed, 0xb3, 0x56, 0x50, 0xeb, 0x85, 0x01, 0xe6, 0x3c, 0xc2, 0x73, 0x0c, 0xc9, 0xd6, 0xd4, 0x1d, - 0xfb, 0x58, 0x23, 0x26, 0x31, 0xb9, 0xa3, 0xbb, 0xf6, 0x77, 0x02, 0xcc, 0xa8, 0x27, 0xc6, 0xbf, - 0xbf, 0xe4, 0xd1, 0xa4, 0x15, 0x1f, 0x4d, 0x6a, 0xda, 0xa3, 0xc9, 0x3c, 0x2f, 0xe6, 0x8d, 0x28, - 0xdf, 0x4e, 0x8d, 0x28, 0xd3, 0x93, 0x84, 0x31, 0x67, 0x92, 0x40, 0x55, 0x48, 0x8b, 0x33, 0x1b, - 0xb6, 0x36, 0xed, 0x01, 0x56, 0x1c, 0x38, 0x11, 0x2d, 0x44, 0xa2, 0xc7, 0x03, 0xc9, 0x9f, 0x06, - 0xbc, 0x39, 0x57, 0xf6, 0x39, 0xa6, 0xd2, 0x46, 0xfc, 0x76, 0x9d, 0x3c, 0x93, 0xd4, 0x2d, 0x7b, - 0x66, 0xc0, 0x8d, 0x4d, 0x12, 0x5e, 0xa4, 0x2c, 0xb2, 0xfe, 0x30, 0x20, 0x3f, 0xab, 0xe9, 0xf2, - 0x05, 0x77, 0xf5, 0x97, 0x2b, 0x90, 0xab, 0x4c, 0x9a, 0xaf, 0x37, 0x6b, 0xe8, 0x09, 0x64, 0x27, - 0x1e, 0x42, 0xe8, 0x96, 0x06, 0xf9, 0xec, 0xc3, 0xd0, 0xfc, 0xf4, 0xa4, 0x30, 0x15, 0xbe, 0x27, - 0x90, 0x9d, 0xe8, 0x8a, 0x5a, 0xbb, 0xcf, 0xf6, 0x74, 0xad, 0xdd, 0xe7, 0x35, 0x5f, 0x0e, 0x57, - 0x86, 0xbd, 0x08, 0xad, 0x6a, 0x70, 0x4c, 0x35, 0x51, 0xb3, 0x74, 0x22, 0x8c, 0xda, 0x74, 0x00, - 0x30, 0x9e, 0xa9, 0xd0, 0x27, 0xa7, 0x19, 0x6c, 0xcd, 0x5b, 0x27, 0x44, 0x8d, 0xa3, 0x3d, 0xf1, - 0x72, 0xd1, 0x8a, 0xf6, 0xec, 0x53, 0x4d, 0x2b, 0xda, 0xf3, 0x1e, 0x48, 0xcf, 0xd4, 0x34, 0x19, - 0xef, 0x78, 0xe8, 0x73, 0x4d, 0x5f, 0xe6, 0x76, 0x5e, 0x73, 0xed, 0x94, 0x68, 0xa5, 0xe9, 0xf9, - 0xe8, 0x31, 0x17, 0x33, 0x40, 0x6b, 0x67, 0x6a, 0x15, 0xe6, 0xdd, 0xd3, 0xc2, 0x95, 0xac, 0xef, - 0xa3, 0x29, 0x29, 0xae, 0xe9, 0x33, 0xbd, 0x6c, 0x9b, 0x2b, 0xe8, 0xce, 0xa9, 0xb0, 0x91, 0x9a, - 0xf2, 0x8f, 0x06, 0xbc, 0xe7, 0xd2, 0xde, 0xf1, 0x14, 0xe5, 0x37, 0xe2, 0xe5, 0x25, 0xf0, 0x9a, - 0x8c, 0x86, 0xb4, 0x69, 0x7c, 0x75, 0x3d, 0x66, 0xaf, 0xcc, 0x7f, 0x48, 0x24, 0x2b, 0xdb, 0x95, - 0x9f, 0x12, 0xcb, 0x15, 0x5e, 0x92, 0x95, 0x57, 0x10, 0xc7, 0x18, 0xec, 0x87, 0xc5, 0xb2, 0xb0, - 0x7c, 0x21, 0x6d, 0xf6, 0x95, 0xcd, 0x7e, 0xcc, 0x66, 0x5f, 0xd9, 0x1c, 0x64, 0xe4, 0x5f, 0x57, - 0xa5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x0c, 0xec, 0x35, 0xe3, 0x13, 0x00, 0x00, + 0x14, 0xce, 0xfa, 0x2f, 0xe5, 0x38, 0x04, 0x33, 0x05, 0xd5, 0x5d, 0x40, 0x22, 0x8b, 0x10, 0x01, + 0xc1, 0x1a, 0xdb, 0x14, 0xa9, 0x94, 0x54, 0x8d, 0x8d, 0x93, 0x18, 0x55, 0xb6, 0x35, 0x4d, 0x1b, + 0x01, 0x91, 0xac, 0xcd, 0x7a, 0x9c, 0xae, 0x64, 0xef, 0x6c, 0x67, 0xd6, 0x41, 0x96, 0x7a, 0xc5, + 0x5d, 0x05, 0x37, 0x95, 0xfa, 0x04, 0x88, 0x1b, 0xb8, 0x07, 0x09, 0x1e, 0x00, 0x89, 0xbe, 0x03, + 0x2f, 0x82, 0xb8, 0x40, 0x33, 0x3b, 0xfe, 0x59, 0xdb, 0x22, 0x93, 0x04, 0x85, 0xe4, 0xd2, 0xb3, + 0xe7, 0xfb, 0xe6, 0x3b, 0x67, 0xce, 0x9c, 0x73, 0xc6, 0x70, 0xd3, 0xe5, 0xe5, 0x02, 0x7f, 0xe8, + 0x30, 0xcf, 0x3f, 0x2c, 0xb8, 0xb4, 0xd7, 0x73, 0x0e, 0x28, 0x73, 0x42, 0x8f, 0xfa, 0x85, 0xa3, + 0xe2, 0x01, 0x09, 0x9d, 0x62, 0x7c, 0xb5, 0xed, 0x04, 0x9e, 0x1d, 0x30, 0x1a, 0x52, 0xb4, 0xe6, + 0xf2, 0xb2, 0xad, 0xa0, 0x76, 0xcc, 0xc8, 0x56, 0x50, 0xf3, 0x5d, 0xc1, 0xee, 0x75, 0x88, 0x1f, + 0x7a, 0xe1, 0xb0, 0x30, 0xe0, 0x84, 0x8d, 0x59, 0x19, 0xe1, 0x74, 0xc0, 0x5c, 0xc2, 0x23, 0x36, + 0xf3, 0x75, 0x61, 0xca, 0x02, 0x77, 0x6c, 0xc0, 0x43, 0x27, 0x1c, 0x8c, 0xbe, 0x16, 0x8f, 0x97, + 0x39, 0x4b, 0xf8, 0xbe, 0x84, 0x84, 0x94, 0x39, 0x87, 0xa4, 0x10, 0x30, 0x7a, 0xe4, 0x75, 0xfe, + 0x65, 0xfb, 0x37, 0x84, 0x75, 0x38, 0x0c, 0x08, 0x1f, 0x9b, 0xc8, 0x5f, 0xd1, 0x67, 0xeb, 0x4f, + 0x03, 0x50, 0x95, 0x11, 0x27, 0x24, 0xf7, 0x1e, 0x3a, 0x8c, 0x60, 0xf2, 0x68, 0x40, 0x78, 0x88, + 0x8a, 0x90, 0xa1, 0x81, 0xf3, 0x68, 0x40, 0xf2, 0xc6, 0x9b, 0xc6, 0x7a, 0xb6, 0x74, 0xdd, 0x16, + 0x31, 0x89, 0x80, 0x8a, 0xc6, 0x6e, 0x4a, 0x03, 0xac, 0x0c, 0x51, 0x13, 0x5e, 0x1c, 0xed, 0xdd, + 0xf6, 0xfc, 0x2e, 0xcd, 0x27, 0x24, 0xf2, 0x3d, 0x89, 0x54, 0x72, 0xed, 0x91, 0xdc, 0x31, 0x09, + 0x56, 0x90, 0xba, 0xdf, 0xa5, 0x78, 0x85, 0x4d, 0xfd, 0x42, 0x55, 0x48, 0x1f, 0x32, 0xc7, 0x0f, + 0xf3, 0x49, 0x49, 0xf4, 0x81, 0x7d, 0xec, 0xb1, 0xd8, 0xd2, 0x87, 0x6d, 0x01, 0xc2, 0x11, 0xd6, + 0xfa, 0xd5, 0x80, 0xab, 0x31, 0xff, 0x78, 0x40, 0x7d, 0x4e, 0x50, 0x01, 0x32, 0xd1, 0x39, 0x28, + 0x07, 0xaf, 0x49, 0x76, 0x16, 0xb8, 0x13, 0x2e, 0xf9, 0x19, 0x2b, 0xb3, 0xa9, 0x88, 0x24, 0x74, + 0x23, 0x72, 0x1b, 0xd2, 0x42, 0x2e, 0x51, 0x0e, 0xac, 0xeb, 0x3a, 0x80, 0x23, 0x98, 0xf5, 0x77, + 0x02, 0xd0, 0xfd, 0xa0, 0xf3, 0x1f, 0x9c, 0x4d, 0x15, 0x92, 0x8c, 0x74, 0x95, 0xf2, 0xa2, 0xb6, + 0x0e, 0xd2, 0x25, 0x8c, 0xf8, 0x2e, 0xc1, 0x02, 0x8d, 0xf6, 0x20, 0xdd, 0xf5, 0x48, 0xaf, 0xa3, + 0xdc, 0xd9, 0xd4, 0xa0, 0x99, 0x57, 0xaf, 0x96, 0xb6, 0x04, 0x11, 0x8e, 0xf8, 0xcc, 0x67, 0x06, + 0x64, 0xa7, 0x96, 0xd1, 0x1e, 0x64, 0x03, 0xc2, 0xfa, 0x1e, 0xe7, 0x1e, 0xf5, 0xb9, 0x52, 0x5d, + 0xd6, 0x55, 0xdd, 0x9a, 0x40, 0x77, 0x96, 0xf0, 0x34, 0x13, 0x7a, 0x0b, 0x56, 0x3a, 0x1e, 0x0f, + 0x7a, 0xce, 0xb0, 0xed, 0x3b, 0xfd, 0xe8, 0x5c, 0x5e, 0x10, 0x46, 0x6a, 0xb5, 0xe1, 0xf4, 0x49, + 0x65, 0x59, 0xb9, 0x29, 0x53, 0x27, 0xe6, 0xc0, 0x25, 0x4a, 0x9d, 0x1f, 0x53, 0xf0, 0xf2, 0x5d, + 0x8f, 0x87, 0x72, 0x91, 0x9f, 0x21, 0x73, 0xee, 0xc3, 0x72, 0xd7, 0xeb, 0x85, 0x84, 0x89, 0x73, + 0x48, 0xae, 0x67, 0x4b, 0xb7, 0x34, 0xa4, 0xcc, 0xed, 0x6c, 0x6f, 0x49, 0x0e, 0x3c, 0xe2, 0x32, + 0x9f, 0x24, 0x21, 0x13, 0xad, 0xa1, 0x5d, 0x48, 0x09, 0x05, 0x32, 0x36, 0xab, 0xa5, 0x3b, 0x67, + 0xa0, 0xb7, 0x77, 0x87, 0x01, 0xc1, 0x92, 0x0d, 0x7d, 0x0e, 0xd9, 0x49, 0x35, 0x1a, 0xa5, 0xec, + 0x3b, 0xc7, 0xd5, 0x22, 0x95, 0xef, 0x3b, 0x4b, 0x18, 0xc6, 0xa5, 0xa8, 0x83, 0x6e, 0x42, 0x9a, + 0x7e, 0xed, 0x13, 0x96, 0x4f, 0x49, 0x96, 0x35, 0xc9, 0x32, 0x2a, 0xfe, 0xb6, 0x28, 0xfe, 0x93, + 0x84, 0xe7, 0x84, 0xd5, 0x3b, 0x3b, 0x4b, 0x38, 0x42, 0xa0, 0x0d, 0x58, 0x76, 0x45, 0xf5, 0xa1, + 0x2c, 0x9f, 0xd6, 0x07, 0x8f, 0x30, 0xd6, 0x57, 0x90, 0x12, 0x3e, 0xa1, 0x1c, 0xac, 0xec, 0x7e, + 0xd1, 0xaa, 0xb5, 0xeb, 0x8d, 0x07, 0x9b, 0x77, 0xeb, 0x9f, 0xe5, 0x96, 0x50, 0x16, 0x96, 0xe5, + 0x4a, 0xa3, 0x99, 0x33, 0x10, 0x82, 0x55, 0xf9, 0x03, 0xd7, 0xb6, 0x6a, 0xb8, 0xd6, 0xa8, 0xd6, + 0x72, 0x09, 0xb4, 0x0a, 0x20, 0xd7, 0x9a, 0x7b, 0x8d, 0x1a, 0xce, 0x25, 0xc7, 0x14, 0x55, 0x5c, + 0xdb, 0xdc, 0x6d, 0xe2, 0x5c, 0xaa, 0x92, 0x81, 0x54, 0x48, 0x58, 0xdf, 0xfa, 0xcd, 0x00, 0x34, + 0x1d, 0xd2, 0x73, 0x4c, 0xf3, 0x3b, 0x90, 0x91, 0xf9, 0xca, 0xf3, 0x49, 0x99, 0x5c, 0xfa, 0x79, + 0xae, 0x70, 0xd6, 0x77, 0x06, 0x20, 0x4c, 0xfa, 0xf4, 0xe8, 0x42, 0xd4, 0x48, 0x6b, 0x08, 0x57, + 0x63, 0x6a, 0xce, 0x2f, 0x96, 0xd6, 0x13, 0x03, 0x5e, 0xda, 0x26, 0xe1, 0x85, 0x08, 0xc3, 0x2f, + 0x06, 0xe4, 0x26, 0x5a, 0x2e, 0x51, 0xdd, 0x6c, 0xc0, 0x75, 0x71, 0x15, 0x30, 0x71, 0x89, 0x77, + 0x44, 0x3a, 0x67, 0x2d, 0x9f, 0xd6, 0x73, 0x03, 0xcc, 0x45, 0x84, 0xe7, 0x18, 0x92, 0x9d, 0x99, + 0x3b, 0xf6, 0xa1, 0x46, 0x4c, 0x62, 0x72, 0xc7, 0x77, 0xed, 0xaf, 0x04, 0x98, 0x51, 0x43, 0x8c, + 0x7f, 0xff, 0x9f, 0xe7, 0x92, 0x76, 0x7c, 0x2e, 0xa9, 0x6b, 0xcf, 0x25, 0x8b, 0xbc, 0x58, 0x34, + 0x9f, 0x7c, 0x33, 0x33, 0x9f, 0xcc, 0x8e, 0x11, 0xc6, 0x82, 0x31, 0x02, 0xd5, 0x20, 0x2d, 0xce, + 0x6c, 0xd4, 0xd7, 0xb4, 0xa7, 0x57, 0x71, 0xe0, 0xa2, 0x01, 0x45, 0xe8, 0xc9, 0x34, 0xf2, 0x87, + 0x01, 0xaf, 0x2d, 0x94, 0x7d, 0x8e, 0xa9, 0xb4, 0x15, 0xbf, 0x5d, 0x27, 0xcf, 0x24, 0x75, 0xcb, + 0x9e, 0x1a, 0x70, 0x6d, 0x9b, 0x84, 0x17, 0x29, 0x8b, 0xac, 0xdf, 0x0d, 0xc8, 0xcf, 0x6b, 0xba, + 0x7c, 0xc1, 0x2d, 0xfd, 0x7c, 0x05, 0x72, 0xd5, 0x69, 0xf3, 0xcd, 0x56, 0x1d, 0x3d, 0x86, 0xec, + 0xd4, 0x2b, 0x08, 0xdd, 0xd0, 0x20, 0x9f, 0x7f, 0x15, 0x9a, 0x1f, 0x9f, 0x14, 0xa6, 0xc2, 0xf7, + 0x18, 0xb2, 0x53, 0x5d, 0x51, 0x6b, 0xf7, 0xf9, 0x9e, 0xae, 0xb5, 0xfb, 0xa2, 0xe6, 0xcb, 0xe1, + 0xca, 0xa8, 0x17, 0xa1, 0x92, 0x06, 0xc7, 0x4c, 0x13, 0x35, 0xcb, 0x27, 0xc2, 0xa8, 0x4d, 0x87, + 0x00, 0x93, 0x99, 0x0a, 0x7d, 0x74, 0x9a, 0xa9, 0xd6, 0xbc, 0x71, 0x42, 0xd4, 0x24, 0xda, 0x53, + 0xcf, 0x16, 0xad, 0x68, 0xcf, 0xbf, 0xd3, 0xb4, 0xa2, 0xbd, 0xe8, 0x75, 0xf4, 0x54, 0x4d, 0x93, + 0xf1, 0x8e, 0x87, 0x3e, 0xd5, 0xf4, 0x65, 0x61, 0xe7, 0x35, 0x37, 0x4e, 0x89, 0x56, 0x9a, 0x9e, + 0x8d, 0x5f, 0x72, 0x31, 0x03, 0xb4, 0x71, 0xa6, 0x56, 0x61, 0xde, 0x3e, 0x2d, 0x5c, 0xc9, 0xfa, + 0x36, 0x9a, 0x92, 0xe2, 0x9a, 0x3e, 0xd1, 0xcb, 0xb6, 0x85, 0x82, 0x6e, 0x9d, 0x0a, 0x1b, 0xa9, + 0xa9, 0xfc, 0x60, 0xc0, 0xdb, 0x2e, 0xed, 0x1f, 0x4f, 0x51, 0x79, 0x35, 0x5e, 0x5e, 0x02, 0xaf, + 0xc5, 0x68, 0x48, 0x5b, 0xc6, 0x97, 0xaf, 0xc4, 0xec, 0x95, 0xf9, 0xf7, 0x89, 0x64, 0xf5, 0x5e, + 0xf5, 0xa7, 0xc4, 0x5a, 0x95, 0x97, 0x65, 0xe5, 0x15, 0xc4, 0x31, 0x06, 0xfb, 0x41, 0xb1, 0x22, + 0x2c, 0x9f, 0x4b, 0x9b, 0x7d, 0x65, 0xb3, 0x1f, 0xb3, 0xd9, 0x57, 0x36, 0x07, 0x19, 0xf9, 0xbf, + 0x55, 0xf9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0xa6, 0xf7, 0x7a, 0xe0, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/cs3/sharing/collaboration/v1beta1/resources.pb.go b/cs3/sharing/collaboration/v1beta1/resources.pb.go index db9e155..0ce9137 100644 --- a/cs3/sharing/collaboration/v1beta1/resources.pb.go +++ b/cs3/sharing/collaboration/v1beta1/resources.pb.go @@ -65,14 +65,14 @@ func (ShareState) EnumDescriptor() ([]byte, []int) { // Shares are relationships between a resource owner // (usually the authenticated user) who grants permissions to a recipient (grantee) -// on a specified resource (resource_id). UserShares represents both user and groups. +// on a specified resource (id only reference). UserShares represents both user and groups. type Share struct { // REQUIRED. // Opaque unique identifier of the share. Id *ShareId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // REQUIRED. - // Unique identifier of the shared resource. - ResourceId *v1beta1.ResourceId `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` + // Unique identifier of the shared resource (path must be empty). + ResourceId *v1beta1.Reference `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` // REQUIRED. // Permissions for the grantee to use // the resource. @@ -135,7 +135,7 @@ func (m *Share) GetId() *ShareId { return nil } -func (m *Share) GetResourceId() *v1beta1.ResourceId { +func (m *Share) GetResourceId() *v1beta1.Reference { if m != nil { return m.ResourceId } @@ -296,7 +296,8 @@ type ShareKey struct { // REQUIRED. Owner *v1beta11.UserId `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` // REQUIRED. - ResourceId *v1beta1.ResourceId `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` + // Unique identifier of the shared resource (path must be empty). + ResourceId *v1beta1.Reference `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` // REQUIRED. Grantee *v1beta1.Grantee `protobuf:"bytes,4,opt,name=grantee,proto3" json:"grantee,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -336,7 +337,7 @@ func (m *ShareKey) GetOwner() *v1beta11.UserId { return nil } -func (m *ShareKey) GetResourceId() *v1beta1.ResourceId { +func (m *ShareKey) GetResourceId() *v1beta1.Reference { if m != nil { return m.ResourceId } @@ -549,46 +550,46 @@ func init() { } var fileDescriptor_cb95b447da150104 = []byte{ - // 652 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x41, 0x4f, 0xd4, 0x40, - 0x14, 0xc7, 0x69, 0x97, 0x65, 0x61, 0x88, 0x64, 0x33, 0x92, 0xd8, 0xa0, 0x26, 0xd2, 0x04, 0x83, - 0xa8, 0xdd, 0x2c, 0x7b, 0x30, 0x51, 0x23, 0xd9, 0x2d, 0x0d, 0x54, 0x0c, 0xd9, 0xcc, 0x2e, 0x1c, - 0x0c, 0x09, 0x29, 0xed, 0x73, 0x99, 0x48, 0x3b, 0x75, 0x66, 0xc0, 0xec, 0xdd, 0x8f, 0x60, 0xe2, - 0xc9, 0x8b, 0xf1, 0xe4, 0x47, 0xf1, 0xe2, 0x57, 0x32, 0x9d, 0x69, 0x17, 0x76, 0x13, 0xa0, 0x82, - 0xb7, 0xdd, 0xbe, 0xff, 0xef, 0xf5, 0xcd, 0xfc, 0xdf, 0x7b, 0x45, 0xcd, 0x50, 0xb4, 0x1a, 0xe2, - 0x38, 0xe0, 0x34, 0x19, 0x34, 0x42, 0x76, 0x72, 0x12, 0x1c, 0x31, 0x1e, 0x48, 0xca, 0x92, 0xc6, - 0x59, 0xf3, 0x08, 0x64, 0xd0, 0x6c, 0x70, 0x10, 0xec, 0x94, 0x87, 0x20, 0x9c, 0x94, 0x33, 0xc9, - 0xf0, 0x72, 0x28, 0x5a, 0x4e, 0x8e, 0x38, 0x63, 0x88, 0x93, 0x23, 0x4b, 0x4f, 0xb2, 0xac, 0x34, - 0x82, 0x44, 0x52, 0x39, 0x6c, 0x9c, 0x0a, 0xe0, 0x97, 0x65, 0x5b, 0x7a, 0xa6, 0x0a, 0x90, 0x8c, - 0x07, 0x03, 0x68, 0xa4, 0x9c, 0x9d, 0xd1, 0xe8, 0x0a, 0xf5, 0xc3, 0x4c, 0x2d, 0x87, 0x29, 0x88, - 0x91, 0x44, 0xfd, 0xd3, 0x61, 0xfb, 0xcb, 0x34, 0xaa, 0xf6, 0x8e, 0x03, 0x0e, 0xf8, 0x25, 0x32, - 0x69, 0x64, 0x19, 0x8f, 0x8c, 0xd5, 0xf9, 0xf5, 0x35, 0xe7, 0xda, 0x8a, 0x1d, 0x45, 0xf9, 0x11, - 0x31, 0x69, 0x84, 0x7d, 0x34, 0x5f, 0xbc, 0xf7, 0x90, 0x46, 0x96, 0xa9, 0x92, 0xac, 0xea, 0x24, - 0xba, 0x50, 0xa7, 0x28, 0x74, 0xc4, 0x93, 0x1c, 0xf0, 0x23, 0x82, 0xf8, 0xe8, 0x37, 0xde, 0x43, - 0xf3, 0x29, 0xf0, 0x98, 0x0a, 0x41, 0x59, 0x22, 0xac, 0x8a, 0x4a, 0xd5, 0x2a, 0x5b, 0x4f, 0xf7, - 0x1c, 0x25, 0x17, 0xf3, 0xe0, 0x0d, 0x54, 0x1b, 0xf0, 0x20, 0x91, 0x00, 0xd6, 0xb4, 0x4a, 0xb9, - 0x72, 0x75, 0x75, 0x5b, 0x5a, 0x4c, 0x0a, 0x0a, 0xbf, 0x40, 0x55, 0xf6, 0x39, 0x01, 0x6e, 0x55, - 0x15, 0xbe, 0xac, 0xf0, 0xc2, 0x30, 0x27, 0x33, 0x6c, 0xc4, 0xee, 0x09, 0xe0, 0x7e, 0x44, 0xb4, - 0x1e, 0xbf, 0x42, 0xb5, 0x90, 0x43, 0x20, 0x19, 0xb7, 0x66, 0xca, 0xa2, 0x05, 0x81, 0xd7, 0x51, - 0x35, 0x94, 0x34, 0x06, 0xab, 0xa6, 0xd0, 0x07, 0x0a, 0xd5, 0xfe, 0x15, 0x48, 0x9f, 0xc6, 0x20, - 0x64, 0x10, 0xa7, 0x44, 0x4b, 0x33, 0x26, 0x56, 0xcc, 0x6c, 0x19, 0x46, 0x49, 0xed, 0x01, 0xaa, - 0x4f, 0xde, 0x1f, 0xee, 0x8d, 0x3b, 0xa1, 0x3b, 0xa3, 0x59, 0xce, 0xd4, 0xcb, 0x7c, 0xb0, 0xbf, - 0x1a, 0xe8, 0x0e, 0x81, 0x10, 0xe8, 0x19, 0x44, 0xba, 0xef, 0xde, 0xa0, 0x6a, 0x66, 0x2c, 0xe4, - 0x2f, 0x58, 0x2d, 0x6b, 0x35, 0xd1, 0x18, 0x76, 0x51, 0x55, 0xc8, 0x40, 0x82, 0xea, 0xba, 0x85, - 0xf5, 0xe7, 0x65, 0xf9, 0x5e, 0x06, 0x11, 0xcd, 0xda, 0x7f, 0x0c, 0x34, 0xab, 0x9e, 0xee, 0xc0, - 0xf0, 0xdc, 0x6a, 0xf3, 0x1f, 0xad, 0x9e, 0x18, 0x83, 0xca, 0x2d, 0xc6, 0xe0, 0xb6, 0xfd, 0x6a, - 0x3f, 0x46, 0xb5, 0x7c, 0x42, 0xf1, 0x7d, 0x34, 0xc7, 0xd2, 0xe0, 0xd3, 0xe9, 0x68, 0x36, 0xe7, - 0xc8, 0xac, 0x7e, 0xe0, 0x47, 0xf6, 0x37, 0x03, 0x2d, 0xe8, 0xfb, 0x84, 0x0f, 0xc0, 0x21, 0x09, - 0x01, 0xbf, 0xbe, 0xd9, 0x26, 0xd8, 0x9e, 0x52, 0xbb, 0x60, 0x03, 0x55, 0x3e, 0xc2, 0x30, 0xbf, - 0xbb, 0xa7, 0x65, 0xf1, 0x1d, 0x18, 0x6e, 0x4f, 0x91, 0x8c, 0xec, 0xcc, 0xa0, 0x69, 0x91, 0x42, - 0x68, 0xff, 0x34, 0x10, 0x52, 0x31, 0x75, 0xb6, 0x8b, 0x37, 0x62, 0xdc, 0x68, 0x82, 0x27, 0x36, - 0x8b, 0xf9, 0x7f, 0x36, 0xcb, 0x1a, 0xcf, 0xab, 0x54, 0xfd, 0x84, 0xef, 0xa1, 0xbb, 0xbd, 0xed, - 0x36, 0xf1, 0x0e, 0x7b, 0xfd, 0x76, 0xdf, 0x3b, 0xf4, 0x77, 0xf7, 0xdb, 0xef, 0xfc, 0xcd, 0xfa, - 0xd4, 0x64, 0xa0, 0xeb, 0xed, 0x6e, 0xfa, 0xbb, 0x5b, 0x75, 0x03, 0x5b, 0x68, 0xf1, 0x62, 0xa0, - 0xed, 0xba, 0x5e, 0xb7, 0xef, 0x6d, 0xd6, 0xcd, 0xc9, 0x08, 0xf1, 0xde, 0x7a, 0x6e, 0x16, 0xa9, - 0x74, 0xbe, 0x1b, 0x68, 0x25, 0x64, 0xf1, 0xf5, 0xb5, 0x77, 0x16, 0x8a, 0xfe, 0x12, 0xdd, 0x6c, - 0xdf, 0x77, 0x8d, 0xf7, 0x8b, 0x63, 0xc2, 0x5c, 0xf7, 0xc3, 0xac, 0xb8, 0x3d, 0xf7, 0x97, 0xb9, - 0xec, 0x8a, 0x96, 0x3a, 0x6f, 0x96, 0xd1, 0x1d, 0xcb, 0xb8, 0xdf, 0xec, 0x64, 0xca, 0xdf, 0x4a, - 0x73, 0x90, 0x6b, 0x0e, 0xc6, 0x34, 0x07, 0xb9, 0xe6, 0x68, 0x46, 0x7d, 0x5c, 0x5a, 0x7f, 0x03, - 0x00, 0x00, 0xff, 0xff, 0xf0, 0xfd, 0xb4, 0x66, 0x2c, 0x07, 0x00, 0x00, + // 653 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x51, 0x4f, 0xd3, 0x50, + 0x14, 0xc7, 0x69, 0xc7, 0x18, 0x5c, 0x22, 0x59, 0xae, 0x24, 0x36, 0xa8, 0x89, 0x34, 0x41, 0x11, + 0xb5, 0xcb, 0xd8, 0x83, 0x89, 0x1a, 0xc9, 0x56, 0x1a, 0x56, 0x31, 0x64, 0xb9, 0x1b, 0x3c, 0x18, + 0x12, 0x52, 0xda, 0xe3, 0xb8, 0x91, 0xf5, 0xd6, 0x7b, 0x2f, 0x98, 0x3d, 0xfb, 0x15, 0x4c, 0x7c, + 0xf2, 0xc5, 0xf8, 0xe4, 0x47, 0xf1, 0xc1, 0xcf, 0x64, 0x7a, 0x6f, 0x3b, 0xd8, 0x12, 0xa0, 0x4e, + 0x1f, 0xd7, 0xf3, 0xff, 0x9d, 0xfe, 0x7b, 0xff, 0xf7, 0x9c, 0xa1, 0x7a, 0x28, 0x1a, 0x35, 0x71, + 0x12, 0x70, 0x1a, 0xf7, 0x6b, 0x21, 0x3b, 0x3d, 0x0d, 0x8e, 0x19, 0x0f, 0x24, 0x65, 0x71, 0xed, + 0xbc, 0x7e, 0x0c, 0x32, 0xa8, 0xd7, 0x38, 0x08, 0x76, 0xc6, 0x43, 0x10, 0x4e, 0xc2, 0x99, 0x64, + 0x78, 0x35, 0x14, 0x0d, 0x27, 0x43, 0x9c, 0x31, 0xc4, 0xc9, 0x90, 0x95, 0xc7, 0x69, 0x57, 0x1a, + 0x41, 0x2c, 0xa9, 0x1c, 0xd6, 0xce, 0x04, 0xf0, 0xab, 0xba, 0xad, 0x3c, 0x55, 0x06, 0x24, 0xe3, + 0x41, 0x1f, 0x6a, 0x09, 0x67, 0xe7, 0x34, 0xba, 0x46, 0x7d, 0x3f, 0x55, 0xcb, 0x61, 0x02, 0x62, + 0x24, 0x51, 0xbf, 0x74, 0xd9, 0xfe, 0x3c, 0x8b, 0xca, 0xdd, 0x93, 0x80, 0x03, 0x7e, 0x81, 0x4c, + 0x1a, 0x59, 0xc6, 0x03, 0x63, 0x7d, 0x71, 0x73, 0xc3, 0xb9, 0xd1, 0xb1, 0xa3, 0x28, 0x3f, 0x22, + 0x26, 0x8d, 0x70, 0x1b, 0x2d, 0xe6, 0xef, 0x3d, 0xa2, 0x91, 0x65, 0xaa, 0x26, 0x8f, 0x74, 0x13, + 0x6d, 0xd4, 0xc9, 0x8d, 0x8e, 0x78, 0x02, 0xef, 0x81, 0x43, 0x1c, 0x02, 0x41, 0x39, 0xeb, 0x47, + 0x78, 0x1f, 0x2d, 0x26, 0xc0, 0x07, 0x54, 0x08, 0xca, 0x62, 0x61, 0x95, 0x54, 0xa7, 0x46, 0x51, + 0x3b, 0x9d, 0x0b, 0x94, 0x5c, 0xee, 0x83, 0xb7, 0x50, 0xa5, 0xcf, 0x83, 0x58, 0x02, 0x58, 0xb3, + 0xaa, 0xe5, 0xda, 0xf5, 0xe6, 0x76, 0xb4, 0x98, 0xe4, 0x14, 0x7e, 0x8e, 0xca, 0xec, 0x53, 0x0c, + 0xdc, 0x2a, 0x2b, 0x7c, 0x55, 0xe1, 0x79, 0x5e, 0x4e, 0x9a, 0xd7, 0x88, 0xdd, 0x17, 0xc0, 0xfd, + 0x88, 0x68, 0x3d, 0x7e, 0x89, 0x2a, 0x21, 0x87, 0x40, 0x32, 0x6e, 0xcd, 0x15, 0x45, 0x73, 0x02, + 0x6f, 0xa2, 0x72, 0x28, 0xe9, 0x00, 0xac, 0x8a, 0x42, 0xef, 0x29, 0x54, 0xc7, 0x97, 0x23, 0x3d, + 0x3a, 0x00, 0x21, 0x83, 0x41, 0x42, 0xb4, 0x34, 0x65, 0x06, 0x8a, 0x99, 0x2f, 0xc2, 0x28, 0xa9, + 0xdd, 0x47, 0xd5, 0xc9, 0xf3, 0xc3, 0xdd, 0xf1, 0x24, 0xf4, 0xc5, 0xa8, 0xdf, 0x94, 0xa9, 0x0e, + 0xf2, 0xaa, 0x1c, 0xec, 0x2f, 0x06, 0xba, 0x45, 0x20, 0x04, 0x7a, 0x0e, 0x91, 0xbe, 0x76, 0xaf, + 0x51, 0x39, 0x0d, 0x16, 0xb2, 0x17, 0xac, 0x17, 0x8d, 0x9a, 0x68, 0x0c, 0xbb, 0xa8, 0x2c, 0x64, + 0x20, 0x41, 0x5d, 0xba, 0xa5, 0xcd, 0x67, 0x45, 0xf9, 0x6e, 0x0a, 0x11, 0xcd, 0xda, 0xbf, 0x0d, + 0x34, 0xaf, 0x9e, 0xee, 0xc2, 0xf0, 0x22, 0x6a, 0xf3, 0x2f, 0xa3, 0x9e, 0x98, 0x82, 0xd2, 0xf4, + 0x53, 0xf0, 0xaf, 0xd7, 0xd5, 0x7e, 0x88, 0x2a, 0xd9, 0x7c, 0xe2, 0xbb, 0x68, 0x81, 0x25, 0xc1, + 0xc7, 0xb3, 0xd1, 0x64, 0x2e, 0x90, 0x79, 0xfd, 0xc0, 0x8f, 0xec, 0xaf, 0x06, 0x5a, 0xd2, 0xc7, + 0x99, 0xfb, 0xc0, 0xaf, 0xa6, 0xdb, 0x03, 0xed, 0x19, 0xb5, 0x09, 0xb6, 0x50, 0xe9, 0x03, 0x0c, + 0xb3, 0xa3, 0x7b, 0x52, 0x14, 0xdf, 0x85, 0x61, 0x7b, 0x86, 0xa4, 0x64, 0x6b, 0x0e, 0xcd, 0x8a, + 0x04, 0x42, 0xfb, 0x87, 0x81, 0x90, 0xaa, 0xa9, 0x6f, 0xbb, 0x7c, 0x22, 0xc6, 0x54, 0x03, 0x3c, + 0xb1, 0x58, 0xcc, 0xff, 0xb3, 0x58, 0x36, 0x78, 0xe6, 0x52, 0x5d, 0x27, 0x7c, 0x07, 0xdd, 0xee, + 0xb6, 0x9b, 0xc4, 0x3b, 0xea, 0xf6, 0x9a, 0x3d, 0xef, 0xc8, 0xdf, 0x3b, 0x68, 0xbe, 0xf5, 0xb7, + 0xab, 0x33, 0x93, 0x85, 0x8e, 0xb7, 0xb7, 0xed, 0xef, 0xed, 0x54, 0x0d, 0x6c, 0xa1, 0xe5, 0xcb, + 0x85, 0xa6, 0xeb, 0x7a, 0x9d, 0x9e, 0xb7, 0x5d, 0x35, 0x27, 0x2b, 0xc4, 0x7b, 0xe3, 0xb9, 0x69, + 0xa5, 0xd4, 0xfa, 0x66, 0xa0, 0xb5, 0x90, 0x0d, 0x6e, 0xf6, 0xde, 0x5a, 0xca, 0x07, 0x52, 0x74, + 0xd2, 0x6d, 0xdf, 0x31, 0xde, 0x2d, 0x8f, 0x09, 0x33, 0xdd, 0x77, 0xb3, 0xe4, 0x76, 0xdd, 0x9f, + 0xe6, 0xaa, 0x2b, 0x1a, 0xea, 0x7b, 0xd3, 0x8e, 0xee, 0x58, 0xc7, 0x83, 0x7a, 0x2b, 0x55, 0xfe, + 0x52, 0x9a, 0xc3, 0x4c, 0x73, 0x38, 0xa6, 0x39, 0xcc, 0x34, 0xc7, 0x73, 0xea, 0xaf, 0xa5, 0xf1, + 0x27, 0x00, 0x00, 0xff, 0xff, 0x58, 0xad, 0x0d, 0x8a, 0x2a, 0x07, 0x00, 0x00, } diff --git a/cs3/sharing/link/v1beta1/link_api.pb.go b/cs3/sharing/link/v1beta1/link_api.pb.go index 39fc241..91077a7 100644 --- a/cs3/sharing/link/v1beta1/link_api.pb.go +++ b/cs3/sharing/link/v1beta1/link_api.pb.go @@ -67,24 +67,24 @@ func (UpdatePublicShareRequest_Update_Type) EnumDescriptor() ([]byte, []int) { type ListPublicSharesRequest_Filter_Type int32 const ( - ListPublicSharesRequest_Filter_TYPE_INVALID ListPublicSharesRequest_Filter_Type = 0 - ListPublicSharesRequest_Filter_TYPE_RESOURCE_ID ListPublicSharesRequest_Filter_Type = 1 - ListPublicSharesRequest_Filter_TYPE_OWNER ListPublicSharesRequest_Filter_Type = 2 - ListPublicSharesRequest_Filter_TYPE_CREATOR ListPublicSharesRequest_Filter_Type = 3 + ListPublicSharesRequest_Filter_TYPE_INVALID ListPublicSharesRequest_Filter_Type = 0 + ListPublicSharesRequest_Filter_TYPE_REFERENCE ListPublicSharesRequest_Filter_Type = 1 + ListPublicSharesRequest_Filter_TYPE_OWNER ListPublicSharesRequest_Filter_Type = 2 + ListPublicSharesRequest_Filter_TYPE_CREATOR ListPublicSharesRequest_Filter_Type = 3 ) var ListPublicSharesRequest_Filter_Type_name = map[int32]string{ 0: "TYPE_INVALID", - 1: "TYPE_RESOURCE_ID", + 1: "TYPE_REFERENCE", 2: "TYPE_OWNER", 3: "TYPE_CREATOR", } var ListPublicSharesRequest_Filter_Type_value = map[string]int32{ - "TYPE_INVALID": 0, - "TYPE_RESOURCE_ID": 1, - "TYPE_OWNER": 2, - "TYPE_CREATOR": 3, + "TYPE_INVALID": 0, + "TYPE_REFERENCE": 1, + "TYPE_OWNER": 2, + "TYPE_CREATOR": 3, } func (x ListPublicSharesRequest_Filter_Type) String() string { @@ -511,7 +511,7 @@ type isListPublicSharesRequest_Filter_Term interface { } type ListPublicSharesRequest_Filter_ResourceId struct { - ResourceId *v1beta11.ResourceId `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3,oneof"` + ResourceId *v1beta11.Reference `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3,oneof"` } type ListPublicSharesRequest_Filter_Owner struct { @@ -535,7 +535,7 @@ func (m *ListPublicSharesRequest_Filter) GetTerm() isListPublicSharesRequest_Fil return nil } -func (m *ListPublicSharesRequest_Filter) GetResourceId() *v1beta11.ResourceId { +func (m *ListPublicSharesRequest_Filter) GetResourceId() *v1beta11.Reference { if x, ok := m.GetTerm().(*ListPublicSharesRequest_Filter_ResourceId); ok { return x.ResourceId } @@ -1017,73 +1017,73 @@ func init() { } var fileDescriptor_fd835bb71eb73d1e = []byte{ - // 1043 bytes of a gzipped FileDescriptorProto + // 1050 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xdd, 0x6e, 0x1b, 0x45, - 0x14, 0xee, 0xae, 0x7f, 0x42, 0x4e, 0x9c, 0xb0, 0x19, 0x0a, 0xdd, 0x58, 0xa9, 0x48, 0x2d, 0xa1, - 0x1a, 0x84, 0xd6, 0xd8, 0x16, 0x3f, 0x15, 0x2a, 0xc2, 0x76, 0x4c, 0xbb, 0xc2, 0xb5, 0xdd, 0x59, - 0xb7, 0xa5, 0x10, 0xc9, 0xda, 0xac, 0xc7, 0xf1, 0x2a, 0xf6, 0xee, 0x76, 0x66, 0x9d, 0xc8, 0x52, - 0x25, 0x6e, 0xe1, 0x8a, 0x57, 0x40, 0x88, 0x2b, 0x6e, 0xb9, 0x42, 0xf0, 0x04, 0xdc, 0x23, 0xf1, - 0x0a, 0xbc, 0x03, 0x42, 0x68, 0x67, 0xc7, 0x8e, 0x13, 0x7b, 0x8d, 0xdd, 0x22, 0x68, 0xee, 0xbc, - 0x73, 0xce, 0xf7, 0xcd, 0x77, 0x7e, 0xe6, 0xcc, 0x18, 0x6e, 0x5a, 0xac, 0x98, 0x63, 0x3d, 0x93, - 0xda, 0xce, 0x51, 0xae, 0x6f, 0x3b, 0xc7, 0xb9, 0x93, 0xfc, 0x21, 0xf1, 0xcd, 0x3c, 0xff, 0x68, - 0x9b, 0x9e, 0xad, 0x79, 0xd4, 0xf5, 0x5d, 0xa4, 0x5a, 0xac, 0xa8, 0x09, 0x47, 0x2d, 0xb0, 0x69, - 0xc2, 0x31, 0xfd, 0x66, 0x40, 0x61, 0x77, 0x88, 0xe3, 0xdb, 0xfe, 0x28, 0x37, 0x64, 0x84, 0x4e, - 0x38, 0x28, 0x61, 0xee, 0x90, 0x5a, 0x84, 0x85, 0x24, 0xe9, 0xdd, 0xc0, 0x95, 0x7a, 0xd6, 0xc4, - 0x81, 0xf9, 0xa6, 0x3f, 0x1c, 0x5b, 0xb3, 0x91, 0x5a, 0x2e, 0xf2, 0xbc, 0xcd, 0x3d, 0x7d, 0x97, - 0x9a, 0x47, 0x24, 0xe7, 0x51, 0xf7, 0xc4, 0xee, 0x2c, 0xd8, 0xf5, 0x7a, 0xe0, 0xed, 0x8f, 0x3c, - 0xc2, 0x26, 0x2e, 0xfc, 0x2b, 0x34, 0x67, 0x7e, 0x93, 0x40, 0xad, 0x50, 0x62, 0xfa, 0xa4, 0x39, - 0x3c, 0xec, 0xdb, 0x96, 0xd1, 0x33, 0x29, 0xc1, 0xe4, 0xc9, 0x90, 0x30, 0x1f, 0xe5, 0x21, 0xe9, - 0x7a, 0xe6, 0x93, 0x21, 0x51, 0xa5, 0x3d, 0x29, 0xbb, 0x51, 0xd8, 0xd1, 0x82, 0x3c, 0x84, 0x70, - 0x41, 0xa6, 0x35, 0xb8, 0x03, 0x16, 0x8e, 0xa8, 0x01, 0x9b, 0x63, 0x05, 0x6d, 0xdb, 0xe9, 0xba, - 0xaa, 0xcc, 0x91, 0x6f, 0x71, 0xa4, 0x10, 0xad, 0x8d, 0x45, 0x4f, 0x48, 0xb0, 0x80, 0xe8, 0x4e, - 0xd7, 0xc5, 0x29, 0x3a, 0xf5, 0x85, 0xde, 0x85, 0xc4, 0x11, 0x35, 0x1d, 0x5f, 0x8d, 0x71, 0xa2, - 0xd7, 0xb5, 0xa8, 0x52, 0x68, 0x77, 0x02, 0x37, 0x1c, 0x7a, 0x67, 0x7e, 0x91, 0x60, 0x67, 0x4e, - 0x5c, 0xcc, 0x73, 0x1d, 0x46, 0x50, 0x0e, 0x92, 0x61, 0xf2, 0x45, 0x60, 0xd7, 0x38, 0x2b, 0xf5, - 0xac, 0x09, 0x99, 0xc1, 0xcd, 0x58, 0xb8, 0x4d, 0x65, 0x42, 0x5e, 0x36, 0x13, 0x1f, 0x42, 0x22, - 0x90, 0x49, 0x84, 0xf0, 0x37, 0xa2, 0x85, 0x4f, 0x2b, 0x0c, 0x31, 0x99, 0xaf, 0xe3, 0xa0, 0x3e, - 0xf0, 0x3a, 0xff, 0x5a, 0x59, 0x3e, 0x86, 0x18, 0x25, 0x5d, 0x21, 0x5e, 0x5b, 0x4e, 0x0a, 0xe9, - 0x12, 0x4a, 0x1c, 0x8b, 0xe0, 0x00, 0x8a, 0xee, 0x43, 0x72, 0xc8, 0x05, 0x89, 0x78, 0x6e, 0x45, - 0x93, 0x44, 0x09, 0x17, 0x06, 0x2c, 0x88, 0xd2, 0xdf, 0xcb, 0x90, 0x0c, 0x97, 0x10, 0x86, 0x78, - 0xa0, 0x9f, 0x73, 0x6f, 0x15, 0x3e, 0x7a, 0x66, 0x6e, 0xad, 0x35, 0xf2, 0x08, 0xe6, 0x5c, 0x67, - 0x9d, 0x13, 0x5f, 0xa5, 0x73, 0xd0, 0x0d, 0x48, 0x75, 0x6c, 0xe6, 0xf5, 0xcd, 0x51, 0xdb, 0x31, - 0x07, 0x44, 0x4d, 0xec, 0x49, 0xd9, 0x75, 0xbc, 0x21, 0xd6, 0xea, 0xe6, 0x80, 0x64, 0xfa, 0x10, - 0x0f, 0xf6, 0x41, 0x0a, 0xa4, 0x5a, 0x8f, 0x9b, 0xd5, 0xb6, 0x5e, 0x7f, 0x58, 0xaa, 0xe9, 0xfb, - 0xca, 0x15, 0x74, 0x15, 0x14, 0xbe, 0xd2, 0xac, 0xe2, 0x7b, 0xba, 0x61, 0xe8, 0x8d, 0xba, 0xa1, - 0x48, 0x68, 0x1b, 0x36, 0xc3, 0xd5, 0x92, 0x61, 0x3c, 0x6a, 0xe0, 0x7d, 0x45, 0x46, 0xaf, 0xc0, - 0xcb, 0x7c, 0xa9, 0xfa, 0x59, 0x53, 0xc7, 0xa5, 0x96, 0xde, 0xa8, 0x2b, 0xb1, 0x09, 0x7a, 0x5f, - 0x37, 0x9a, 0xb5, 0xd2, 0xe3, 0x7a, 0xe9, 0x5e, 0x55, 0x89, 0xf3, 0x56, 0x9e, 0x13, 0xf6, 0x65, - 0x69, 0xe5, 0x1f, 0xe3, 0x70, 0xad, 0x66, 0x33, 0x7f, 0xca, 0xc4, 0x9e, 0xa3, 0x93, 0x31, 0xac, - 0x75, 0xed, 0xbe, 0x4f, 0x28, 0x53, 0xe5, 0xbd, 0x58, 0x76, 0xa3, 0xf0, 0x41, 0xb4, 0x9a, 0x88, - 0x6d, 0xb5, 0x4f, 0x38, 0x01, 0x1e, 0x13, 0x21, 0x04, 0x71, 0x66, 0x1f, 0x39, 0x3c, 0xbc, 0x97, - 0x30, 0xff, 0x9d, 0xfe, 0x53, 0x86, 0x64, 0xe8, 0x87, 0xee, 0x8b, 0xe6, 0x94, 0x79, 0x73, 0xde, - 0x7e, 0xd6, 0xfd, 0xa6, 0x7b, 0xf3, 0x53, 0xd8, 0x38, 0x1b, 0x93, 0x1d, 0x91, 0xd7, 0xec, 0x92, - 0x43, 0xb2, 0x73, 0xf7, 0x0a, 0x86, 0xc9, 0x90, 0xec, 0xa0, 0x5b, 0x90, 0x70, 0x4f, 0x1d, 0x42, - 0x45, 0xa3, 0xdf, 0xe0, 0x34, 0xe3, 0x3b, 0x49, 0x0b, 0xee, 0xa4, 0xb3, 0xe3, 0xc3, 0x08, 0xe5, - 0xf8, 0x10, 0x81, 0x6e, 0xc3, 0x9a, 0x15, 0x4c, 0x49, 0x97, 0xf2, 0x3e, 0x5f, 0x12, 0x3c, 0xc6, - 0x64, 0x9a, 0xff, 0x78, 0x10, 0x70, 0xd5, 0x68, 0x3c, 0xc0, 0x95, 0x6a, 0x5b, 0xdf, 0x57, 0x24, - 0xb4, 0x05, 0xc0, 0x57, 0x1b, 0x8f, 0xea, 0x55, 0xac, 0xc8, 0x13, 0x5c, 0x05, 0x57, 0x4b, 0xad, - 0x06, 0x56, 0x62, 0xe5, 0x24, 0xc4, 0x7d, 0x42, 0x07, 0x99, 0x9f, 0x25, 0x50, 0x67, 0xd3, 0xf9, - 0xff, 0xf4, 0x7c, 0x6c, 0xe5, 0x9e, 0xff, 0x46, 0x02, 0x15, 0x93, 0x81, 0x7b, 0xf2, 0xa2, 0x8c, - 0xef, 0xcc, 0x97, 0xb0, 0x33, 0x47, 0xd0, 0x7f, 0x97, 0xcf, 0xcc, 0xb7, 0x12, 0xbc, 0x7a, 0x87, - 0xf8, 0x2f, 0xca, 0x75, 0x36, 0xe7, 0xc8, 0x67, 0x7e, 0x92, 0xe0, 0xb5, 0x8b, 0x12, 0x2f, 0xcb, - 0x94, 0xfd, 0x5d, 0x82, 0xdd, 0xf3, 0xda, 0xcb, 0xa3, 0x96, 0x7b, 0x4c, 0x9c, 0xe7, 0xc8, 0xf2, - 0x55, 0x48, 0xf8, 0x01, 0x05, 0x0f, 0x61, 0x1d, 0x87, 0x1f, 0xe8, 0x0b, 0xd8, 0x32, 0x87, 0x7e, - 0x2f, 0x18, 0x10, 0x96, 0xe9, 0xdb, 0xae, 0x23, 0xf4, 0x16, 0x97, 0xd2, 0x5b, 0x3a, 0x07, 0xc5, - 0x17, 0xa8, 0x26, 0x65, 0x89, 0x4f, 0x95, 0xe5, 0x0f, 0x09, 0xae, 0x47, 0x84, 0x76, 0x49, 0xaa, - 0x83, 0x6e, 0xc2, 0xa6, 0x67, 0x32, 0x76, 0xea, 0xd2, 0x4e, 0xbb, 0x67, 0xb2, 0x1e, 0x8f, 0x6f, - 0xbd, 0x2c, 0xab, 0x12, 0x4e, 0x8d, 0x0d, 0x77, 0x4d, 0xd6, 0x2b, 0xfc, 0x95, 0x80, 0xb5, 0x9a, - 0xed, 0x1c, 0x97, 0x9a, 0x3a, 0x7a, 0x0a, 0xdb, 0x33, 0x2f, 0x58, 0x54, 0x88, 0xde, 0x37, 0xea, - 0x19, 0x9f, 0x2e, 0xae, 0x84, 0x11, 0x39, 0x7d, 0x0a, 0xdb, 0x33, 0x03, 0x63, 0xd1, 0xee, 0x51, - 0xe3, 0x6e, 0xd1, 0xee, 0xd1, 0x13, 0x89, 0xc1, 0xd6, 0xf9, 0x92, 0xa3, 0xdc, 0x82, 0xe7, 0xdb, - 0xbc, 0xb1, 0x92, 0x7e, 0x67, 0x79, 0x80, 0xd8, 0xf4, 0xab, 0x99, 0x11, 0x25, 0x1a, 0x0d, 0xbd, - 0xb7, 0x2c, 0xd7, 0xf9, 0x43, 0x97, 0x7e, 0x7f, 0x65, 0x9c, 0x90, 0x32, 0x02, 0xe5, 0xe2, 0xed, - 0x87, 0xf2, 0x2b, 0x3f, 0x3c, 0xd2, 0x85, 0x55, 0x20, 0x67, 0x85, 0x9f, 0x79, 0x6d, 0x2e, 0x2a, - 0x7c, 0xd4, 0x8b, 0x7c, 0x51, 0xe1, 0x23, 0x9f, 0xb3, 0xe5, 0x53, 0xd8, 0xb5, 0xdc, 0x41, 0x24, - 0xb2, 0x9c, 0xe2, 0xa7, 0xc3, 0xb3, 0x9b, 0xc1, 0xbf, 0xd7, 0xa6, 0xf4, 0xf9, 0x46, 0x60, 0x15, - 0xc6, 0xef, 0xe4, 0x58, 0xc5, 0xa8, 0xfd, 0x20, 0xab, 0x15, 0x56, 0xd4, 0x0c, 0x81, 0x0e, 0xfc, - 0xb5, 0x87, 0xf9, 0x72, 0xe0, 0xf0, 0x2b, 0x37, 0x1d, 0x08, 0xd3, 0x41, 0x60, 0x3a, 0x10, 0xa6, - 0xc3, 0x24, 0xff, 0x3f, 0x5c, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xd0, 0x0b, 0x21, 0x14, - 0x10, 0x00, 0x00, + 0x14, 0xee, 0xae, 0x7f, 0x42, 0x4e, 0x7e, 0xd8, 0x0c, 0x85, 0x6e, 0xac, 0x54, 0xa4, 0x96, 0x50, + 0x02, 0x42, 0x6b, 0x62, 0x8b, 0x9f, 0x0a, 0x15, 0x61, 0x3b, 0xdb, 0x66, 0x91, 0x6b, 0xbb, 0xb3, + 0xa6, 0xa5, 0x10, 0xc9, 0xda, 0xac, 0xc7, 0xf1, 0x2a, 0xf6, 0xee, 0x76, 0x66, 0x9d, 0xc8, 0x52, + 0x25, 0x6e, 0xe1, 0x8a, 0x57, 0x40, 0x88, 0x2b, 0xae, 0xb8, 0x45, 0xf0, 0x04, 0xdc, 0x23, 0xf1, + 0x0a, 0x3c, 0x02, 0x37, 0x08, 0xed, 0xec, 0xd8, 0x71, 0x62, 0xaf, 0xb1, 0x5b, 0x04, 0xcd, 0x9d, + 0x77, 0xce, 0xf9, 0xbe, 0xf9, 0xce, 0xcf, 0x9c, 0x19, 0xc3, 0x8e, 0xcd, 0x0a, 0x39, 0xd6, 0xb1, + 0xa8, 0xe3, 0x1e, 0xe7, 0xba, 0x8e, 0x7b, 0x92, 0x3b, 0xdd, 0x3b, 0x22, 0x81, 0xb5, 0xc7, 0x3f, + 0x9a, 0x96, 0xef, 0x68, 0x3e, 0xf5, 0x02, 0x0f, 0xa9, 0x36, 0x2b, 0x68, 0xc2, 0x51, 0x0b, 0x6d, + 0x9a, 0x70, 0xcc, 0xbc, 0x19, 0x52, 0x38, 0x2d, 0xe2, 0x06, 0x4e, 0x30, 0xc8, 0xf5, 0x19, 0xa1, + 0x23, 0x0e, 0x4a, 0x98, 0xd7, 0xa7, 0x36, 0x61, 0x11, 0x49, 0x66, 0x2b, 0x74, 0xa5, 0xbe, 0x3d, + 0x72, 0x60, 0x81, 0x15, 0xf4, 0x87, 0xd6, 0xdd, 0x58, 0x2d, 0x97, 0x79, 0xde, 0xe6, 0x9e, 0x81, + 0x47, 0xad, 0x63, 0x92, 0xf3, 0xa9, 0x77, 0xea, 0xb4, 0x66, 0xec, 0x7a, 0x33, 0xf4, 0x0e, 0x06, + 0x3e, 0x61, 0x23, 0x17, 0xfe, 0x15, 0x99, 0xb3, 0xbf, 0x49, 0xa0, 0x96, 0x29, 0xb1, 0x02, 0x52, + 0xef, 0x1f, 0x75, 0x1d, 0xdb, 0xec, 0x58, 0x94, 0x60, 0xf2, 0xa4, 0x4f, 0x58, 0x80, 0xf6, 0x20, + 0xed, 0xf9, 0xd6, 0x93, 0x3e, 0x51, 0xa5, 0x6d, 0x69, 0x77, 0x25, 0xbf, 0xa9, 0x85, 0x79, 0x88, + 0xe0, 0x82, 0x4c, 0xab, 0x71, 0x07, 0x2c, 0x1c, 0x51, 0x0d, 0xd6, 0x86, 0x0a, 0x9a, 0x8e, 0xdb, + 0xf6, 0x54, 0x99, 0x23, 0xdf, 0xe2, 0x48, 0x21, 0x5a, 0x1b, 0x8a, 0x1e, 0x91, 0x60, 0x01, 0x31, + 0xdc, 0xb6, 0x87, 0x57, 0xe9, 0xd8, 0x17, 0x7a, 0x17, 0x52, 0xc7, 0xd4, 0x72, 0x03, 0x35, 0xc1, + 0x89, 0x5e, 0xd7, 0xe2, 0x4a, 0xa1, 0xdd, 0x0b, 0xdd, 0x70, 0xe4, 0x9d, 0xfd, 0x45, 0x82, 0xcd, + 0x29, 0x71, 0x31, 0xdf, 0x73, 0x19, 0x41, 0x39, 0x48, 0x47, 0xc9, 0x17, 0x81, 0xdd, 0xe0, 0xac, + 0xd4, 0xb7, 0x47, 0x64, 0x26, 0x37, 0x63, 0xe1, 0x36, 0x96, 0x09, 0x79, 0xde, 0x4c, 0x7c, 0x08, + 0xa9, 0x50, 0x26, 0x11, 0xc2, 0xdf, 0x88, 0x17, 0x3e, 0xae, 0x30, 0xc2, 0x64, 0xbf, 0x4e, 0x82, + 0xfa, 0xa9, 0xdf, 0xfa, 0xd7, 0xca, 0xf2, 0x31, 0x24, 0x28, 0x69, 0x0b, 0xf1, 0xda, 0x7c, 0x52, + 0x48, 0x9b, 0x50, 0xe2, 0xda, 0x04, 0x87, 0x50, 0xf4, 0x00, 0xd2, 0x7d, 0x2e, 0x48, 0xc4, 0x73, + 0x3b, 0x9e, 0x24, 0x4e, 0xb8, 0x30, 0x60, 0x41, 0x94, 0xf9, 0x5e, 0x86, 0x74, 0xb4, 0x84, 0x30, + 0x24, 0x43, 0xfd, 0x9c, 0x7b, 0x3d, 0xff, 0xd1, 0x33, 0x73, 0x6b, 0x8d, 0x81, 0x4f, 0x30, 0xe7, + 0x3a, 0xef, 0x9c, 0xe4, 0x22, 0x9d, 0x83, 0x6e, 0xc1, 0x6a, 0xcb, 0x61, 0x7e, 0xd7, 0x1a, 0x34, + 0x5d, 0xab, 0x47, 0xd4, 0xd4, 0xb6, 0xb4, 0xbb, 0x8c, 0x57, 0xc4, 0x5a, 0xd5, 0xea, 0x91, 0x6c, + 0x17, 0x92, 0xe1, 0x3e, 0x48, 0x81, 0xd5, 0xc6, 0xe3, 0xba, 0xde, 0x34, 0xaa, 0x0f, 0x8b, 0x15, + 0x63, 0x5f, 0xb9, 0x86, 0xae, 0x83, 0xc2, 0x57, 0xea, 0x3a, 0xbe, 0x6f, 0x98, 0xa6, 0x51, 0xab, + 0x9a, 0x8a, 0x84, 0x36, 0x60, 0x2d, 0x5a, 0x2d, 0x9a, 0xe6, 0xa3, 0x1a, 0xde, 0x57, 0x64, 0xf4, + 0x0a, 0xbc, 0xcc, 0x97, 0xf4, 0xcf, 0xea, 0x06, 0x2e, 0x36, 0x8c, 0x5a, 0x55, 0x49, 0x8c, 0xd0, + 0xfb, 0x86, 0x59, 0xaf, 0x14, 0x1f, 0x57, 0x8b, 0xf7, 0x75, 0x25, 0xc9, 0x5b, 0x79, 0x4a, 0xd8, + 0x57, 0xa5, 0x95, 0x7f, 0x4c, 0xc2, 0x8d, 0x8a, 0xc3, 0x82, 0x31, 0x13, 0x7b, 0x8e, 0x4e, 0xc6, + 0xb0, 0xd4, 0x76, 0xba, 0x01, 0xa1, 0x4c, 0x95, 0xb7, 0x13, 0xbb, 0x2b, 0xf9, 0x0f, 0xe2, 0xd5, + 0xc4, 0x6c, 0xab, 0xdd, 0xe5, 0x04, 0x78, 0x48, 0x84, 0x10, 0x24, 0x99, 0x73, 0xec, 0xf2, 0xf0, + 0x5e, 0xc2, 0xfc, 0x77, 0xe6, 0x4f, 0x19, 0xd2, 0x91, 0x1f, 0x7a, 0x20, 0x9a, 0x53, 0xe6, 0xcd, + 0x79, 0xe7, 0x59, 0xf7, 0x1b, 0xef, 0xcd, 0x4f, 0x60, 0xe5, 0x7c, 0x4c, 0xb6, 0x44, 0x5e, 0x77, + 0xfe, 0x69, 0x48, 0x8a, 0x03, 0x79, 0x70, 0x0d, 0xc3, 0x68, 0x46, 0xb6, 0xd0, 0x6d, 0x48, 0x79, + 0x67, 0x2e, 0xa1, 0xa2, 0xcf, 0x6f, 0x71, 0x96, 0xe1, 0x95, 0xa4, 0x85, 0x57, 0xd2, 0xf9, 0xe9, + 0x61, 0x84, 0x1a, 0xad, 0x83, 0x6b, 0x38, 0x42, 0xa0, 0x3b, 0xb0, 0x64, 0x87, 0x43, 0xd2, 0xa3, + 0xbc, 0xcd, 0xe7, 0x04, 0x0f, 0x31, 0xd9, 0x6a, 0xec, 0x39, 0x40, 0xb0, 0xce, 0x57, 0xb0, 0x7e, + 0x57, 0xc7, 0x7a, 0xb5, 0xac, 0x2b, 0x12, 0x5a, 0x07, 0xe0, 0x6b, 0xb5, 0x47, 0x55, 0x1d, 0x2b, + 0xf2, 0x08, 0x55, 0xc6, 0x7a, 0xb1, 0x51, 0xc3, 0x4a, 0xa2, 0x94, 0x86, 0x64, 0x40, 0x68, 0x2f, + 0xfb, 0xb3, 0x04, 0xea, 0x64, 0x2e, 0xff, 0x9f, 0x86, 0x4f, 0x2c, 0xdc, 0xf0, 0xdf, 0x48, 0xa0, + 0x62, 0xd2, 0xf3, 0x4e, 0x5f, 0x94, 0xd9, 0x9d, 0xfd, 0x12, 0x36, 0xa7, 0x08, 0xfa, 0xef, 0xf2, + 0x99, 0xfd, 0x56, 0x82, 0x57, 0xef, 0x91, 0xe0, 0x45, 0xb9, 0xcb, 0xa6, 0x9c, 0xf7, 0xec, 0x4f, + 0x12, 0xbc, 0x76, 0x59, 0xe2, 0x55, 0x19, 0xb1, 0xbf, 0x4b, 0xb0, 0x75, 0x51, 0x7b, 0x69, 0xd0, + 0xf0, 0x4e, 0x88, 0xfb, 0x1c, 0x59, 0xbe, 0x0e, 0xa9, 0x20, 0xa4, 0xe0, 0x21, 0x2c, 0xe3, 0xe8, + 0x03, 0x7d, 0x01, 0xeb, 0x56, 0x3f, 0xe8, 0x84, 0xe3, 0xc1, 0xb6, 0x02, 0xc7, 0x73, 0x85, 0xde, + 0xc2, 0x5c, 0x7a, 0x8b, 0x17, 0xa0, 0xf8, 0x12, 0xd5, 0xa8, 0x2c, 0xc9, 0xb1, 0xb2, 0xfc, 0x21, + 0xc1, 0xcd, 0x98, 0xd0, 0xae, 0x48, 0x75, 0xd0, 0x0e, 0xac, 0xf9, 0x16, 0x63, 0x67, 0x1e, 0x6d, + 0x35, 0x3b, 0x16, 0xeb, 0xf0, 0xf8, 0x96, 0x4b, 0xb2, 0x2a, 0xe1, 0xd5, 0xa1, 0xe1, 0xc0, 0x62, + 0x9d, 0xfc, 0x5f, 0x29, 0x58, 0xaa, 0x38, 0xee, 0x49, 0xb1, 0x6e, 0xa0, 0xa7, 0xb0, 0x31, 0xf1, + 0x7c, 0x45, 0xf9, 0xf8, 0x7d, 0xe3, 0xde, 0xf0, 0x99, 0xc2, 0x42, 0x18, 0x91, 0xd3, 0xa7, 0xb0, + 0x31, 0x31, 0x30, 0x66, 0xed, 0x1e, 0x37, 0xee, 0x66, 0xed, 0x1e, 0x3f, 0x91, 0x18, 0xac, 0x5f, + 0x2c, 0x39, 0xca, 0xcd, 0x78, 0xbb, 0x4d, 0x1b, 0x2b, 0x99, 0x77, 0xe6, 0x07, 0x88, 0x4d, 0xbf, + 0x9a, 0x18, 0x51, 0xa2, 0xd1, 0xd0, 0x7b, 0xf3, 0x72, 0x5d, 0x3c, 0x74, 0x99, 0xf7, 0x17, 0xc6, + 0x09, 0x29, 0x03, 0x50, 0x2e, 0xdf, 0x7e, 0x68, 0x6f, 0xe1, 0x57, 0x47, 0x26, 0xbf, 0x08, 0xe4, + 0xbc, 0xf0, 0x13, 0x4f, 0xcd, 0x59, 0x85, 0x8f, 0x7b, 0x8e, 0xcf, 0x2a, 0x7c, 0xec, 0x5b, 0xb6, + 0x74, 0x06, 0x5b, 0xb6, 0xd7, 0x8b, 0x45, 0x96, 0x56, 0xf9, 0xe9, 0xf0, 0x9d, 0x7a, 0xf8, 0xd7, + 0xb5, 0x2e, 0x7d, 0xbe, 0x12, 0x5a, 0x85, 0xf1, 0x3b, 0x39, 0x51, 0x36, 0x2b, 0x3f, 0xc8, 0x6a, + 0x99, 0x15, 0x34, 0x53, 0xa0, 0x43, 0x7f, 0xed, 0xe1, 0x5e, 0x29, 0x74, 0xf8, 0x95, 0x9b, 0x0e, + 0x85, 0xe9, 0x30, 0x34, 0x1d, 0x0a, 0xd3, 0x51, 0x9a, 0xff, 0x19, 0x2e, 0xfc, 0x1d, 0x00, 0x00, + 0xff, 0xff, 0xf6, 0xa7, 0xa4, 0x58, 0x11, 0x10, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/cs3/sharing/link/v1beta1/resources.pb.go b/cs3/sharing/link/v1beta1/resources.pb.go index 68e55a3..5771184 100644 --- a/cs3/sharing/link/v1beta1/resources.pb.go +++ b/cs3/sharing/link/v1beta1/resources.pb.go @@ -25,7 +25,7 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Public share are relationships between a resource owner // (usually the authenticated user) who grants permissions to a recipient (grantee) -// on a specified resource (resource_id). UserShares represents both user and groups. +// on a specified resource (id only reference). UserShares represents both user and groups. // TODO(labkode): do we need to have resource_type stored on the share? // This is not needed if when getting the shares a stat operation is launched against the // the storage provider. @@ -38,8 +38,8 @@ type PublicShare struct { // to the public share. Token string `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"` // REQUIRED. - // Unique identifier of the shared resource. - ResourceId *v1beta1.ResourceId `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` + // Unique identifier of the shared resource (path must be empty). + ResourceId *v1beta1.Reference `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` // REQUIRED. // Permissions for the grantee to use // the resource. @@ -124,7 +124,7 @@ func (m *PublicShare) GetToken() string { return "" } -func (m *PublicShare) GetResourceId() *v1beta1.ResourceId { +func (m *PublicShare) GetResourceId() *v1beta1.Reference { if m != nil { return m.ResourceId } @@ -576,47 +576,47 @@ func init() { } var fileDescriptor_2f13c61869aaebc4 = []byte{ - // 665 bytes of a gzipped FileDescriptorProto + // 663 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4c, 0x14, 0xad, 0xdd, 0xa6, 0x4d, 0xae, 0xfb, 0x55, 0xfa, 0x86, 0xaa, 0x32, 0x25, 0x48, 0x6d, 0x36, 0x04, 0xa9, 0x38, 0xa4, 0x59, 0x54, 0x08, 0x36, 0xa4, 0x02, 0x12, 0xa9, 0x82, 0xc8, 0x01, 0x16, 0xa8, 0x52, 0x34, 0xb5, 0x2f, 0xed, 0xa8, 0xb1, 0xc7, 0x9d, 0x99, 0xb4, 0x64, 0xc5, 0x03, 0xf0, - 0x16, 0x2c, 0xd9, 0xb1, 0xe0, 0x25, 0x78, 0x2a, 0x34, 0xe3, 0x9f, 0x3a, 0xa8, 0x41, 0x29, 0x62, - 0x97, 0x99, 0x7b, 0xce, 0xb9, 0xd7, 0x3e, 0xe7, 0x3a, 0xd0, 0x0c, 0x64, 0xa7, 0x25, 0xcf, 0xa8, - 0x60, 0xf1, 0x69, 0x6b, 0xcc, 0xe2, 0xf3, 0xd6, 0x65, 0xfb, 0x04, 0x15, 0x6d, 0xb7, 0x04, 0x4a, - 0x3e, 0x11, 0x01, 0x4a, 0x2f, 0x11, 0x5c, 0x71, 0xe2, 0x06, 0xb2, 0xe3, 0x65, 0x48, 0x4f, 0x23, - 0xbd, 0x0c, 0xb9, 0xfd, 0x50, 0x6b, 0xb0, 0x10, 0x63, 0xc5, 0xd4, 0xb4, 0x35, 0x91, 0x28, 0xe6, - 0x89, 0x6c, 0xef, 0x99, 0x76, 0x8a, 0x0b, 0x7a, 0x8a, 0xad, 0x44, 0xf0, 0x4b, 0x16, 0xfe, 0x01, - 0x7d, 0x5f, 0xa3, 0xd5, 0x34, 0x41, 0x59, 0x40, 0xcc, 0x29, 0x2d, 0x37, 0xbe, 0x57, 0xc0, 0x19, - 0x4c, 0x4e, 0xc6, 0x2c, 0x18, 0x9e, 0x51, 0x81, 0xe4, 0x00, 0x6c, 0x16, 0xba, 0xd6, 0x8e, 0xd5, - 0x74, 0xf6, 0x1f, 0x78, 0xf3, 0xc6, 0xf5, 0x4a, 0x94, 0x7e, 0xe8, 0xdb, 0x2c, 0x24, 0x9b, 0x50, - 0x51, 0xfc, 0x1c, 0x63, 0xd7, 0xde, 0xb1, 0x9a, 0x35, 0x3f, 0x3d, 0x90, 0x3e, 0x38, 0xf9, 0x40, - 0x23, 0x16, 0xba, 0xcb, 0x46, 0xb7, 0x99, 0xea, 0xa6, 0x4f, 0xe0, 0xe5, 0x4f, 0x50, 0x68, 0xfb, - 0x19, 0xa1, 0x1f, 0xfa, 0x20, 0x8a, 0xdf, 0xc4, 0x07, 0x27, 0x41, 0x11, 0x31, 0x29, 0x19, 0x8f, - 0xa5, 0xbb, 0x62, 0xa4, 0x1e, 0x2f, 0x34, 0xe2, 0xe0, 0x9a, 0xe7, 0x97, 0x45, 0xc8, 0x01, 0x54, - 0xf8, 0x55, 0x8c, 0xc2, 0xad, 0x18, 0xb5, 0x5d, 0xa3, 0x96, 0xbb, 0xe0, 0x69, 0x17, 0x0a, 0xb9, - 0x77, 0x12, 0x45, 0x3f, 0xf4, 0x53, 0x3c, 0x79, 0x0a, 0x6b, 0x81, 0x40, 0xaa, 0xb8, 0x70, 0x57, - 0x17, 0xa5, 0xe6, 0x0c, 0xb2, 0x0f, 0x95, 0x40, 0xb1, 0x08, 0xdd, 0x35, 0x43, 0xad, 0x1b, 0x6a, - 0x6a, 0x4a, 0x4e, 0x79, 0xcb, 0x22, 0x94, 0x8a, 0x46, 0x89, 0x9f, 0x42, 0x35, 0x27, 0x32, 0x9c, - 0xea, 0x22, 0x1c, 0x03, 0x25, 0x8f, 0x80, 0x24, 0x54, 0xca, 0x2b, 0x2e, 0xc2, 0x91, 0x76, 0x1b, - 0x03, 0x85, 0xa1, 0x5b, 0xdb, 0xb1, 0x9a, 0x55, 0xff, 0xff, 0xbc, 0x32, 0xc8, 0x0b, 0xe4, 0x19, - 0x00, 0x7e, 0x4a, 0x98, 0xa0, 0x8a, 0xf1, 0xd8, 0x85, 0x05, 0xfa, 0x94, 0xf0, 0x64, 0x17, 0xd6, - 0x43, 0x26, 0x93, 0x31, 0x9d, 0x8e, 0x62, 0x1a, 0xa1, 0xeb, 0x98, 0x18, 0x38, 0xd9, 0xdd, 0x6b, - 0x1a, 0x21, 0x79, 0x09, 0x35, 0xc9, 0x4e, 0x63, 0xaa, 0x26, 0x02, 0xdd, 0xf5, 0x72, 0x14, 0x6e, - 0xf2, 0xcf, 0x38, 0x37, 0xcc, 0xf1, 0xfe, 0x35, 0xb5, 0x11, 0xc1, 0xd6, 0xcd, 0xe6, 0x92, 0xe1, - 0x6c, 0x46, 0xd2, 0x18, 0xb7, 0x17, 0x8b, 0xdb, 0xbc, 0x90, 0x34, 0xf6, 0xe0, 0xbf, 0x99, 0xb8, - 0x93, 0x7b, 0x50, 0xe3, 0x09, 0xbd, 0x98, 0x98, 0x48, 0xa7, 0x71, 0xaf, 0xa6, 0x17, 0xfd, 0xb0, - 0x71, 0x01, 0x9b, 0x25, 0xb4, 0x8f, 0x1f, 0x51, 0x60, 0x1c, 0x20, 0x79, 0xf2, 0x17, 0x8b, 0xd5, - 0x5b, 0x32, 0xab, 0xb5, 0x35, 0xb3, 0x5a, 0xbd, 0xa5, 0x6c, 0xb9, 0xba, 0xab, 0xb0, 0x22, 0x13, - 0x0c, 0x1a, 0x5f, 0x2c, 0xb8, 0x5b, 0xe2, 0x3d, 0x9f, 0xa8, 0x33, 0x1d, 0xc3, 0x20, 0x35, 0xa6, - 0x0e, 0xd5, 0xdc, 0x6b, 0xd3, 0x5e, 0x0b, 0x14, 0x37, 0xa4, 0x57, 0xf6, 0xc4, 0xbe, 0x9d, 0x27, - 0xbd, 0xa5, 0x92, 0x2b, 0xc5, 0x34, 0x9f, 0x61, 0x63, 0x16, 0x46, 0xea, 0xe5, 0x1e, 0x66, 0x84, - 0x12, 0x8f, 0xbc, 0x81, 0xcd, 0xe2, 0x30, 0x2a, 0x05, 0xd0, 0x5e, 0x20, 0x80, 0x77, 0x0a, 0xe6, - 0x8b, 0x82, 0xd8, 0xf8, 0x61, 0x41, 0xe5, 0x95, 0xa0, 0xb1, 0xfa, 0xfd, 0x93, 0x61, 0xfd, 0x8b, - 0x4f, 0xc6, 0x76, 0xe9, 0x75, 0x66, 0xde, 0x17, 0x2f, 0x73, 0x76, 0x83, 0x96, 0x6f, 0xb7, 0x41, - 0xdd, 0x29, 0xd4, 0x03, 0x1e, 0xcd, 0x9d, 0xae, 0xbb, 0x91, 0x27, 0x55, 0xea, 0x9d, 0xe5, 0x03, - 0xeb, 0x83, 0xa3, 0xeb, 0x59, 0xf9, 0xab, 0xbd, 0x7c, 0x38, 0x3c, 0xfa, 0x66, 0xbb, 0x87, 0xb2, - 0x63, 0x7c, 0xd2, 0xfc, 0x23, 0xcd, 0x7f, 0xdf, 0xee, 0x6a, 0xc0, 0x4f, 0x53, 0x3a, 0xce, 0x4a, - 0xc7, 0xba, 0x74, 0x9c, 0x95, 0x4e, 0x56, 0xcd, 0x9f, 0x41, 0xe7, 0x57, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x14, 0xce, 0xc7, 0x56, 0xca, 0x06, 0x00, 0x00, + 0x16, 0x2c, 0x59, 0xb1, 0xe1, 0x25, 0x78, 0x2a, 0x34, 0xe3, 0x9f, 0x3a, 0x88, 0x40, 0x8a, 0x58, + 0xce, 0xdc, 0x73, 0xce, 0xbd, 0xf6, 0x39, 0xd7, 0x86, 0x66, 0x20, 0x3b, 0x2d, 0x79, 0x46, 0x05, + 0x8b, 0x4f, 0x5b, 0x63, 0x16, 0x9f, 0xb7, 0x2e, 0xdb, 0x27, 0xa8, 0x68, 0xbb, 0x25, 0x50, 0xf2, + 0x89, 0x08, 0x50, 0x7a, 0x89, 0xe0, 0x8a, 0x13, 0x37, 0x90, 0x1d, 0x2f, 0x43, 0x7a, 0x1a, 0xe9, + 0x65, 0xc8, 0xed, 0xfb, 0x5a, 0x83, 0x85, 0x18, 0x2b, 0xa6, 0xa6, 0xad, 0x89, 0x44, 0x31, 0x4f, + 0x64, 0x7b, 0xcf, 0xb4, 0x53, 0x5c, 0xd0, 0x53, 0x6c, 0x25, 0x82, 0x5f, 0xb2, 0xf0, 0x37, 0xe8, + 0xbb, 0x1a, 0xad, 0xa6, 0x09, 0xca, 0x02, 0x62, 0x4e, 0x69, 0xb9, 0xf1, 0xb5, 0x02, 0xce, 0x60, + 0x72, 0x32, 0x66, 0xc1, 0xf0, 0x8c, 0x0a, 0x24, 0x07, 0x60, 0xb3, 0xd0, 0xb5, 0x76, 0xac, 0xa6, + 0xb3, 0x7f, 0xcf, 0x9b, 0x37, 0xae, 0x57, 0xa2, 0xf4, 0x43, 0xdf, 0x66, 0x21, 0xd9, 0x84, 0x8a, + 0xe2, 0xe7, 0x18, 0xbb, 0xf6, 0x8e, 0xd5, 0xac, 0xf9, 0xe9, 0x81, 0xf4, 0xc0, 0xc9, 0x07, 0x1a, + 0xb1, 0xd0, 0x5d, 0x2e, 0xeb, 0xa6, 0x4f, 0xe0, 0xe5, 0x4f, 0x50, 0x68, 0xfb, 0xf8, 0x1e, 0x05, + 0xc6, 0x01, 0xfa, 0x90, 0x73, 0xfb, 0x21, 0xf1, 0xc1, 0x49, 0x50, 0x44, 0x4c, 0x4a, 0xc6, 0x63, + 0xe9, 0xae, 0x18, 0xa5, 0x87, 0x0b, 0x4d, 0x38, 0xb8, 0xe6, 0xf9, 0x65, 0x11, 0x72, 0x00, 0x15, + 0x7e, 0x15, 0xa3, 0x70, 0x2b, 0x46, 0x6d, 0xd7, 0xa8, 0xe5, 0x26, 0x78, 0xda, 0x84, 0x42, 0xee, + 0x8d, 0x44, 0xd1, 0x0f, 0xfd, 0x14, 0x4f, 0x1e, 0xc3, 0x5a, 0x20, 0x90, 0x2a, 0x2e, 0xdc, 0xd5, + 0x45, 0xa9, 0x39, 0x83, 0xec, 0x43, 0x25, 0x50, 0x2c, 0x42, 0x77, 0xcd, 0x50, 0xeb, 0x86, 0x9a, + 0x7a, 0x92, 0x53, 0x5e, 0xb3, 0x08, 0xa5, 0xa2, 0x51, 0xe2, 0xa7, 0x50, 0xcd, 0x89, 0x0c, 0xa7, + 0xba, 0x08, 0xc7, 0x40, 0xc9, 0x03, 0x20, 0x09, 0x95, 0xf2, 0x8a, 0x8b, 0x70, 0xa4, 0xcd, 0xc6, + 0x40, 0x61, 0xe8, 0xd6, 0x76, 0xac, 0x66, 0xd5, 0xff, 0x3f, 0xaf, 0x0c, 0xf2, 0x02, 0x79, 0x02, + 0x80, 0x1f, 0x12, 0x26, 0xa8, 0x62, 0x3c, 0x76, 0x61, 0x81, 0x3e, 0x25, 0x3c, 0xd9, 0x85, 0xf5, + 0x90, 0xc9, 0x64, 0x4c, 0xa7, 0xa3, 0x98, 0x46, 0xe8, 0x3a, 0x26, 0x05, 0x4e, 0x76, 0xf7, 0x92, + 0x46, 0x48, 0x9e, 0x43, 0x4d, 0xb2, 0xd3, 0x98, 0xaa, 0x89, 0x40, 0x77, 0xdd, 0xe8, 0x37, 0xe7, + 0xfb, 0x67, 0x9c, 0x1b, 0xe6, 0x78, 0xff, 0x9a, 0xda, 0x88, 0x60, 0xeb, 0xd7, 0xe6, 0x92, 0xe1, + 0x6c, 0x46, 0xd2, 0x14, 0xb7, 0xff, 0x94, 0xb6, 0x34, 0x62, 0xf3, 0x42, 0xd2, 0xd8, 0x83, 0xff, + 0x66, 0xd2, 0x4e, 0xee, 0x40, 0x8d, 0x27, 0xf4, 0x62, 0x62, 0x12, 0x9d, 0xa6, 0xbd, 0x9a, 0x5e, + 0xf4, 0xc3, 0xc6, 0x05, 0x6c, 0x96, 0xd0, 0x45, 0x94, 0xc9, 0xa3, 0xbf, 0xd8, 0xab, 0xde, 0x92, + 0xd9, 0xac, 0xad, 0x99, 0xcd, 0xea, 0x2d, 0x65, 0xbb, 0xd5, 0x5d, 0x85, 0x15, 0x99, 0x60, 0xd0, + 0xf8, 0x64, 0xc1, 0xed, 0x12, 0xef, 0xe9, 0x44, 0x9d, 0xe9, 0x18, 0x06, 0xa9, 0x31, 0x75, 0xa8, + 0xe6, 0x5e, 0x9b, 0xf6, 0x5a, 0xa0, 0xb8, 0x21, 0xbd, 0xb2, 0x27, 0xf6, 0xcd, 0x3c, 0xe9, 0x2d, + 0x95, 0x5c, 0x29, 0xa6, 0xf9, 0x08, 0x1b, 0xb3, 0x30, 0x52, 0x2f, 0xf7, 0x30, 0x23, 0x94, 0x78, + 0xe4, 0x15, 0x6c, 0x16, 0x87, 0x51, 0x29, 0x80, 0xf6, 0x02, 0x01, 0xbc, 0x55, 0x30, 0x9f, 0x15, + 0xc4, 0xc6, 0x37, 0x0b, 0x2a, 0x2f, 0x04, 0x8d, 0xd5, 0xcf, 0x9f, 0x0c, 0xeb, 0x5f, 0x7c, 0x32, + 0xb6, 0x4b, 0xaf, 0x33, 0xf3, 0xbe, 0x78, 0x99, 0xb3, 0x1b, 0xb4, 0x7c, 0xb3, 0x0d, 0xea, 0x4e, + 0xa1, 0x1e, 0xf0, 0x68, 0xee, 0x74, 0xdd, 0x8d, 0x3c, 0xa9, 0x52, 0xef, 0x2c, 0x1f, 0x58, 0xef, + 0x1c, 0x5d, 0xcf, 0xca, 0x9f, 0xed, 0xe5, 0xc3, 0xe1, 0xd1, 0x17, 0xdb, 0x3d, 0x94, 0x1d, 0xe3, + 0x93, 0xe6, 0x1f, 0x69, 0xfe, 0xdb, 0x76, 0x57, 0x03, 0xbe, 0x9b, 0xd2, 0x71, 0x56, 0x3a, 0xd6, + 0xa5, 0xe3, 0xac, 0x74, 0xb2, 0x6a, 0xfe, 0x05, 0x9d, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x84, + 0xa1, 0x06, 0x5a, 0xc9, 0x06, 0x00, 0x00, } diff --git a/cs3/sharing/ocm/v1beta1/ocm_api.pb.go b/cs3/sharing/ocm/v1beta1/ocm_api.pb.go index b3ce8cb..574df32 100644 --- a/cs3/sharing/ocm/v1beta1/ocm_api.pb.go +++ b/cs3/sharing/ocm/v1beta1/ocm_api.pb.go @@ -36,7 +36,7 @@ type ListOCMSharesRequest_Filter_Type int32 const ( ListOCMSharesRequest_Filter_TYPE_INVALID ListOCMSharesRequest_Filter_Type = 0 ListOCMSharesRequest_Filter_TYPE_NO ListOCMSharesRequest_Filter_Type = 1 - ListOCMSharesRequest_Filter_TYPE_RESOURCE_ID ListOCMSharesRequest_Filter_Type = 2 + ListOCMSharesRequest_Filter_TYPE_REFERENCE ListOCMSharesRequest_Filter_Type = 2 ListOCMSharesRequest_Filter_TYPE_OWNER ListOCMSharesRequest_Filter_Type = 3 ListOCMSharesRequest_Filter_TYPE_CREATOR ListOCMSharesRequest_Filter_Type = 4 ListOCMSharesRequest_Filter_TYPE_OWNER_PROVIDER ListOCMSharesRequest_Filter_Type = 5 @@ -46,7 +46,7 @@ const ( var ListOCMSharesRequest_Filter_Type_name = map[int32]string{ 0: "TYPE_INVALID", 1: "TYPE_NO", - 2: "TYPE_RESOURCE_ID", + 2: "TYPE_REFERENCE", 3: "TYPE_OWNER", 4: "TYPE_CREATOR", 5: "TYPE_OWNER_PROVIDER", @@ -56,7 +56,7 @@ var ListOCMSharesRequest_Filter_Type_name = map[int32]string{ var ListOCMSharesRequest_Filter_Type_value = map[string]int32{ "TYPE_INVALID": 0, "TYPE_NO": 1, - "TYPE_RESOURCE_ID": 2, + "TYPE_REFERENCE": 2, "TYPE_OWNER": 3, "TYPE_CREATOR": 4, "TYPE_OWNER_PROVIDER": 5, @@ -76,8 +76,8 @@ type CreateOCMShareRequest struct { // Opaque information. Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` // REQUIRED. - // The unique identifier for the shared storage resource. - ResourceId *v1beta11.ResourceId `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` + // Unique identifier of the shared resource (path must be empty). + ResourceId *v1beta11.Reference `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` // REQUIRED. // The share grant for the share. Grant *ShareGrant `protobuf:"bytes,3,opt,name=grant,proto3" json:"grant,omitempty"` @@ -121,7 +121,7 @@ func (m *CreateOCMShareRequest) GetOpaque() *v1beta1.Opaque { return nil } -func (m *CreateOCMShareRequest) GetResourceId() *v1beta11.ResourceId { +func (m *CreateOCMShareRequest) GetResourceId() *v1beta11.Reference { if m != nil { return m.ResourceId } @@ -498,7 +498,7 @@ type isListOCMSharesRequest_Filter_Term interface { } type ListOCMSharesRequest_Filter_ResourceId struct { - ResourceId *v1beta11.ResourceId `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3,oneof"` + ResourceId *v1beta11.Reference `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3,oneof"` } type ListOCMSharesRequest_Filter_Owner struct { @@ -522,7 +522,7 @@ func (m *ListOCMSharesRequest_Filter) GetTerm() isListOCMSharesRequest_Filter_Te return nil } -func (m *ListOCMSharesRequest_Filter) GetResourceId() *v1beta11.ResourceId { +func (m *ListOCMSharesRequest_Filter) GetResourceId() *v1beta11.Reference { if x, ok := m.GetTerm().(*ListOCMSharesRequest_Filter_ResourceId); ok { return x.ResourceId } @@ -1269,77 +1269,77 @@ func init() { var fileDescriptor_3b1231a7f0a479a0 = []byte{ // 1126 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xfa, 0x2b, 0xe2, 0xb9, 0x44, 0xd6, 0xb4, 0x6e, 0xdc, 0x6d, 0x53, 0xc1, 0x56, 0xb4, - 0xa9, 0x28, 0x6b, 0xe5, 0x83, 0xa0, 0xf0, 0x25, 0xc5, 0x8e, 0x9b, 0x5a, 0x34, 0x59, 0x33, 0x49, - 0xc3, 0x87, 0x22, 0xac, 0xed, 0x7a, 0x92, 0xac, 0x94, 0xfd, 0xc8, 0xcc, 0x26, 0x10, 0x89, 0x03, - 0x42, 0x80, 0x44, 0x6f, 0xfc, 0x0b, 0x1c, 0xb9, 0x80, 0xe0, 0xc6, 0x85, 0x03, 0x37, 0xae, 0x48, - 0xdc, 0x91, 0xf8, 0x43, 0xd0, 0xcc, 0xce, 0xda, 0xd9, 0x8d, 0xd7, 0xb1, 0xdb, 0xca, 0xe9, 0x2d, - 0x9e, 0xf7, 0xfb, 0xbd, 0xf7, 0xdb, 0x37, 0x33, 0xef, 0xbd, 0x09, 0xbc, 0x66, 0xb1, 0x85, 0x2a, - 0xdb, 0x37, 0xa9, 0xed, 0xee, 0x55, 0x3d, 0xcb, 0xa9, 0x1e, 0xcf, 0x3d, 0x26, 0x81, 0x39, 0xc7, - 0xff, 0x6e, 0x9b, 0xbe, 0xad, 0xfb, 0xd4, 0x0b, 0x3c, 0x34, 0x6d, 0xb1, 0x05, 0x5d, 0xc2, 0x74, - 0xcf, 0x72, 0x74, 0x09, 0x53, 0xef, 0x72, 0xbe, 0xdd, 0x21, 0x6e, 0x60, 0x07, 0x27, 0xd5, 0x23, - 0x46, 0x68, 0xd7, 0x03, 0x25, 0xcc, 0x3b, 0xa2, 0x16, 0x61, 0xa1, 0x0f, 0x75, 0x96, 0x43, 0x79, - 0x08, 0x9f, 0x7a, 0xc7, 0x76, 0x67, 0x00, 0xf2, 0x06, 0x47, 0x52, 0xdf, 0xea, 0x02, 0x58, 0x60, - 0x06, 0x47, 0x91, 0xf5, 0x4e, 0x9a, 0xe4, 0xa4, 0x9b, 0x7b, 0x02, 0x18, 0x78, 0xd4, 0xdc, 0x23, - 0xe7, 0x07, 0x9d, 0xe1, 0xe8, 0xe0, 0xc4, 0x27, 0xac, 0x0b, 0x11, 0xbf, 0x42, 0xb3, 0xf6, 0x4b, - 0x06, 0xca, 0x75, 0x4a, 0xcc, 0x80, 0x18, 0xf5, 0xf5, 0xcd, 0x7d, 0x93, 0x12, 0x4c, 0x0e, 0x8f, - 0x08, 0x0b, 0xd0, 0x1c, 0x14, 0x3c, 0xdf, 0x3c, 0x3c, 0x22, 0x15, 0xe5, 0x15, 0x65, 0xb6, 0x38, - 0x7f, 0x4d, 0xe7, 0xc9, 0x0a, 0xb9, 0xd2, 0x93, 0x6e, 0x08, 0x00, 0x96, 0x40, 0xd4, 0x84, 0x62, - 0x14, 0xbe, 0x6d, 0x77, 0x2a, 0x19, 0xc1, 0x9b, 0x15, 0x3c, 0xa9, 0x57, 0x8f, 0xf4, 0x76, 0x5d, - 0x60, 0x49, 0x68, 0x76, 0x30, 0xd0, 0xee, 0xdf, 0x68, 0x19, 0xf2, 0x7b, 0xd4, 0x74, 0x83, 0x4a, - 0x56, 0x38, 0xb9, 0xa5, 0xa7, 0xec, 0x94, 0x2e, 0x34, 0xaf, 0x71, 0x28, 0x0e, 0x19, 0xe8, 0x33, - 0x98, 0xa6, 0xc4, 0xb2, 0x7d, 0x9b, 0xb8, 0x41, 0xdb, 0x21, 0x6c, 0xbf, 0x1d, 0x05, 0xad, 0xe4, - 0x84, 0xb3, 0xdb, 0xc2, 0x19, 0x77, 0x72, 0x46, 0x4d, 0x4b, 0x2e, 0x34, 0xdd, 0x5d, 0x0f, 0x97, - 0xbb, 0x6e, 0xd6, 0x09, 0xdb, 0x8f, 0x4c, 0xda, 0xaf, 0x0a, 0x5c, 0x4d, 0xa6, 0x8c, 0xf9, 0x9e, - 0xcb, 0x08, 0xaa, 0x42, 0x21, 0xdc, 0x53, 0x99, 0xb3, 0x69, 0x11, 0x89, 0xfa, 0x56, 0x4f, 0xae, - 0x30, 0x63, 0x09, 0x3b, 0x95, 0xe4, 0xcc, 0xb0, 0x49, 0x5e, 0x84, 0x3c, 0xcf, 0x03, 0x91, 0x99, - 0xb9, 0x39, 0x38, 0x33, 0x38, 0x04, 0x6b, 0xff, 0x65, 0xa0, 0xfc, 0xc8, 0xef, 0x3c, 0x9f, 0x7d, - 0x5e, 0x86, 0x2c, 0x25, 0xbb, 0x52, 0xf2, 0x9d, 0x73, 0x04, 0x90, 0x5d, 0x42, 0x89, 0x6b, 0x11, - 0xcc, 0x39, 0xa8, 0x05, 0xf9, 0x5d, 0x9b, 0x1c, 0x74, 0xa4, 0xfa, 0xb7, 0x53, 0xc9, 0x7d, 0xc5, - 0xca, 0xd5, 0xfb, 0xdc, 0x03, 0x0e, 0x1d, 0xa9, 0x4f, 0x14, 0x28, 0x9e, 0x5a, 0x46, 0xeb, 0x50, - 0xf4, 0x09, 0x75, 0x6c, 0xc6, 0x6c, 0xcf, 0x65, 0x52, 0xe4, 0xdd, 0xc1, 0x22, 0x5b, 0x3d, 0xc2, - 0x83, 0x09, 0x7c, 0x9a, 0x8f, 0x6e, 0xc1, 0xa5, 0x8e, 0xcd, 0xfc, 0x03, 0xf3, 0xa4, 0xed, 0x9a, - 0x4e, 0x98, 0xf5, 0x97, 0x38, 0x48, 0xae, 0x6e, 0x98, 0x0e, 0xa9, 0x4d, 0xca, 0xaf, 0xd2, 0xbe, - 0x84, 0xab, 0x49, 0xe1, 0xe3, 0x3b, 0x1a, 0xda, 0x3f, 0x39, 0xb8, 0xf2, 0xd0, 0x66, 0x41, 0x14, - 0x9c, 0x3d, 0xc3, 0x1e, 0x6f, 0xc0, 0xe4, 0xae, 0x7d, 0x10, 0x10, 0xca, 0x53, 0x98, 0x9d, 0x2d, - 0xce, 0x2f, 0xa6, 0xa6, 0xb0, 0x5f, 0x48, 0xfd, 0xbe, 0x20, 0xe3, 0xc8, 0x89, 0xfa, 0x7b, 0x16, - 0x0a, 0xe1, 0x1a, 0x5a, 0x87, 0x1c, 0x0f, 0x2d, 0xbe, 0x6b, 0x6a, 0x7e, 0xf9, 0x69, 0xfc, 0xea, - 0x5b, 0x27, 0x3e, 0xc1, 0xc2, 0x0d, 0xfa, 0x20, 0x5e, 0x75, 0xb2, 0xa3, 0x55, 0x9d, 0x07, 0x13, - 0xc9, 0xba, 0xe3, 0x7d, 0xee, 0x76, 0x4b, 0xc5, 0xab, 0xc2, 0x4d, 0xd4, 0x08, 0x74, 0xde, 0x08, - 0x7a, 0x27, 0x94, 0x11, 0x2a, 0xf8, 0x21, 0x03, 0xbd, 0x07, 0x93, 0x16, 0x2f, 0x0b, 0x1e, 0xad, - 0xe4, 0x87, 0x27, 0x47, 0x1c, 0xed, 0x07, 0x05, 0x72, 0xfc, 0xab, 0x50, 0x09, 0x2e, 0x6d, 0x7d, - 0xd2, 0x6a, 0xb4, 0x9b, 0x1b, 0xdb, 0x2b, 0x0f, 0x9b, 0xab, 0xa5, 0x09, 0x54, 0x84, 0x49, 0xb1, - 0xb2, 0x61, 0x94, 0x14, 0x74, 0x05, 0x4a, 0xe2, 0x07, 0x6e, 0x6c, 0x1a, 0x8f, 0x70, 0xbd, 0xd1, - 0x6e, 0xae, 0x96, 0x32, 0x68, 0x0a, 0x40, 0xac, 0x1a, 0x1f, 0x6d, 0x34, 0x70, 0x29, 0xdb, 0x75, - 0x52, 0xc7, 0x8d, 0x95, 0x2d, 0x03, 0x97, 0x72, 0x68, 0x1a, 0x2e, 0xf7, 0x10, 0xed, 0x16, 0x36, - 0xb6, 0x9b, 0xab, 0x0d, 0x5c, 0xca, 0xa3, 0x6b, 0x50, 0x3e, 0x0d, 0xed, 0x99, 0x0a, 0xb5, 0x02, - 0xe4, 0x02, 0x42, 0x1d, 0xed, 0x37, 0x05, 0xca, 0x89, 0xdd, 0x18, 0x63, 0xc5, 0x5b, 0x82, 0x82, - 0x28, 0x62, 0xac, 0x92, 0x15, 0x27, 0xf1, 0xbc, 0x92, 0x27, 0xd1, 0xda, 0xb7, 0x0a, 0x94, 0x31, - 0x71, 0xbc, 0xe3, 0x8b, 0xad, 0x79, 0xbc, 0x28, 0x24, 0x65, 0x8c, 0xb1, 0x28, 0x7c, 0xad, 0x00, - 0x5a, 0x23, 0xc1, 0xc5, 0xa6, 0xe0, 0x67, 0x05, 0x2e, 0xc7, 0x44, 0xbc, 0xf0, 0x0d, 0xf3, 0x43, - 0xb8, 0xc1, 0x4f, 0x3c, 0x26, 0x16, 0xb1, 0x8f, 0x49, 0xe7, 0x39, 0x94, 0x54, 0xed, 0x4f, 0x05, - 0x66, 0x52, 0x7c, 0x8e, 0x31, 0x1d, 0xef, 0x27, 0x6e, 0xd3, 0xed, 0xd4, 0x7c, 0x44, 0x3a, 0xe3, - 0xb7, 0xea, 0xdf, 0x0c, 0xcc, 0x84, 0x3d, 0x2e, 0xf9, 0x1d, 0x17, 0x33, 0x51, 0x7c, 0x1c, 0x9f, - 0x28, 0x6a, 0xe7, 0x4c, 0x14, 0x29, 0xa2, 0xfb, 0x4d, 0x16, 0x5f, 0xc4, 0x07, 0x8b, 0xe4, 0x24, - 0xa0, 0xf4, 0x99, 0x04, 0xd0, 0x3b, 0x90, 0xe7, 0x5b, 0x13, 0x35, 0xb7, 0x73, 0xe6, 0x56, 0xbe, - 0x9b, 0x84, 0x77, 0x10, 0xc1, 0xe9, 0x8d, 0x11, 0xdf, 0x28, 0x70, 0x33, 0x4d, 0xee, 0x18, 0x4b, - 0xc7, 0x13, 0x05, 0xd4, 0x35, 0x12, 0xbc, 0x10, 0xfb, 0xac, 0xfd, 0xa1, 0xc0, 0xf5, 0xbe, 0x62, - 0xc6, 0x78, 0x77, 0xde, 0x8d, 0x97, 0x92, 0x61, 0xaf, 0x4e, 0x48, 0x9a, 0xff, 0x7b, 0x12, 0x0a, - 0x86, 0xe5, 0xac, 0xb4, 0x9a, 0xe8, 0x10, 0xa6, 0xe2, 0x4f, 0x08, 0xa4, 0xa7, 0xfa, 0xea, 0xfb, - 0x3c, 0x53, 0xab, 0x43, 0xe3, 0x65, 0x7e, 0x0e, 0x61, 0x2a, 0xde, 0x85, 0x06, 0x84, 0xec, 0xdb, - 0x35, 0x07, 0x84, 0x4c, 0x69, 0x6f, 0xfb, 0x50, 0x3c, 0x55, 0xf4, 0xd1, 0xeb, 0xa9, 0xfc, 0xb3, - 0xfd, 0x49, 0xbd, 0x37, 0x1c, 0x58, 0x46, 0x72, 0xe1, 0xe5, 0xd8, 0x7c, 0x82, 0xde, 0x18, 0x69, - 0xaa, 0x54, 0xf5, 0x61, 0xe1, 0xbd, 0x64, 0xc6, 0xe7, 0xfc, 0x01, 0xc9, 0xec, 0xfb, 0x92, 0x19, - 0x90, 0xcc, 0x94, 0x07, 0xc4, 0x77, 0x72, 0x06, 0x3b, 0xd3, 0x3d, 0xd0, 0x9b, 0x03, 0xc5, 0xa7, - 0x75, 0x30, 0x75, 0x69, 0x54, 0x9a, 0x14, 0xf2, 0xbd, 0x12, 0x3d, 0x72, 0x92, 0x18, 0xb4, 0xf4, - 0x74, 0xc5, 0x57, 0x7d, 0x6b, 0x64, 0x9e, 0xd4, 0xf2, 0x55, 0x38, 0x57, 0x9c, 0x11, 0xb2, 0x30, - 0xe8, 0xf4, 0xa4, 0xa9, 0x58, 0x1c, 0x8d, 0x14, 0x4a, 0xa8, 0x51, 0xb8, 0x6e, 0x79, 0x4e, 0x1a, - 0xb5, 0x56, 0xe4, 0x37, 0xde, 0xb7, 0x5b, 0xd4, 0x0b, 0xbc, 0x96, 0xf2, 0x29, 0x78, 0x96, 0x23, - 0x4d, 0x3f, 0x66, 0xb2, 0xf5, 0x4d, 0xe3, 0xa7, 0xcc, 0x74, 0x9d, 0x2d, 0x88, 0x8a, 0xc7, 0xa9, - 0x86, 0xe5, 0xe8, 0xdb, 0x73, 0x35, 0x6e, 0xff, 0x4b, 0x58, 0x76, 0xa4, 0x65, 0xc7, 0xb0, 0x9c, - 0x1d, 0x69, 0x79, 0x5c, 0x10, 0xff, 0xbc, 0x59, 0xf8, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xef, 0x79, - 0x2e, 0xcc, 0xe7, 0x12, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, + 0x13, 0x37, 0xf5, 0x32, 0xfe, 0xa3, 0xfc, 0x0d, 0x61, 0x53, 0xc5, 0x0a, 0x13, 0x07, 0x2d, 0x83, + 0x26, 0x0e, 0x9a, 0x52, 0xf0, 0xa3, 0x2e, 0xdc, 0x17, 0x60, 0x29, 0xb2, 0xad, 0x22, 0x16, 0xd5, + 0x8d, 0xeb, 0x3e, 0x60, 0x54, 0x60, 0xa8, 0xb5, 0x4d, 0xc0, 0x7c, 0x78, 0x97, 0x76, 0x6b, 0xa0, + 0x87, 0xa2, 0x68, 0x0b, 0x34, 0x97, 0x7e, 0x87, 0x1e, 0x7b, 0x09, 0xd0, 0x1e, 0x7a, 0xec, 0xa1, + 0xb7, 0x5e, 0xf3, 0x09, 0x0a, 0xf4, 0x83, 0x14, 0xbb, 0x5c, 0x4a, 0x26, 0x2d, 0xca, 0x52, 0x1a, + 0xc8, 0xb9, 0x59, 0x3b, 0xbf, 0xdf, 0xcc, 0x8f, 0x33, 0xe4, 0xcc, 0xac, 0xe1, 0x75, 0x8b, 0x2d, + 0x55, 0xd9, 0x81, 0x49, 0x6d, 0x77, 0xbf, 0xea, 0x59, 0x4e, 0xf5, 0x64, 0xe1, 0x31, 0x09, 0xcc, + 0x05, 0xfe, 0x77, 0xc7, 0xf4, 0x6d, 0xdd, 0xa7, 0x5e, 0xe0, 0xa1, 0x59, 0x8b, 0x2d, 0xe9, 0x12, + 0xa6, 0x7b, 0x96, 0xa3, 0x4b, 0x98, 0x7a, 0x8f, 0xf3, 0xed, 0x2e, 0x71, 0x03, 0x3b, 0x38, 0xad, + 0x1e, 0x33, 0x42, 0x7b, 0x1e, 0x28, 0x61, 0xde, 0x31, 0xb5, 0x08, 0x0b, 0x7d, 0xa8, 0xf3, 0x1c, + 0xca, 0x43, 0xf8, 0xd4, 0x3b, 0xb1, 0xbb, 0x43, 0x90, 0x37, 0x39, 0x92, 0xfa, 0x56, 0x0f, 0xc0, + 0x02, 0x33, 0x38, 0x8e, 0xac, 0x77, 0xd3, 0x24, 0x27, 0xdd, 0xdc, 0x17, 0xc0, 0xc0, 0xa3, 0xe6, + 0x3e, 0xb9, 0x38, 0xe8, 0x1c, 0x47, 0x07, 0xa7, 0x3e, 0x61, 0x3d, 0x88, 0xf8, 0x15, 0x9a, 0xb5, + 0xa7, 0x19, 0x28, 0xd7, 0x29, 0x31, 0x03, 0x62, 0xd4, 0xb7, 0x1e, 0x1d, 0x98, 0x94, 0x60, 0x72, + 0x74, 0x4c, 0x58, 0x80, 0x16, 0xa0, 0xe0, 0xf9, 0xe6, 0xd1, 0x31, 0xa9, 0x28, 0xaf, 0x2a, 0xf3, + 0xc5, 0xc5, 0xeb, 0x3a, 0x4f, 0x56, 0xc8, 0x95, 0x9e, 0x74, 0x43, 0x00, 0xb0, 0x04, 0xa2, 0x4d, + 0x28, 0x46, 0xe1, 0x3b, 0x76, 0xb7, 0x92, 0x11, 0xbc, 0xbb, 0x82, 0x27, 0xf5, 0xea, 0x91, 0xde, + 0x9e, 0x0b, 0x4c, 0xf6, 0x08, 0x25, 0xae, 0x45, 0x30, 0x44, 0xdc, 0x66, 0x17, 0xad, 0x42, 0x7e, + 0x9f, 0x9a, 0x6e, 0x50, 0xc9, 0x0a, 0x1f, 0xb7, 0xf5, 0x94, 0x42, 0xe9, 0x42, 0xf2, 0x06, 0x87, + 0xe2, 0x90, 0x81, 0xbe, 0x80, 0x59, 0x4a, 0x2c, 0xdb, 0xb7, 0x89, 0x1b, 0x74, 0x1c, 0xc2, 0x0e, + 0x3a, 0x51, 0xcc, 0x4a, 0x4e, 0x38, 0xbb, 0x23, 0x9c, 0x71, 0x27, 0xe7, 0xc4, 0xb4, 0xe5, 0x41, + 0xd3, 0xdd, 0xf3, 0x70, 0xb9, 0xe7, 0x66, 0x8b, 0xb0, 0x83, 0xc8, 0xa4, 0xfd, 0xaa, 0xc0, 0xb5, + 0x64, 0xc6, 0x98, 0xef, 0xb9, 0x8c, 0xa0, 0x2a, 0x14, 0xc2, 0x92, 0xca, 0x94, 0xcd, 0x8a, 0x48, + 0xd4, 0xb7, 0xfa, 0x72, 0x85, 0x19, 0x4b, 0xd8, 0x99, 0x1c, 0x67, 0x46, 0xcd, 0xf1, 0x32, 0xe4, + 0x79, 0x1e, 0x88, 0xcc, 0xcc, 0xad, 0xe1, 0x99, 0xc1, 0x21, 0x58, 0xfb, 0x27, 0x03, 0xe5, 0x8f, + 0xfd, 0xee, 0x8b, 0x29, 0xf3, 0x2a, 0x64, 0x29, 0xd9, 0x8b, 0x97, 0x37, 0x55, 0x40, 0xaf, 0xbc, + 0x9c, 0x83, 0xda, 0x90, 0xdf, 0xb3, 0xc9, 0x61, 0x57, 0xaa, 0x7f, 0x27, 0x95, 0x3c, 0x50, 0xac, + 0x3c, 0x5d, 0xe7, 0x1e, 0x70, 0xe8, 0x48, 0x7d, 0xa2, 0x40, 0xf1, 0xcc, 0x31, 0xda, 0x82, 0xa2, + 0x4f, 0xa8, 0x63, 0x33, 0x66, 0x7b, 0x2e, 0x93, 0x22, 0xef, 0x0d, 0x17, 0xd9, 0xee, 0x13, 0x36, + 0xa7, 0xf0, 0x59, 0x3e, 0xba, 0x0d, 0x57, 0xba, 0x36, 0xf3, 0x0f, 0xcd, 0xd3, 0x8e, 0x6b, 0x3a, + 0x61, 0xd6, 0xff, 0xc7, 0x41, 0xf2, 0xb4, 0x65, 0x3a, 0xa4, 0x36, 0x2d, 0x9f, 0x4a, 0xfb, 0x1a, + 0xae, 0x25, 0x85, 0x4f, 0xee, 0xd5, 0xd0, 0x9e, 0xe5, 0xe0, 0x95, 0x87, 0x36, 0x0b, 0xa2, 0xe0, + 0xec, 0x3f, 0xd4, 0xb8, 0x05, 0xd3, 0x7b, 0xf6, 0x61, 0x40, 0x28, 0x4f, 0x61, 0x76, 0xbe, 0xb8, + 0xb8, 0x9c, 0x9a, 0xc2, 0x41, 0x21, 0xf5, 0x75, 0x41, 0xc6, 0x91, 0x13, 0xf5, 0xf7, 0x2c, 0x14, + 0xc2, 0x33, 0xb4, 0x05, 0x39, 0x1e, 0x5a, 0x3c, 0xd7, 0xcc, 0xe2, 0xea, 0xf3, 0xf8, 0xd5, 0xb7, + 0x4f, 0x7d, 0x82, 0x85, 0x1b, 0xf4, 0x61, 0xbc, 0xe9, 0x64, 0xc7, 0x6a, 0x3a, 0x9b, 0x53, 0xc9, + 0xb6, 0xe3, 0x7d, 0xe9, 0xf6, 0x3a, 0xc5, 0x6b, 0xc2, 0x4b, 0x34, 0x06, 0x74, 0x3e, 0x06, 0xfa, + 0x2f, 0x28, 0x23, 0xb4, 0xd9, 0xdd, 0x9c, 0xc2, 0x21, 0x03, 0xbd, 0x0f, 0xd3, 0x16, 0xef, 0x0a, + 0x1e, 0xad, 0xe4, 0x47, 0x27, 0x47, 0x1c, 0xed, 0x27, 0x05, 0x72, 0xfc, 0xa1, 0x50, 0x09, 0xae, + 0x6c, 0x7f, 0xd6, 0x6e, 0x74, 0x9a, 0xad, 0x9d, 0xb5, 0x87, 0xcd, 0x07, 0xa5, 0x29, 0x54, 0x84, + 0x69, 0x71, 0xd2, 0x32, 0x4a, 0x0a, 0x42, 0x30, 0x23, 0x7e, 0xe0, 0xc6, 0x7a, 0x03, 0x37, 0x5a, + 0xf5, 0x46, 0x29, 0x83, 0x66, 0x00, 0xc4, 0x99, 0xf1, 0x49, 0xab, 0x81, 0x4b, 0xd9, 0x9e, 0x8b, + 0x3a, 0x6e, 0xac, 0x6d, 0x1b, 0xb8, 0x94, 0x43, 0xb3, 0x70, 0xb5, 0x8f, 0xe8, 0xb4, 0xb1, 0xb1, + 0xd3, 0x7c, 0xd0, 0xc0, 0xa5, 0x3c, 0xba, 0x0e, 0xe5, 0xb3, 0xd0, 0xbe, 0xa9, 0x50, 0x2b, 0x40, + 0x2e, 0x20, 0xd4, 0xd1, 0x7e, 0x53, 0xa0, 0x9c, 0x28, 0xc5, 0x04, 0xdb, 0xdd, 0x0a, 0x14, 0x44, + 0x07, 0x63, 0x95, 0xac, 0x78, 0x0d, 0x2f, 0xea, 0x77, 0x12, 0xad, 0x7d, 0xaf, 0x40, 0x19, 0x13, + 0xc7, 0x3b, 0xb9, 0xdc, 0x86, 0xc7, 0x3b, 0x42, 0x52, 0xc6, 0x04, 0x3b, 0xc2, 0xb7, 0x0a, 0xa0, + 0x0d, 0x12, 0x5c, 0x6e, 0x0a, 0x9e, 0x2a, 0x70, 0x35, 0x26, 0xe2, 0xa5, 0x9f, 0x96, 0x1f, 0xc1, + 0x4d, 0xfe, 0xc6, 0x63, 0x62, 0x11, 0xfb, 0x84, 0x74, 0x5f, 0x40, 0x3f, 0xd5, 0xfe, 0x54, 0x60, + 0x2e, 0xc5, 0xe7, 0x04, 0xd3, 0xf1, 0x41, 0xe2, 0x6b, 0xba, 0x93, 0x9a, 0x8f, 0x48, 0x67, 0xfc, + 0xab, 0xfa, 0x3b, 0x03, 0x73, 0xe1, 0x80, 0x4b, 0x3e, 0xc7, 0xe5, 0xac, 0x13, 0x9f, 0xc6, 0xd7, + 0x89, 0xda, 0x05, 0xeb, 0x44, 0x8a, 0xe8, 0x41, 0x6b, 0xc5, 0x57, 0xf1, 0xad, 0x22, 0xb9, 0x06, + 0x28, 0x03, 0xd6, 0x00, 0xf4, 0x2e, 0xe4, 0x79, 0x69, 0xa2, 0xc9, 0x76, 0xc1, 0xd2, 0xca, 0xab, + 0xc9, 0xe7, 0x4f, 0xc8, 0xe9, 0xef, 0x10, 0xdf, 0x29, 0x70, 0x2b, 0x4d, 0xee, 0x04, 0x5b, 0xc7, + 0x13, 0x05, 0xd4, 0x0d, 0x12, 0xbc, 0x14, 0x75, 0xd6, 0xfe, 0x50, 0xe0, 0xc6, 0x40, 0x31, 0x13, + 0xfc, 0x76, 0xde, 0x8b, 0xb7, 0x92, 0x51, 0x3f, 0x9d, 0x90, 0xb4, 0xf8, 0x6c, 0x1a, 0x0a, 0x86, + 0xe5, 0xac, 0xb5, 0x9b, 0xe8, 0x08, 0x66, 0xe2, 0xf7, 0x07, 0xa4, 0xa7, 0xfa, 0x1a, 0x78, 0x35, + 0x53, 0xab, 0x23, 0xe3, 0x65, 0x7e, 0x8e, 0x60, 0x26, 0x3e, 0x85, 0x86, 0x84, 0x1c, 0x38, 0x35, + 0x87, 0x84, 0x4c, 0x19, 0x6f, 0x07, 0x50, 0x3c, 0xd3, 0xf4, 0xd1, 0x1b, 0xa9, 0xfc, 0xf3, 0xf3, + 0x49, 0xbd, 0x3f, 0x1a, 0x58, 0x46, 0x72, 0xe1, 0xff, 0xb1, 0xfd, 0x04, 0xbd, 0x39, 0xd6, 0x4a, + 0xa9, 0xea, 0xa3, 0xc2, 0xfb, 0xc9, 0x8c, 0x2f, 0xf9, 0x43, 0x92, 0x39, 0xf0, 0x1a, 0x33, 0x24, + 0x99, 0x29, 0xb7, 0x87, 0x1f, 0xe4, 0x0e, 0x76, 0x6e, 0x7a, 0xa0, 0xb7, 0x86, 0x8a, 0x4f, 0x9b, + 0x60, 0xea, 0xca, 0xb8, 0x34, 0x29, 0xe4, 0x47, 0x25, 0xba, 0xe1, 0x24, 0x31, 0x68, 0xe5, 0xf9, + 0x9a, 0xaf, 0xfa, 0xf6, 0xd8, 0x3c, 0xa9, 0xe5, 0x9b, 0x70, 0xaf, 0x38, 0x27, 0x64, 0x69, 0xd8, + 0xdb, 0x93, 0xa6, 0x62, 0x79, 0x3c, 0x52, 0x28, 0xa1, 0x46, 0xe1, 0x86, 0xe5, 0x39, 0x69, 0xd4, + 0x5a, 0x91, 0x7f, 0xf1, 0xbe, 0xdd, 0xa6, 0x5e, 0xe0, 0xb5, 0x95, 0xcf, 0xc1, 0xb3, 0x1c, 0x69, + 0xfa, 0x39, 0x93, 0xad, 0x3f, 0x32, 0x7e, 0xc9, 0xcc, 0xd6, 0xd9, 0x92, 0xe8, 0x78, 0x9c, 0x6a, + 0x58, 0x8e, 0xbe, 0xb3, 0x50, 0xe3, 0xf6, 0xbf, 0x84, 0x65, 0x57, 0x5a, 0x76, 0x0d, 0xcb, 0xd9, + 0x95, 0x96, 0xc7, 0x05, 0xf1, 0x8f, 0x9b, 0xa5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x6d, + 0x9b, 0x52, 0xe3, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/cs3/sharing/ocm/v1beta1/resources.pb.go b/cs3/sharing/ocm/v1beta1/resources.pb.go index 21cb5e1..6382dbf 100644 --- a/cs3/sharing/ocm/v1beta1/resources.pb.go +++ b/cs3/sharing/ocm/v1beta1/resources.pb.go @@ -96,14 +96,14 @@ func (Share_ShareType) EnumDescriptor() ([]byte, []int) { // Shares are relationships between a resource owner // (usually the authenticated user) who grants permissions to a recipient (grantee) -// on a specified resource (resource_id). UserShares represents both user and groups. +// on a specified resource (id only reference). UserShares represents both user and groups. type Share struct { // REQUIRED. // Opaque unique identifier of the share. Id *ShareId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // REQUIRED. - // Unique identifier of the shared resource. - ResourceId *v1beta1.ResourceId `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` + // Unique identifier of the shared resource (path must be empty). + ResourceId *v1beta1.Reference `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` // REQUIRED. // Name of the shared resource. Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` @@ -171,7 +171,7 @@ func (m *Share) GetId() *ShareId { return nil } -func (m *Share) GetResourceId() *v1beta1.ResourceId { +func (m *Share) GetResourceId() *v1beta1.Reference { if m != nil { return m.ResourceId } @@ -354,7 +354,8 @@ type ShareKey struct { // REQUIRED. Owner *v1beta11.UserId `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` // REQUIRED. - ResourceId *v1beta1.ResourceId `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` + // Unique identifier of the shared resource (path must be empty). + ResourceId *v1beta1.Reference `protobuf:"bytes,3,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` // REQUIRED. Grantee *v1beta1.Grantee `protobuf:"bytes,4,opt,name=grantee,proto3" json:"grantee,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -394,7 +395,7 @@ func (m *ShareKey) GetOwner() *v1beta11.UserId { return nil } -func (m *ShareKey) GetResourceId() *v1beta1.ResourceId { +func (m *ShareKey) GetResourceId() *v1beta1.Reference { if m != nil { return m.ResourceId } @@ -608,51 +609,51 @@ func init() { } var fileDescriptor_b8b387acee7aaf43 = []byte{ - // 736 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xdf, 0x6e, 0xda, 0x48, - 0x14, 0xc6, 0x63, 0x03, 0x01, 0x4e, 0xb4, 0x08, 0xcd, 0xae, 0x36, 0x56, 0xb2, 0xbb, 0x62, 0xbd, - 0xda, 0x5d, 0xb2, 0x5a, 0x99, 0x12, 0x5a, 0x55, 0x55, 0x2f, 0x2a, 0x20, 0x2e, 0x71, 0x13, 0x11, - 0x34, 0x38, 0x91, 0x5a, 0x45, 0x42, 0x8e, 0x7d, 0x9a, 0x58, 0x95, 0xb1, 0x3b, 0x63, 0x52, 0x71, - 0xd7, 0xaa, 0x6f, 0xd1, 0xcb, 0xf6, 0xae, 0x8f, 0xd2, 0x9b, 0xbe, 0x52, 0xe5, 0x19, 0x9b, 0x10, - 0x24, 0x50, 0xfe, 0xdc, 0xa0, 0x61, 0xbe, 0xef, 0x37, 0x73, 0x66, 0xe6, 0x9c, 0x63, 0xf8, 0xd7, - 0xe5, 0xad, 0x06, 0xbf, 0x70, 0x98, 0x3f, 0x3e, 0x6f, 0x84, 0x6e, 0xd0, 0xb8, 0x6c, 0x9e, 0x61, - 0xec, 0x34, 0x1b, 0x0c, 0x79, 0x38, 0x61, 0x2e, 0x72, 0x23, 0x62, 0x61, 0x1c, 0x92, 0x4d, 0x97, - 0xb7, 0x8c, 0xd4, 0x68, 0x84, 0x6e, 0x60, 0xa4, 0xc6, 0xad, 0x9d, 0x64, 0x05, 0xdf, 0xc3, 0x71, - 0xec, 0xc7, 0xd3, 0xc6, 0x84, 0x23, 0x5b, 0xb6, 0xc6, 0xd6, 0xff, 0x62, 0xb3, 0x38, 0x64, 0xce, - 0x39, 0x36, 0x22, 0x16, 0x5e, 0xfa, 0xde, 0x0a, 0xf7, 0xef, 0x89, 0x3b, 0x9e, 0x46, 0xc8, 0x67, - 0x16, 0xf1, 0x4f, 0xca, 0xfa, 0x97, 0x02, 0x14, 0x86, 0x17, 0x0e, 0x43, 0xf2, 0x00, 0x54, 0xdf, - 0xd3, 0x94, 0x9a, 0x52, 0xdf, 0xd8, 0xad, 0x19, 0x4b, 0xe2, 0x34, 0x84, 0xd7, 0xf2, 0xa8, 0xea, - 0x7b, 0xc4, 0x82, 0x8d, 0x6c, 0xb7, 0x91, 0xef, 0x69, 0xaa, 0x40, 0xeb, 0x12, 0x95, 0xe1, 0x19, - 0x59, 0x78, 0x33, 0x9e, 0xa6, 0x80, 0xe5, 0x51, 0x60, 0xb3, 0x31, 0x21, 0x90, 0x1f, 0x3b, 0x01, - 0x6a, 0xb9, 0x9a, 0x52, 0x2f, 0x53, 0x31, 0x26, 0x07, 0xb0, 0x11, 0x21, 0x0b, 0x7c, 0xce, 0xfd, - 0x70, 0xcc, 0xb5, 0xbc, 0x58, 0x7e, 0x67, 0x75, 0x64, 0x83, 0x2b, 0x80, 0xce, 0xd3, 0xe4, 0x19, - 0x14, 0xcf, 0x99, 0x33, 0x8e, 0x11, 0xb5, 0x82, 0x58, 0xe8, 0xef, 0xd5, 0x71, 0xf6, 0xa4, 0x99, - 0x66, 0x14, 0x79, 0x0c, 0x85, 0xf0, 0xdd, 0x18, 0x99, 0xb6, 0x2e, 0xf0, 0x3f, 0x05, 0x9e, 0x3d, - 0x98, 0x91, 0x3c, 0xd8, 0x8c, 0x3d, 0xe6, 0xc8, 0x2c, 0x8f, 0x4a, 0x3f, 0x79, 0x0a, 0x45, 0x97, - 0xa1, 0x13, 0x87, 0x4c, 0x2b, 0xde, 0x14, 0xcd, 0x08, 0xb2, 0x0b, 0x05, 0x37, 0xf6, 0x03, 0xd4, - 0x4a, 0x02, 0xfd, 0x4d, 0xa0, 0xf2, 0xfd, 0x32, 0xc4, 0xf6, 0x03, 0xe4, 0xb1, 0x13, 0x44, 0x54, - 0x5a, 0x13, 0x26, 0x10, 0x4c, 0xf9, 0x26, 0x8c, 0xb0, 0x92, 0x1e, 0x40, 0x72, 0xa7, 0x38, 0x4a, - 0x7c, 0x1a, 0xd4, 0x94, 0x7a, 0x25, 0x7b, 0xc9, 0x65, 0x57, 0x2d, 0x7f, 0xed, 0x69, 0x84, 0xb4, - 0xcc, 0xb3, 0xa1, 0x6e, 0x43, 0x79, 0x36, 0x4f, 0x7e, 0x05, 0x32, 0xdc, 0x6f, 0x53, 0x73, 0x64, - 0xbf, 0x1c, 0x98, 0x23, 0xab, 0x7f, 0xd2, 0x3e, 0xb4, 0xf6, 0xaa, 0x6b, 0x0b, 0xf3, 0xd4, 0xec, - 0x1d, 0x1f, 0xb6, 0x69, 0x55, 0x21, 0x9b, 0xf0, 0xf3, 0xdc, 0xbc, 0x4d, 0xdb, 0xfd, 0xe1, 0x73, - 0x93, 0x56, 0x55, 0xfd, 0x83, 0x02, 0xd5, 0xc5, 0xf7, 0x25, 0xc3, 0xeb, 0xf9, 0x21, 0x33, 0xb7, - 0x79, 0xb3, 0xf4, 0x5b, 0x9a, 0x27, 0x1a, 0x14, 0x19, 0x8a, 0xe3, 0x88, 0x7c, 0x2e, 0xd1, 0xec, - 0xaf, 0xfe, 0x5e, 0x81, 0x9f, 0x28, 0xba, 0xe8, 0x5f, 0xa2, 0x27, 0x2b, 0xe6, 0x21, 0x14, 0xa4, - 0x53, 0x6e, 0xfd, 0xc7, 0xea, 0xfb, 0xa2, 0xd2, 0x4c, 0x9e, 0x40, 0x81, 0xc7, 0x4e, 0x2c, 0xd7, - 0xaf, 0xec, 0xfe, 0xb5, 0x9a, 0x1a, 0x26, 0x56, 0x2a, 0x09, 0xfd, 0xbb, 0x02, 0x25, 0x31, 0x7b, - 0x80, 0xd3, 0xab, 0x84, 0x54, 0x6f, 0x99, 0x90, 0x0b, 0x65, 0x9b, 0xbb, 0x47, 0xd9, 0xce, 0x55, - 0x55, 0xfe, 0x2e, 0x55, 0xa5, 0xff, 0x03, 0xc5, 0xb4, 0xa3, 0x90, 0x6d, 0x28, 0x87, 0x91, 0xf3, - 0x76, 0x32, 0xeb, 0x25, 0x65, 0x5a, 0x92, 0x13, 0x96, 0xa7, 0x7f, 0x54, 0xa0, 0x22, 0x6f, 0x11, - 0x5f, 0x23, 0xc3, 0xb1, 0x9b, 0xa4, 0xf9, 0x2d, 0xfa, 0xd5, 0xfe, 0x9a, 0xe8, 0x58, 0x8f, 0x20, - 0xf7, 0x06, 0xa7, 0xd7, 0x6e, 0x6c, 0x29, 0x74, 0x80, 0xd3, 0xfd, 0x35, 0x9a, 0xf8, 0x3b, 0xeb, - 0x90, 0xe7, 0x11, 0xba, 0xfa, 0x27, 0x05, 0x40, 0x68, 0xe2, 0x1c, 0xf3, 0xa7, 0x57, 0xee, 0xd4, - 0x53, 0x16, 0x3a, 0x9c, 0x7a, 0x9f, 0x0e, 0xf7, 0x1f, 0x4b, 0x63, 0x13, 0x19, 0x73, 0x55, 0x4a, - 0x43, 0xbb, 0x6d, 0xcf, 0xd7, 0xde, 0x82, 0x30, 0x30, 0xfb, 0x7b, 0x56, 0xbf, 0x57, 0x55, 0x88, - 0x06, 0xbf, 0xcc, 0x0b, 0xed, 0x6e, 0xd7, 0x1c, 0xd8, 0xe6, 0x5e, 0x55, 0x5d, 0x54, 0xa8, 0xf9, - 0xc2, 0xec, 0x26, 0x4a, 0xae, 0x33, 0x81, 0x6d, 0x37, 0x0c, 0x96, 0x05, 0xdc, 0xa9, 0x64, 0x69, - 0xc3, 0x07, 0xc9, 0xc7, 0x66, 0xa0, 0xbc, 0x82, 0xd0, 0x0d, 0x52, 0xf5, 0xb3, 0x9a, 0xeb, 0x0e, - 0x8f, 0xbe, 0xaa, 0x9b, 0x5d, 0xde, 0x12, 0x47, 0x4b, 0xe8, 0x23, 0x37, 0x30, 0x4e, 0x9a, 0x9d, - 0x44, 0xff, 0x26, 0x94, 0xd3, 0x54, 0x39, 0x3d, 0x72, 0x83, 0xd3, 0x54, 0x39, 0x5b, 0x17, 0xdf, - 0xae, 0xd6, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xe3, 0x9a, 0x99, 0x77, 0x07, 0x00, 0x00, + // 735 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x41, 0x6f, 0xda, 0x48, + 0x14, 0xc7, 0x63, 0x03, 0x01, 0x5e, 0xb4, 0x08, 0xcd, 0xae, 0x36, 0x56, 0xb2, 0xbb, 0x62, 0x5d, + 0xb5, 0x21, 0x55, 0x65, 0x0a, 0xb4, 0xaa, 0xaa, 0x1e, 0x2a, 0x20, 0x2e, 0xd0, 0x44, 0x04, 0x0d, + 0x4e, 0xa4, 0x56, 0x91, 0x90, 0x63, 0xbf, 0x26, 0x56, 0x65, 0xec, 0xce, 0x98, 0x54, 0xdc, 0x5a, + 0xf5, 0x5b, 0xf4, 0x98, 0x63, 0x3f, 0x4a, 0x0f, 0xfd, 0x4c, 0x95, 0x67, 0x30, 0x21, 0x48, 0xd0, + 0x24, 0xbd, 0x58, 0xf6, 0xfc, 0xff, 0xbf, 0x99, 0x37, 0x33, 0xef, 0x3d, 0xc3, 0x8e, 0xc3, 0xeb, + 0x15, 0x7e, 0x6e, 0x33, 0x6f, 0x74, 0x56, 0x09, 0x1c, 0xbf, 0x72, 0x51, 0x3d, 0xc5, 0xc8, 0xae, + 0x56, 0x18, 0xf2, 0x60, 0xcc, 0x1c, 0xe4, 0x46, 0xc8, 0x82, 0x28, 0x20, 0x9b, 0x0e, 0xaf, 0x1b, + 0x53, 0xa3, 0x11, 0x38, 0xbe, 0x31, 0x35, 0x6e, 0xed, 0xc6, 0x33, 0x78, 0x2e, 0x8e, 0x22, 0x2f, + 0x9a, 0x54, 0xc6, 0x1c, 0xd9, 0xb2, 0x39, 0xb6, 0x1e, 0x89, 0xc5, 0xa2, 0x80, 0xd9, 0x67, 0x58, + 0x09, 0x59, 0x70, 0xe1, 0xb9, 0x2b, 0xdc, 0xff, 0xc6, 0xee, 0x68, 0x12, 0x22, 0x9f, 0x59, 0xc4, + 0x97, 0x94, 0xf5, 0xcb, 0x0c, 0x64, 0x06, 0xe7, 0x36, 0x43, 0xf2, 0x18, 0x54, 0xcf, 0xd5, 0x94, + 0x92, 0x52, 0xde, 0xa8, 0x95, 0x8c, 0x25, 0x71, 0x1a, 0xc2, 0xdb, 0x75, 0xa9, 0xea, 0xb9, 0xa4, + 0x03, 0x1b, 0xc9, 0x6a, 0x43, 0xcf, 0xd5, 0x54, 0x81, 0xee, 0x48, 0x54, 0x86, 0x67, 0x24, 0xe1, + 0xcd, 0x78, 0x8a, 0xef, 0x90, 0xe1, 0xc8, 0x41, 0x0a, 0x09, 0xdb, 0x75, 0x09, 0x81, 0xf4, 0xc8, + 0xf6, 0x51, 0x4b, 0x95, 0x94, 0x72, 0x9e, 0x8a, 0x77, 0xb2, 0x0f, 0x1b, 0x21, 0x32, 0xdf, 0xe3, + 0xdc, 0x0b, 0x46, 0x5c, 0x4b, 0x8b, 0xd9, 0x77, 0x57, 0x07, 0xd6, 0xbf, 0x02, 0xe8, 0x3c, 0x4d, + 0x5e, 0x42, 0xf6, 0x8c, 0xd9, 0xa3, 0x08, 0x51, 0xcb, 0x88, 0x89, 0xee, 0xaf, 0x0e, 0xb3, 0x2d, + 0xcd, 0x34, 0xa1, 0xc8, 0x33, 0xc8, 0x04, 0x1f, 0x47, 0xc8, 0xb4, 0x75, 0x81, 0xff, 0x2f, 0xf0, + 0xe4, 0xbe, 0x8c, 0xf8, 0xbe, 0x66, 0xec, 0x11, 0x47, 0xd6, 0x75, 0xa9, 0xf4, 0x93, 0x17, 0x90, + 0x75, 0x18, 0xda, 0x51, 0xc0, 0xb4, 0xec, 0x4d, 0xd1, 0x84, 0x20, 0x35, 0xc8, 0x38, 0x91, 0xe7, + 0xa3, 0x96, 0x13, 0xe8, 0x3f, 0x02, 0x95, 0xd7, 0x97, 0x20, 0x96, 0xe7, 0x23, 0x8f, 0x6c, 0x3f, + 0xa4, 0xd2, 0x1a, 0x33, 0xbe, 0x60, 0xf2, 0x37, 0x61, 0x84, 0x95, 0xb4, 0x01, 0xe2, 0x33, 0xc5, + 0x61, 0xec, 0xd3, 0xa0, 0xa4, 0x94, 0x0b, 0xb5, 0xf2, 0xea, 0xa3, 0x96, 0x4f, 0x6b, 0x12, 0x22, + 0xcd, 0xf3, 0xe4, 0x55, 0xb7, 0x20, 0x3f, 0x1b, 0x27, 0x7f, 0x03, 0x19, 0x74, 0x1a, 0xd4, 0x1c, + 0x5a, 0x6f, 0xfa, 0xe6, 0xb0, 0xdb, 0x3b, 0x6e, 0x1c, 0x74, 0xf7, 0x8a, 0x6b, 0x0b, 0xe3, 0xd4, + 0x6c, 0x1f, 0x1d, 0x34, 0x68, 0x51, 0x21, 0x9b, 0xf0, 0xe7, 0xdc, 0xb8, 0x45, 0x1b, 0xbd, 0xc1, + 0x2b, 0x93, 0x16, 0x55, 0xfd, 0xb3, 0x02, 0xc5, 0xc5, 0xfb, 0x25, 0x83, 0xeb, 0xf9, 0x21, 0x13, + 0xb7, 0xfa, 0xab, 0xec, 0x93, 0x29, 0xb7, 0x34, 0x4f, 0x34, 0xc8, 0x32, 0x14, 0xdb, 0x11, 0xe9, + 0x9c, 0xa3, 0xc9, 0xa7, 0xfe, 0x49, 0x81, 0x3f, 0x28, 0x3a, 0xe8, 0x5d, 0xa0, 0x2b, 0x0b, 0xe6, + 0x09, 0x64, 0xa4, 0x53, 0x2e, 0xfd, 0xdf, 0xea, 0xf3, 0xa2, 0xd2, 0x4c, 0x9e, 0x43, 0x86, 0x47, + 0x76, 0x24, 0xe7, 0x2f, 0xd4, 0xee, 0xad, 0xa6, 0x06, 0xb1, 0x95, 0x4a, 0x42, 0xff, 0xa1, 0x40, + 0x4e, 0x8c, 0xee, 0xe3, 0xe4, 0x2a, 0x21, 0xd5, 0x5b, 0x26, 0xe4, 0x42, 0xd5, 0xa6, 0xee, 0x5e, + 0xb5, 0x73, 0x45, 0x95, 0xbe, 0x4b, 0x51, 0xe9, 0x0f, 0x20, 0x3b, 0xed, 0x27, 0x64, 0x1b, 0xf2, + 0x41, 0x68, 0x7f, 0x18, 0xcf, 0x3a, 0x49, 0x9e, 0xe6, 0xe4, 0x40, 0xd7, 0xd5, 0xbf, 0x28, 0x50, + 0x90, 0x87, 0x98, 0xc4, 0x41, 0x6a, 0xb7, 0xe9, 0x56, 0x9d, 0x35, 0xd1, 0xaf, 0x9e, 0x42, 0xea, + 0x3d, 0x4e, 0xae, 0x1d, 0xd8, 0x52, 0x68, 0x1f, 0x27, 0x9d, 0x35, 0x1a, 0xfb, 0x9b, 0xeb, 0x90, + 0xe6, 0x21, 0x3a, 0xfa, 0x57, 0x05, 0x40, 0x68, 0x62, 0x1f, 0xf3, 0xbb, 0x57, 0xee, 0xd4, 0x52, + 0x16, 0x1a, 0x9c, 0xfa, 0x3b, 0x0d, 0xee, 0x21, 0x9b, 0xc6, 0x26, 0x12, 0xe6, 0xaa, 0x92, 0x06, + 0x56, 0xc3, 0x9a, 0x2f, 0xbd, 0x05, 0xa1, 0x6f, 0xf6, 0xf6, 0xba, 0xbd, 0x76, 0x51, 0x21, 0x1a, + 0xfc, 0x35, 0x2f, 0x34, 0x5a, 0x2d, 0xb3, 0x6f, 0x99, 0x7b, 0x45, 0x75, 0x51, 0xa1, 0xe6, 0x6b, + 0xb3, 0x15, 0x2b, 0xa9, 0xe6, 0x18, 0xb6, 0x9d, 0xc0, 0x5f, 0x16, 0x70, 0xb3, 0x90, 0x54, 0x1b, + 0xef, 0xc7, 0xbf, 0x9a, 0xbe, 0xf2, 0x16, 0x02, 0xc7, 0x9f, 0xaa, 0x97, 0x6a, 0xaa, 0x35, 0x38, + 0xfc, 0xa6, 0x6e, 0xb6, 0x78, 0x5d, 0x6c, 0x2d, 0xa6, 0x0f, 0x1d, 0xdf, 0x38, 0xae, 0x36, 0x63, + 0xfd, 0xbb, 0x50, 0x4e, 0xa6, 0xca, 0xc9, 0xa1, 0xe3, 0x9f, 0x4c, 0x95, 0xd3, 0x75, 0xf1, 0xe7, + 0xaa, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x01, 0xad, 0x9c, 0x70, 0x75, 0x07, 0x00, 0x00, } diff --git a/cs3/storage/provider/v1beta1/provider_api.pb.go b/cs3/storage/provider/v1beta1/provider_api.pb.go index e739022..589a9b3 100644 --- a/cs3/storage/provider/v1beta1/provider_api.pb.go +++ b/cs3/storage/provider/v1beta1/provider_api.pb.go @@ -111,12 +111,11 @@ type GetHomeResponse struct { // Opaque information. Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` // REQUIRED. - // The path to the home in a storage provider. - // For example /eos/user/h/hugo in the storage provider with root path /eos/user/. - Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // The reference to the home in a storage provider. + Ref *Reference `protobuf:"bytes,3,opt,name=ref,proto3" json:"ref,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetHomeResponse) Reset() { *m = GetHomeResponse{} } @@ -158,11 +157,11 @@ func (m *GetHomeResponse) GetOpaque() *v1beta1.Opaque { return nil } -func (m *GetHomeResponse) GetPath() string { +func (m *GetHomeResponse) GetRef() *Reference { if m != nil { - return m.Path + return m.Ref } - return "" + return nil } type AddGrantRequest struct { @@ -486,11 +485,11 @@ type GetPathRequest struct { // Opaque information. Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` // REQUIRED. - // The resource id of the resource. - ResourceId *ResourceId `protobuf:"bytes,2,opt,name=resource_id,json=resourceId,proto3" json:"resource_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // Unique identifier of the shared resource (path must be empty). + Ref *Reference `protobuf:"bytes,2,opt,name=ref,proto3" json:"ref,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetPathRequest) Reset() { *m = GetPathRequest{} } @@ -525,9 +524,9 @@ func (m *GetPathRequest) GetOpaque() *v1beta1.Opaque { return nil } -func (m *GetPathRequest) GetResourceId() *ResourceId { +func (m *GetPathRequest) GetRef() *Reference { if m != nil { - return m.ResourceId + return m.Ref } return nil } @@ -1994,10 +1993,10 @@ type RestoreRecycleItemRequest struct { // the original. // If empty, service implementors MUST restore // to original location if possible. - RestorePath string `protobuf:"bytes,4,opt,name=restore_path,json=restorePath,proto3" json:"restore_path,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + RestoreRef *Reference `protobuf:"bytes,4,opt,name=restore_ref,json=restoreRef,proto3" json:"restore_ref,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RestoreRecycleItemRequest) Reset() { *m = RestoreRecycleItemRequest{} } @@ -2046,11 +2045,11 @@ func (m *RestoreRecycleItemRequest) GetKey() string { return "" } -func (m *RestoreRecycleItemRequest) GetRestorePath() string { +func (m *RestoreRecycleItemRequest) GetRestoreRef() *Reference { if m != nil { - return m.RestorePath + return m.RestoreRef } - return "" + return nil } type RestoreRecycleItemResponse struct { @@ -2457,7 +2456,7 @@ type CreateSymlinkRequest struct { Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` // REQUIRED. // The location where to store the symlink. - Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` + Ref *Reference `protobuf:"bytes,2,opt,name=ref,proto3" json:"ref,omitempty"` // REQUIRED. // The link target can hold arbitrary text; if later resolved, // a relative link is interpreted in relation to its parent directory @@ -2499,11 +2498,11 @@ func (m *CreateSymlinkRequest) GetOpaque() *v1beta1.Opaque { return nil } -func (m *CreateSymlinkRequest) GetPath() string { +func (m *CreateSymlinkRequest) GetRef() *Reference { if m != nil { - return m.Path + return m.Ref } - return "" + return nil } func (m *CreateSymlinkRequest) GetTarget() string { @@ -2570,7 +2569,7 @@ type CreateReferenceRequest struct { Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` // REQUIRED. // The location where to store the reference. - Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` + Ref *Reference `protobuf:"bytes,2,opt,name=ref,proto3" json:"ref,omitempty"` // REQUIRED. // The reference resource by RFC3986. TargetUri string `protobuf:"bytes,3,opt,name=target_uri,json=targetUri,proto3" json:"target_uri,omitempty"` @@ -2611,11 +2610,11 @@ func (m *CreateReferenceRequest) GetOpaque() *v1beta1.Opaque { return nil } -func (m *CreateReferenceRequest) GetPath() string { +func (m *CreateReferenceRequest) GetRef() *Reference { if m != nil { - return m.Path + return m.Ref } - return "" + return nil } func (m *CreateReferenceRequest) GetTargetUri() string { @@ -3629,142 +3628,141 @@ func init() { } var fileDescriptor_d1968a7258bd7add = []byte{ - // 2146 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xdd, 0x8f, 0x1b, 0x49, - 0x11, 0x4f, 0x7b, 0xbd, 0x4e, 0xb6, 0xbc, 0x1f, 0x4e, 0xe7, 0x73, 0x27, 0xbb, 0x24, 0x37, 0x3c, - 0xb0, 0x17, 0x12, 0x3b, 0xeb, 0x25, 0x77, 0x17, 0xee, 0x38, 0xd8, 0x8f, 0xe4, 0x62, 0x91, 0x0f, - 0xdf, 0xec, 0x6e, 0x22, 0x50, 0x0e, 0x6b, 0x62, 0xf7, 0x6e, 0x46, 0xb1, 0x67, 0x9c, 0x99, 0xf6, - 0x5e, 0x0c, 0xba, 0x13, 0x07, 0xa7, 0x44, 0xe8, 0x0e, 0x5e, 0xe0, 0x8d, 0x07, 0x24, 0x1e, 0x79, - 0x03, 0x04, 0x48, 0x88, 0x43, 0x02, 0xe9, 0x1e, 0x40, 0x20, 0x01, 0xe2, 0x95, 0x77, 0x24, 0xfe, - 0x09, 0xd4, 0x3d, 0x3d, 0xf6, 0x8c, 0x67, 0x76, 0x7a, 0xbc, 0x8e, 0xc6, 0xb7, 0x4f, 0xf6, 0x4c, - 0x57, 0x55, 0xff, 0xaa, 0xba, 0xbb, 0xba, 0xa6, 0xaa, 0xa0, 0x54, 0x77, 0x56, 0x4a, 0x0e, 0xb5, - 0x6c, 0x7d, 0x97, 0x94, 0xda, 0xb6, 0xb5, 0x67, 0x34, 0x88, 0x5d, 0xda, 0x5b, 0x7e, 0x48, 0xa8, - 0xbe, 0xdc, 0x7b, 0x51, 0xd3, 0xdb, 0x46, 0xb1, 0x6d, 0x5b, 0xd4, 0xc2, 0x0b, 0x75, 0x67, 0xa5, - 0x28, 0x18, 0x8a, 0xde, 0x78, 0x51, 0x30, 0x28, 0x2f, 0x33, 0x71, 0x46, 0x83, 0x98, 0xd4, 0xa0, - 0xdd, 0x52, 0xc7, 0xf1, 0xc9, 0xb2, 0x89, 0x63, 0x75, 0xec, 0x3a, 0x71, 0x5c, 0x41, 0x0a, 0x13, - 0x54, 0xb2, 0xdb, 0xf5, 0x1e, 0x81, 0x43, 0x75, 0xda, 0xf1, 0x46, 0x2f, 0xc5, 0xe2, 0x1a, 0x94, - 0xb5, 0xc8, 0xa8, 0x69, 0xb7, 0x4d, 0x9c, 0x1e, 0x09, 0x7f, 0x72, 0x87, 0xd5, 0x75, 0x98, 0x7d, - 0x8b, 0xd0, 0x9b, 0x56, 0x8b, 0x68, 0xe4, 0x49, 0x87, 0x38, 0x14, 0x2f, 0x43, 0xce, 0x6a, 0xeb, - 0x4f, 0x3a, 0xe4, 0x2c, 0xba, 0x80, 0x96, 0xf2, 0xe5, 0xf9, 0x22, 0x53, 0xcb, 0xe5, 0x11, 0x12, - 0x8a, 0x77, 0x39, 0x81, 0x26, 0x08, 0xd5, 0x1f, 0x20, 0x98, 0xeb, 0x49, 0x71, 0xda, 0x96, 0xe9, - 0x10, 0x5c, 0x82, 0x9c, 0x8b, 0x5a, 0x88, 0x39, 0xc3, 0xc5, 0xd8, 0xed, 0x7a, 0x4f, 0xc8, 0x26, - 0x1f, 0xd6, 0x04, 0x99, 0x6f, 0xde, 0x4c, 0xc2, 0x79, 0x31, 0x86, 0x6c, 0x5b, 0xa7, 0x8f, 0xce, - 0x4e, 0x5c, 0x40, 0x4b, 0x53, 0x1a, 0xff, 0xaf, 0xfe, 0x1e, 0xc1, 0xdc, 0x6a, 0xa3, 0xf1, 0x96, - 0xad, 0x9b, 0xf4, 0xe0, 0x2a, 0xe1, 0x6b, 0x30, 0x61, 0x93, 0x1d, 0x01, 0xe5, 0x0b, 0xc5, 0xb8, - 0x95, 0x2d, 0x6a, 0x64, 0x87, 0xd8, 0xc4, 0xac, 0x13, 0x8d, 0xf1, 0xe0, 0x6b, 0x30, 0xb9, 0xcb, - 0x66, 0xe7, 0xb0, 0xf2, 0xe5, 0xcf, 0xc7, 0x33, 0xbb, 0x40, 0x5d, 0x0e, 0x75, 0x0f, 0x0a, 0x7d, - 0xec, 0xe9, 0x19, 0x52, 0x7d, 0x86, 0xe0, 0xf4, 0xba, 0x4d, 0x74, 0x4a, 0xd6, 0x2d, 0x93, 0xea, - 0x86, 0x49, 0xec, 0xb1, 0xd8, 0x4e, 0x7d, 0x0f, 0xce, 0x84, 0x70, 0xa4, 0x68, 0x87, 0xf7, 0x60, - 0x66, 0x83, 0x34, 0x09, 0x25, 0xe3, 0xd1, 0x9e, 0xc2, 0xac, 0x37, 0x7d, 0x8a, 0x4a, 0xff, 0x08, - 0x71, 0x1f, 0x50, 0xd5, 0xe9, 0xa3, 0x11, 0xd4, 0xae, 0x40, 0xde, 0x73, 0x3d, 0x35, 0xa3, 0x21, - 0x66, 0x5f, 0x92, 0xa9, 0xef, 0x32, 0x54, 0x1a, 0x1a, 0xd8, 0xbd, 0xff, 0x9e, 0x3b, 0x71, 0x01, - 0x8d, 0xd9, 0x9d, 0x6c, 0x70, 0x28, 0x6f, 0x77, 0x2c, 0xaa, 0x8f, 0xe0, 0x20, 0x7f, 0x8b, 0xa0, - 0xd0, 0x17, 0x93, 0xa2, 0x4a, 0xe7, 0x21, 0x4f, 0x2d, 0xaa, 0x37, 0x6b, 0x0f, 0xbb, 0x94, 0x38, - 0x5c, 0xb3, 0xac, 0x06, 0xfc, 0xd5, 0x1a, 0x7b, 0x83, 0x17, 0x01, 0x3a, 0x0e, 0x69, 0x88, 0xf1, - 0x2c, 0x1f, 0x9f, 0x62, 0x6f, 0xf8, 0x30, 0x5b, 0x8a, 0xf9, 0x8a, 0x69, 0x50, 0x43, 0xa7, 0xe4, - 0x86, 0xd1, 0x24, 0xdb, 0xed, 0xa6, 0xa5, 0x37, 0xc6, 0x73, 0x3a, 0xfe, 0x81, 0x40, 0x89, 0xc2, - 0x92, 0xa2, 0x39, 0xef, 0xc0, 0x14, 0xbf, 0x36, 0xeb, 0x56, 0x93, 0x19, 0x73, 0x62, 0x29, 0x5f, - 0xbe, 0x12, 0xaf, 0x43, 0x1f, 0x68, 0x55, 0x30, 0x6a, 0x7d, 0x11, 0xea, 0x47, 0x08, 0xce, 0xf9, - 0x55, 0xda, 0xb0, 0xde, 0x35, 0xc7, 0x67, 0xe0, 0x7f, 0x23, 0x58, 0x88, 0x46, 0x93, 0xa2, 0x89, - 0xab, 0x61, 0x13, 0x97, 0xe5, 0x26, 0xf6, 0xa0, 0x46, 0x19, 0xf9, 0x03, 0x04, 0xc7, 0x6f, 0x19, - 0x0e, 0xe5, 0xd7, 0xaa, 0x33, 0x1e, 0xd3, 0xfe, 0x06, 0x01, 0xf6, 0x63, 0x48, 0xd1, 0xa0, 0xaf, - 0x43, 0x8e, 0x07, 0x17, 0x9e, 0x35, 0x13, 0xc5, 0x23, 0x82, 0x45, 0xfd, 0x33, 0x02, 0x85, 0xe1, - 0xee, 0x5d, 0xc7, 0x9b, 0xd4, 0x26, 0x7a, 0x6b, 0x3c, 0x81, 0xd5, 0x2b, 0x70, 0x46, 0xb7, 0x1f, - 0x1a, 0xd4, 0xd6, 0xed, 0x6e, 0xad, 0x45, 0xa8, 0xde, 0xd0, 0xa9, 0x5e, 0x7b, 0x4c, 0xba, 0xae, - 0x6a, 0x53, 0xda, 0xa9, 0xde, 0xf0, 0x6d, 0x31, 0xfa, 0x75, 0xd2, 0x75, 0xd4, 0x3f, 0x21, 0x38, - 0x17, 0xa9, 0x44, 0x8a, 0xab, 0xf0, 0x26, 0x64, 0x0d, 0x73, 0xc7, 0x12, 0x31, 0xe1, 0xc5, 0x84, - 0xf7, 0xa2, 0xb9, 0x63, 0x69, 0x9c, 0x4f, 0xfd, 0x03, 0x82, 0x93, 0x01, 0x1d, 0x0e, 0xd7, 0x12, - 0x7c, 0x82, 0xe0, 0xd4, 0x00, 0xfc, 0x14, 0x8d, 0xff, 0x35, 0x98, 0x64, 0x46, 0xf4, 0x4e, 0xc0, - 0x30, 0xd6, 0x77, 0x19, 0xd5, 0xe7, 0x08, 0xce, 0x30, 0xfc, 0xcc, 0xd7, 0xdc, 0x23, 0xb6, 0x63, - 0x58, 0xe6, 0x98, 0x3c, 0xc9, 0xa7, 0x08, 0xce, 0x86, 0x91, 0xa4, 0x68, 0xcc, 0xeb, 0x70, 0x6c, - 0x4f, 0xcc, 0x2b, 0xec, 0xf9, 0xb2, 0xdc, 0x3f, 0x0b, 0xa4, 0x5a, 0x8f, 0x55, 0xfd, 0xa5, 0xf0, - 0x88, 0x1a, 0xa9, 0x77, 0xeb, 0xcd, 0x51, 0x02, 0xee, 0xab, 0x70, 0x74, 0xc7, 0xb6, 0x5a, 0x35, - 0xea, 0x08, 0x25, 0x16, 0x22, 0x78, 0xb6, 0x8c, 0x16, 0x71, 0xa8, 0xde, 0x6a, 0x6b, 0x39, 0x46, - 0xbc, 0xc5, 0x54, 0x9f, 0xa4, 0x56, 0x8d, 0x3a, 0xe2, 0x48, 0xc6, 0x33, 0x65, 0xa9, 0xb5, 0xe5, - 0xa8, 0x7f, 0x41, 0x70, 0x22, 0x80, 0x39, 0xd5, 0xd0, 0x63, 0xc6, 0x76, 0xa7, 0xad, 0x19, 0x94, - 0xb4, 0x12, 0xda, 0x5e, 0x20, 0xad, 0x50, 0xd2, 0xd2, 0xa6, 0xed, 0xfe, 0x83, 0xa3, 0xfe, 0x4e, - 0xec, 0x23, 0x41, 0x31, 0xb2, 0x5f, 0x4f, 0x6f, 0x15, 0xfe, 0x8e, 0x60, 0x3e, 0x02, 0x79, 0x8a, - 0x6b, 0x71, 0x0b, 0xa6, 0xfd, 0x6b, 0x21, 0xb0, 0x0f, 0xb1, 0x14, 0x79, 0xdf, 0x52, 0xa8, 0x7f, - 0x43, 0x90, 0xbf, 0x6d, 0xed, 0x8d, 0x72, 0x04, 0xbe, 0x0a, 0x39, 0xd7, 0x67, 0x0d, 0xeb, 0x52, - 0x04, 0x1b, 0xfb, 0x7a, 0x6b, 0x10, 0x87, 0x1a, 0xa6, 0x4e, 0x0d, 0xcb, 0x14, 0x0a, 0x25, 0x96, - 0xe2, 0xe7, 0x55, 0x6d, 0x98, 0x76, 0xb5, 0x49, 0xf1, 0x13, 0xf6, 0xfb, 0x08, 0x4e, 0x54, 0x3b, - 0xf6, 0x2e, 0x19, 0xdd, 0x9b, 0x8c, 0xe0, 0x9a, 0xbf, 0x0d, 0x27, 0x83, 0x20, 0x52, 0xb4, 0xc0, - 0x4f, 0x11, 0xcc, 0x6b, 0x84, 0x21, 0x25, 0x7e, 0x7f, 0x3b, 0x96, 0x20, 0xa1, 0x00, 0x13, 0x8f, - 0x49, 0x57, 0x7c, 0x46, 0xb3, 0xbf, 0xea, 0x77, 0x11, 0x28, 0x51, 0xe8, 0x52, 0x34, 0xd0, 0x1f, - 0xfb, 0x06, 0xf2, 0x9f, 0xc4, 0xcf, 0x86, 0x81, 0xf0, 0x4b, 0xcc, 0xa3, 0x70, 0x70, 0x35, 0x9e, - 0x82, 0xc8, 0xf2, 0xa1, 0xbc, 0x78, 0x57, 0xd5, 0xe9, 0x23, 0xbf, 0x0d, 0x03, 0x0a, 0xa4, 0x68, - 0xc3, 0x4f, 0x10, 0x60, 0x8d, 0xb4, 0xac, 0x3d, 0x72, 0x38, 0xd3, 0xab, 0x5d, 0x38, 0x11, 0x80, - 0x9f, 0xa2, 0xe9, 0x7e, 0x8d, 0x20, 0xcf, 0xa4, 0x1c, 0xae, 0xb0, 0xfd, 0x57, 0x08, 0xa6, 0x5d, - 0xd4, 0x87, 0xe8, 0x53, 0x89, 0xed, 0xd2, 0xed, 0x76, 0x43, 0xa7, 0x87, 0x77, 0x97, 0x06, 0xe0, - 0xa7, 0xb8, 0x4b, 0x3b, 0x70, 0xd2, 0x4d, 0xbf, 0x6f, 0x76, 0x5b, 0x4d, 0xc3, 0x7c, 0x3c, 0x82, - 0xed, 0xbc, 0x64, 0x6a, 0xa6, 0x9f, 0x4c, 0xc5, 0xa7, 0x21, 0x47, 0x75, 0x7b, 0x97, 0x50, 0xe1, - 0xfa, 0xc4, 0x93, 0xfa, 0x1d, 0x38, 0x35, 0x30, 0x6d, 0x8a, 0x3a, 0xbf, 0xef, 0x95, 0x3e, 0xfa, - 0x2b, 0xf8, 0x62, 0xb5, 0x5e, 0x04, 0x70, 0xf5, 0xac, 0x75, 0x6c, 0x43, 0x68, 0x3e, 0xe5, 0xbe, - 0xd9, 0xb6, 0x8d, 0x7e, 0xc9, 0xc3, 0x37, 0x7f, 0x8a, 0xea, 0xff, 0x0f, 0xc1, 0xb9, 0x4d, 0x42, - 0x57, 0x07, 0xcf, 0xff, 0x78, 0x8e, 0xcd, 0xb7, 0x00, 0x87, 0x1d, 0x95, 0x38, 0x43, 0xa5, 0x78, - 0x49, 0x61, 0x0d, 0x8e, 0x87, 0x9c, 0x9a, 0xfa, 0x3d, 0x04, 0x0b, 0xd1, 0xda, 0xa6, 0x68, 0xf2, - 0x4f, 0x11, 0x2c, 0x6e, 0x9b, 0xce, 0x67, 0xc6, 0xe8, 0x07, 0xbd, 0x1d, 0x3e, 0x44, 0xf0, 0xb9, - 0xfd, 0xf4, 0x48, 0xd1, 0x9c, 0x37, 0xe0, 0xb8, 0x7b, 0x80, 0x46, 0xac, 0x62, 0x3f, 0x05, 0xec, - 0x97, 0x93, 0xa2, 0x06, 0xff, 0x45, 0x30, 0x2f, 0x1c, 0xa0, 0xbb, 0x64, 0x9b, 0x6d, 0xbd, 0x3e, - 0x5a, 0x4a, 0x64, 0xd2, 0x7a, 0xd7, 0x24, 0xb6, 0x80, 0x70, 0x9e, 0x73, 0x78, 0xbd, 0x07, 0xc5, - 0x8e, 0xe3, 0xdb, 0x0b, 0xdb, 0x0e, 0xb1, 0x35, 0x97, 0x9a, 0x79, 0x2f, 0x26, 0xd6, 0x2b, 0x80, - 0xb1, 0xff, 0xec, 0x9d, 0xa9, 0xb7, 0x88, 0x88, 0x48, 0xf9, 0x7f, 0x76, 0xb9, 0x3d, 0xe9, 0x58, - 0x54, 0x3f, 0x3b, 0x99, 0xe4, 0x72, 0x73, 0xab, 0x5e, 0x2e, 0x87, 0xfa, 0x4f, 0x04, 0x4a, 0x94, - 0xaa, 0xc2, 0xda, 0x07, 0xd0, 0xb5, 0xbf, 0x40, 0x99, 0x64, 0x0b, 0x74, 0x17, 0x66, 0x04, 0xd6, - 0x9a, 0xc3, 0x26, 0x4f, 0x16, 0x68, 0x04, 0xe0, 0x4e, 0x3b, 0xbe, 0x27, 0xf5, 0x59, 0xd6, 0x4d, - 0xa5, 0xf8, 0x49, 0x46, 0xc9, 0x0e, 0xde, 0x87, 0xa3, 0x3b, 0x46, 0x93, 0x12, 0x9b, 0xa9, 0x34, - 0xb1, 0x94, 0x2f, 0x7f, 0x25, 0x1e, 0xda, 0x7e, 0x73, 0x17, 0x6f, 0x70, 0x29, 0x9a, 0x27, 0x4d, - 0xf9, 0x4f, 0x06, 0x72, 0xee, 0x3b, 0x7c, 0x4f, 0x2c, 0x35, 0x03, 0x35, 0x5b, 0x5e, 0x1b, 0x69, - 0x82, 0xe2, 0x56, 0xb7, 0x4d, 0xc4, 0x76, 0x79, 0x13, 0x32, 0xbd, 0xea, 0xef, 0xa5, 0xe4, 0x16, - 0xad, 0x34, 0x6e, 0x1e, 0xd1, 0x32, 0x46, 0x83, 0x6d, 0x2d, 0x77, 0xe7, 0xba, 0x8b, 0xf2, 0x92, - 0x64, 0xe7, 0x72, 0x3e, 0xb1, 0x7b, 0xcf, 0x03, 0xf0, 0xf5, 0xac, 0x71, 0xc5, 0xf8, 0x7e, 0xbd, - 0x79, 0x44, 0x9b, 0xe2, 0xef, 0x18, 0x42, 0xf5, 0x3e, 0x64, 0xd9, 0x2f, 0x2e, 0xc0, 0xf4, 0xd6, - 0x37, 0xaa, 0xd7, 0x6b, 0x95, 0x3b, 0xf7, 0x56, 0x6f, 0x55, 0x36, 0x0a, 0x47, 0x70, 0x1e, 0x8e, - 0xf2, 0x37, 0x77, 0xee, 0x16, 0x50, 0xef, 0xa1, 0xb2, 0x51, 0xc8, 0xe0, 0x59, 0x00, 0xfe, 0x70, - 0xf7, 0xfe, 0x9d, 0xeb, 0x5a, 0x61, 0x02, 0x9f, 0x80, 0x39, 0xfe, 0xbc, 0x59, 0x5d, 0x5d, 0xbf, - 0x5e, 0x63, 0x7f, 0x0b, 0xd9, 0xb5, 0x1c, 0x64, 0x29, 0xb1, 0x5b, 0xea, 0xbf, 0x44, 0x66, 0x6a, - 0xc0, 0x56, 0x29, 0xee, 0xed, 0xb7, 0x61, 0x36, 0xb0, 0xb7, 0x13, 0xa6, 0xbc, 0x03, 0x9b, 0x7b, - 0xc6, 0xbf, 0xb9, 0x1d, 0xf5, 0x67, 0x08, 0xe6, 0xdd, 0x78, 0xf4, 0x05, 0x39, 0xa7, 0xd0, 0xf9, - 0xcb, 0x8c, 0x78, 0xfe, 0x98, 0x4f, 0x89, 0x42, 0x78, 0x98, 0x7d, 0xca, 0xc7, 0x08, 0xe6, 0xdd, - 0x5e, 0x90, 0x17, 0x64, 0xf5, 0x37, 0x0e, 0x7a, 0x30, 0xd9, 0xb1, 0xe4, 0xc9, 0x87, 0x28, 0x38, - 0xe9, 0x99, 0xb8, 0xfc, 0x93, 0x45, 0xc8, 0x57, 0x05, 0xd4, 0xd5, 0x6a, 0x05, 0x1b, 0x70, 0xcc, - 0xeb, 0x95, 0xc2, 0x97, 0x25, 0xa1, 0x61, 0xb0, 0x1f, 0x4c, 0x29, 0x26, 0x25, 0x17, 0xea, 0xbd, - 0x0f, 0x73, 0x03, 0x5d, 0x49, 0xf8, 0x4b, 0xf1, 0x22, 0xa2, 0x9b, 0xa9, 0x94, 0xab, 0x43, 0x72, - 0x89, 0xf9, 0xeb, 0x90, 0x73, 0x8d, 0x8f, 0xbf, 0x18, 0x2f, 0x20, 0xd0, 0xbc, 0xa4, 0x5c, 0x4a, - 0x46, 0x2c, 0x26, 0xd9, 0x81, 0xa3, 0xa2, 0xe9, 0x06, 0x4b, 0x18, 0x83, 0xcd, 0x42, 0xca, 0xe5, - 0x84, 0xd4, 0x62, 0x1e, 0x03, 0x8e, 0x79, 0xad, 0x30, 0x58, 0xce, 0xea, 0xef, 0xbc, 0x91, 0xad, - 0x5b, 0xa8, 0xc3, 0xe6, 0x87, 0x08, 0x4e, 0x46, 0x35, 0x34, 0xe0, 0x6b, 0xf1, 0x82, 0x62, 0x5a, - 0x32, 0x94, 0x2f, 0x1f, 0x84, 0x55, 0xe0, 0x79, 0x8e, 0x00, 0x87, 0x3b, 0x58, 0xf0, 0xab, 0xc9, - 0x45, 0x06, 0xfa, 0x6f, 0x94, 0xd7, 0x86, 0x67, 0x14, 0x48, 0x2c, 0x80, 0x7e, 0x3b, 0x02, 0x2e, - 0xc9, 0xaf, 0xff, 0x40, 0xf3, 0x84, 0x72, 0x25, 0x39, 0x83, 0x98, 0xf0, 0x63, 0x51, 0x3a, 0x1b, - 0xa8, 0xc1, 0xe3, 0xd7, 0xe4, 0x92, 0xa2, 0x7b, 0x0f, 0x94, 0x6b, 0x07, 0xe0, 0x74, 0xc1, 0x5c, - 0x41, 0xf8, 0x29, 0xcc, 0x04, 0x08, 0x70, 0x79, 0x08, 0x69, 0x1e, 0x82, 0x95, 0xa1, 0x78, 0x84, - 0x21, 0x3e, 0x40, 0x50, 0x18, 0xac, 0xdf, 0xe2, 0xab, 0x72, 0x49, 0x11, 0x95, 0x67, 0xe5, 0x95, - 0x61, 0xd9, 0x04, 0x86, 0x67, 0xa2, 0x23, 0x26, 0x50, 0x41, 0xc3, 0x09, 0xa4, 0x45, 0x15, 0x0b, - 0x95, 0x57, 0x87, 0xe6, 0xeb, 0x2d, 0x83, 0x0d, 0x79, 0xdf, 0x30, 0xbe, 0x92, 0x58, 0x92, 0x37, - 0xf7, 0xf2, 0x10, 0x1c, 0x42, 0xf9, 0x77, 0x20, 0x7b, 0xdb, 0xda, 0x23, 0x58, 0x52, 0xae, 0xf3, - 0x55, 0xe4, 0x94, 0x8b, 0x49, 0x48, 0x85, 0x78, 0x1b, 0xf2, 0xbe, 0x1c, 0xb3, 0x4c, 0xa5, 0x70, - 0x36, 0x5d, 0xa6, 0x52, 0x54, 0x02, 0xbb, 0x03, 0xd3, 0xfe, 0xc2, 0x13, 0x96, 0x88, 0x88, 0xa8, - 0x94, 0x29, 0xe5, 0x61, 0x58, 0x7c, 0xee, 0x2c, 0x5c, 0xd5, 0x91, 0xb9, 0xb3, 0x7d, 0xab, 0x54, - 0x32, 0x77, 0x16, 0x53, 0x40, 0xf2, 0x21, 0xf1, 0xd5, 0x46, 0x12, 0x22, 0x09, 0x97, 0x83, 0x12, - 0x22, 0x89, 0x2a, 0xc3, 0xbc, 0x03, 0x59, 0x16, 0xb7, 0xc8, 0x76, 0x97, 0xaf, 0x14, 0xa0, 0x5c, - 0x4c, 0x42, 0xda, 0xdf, 0x5d, 0xbe, 0xdc, 0xb0, 0x6c, 0x77, 0x85, 0xb3, 0xe0, 0xb2, 0xdd, 0x15, - 0x95, 0x78, 0x7e, 0x0a, 0x33, 0x81, 0xec, 0xac, 0xcc, 0x57, 0x46, 0x65, 0x90, 0x65, 0xbe, 0x32, - 0x3a, 0xfd, 0xdb, 0x8b, 0xbb, 0x7a, 0x09, 0xab, 0x64, 0x71, 0xd7, 0x60, 0x26, 0x37, 0x59, 0xdc, - 0x15, 0xce, 0xbf, 0xb2, 0xf8, 0x21, 0x2a, 0x5b, 0x28, 0x8b, 0x1f, 0x62, 0xf2, 0xa9, 0xb2, 0xf8, - 0x21, 0x36, 0x39, 0xf9, 0x63, 0x04, 0xa7, 0xa3, 0x13, 0x6e, 0xf8, 0x75, 0xc9, 0xba, 0xc6, 0xa5, - 0x1b, 0x95, 0x37, 0x0e, 0xc6, 0xdc, 0x8f, 0x25, 0xfa, 0x79, 0x33, 0x59, 0x2c, 0x11, 0xca, 0xd4, - 0xc9, 0x62, 0x89, 0x88, 0x94, 0x9c, 0x1b, 0xa9, 0xf2, 0xd9, 0xe4, 0x91, 0xaa, 0x7f, 0xaa, 0xcb, - 0x09, 0xa9, 0x7d, 0x5e, 0x25, 0x9c, 0xab, 0x92, 0x79, 0x95, 0x7d, 0x13, 0x79, 0x32, 0xaf, 0x12, - 0x93, 0x16, 0xfb, 0x50, 0x5c, 0xd8, 0x81, 0xc4, 0x42, 0x92, 0x0b, 0x3b, 0x2a, 0x6b, 0x93, 0xe4, - 0xc2, 0x8e, 0xce, 0x60, 0x3c, 0xef, 0x55, 0xd6, 0x86, 0x31, 0xc8, 0xbe, 0xc9, 0x03, 0x99, 0x41, - 0x62, 0xbe, 0xe9, 0x19, 0x92, 0xf0, 0xf7, 0xa8, 0x0c, 0xc9, 0xbe, 0x1f, 0xd4, 0x32, 0x24, 0xfb, - 0x7f, 0xfa, 0xae, 0x7d, 0x84, 0xe0, 0x42, 0xdd, 0x6a, 0xc5, 0xf2, 0xaf, 0x15, 0x7a, 0x1f, 0xae, - 0x6d, 0x83, 0xb7, 0x28, 0x57, 0xd1, 0x37, 0xe7, 0x3c, 0x2a, 0x41, 0xf4, 0xf3, 0xcc, 0xc4, 0xfa, - 0x66, 0xf5, 0x17, 0x99, 0x85, 0x75, 0x67, 0xc5, 0xfb, 0x04, 0x2f, 0x7a, 0x7c, 0xc5, 0x7b, 0xcb, - 0x6b, 0x8c, 0xe8, 0xaf, 0x7c, 0xf8, 0x81, 0x18, 0x7e, 0xe0, 0x0d, 0x3f, 0x10, 0xc3, 0x0f, 0x73, - 0xbc, 0xed, 0x79, 0xe5, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x22, 0x3b, 0x40, 0xbc, 0x36, - 0x00, 0x00, + // 2129 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xdd, 0x8f, 0x1b, 0x57, + 0x15, 0xcf, 0xf5, 0x3a, 0x4e, 0xf6, 0x78, 0x3f, 0x9c, 0x9b, 0xcf, 0x9d, 0xec, 0x92, 0x32, 0x3c, + 0x90, 0x86, 0xc4, 0xce, 0xee, 0x92, 0xb6, 0xa1, 0xa5, 0xb0, 0x1f, 0x49, 0x63, 0x91, 0x0f, 0x77, + 0x76, 0x37, 0x11, 0x28, 0xc5, 0x9a, 0xd8, 0x77, 0xd3, 0x51, 0xd6, 0x33, 0xce, 0x9d, 0xeb, 0x6d, + 0x0c, 0x6a, 0x45, 0xa1, 0x4a, 0x84, 0x5a, 0x9e, 0xe0, 0x0d, 0x24, 0x24, 0x24, 0x5e, 0x78, 0xe2, + 0x43, 0x80, 0x84, 0xe8, 0x03, 0x48, 0x7d, 0x00, 0x81, 0x04, 0x88, 0x57, 0x1e, 0x91, 0x90, 0xf8, + 0x27, 0xaa, 0x7b, 0xe7, 0x8e, 0x3d, 0xe3, 0x99, 0x9d, 0x3b, 0x5e, 0x57, 0xe3, 0xee, 0x93, 0x3d, + 0x73, 0xef, 0x39, 0xf7, 0x77, 0x7e, 0xf7, 0xce, 0x99, 0x33, 0xe7, 0x1c, 0xa8, 0x34, 0xdc, 0xe5, + 0x8a, 0xcb, 0x1c, 0x6a, 0x3e, 0x24, 0x95, 0x36, 0x75, 0x76, 0xad, 0x26, 0xa1, 0x95, 0xdd, 0xc5, + 0x07, 0x84, 0x99, 0x8b, 0xbd, 0x1b, 0x75, 0xb3, 0x6d, 0x95, 0xdb, 0xd4, 0x61, 0x0e, 0x9e, 0x6f, + 0xb8, 0xcb, 0x65, 0x29, 0x50, 0xf6, 0xc7, 0xcb, 0x52, 0x40, 0x7b, 0x9e, 0xab, 0xb3, 0x9a, 0xc4, + 0x66, 0x16, 0xeb, 0x56, 0x3a, 0x6e, 0x40, 0x17, 0x25, 0xae, 0xd3, 0xa1, 0x0d, 0xe2, 0x7a, 0x8a, + 0x34, 0xae, 0xa8, 0x42, 0xdb, 0x8d, 0xde, 0x04, 0x97, 0x99, 0xac, 0xe3, 0x8f, 0x5e, 0x4c, 0xc4, + 0x35, 0xa8, 0x6b, 0x81, 0xcf, 0x66, 0xdd, 0x36, 0x71, 0x7b, 0x53, 0xc4, 0x95, 0x37, 0xac, 0xaf, + 0xc1, 0xcc, 0x6b, 0x84, 0xdd, 0x70, 0x5a, 0xc4, 0x20, 0x8f, 0x3b, 0xc4, 0x65, 0x78, 0x11, 0x0a, + 0x4e, 0xdb, 0x7c, 0xdc, 0x21, 0x67, 0xd0, 0x73, 0xe8, 0x7c, 0x71, 0x69, 0xae, 0xcc, 0xcd, 0xf2, + 0x64, 0xa4, 0x86, 0xf2, 0x1d, 0x31, 0xc1, 0x90, 0x13, 0xf5, 0x5f, 0x22, 0x98, 0xed, 0x69, 0x71, + 0xdb, 0x8e, 0xed, 0x12, 0x5c, 0x81, 0x82, 0x87, 0x5a, 0xaa, 0x39, 0x2d, 0xd4, 0xd0, 0x76, 0xa3, + 0xa7, 0x64, 0x43, 0x0c, 0x1b, 0x72, 0x5a, 0x60, 0xdd, 0x5c, 0xca, 0x75, 0xf1, 0x55, 0x98, 0xa0, + 0x64, 0xfb, 0xcc, 0x84, 0x98, 0xff, 0xf9, 0x72, 0x12, 0xfd, 0x65, 0x83, 0x6c, 0x13, 0x4a, 0xec, + 0x06, 0x31, 0xb8, 0x8c, 0xfe, 0x07, 0x04, 0xb3, 0x2b, 0xcd, 0xe6, 0x6b, 0xd4, 0xb4, 0xd9, 0xfe, + 0x2d, 0xf7, 0x11, 0xe4, 0x86, 0x47, 0x80, 0xaf, 0xc2, 0xe1, 0x87, 0x7c, 0x75, 0x09, 0xff, 0x73, + 0xc9, 0xc2, 0x1e, 0x50, 0x4f, 0x42, 0xdf, 0x85, 0x52, 0x1f, 0x7b, 0x76, 0x7c, 0xeb, 0x4f, 0x11, + 0x9c, 0x5a, 0xa3, 0xc4, 0x64, 0x64, 0xcd, 0xb1, 0x99, 0x69, 0xd9, 0x84, 0x8e, 0x85, 0x3b, 0xfd, + 0x6d, 0x38, 0x1d, 0xc1, 0x91, 0x21, 0x0f, 0x6f, 0xc3, 0xf4, 0x3a, 0xd9, 0x21, 0x8c, 0x8c, 0xc7, + 0x7a, 0x06, 0x33, 0xfe, 0xf2, 0x19, 0x1a, 0xfd, 0x8e, 0xf0, 0x14, 0x35, 0x93, 0xbd, 0x39, 0x1e, + 0xab, 0xbf, 0xef, 0x39, 0x19, 0x0f, 0x40, 0x86, 0x4e, 0x06, 0x43, 0xbe, 0x6d, 0xb2, 0x37, 0xc5, + 0x63, 0x3a, 0x69, 0x88, 0xff, 0xfa, 0xba, 0x80, 0xf2, 0x7a, 0xc7, 0x61, 0xe6, 0x08, 0x6e, 0xf3, + 0x77, 0x08, 0x4a, 0x7d, 0x35, 0x19, 0x9a, 0x74, 0x0e, 0x8a, 0xcc, 0x61, 0xe6, 0x4e, 0xfd, 0x41, + 0x97, 0x11, 0x57, 0x58, 0x96, 0x37, 0x40, 0xdc, 0x5a, 0xe5, 0x77, 0xf0, 0x02, 0x40, 0xc7, 0x25, + 0x4d, 0x39, 0x9e, 0x17, 0xe3, 0x93, 0xfc, 0x8e, 0x18, 0xe6, 0x5b, 0x31, 0x57, 0xb5, 0x2d, 0x66, + 0x99, 0x8c, 0x5c, 0xb7, 0x76, 0xc8, 0x56, 0x7b, 0xc7, 0x31, 0x9b, 0xe3, 0x39, 0x16, 0xff, 0x40, + 0xa0, 0xc5, 0x61, 0xc9, 0x90, 0xce, 0xdb, 0x30, 0x29, 0x5e, 0xa6, 0x0d, 0x67, 0x87, 0x93, 0x39, + 0x71, 0xbe, 0xb8, 0x74, 0x39, 0xd9, 0x86, 0x3e, 0xd0, 0x9a, 0x14, 0x34, 0xfa, 0x2a, 0xf4, 0xf7, + 0x11, 0x9c, 0x0d, 0x9a, 0xb4, 0xee, 0xbc, 0x65, 0x8f, 0x8f, 0xe0, 0x7f, 0x23, 0x98, 0x8f, 0x47, + 0x93, 0x21, 0xc5, 0xb5, 0x28, 0xc5, 0x4b, 0x6a, 0x8a, 0x7d, 0xa8, 0x71, 0x24, 0xbf, 0x8b, 0xe0, + 0xd8, 0x4d, 0xcb, 0x65, 0xe2, 0x2d, 0xea, 0x8e, 0x87, 0xda, 0xdf, 0x22, 0xc0, 0x41, 0x0c, 0x19, + 0x12, 0xfa, 0x32, 0x14, 0x44, 0x2c, 0xe1, 0xb3, 0x99, 0x2a, 0xfc, 0x90, 0x22, 0xfa, 0x9f, 0x11, + 0x68, 0x1c, 0x77, 0xef, 0xed, 0xbb, 0xc1, 0x28, 0x31, 0x5b, 0xe3, 0x89, 0xa3, 0x5e, 0x80, 0xd3, + 0x26, 0x7d, 0x60, 0x31, 0x6a, 0xd2, 0x6e, 0xbd, 0x45, 0x98, 0xd9, 0x34, 0x99, 0x59, 0x7f, 0x44, + 0xba, 0x9e, 0x69, 0x93, 0xc6, 0xc9, 0xde, 0xf0, 0x2d, 0x39, 0xfa, 0x35, 0xd2, 0x75, 0xf5, 0x3f, + 0x21, 0x38, 0x1b, 0x6b, 0x44, 0x86, 0xbb, 0xf0, 0x2a, 0xe4, 0x2d, 0x7b, 0xdb, 0x91, 0x21, 0xe0, + 0x05, 0x95, 0xdd, 0x5e, 0x64, 0x5f, 0xb5, 0xb7, 0x1d, 0x43, 0xc8, 0xe9, 0x7f, 0x44, 0x70, 0x22, + 0x64, 0xc3, 0xc1, 0xda, 0x82, 0x0f, 0x11, 0x9c, 0x1c, 0x80, 0x9f, 0x21, 0xf9, 0x5f, 0x85, 0xc3, + 0x9c, 0x44, 0xff, 0x09, 0x18, 0x86, 0x7d, 0x4f, 0x50, 0x7f, 0x86, 0xe0, 0x34, 0xc7, 0xcf, 0x7d, + 0xcd, 0x5d, 0x42, 0x5d, 0xcb, 0xb1, 0xc7, 0xe4, 0x49, 0x3e, 0x42, 0x70, 0x26, 0x8a, 0x24, 0x43, + 0x32, 0xaf, 0xc1, 0xd1, 0x5d, 0xb9, 0xae, 0xe4, 0xf3, 0x79, 0xb5, 0x7f, 0x96, 0x48, 0x8d, 0x9e, + 0xa8, 0xfe, 0x2b, 0xe9, 0x11, 0x0d, 0xd2, 0xe8, 0x36, 0x76, 0x46, 0x89, 0xaf, 0xaf, 0xc0, 0x91, + 0x6d, 0xea, 0xb4, 0xea, 0xcc, 0x95, 0x46, 0xcc, 0xc7, 0xc8, 0x6c, 0x5a, 0x2d, 0xe2, 0x32, 0xb3, + 0xd5, 0x36, 0x0a, 0x7c, 0xf2, 0x26, 0x37, 0xfd, 0x30, 0x73, 0xea, 0xcc, 0x95, 0x8f, 0x64, 0xb2, + 0x50, 0x9e, 0x39, 0x9b, 0xae, 0xfe, 0x17, 0x04, 0xc7, 0x43, 0x98, 0x33, 0x0d, 0x3d, 0xa6, 0xa9, + 0xb7, 0x6c, 0xdd, 0x62, 0xa4, 0x95, 0x92, 0x7b, 0x89, 0xb4, 0xca, 0x48, 0xcb, 0x98, 0xa2, 0xfd, + 0x0b, 0x57, 0xff, 0xbd, 0x3c, 0x47, 0x72, 0xc6, 0xc8, 0x7e, 0x3d, 0xbb, 0x5d, 0xf8, 0x3b, 0x82, + 0xb9, 0x18, 0xe4, 0x19, 0xee, 0xc5, 0x4d, 0x98, 0x0a, 0xee, 0x85, 0xc4, 0x3e, 0xc4, 0x56, 0x14, + 0x03, 0x5b, 0xa1, 0xff, 0x0d, 0x41, 0xf1, 0x96, 0xb3, 0x3b, 0xca, 0x23, 0xf0, 0x15, 0x28, 0x78, + 0x3e, 0x6b, 0x58, 0x97, 0x22, 0xc5, 0x70, 0x15, 0x8a, 0x4d, 0xe2, 0x32, 0xcb, 0x36, 0x99, 0xe5, + 0xd8, 0xc3, 0xe6, 0x59, 0x82, 0xb2, 0x3a, 0x85, 0x29, 0xcf, 0x9a, 0x0c, 0xbf, 0x58, 0xbf, 0x87, + 0xe0, 0x78, 0xad, 0x43, 0x1f, 0x92, 0xd1, 0xbd, 0xc9, 0x08, 0xae, 0xf9, 0x5b, 0x70, 0x22, 0x0c, + 0x22, 0x43, 0x06, 0x7e, 0x8c, 0x60, 0xce, 0x20, 0x1c, 0x29, 0x09, 0xfa, 0xdb, 0xb1, 0x04, 0x09, + 0x25, 0x98, 0x78, 0x44, 0xba, 0xf2, 0x33, 0x9a, 0xff, 0xd5, 0xbf, 0x83, 0x40, 0x8b, 0x43, 0x97, + 0x21, 0x41, 0xff, 0xed, 0x13, 0x14, 0x7c, 0x12, 0x3f, 0x1d, 0x04, 0xe1, 0x1b, 0x50, 0xa4, 0x1e, + 0xb8, 0x3a, 0x57, 0x9a, 0x1f, 0x4e, 0x29, 0x50, 0xdf, 0xb0, 0xed, 0x20, 0xd5, 0x21, 0x3b, 0x33, + 0xa4, 0xfa, 0x43, 0x04, 0xd8, 0x20, 0x2d, 0x67, 0x97, 0x1c, 0xcc, 0xa4, 0x6b, 0x17, 0x8e, 0x87, + 0xe0, 0x67, 0x48, 0xdd, 0x6f, 0x10, 0x14, 0xb9, 0x96, 0x83, 0x15, 0xdd, 0xff, 0x1a, 0xc1, 0x94, + 0x87, 0xfa, 0x00, 0x7d, 0x51, 0xf1, 0x53, 0xba, 0xd5, 0x6e, 0x9a, 0xec, 0xe0, 0x9e, 0xd2, 0x10, + 0xfc, 0x0c, 0x4f, 0xe9, 0x4f, 0x10, 0x9c, 0xf0, 0xb2, 0xf2, 0x1b, 0xdd, 0xd6, 0x8e, 0x65, 0x3f, + 0x1a, 0x0f, 0x79, 0xa7, 0xa0, 0xc0, 0x4c, 0xfa, 0x90, 0x30, 0xe9, 0x49, 0xe5, 0x95, 0xfe, 0x6d, + 0x38, 0x39, 0x80, 0x2e, 0x43, 0x6e, 0x7e, 0xde, 0xab, 0x9c, 0xf4, 0xd1, 0x8e, 0x85, 0x9d, 0x05, + 0x00, 0x8f, 0x8f, 0x7a, 0x87, 0x5a, 0x92, 0xa1, 0x49, 0xef, 0xce, 0x16, 0xb5, 0xfa, 0x85, 0x95, + 0x00, 0xcc, 0x0c, 0x69, 0xfa, 0x3f, 0x82, 0xb3, 0x1b, 0x84, 0xad, 0x0c, 0xfa, 0x93, 0xf1, 0x70, + 0xf5, 0x4d, 0xc0, 0x51, 0xc7, 0x27, 0x9f, 0xc9, 0x4a, 0xb2, 0xa6, 0xa8, 0x05, 0xc7, 0x22, 0x4e, + 0x52, 0xff, 0x2e, 0x82, 0xf9, 0x78, 0x6b, 0x33, 0xa4, 0xfc, 0x23, 0x04, 0x0b, 0x5b, 0xb6, 0xfb, + 0xa9, 0x21, 0x7d, 0xbf, 0x6f, 0x9b, 0xf7, 0x10, 0x7c, 0x66, 0x2f, 0x3b, 0x32, 0xa4, 0xf3, 0x3a, + 0x1c, 0xf3, 0x1e, 0xa0, 0x11, 0x4b, 0xea, 0x4f, 0x00, 0x07, 0xf5, 0x64, 0x68, 0xc1, 0xff, 0x10, + 0xcc, 0x49, 0x47, 0xe9, 0x6d, 0xd9, 0x46, 0xdb, 0x6c, 0x8c, 0x96, 0x89, 0x39, 0xec, 0xbc, 0x65, + 0x13, 0x2a, 0x21, 0x9c, 0x13, 0x12, 0x7e, 0x23, 0x44, 0xb9, 0xe3, 0x06, 0xce, 0xc2, 0x96, 0x4b, + 0xa8, 0xe1, 0xcd, 0xc6, 0x18, 0xf2, 0x5c, 0xad, 0x5f, 0x77, 0xe3, 0xff, 0xf9, 0x3d, 0xdb, 0x6c, + 0x11, 0x11, 0x09, 0x4f, 0x1a, 0xe2, 0x3f, 0x7f, 0x59, 0x3e, 0xee, 0x38, 0xcc, 0x3c, 0x73, 0x38, + 0xcd, 0xcb, 0xd2, 0x2b, 0xb6, 0x79, 0x12, 0xfa, 0x3f, 0x11, 0x68, 0x71, 0xa6, 0x4a, 0xb6, 0xf7, + 0x61, 0x6b, 0x7f, 0x83, 0x72, 0xe9, 0x36, 0xe8, 0x0e, 0x4c, 0x4b, 0xac, 0x75, 0x97, 0x2f, 0x9e, + 0x2e, 0x70, 0x09, 0xc1, 0x9d, 0x72, 0x03, 0x57, 0xfa, 0xd3, 0xbc, 0x97, 0xc1, 0x09, 0x4e, 0x19, + 0x25, 0x29, 0x79, 0x0f, 0x8e, 0x6c, 0x5b, 0x3b, 0x8c, 0x50, 0x6e, 0xd2, 0xc4, 0xf9, 0xe2, 0xd2, + 0x97, 0x93, 0xa1, 0xed, 0xb5, 0x76, 0xf9, 0xba, 0xd0, 0x62, 0xf8, 0xda, 0xb4, 0xff, 0xe4, 0xa0, + 0xe0, 0xdd, 0xc3, 0x77, 0xe5, 0x56, 0x73, 0x50, 0x33, 0x4b, 0xab, 0x23, 0x2d, 0x50, 0xde, 0xec, + 0xb6, 0x89, 0x3c, 0x2e, 0xaf, 0x42, 0xce, 0x6a, 0xca, 0x9d, 0xb8, 0x98, 0x9e, 0xd1, 0x6a, 0xf3, + 0xc6, 0x21, 0x23, 0x67, 0x35, 0xf9, 0xd1, 0xf2, 0x4e, 0xae, 0xb7, 0x29, 0x9f, 0x55, 0x9c, 0x5c, + 0x21, 0x27, 0x4f, 0xef, 0x39, 0x00, 0xb1, 0x9f, 0x75, 0x61, 0x98, 0x38, 0xaf, 0x37, 0x0e, 0x19, + 0x93, 0xe2, 0x1e, 0x47, 0xa8, 0xdf, 0x83, 0x3c, 0xff, 0xc5, 0x25, 0x98, 0xda, 0xfc, 0x7a, 0xed, + 0x5a, 0xbd, 0x7a, 0xfb, 0xee, 0xca, 0xcd, 0xea, 0x7a, 0xe9, 0x10, 0x2e, 0xc2, 0x11, 0x71, 0xe7, + 0xf6, 0x9d, 0x12, 0xea, 0x5d, 0x54, 0xd7, 0x4b, 0x39, 0x3c, 0x03, 0x20, 0x2e, 0xee, 0xdc, 0xbb, + 0x7d, 0xcd, 0x28, 0x4d, 0xe0, 0xe3, 0x30, 0x2b, 0xae, 0x37, 0x6a, 0x2b, 0x6b, 0xd7, 0xea, 0xfc, + 0x6f, 0x29, 0xbf, 0x5a, 0x80, 0x3c, 0x23, 0xb4, 0xa5, 0xff, 0x4b, 0x26, 0xc4, 0x06, 0xb8, 0xca, + 0xf0, 0x6c, 0xbf, 0x0e, 0x33, 0xa1, 0xb3, 0x9d, 0x32, 0xd3, 0x1e, 0x3a, 0xdc, 0xd3, 0xc1, 0xc3, + 0xed, 0xea, 0x3f, 0x45, 0x30, 0xe7, 0xc5, 0xb7, 0x9f, 0x90, 0x73, 0x8a, 0x3c, 0x7f, 0xb9, 0x11, + 0x9f, 0x3f, 0xee, 0x53, 0xe2, 0x10, 0x1e, 0x64, 0x9f, 0xf2, 0x01, 0x82, 0x39, 0xaf, 0xe3, 0xe4, + 0x13, 0x62, 0xfd, 0x95, 0xfd, 0x3e, 0x98, 0xfc, 0xb1, 0x14, 0xc9, 0x8c, 0x38, 0x38, 0xd9, 0x51, + 0xbc, 0xf4, 0xa3, 0x05, 0x28, 0xd6, 0x24, 0xd4, 0x95, 0x5a, 0x15, 0x5b, 0x70, 0xd4, 0xef, 0xc8, + 0xc2, 0x97, 0x14, 0xa1, 0x61, 0xb8, 0xeb, 0x4c, 0x2b, 0xa7, 0x9d, 0x2e, 0xcd, 0x7b, 0x07, 0x66, + 0x07, 0x7a, 0x9f, 0xf0, 0x17, 0x93, 0x55, 0xc4, 0xb7, 0x6c, 0x69, 0x57, 0x86, 0x94, 0x92, 0xeb, + 0x37, 0xa0, 0xe0, 0x91, 0x8f, 0xbf, 0x90, 0xac, 0x20, 0xd4, 0x22, 0xa5, 0x5d, 0x4c, 0x37, 0x59, + 0x2e, 0xb2, 0x0d, 0x47, 0x64, 0xaf, 0x0f, 0x56, 0x08, 0x86, 0x7b, 0x92, 0xb4, 0x4b, 0x29, 0x67, + 0xcb, 0x75, 0x2c, 0x38, 0xea, 0x77, 0xe0, 0x60, 0xb5, 0x68, 0xb0, 0xe1, 0x47, 0xb5, 0x6f, 0x91, + 0xc6, 0x9e, 0x1f, 0x20, 0x38, 0x11, 0xd7, 0x47, 0x81, 0xaf, 0x26, 0x2b, 0x4a, 0xe8, 0x04, 0xd1, + 0xbe, 0xb4, 0x1f, 0x51, 0x89, 0xe7, 0x19, 0x02, 0x1c, 0x6d, 0x9c, 0xc1, 0x2f, 0xa6, 0x57, 0x19, + 0x6a, 0xfb, 0xd1, 0x5e, 0x1a, 0x5e, 0x50, 0x22, 0x71, 0x00, 0xfa, 0x5d, 0x10, 0xb8, 0xa2, 0x7e, + 0xfd, 0x87, 0x7a, 0x36, 0xb4, 0xcb, 0xe9, 0x05, 0xe4, 0x82, 0x1f, 0xc8, 0x8a, 0xdd, 0x40, 0xe9, + 0x1f, 0xbf, 0xa4, 0xd6, 0x14, 0xdf, 0xf2, 0xa0, 0x5d, 0xdd, 0x87, 0xa4, 0x07, 0xe6, 0x32, 0xc2, + 0x4f, 0x60, 0x3a, 0x34, 0x01, 0x2f, 0x0d, 0xa1, 0xcd, 0x47, 0xb0, 0x3c, 0x94, 0x8c, 0x24, 0xe2, + 0x5d, 0x04, 0xa5, 0xc1, 0xb2, 0x31, 0xbe, 0xa2, 0xd6, 0x14, 0x53, 0xf0, 0xd6, 0x5e, 0x18, 0x56, + 0x4c, 0x62, 0x78, 0x2a, 0x1b, 0x71, 0x42, 0x85, 0x3b, 0x9c, 0x42, 0x5b, 0x5c, 0x8d, 0x52, 0x7b, + 0x71, 0x68, 0xb9, 0xde, 0x36, 0x50, 0x28, 0x06, 0x86, 0xf1, 0xe5, 0xd4, 0x9a, 0xfc, 0xb5, 0x17, + 0x87, 0x90, 0x90, 0xc6, 0xbf, 0x01, 0xf9, 0x5b, 0xce, 0x2e, 0xc1, 0x8a, 0x2a, 0x61, 0xa0, 0x10, + 0xa8, 0x5d, 0x48, 0x33, 0x55, 0xaa, 0xa7, 0x50, 0x0c, 0xe4, 0xac, 0x55, 0x26, 0x45, 0xb3, 0xf3, + 0x2a, 0x93, 0xe2, 0x12, 0xe2, 0x1d, 0x98, 0x0a, 0xd6, 0xbb, 0xb0, 0x42, 0x45, 0x4c, 0x81, 0x4e, + 0x5b, 0x1a, 0x46, 0x24, 0xe0, 0xce, 0xa2, 0xc5, 0x24, 0x95, 0x3b, 0xdb, 0xb3, 0x38, 0xa6, 0x72, + 0x67, 0x09, 0x75, 0xab, 0x00, 0x92, 0x40, 0xad, 0x25, 0x25, 0x92, 0x68, 0x15, 0x2a, 0x25, 0x92, + 0xb8, 0xb2, 0xce, 0x1b, 0x90, 0xe7, 0x71, 0x8b, 0xea, 0x74, 0x05, 0x4a, 0x0b, 0xda, 0x85, 0x34, + 0x53, 0xfb, 0xa7, 0x2b, 0x90, 0x6b, 0x56, 0x9d, 0xae, 0x68, 0x56, 0x5d, 0x75, 0xba, 0xe2, 0x12, + 0xd9, 0x4f, 0x60, 0x3a, 0x94, 0xc5, 0x55, 0xf9, 0xca, 0xb8, 0x84, 0xb4, 0xca, 0x57, 0xc6, 0xa7, + 0x89, 0x7b, 0x71, 0x57, 0x2f, 0x61, 0x95, 0x2e, 0xee, 0x1a, 0x4c, 0xf8, 0xa6, 0x8b, 0xbb, 0xa2, + 0xf9, 0x57, 0x1e, 0x3f, 0xc4, 0x65, 0x0b, 0x55, 0xf1, 0x43, 0x42, 0x3e, 0x55, 0x15, 0x3f, 0x24, + 0x26, 0x27, 0x7f, 0x88, 0xe0, 0x54, 0x7c, 0xc2, 0x0d, 0xbf, 0xac, 0xd8, 0xd7, 0xa4, 0x74, 0xa3, + 0xf6, 0xca, 0xfe, 0x84, 0xfb, 0xb1, 0x44, 0x3f, 0x6f, 0xa6, 0x8a, 0x25, 0x22, 0x99, 0x3a, 0x55, + 0x2c, 0x11, 0x93, 0x92, 0xf3, 0x22, 0x55, 0xb1, 0x9a, 0x3a, 0x52, 0x0d, 0x2e, 0x75, 0x29, 0xe5, + 0xec, 0x80, 0x57, 0x89, 0xe6, 0xaa, 0x54, 0x5e, 0x65, 0xcf, 0x44, 0x9e, 0xca, 0xab, 0x24, 0xa4, + 0xc5, 0xde, 0x93, 0x2f, 0xec, 0x50, 0x62, 0x21, 0xcd, 0x0b, 0x3b, 0x2e, 0x6b, 0x93, 0xe6, 0x85, + 0x1d, 0x9f, 0xc1, 0x78, 0xd6, 0xab, 0xd4, 0x0d, 0x43, 0xc8, 0x9e, 0xc9, 0x03, 0x15, 0x21, 0x09, + 0xdf, 0xf4, 0x1c, 0x49, 0xf4, 0x7b, 0x54, 0x85, 0x64, 0xcf, 0x0f, 0x6a, 0x15, 0x92, 0xbd, 0x3f, + 0x7d, 0x57, 0xdf, 0x47, 0xf0, 0x5c, 0xc3, 0x69, 0x25, 0xca, 0xaf, 0x96, 0x7a, 0x1f, 0xae, 0x6d, + 0x4b, 0x74, 0x46, 0xd7, 0xd0, 0x37, 0x66, 0xfd, 0x59, 0x72, 0xd2, 0xcf, 0x72, 0x13, 0x6b, 0x1b, + 0xb5, 0x5f, 0xe4, 0xe6, 0xd7, 0xdc, 0x65, 0xff, 0x13, 0xbc, 0xec, 0xcb, 0x95, 0xef, 0x2e, 0xae, + 0xf2, 0x49, 0x7f, 0x15, 0xc3, 0xf7, 0xe5, 0xf0, 0x7d, 0x7f, 0xf8, 0xbe, 0x1c, 0x7e, 0x50, 0x10, + 0xdd, 0xd6, 0xcb, 0x1f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa7, 0xdf, 0x1b, 0x24, 0x49, 0x37, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3793,7 +3791,7 @@ type ProviderAPIClient interface { // MUST return CODE_NOT_FOUND if the reference does not exist. Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) // Returns the path reference for - // the provided resource id reference. + // the provided resource reference. // MUST return CODE_NOT_FOUND if the reference does not exist GetPath(ctx context.Context, in *GetPathRequest, opts ...grpc.CallOption) (*GetPathResponse, error) // Returns the quota available under the provided @@ -4224,7 +4222,7 @@ type ProviderAPIServer interface { // MUST return CODE_NOT_FOUND if the reference does not exist. Delete(context.Context, *DeleteRequest) (*DeleteResponse, error) // Returns the path reference for - // the provided resource id reference. + // the provided resource reference. // MUST return CODE_NOT_FOUND if the reference does not exist GetPath(context.Context, *GetPathRequest) (*GetPathResponse, error) // Returns the quota available under the provided diff --git a/cs3/storage/provider/v1beta1/resources.pb.go b/cs3/storage/provider/v1beta1/resources.pb.go index 7a0202c..66c2194 100644 --- a/cs3/storage/provider/v1beta1/resources.pb.go +++ b/cs3/storage/provider/v1beta1/resources.pb.go @@ -169,7 +169,7 @@ type ResourceInfo struct { Type ResourceType `protobuf:"varint,2,opt,name=type,proto3,enum=cs3.storage.provider.v1beta1.ResourceType" json:"type,omitempty"` // REQUIRED. // Opaque unique identifier of the resource. - Id *ResourceId `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"` + Id *Reference `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"` // REQUIRED. // The data checksum for the file resource. // For all other resources, the checksum is unset. @@ -189,8 +189,7 @@ type ResourceInfo struct { // For reference types this is NOT the mtime of the target. Mtime *v1beta1.Timestamp `protobuf:"bytes,7,opt,name=mtime,proto3" json:"mtime,omitempty"` // REQUIRED. - // The path for the resource. - // It MUST start with the slash character (/). + // The path for the resource, relative to the reference used to make the request. Path string `protobuf:"bytes,8,opt,name=path,proto3" json:"path,omitempty"` // REQUIRED. // The set of permissions for the resource effective for the authenticated user. @@ -258,7 +257,7 @@ func (m *ResourceInfo) GetType() ResourceType { return ResourceType_RESOURCE_TYPE_INVALID } -func (m *ResourceInfo) GetId() *ResourceId { +func (m *ResourceInfo) GetId() *Reference { if m != nil { return m.Id } @@ -540,19 +539,27 @@ func (m *ResourceChecksumPriority) GetPriority() uint32 { return 0 } -// The mechanism to identify a resource -// in the storage provider namespace. Note that the path OR the resourceId must be specifed, not both. +// The mechanism to identify a resource in the CS3 namespace. +// It can represent path based, id based and combined references: +// The storage registry uses the storage_id to determine the responsible storage provider. +// When the storage_id is not available it will use the path. +// In a URL the different components can be represented in a string using the following layout: +// !: type Reference struct { - // REQUIRED. - // One of the specifications MUST be specified. - // - // Types that are valid to be assigned to Spec: - // *Reference_Path - // *Reference_Id - Spec isReference_Spec `protobuf_oneof:"spec"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // OPTIONAL. + // The logical id of a storage. Used by the storage registry to determine the responsible storage provider. + StorageId string `protobuf:"bytes,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` + // OPTIONAL. + // The logical node id used by a storage provider to uniquely identify a resource in a storage. + NodeId string `protobuf:"bytes,2,opt,name=node_id,json=nodeId,proto3" json:"node_id,omitempty"` + // OPTIONAL. + // When starting with `/` the reference represents an absolute path. In this case the storage_id and the node_id must be empty. + // When not starting with `/` represents a path relative to the node_id. + // When node_id is empty the path is considered relative to the root of the storage. + Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Reference) Reset() { *m = Reference{} } @@ -580,103 +587,23 @@ func (m *Reference) XXX_DiscardUnknown() { var xxx_messageInfo_Reference proto.InternalMessageInfo -type isReference_Spec interface { - isReference_Spec() -} - -type Reference_Path struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3,oneof"` -} - -type Reference_Id struct { - Id *ResourceId `protobuf:"bytes,2,opt,name=id,proto3,oneof"` -} - -func (*Reference_Path) isReference_Spec() {} - -func (*Reference_Id) isReference_Spec() {} - -func (m *Reference) GetSpec() isReference_Spec { +func (m *Reference) GetStorageId() string { if m != nil { - return m.Spec - } - return nil -} - -func (m *Reference) GetPath() string { - if x, ok := m.GetSpec().(*Reference_Path); ok { - return x.Path + return m.StorageId } return "" } -func (m *Reference) GetId() *ResourceId { - if x, ok := m.GetSpec().(*Reference_Id); ok { - return x.Id - } - return nil -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*Reference) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*Reference_Path)(nil), - (*Reference_Id)(nil), - } -} - -// A resource id identifies uniquely a -// resource in the storage provider namespace. -// A ResourceId MUST be unique in the storage provider. -type ResourceId struct { - // REQUIRED. - // The storage id of the storage provider. - StorageId string `protobuf:"bytes,1,opt,name=storage_id,json=storageId,proto3" json:"storage_id,omitempty"` - // REQUIRED. - // The internal id used by service implementor to - // uniquely identity the resource in the internal - // implementation of the service. - OpaqueId string `protobuf:"bytes,2,opt,name=opaque_id,json=opaqueId,proto3" json:"opaque_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ResourceId) Reset() { *m = ResourceId{} } -func (m *ResourceId) String() string { return proto.CompactTextString(m) } -func (*ResourceId) ProtoMessage() {} -func (*ResourceId) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{6} -} - -func (m *ResourceId) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ResourceId.Unmarshal(m, b) -} -func (m *ResourceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ResourceId.Marshal(b, m, deterministic) -} -func (m *ResourceId) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResourceId.Merge(m, src) -} -func (m *ResourceId) XXX_Size() int { - return xxx_messageInfo_ResourceId.Size(m) -} -func (m *ResourceId) XXX_DiscardUnknown() { - xxx_messageInfo_ResourceId.DiscardUnknown(m) -} - -var xxx_messageInfo_ResourceId proto.InternalMessageInfo - -func (m *ResourceId) GetStorageId() string { +func (m *Reference) GetNodeId() string { if m != nil { - return m.StorageId + return m.NodeId } return "" } -func (m *ResourceId) GetOpaqueId() string { +func (m *Reference) GetPath() string { if m != nil { - return m.OpaqueId + return m.Path } return "" } @@ -710,7 +637,7 @@ func (m *ResourcePermissions) Reset() { *m = ResourcePermissions{} } func (m *ResourcePermissions) String() string { return proto.CompactTextString(m) } func (*ResourcePermissions) ProtoMessage() {} func (*ResourcePermissions) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{7} + return fileDescriptor_b91600c359c2e479, []int{6} } func (m *ResourcePermissions) XXX_Unmarshal(b []byte) error { @@ -875,7 +802,7 @@ func (m *Grant) Reset() { *m = Grant{} } func (m *Grant) String() string { return proto.CompactTextString(m) } func (*Grant) ProtoMessage() {} func (*Grant) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{8} + return fileDescriptor_b91600c359c2e479, []int{7} } func (m *Grant) XXX_Unmarshal(b []byte) error { @@ -935,7 +862,7 @@ func (m *Grantee) Reset() { *m = Grantee{} } func (m *Grantee) String() string { return proto.CompactTextString(m) } func (*Grantee) ProtoMessage() {} func (*Grantee) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{9} + return fileDescriptor_b91600c359c2e479, []int{8} } func (m *Grantee) XXX_Unmarshal(b []byte) error { @@ -1043,7 +970,7 @@ func (m *FileVersion) Reset() { *m = FileVersion{} } func (m *FileVersion) String() string { return proto.CompactTextString(m) } func (*FileVersion) ProtoMessage() {} func (*FileVersion) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{10} + return fileDescriptor_b91600c359c2e479, []int{9} } func (m *FileVersion) XXX_Unmarshal(b []byte) error { @@ -1112,9 +1039,8 @@ type RecycleItem struct { // The key to identify the deleted resource. Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty"` // REQUIRED. - // The original path of the deleted resource. - // MUST start with the slash character (/). - Path string `protobuf:"bytes,4,opt,name=path,proto3" json:"path,omitempty"` + // The original reference of the deleted resource. + Ref *Reference `protobuf:"bytes,4,opt,name=ref,proto3" json:"ref,omitempty"` // OPTIONAL. // The size of the deleted resource. Size uint64 `protobuf:"varint,5,opt,name=size,proto3" json:"size,omitempty"` @@ -1131,7 +1057,7 @@ func (m *RecycleItem) Reset() { *m = RecycleItem{} } func (m *RecycleItem) String() string { return proto.CompactTextString(m) } func (*RecycleItem) ProtoMessage() {} func (*RecycleItem) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{11} + return fileDescriptor_b91600c359c2e479, []int{10} } func (m *RecycleItem) XXX_Unmarshal(b []byte) error { @@ -1173,11 +1099,11 @@ func (m *RecycleItem) GetKey() string { return "" } -func (m *RecycleItem) GetPath() string { +func (m *RecycleItem) GetRef() *Reference { if m != nil { - return m.Path + return m.Ref } - return "" + return nil } func (m *RecycleItem) GetSize() uint64 { @@ -1225,7 +1151,7 @@ func (m *FileUploadProtocol) Reset() { *m = FileUploadProtocol{} } func (m *FileUploadProtocol) String() string { return proto.CompactTextString(m) } func (*FileUploadProtocol) ProtoMessage() {} func (*FileUploadProtocol) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{12} + return fileDescriptor_b91600c359c2e479, []int{11} } func (m *FileUploadProtocol) XXX_Unmarshal(b []byte) error { @@ -1307,7 +1233,7 @@ func (m *FileDownloadProtocol) Reset() { *m = FileDownloadProtocol{} } func (m *FileDownloadProtocol) String() string { return proto.CompactTextString(m) } func (*FileDownloadProtocol) ProtoMessage() {} func (*FileDownloadProtocol) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{13} + return fileDescriptor_b91600c359c2e479, []int{12} } func (m *FileDownloadProtocol) XXX_Unmarshal(b []byte) error { @@ -1367,7 +1293,7 @@ type StorageSpace struct { Owner *v1beta11.User `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` // OPTIONAL. // The root resource of the storage space. - Root *ResourceId `protobuf:"bytes,4,opt,name=root,proto3" json:"root,omitempty"` + Root *Reference `protobuf:"bytes,4,opt,name=root,proto3" json:"root,omitempty"` // OPTIONAL. Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` // OPTIONAL. @@ -1387,7 +1313,7 @@ func (m *StorageSpace) Reset() { *m = StorageSpace{} } func (m *StorageSpace) String() string { return proto.CompactTextString(m) } func (*StorageSpace) ProtoMessage() {} func (*StorageSpace) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{14} + return fileDescriptor_b91600c359c2e479, []int{13} } func (m *StorageSpace) XXX_Unmarshal(b []byte) error { @@ -1429,7 +1355,7 @@ func (m *StorageSpace) GetOwner() *v1beta11.User { return nil } -func (m *StorageSpace) GetRoot() *ResourceId { +func (m *StorageSpace) GetRoot() *Reference { if m != nil { return m.Root } @@ -1478,7 +1404,7 @@ func (m *StorageSpaceId) Reset() { *m = StorageSpaceId{} } func (m *StorageSpaceId) String() string { return proto.CompactTextString(m) } func (*StorageSpaceId) ProtoMessage() {} func (*StorageSpaceId) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{15} + return fileDescriptor_b91600c359c2e479, []int{14} } func (m *StorageSpaceId) XXX_Unmarshal(b []byte) error { @@ -1526,7 +1452,7 @@ func (m *Quota) Reset() { *m = Quota{} } func (m *Quota) String() string { return proto.CompactTextString(m) } func (*Quota) ProtoMessage() {} func (*Quota) Descriptor() ([]byte, []int) { - return fileDescriptor_b91600c359c2e479, []int{16} + return fileDescriptor_b91600c359c2e479, []int{15} } func (m *Quota) XXX_Unmarshal(b []byte) error { @@ -1579,7 +1505,6 @@ func init() { proto.RegisterType((*ResourceChecksum)(nil), "cs3.storage.provider.v1beta1.ResourceChecksum") proto.RegisterType((*ResourceChecksumPriority)(nil), "cs3.storage.provider.v1beta1.ResourceChecksumPriority") proto.RegisterType((*Reference)(nil), "cs3.storage.provider.v1beta1.Reference") - proto.RegisterType((*ResourceId)(nil), "cs3.storage.provider.v1beta1.ResourceId") proto.RegisterType((*ResourcePermissions)(nil), "cs3.storage.provider.v1beta1.ResourcePermissions") proto.RegisterType((*Grant)(nil), "cs3.storage.provider.v1beta1.Grant") proto.RegisterType((*Grantee)(nil), "cs3.storage.provider.v1beta1.Grantee") @@ -1597,111 +1522,110 @@ func init() { } var fileDescriptor_b91600c359c2e479 = []byte{ - // 1688 bytes of a gzipped FileDescriptorProto + // 1672 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x73, 0xdb, 0xc6, - 0x15, 0x37, 0xf8, 0x21, 0x81, 0x4f, 0x5f, 0xd0, 0x9a, 0x71, 0x61, 0xd9, 0x89, 0x15, 0x64, 0xd2, - 0xc8, 0xaa, 0x4b, 0x45, 0x52, 0xd3, 0xa6, 0xa9, 0xd3, 0x94, 0xa2, 0x61, 0x8b, 0x8d, 0x44, 0xb3, - 0x4b, 0xca, 0x53, 0x77, 0x3c, 0xc5, 0x40, 0xc0, 0x9a, 0xc1, 0x84, 0x24, 0x10, 0x60, 0xa9, 0x98, - 0x3d, 0x74, 0xa6, 0xc7, 0x76, 0xa6, 0x33, 0x3d, 0xf5, 0xd6, 0x4b, 0x67, 0x7a, 0x49, 0x6f, 0xfd, - 0x0f, 0x7a, 0xed, 0xff, 0xd4, 0x69, 0x67, 0xdf, 0x2e, 0x48, 0x80, 0xb2, 0x64, 0x4a, 0xd3, 0x4e, - 0x6e, 0xbb, 0xef, 0xfb, 0xbd, 0xc5, 0x7b, 0xef, 0x07, 0x78, 0xe0, 0x25, 0xfb, 0x3b, 0x09, 0x0f, - 0x63, 0xb7, 0xc7, 0x76, 0xa2, 0x38, 0x3c, 0x0b, 0x7c, 0x16, 0xef, 0x9c, 0xed, 0x9e, 0x32, 0xee, - 0xee, 0xee, 0xc4, 0x2c, 0x09, 0x47, 0xb1, 0xc7, 0x92, 0x5a, 0x14, 0x87, 0x3c, 0x24, 0x77, 0xbd, - 0x64, 0xbf, 0xa6, 0xa4, 0x6b, 0xa9, 0x74, 0x4d, 0x49, 0x6f, 0x6c, 0x0b, 0x5b, 0x81, 0xcf, 0x86, - 0x3c, 0xe0, 0xe3, 0x9d, 0x5e, 0x1c, 0x8e, 0xa2, 0x8b, 0x2c, 0x6d, 0xdc, 0xcf, 0xc9, 0x8e, 0x92, - 0x8b, 0x9d, 0x6e, 0xbc, 0x2d, 0x44, 0xf9, 0x38, 0x62, 0xc9, 0x44, 0x04, 0x6f, 0x92, 0x6d, 0xfd, - 0xa7, 0x0c, 0xcb, 0x54, 0xa9, 0x34, 0x87, 0x2f, 0x43, 0xb2, 0x0b, 0x0b, 0x61, 0xe4, 0x7e, 0x35, - 0x62, 0xa6, 0xb6, 0xa9, 0x6d, 0x2d, 0xed, 0xdd, 0xae, 0x89, 0xa8, 0xa5, 0x8a, 0x32, 0x50, 0x7b, - 0x8a, 0x02, 0x54, 0x09, 0x92, 0x9f, 0x42, 0x49, 0xf0, 0xcd, 0xc2, 0xa6, 0xb6, 0xb5, 0xba, 0xb7, - 0x5d, 0xbb, 0x2c, 0xcd, 0x5a, 0xea, 0xac, 0x3b, 0x8e, 0x18, 0x45, 0x3d, 0xf2, 0x31, 0x14, 0x02, - 0xdf, 0x2c, 0xa2, 0xbb, 0xad, 0xf9, 0xb4, 0x9b, 0x3e, 0x2d, 0x04, 0x3e, 0xf9, 0x39, 0xe8, 0xde, - 0x17, 0xcc, 0xfb, 0x32, 0x19, 0x0d, 0xcc, 0x12, 0xea, 0xd7, 0xe6, 0xd3, 0x6f, 0x28, 0x2d, 0x3a, - 0xd1, 0x27, 0x04, 0x4a, 0x8c, 0xbb, 0x3d, 0xb3, 0xbc, 0xa9, 0x6d, 0x55, 0x28, 0x9e, 0xc9, 0x1d, - 0xa8, 0x0c, 0x82, 0x01, 0x73, 0x30, 0xbd, 0x05, 0x64, 0xe8, 0x82, 0x20, 0x82, 0x27, 0x7b, 0x50, - 0x1e, 0xf0, 0x60, 0xc0, 0xcc, 0x45, 0xf4, 0x7c, 0xf7, 0x35, 0x85, 0xea, 0x06, 0x03, 0x96, 0x70, - 0x77, 0x10, 0x51, 0x29, 0x2a, 0x9c, 0x44, 0x2e, 0xff, 0xc2, 0xd4, 0xa5, 0x13, 0x71, 0x26, 0xbf, - 0x84, 0xd5, 0x88, 0xc5, 0x83, 0x20, 0x49, 0x82, 0x70, 0xe8, 0x24, 0x8c, 0x9b, 0x15, 0x34, 0xb8, - 0x3b, 0x5f, 0x2a, 0xed, 0x89, 0x6e, 0x42, 0x57, 0xa6, 0x86, 0x3a, 0x8c, 0x0b, 0x6f, 0x49, 0xf0, - 0x1b, 0x66, 0xc2, 0xa6, 0xb6, 0x55, 0xa2, 0x78, 0x26, 0x3f, 0x82, 0x72, 0xf8, 0xf5, 0x90, 0xc5, - 0xe6, 0x12, 0x3a, 0x79, 0x17, 0x9d, 0xa4, 0x9f, 0x52, 0x4d, 0x7c, 0x4a, 0x13, 0x0f, 0x27, 0x09, - 0x8b, 0x9b, 0x3e, 0x95, 0xf2, 0xe4, 0x16, 0x2c, 0x70, 0x37, 0xee, 0x31, 0x6e, 0x2e, 0x63, 0xf0, - 0xea, 0x46, 0x7e, 0x0d, 0xc4, 0x73, 0x87, 0xe1, 0x30, 0xf0, 0xdc, 0xbe, 0x33, 0x60, 0xdc, 0xf5, - 0x5d, 0xee, 0x9a, 0x2b, 0x68, 0x7d, 0xe7, 0xf2, 0x14, 0x1a, 0xa9, 0xde, 0xb1, 0x52, 0xa3, 0xeb, - 0xde, 0x2c, 0x49, 0xd8, 0x77, 0xe3, 0xd3, 0x80, 0xc7, 0x6e, 0x3c, 0x9e, 0xda, 0x5f, 0x9d, 0xc7, - 0x7e, 0x3d, 0xd5, 0x9b, 0xda, 0x77, 0x67, 0x49, 0x56, 0x17, 0xd6, 0xcf, 0xc5, 0x41, 0x3e, 0x9b, - 0x24, 0x2b, 0xbb, 0xe0, 0x83, 0x37, 0xbd, 0xc5, 0x4b, 0x16, 0xb3, 0xa1, 0xc7, 0xd2, 0xaa, 0x58, - 0x7f, 0xd7, 0x60, 0xfd, 0x9c, 0x7b, 0xf2, 0x1c, 0xf4, 0x49, 0x06, 0xda, 0x66, 0x71, 0x6b, 0x69, - 0xef, 0xd3, 0x2b, 0x66, 0x50, 0x4b, 0x0f, 0xf6, 0x90, 0xc7, 0x63, 0x3a, 0x31, 0xb7, 0xf1, 0x13, - 0x58, 0xc9, 0xb1, 0x88, 0x01, 0xc5, 0x2f, 0xd9, 0x18, 0xe3, 0xaf, 0x50, 0x71, 0x24, 0x55, 0x28, - 0x9f, 0xb9, 0xfd, 0x91, 0x6c, 0xd4, 0x0a, 0x95, 0x97, 0x4f, 0x0a, 0x1f, 0x6b, 0x56, 0x1f, 0x8c, - 0xd9, 0xce, 0x20, 0x8f, 0x55, 0x57, 0x6b, 0xd8, 0xd5, 0x7b, 0x57, 0xeb, 0xab, 0x4c, 0x77, 0x1b, - 0x50, 0x14, 0xed, 0x29, 0x7d, 0x8a, 0xa3, 0xf5, 0x5b, 0x30, 0x67, 0xe5, 0xdb, 0x71, 0x10, 0xc6, - 0x01, 0x1f, 0xff, 0xcf, 0xbc, 0x6e, 0x80, 0x1e, 0x29, 0x9b, 0xe8, 0x7a, 0x85, 0x4e, 0xee, 0x16, - 0x83, 0xca, 0xe4, 0xc1, 0x48, 0x55, 0x75, 0x24, 0xd6, 0xe9, 0xf0, 0x86, 0xea, 0xc9, 0x4f, 0x70, - 0x24, 0x15, 0xae, 0x36, 0x92, 0x0e, 0x6f, 0x88, 0xa1, 0x74, 0xb0, 0x00, 0xa5, 0x24, 0x62, 0x9e, - 0x75, 0x08, 0x30, 0xe5, 0x91, 0xb7, 0x01, 0x94, 0x09, 0x27, 0xf0, 0xd5, 0xab, 0x54, 0x14, 0xa5, - 0xe9, 0x8b, 0x49, 0x23, 0xa7, 0xa9, 0xa3, 0xfc, 0x56, 0xa8, 0x2e, 0x09, 0x4d, 0xdf, 0xfa, 0x5b, - 0x19, 0x6e, 0xbe, 0xa6, 0xdd, 0x85, 0x92, 0xeb, 0xfb, 0x4e, 0x2f, 0x76, 0x87, 0xf2, 0x43, 0xd5, - 0xa9, 0xee, 0xfa, 0xfe, 0x13, 0x71, 0x27, 0xf7, 0xc1, 0xf0, 0x62, 0xe6, 0x72, 0xe6, 0x78, 0xe1, - 0x90, 0xbb, 0x81, 0xe8, 0xf9, 0x02, 0xca, 0xac, 0x49, 0x7a, 0x23, 0x25, 0x8b, 0xd6, 0xf6, 0x59, - 0x9f, 0x71, 0x86, 0x43, 0x58, 0xa7, 0xea, 0x46, 0x6e, 0x83, 0xde, 0x63, 0xdc, 0xc1, 0xfa, 0x94, - 0x91, 0xb3, 0xd8, 0x63, 0xbc, 0x2d, 0x0a, 0x74, 0x07, 0x2a, 0x82, 0xf5, 0xd5, 0x28, 0xe4, 0x2e, - 0x4e, 0x46, 0x9d, 0x0a, 0xd9, 0x5f, 0x88, 0x3b, 0xf9, 0x01, 0xdc, 0x0a, 0x86, 0x01, 0x0f, 0x84, - 0xf3, 0x97, 0x41, 0x9f, 0x39, 0x7e, 0xf8, 0xf5, 0xb0, 0x1f, 0xba, 0x3e, 0x8e, 0x4a, 0x9d, 0x56, - 0x53, 0xee, 0xe3, 0xa0, 0xcf, 0x1e, 0x29, 0x1e, 0xf9, 0x10, 0xaa, 0x79, 0xad, 0x51, 0x84, 0x3a, - 0x3a, 0xea, 0x90, 0xac, 0xce, 0x09, 0x72, 0xc8, 0x3d, 0x58, 0xea, 0x07, 0x09, 0x97, 0x05, 0x48, - 0x70, 0x6c, 0xea, 0x14, 0x04, 0x09, 0x4b, 0x90, 0x90, 0xf7, 0x61, 0x15, 0x05, 0xa6, 0x15, 0x00, - 0x94, 0x59, 0x11, 0xd4, 0x69, 0xfe, 0x0f, 0x80, 0xa0, 0x18, 0x7a, 0x3d, 0x63, 0x31, 0x56, 0x17, - 0x07, 0xa4, 0x4e, 0x0d, 0xc1, 0x11, 0x3e, 0x9f, 0x29, 0x3a, 0x79, 0x17, 0x96, 0x51, 0x3a, 0x66, - 0xde, 0xd8, 0xeb, 0x33, 0x1c, 0x87, 0x3a, 0xc5, 0x48, 0xa8, 0x24, 0x89, 0xc1, 0x3b, 0x08, 0xcf, - 0x18, 0x4e, 0x41, 0x9d, 0xe2, 0x59, 0xa8, 0xc5, 0x4c, 0x9c, 0xd4, 0x7b, 0xad, 0x4a, 0x35, 0x49, - 0x93, 0x4f, 0xf6, 0x1e, 0xac, 0x44, 0xa3, 0xb8, 0xc7, 0x26, 0xa6, 0xd7, 0x50, 0x66, 0x19, 0x89, - 0xa9, 0xed, 0x0f, 0xa1, 0x1a, 0x33, 0xf1, 0xe1, 0xb0, 0x5c, 0xbc, 0xa6, 0x21, 0xcb, 0xa4, 0x78, - 0x99, 0x88, 0xb3, 0x1a, 0xca, 0xb0, 0x13, 0x70, 0x36, 0x30, 0xd7, 0x73, 0x1a, 0xca, 0x7e, 0x93, - 0x33, 0xdc, 0x85, 0x09, 0x77, 0xb9, 0x49, 0x64, 0xfc, 0xe2, 0x2c, 0xe2, 0x1f, 0x45, 0xbe, 0x78, - 0x1c, 0x19, 0xff, 0x4d, 0x19, 0xbf, 0xa4, 0x61, 0xfc, 0xd6, 0x5f, 0x34, 0x28, 0xcb, 0x4c, 0x3e, - 0x83, 0x45, 0x94, 0x62, 0x29, 0x8c, 0x78, 0xff, 0xf2, 0x26, 0x7a, 0x22, 0x85, 0x69, 0xaa, 0x45, - 0x3a, 0xb0, 0x34, 0xdd, 0x65, 0x89, 0xea, 0xc4, 0x6b, 0x6c, 0xc4, 0xac, 0x15, 0xeb, 0x77, 0x05, - 0x58, 0x54, 0x9e, 0xc8, 0xa7, 0xb9, 0x41, 0x73, 0x7f, 0xae, 0xf0, 0x32, 0xf3, 0xe5, 0x21, 0x2c, - 0x8a, 0x5d, 0xe9, 0x4c, 0x80, 0xcb, 0x9b, 0x17, 0xe9, 0xe1, 0x0d, 0xba, 0x30, 0xc2, 0x13, 0xf9, - 0x19, 0xe8, 0x08, 0xf0, 0x84, 0xba, 0xc4, 0x2d, 0xef, 0xe5, 0xd5, 0x91, 0x9b, 0x71, 0x1f, 0x8e, - 0x22, 0x34, 0xb0, 0xd8, 0x93, 0xc7, 0x0c, 0x4c, 0x2b, 0xcf, 0x09, 0xd3, 0x0e, 0x4a, 0x62, 0xa6, - 0x59, 0x7f, 0xd2, 0x60, 0x29, 0xfb, 0x71, 0x5c, 0x03, 0xef, 0xa9, 0xcd, 0x52, 0x9c, 0x6e, 0x96, - 0x14, 0x68, 0x94, 0x32, 0x40, 0xa3, 0x9a, 0xc2, 0xa3, 0x32, 0x12, 0xa7, 0x00, 0x08, 0x51, 0xd6, - 0xc2, 0x14, 0x65, 0x59, 0xff, 0xd6, 0x60, 0x29, 0xfb, 0xf5, 0x7d, 0x0b, 0x10, 0xf4, 0xb5, 0x29, - 0xe1, 0xdc, 0x2b, 0x65, 0x90, 0x5a, 0x9a, 0x66, 0x39, 0x93, 0x66, 0x1d, 0x56, 0x70, 0x5a, 0x0a, - 0xec, 0x86, 0xe9, 0x2e, 0xcc, 0x81, 0x06, 0x97, 0x53, 0x15, 0x41, 0xb2, 0xfe, 0x58, 0x00, 0x32, - 0x9d, 0x6a, 0x6d, 0x81, 0xcb, 0xbd, 0xb0, 0x7f, 0x9d, 0x32, 0xe0, 0xd6, 0x93, 0xea, 0xe9, 0x12, - 0x49, 0xef, 0xe4, 0x03, 0x58, 0x93, 0x03, 0xd5, 0x61, 0x43, 0x3f, 0x0a, 0x83, 0x21, 0x57, 0xe9, - 0xae, 0x4a, 0xb2, 0xad, 0xa8, 0xa4, 0x07, 0x37, 0xdd, 0x33, 0x37, 0xe8, 0xbb, 0xa7, 0x7d, 0xe6, - 0xa4, 0xf0, 0x38, 0x31, 0x4b, 0x88, 0x57, 0x7e, 0x78, 0xb5, 0x8d, 0x9c, 0xee, 0x75, 0x4a, 0x26, - 0x26, 0x53, 0x56, 0x22, 0xd6, 0x0e, 0x7b, 0x15, 0x85, 0x09, 0x53, 0xcb, 0x45, 0xdd, 0xac, 0x6f, - 0x34, 0xa8, 0x66, 0x37, 0xc3, 0xff, 0xab, 0x22, 0xdf, 0x83, 0xf5, 0x74, 0x31, 0xcd, 0xd6, 0xc4, - 0x48, 0x19, 0x93, 0xaa, 0x4c, 0x83, 0x2d, 0xe5, 0x82, 0xfd, 0x73, 0x11, 0x96, 0x3b, 0xb2, 0x1c, - 0x9d, 0xc8, 0xf5, 0xd8, 0x75, 0x82, 0x7c, 0x98, 0x41, 0x1b, 0x0f, 0x2e, 0x2f, 0x70, 0xd6, 0x95, - 0xfa, 0x09, 0xfa, 0x28, 0x45, 0xf4, 0x72, 0x10, 0xdd, 0x7b, 0xc3, 0x20, 0x4a, 0xf1, 0xfc, 0x43, - 0x28, 0xc5, 0x61, 0xc8, 0xd5, 0xfc, 0x99, 0xff, 0xbf, 0x0b, 0xb5, 0x44, 0x2b, 0x0c, 0x5d, 0xd5, - 0xdc, 0x15, 0x8a, 0x67, 0xf2, 0x63, 0x28, 0x4f, 0xf1, 0x40, 0x3a, 0xd2, 0x2e, 0x34, 0x89, 0x50, - 0x81, 0x4a, 0x0d, 0x44, 0x47, 0x22, 0x25, 0xf9, 0xa7, 0xb5, 0xa8, 0xd0, 0x91, 0xa0, 0xe4, 0x7f, - 0xb5, 0xf4, 0xb9, 0x7f, 0xb5, 0xac, 0xef, 0xc3, 0x6a, 0xbe, 0x58, 0x79, 0x8c, 0xa5, 0xcd, 0x60, - 0xac, 0x3f, 0x68, 0x50, 0x96, 0xe8, 0xe5, 0x1a, 0x0f, 0xf8, 0x5d, 0x58, 0xc3, 0x3c, 0x9c, 0x81, - 0xfb, 0xca, 0x39, 0x1d, 0x73, 0x26, 0x37, 0x56, 0x89, 0xae, 0x20, 0xf9, 0xd8, 0x7d, 0x75, 0x20, - 0x88, 0x79, 0x39, 0xb1, 0xbd, 0x13, 0x7c, 0xb4, 0x8c, 0x9c, 0xf8, 0xee, 0x93, 0xed, 0x7f, 0x68, - 0xd3, 0xbf, 0x72, 0x2c, 0xc0, 0x6d, 0x78, 0x8b, 0xda, 0x9d, 0xa7, 0x27, 0xb4, 0x61, 0x3b, 0xdd, - 0xe7, 0x6d, 0xdb, 0x69, 0xb6, 0x9e, 0xd5, 0x8f, 0x9a, 0x8f, 0x8c, 0x1b, 0xe4, 0x16, 0x90, 0x3c, - 0xeb, 0x71, 0xf3, 0xc8, 0x36, 0x34, 0x72, 0x07, 0xbe, 0x93, 0xa7, 0x37, 0x9e, 0xb6, 0xba, 0xf5, - 0x66, 0xcb, 0xa6, 0x46, 0xe1, 0x3c, 0x93, 0xda, 0x8f, 0x6d, 0x6a, 0xb7, 0x1a, 0xb6, 0x51, 0x3c, - 0xef, 0xac, 0xf3, 0xfc, 0xf8, 0xa8, 0xd9, 0xfa, 0xdc, 0x28, 0x91, 0x0d, 0xb8, 0x35, 0x1b, 0x47, - 0xd7, 0xa6, 0xad, 0xfa, 0x91, 0x51, 0xde, 0xfe, 0xa7, 0x06, 0xd5, 0xd7, 0x21, 0x72, 0x62, 0xc1, - 0x3b, 0x13, 0xa5, 0xc6, 0xa1, 0xdd, 0xf8, 0xbc, 0x73, 0x72, 0x3c, 0x9b, 0xc5, 0x26, 0xdc, 0xbd, - 0x40, 0xe6, 0xa4, 0xd5, 0xb1, 0xbb, 0x86, 0x76, 0x89, 0x95, 0xfa, 0xa3, 0x23, 0x9b, 0xee, 0xef, - 0x19, 0x05, 0xf2, 0x0e, 0x6c, 0x5c, 0x20, 0x73, 0xfc, 0xe8, 0x23, 0xa3, 0x48, 0xee, 0xc1, 0x9d, - 0x0b, 0xf8, 0x9d, 0xc3, 0xfa, 0xae, 0x51, 0xda, 0x7e, 0x06, 0x4b, 0x99, 0x5d, 0x4f, 0x4c, 0xa8, - 0x3e, 0xa1, 0xf5, 0x56, 0xd7, 0x3e, 0x57, 0xf5, 0xb7, 0x60, 0x3d, 0xc7, 0x39, 0xe9, 0xd8, 0xd4, - 0xd0, 0xc4, 0x63, 0xe4, 0xc8, 0x4f, 0xe8, 0xd3, 0x93, 0xb6, 0x51, 0x38, 0xf8, 0xbd, 0x06, 0x9b, - 0x5e, 0x38, 0xb8, 0xb4, 0x23, 0x0e, 0x56, 0xd3, 0xea, 0x25, 0x38, 0xf1, 0xda, 0xda, 0xaf, 0xd6, - 0x52, 0x19, 0x25, 0xf2, 0xd7, 0x42, 0xb1, 0xd1, 0x69, 0x7f, 0x53, 0xb8, 0xdb, 0x48, 0xf6, 0xd3, - 0x51, 0x50, 0x6b, 0xa7, 0x76, 0x9e, 0xed, 0x1e, 0x08, 0xa1, 0x7f, 0x21, 0xfb, 0x85, 0x62, 0xbf, - 0x48, 0xd9, 0x2f, 0x14, 0xfb, 0x74, 0x01, 0x07, 0xe0, 0xfe, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, - 0x5f, 0x86, 0x5e, 0x0d, 0xbd, 0x12, 0x00, 0x00, + 0x15, 0x0f, 0xf8, 0x21, 0x81, 0x4f, 0x5f, 0xd0, 0x5a, 0x71, 0x60, 0xd9, 0x89, 0x15, 0x64, 0xd2, + 0xc8, 0xaa, 0x4b, 0x45, 0x52, 0xd3, 0x34, 0x4d, 0xd2, 0x94, 0xa2, 0x61, 0x9b, 0x8d, 0x44, 0xb3, + 0x4b, 0xca, 0xad, 0x3b, 0x9e, 0x62, 0x20, 0x60, 0xc5, 0x60, 0x42, 0x02, 0x08, 0xb0, 0x54, 0xcc, + 0x1e, 0x3a, 0xd3, 0x63, 0x3b, 0xd3, 0x99, 0x5e, 0x7a, 0xec, 0xa5, 0xd3, 0x5e, 0xdc, 0x5b, 0xff, + 0x83, 0x5e, 0xfb, 0x47, 0x75, 0x3a, 0xfb, 0x76, 0x01, 0x82, 0x92, 0x25, 0x53, 0x9a, 0x76, 0x7a, + 0xdb, 0x7d, 0xdf, 0xfb, 0x76, 0xdf, 0x7b, 0xbf, 0x85, 0xfb, 0x5e, 0xba, 0xb7, 0x9d, 0xf2, 0x28, + 0x71, 0xfb, 0x6c, 0x3b, 0x4e, 0xa2, 0xd3, 0xc0, 0x67, 0xc9, 0xf6, 0xe9, 0xce, 0x31, 0xe3, 0xee, + 0xce, 0x76, 0xc2, 0xd2, 0x68, 0x94, 0x78, 0x2c, 0xad, 0xc7, 0x49, 0xc4, 0x23, 0x72, 0xc7, 0x4b, + 0xf7, 0xea, 0x4a, 0xba, 0x9e, 0x49, 0xd7, 0x95, 0xf4, 0xfa, 0x96, 0xb0, 0x15, 0xf8, 0x2c, 0xe4, + 0x01, 0x1f, 0x6f, 0xf7, 0x93, 0x68, 0x14, 0x5f, 0x64, 0x69, 0xfd, 0xde, 0x94, 0xec, 0x28, 0xbd, + 0xd8, 0xe9, 0xfa, 0xdb, 0x42, 0x94, 0x8f, 0x63, 0x96, 0xe6, 0x22, 0xb8, 0x93, 0x6c, 0xeb, 0xdf, + 0x55, 0x58, 0xa4, 0x4a, 0xa5, 0x15, 0x9e, 0x44, 0x64, 0x07, 0xe6, 0xa2, 0xd8, 0xfd, 0x66, 0xc4, + 0x4c, 0x6d, 0x43, 0xdb, 0x5c, 0xd8, 0xbd, 0x55, 0x17, 0x51, 0x4b, 0x15, 0x65, 0xa0, 0xfe, 0x04, + 0x05, 0xa8, 0x12, 0x24, 0x3f, 0x86, 0x8a, 0xe0, 0x9b, 0xa5, 0x0d, 0x6d, 0x73, 0x79, 0x77, 0xab, + 0x7e, 0xd9, 0x31, 0xeb, 0x99, 0xb3, 0xde, 0x38, 0x66, 0x14, 0xf5, 0xc8, 0xc7, 0x50, 0x0a, 0x7c, + 0xb3, 0x8c, 0xee, 0x3e, 0x78, 0x9d, 0xf6, 0x09, 0x4b, 0x58, 0xe8, 0x31, 0x5a, 0x0a, 0x7c, 0xf2, + 0x53, 0xd0, 0xbd, 0xaf, 0x98, 0xf7, 0x75, 0x3a, 0x1a, 0x9a, 0x15, 0x54, 0xaf, 0xcf, 0xe6, 0xbc, + 0xa9, 0xb4, 0x68, 0xae, 0x4f, 0x08, 0x54, 0x18, 0x77, 0xfb, 0x66, 0x75, 0x43, 0xdb, 0xac, 0x51, + 0x5c, 0x93, 0xdb, 0x50, 0x1b, 0x06, 0x43, 0xe6, 0xe0, 0xe9, 0xe6, 0x90, 0xa1, 0x0b, 0x82, 0x88, + 0x9d, 0xec, 0x42, 0x75, 0xc8, 0x83, 0x21, 0x33, 0xe7, 0xd1, 0xf3, 0x9d, 0x57, 0xe4, 0xa9, 0x17, + 0x0c, 0x59, 0xca, 0xdd, 0x61, 0x4c, 0xa5, 0xa8, 0x70, 0x12, 0xbb, 0xfc, 0x2b, 0x53, 0x97, 0x4e, + 0xc4, 0x9a, 0xfc, 0x02, 0x96, 0x63, 0x96, 0x0c, 0x83, 0x34, 0x0d, 0xa2, 0xd0, 0x49, 0x19, 0x37, + 0x6b, 0x68, 0x70, 0x67, 0xb6, 0xa3, 0x74, 0x72, 0xdd, 0x94, 0x2e, 0x4d, 0x0c, 0x75, 0x19, 0x17, + 0xde, 0xd2, 0xe0, 0xd7, 0xcc, 0x84, 0x0d, 0x6d, 0xb3, 0x42, 0x71, 0x4d, 0x3e, 0x86, 0x6a, 0xf4, + 0x6d, 0xc8, 0x12, 0x73, 0x01, 0x9d, 0xbc, 0x8b, 0x4e, 0xb2, 0x97, 0x54, 0x17, 0x2f, 0x29, 0xf7, + 0x70, 0x94, 0xb2, 0xa4, 0xe5, 0x53, 0x29, 0x4f, 0x6e, 0xc2, 0x1c, 0x77, 0x93, 0x3e, 0xe3, 0xe6, + 0x22, 0x06, 0xaf, 0x76, 0xe4, 0x57, 0x40, 0x3c, 0x37, 0x8c, 0xc2, 0xc0, 0x73, 0x07, 0xce, 0x90, + 0x71, 0xd7, 0x77, 0xb9, 0x6b, 0x2e, 0xa1, 0xf5, 0xed, 0xcb, 0x8f, 0xd0, 0xcc, 0xf4, 0x0e, 0x95, + 0x1a, 0x5d, 0xf5, 0xce, 0x92, 0x84, 0x7d, 0x37, 0x39, 0x0e, 0x78, 0xe2, 0x26, 0xe3, 0x89, 0xfd, + 0xe5, 0x59, 0xec, 0x37, 0x32, 0xbd, 0x89, 0x7d, 0xf7, 0x2c, 0xc9, 0xea, 0xc1, 0xea, 0xb9, 0x38, + 0xc8, 0x17, 0xf9, 0x61, 0xb5, 0xab, 0xbd, 0x4a, 0xa5, 0x66, 0xfd, 0x5d, 0x83, 0xd5, 0x73, 0xee, + 0xc9, 0x33, 0xd0, 0xf3, 0x13, 0x68, 0x1b, 0xe5, 0xcd, 0x85, 0xdd, 0xcf, 0xaf, 0x78, 0x82, 0x7a, + 0xb6, 0xb0, 0x43, 0x9e, 0x8c, 0x69, 0x6e, 0x6e, 0xfd, 0x53, 0x58, 0x9a, 0x62, 0x11, 0x03, 0xca, + 0x5f, 0xb3, 0x31, 0xc6, 0x5f, 0xa3, 0x62, 0x49, 0xd6, 0xa0, 0x7a, 0xea, 0x0e, 0x46, 0xb2, 0x4e, + 0x6b, 0x54, 0x6e, 0x7e, 0x54, 0xfa, 0xa1, 0x66, 0x0d, 0xc0, 0x38, 0x5b, 0x19, 0xe4, 0xa1, 0x2a, + 0x6a, 0x0d, 0x8b, 0x7a, 0xf7, 0x6a, 0x75, 0x55, 0x28, 0x6e, 0x03, 0xca, 0xa2, 0x3c, 0xa5, 0x4f, + 0xb1, 0xb4, 0x7e, 0x03, 0xe6, 0x59, 0xf9, 0x4e, 0x12, 0x44, 0x49, 0xc0, 0xc7, 0xff, 0x35, 0xaf, + 0xeb, 0xa0, 0xc7, 0xca, 0x26, 0xba, 0x5e, 0xa2, 0xf9, 0xde, 0xfa, 0x39, 0xd4, 0xf2, 0x0b, 0x23, + 0x6f, 0x03, 0x28, 0xfb, 0x4e, 0xe0, 0xab, 0x6c, 0xd5, 0x14, 0xa5, 0xe5, 0x93, 0xb7, 0x60, 0x3e, + 0x8c, 0x7c, 0xe4, 0xc9, 0x13, 0xcc, 0x89, 0x6d, 0xcb, 0xcf, 0x2b, 0xb9, 0x3c, 0xa9, 0x64, 0xeb, + 0x6f, 0x55, 0xb8, 0xf1, 0x8a, 0xb2, 0x14, 0x6d, 0xc4, 0xf5, 0x7d, 0xa7, 0x9f, 0xb8, 0xa1, 0x7c, + 0x50, 0x3a, 0xd5, 0x5d, 0xdf, 0x7f, 0x24, 0xf6, 0xe4, 0x1e, 0x18, 0x5e, 0xc2, 0x5c, 0xce, 0x1c, + 0x2f, 0x0a, 0xb9, 0x1b, 0x88, 0xda, 0x2c, 0xa1, 0xcc, 0x8a, 0xa4, 0x37, 0x33, 0xb2, 0x28, 0x41, + 0x9f, 0x0d, 0x18, 0x67, 0xe8, 0x55, 0xa7, 0x6a, 0x47, 0x6e, 0x81, 0xde, 0x67, 0xdc, 0xc1, 0x78, + 0xaa, 0xc8, 0x99, 0xef, 0x33, 0xde, 0x11, 0xcd, 0xe5, 0x36, 0xd4, 0x04, 0xeb, 0x9b, 0x51, 0xc4, + 0x5d, 0xec, 0x60, 0x3a, 0x15, 0xb2, 0x3f, 0x13, 0x7b, 0xf2, 0x7d, 0xb8, 0x19, 0x84, 0x01, 0x0f, + 0x84, 0xf3, 0x93, 0x60, 0xc0, 0x1c, 0x3f, 0xfa, 0x36, 0x1c, 0x44, 0xae, 0x8f, 0x2d, 0x4d, 0xa7, + 0x6b, 0x19, 0xf7, 0x61, 0x30, 0x60, 0x0f, 0x14, 0x8f, 0x7c, 0x08, 0x6b, 0xd3, 0x5a, 0xa3, 0x18, + 0x75, 0x74, 0xd4, 0x21, 0x45, 0x9d, 0x23, 0xe4, 0x90, 0xbb, 0xb0, 0x30, 0x08, 0x52, 0x2e, 0x13, + 0x90, 0x62, 0x7b, 0xd3, 0x29, 0x08, 0x12, 0xa6, 0x20, 0x25, 0xef, 0xc3, 0x32, 0x0a, 0x4c, 0x32, + 0x00, 0x28, 0xb3, 0x24, 0xa8, 0x93, 0xf3, 0xdf, 0x07, 0x82, 0x62, 0xe8, 0xf5, 0x94, 0x25, 0x98, + 0x5d, 0x6c, 0x64, 0x3a, 0x35, 0x04, 0x47, 0xf8, 0x7c, 0xaa, 0xe8, 0xe4, 0x5d, 0x58, 0x44, 0xe9, + 0x84, 0x79, 0x63, 0x6f, 0xc0, 0xb0, 0x6d, 0xe9, 0x14, 0x23, 0xa1, 0x92, 0x24, 0x2e, 0x71, 0x18, + 0x9d, 0x32, 0xec, 0x56, 0x3a, 0xc5, 0xb5, 0x50, 0x4b, 0x98, 0x58, 0xa9, 0xfb, 0x5a, 0x96, 0x6a, + 0x92, 0x26, 0xaf, 0xec, 0x3d, 0x58, 0x8a, 0x47, 0x49, 0x9f, 0xe5, 0xa6, 0x57, 0x50, 0x66, 0x11, + 0x89, 0x99, 0xed, 0x0f, 0x61, 0x2d, 0x61, 0xe2, 0x21, 0xb1, 0xa9, 0x78, 0x4d, 0x43, 0xa6, 0x49, + 0xf1, 0x0a, 0x11, 0x17, 0x35, 0x94, 0x61, 0x27, 0xe0, 0x6c, 0x68, 0xae, 0x4e, 0x69, 0x28, 0xfb, + 0x2d, 0xce, 0x70, 0x66, 0xa5, 0xdc, 0xe5, 0x26, 0x91, 0xf1, 0x8b, 0xb5, 0x88, 0x7f, 0x14, 0xfb, + 0xe2, 0x72, 0x64, 0xfc, 0x37, 0x64, 0xfc, 0x92, 0x86, 0xf1, 0x5b, 0x7f, 0xd6, 0xa0, 0x2a, 0x4f, + 0xf2, 0x05, 0xcc, 0xa3, 0x14, 0xcb, 0xa6, 0xfd, 0xfb, 0x97, 0x57, 0xdc, 0x23, 0x29, 0x4c, 0x33, + 0x2d, 0xd2, 0x85, 0x85, 0xc9, 0xcc, 0x49, 0xf1, 0xe1, 0x5e, 0x6b, 0x72, 0x15, 0xad, 0x58, 0xbf, + 0x2d, 0xc1, 0xbc, 0xf2, 0x44, 0x3e, 0x9f, 0x6a, 0x08, 0xf7, 0x66, 0x0a, 0xaf, 0xd0, 0x07, 0x3e, + 0x83, 0x79, 0x31, 0xd3, 0x9c, 0x1c, 0x5f, 0xbc, 0x7e, 0xe0, 0x3d, 0x7e, 0x83, 0xce, 0x8d, 0x70, + 0x45, 0x7e, 0x02, 0x3a, 0xe2, 0x30, 0xa1, 0x2e, 0xf1, 0xc5, 0x7b, 0xd3, 0xea, 0xc8, 0x2d, 0xb8, + 0x8f, 0x46, 0x31, 0x1a, 0x98, 0xef, 0xcb, 0x65, 0x01, 0x4d, 0x55, 0x67, 0x44, 0x53, 0xfb, 0x15, + 0x81, 0x86, 0xac, 0x3f, 0x6a, 0xb0, 0x50, 0x7c, 0x1c, 0xd7, 0x80, 0x65, 0x6a, 0x02, 0x94, 0x27, + 0x13, 0x20, 0x03, 0x04, 0x95, 0x02, 0x20, 0x58, 0xcb, 0x60, 0x4c, 0x15, 0x89, 0x13, 0xa0, 0x82, + 0x68, 0x68, 0x6e, 0x82, 0x86, 0xac, 0xbf, 0x96, 0x60, 0xa1, 0xf8, 0xfa, 0xfe, 0x0f, 0x48, 0xf1, + 0xfc, 0x91, 0x3e, 0x81, 0x72, 0xc2, 0x4e, 0xd4, 0xed, 0xcc, 0x3c, 0xa6, 0x85, 0x4e, 0x9e, 0x8d, + 0x6a, 0x21, 0x1b, 0x0d, 0x58, 0xc2, 0xa6, 0x2a, 0xa0, 0x18, 0x66, 0x65, 0x6e, 0x06, 0x70, 0xb7, + 0x98, 0xa9, 0x08, 0x92, 0xf5, 0x87, 0x12, 0x90, 0x49, 0xf3, 0xeb, 0x08, 0x94, 0xed, 0x45, 0x83, + 0xeb, 0x64, 0x0b, 0x87, 0x98, 0x54, 0x57, 0xd3, 0x27, 0xdf, 0x93, 0x0f, 0x60, 0x45, 0xf6, 0x5d, + 0x87, 0x85, 0x7e, 0x1c, 0x05, 0x21, 0x57, 0x59, 0x59, 0x96, 0x64, 0x5b, 0x51, 0x49, 0x1f, 0x6e, + 0xb8, 0xa7, 0x6e, 0x30, 0x70, 0x8f, 0x07, 0xcc, 0xc9, 0xd0, 0x6e, 0x6a, 0x56, 0x10, 0x7e, 0xfc, + 0xe0, 0x6a, 0x03, 0x36, 0x1b, 0xd3, 0x94, 0xe4, 0x26, 0x33, 0x56, 0x2a, 0xa6, 0x13, 0x7b, 0x11, + 0x47, 0x29, 0x53, 0x33, 0x48, 0xed, 0xac, 0x97, 0x1a, 0xac, 0x15, 0x07, 0xc8, 0xff, 0x2a, 0x23, + 0xdf, 0x85, 0xd5, 0x6c, 0x7e, 0x9d, 0xcd, 0x89, 0x91, 0x31, 0xf2, 0xac, 0x4c, 0x82, 0xad, 0x4c, + 0x05, 0xfb, 0xa7, 0x32, 0x2c, 0x76, 0x65, 0x3a, 0xba, 0xb1, 0xeb, 0xb1, 0xeb, 0x04, 0xf9, 0x19, + 0x7e, 0x67, 0x64, 0x2b, 0xbc, 0x7f, 0x79, 0x82, 0x8b, 0xae, 0x5a, 0x3e, 0xfe, 0x69, 0x3e, 0xca, + 0x00, 0xba, 0xec, 0x57, 0x77, 0x5f, 0xd3, 0xaf, 0x32, 0x78, 0xfe, 0x29, 0x54, 0x92, 0x28, 0xe2, + 0x57, 0x2d, 0x04, 0x54, 0x12, 0x95, 0x10, 0xba, 0xaa, 0x05, 0xd4, 0x28, 0xae, 0xc9, 0x27, 0x50, + 0x9d, 0xa0, 0x86, 0xac, 0xf1, 0x5d, 0x68, 0x11, 0x01, 0x05, 0x95, 0x1a, 0x88, 0xa9, 0xc4, 0x89, + 0xe4, 0xbf, 0x69, 0x5e, 0x61, 0x2a, 0x41, 0x99, 0xfe, 0x38, 0xe9, 0x33, 0x7f, 0x9c, 0xac, 0xef, + 0xc1, 0xf2, 0x74, 0xae, 0x04, 0xb2, 0x91, 0xf9, 0x9e, 0xe0, 0x36, 0x5d, 0x12, 0x5a, 0xbe, 0xf5, + 0x7b, 0x0d, 0xaa, 0x12, 0xe3, 0x5c, 0xe3, 0xfe, 0xbe, 0x03, 0x2b, 0x78, 0x0e, 0x67, 0xe8, 0xbe, + 0x70, 0x8e, 0xc7, 0x9c, 0xc9, 0xb9, 0x56, 0xa1, 0x4b, 0x48, 0x3e, 0x74, 0x5f, 0xec, 0x0b, 0xe2, + 0xb4, 0x9c, 0x98, 0xf1, 0x29, 0xde, 0x59, 0x41, 0x4e, 0x3c, 0xfb, 0x74, 0xeb, 0x1f, 0xda, 0xe4, + 0x8b, 0x8d, 0x09, 0xb8, 0x05, 0x6f, 0x52, 0xbb, 0xfb, 0xe4, 0x88, 0x36, 0x6d, 0xa7, 0xf7, 0xac, + 0x63, 0x3b, 0xad, 0xf6, 0xd3, 0xc6, 0x41, 0xeb, 0x81, 0xf1, 0x06, 0xb9, 0x09, 0x64, 0x9a, 0xf5, + 0xb0, 0x75, 0x60, 0x1b, 0x1a, 0xb9, 0x0d, 0x6f, 0x4d, 0xd3, 0x9b, 0x4f, 0xda, 0xbd, 0x46, 0xab, + 0x6d, 0x53, 0xa3, 0x74, 0x9e, 0x49, 0xed, 0x87, 0x36, 0xb5, 0xdb, 0x4d, 0xdb, 0x28, 0x9f, 0x77, + 0xd6, 0x7d, 0x76, 0x78, 0xd0, 0x6a, 0x7f, 0x69, 0x54, 0xc8, 0x3a, 0xdc, 0x3c, 0x1b, 0x47, 0xcf, + 0xa6, 0xed, 0xc6, 0x81, 0x51, 0xdd, 0xfa, 0xa7, 0x06, 0x6b, 0xaf, 0xc2, 0xd7, 0xc4, 0x82, 0x77, + 0x72, 0xa5, 0xe6, 0x63, 0xbb, 0xf9, 0x65, 0xf7, 0xe8, 0xf0, 0xec, 0x29, 0x36, 0xe0, 0xce, 0x05, + 0x32, 0x47, 0xed, 0xae, 0xdd, 0x33, 0xb4, 0x4b, 0xac, 0x34, 0x1e, 0x1c, 0xd8, 0x74, 0x6f, 0xd7, + 0x28, 0x91, 0x77, 0x60, 0xfd, 0x02, 0x99, 0xc3, 0x07, 0x1f, 0x19, 0x65, 0x72, 0x17, 0x6e, 0x5f, + 0xc0, 0xef, 0x3e, 0x6e, 0xec, 0x18, 0x95, 0xad, 0xa7, 0xb0, 0x50, 0x40, 0x04, 0xc4, 0x84, 0xb5, + 0x47, 0xb4, 0xd1, 0xee, 0xd9, 0xe7, 0xb2, 0xfe, 0x26, 0xac, 0x4e, 0x71, 0x8e, 0xba, 0x36, 0x35, + 0x34, 0x71, 0x19, 0x53, 0xe4, 0x47, 0xf4, 0xc9, 0x51, 0xc7, 0x28, 0xed, 0xff, 0x4e, 0x83, 0x0d, + 0x2f, 0x1a, 0x5e, 0x5a, 0x11, 0xfb, 0xcb, 0x59, 0xf6, 0x52, 0x6c, 0x78, 0x1d, 0xed, 0x97, 0x2b, + 0x99, 0x8c, 0x12, 0xf9, 0x4b, 0xa9, 0xdc, 0xec, 0x76, 0x5e, 0x96, 0xee, 0x34, 0xd3, 0xbd, 0xac, + 0x13, 0xd4, 0x3b, 0x99, 0x9d, 0xa7, 0x3b, 0xfb, 0x42, 0xe8, 0x5f, 0xc8, 0x7e, 0xae, 0xd8, 0xcf, + 0x33, 0xf6, 0x73, 0xc5, 0x3e, 0x9e, 0xc3, 0xfe, 0xb7, 0xf7, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x2f, 0x8d, 0xd8, 0x64, 0x8a, 0x12, 0x00, 0x00, }