diff --git a/changelog/unreleased/fix-share-locked-file.md b/changelog/unreleased/fix-share-locked-file.md new file mode 100644 index 000000000..015ae3f92 --- /dev/null +++ b/changelog/unreleased/fix-share-locked-file.md @@ -0,0 +1,6 @@ +Enhancement: Fix err when the user share the locked file + +Fix unexpected behavior when the user try to share the locked file + +https://github.com/owncloud/ocis/pull/6357 +https://github.com/owncloud/ocis/issues/6197 diff --git a/go.mod b/go.mod index ec0b5c44b..975653457 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,8 @@ require ( github.com/blevesearch/bleve/v2 v2.3.7 github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.4.0 - github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 - github.com/cs3org/reva/v2 v2.13.4-0.20230522074943-fde10c4f3dea + github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d + github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3 github.com/disintegration/imaging v1.6.2 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e github.com/egirna/icap-client v0.1.1 @@ -320,4 +320,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/cs3org/go-cs3apis => github.com/c0rby/go-cs3apis v0.0.0-20230110100311-5b424f1baa35 +replace github.com/cs3org/go-cs3apis => github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1 diff --git a/go.sum b/go.sum index 2163c451e..a63aa53f2 100644 --- a/go.sum +++ b/go.sum @@ -388,6 +388,8 @@ contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRq contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1 h1:dOIG9lXUo5CAZbjlegvZpeTqfAlH+zn+0uXbtlZjCPY= +github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= @@ -562,8 +564,6 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBW github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HVHpXvjfy0Dy7g6fuA= github.com/c-bata/go-prompt v0.2.5/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw= -github.com/c0rby/go-cs3apis v0.0.0-20230110100311-5b424f1baa35 h1:bbpRY/l4z5MTH+TRGZdkIqDM9JXQQewJdO1o+80zcok= -github.com/c0rby/go-cs3apis v0.0.0-20230110100311-5b424f1baa35/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -627,8 +627,8 @@ github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4= github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc= github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA= -github.com/cs3org/reva/v2 v2.13.4-0.20230522074943-fde10c4f3dea h1:UDl1PP9Ydr/0NE1pXPzYSUJrmltFottU9QKcFgf4o40= -github.com/cs3org/reva/v2 v2.13.4-0.20230522074943-fde10c4f3dea/go.mod h1:MoymB39kU/myG7LFkaCwqtoXQHct+/8uoZAvJEmNi+I= +github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3 h1:YGqR0xnslU9wkQ8/XhZE0fJ87u5meecdvOQ15VKFiFM= +github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3/go.mod h1:jkngU/36YdFNQfFurjgKl8URY2dkhwgJ5gQXt1GUoPw= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= diff --git a/vendor/github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1/gateway_api.pb.go b/vendor/github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1/gateway_api.pb.go index 9dbf251a7..b07d01938 100644 --- a/vendor/github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1/gateway_api.pb.go +++ b/vendor/github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1/gateway_api.pb.go @@ -680,179 +680,179 @@ func init() { } var fileDescriptor_2d35d050f2c88549 = []byte{ - // 2749 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0xdb, 0x73, 0xdc, 0xb6, - 0xf5, 0xfe, 0x51, 0x72, 0x14, 0x0b, 0xb2, 0x64, 0x19, 0xb2, 0x63, 0x45, 0xc9, 0x6f, 0xea, 0x51, - 0xe2, 0xd8, 0x8e, 0xed, 0x95, 0x2d, 0xd9, 0x4e, 0x1c, 0x27, 0x9d, 0x59, 0x5d, 0xbc, 0xd9, 0xb1, - 0x15, 0x29, 0xbb, 0x96, 0x9c, 0x74, 0xdc, 0x51, 0x28, 0x2e, 0x24, 0x71, 0xc4, 0x25, 0x69, 0x10, - 0x2b, 0x79, 0x3b, 0x69, 0xda, 0x4e, 0x33, 0xbd, 0x4c, 0xdb, 0x87, 0xde, 0x5e, 0xfb, 0xd0, 0xb7, - 0xf4, 0xff, 0xe8, 0x74, 0xa6, 0x7d, 0xeb, 0x3f, 0xd4, 0x0e, 0xc0, 0x03, 0x12, 0x20, 0xb9, 0x4b, - 0x50, 0x9e, 0x71, 0xdf, 0xb4, 0xc0, 0xf7, 0x9d, 0xf3, 0xe1, 0xe0, 0x76, 0x00, 0x42, 0xe8, 0xb2, - 0x13, 0x2d, 0x2d, 0xec, 0xdb, 0x8c, 0x1c, 0xdb, 0xfd, 0x85, 0xa3, 0xdb, 0xbb, 0x84, 0xd9, 0xb7, - 0xe5, 0xef, 0x1d, 0x3b, 0x74, 0x6b, 0x21, 0x0d, 0x58, 0x80, 0x67, 0x9c, 0x68, 0xa9, 0x06, 0xc5, - 0x35, 0x80, 0xcd, 0x5d, 0xe7, 0x5c, 0x3b, 0x0c, 0x17, 0x42, 0x1a, 0x1c, 0xb9, 0x1d, 0x42, 0x13, - 0x03, 0xb2, 0x20, 0xb5, 0x90, 0x82, 0x29, 0xd9, 0x77, 0x23, 0x46, 0x53, 0x6f, 0xb2, 0x40, 0x01, - 0xdf, 0x11, 0xe0, 0x1e, 0x3b, 0xe0, 0x0c, 0xcf, 0x75, 0x6c, 0xe6, 0x06, 0x7e, 0x94, 0x30, 0xd4, - 0x42, 0x85, 0x75, 0x23, 0x61, 0x99, 0xf8, 0x78, 0xa7, 0xa8, 0xe5, 0x94, 0x44, 0x41, 0x8f, 0x3a, - 0x24, 0x02, 0xd0, 0xfb, 0x1c, 0xe4, 0x76, 0x88, 0xcf, 0x5c, 0xd6, 0x5f, 0xd8, 0xa7, 0x41, 0x2f, - 0x4c, 0xa3, 0xc4, 0x7f, 0x29, 0x06, 0xaf, 0x69, 0xd8, 0x5e, 0xa4, 0xc4, 0x23, 0x6b, 0xf6, 0xea, - 0x60, 0x28, 0xff, 0xa1, 0x18, 0xbd, 0xc2, 0x91, 0x81, 0xd3, 0x5d, 0x70, 0x02, 0x4a, 0x12, 0x50, - 0xe0, 0x74, 0x77, 0x78, 0x41, 0x11, 0xd0, 0xf5, 0x8f, 0x5c, 0x96, 0x42, 0xe3, 0x9f, 0xd9, 0x8e, - 0xe0, 0x40, 0x93, 0x5e, 0xbb, 0xc9, 0xc1, 0x21, 0xa1, 0x5d, 0x37, 0x8a, 0xb4, 0x2e, 0x50, 0xca, - 0x72, 0x70, 0x4a, 0xf6, 0x08, 0x25, 0xbe, 0x43, 0x14, 0x78, 0x5a, 0xa6, 0xc0, 0xdf, 0xe6, 0x70, - 0x1a, 0x3a, 0x09, 0x2c, 0x62, 0x36, 0xeb, 0xc9, 0x20, 0xdd, 0xe7, 0xb5, 0xd1, 0x81, 0x4d, 0x5d, - 0x7f, 0x7f, 0xc1, 0x09, 0x3c, 0xcf, 0xde, 0x0d, 0xa8, 0xe8, 0xf4, 0x04, 0xaf, 0x95, 0x66, 0x83, - 0x21, 0xa9, 0x9e, 0xeb, 0x1f, 0x26, 0x0c, 0xfe, 0x43, 0x01, 0x5e, 0x56, 0x81, 0x3c, 0x28, 0x6a, - 0x84, 0x53, 0xd8, 0x82, 0x80, 0xb1, 0x80, 0xda, 0xfb, 0xc4, 0x28, 0x6e, 0x37, 0x86, 0x12, 0xb2, - 0xc3, 0xe1, 0x2d, 0x8e, 0x66, 0x2f, 0x92, 0x7a, 0xf6, 0x42, 0x31, 0xf5, 0xff, 0xa2, 0xb2, 0x1f, - 0x2a, 0xd1, 0x14, 0xbf, 0xe2, 0xea, 0xf9, 0xbf, 0x58, 0x68, 0xa6, 0xde, 0x63, 0x07, 0x7c, 0x2c, - 0x39, 0x36, 0x23, 0x2d, 0xf2, 0xbc, 0x47, 0x22, 0x86, 0x6f, 0xa3, 0xb1, 0x20, 0xb4, 0x9f, 0xf7, - 0xc8, 0xac, 0x75, 0xc9, 0xba, 0x3a, 0xb1, 0xf8, 0x66, 0x8d, 0x4f, 0xe1, 0x98, 0x09, 0x76, 0x6a, - 0x1b, 0x02, 0xd0, 0x02, 0x20, 0xc6, 0xe8, 0x14, 0xaf, 0x9f, 0x1d, 0xb9, 0x64, 0x5d, 0x1d, 0x6f, - 0x89, 0xbf, 0xf1, 0x5b, 0x68, 0xdc, 0xf1, 0x5c, 0xe2, 0xb3, 0x1d, 0xb7, 0x33, 0x3b, 0x2a, 0x2a, - 0x4e, 0xc7, 0x05, 0xcd, 0x0e, 0x7e, 0x07, 0x4d, 0x42, 0x65, 0x44, 0x1c, 0x4a, 0xd8, 0xec, 0x29, - 0x01, 0x38, 0x13, 0x17, 0xb6, 0x45, 0xd9, 0xfc, 0xdf, 0x2d, 0x74, 0x5e, 0x17, 0x18, 0x85, 0x81, - 0x1f, 0x11, 0xbc, 0x80, 0xc6, 0xe2, 0xfe, 0x06, 0x85, 0x17, 0x85, 0x42, 0x1a, 0x3a, 0x89, 0xbe, - 0xb6, 0xa8, 0x6e, 0x01, 0x4c, 0x69, 0xd2, 0x88, 0x69, 0x93, 0xce, 0xa3, 0xd7, 0x58, 0x70, 0x48, - 0x7c, 0x90, 0x1e, 0xff, 0xc0, 0x4b, 0xe8, 0x14, 0x9f, 0x66, 0x42, 0xee, 0xc4, 0xe2, 0xf7, 0x84, - 0x19, 0x39, 0x1b, 0x6b, 0xbc, 0x26, 0x31, 0xb7, 0x15, 0x11, 0xda, 0x12, 0xe0, 0xf9, 0x2f, 0xd0, - 0xe4, 0xd3, 0x83, 0xa0, 0xde, 0x6d, 0xbe, 0x44, 0x84, 0x13, 0x39, 0x23, 0x8a, 0x9c, 0xf9, 0xef, - 0x2c, 0x34, 0x25, 0x4d, 0xbf, 0xc2, 0xd8, 0xc8, 0x28, 0x8c, 0x56, 0x89, 0xc2, 0x4f, 0xd0, 0xd9, - 0x06, 0x61, 0x9f, 0xf7, 0x02, 0x66, 0xbf, 0x44, 0x1c, 0xee, 0xa3, 0x51, 0x4a, 0xf6, 0x40, 0xea, - 0x15, 0x81, 0x87, 0xc9, 0x52, 0x93, 0x93, 0x25, 0xa1, 0xb6, 0xe4, 0xca, 0xd1, 0xe2, 0x9c, 0xf9, - 0x7f, 0x59, 0xe8, 0xed, 0xa6, 0xef, 0x32, 0xd7, 0x66, 0xe4, 0xa1, 0xeb, 0x91, 0xd5, 0xe0, 0xd8, - 0xf7, 0x02, 0xbb, 0xf3, 0x4a, 0x43, 0xd7, 0x40, 0xe3, 0x62, 0xf6, 0x39, 0x81, 0x17, 0xcd, 0x8e, - 0x5e, 0x1a, 0xbd, 0x3a, 0xb1, 0x78, 0xad, 0x56, 0xb0, 0x45, 0xd6, 0x54, 0x85, 0x9b, 0xc0, 0x68, - 0xa5, 0xdc, 0xf9, 0x7f, 0x58, 0x68, 0x4e, 0x6d, 0xcd, 0x56, 0xf8, 0xca, 0xdb, 0xb2, 0x96, 0x6f, - 0xcb, 0x95, 0x81, 0x6d, 0x89, 0xf5, 0x15, 0xb5, 0xe4, 0xcf, 0x16, 0x7a, 0xf3, 0xb1, 0x1b, 0x31, - 0x3e, 0xd5, 0x37, 0xa1, 0x0f, 0xa3, 0x57, 0x3e, 0xd7, 0x79, 0xbd, 0x68, 0x04, 0x9f, 0x5c, 0xfc, - 0xc7, 0xfc, 0x7f, 0x46, 0xd0, 0xf4, 0x46, 0x48, 0xfc, 0xa6, 0x5f, 0x0f, 0xc3, 0xff, 0xc9, 0x90, - 0xc5, 0x8f, 0xd0, 0xf8, 0x91, 0x4b, 0x8e, 0x77, 0xba, 0x41, 0x87, 0x88, 0xd9, 0x36, 0xb5, 0x58, - 0x2b, 0x8c, 0x70, 0x56, 0x67, 0x6d, 0xdb, 0x25, 0xc7, 0xeb, 0x41, 0x87, 0xb4, 0x4e, 0x1f, 0xc1, - 0x5f, 0x78, 0x1a, 0x8d, 0xda, 0x61, 0x08, 0x2b, 0x2d, 0xff, 0x13, 0x5f, 0x44, 0xaf, 0x7b, 0x81, - 0x73, 0xc8, 0x17, 0xe8, 0xd7, 0x44, 0xe9, 0x18, 0xff, 0xd9, 0xec, 0xcc, 0x7f, 0x6b, 0xa1, 0xd3, - 0xd2, 0x02, 0xbe, 0x80, 0xce, 0x6d, 0x37, 0xd7, 0x9e, 0xee, 0xac, 0x6f, 0xac, 0xae, 0xed, 0x34, - 0x3f, 0xdb, 0xae, 0x3f, 0x6e, 0xae, 0x4e, 0xff, 0x1f, 0xbe, 0x88, 0x66, 0xd2, 0x62, 0xf1, 0xd7, - 0xc6, 0x67, 0x8f, 0xbf, 0x9c, 0xb6, 0xf4, 0x8a, 0xd6, 0x5a, 0x7d, 0x35, 0xae, 0x18, 0xc1, 0xb3, - 0xe8, 0x7c, 0xa6, 0xe2, 0x69, 0xab, 0xf9, 0x64, 0x6d, 0x7a, 0x54, 0x77, 0xb1, 0xd9, 0x5a, 0xe3, - 0x3f, 0xa6, 0x4f, 0x2d, 0xfe, 0x7b, 0x1b, 0xa1, 0x46, 0xdc, 0xd2, 0xfa, 0x66, 0x13, 0x3b, 0xe8, - 0x8c, 0xba, 0x1d, 0xe0, 0xab, 0x85, 0xa1, 0x28, 0xd8, 0xd2, 0xe6, 0xae, 0x19, 0x20, 0x61, 0xbc, - 0x7d, 0x8e, 0xc6, 0xe2, 0x15, 0x15, 0xcf, 0x17, 0x92, 0xb4, 0x95, 0x7c, 0xee, 0x9d, 0xa1, 0x18, - 0x30, 0xf9, 0x5b, 0x0b, 0xcd, 0x34, 0x88, 0x4f, 0xa8, 0xcd, 0x48, 0x3d, 0x0c, 0x37, 0xed, 0x28, - 0x3a, 0x0e, 0x68, 0x07, 0xdf, 0x17, 0x64, 0x9e, 0x76, 0xd6, 0xd4, 0xbc, 0x34, 0x31, 0x53, 0xc0, - 0x91, 0x7e, 0x3f, 0x3a, 0x09, 0x15, 0xe4, 0xfc, 0xdc, 0x42, 0xd3, 0x62, 0xbe, 0xa5, 0x75, 0x11, - 0xbe, 0x57, 0x62, 0x30, 0x4b, 0x90, 0x42, 0x3e, 0xa8, 0xcc, 0x03, 0x15, 0x7f, 0xb0, 0xd0, 0x85, - 0xa6, 0x7f, 0x64, 0x7b, 0x6e, 0x27, 0x13, 0x96, 0x07, 0x25, 0x26, 0x0b, 0x59, 0x52, 0xcf, 0xc7, - 0x27, 0x23, 0x83, 0xa8, 0x1f, 0xa3, 0xa9, 0x06, 0x51, 0xf5, 0xe2, 0x3b, 0xa5, 0x81, 0x66, 0x05, - 0x2a, 0xee, 0x56, 0x64, 0x81, 0xfb, 0x6f, 0xd0, 0xd9, 0x15, 0x4a, 0x6c, 0x46, 0x56, 0x02, 0x9f, - 0xd9, 0xae, 0x4f, 0x28, 0xf8, 0x1f, 0xb8, 0x5e, 0x64, 0xe0, 0xba, 0x7f, 0x73, 0x16, 0xf8, 0xf7, - 0xd0, 0xf8, 0x93, 0xa0, 0xe7, 0x1c, 0xf0, 0xf5, 0x1a, 0xd7, 0x86, 0xdb, 0x48, 0x80, 0xd2, 0xe7, - 0x82, 0x31, 0x1e, 0xbc, 0x39, 0x68, 0x6c, 0x95, 0x78, 0x84, 0x11, 0x7c, 0x7d, 0x38, 0x35, 0x46, - 0x49, 0x3f, 0x37, 0xcc, 0xc0, 0xe0, 0x64, 0x0f, 0xbd, 0xde, 0x20, 0x6c, 0xd3, 0x66, 0x07, 0xb8, - 0x84, 0x08, 0x30, 0xe9, 0xe6, 0xa6, 0x21, 0x1a, 0xfc, 0x7c, 0x85, 0x4e, 0xcb, 0xec, 0x06, 0xbf, - 0x5b, 0xb8, 0x28, 0x64, 0x92, 0x9f, 0xb9, 0x5a, 0xa9, 0x03, 0x80, 0x83, 0x87, 0x6f, 0x2d, 0x74, - 0xbe, 0x28, 0x7d, 0x81, 0x65, 0x64, 0xa0, 0xa1, 0xe2, 0x94, 0x27, 0xd6, 0x70, 0xbb, 0x50, 0xe9, - 0xd0, 0x24, 0xe9, 0x1b, 0x84, 0xf3, 0x69, 0x07, 0xfe, 0xc0, 0x5c, 0x83, 0x4c, 0x54, 0xd4, 0x51, - 0x33, 0x4c, 0x41, 0x26, 0xb1, 0xe1, 0x8b, 0x29, 0x5f, 0x54, 0x92, 0xd1, 0xdb, 0x66, 0x94, 0xd8, - 0x5d, 0xfc, 0xe1, 0x70, 0x05, 0x05, 0x14, 0x29, 0xe1, 0xfe, 0x09, 0x98, 0xb1, 0x98, 0x5b, 0x16, - 0x7e, 0x81, 0x26, 0x35, 0x00, 0x5e, 0xac, 0x60, 0x4d, 0x2a, 0x58, 0xaa, 0xc4, 0x81, 0x40, 0xfc, - 0x0c, 0x96, 0x71, 0x1e, 0xa3, 0x6d, 0x42, 0xc5, 0x81, 0x1a, 0xdf, 0x2d, 0xb7, 0xa4, 0xe2, 0xa5, - 0x80, 0x7b, 0x55, 0x69, 0xa0, 0xe1, 0x17, 0x16, 0x3a, 0xc7, 0x2b, 0x5b, 0xc4, 0xe9, 0x3b, 0x1e, - 0x81, 0xae, 0x30, 0xb0, 0xa6, 0x11, 0xf4, 0xbd, 0xa4, 0x0a, 0x2f, 0xe9, 0x06, 0x8a, 0x26, 0x94, - 0x6a, 0x7c, 0xcb, 0xd8, 0x92, 0x3e, 0x13, 0xcc, 0x18, 0xd0, 0xf8, 0x1f, 0xa2, 0x53, 0xeb, 0xc1, - 0x11, 0xc1, 0xd7, 0x86, 0x53, 0x39, 0x46, 0x7a, 0x79, 0xdf, 0x04, 0x0a, 0xe6, 0x7b, 0xe8, 0xcc, - 0x66, 0x8f, 0xee, 0x13, 0xd9, 0xa6, 0x12, 0x85, 0x2a, 0x56, 0xba, 0x5b, 0xac, 0x42, 0x01, 0xb7, - 0xbf, 0xb4, 0x10, 0x6e, 0x11, 0xce, 0x21, 0x4a, 0x97, 0x97, 0x4d, 0xf0, 0x3c, 0x43, 0x6a, 0xf8, - 0xb0, 0x3a, 0x31, 0xaf, 0x04, 0x44, 0x36, 0x19, 0xe9, 0x1a, 0x2a, 0x51, 0x18, 0xd5, 0x94, 0x68, - 0xc4, 0xb4, 0xa7, 0xf9, 0x21, 0xa3, 0xac, 0xa7, 0x39, 0xc6, 0xb0, 0xa7, 0x63, 0x28, 0x98, 0x7f, - 0x81, 0x26, 0xe3, 0x1d, 0xb9, 0xdd, 0xef, 0x7a, 0xae, 0x7f, 0x58, 0xb6, 0x86, 0x68, 0x60, 0xc3, - 0x35, 0x24, 0xc3, 0x01, 0xcf, 0xbf, 0xb3, 0xd0, 0xf9, 0x36, 0x61, 0x75, 0xba, 0xeb, 0x32, 0x6a, - 0xd3, 0xfe, 0x3a, 0x61, 0x76, 0xc7, 0x66, 0x76, 0xd9, 0x9e, 0x52, 0xc4, 0xd1, 0x53, 0xd3, 0x8a, - 0x54, 0xd0, 0xf3, 0x47, 0x0b, 0xbd, 0xb1, 0xe5, 0x47, 0x45, 0x8a, 0x1e, 0x0c, 0x37, 0x5b, 0xcc, - 0xd2, 0xb3, 0xc2, 0xca, 0xe4, 0x34, 0x87, 0x68, 0x13, 0xf6, 0x38, 0x70, 0x0e, 0xcb, 0x72, 0x08, - 0x80, 0x19, 0xe6, 0x10, 0x09, 0x5a, 0xcb, 0x55, 0x4c, 0xfc, 0x34, 0x2a, 0xf9, 0x69, 0x64, 0xfc, - 0x50, 0x34, 0xd1, 0x22, 0x7b, 0x94, 0x44, 0x07, 0xc2, 0xd7, 0xad, 0xd2, 0x23, 0xa9, 0x84, 0x1a, - 0x2e, 0x96, 0x1a, 0x23, 0x4d, 0xf6, 0xb6, 0x7c, 0x7e, 0xba, 0x2c, 0x4b, 0xf6, 0x62, 0x94, 0x61, - 0xb2, 0x27, 0xc1, 0xe0, 0x24, 0x40, 0x28, 0x1e, 0xe7, 0x9f, 0x06, 0x5d, 0x82, 0x17, 0x4c, 0x66, - 0x04, 0x47, 0x4a, 0x67, 0xb7, 0xcc, 0x09, 0xca, 0x12, 0x05, 0x33, 0x2b, 0x66, 0xb5, 0x43, 0xdb, - 0x21, 0x65, 0x4b, 0x54, 0x9e, 0x61, 0xb8, 0x44, 0x15, 0x11, 0xd3, 0xec, 0x50, 0xec, 0xc4, 0x6a, - 0x65, 0x64, 0xb2, 0x13, 0x6b, 0x84, 0x0a, 0x3b, 0x71, 0x86, 0xa7, 0x04, 0x64, 0x2b, 0xec, 0x54, - 0x0c, 0x48, 0x9e, 0x61, 0x18, 0x90, 0x22, 0xa2, 0xa2, 0x24, 0x3e, 0x0b, 0x54, 0x51, 0x92, 0x67, - 0x18, 0x2a, 0x29, 0x22, 0x82, 0x92, 0x1d, 0x34, 0x9e, 0x5c, 0xcf, 0xe0, 0xcb, 0x46, 0xd7, 0x37, - 0x73, 0xf1, 0x24, 0xb1, 0xc3, 0x30, 0xef, 0x49, 0xc1, 0x82, 0x83, 0xaf, 0xd1, 0x04, 0x8c, 0x8c, - 0x03, 0x9b, 0x12, 0x99, 0x03, 0xc6, 0x9f, 0x26, 0x6a, 0xda, 0x87, 0x8e, 0xec, 0x48, 0xe2, 0xf8, - 0x4c, 0x0e, 0x68, 0x4e, 0x4b, 0xbd, 0xb7, 0x48, 0x37, 0x38, 0xaa, 0xe0, 0x5d, 0xc1, 0x57, 0xf1, - 0xae, 0xd1, 0xc0, 0x7b, 0x24, 0xce, 0x5d, 0xb1, 0xeb, 0x45, 0x03, 0x1b, 0x12, 0x9c, 0xd9, 0x36, - 0x0d, 0x39, 0xe0, 0xb4, 0x8f, 0x90, 0x98, 0x02, 0xbc, 0x30, 0x92, 0x47, 0xf4, 0xa1, 0x26, 0x52, - 0x78, 0xe6, 0x88, 0x6e, 0xcc, 0x4a, 0xa3, 0x0d, 0x83, 0xde, 0x38, 0xda, 0x0a, 0xbe, 0x4a, 0xb4, - 0x35, 0x1a, 0x78, 0xff, 0xbd, 0x85, 0x30, 0xa4, 0xc2, 0xc4, 0x3d, 0x22, 0x1d, 0x88, 0xc0, 0xc7, - 0x86, 0x6d, 0xd1, 0x69, 0x52, 0xcc, 0x27, 0x27, 0x64, 0x83, 0xa6, 0x3f, 0x59, 0x68, 0x26, 0xd6, - 0xaa, 0x01, 0xf0, 0x27, 0xc6, 0x6d, 0xd4, 0x78, 0x52, 0xd5, 0xf7, 0x4f, 0x4a, 0x07, 0x59, 0xbf, - 0xb1, 0xd0, 0x74, 0x83, 0xe8, 0xa2, 0xf1, 0x47, 0x66, 0xa3, 0xad, 0x50, 0xd0, 0x83, 0x13, 0x71, - 0x41, 0xcd, 0x97, 0x68, 0xac, 0x4d, 0xd8, 0x23, 0xd2, 0xc7, 0xef, 0x09, 0x33, 0xca, 0x57, 0x55, - 0x35, 0x1d, 0x79, 0x44, 0xfa, 0xd2, 0xdd, 0x95, 0x52, 0x5c, 0x6a, 0xba, 0x51, 0x66, 0xba, 0x61, - 0x68, 0xba, 0xa1, 0x9b, 0xfe, 0x1a, 0x9d, 0x8b, 0x57, 0x9c, 0xcd, 0xde, 0xae, 0xe7, 0x3a, 0x45, - 0xb3, 0x9c, 0xa7, 0xb3, 0x99, 0xe5, 0x49, 0x01, 0x17, 0xcf, 0xf2, 0x32, 0x4e, 0xea, 0x3d, 0x5e, - 0x71, 0x0c, 0xbd, 0xe7, 0xc0, 0x06, 0xde, 0x0b, 0x38, 0xc9, 0xc2, 0x36, 0xd5, 0x20, 0x4c, 0x75, - 0xbd, 0x30, 0xd8, 0x8c, 0x8e, 0xcc, 0xe4, 0x33, 0x26, 0x04, 0x70, 0xfa, 0x2b, 0x0b, 0x5d, 0xd0, - 0xab, 0x96, 0xfb, 0x4f, 0xc4, 0x87, 0xcf, 0x7b, 0xa6, 0xb6, 0x80, 0x90, 0xc9, 0x24, 0x2a, 0xf0, - 0x92, 0x35, 0x56, 0xdc, 0x6e, 0x28, 0x88, 0x48, 0x1e, 0x81, 0x8b, 0x8c, 0x65, 0xb1, 0x99, 0x23, - 0xb0, 0x19, 0x25, 0xed, 0xf8, 0x78, 0x66, 0x1b, 0x76, 0x7c, 0x0e, 0x6c, 0xd0, 0xf1, 0x05, 0x1c, - 0xf0, 0xfe, 0x1c, 0x4d, 0xc5, 0x63, 0x72, 0x63, 0x65, 0x3d, 0x76, 0x5d, 0xd3, 0xcc, 0x04, 0x4e, - 0x37, 0x33, 0x78, 0x25, 0x30, 0x73, 0x13, 0x6b, 0x80, 0x4f, 0x5d, 0xc6, 0x03, 0xd1, 0xc0, 0xa5, - 0x0e, 0x2c, 0x77, 0x99, 0xc5, 0x83, 0xcb, 0x03, 0x34, 0xd1, 0x20, 0x2c, 0xf1, 0x77, 0x7d, 0x20, - 0x5f, 0x41, 0x65, 0x0e, 0x05, 0x65, 0x60, 0xf0, 0xe4, 0xc7, 0x37, 0x74, 0xb2, 0x3c, 0xc2, 0x37, - 0x07, 0xd2, 0x35, 0x5c, 0xe6, 0x9e, 0xb6, 0x1c, 0x9e, 0x06, 0x33, 0xee, 0x5c, 0x83, 0x60, 0xea, - 0xc0, 0xf2, 0x60, 0x66, 0xf1, 0xe9, 0x35, 0xdc, 0x05, 0x75, 0x87, 0x4c, 0xdb, 0x7a, 0x77, 0xa8, - 0xf8, 0x1c, 0xbe, 0x38, 0x3f, 0x30, 0xa0, 0x81, 0x90, 0x5f, 0xf3, 0xf3, 0xbb, 0xb6, 0x29, 0x26, - 0x41, 0xb8, 0x57, 0xd2, 0xa8, 0x2c, 0xa1, 0x78, 0x01, 0x31, 0xe1, 0x81, 0x96, 0x9f, 0x8a, 0xaf, - 0x6e, 0x39, 0xb1, 0x78, 0x69, 0xd8, 0xe8, 0x19, 0xa4, 0xe2, 0x4e, 0x35, 0x12, 0x48, 0x38, 0x12, - 0x4f, 0x1e, 0xea, 0x61, 0x98, 0x7c, 0xd6, 0x86, 0xc3, 0x36, 0x4f, 0xec, 0xe5, 0xc3, 0xb2, 0xec, - 0x47, 0xa1, 0xf4, 0x0b, 0xb8, 0x7a, 0xd8, 0x36, 0x63, 0xa4, 0x7b, 0x47, 0xbd, 0xd3, 0x51, 0xaa, - 0x60, 0xef, 0x28, 0x34, 0xa2, 0x23, 0xf5, 0xbd, 0xc3, 0x88, 0xa0, 0x2f, 0xd8, 0x5a, 0x6b, 0x87, - 0x68, 0xcf, 0x62, 0xf5, 0x05, 0xdb, 0x90, 0x92, 0xe6, 0x5a, 0x6f, 0x88, 0x5c, 0xb9, 0x17, 0x86, - 0x01, 0x65, 0xa4, 0xb3, 0xee, 0x76, 0xc9, 0x93, 0x7e, 0x48, 0x22, 0x38, 0xef, 0x0d, 0x34, 0x97, - 0x67, 0xe8, 0xe7, 0xbd, 0x4a, 0x44, 0x50, 0xf3, 0x9d, 0x85, 0x2e, 0x35, 0x08, 0x5b, 0x25, 0x7b, - 0x76, 0xcf, 0x53, 0x05, 0x3f, 0x0c, 0xa8, 0x44, 0xe3, 0xfa, 0xd0, 0x5e, 0x1d, 0xca, 0x95, 0x0a, - 0x97, 0x5f, 0xc6, 0x84, 0xa2, 0xb5, 0xfd, 0x12, 0x5a, 0xdb, 0x2f, 0xaf, 0xb5, 0x6d, 0xaa, 0xf5, - 0x2b, 0x71, 0x3d, 0xb6, 0x15, 0x11, 0x0a, 0x17, 0xb1, 0xc5, 0x4f, 0x8e, 0x00, 0xa3, 0x5f, 0xc4, - 0x96, 0x40, 0x93, 0x2b, 0xf7, 0x29, 0x28, 0x5a, 0xee, 0xaf, 0x78, 0xb6, 0xdb, 0x85, 0xe9, 0x3a, - 0x94, 0x0d, 0x50, 0x7d, 0xba, 0x9a, 0x31, 0x92, 0xfb, 0xb8, 0x49, 0xa8, 0x69, 0xd0, 0xa0, 0x17, - 0x46, 0x30, 0x5b, 0x87, 0xda, 0x88, 0x91, 0xfa, 0x6c, 0x35, 0x22, 0x24, 0x77, 0x8d, 0xe3, 0x0f, - 0x5d, 0xbf, 0xc3, 0x6b, 0x22, 0xd8, 0x7d, 0x8b, 0xe9, 0x09, 0x4a, 0xdf, 0x7d, 0x4b, 0xc1, 0xe0, - 0x87, 0x88, 0xf3, 0xb9, 0x70, 0x9e, 0x75, 0x23, 0x5e, 0xc1, 0xaa, 0x32, 0x05, 0x6a, 0x80, 0x9b, - 0x41, 0x60, 0x70, 0xf3, 0x23, 0xb1, 0xd2, 0x8a, 0x32, 0xd9, 0x75, 0x8b, 0x26, 0x06, 0x32, 0x9d, - 0xb7, 0x54, 0x89, 0x03, 0xbe, 0x0f, 0x11, 0x6a, 0x10, 0xb6, 0x4e, 0xba, 0xbb, 0x3c, 0x96, 0x37, - 0x4b, 0x4c, 0x00, 0x4e, 0xcf, 0x2e, 0x0c, 0xe0, 0x49, 0xde, 0x34, 0xfe, 0xa9, 0x1d, 0xc5, 0xa5, - 0x78, 0x68, 0x8c, 0x12, 0x98, 0x7e, 0x4b, 0x5c, 0x8e, 0x4e, 0x9b, 0xc5, 0xbb, 0x13, 0x86, 0xe4, - 0x50, 0x72, 0x8a, 0x33, 0x6a, 0x96, 0x0a, 0x4f, 0x3e, 0x81, 0x9c, 0xcb, 0x3d, 0x01, 0x83, 0x9d, - 0x5a, 0xbc, 0xa2, 0x28, 0xde, 0x0b, 0xf4, 0x07, 0x63, 0xaa, 0xe7, 0xec, 0x05, 0xdb, 0xe0, 0xf7, - 0x65, 0xf1, 0xa5, 0xbb, 0xb8, 0x30, 0x2e, 0xbf, 0x74, 0x57, 0x6f, 0x8b, 0x6f, 0x1a, 0xa2, 0x93, - 0xef, 0xe6, 0xc9, 0x1b, 0xa0, 0xa6, 0x78, 0x58, 0x1d, 0x9f, 0xab, 0xe2, 0x51, 0xca, 0x13, 0x8a, - 0xf8, 0xb9, 0x75, 0xee, 0x05, 0x8f, 0x02, 0xd6, 0x47, 0xa9, 0x29, 0x27, 0x79, 0xdb, 0x31, 0xf9, - 0x30, 0xa0, 0xc7, 0x36, 0xed, 0xc4, 0xb5, 0xd0, 0xda, 0x02, 0x2b, 0x1a, 0x4c, 0x6f, 0x6d, 0x39, - 0x1a, 0xbc, 0xb9, 0xe8, 0x4c, 0xdd, 0x71, 0x48, 0xc8, 0xc0, 0xd9, 0xf5, 0x41, 0x74, 0x15, 0xa5, - 0x4f, 0xfd, 0x52, 0x70, 0xb2, 0x7a, 0x8a, 0x24, 0x4b, 0x54, 0x11, 0xb1, 0xfa, 0x40, 0xc2, 0x5d, - 0x18, 0x20, 0x0d, 0xa8, 0x27, 0xdc, 0x26, 0xf8, 0x74, 0xb8, 0xf2, 0x41, 0xac, 0xd6, 0xc9, 0xd4, - 0xae, 0x28, 0x44, 0x59, 0xa8, 0xbe, 0x57, 0x98, 0x31, 0xd2, 0xb3, 0x69, 0x33, 0x92, 0xa3, 0xb8, - 0xee, 0x79, 0xc1, 0x31, 0xe9, 0x28, 0x83, 0x28, 0xff, 0xf2, 0x22, 0x0b, 0xce, 0x0f, 0x22, 0x13, - 0x8e, 0x96, 0xd0, 0x36, 0xfd, 0xbd, 0x60, 0xb9, 0xbf, 0x1a, 0x74, 0x6d, 0xd7, 0x57, 0x5a, 0x5d, - 0x34, 0x05, 0x54, 0x68, 0xbe, 0xd5, 0xe5, 0x8c, 0x4c, 0x6e, 0xe9, 0x79, 0xd9, 0xdc, 0xb2, 0xd0, - 0x4c, 0x16, 0xab, 0xe7, 0x96, 0x86, 0x14, 0x70, 0x7d, 0x2c, 0xbf, 0xf0, 0x6c, 0xac, 0xac, 0xaf, - 0x04, 0x94, 0xa8, 0x77, 0x31, 0xdc, 0x92, 0x13, 0x50, 0x92, 0x3f, 0x5f, 0x27, 0x48, 0x7d, 0x87, - 0x36, 0x22, 0x24, 0xf7, 0x6a, 0x67, 0x36, 0x7b, 0x9e, 0xf7, 0x84, 0xda, 0x7e, 0xb4, 0x47, 0x28, - 0x8e, 0x9f, 0x1a, 0xb2, 0x17, 0xca, 0xe7, 0xfb, 0xb4, 0x56, 0xba, 0x79, 0x77, 0x38, 0x28, 0xd9, - 0x44, 0xce, 0x35, 0x08, 0x93, 0xc5, 0xf1, 0xfb, 0x59, 0x78, 0x4d, 0xa9, 0x50, 0x73, 0x10, 0xfd, - 0x35, 0xe5, 0x70, 0x64, 0xf2, 0xed, 0x63, 0x6a, 0xc5, 0xf6, 0x1d, 0x92, 0x36, 0xe3, 0x72, 0x96, - 0xac, 0xd7, 0x4b, 0x1f, 0xef, 0x95, 0xc1, 0xc0, 0xc1, 0xb3, 0xf8, 0x74, 0x2f, 0xcb, 0x23, 0x9c, - 0x8b, 0x80, 0x56, 0x2d, 0xcd, 0x5f, 0x2e, 0x41, 0xa5, 0xd6, 0x5b, 0x84, 0xd1, 0x7e, 0xa2, 0x3e, - 0x67, 0x5d, 0xab, 0x1e, 0x68, 0x3d, 0x83, 0x02, 0xeb, 0x0c, 0x9d, 0x5d, 0x39, 0x20, 0xce, 0xe1, - 0x66, 0xf2, 0x1f, 0x31, 0x30, 0xae, 0x94, 0x7f, 0x91, 0x49, 0xdb, 0xaf, 0x23, 0xf5, 0x71, 0x65, - 0x44, 0x88, 0xbd, 0x2e, 0xfb, 0xe8, 0xa2, 0x13, 0x74, 0x8b, 0x76, 0xc9, 0xe5, 0xb3, 0xf2, 0xb1, - 0x6d, 0xe8, 0x8a, 0x87, 0xda, 0x9b, 0xd6, 0x0f, 0xa6, 0x00, 0x03, 0x90, 0xbf, 0x8e, 0x8c, 0xae, - 0x34, 0xbe, 0xf8, 0xdb, 0xc8, 0xcc, 0x4a, 0xb4, 0x54, 0x03, 0x74, 0x6d, 0xfb, 0xf6, 0x32, 0xaf, - 0xfb, 0xa7, 0x28, 0x7d, 0x06, 0xa5, 0xcf, 0xa0, 0x74, 0x77, 0x4c, 0xbc, 0xf4, 0x5e, 0xfa, 0x6f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xda, 0xe4, 0xa2, 0x30, 0x36, 0x00, 0x00, + // 2740 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x6f, 0xdc, 0xc6, + 0x15, 0x2e, 0x25, 0x47, 0xb1, 0x46, 0x96, 0x2c, 0x53, 0x76, 0xac, 0x28, 0x29, 0x6a, 0x28, 0x75, + 0x6c, 0xc7, 0xf6, 0xca, 0x96, 0x6c, 0x27, 0x8e, 0x93, 0x02, 0xab, 0x8b, 0x37, 0x0b, 0x5b, 0x91, + 0xb2, 0x6b, 0xc9, 0x49, 0xe1, 0x42, 0xa1, 0xb8, 0x47, 0x12, 0xa1, 0x5d, 0x92, 0x1e, 0xce, 0x4a, + 0xde, 0x22, 0x4d, 0x5b, 0x34, 0xe8, 0x05, 0x6d, 0x1f, 0x7a, 0x7b, 0xed, 0x43, 0xdf, 0xd2, 0xff, + 0x51, 0x14, 0x68, 0xff, 0x40, 0xff, 0x4d, 0x8b, 0x19, 0x9e, 0x21, 0x67, 0xb8, 0xdc, 0xe5, 0x50, + 0x06, 0xdc, 0x37, 0xed, 0xcc, 0xf7, 0x9d, 0xf3, 0xcd, 0x99, 0xdb, 0x99, 0xe1, 0x88, 0x5c, 0x76, + 0xa3, 0xa5, 0x85, 0x7d, 0x87, 0xc1, 0xb1, 0xd3, 0x5b, 0x38, 0xba, 0xbd, 0x0b, 0xcc, 0xb9, 0x2d, + 0x7f, 0xef, 0x38, 0xa1, 0x57, 0x09, 0x69, 0xc0, 0x02, 0x7b, 0xc6, 0x8d, 0x96, 0x2a, 0x58, 0x5c, + 0x41, 0xd8, 0xdc, 0x75, 0xce, 0x75, 0xc2, 0x70, 0x21, 0xa4, 0xc1, 0x91, 0xd7, 0x02, 0x9a, 0x18, + 0x90, 0x05, 0xa9, 0x85, 0x14, 0x4c, 0x61, 0xdf, 0x8b, 0x18, 0x4d, 0xbd, 0xc9, 0x02, 0x05, 0x7c, + 0x47, 0x80, 0xbb, 0xec, 0x80, 0x33, 0xda, 0x9e, 0xeb, 0x30, 0x2f, 0xf0, 0xa3, 0x84, 0xa1, 0x16, + 0x2a, 0xac, 0x1b, 0x09, 0xcb, 0xc4, 0xc7, 0x3b, 0x79, 0x2d, 0xa7, 0x10, 0x05, 0x5d, 0xea, 0x42, + 0x84, 0xa0, 0xf7, 0x38, 0xc8, 0x6b, 0x81, 0xcf, 0x3c, 0xd6, 0x5b, 0xd8, 0xa7, 0x41, 0x37, 0x4c, + 0xa3, 0xc4, 0x7f, 0x29, 0x06, 0xaf, 0x69, 0xd8, 0x6e, 0xa4, 0xc4, 0x23, 0x6b, 0xf6, 0xea, 0x60, + 0x28, 0xff, 0xa1, 0x18, 0xbd, 0xc2, 0x91, 0x81, 0xdb, 0x59, 0x70, 0x03, 0x0a, 0x09, 0x28, 0x70, + 0x3b, 0x3b, 0xbc, 0x20, 0x0f, 0xe8, 0xf9, 0x47, 0x1e, 0x4b, 0xa1, 0xf1, 0xcf, 0x6c, 0x47, 0x70, + 0xa0, 0x49, 0xaf, 0xdd, 0xe4, 0xe0, 0x10, 0x68, 0xc7, 0x8b, 0x22, 0xad, 0x0b, 0x94, 0xb2, 0x3e, + 0x38, 0x85, 0x3d, 0xa0, 0xe0, 0xbb, 0xa0, 0xc0, 0xd3, 0x32, 0x05, 0xfe, 0x36, 0x87, 0xd3, 0xd0, + 0x4d, 0x60, 0x11, 0x73, 0x58, 0x57, 0x06, 0xe9, 0x3e, 0xaf, 0x8d, 0x0e, 0x1c, 0xea, 0xf9, 0xfb, + 0x0b, 0x6e, 0xd0, 0x6e, 0x3b, 0xbb, 0x01, 0x15, 0x9d, 0x9e, 0xe0, 0xb5, 0xd2, 0x6c, 0x30, 0x24, + 0xb5, 0xed, 0xf9, 0x87, 0x09, 0x83, 0xff, 0x50, 0x80, 0x97, 0x55, 0x20, 0x0f, 0x8a, 0x1a, 0xe1, + 0x14, 0xb6, 0x20, 0x60, 0x2c, 0xa0, 0xce, 0x3e, 0x18, 0xc5, 0xed, 0xc6, 0x50, 0x42, 0x76, 0x38, + 0xbc, 0xc5, 0xd1, 0xec, 0x45, 0x52, 0xcf, 0x5e, 0x28, 0xa6, 0xbe, 0x2b, 0x2a, 0x7b, 0xa1, 0x12, + 0x4d, 0xf1, 0x2b, 0xae, 0x9e, 0xff, 0xab, 0x45, 0x66, 0xaa, 0x5d, 0x76, 0xc0, 0xc7, 0x92, 0xeb, + 0x30, 0x68, 0xc0, 0xf3, 0x2e, 0x44, 0xcc, 0xbe, 0x4d, 0xc6, 0x82, 0xd0, 0x79, 0xde, 0x85, 0x59, + 0xeb, 0x92, 0x75, 0x75, 0x62, 0xf1, 0xcd, 0x0a, 0x9f, 0xc2, 0x31, 0x13, 0xed, 0x54, 0x36, 0x04, + 0xa0, 0x81, 0x40, 0xdb, 0x26, 0xa7, 0x78, 0xfd, 0xec, 0xc8, 0x25, 0xeb, 0xea, 0x78, 0x43, 0xfc, + 0x6d, 0xbf, 0x45, 0xc6, 0xdd, 0xb6, 0x07, 0x3e, 0xdb, 0xf1, 0x5a, 0xb3, 0xa3, 0xa2, 0xe2, 0x74, + 0x5c, 0x50, 0x6f, 0xd9, 0xef, 0x90, 0x49, 0xac, 0x8c, 0xc0, 0xa5, 0xc0, 0x66, 0x4f, 0x09, 0xc0, + 0x99, 0xb8, 0xb0, 0x29, 0xca, 0xe6, 0xff, 0x61, 0x91, 0xf3, 0xba, 0xc0, 0x28, 0x0c, 0xfc, 0x08, + 0xec, 0x05, 0x32, 0x16, 0xf7, 0x37, 0x2a, 0xbc, 0x28, 0x14, 0xd2, 0xd0, 0x4d, 0xf4, 0x35, 0x45, + 0x75, 0x03, 0x61, 0x4a, 0x93, 0x46, 0x4c, 0x9b, 0x74, 0x9e, 0xbc, 0xc6, 0x82, 0x43, 0xf0, 0x51, + 0x7a, 0xfc, 0xc3, 0x5e, 0x22, 0xa7, 0xf8, 0x34, 0x13, 0x72, 0x27, 0x16, 0xbf, 0x27, 0xcc, 0xc8, + 0xd9, 0x58, 0xe1, 0x35, 0x89, 0xb9, 0xad, 0x08, 0x68, 0x43, 0x80, 0xe7, 0x3f, 0x27, 0x93, 0x4f, + 0x0f, 0x82, 0x6a, 0xa7, 0xfe, 0x12, 0x11, 0x4e, 0xe4, 0x8c, 0x28, 0x72, 0xe6, 0xbf, 0xb5, 0xc8, + 0x94, 0x34, 0xfd, 0x0a, 0x63, 0x23, 0xa3, 0x30, 0x5a, 0x26, 0x0a, 0x3f, 0x25, 0x67, 0x6b, 0xc0, + 0x3e, 0xeb, 0x06, 0xcc, 0x79, 0x89, 0x38, 0xdc, 0x27, 0xa3, 0x14, 0xf6, 0x50, 0xea, 0x15, 0x81, + 0xc7, 0xc9, 0x52, 0x91, 0x93, 0x25, 0xa1, 0x36, 0xe4, 0xca, 0xd1, 0xe0, 0x9c, 0xf9, 0x7f, 0x5b, + 0xe4, 0xed, 0xba, 0xef, 0x31, 0xcf, 0x61, 0xf0, 0xd0, 0x6b, 0xc3, 0x6a, 0x70, 0xec, 0xb7, 0x03, + 0xa7, 0xf5, 0x4a, 0x43, 0x57, 0x23, 0xe3, 0x62, 0xf6, 0xb9, 0x41, 0x3b, 0x9a, 0x1d, 0xbd, 0x34, + 0x7a, 0x75, 0x62, 0xf1, 0x5a, 0x25, 0x67, 0x8b, 0xac, 0xa8, 0x0a, 0x37, 0x91, 0xd1, 0x48, 0xb9, + 0xf3, 0xff, 0xb4, 0xc8, 0x9c, 0xda, 0x9a, 0xad, 0xf0, 0x95, 0xb7, 0x65, 0xad, 0xbf, 0x2d, 0x57, + 0x06, 0xb6, 0x25, 0xd6, 0x97, 0xd7, 0x92, 0xbf, 0x58, 0xe4, 0xcd, 0xc7, 0x5e, 0xc4, 0xf8, 0x54, + 0xdf, 0xc4, 0x3e, 0x8c, 0x5e, 0xf9, 0x5c, 0xe7, 0xf5, 0xa2, 0x11, 0x7c, 0x72, 0xf1, 0x1f, 0xf3, + 0xff, 0x1d, 0x21, 0xd3, 0x1b, 0x21, 0xf8, 0x75, 0xbf, 0x1a, 0x86, 0xff, 0x97, 0x21, 0x6b, 0x3f, + 0x22, 0xe3, 0x47, 0x1e, 0x1c, 0xef, 0x74, 0x82, 0x16, 0x88, 0xd9, 0x36, 0xb5, 0x58, 0xc9, 0x8d, + 0x70, 0x56, 0x67, 0x65, 0xdb, 0x83, 0xe3, 0xf5, 0xa0, 0x05, 0x8d, 0xd3, 0x47, 0xf8, 0x97, 0x3d, + 0x4d, 0x46, 0x9d, 0x30, 0xc4, 0x95, 0x96, 0xff, 0x69, 0x5f, 0x24, 0xaf, 0xb7, 0x03, 0xf7, 0x90, + 0x2f, 0xd0, 0xaf, 0x89, 0xd2, 0x31, 0xfe, 0xb3, 0xde, 0x9a, 0xff, 0xc6, 0x22, 0xa7, 0xa5, 0x05, + 0xfb, 0x02, 0x39, 0xb7, 0x5d, 0x5f, 0x7b, 0xba, 0xb3, 0xbe, 0xb1, 0xba, 0xb6, 0x53, 0xff, 0x74, + 0xbb, 0xfa, 0xb8, 0xbe, 0x3a, 0xfd, 0x1d, 0xfb, 0x22, 0x99, 0x49, 0x8b, 0xc5, 0x5f, 0x1b, 0x9f, + 0x3e, 0xfe, 0x62, 0xda, 0xd2, 0x2b, 0x1a, 0x6b, 0xd5, 0xd5, 0xb8, 0x62, 0xc4, 0x9e, 0x25, 0xe7, + 0x33, 0x15, 0x4f, 0x1b, 0xf5, 0x27, 0x6b, 0xd3, 0xa3, 0xba, 0x8b, 0xcd, 0xc6, 0x1a, 0xff, 0x31, + 0x7d, 0x6a, 0xf1, 0x3f, 0xdb, 0x84, 0xd4, 0xe2, 0x96, 0x56, 0x37, 0xeb, 0xb6, 0x4b, 0xce, 0xa8, + 0xdb, 0x81, 0x7d, 0x35, 0x37, 0x14, 0x39, 0x5b, 0xda, 0xdc, 0x35, 0x03, 0x24, 0x8e, 0xb7, 0xcf, + 0xc8, 0x58, 0xbc, 0xa2, 0xda, 0xf3, 0xb9, 0x24, 0x6d, 0x25, 0x9f, 0x7b, 0x67, 0x28, 0x06, 0x4d, + 0xfe, 0xce, 0x22, 0x33, 0x35, 0xf0, 0x81, 0x3a, 0x0c, 0xaa, 0x61, 0xb8, 0xe9, 0x44, 0xd1, 0x71, + 0x40, 0x5b, 0xf6, 0x7d, 0x41, 0xe6, 0x69, 0x67, 0x45, 0xcd, 0x4b, 0x13, 0x33, 0x39, 0x1c, 0xe9, + 0xf7, 0xc3, 0x93, 0x50, 0x51, 0xce, 0x2f, 0x2c, 0x32, 0x2d, 0xe6, 0x5b, 0x5a, 0x17, 0xd9, 0xf7, + 0x0a, 0x0c, 0x66, 0x09, 0x52, 0xc8, 0xfb, 0xa5, 0x79, 0xa8, 0xe2, 0x8f, 0x16, 0xb9, 0x50, 0xf7, + 0x8f, 0x9c, 0xb6, 0xd7, 0xca, 0x84, 0xe5, 0x41, 0x81, 0xc9, 0x5c, 0x96, 0xd4, 0xf3, 0xd1, 0xc9, + 0xc8, 0x28, 0xea, 0x27, 0x64, 0xaa, 0x06, 0xaa, 0x5e, 0xfb, 0x4e, 0x61, 0xa0, 0x59, 0x8e, 0x8a, + 0xbb, 0x25, 0x59, 0xe8, 0xfe, 0x6b, 0x72, 0x76, 0x85, 0x82, 0xc3, 0x60, 0x25, 0xf0, 0x99, 0xe3, + 0xf9, 0x40, 0xd1, 0xff, 0xc0, 0xf5, 0x22, 0x03, 0xd7, 0xfd, 0x9b, 0xb3, 0xd0, 0x7f, 0x9b, 0x8c, + 0x3f, 0x09, 0xba, 0xee, 0x01, 0x5f, 0xaf, 0xed, 0xca, 0x70, 0x1b, 0x09, 0x50, 0xfa, 0x5c, 0x30, + 0xc6, 0xa3, 0x37, 0x97, 0x8c, 0xad, 0x42, 0x1b, 0x18, 0xd8, 0xd7, 0x87, 0x53, 0x63, 0x94, 0xf4, + 0x73, 0xc3, 0x0c, 0x8c, 0x4e, 0xf6, 0xc8, 0xeb, 0x35, 0x60, 0x9b, 0x0e, 0x3b, 0xb0, 0x0b, 0x88, + 0x08, 0x93, 0x6e, 0x6e, 0x1a, 0xa2, 0xd1, 0xcf, 0x97, 0xe4, 0xb4, 0xcc, 0x6e, 0xec, 0xef, 0xe7, + 0x2e, 0x0a, 0x99, 0xe4, 0x67, 0xae, 0x52, 0xe8, 0x00, 0xe1, 0xe8, 0xe1, 0x1b, 0x8b, 0x9c, 0xcf, + 0x4b, 0x5f, 0x70, 0x19, 0x19, 0x68, 0x28, 0x3f, 0xe5, 0x89, 0x35, 0xdc, 0xce, 0x55, 0x3a, 0x34, + 0x49, 0xfa, 0x9a, 0xd8, 0xfd, 0x69, 0x87, 0xfd, 0xbe, 0xb9, 0x06, 0x99, 0xa8, 0xa8, 0xa3, 0x66, + 0x98, 0x82, 0x4c, 0x62, 0xc3, 0x17, 0x53, 0xbe, 0xa8, 0x24, 0xa3, 0xb7, 0xc9, 0x28, 0x38, 0x1d, + 0xfb, 0x83, 0xe1, 0x0a, 0x72, 0x28, 0x52, 0xc2, 0xfd, 0x13, 0x30, 0x63, 0x31, 0xb7, 0x2c, 0xfb, + 0x05, 0x99, 0xd4, 0x00, 0xf6, 0x62, 0x09, 0x6b, 0x52, 0xc1, 0x52, 0x29, 0x0e, 0x06, 0xe2, 0xe7, + 0xb8, 0x8c, 0xf3, 0x18, 0x6d, 0x03, 0x15, 0x07, 0x6a, 0xfb, 0x6e, 0xb1, 0x25, 0x15, 0x2f, 0x05, + 0xdc, 0x2b, 0x4b, 0x43, 0x0d, 0xbf, 0xb4, 0xc8, 0x39, 0x5e, 0xd9, 0x00, 0xb7, 0xe7, 0xb6, 0x01, + 0xbb, 0xc2, 0xc0, 0x9a, 0x46, 0xd0, 0xf7, 0x92, 0x32, 0xbc, 0xa4, 0x1b, 0x28, 0x99, 0x50, 0xaa, + 0xed, 0x5b, 0xc6, 0x96, 0xf4, 0x99, 0x60, 0xc6, 0xc0, 0xc6, 0xff, 0x88, 0x9c, 0x5a, 0x0f, 0x8e, + 0xc0, 0xbe, 0x36, 0x9c, 0xca, 0x31, 0xd2, 0xcb, 0x7b, 0x26, 0x50, 0x34, 0xdf, 0x25, 0x67, 0x36, + 0xbb, 0x74, 0x1f, 0x64, 0x9b, 0x0a, 0x14, 0xaa, 0x58, 0xe9, 0x6e, 0xb1, 0x0c, 0x05, 0xdd, 0xfe, + 0xca, 0x22, 0x76, 0x03, 0x38, 0x07, 0x94, 0x2e, 0x2f, 0x9a, 0xe0, 0xfd, 0x0c, 0xa9, 0xe1, 0x83, + 0xf2, 0xc4, 0x7e, 0x25, 0x28, 0xb2, 0xce, 0xa0, 0x63, 0xa8, 0x44, 0x61, 0x94, 0x53, 0xa2, 0x11, + 0xd3, 0x9e, 0xe6, 0x87, 0x8c, 0xa2, 0x9e, 0xe6, 0x18, 0xc3, 0x9e, 0x8e, 0xa1, 0x68, 0xfe, 0x05, + 0x99, 0x8c, 0x77, 0xe4, 0x66, 0xaf, 0xd3, 0xf6, 0xfc, 0xc3, 0xa2, 0x35, 0x44, 0x03, 0x1b, 0xae, + 0x21, 0x19, 0x0e, 0x7a, 0xfe, 0xbd, 0x45, 0xce, 0x37, 0x81, 0x55, 0xe9, 0xae, 0xc7, 0xa8, 0x43, + 0x7b, 0xeb, 0xc0, 0x9c, 0x96, 0xc3, 0x9c, 0xa2, 0x3d, 0x25, 0x8f, 0xa3, 0xa7, 0xa6, 0x25, 0xa9, + 0xa8, 0xe7, 0x4f, 0x16, 0x79, 0x63, 0xcb, 0x8f, 0xf2, 0x14, 0x3d, 0x18, 0x6e, 0x36, 0x9f, 0xa5, + 0x67, 0x85, 0xa5, 0xc9, 0x69, 0x0e, 0xd1, 0x04, 0xf6, 0x38, 0x70, 0x0f, 0x8b, 0x72, 0x08, 0x84, + 0x19, 0xe6, 0x10, 0x09, 0x5a, 0xcb, 0x55, 0x4c, 0xfc, 0xd4, 0x4a, 0xf9, 0xa9, 0x65, 0xfc, 0x50, + 0x32, 0xd1, 0x80, 0x3d, 0x0a, 0xd1, 0x81, 0xf0, 0x75, 0xab, 0xf0, 0x48, 0x2a, 0xa1, 0x86, 0x8b, + 0xa5, 0xc6, 0x48, 0x93, 0xbd, 0x2d, 0x9f, 0x9f, 0x2e, 0x8b, 0x92, 0xbd, 0x18, 0x65, 0x98, 0xec, + 0x49, 0x30, 0x3a, 0x09, 0x08, 0x89, 0xc7, 0xf9, 0x27, 0x41, 0x07, 0xec, 0x05, 0x93, 0x19, 0xc1, + 0x91, 0xd2, 0xd9, 0x2d, 0x73, 0x82, 0xb2, 0x44, 0xe1, 0xcc, 0x8a, 0x59, 0xcd, 0xd0, 0x71, 0xa1, + 0x68, 0x89, 0xea, 0x67, 0x18, 0x2e, 0x51, 0x79, 0xc4, 0x34, 0x3b, 0x14, 0x3b, 0xb1, 0x5a, 0x19, + 0x99, 0xec, 0xc4, 0x1a, 0xa1, 0xc4, 0x4e, 0x9c, 0xe1, 0x29, 0x01, 0xd9, 0x0a, 0x5b, 0x25, 0x03, + 0xd2, 0xcf, 0x30, 0x0c, 0x48, 0x1e, 0x51, 0x51, 0x12, 0x9f, 0x05, 0xca, 0x28, 0xe9, 0x67, 0x18, + 0x2a, 0xc9, 0x23, 0xa2, 0x92, 0x1d, 0x32, 0x9e, 0x5c, 0xcf, 0xd8, 0x97, 0x8d, 0xae, 0x6f, 0xe6, + 0xe2, 0x49, 0xe2, 0x84, 0x61, 0xbf, 0x27, 0x05, 0x8b, 0x0e, 0xbe, 0x22, 0x13, 0x38, 0x32, 0x0e, + 0x1c, 0x0a, 0x32, 0x07, 0x8c, 0x3f, 0x4d, 0x54, 0xb4, 0x0f, 0x1d, 0xd9, 0x91, 0xc4, 0xf1, 0x99, + 0x1c, 0xd0, 0x9c, 0x96, 0x7a, 0x6f, 0x40, 0x27, 0x38, 0x2a, 0xe1, 0x5d, 0xc1, 0x97, 0xf1, 0xae, + 0xd1, 0xd0, 0x7b, 0x24, 0xce, 0x5d, 0xb1, 0xeb, 0x45, 0x03, 0x1b, 0x12, 0x9c, 0xd9, 0x36, 0x0d, + 0x39, 0xe8, 0xb4, 0x47, 0x88, 0x98, 0x02, 0xbc, 0x30, 0x92, 0x47, 0xf4, 0xa1, 0x26, 0x52, 0x78, + 0xe6, 0x88, 0x6e, 0xcc, 0x4a, 0xa3, 0x8d, 0x83, 0xde, 0x38, 0xda, 0x0a, 0xbe, 0x4c, 0xb4, 0x35, + 0x1a, 0x7a, 0xff, 0x83, 0x45, 0x6c, 0x4c, 0x85, 0xc1, 0x3b, 0x82, 0x16, 0x46, 0xe0, 0x23, 0xc3, + 0xb6, 0xe8, 0x34, 0x29, 0xe6, 0xe3, 0x13, 0xb2, 0x51, 0xd3, 0x9f, 0x2d, 0x32, 0x13, 0x6b, 0xd5, + 0x00, 0xf6, 0xc7, 0xc6, 0x6d, 0xd4, 0x78, 0x52, 0xd5, 0x0f, 0x4e, 0x4a, 0x47, 0x59, 0xbf, 0xb5, + 0xc8, 0x74, 0x0d, 0x74, 0xd1, 0xf6, 0x87, 0x66, 0xa3, 0x2d, 0x57, 0xd0, 0x83, 0x13, 0x71, 0x51, + 0xcd, 0x17, 0x64, 0xac, 0x09, 0xec, 0x11, 0xf4, 0xec, 0x77, 0x85, 0x19, 0xe5, 0xab, 0xaa, 0x9a, + 0x8e, 0x3c, 0x82, 0x9e, 0x74, 0x77, 0xa5, 0x10, 0x97, 0x9a, 0xae, 0x15, 0x99, 0xae, 0x19, 0x9a, + 0xae, 0xe9, 0xa6, 0xbf, 0x22, 0xe7, 0xe2, 0x15, 0x67, 0xb3, 0xbb, 0xdb, 0xf6, 0xdc, 0xbc, 0x59, + 0xce, 0xd3, 0xd9, 0xcc, 0xf2, 0xa4, 0x80, 0xf3, 0x67, 0x79, 0x11, 0x27, 0xf5, 0x1e, 0xaf, 0x38, + 0x86, 0xde, 0xfb, 0xc0, 0x06, 0xde, 0x73, 0x38, 0xc9, 0xc2, 0x36, 0x55, 0x03, 0xa6, 0xba, 0x5e, + 0x18, 0x6c, 0x46, 0x47, 0x66, 0xf2, 0x19, 0x13, 0x02, 0x3a, 0xfd, 0xb5, 0x45, 0x2e, 0xe8, 0x55, + 0xcb, 0xbd, 0x27, 0xe2, 0xc3, 0xe7, 0x3d, 0x53, 0x5b, 0x48, 0xc8, 0x64, 0x12, 0x25, 0x78, 0xc9, + 0x1a, 0x2b, 0x6e, 0x37, 0x14, 0x44, 0x24, 0x8f, 0xc0, 0x79, 0xc6, 0xb2, 0xd8, 0xcc, 0x11, 0xd8, + 0x8c, 0x92, 0x76, 0x7c, 0x3c, 0xb3, 0x0d, 0x3b, 0xbe, 0x0f, 0x6c, 0xd0, 0xf1, 0x39, 0x1c, 0xf4, + 0xfe, 0x9c, 0x4c, 0xc5, 0x63, 0x72, 0x63, 0x65, 0x3d, 0x76, 0x5d, 0xd1, 0xcc, 0x04, 0x6e, 0x27, + 0x33, 0x78, 0x25, 0x30, 0x73, 0x13, 0x6b, 0x80, 0x4f, 0x5d, 0xc6, 0x03, 0xd1, 0xc0, 0xa5, 0x0e, + 0x2c, 0x76, 0x99, 0xc5, 0xa3, 0xcb, 0x03, 0x32, 0x51, 0x03, 0x96, 0xf8, 0xbb, 0x3e, 0x90, 0xaf, + 0xa0, 0x32, 0x87, 0x82, 0x22, 0x30, 0x7a, 0xf2, 0xe3, 0x1b, 0x3a, 0x59, 0x1e, 0xd9, 0x37, 0x07, + 0xd2, 0x35, 0x5c, 0xe6, 0x9e, 0xb6, 0x18, 0x9e, 0x06, 0x33, 0xee, 0x5c, 0x83, 0x60, 0xea, 0xc0, + 0xe2, 0x60, 0x66, 0xf1, 0xe9, 0x35, 0xdc, 0x05, 0x75, 0x87, 0x4c, 0xdb, 0x7a, 0x77, 0xa8, 0xf8, + 0x3e, 0x7c, 0x7e, 0x7e, 0x60, 0x40, 0x43, 0x21, 0xbf, 0xe1, 0xe7, 0x77, 0x6d, 0x53, 0x4c, 0x82, + 0x70, 0xaf, 0xa0, 0x51, 0x59, 0x42, 0xfe, 0x02, 0x62, 0xc2, 0x43, 0x2d, 0x3f, 0x13, 0x5f, 0xdd, + 0xfa, 0xc4, 0xda, 0x4b, 0xc3, 0x46, 0xcf, 0x20, 0x15, 0x77, 0xca, 0x91, 0x50, 0xc2, 0x91, 0x78, + 0xf2, 0x50, 0x0d, 0xc3, 0xe4, 0xb3, 0x36, 0x1e, 0xb6, 0x79, 0x62, 0x2f, 0x1f, 0x96, 0x65, 0x3f, + 0x0a, 0xa5, 0x5f, 0xc0, 0xd5, 0xc3, 0xb6, 0x19, 0x23, 0xdd, 0x3b, 0xaa, 0xad, 0x96, 0x52, 0x85, + 0x7b, 0x47, 0xae, 0x11, 0x1d, 0xa9, 0xef, 0x1d, 0x46, 0x04, 0x7d, 0xc1, 0xd6, 0x5a, 0x3b, 0x44, + 0x7b, 0x16, 0xab, 0x2f, 0xd8, 0x86, 0x94, 0x34, 0xd7, 0x7a, 0x43, 0xe4, 0xca, 0xdd, 0x30, 0x0c, + 0x28, 0x83, 0xd6, 0xba, 0xd7, 0x81, 0x27, 0xbd, 0x10, 0x22, 0x3c, 0xef, 0x0d, 0x34, 0xd7, 0xcf, + 0xd0, 0xcf, 0x7b, 0xa5, 0x88, 0xa8, 0xe6, 0x5b, 0x8b, 0x5c, 0xaa, 0x01, 0x5b, 0x85, 0x3d, 0xa7, + 0xdb, 0x56, 0x05, 0x3f, 0x0c, 0xa8, 0x44, 0xdb, 0xd5, 0xa1, 0xbd, 0x3a, 0x94, 0x2b, 0x15, 0x2e, + 0xbf, 0x8c, 0x09, 0x45, 0x6b, 0xf3, 0x25, 0xb4, 0x36, 0x5f, 0x5e, 0x6b, 0xd3, 0x54, 0xeb, 0x97, + 0xe2, 0x7a, 0x6c, 0x2b, 0x02, 0x8a, 0x17, 0xb1, 0xf9, 0x4f, 0x8e, 0x10, 0xa3, 0x5f, 0xc4, 0x16, + 0x40, 0x93, 0x2b, 0xf7, 0x29, 0x2c, 0x5a, 0xee, 0xad, 0xb4, 0x1d, 0xaf, 0x83, 0xd3, 0x75, 0x28, + 0x1b, 0xa1, 0xfa, 0x74, 0x35, 0x63, 0x24, 0xf7, 0x71, 0x93, 0x58, 0x53, 0xa3, 0x41, 0x37, 0x8c, + 0x70, 0xb6, 0x0e, 0xb5, 0x11, 0x23, 0xf5, 0xd9, 0x6a, 0x44, 0x48, 0xee, 0x1a, 0xc7, 0x1f, 0x7a, + 0x7e, 0x8b, 0xd7, 0x44, 0xb8, 0xfb, 0xe6, 0xd3, 0x13, 0x94, 0xbe, 0xfb, 0x16, 0x82, 0xd1, 0x0f, + 0x88, 0xf3, 0xb9, 0x70, 0x9e, 0x75, 0x23, 0x5e, 0xc1, 0xaa, 0x32, 0x05, 0x6a, 0x80, 0x9b, 0x41, + 0x60, 0x74, 0xf3, 0x63, 0xb1, 0xd2, 0x8a, 0x32, 0xd9, 0x75, 0x8b, 0x26, 0x06, 0x32, 0x9d, 0xb7, + 0x54, 0x8a, 0x83, 0xbe, 0x0f, 0x09, 0xa9, 0x01, 0x5b, 0x87, 0xce, 0x2e, 0x8f, 0xe5, 0xcd, 0x02, + 0x13, 0x88, 0xd3, 0xb3, 0x0b, 0x03, 0x78, 0x92, 0x37, 0x8d, 0x7f, 0xe2, 0x44, 0x71, 0xa9, 0x3d, + 0x34, 0x46, 0x09, 0x4c, 0xbf, 0x25, 0x2e, 0x46, 0xa7, 0xcd, 0xe2, 0xdd, 0x89, 0x43, 0x72, 0x28, + 0x39, 0xc5, 0x19, 0x35, 0x4b, 0x85, 0x27, 0x9f, 0x40, 0xce, 0xf5, 0x3d, 0x01, 0xc3, 0x9d, 0x5a, + 0xbc, 0xa2, 0xc8, 0xdf, 0x0b, 0xf4, 0x07, 0x63, 0xaa, 0xe7, 0xec, 0x05, 0xdb, 0xe0, 0xf7, 0x65, + 0xf1, 0xa5, 0xbb, 0xb8, 0x30, 0x2e, 0xbe, 0x74, 0x57, 0x6f, 0x8b, 0x6f, 0x1a, 0xa2, 0x93, 0xef, + 0xe6, 0xc9, 0x1b, 0xa0, 0xba, 0x78, 0x58, 0x1d, 0x9f, 0xab, 0xe2, 0x51, 0xca, 0x13, 0x8a, 0xf8, + 0xb9, 0x75, 0xdf, 0x0b, 0x1e, 0x05, 0xac, 0x8f, 0x52, 0x53, 0x4e, 0xf2, 0xb6, 0x63, 0xf2, 0x61, + 0x40, 0x8f, 0x1d, 0xda, 0x8a, 0x6b, 0xb1, 0xb5, 0x39, 0x56, 0x34, 0x98, 0xde, 0xda, 0x62, 0x34, + 0x7a, 0xf3, 0xc8, 0x99, 0xaa, 0xeb, 0x42, 0xc8, 0xd0, 0xd9, 0xf5, 0x41, 0x74, 0x15, 0xa5, 0x4f, + 0xfd, 0x42, 0x70, 0xb2, 0x7a, 0x8a, 0x24, 0x4b, 0x54, 0x81, 0x58, 0x7d, 0x30, 0xe1, 0xce, 0x0d, + 0x90, 0x06, 0xd4, 0x13, 0x6e, 0x13, 0x7c, 0x3a, 0x5c, 0xf9, 0x20, 0x56, 0xeb, 0x64, 0x6a, 0x97, + 0x17, 0xa2, 0x2c, 0x54, 0xdf, 0x2b, 0xcc, 0x18, 0xe9, 0xd9, 0xb4, 0x1e, 0xc9, 0x51, 0x5c, 0x6d, + 0xb7, 0x83, 0x63, 0x68, 0x29, 0x83, 0xa8, 0xff, 0xe5, 0x45, 0x16, 0xdc, 0x3f, 0x88, 0x4c, 0x38, + 0x5a, 0x42, 0x5b, 0xf7, 0xf7, 0x82, 0xe5, 0xde, 0x6a, 0xd0, 0x71, 0x3c, 0x5f, 0x69, 0x75, 0xde, + 0x14, 0x50, 0xa1, 0xfd, 0xad, 0x2e, 0x66, 0x64, 0x72, 0xcb, 0x76, 0x3b, 0x9b, 0x5b, 0xe6, 0x9a, + 0xc9, 0x62, 0xf5, 0xdc, 0xd2, 0x90, 0x82, 0xae, 0x8f, 0xe5, 0x17, 0x9e, 0x8d, 0x95, 0xf5, 0x95, + 0x80, 0x82, 0x7a, 0x17, 0xc3, 0x2d, 0xb9, 0x01, 0x85, 0xfe, 0xf3, 0x75, 0x82, 0xd4, 0x77, 0x68, + 0x23, 0x42, 0xf2, 0xd9, 0x00, 0xef, 0x01, 0x9e, 0x50, 0xc7, 0x8f, 0xf6, 0x80, 0xe2, 0xb7, 0x03, + 0xf6, 0x22, 0xc3, 0x96, 0xf5, 0xd2, 0xd5, 0xbb, 0x45, 0xb0, 0x64, 0x2b, 0x39, 0x57, 0x03, 0x26, + 0x8b, 0xe3, 0x57, 0xb4, 0xf8, 0xa6, 0x52, 0x21, 0xf7, 0x41, 0xf4, 0x37, 0x95, 0xc3, 0x91, 0x4a, + 0x53, 0x1c, 0xdf, 0x85, 0xf6, 0x90, 0xa6, 0x68, 0xf5, 0x83, 0x9b, 0x92, 0x81, 0xa1, 0x83, 0x67, + 0xf1, 0x19, 0x5f, 0x96, 0x47, 0xf8, 0x04, 0x4b, 0x21, 0x6a, 0xd5, 0xd2, 0xfc, 0xe5, 0x02, 0x54, + 0x6a, 0xbd, 0x01, 0x8c, 0xf6, 0x12, 0xf5, 0x7d, 0xd6, 0xb5, 0xea, 0x81, 0xd6, 0x33, 0x28, 0xb4, + 0xce, 0xc8, 0xd9, 0x95, 0x03, 0x70, 0x0f, 0x37, 0x93, 0xff, 0x8b, 0xc1, 0xd1, 0xa5, 0xfc, 0xa3, + 0x4c, 0xda, 0x7e, 0x1d, 0xa9, 0x8f, 0x2e, 0x23, 0x42, 0xec, 0x75, 0xd9, 0x27, 0x17, 0xdd, 0xa0, + 0x93, 0xb7, 0x57, 0x2e, 0x9f, 0x95, 0x4f, 0x6e, 0x43, 0x4f, 0x3c, 0xd7, 0xde, 0xb4, 0x7e, 0x38, + 0x85, 0x18, 0x84, 0xfc, 0x6d, 0x64, 0x74, 0xa5, 0xf6, 0xf9, 0xdf, 0x47, 0x66, 0x56, 0xa2, 0xa5, + 0x0a, 0xa2, 0x2b, 0xdb, 0xb7, 0x97, 0x79, 0xdd, 0xbf, 0x44, 0xe9, 0x33, 0x2c, 0x7d, 0x86, 0xa5, + 0xbb, 0x63, 0xe2, 0xbd, 0xf7, 0xd2, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x12, 0x3f, 0x74, + 0x36, 0x36, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -995,6 +995,7 @@ type GatewayAPIClient interface { OpenInApp(ctx context.Context, in *OpenInAppRequest, opts ...grpc.CallOption) (*v1beta15.OpenInAppResponse, error) // Creates a new share. // MUST return CODE_NOT_FOUND if the resource reference does not exist. + // MUST return CODE_LOCKED if the resource reference already locked. // MUST return CODE_ALREADY_EXISTS if the share already exists for the 4-tuple consisting of // (owner, shared_resource, grantee). // New shares MUST be created in the state SHARE_STATE_PENDING. @@ -1132,8 +1133,8 @@ type GatewayAPIClient interface { ListAllProviders(ctx context.Context, in *v1beta114.ListAllProvidersRequest, opts ...grpc.CallOption) (*v1beta114.ListAllProvidersResponse, error) // Creates a new ocm share. CreateOCMCoreShare(ctx context.Context, in *v1beta115.CreateOCMCoreShareRequest, opts ...grpc.CallOption) (*v1beta115.CreateOCMCoreShareResponse, error) - // Requests the destination to pull a resource from source. - PullTransfer(ctx context.Context, in *v1beta116.PullTransferRequest, opts ...grpc.CallOption) (*v1beta116.PullTransferResponse, error) + // Requests creation of a transfer. + CreateTransfer(ctx context.Context, in *v1beta116.CreateTransferRequest, opts ...grpc.CallOption) (*v1beta116.CreateTransferResponse, error) // Requests a transfer status. GetTransferStatus(ctx context.Context, in *v1beta116.GetTransferStatusRequest, opts ...grpc.CallOption) (*v1beta116.GetTransferStatusResponse, error) // Requests to cancel a transfer. @@ -1974,9 +1975,9 @@ func (c *gatewayAPIClient) CreateOCMCoreShare(ctx context.Context, in *v1beta115 return out, nil } -func (c *gatewayAPIClient) PullTransfer(ctx context.Context, in *v1beta116.PullTransferRequest, opts ...grpc.CallOption) (*v1beta116.PullTransferResponse, error) { - out := new(v1beta116.PullTransferResponse) - err := c.cc.Invoke(ctx, "/cs3.gateway.v1beta1.GatewayAPI/PullTransfer", in, out, opts...) +func (c *gatewayAPIClient) CreateTransfer(ctx context.Context, in *v1beta116.CreateTransferRequest, opts ...grpc.CallOption) (*v1beta116.CreateTransferResponse, error) { + out := new(v1beta116.CreateTransferResponse) + err := c.cc.Invoke(ctx, "/cs3.gateway.v1beta1.GatewayAPI/CreateTransfer", in, out, opts...) if err != nil { return nil, err } @@ -2158,6 +2159,7 @@ type GatewayAPIServer interface { OpenInApp(context.Context, *OpenInAppRequest) (*v1beta15.OpenInAppResponse, error) // Creates a new share. // MUST return CODE_NOT_FOUND if the resource reference does not exist. + // MUST return CODE_LOCKED if the resource reference already locked. // MUST return CODE_ALREADY_EXISTS if the share already exists for the 4-tuple consisting of // (owner, shared_resource, grantee). // New shares MUST be created in the state SHARE_STATE_PENDING. @@ -2295,8 +2297,8 @@ type GatewayAPIServer interface { ListAllProviders(context.Context, *v1beta114.ListAllProvidersRequest) (*v1beta114.ListAllProvidersResponse, error) // Creates a new ocm share. CreateOCMCoreShare(context.Context, *v1beta115.CreateOCMCoreShareRequest) (*v1beta115.CreateOCMCoreShareResponse, error) - // Requests the destination to pull a resource from source. - PullTransfer(context.Context, *v1beta116.PullTransferRequest) (*v1beta116.PullTransferResponse, error) + // Requests creation of a transfer. + CreateTransfer(context.Context, *v1beta116.CreateTransferRequest) (*v1beta116.CreateTransferResponse, error) // Requests a transfer status. GetTransferStatus(context.Context, *v1beta116.GetTransferStatusRequest) (*v1beta116.GetTransferStatusResponse, error) // Requests to cancel a transfer. @@ -2571,8 +2573,8 @@ func (*UnimplementedGatewayAPIServer) ListAllProviders(ctx context.Context, req func (*UnimplementedGatewayAPIServer) CreateOCMCoreShare(ctx context.Context, req *v1beta115.CreateOCMCoreShareRequest) (*v1beta115.CreateOCMCoreShareResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateOCMCoreShare not implemented") } -func (*UnimplementedGatewayAPIServer) PullTransfer(ctx context.Context, req *v1beta116.PullTransferRequest) (*v1beta116.PullTransferResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PullTransfer not implemented") +func (*UnimplementedGatewayAPIServer) CreateTransfer(ctx context.Context, req *v1beta116.CreateTransferRequest) (*v1beta116.CreateTransferResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateTransfer not implemented") } func (*UnimplementedGatewayAPIServer) GetTransferStatus(ctx context.Context, req *v1beta116.GetTransferStatusRequest) (*v1beta116.GetTransferStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTransferStatus not implemented") @@ -4148,20 +4150,20 @@ func _GatewayAPI_CreateOCMCoreShare_Handler(srv interface{}, ctx context.Context return interceptor(ctx, in, info, handler) } -func _GatewayAPI_PullTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1beta116.PullTransferRequest) +func _GatewayAPI_CreateTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(v1beta116.CreateTransferRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(GatewayAPIServer).PullTransfer(ctx, in) + return srv.(GatewayAPIServer).CreateTransfer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cs3.gateway.v1beta1.GatewayAPI/PullTransfer", + FullMethod: "/cs3.gateway.v1beta1.GatewayAPI/CreateTransfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(GatewayAPIServer).PullTransfer(ctx, req.(*v1beta116.PullTransferRequest)) + return srv.(GatewayAPIServer).CreateTransfer(ctx, req.(*v1beta116.CreateTransferRequest)) } return interceptor(ctx, in, info, handler) } @@ -4597,8 +4599,8 @@ var _GatewayAPI_serviceDesc = grpc.ServiceDesc{ Handler: _GatewayAPI_CreateOCMCoreShare_Handler, }, { - MethodName: "PullTransfer", - Handler: _GatewayAPI_PullTransfer_Handler, + MethodName: "CreateTransfer", + Handler: _GatewayAPI_CreateTransfer_Handler, }, { MethodName: "GetTransferStatus", diff --git a/vendor/github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1/invite_api.pb.go b/vendor/github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1/invite_api.pb.go index 721ade6ca..463262c08 100644 --- a/vendor/github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1/invite_api.pb.go +++ b/vendor/github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1/invite_api.pb.go @@ -31,10 +31,13 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type GenerateInviteTokenRequest struct { // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` + // OPTIONAL. + // The description of the token. + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GenerateInviteTokenRequest) Reset() { *m = GenerateInviteTokenRequest{} } @@ -69,6 +72,13 @@ func (m *GenerateInviteTokenRequest) GetOpaque() *v1beta1.Opaque { return nil } +func (m *GenerateInviteTokenRequest) GetDescription() string { + if m != nil { + return m.Description + } + return "" +} + type GenerateInviteTokenResponse struct { // REQUIRED. // The response status. @@ -197,10 +207,19 @@ type ForwardInviteResponse struct { Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` + // REQUIRED. + // The initiator's user id of the workflow. + UserId *v1beta13.UserId `protobuf:"bytes,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` + // REQUIRED. + // The initiator's email of the workflow. + Email string `protobuf:"bytes,4,opt,name=email,proto3" json:"email,omitempty"` + // REQUIRED. + // The initiator's display name of the workflow. + DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ForwardInviteResponse) Reset() { *m = ForwardInviteResponse{} } @@ -242,6 +261,27 @@ func (m *ForwardInviteResponse) GetOpaque() *v1beta1.Opaque { return nil } +func (m *ForwardInviteResponse) GetUserId() *v1beta13.UserId { + if m != nil { + return m.UserId + } + return nil +} + +func (m *ForwardInviteResponse) GetEmail() string { + if m != nil { + return m.Email + } + return "" +} + +func (m *ForwardInviteResponse) GetDisplayName() string { + if m != nil { + return m.DisplayName + } + return "" +} + type AcceptInviteRequest struct { // OPTIONAL. // Opaque information. @@ -309,10 +349,19 @@ type AcceptInviteResponse struct { Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` + // REQUIRED. + // The initiator's user id of the workflow. + UserId *v1beta13.UserId `protobuf:"bytes,3,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` + // REQUIRED. + // The initiator's email of the workflow. + Email string `protobuf:"bytes,4,opt,name=email,proto3" json:"email,omitempty"` + // REQUIRED. + // The initiator's display name of the workflow. + DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *AcceptInviteResponse) Reset() { *m = AcceptInviteResponse{} } @@ -354,6 +403,27 @@ func (m *AcceptInviteResponse) GetOpaque() *v1beta1.Opaque { return nil } +func (m *AcceptInviteResponse) GetUserId() *v1beta13.UserId { + if m != nil { + return m.UserId + } + return nil +} + +func (m *AcceptInviteResponse) GetEmail() string { + if m != nil { + return m.Email + } + return "" +} + +func (m *AcceptInviteResponse) GetDisplayName() string { + if m != nil { + return m.DisplayName + } + return "" +} + type GetAcceptedUserRequest struct { // OPTIONAL. // Opaque information. @@ -596,49 +666,53 @@ func init() { } var fileDescriptor_b0e70953130e3677 = []byte{ - // 667 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xdf, 0x6e, 0xd3, 0x3e, - 0x14, 0x56, 0xda, 0x9f, 0x2a, 0xed, 0xec, 0xcf, 0x4f, 0x64, 0xa3, 0xeb, 0x02, 0x88, 0x11, 0xa4, - 0x31, 0xc4, 0x48, 0xe9, 0xfa, 0x02, 0x6c, 0x93, 0x36, 0xf5, 0xaa, 0x55, 0x06, 0x5c, 0xa0, 0x4a, - 0x55, 0xe6, 0x9c, 0x21, 0x8b, 0x25, 0xce, 0x6c, 0x77, 0x30, 0x90, 0x78, 0x0a, 0x9e, 0x80, 0x4b, - 0x5e, 0x82, 0x4b, 0x04, 0x97, 0x7b, 0x11, 0x5e, 0x01, 0xc5, 0x76, 0xb3, 0x6c, 0x4b, 0xa0, 0xeb, - 0xa4, 0x8a, 0xbb, 0xba, 0xdf, 0x77, 0xbe, 0x73, 0xfc, 0xd9, 0xe7, 0x38, 0xf0, 0x88, 0x88, 0x76, - 0x93, 0x91, 0xa8, 0x49, 0xe3, 0x13, 0x2a, 0xb1, 0x79, 0xd2, 0x3a, 0x40, 0x19, 0xb4, 0xcc, 0x72, - 0x10, 0x24, 0xd4, 0x4b, 0x38, 0x93, 0xcc, 0xae, 0x13, 0xd1, 0xf6, 0x18, 0x89, 0x3c, 0x8d, 0x78, - 0x86, 0xe8, 0x3c, 0x4e, 0x05, 0x68, 0x88, 0xb1, 0xa4, 0xf2, 0xb4, 0x39, 0x14, 0xc8, 0x33, 0x0d, - 0x8e, 0x82, 0x0d, 0x39, 0x41, 0xa1, 0x25, 0x9c, 0xb5, 0x92, 0x5c, 0x97, 0x79, 0xeb, 0x23, 0x5e, - 0xc2, 0xd9, 0x09, 0x0d, 0xff, 0xa0, 0x78, 0x37, 0x65, 0xf2, 0x84, 0x64, 0x04, 0x21, 0x03, 0x39, - 0x1c, 0xa1, 0xf7, 0x52, 0x54, 0x9e, 0x26, 0x28, 0x32, 0x5c, 0xad, 0x34, 0xec, 0x76, 0xc1, 0xd9, - 0xc3, 0x18, 0x79, 0x20, 0xb1, 0xa3, 0x0a, 0x7a, 0xc1, 0xde, 0x62, 0xec, 0xe3, 0xf1, 0x10, 0x85, - 0xb4, 0x5b, 0x50, 0x63, 0x49, 0x70, 0x3c, 0xc4, 0x86, 0xb5, 0x6a, 0xad, 0xcf, 0x6e, 0xae, 0x78, - 0xa9, 0x01, 0x3a, 0xde, 0xa8, 0x79, 0x5d, 0x45, 0xf0, 0x0d, 0xd1, 0xfd, 0x61, 0xc1, 0x9d, 0x42, - 0x45, 0x91, 0xb0, 0x58, 0xa0, 0xdd, 0x84, 0x9a, 0xae, 0xcf, 0x48, 0x2e, 0x2b, 0x49, 0x9e, 0x90, - 0x4c, 0x70, 0x5f, 0xc1, 0xbe, 0xa1, 0xe5, 0x6a, 0xa8, 0x8c, 0x59, 0x83, 0xbd, 0x0b, 0x73, 0xe6, - 0xe8, 0x64, 0x9a, 0xbb, 0x51, 0x55, 0x81, 0x0f, 0xbd, 0xe2, 0xd3, 0xf3, 0xf2, 0x65, 0xce, 0xd2, - 0xf3, 0x85, 0xfb, 0xcb, 0x82, 0xa5, 0x5d, 0xc6, 0xdf, 0x05, 0x3c, 0xd4, 0x9c, 0xc9, 0x7d, 0xb9, - 0x52, 0x53, 0x65, 0xb2, 0x9a, 0xec, 0x3e, 0xd4, 0x19, 0xa7, 0x6f, 0x68, 0x3c, 0x10, 0xa7, 0x42, - 0x62, 0x34, 0x18, 0xdd, 0x0f, 0xb3, 0xcb, 0xb5, 0x4c, 0x71, 0x04, 0x64, 0x9a, 0x3d, 0xf3, 0x47, - 0x27, 0x3e, 0x64, 0xfe, 0x92, 0x56, 0xd9, 0x57, 0x22, 0x23, 0xc4, 0xfd, 0x08, 0xb7, 0x2f, 0x6d, - 0x78, 0x7a, 0xc7, 0xe6, 0x9e, 0x59, 0xb0, 0xb8, 0x45, 0x08, 0x26, 0xf2, 0x9f, 0x71, 0xfb, 0x39, - 0xcc, 0x72, 0x8c, 0x98, 0xc4, 0x41, 0xda, 0xd4, 0xc6, 0xe2, 0xfb, 0x4a, 0x66, 0xd4, 0xee, 0x5e, - 0x8a, 0x64, 0x4a, 0x2f, 0x05, 0x72, 0x1f, 0x74, 0x4c, 0xfa, 0xdb, 0xfd, 0x00, 0x4b, 0x17, 0xf7, - 0x34, 0x45, 0x43, 0x3f, 0x5b, 0x50, 0xdf, 0x43, 0xa9, 0xf3, 0x63, 0xa8, 0x6a, 0x9b, 0xdc, 0xd3, - 0x3d, 0x58, 0xc8, 0x79, 0x31, 0xa0, 0xa1, 0x29, 0xe4, 0xc1, 0x5f, 0xec, 0xe8, 0x84, 0xfe, 0xdc, - 0xb9, 0x21, 0x9d, 0xd0, 0xfd, 0x66, 0xc1, 0xf2, 0x95, 0xb2, 0xa6, 0x38, 0x1e, 0x6e, 0x7e, 0xa8, - 0x08, 0x8d, 0x5d, 0x1a, 0x87, 0xf9, 0x1d, 0x88, 0x1b, 0x38, 0x5b, 0x87, 0xda, 0x21, 0x3d, 0x92, - 0xc8, 0xd5, 0x1e, 0x66, 0x7c, 0xb3, 0x72, 0xbf, 0x5b, 0xb0, 0x52, 0x90, 0x67, 0xaa, 0x93, 0x74, - 0x21, 0x30, 0xc9, 0x95, 0x59, 0xa2, 0x51, 0x5d, 0xad, 0x8e, 0xe3, 0xd6, 0x7c, 0x90, 0xaf, 0x79, - 0xf3, 0xec, 0x3f, 0x98, 0xd1, 0x0d, 0xb0, 0xd5, 0xeb, 0xd8, 0x9f, 0x60, 0xb1, 0xe0, 0x89, 0xb0, - 0x37, 0xcb, 0xda, 0xb3, 0xfc, 0x85, 0x72, 0xda, 0xd7, 0x8a, 0x31, 0xce, 0x1d, 0xc1, 0xfc, 0x85, - 0x29, 0x67, 0x6f, 0x94, 0xa9, 0x14, 0x4d, 0x7f, 0xe7, 0xe9, 0x98, 0x6c, 0x93, 0x8d, 0xc2, 0x5c, - 0x7e, 0x02, 0xd8, 0x4f, 0xca, 0xc2, 0x0b, 0x66, 0x9f, 0xb3, 0x31, 0x1e, 0xd9, 0xa4, 0xe2, 0xf0, - 0xff, 0xa5, 0xc6, 0xb2, 0xbd, 0x72, 0x83, 0x8a, 0x06, 0x83, 0xd3, 0x1c, 0x9b, 0x6f, 0x72, 0xbe, - 0x87, 0x5b, 0x57, 0xee, 0xa8, 0xfd, 0xac, 0xd4, 0xa2, 0x92, 0xb6, 0x71, 0x5a, 0xd7, 0x88, 0xd0, - 0x99, 0xb7, 0x87, 0xe0, 0x10, 0x16, 0x95, 0xc4, 0x6d, 0x2f, 0x98, 0xfb, 0x96, 0xd0, 0x5e, 0xfa, - 0xa5, 0xd3, 0xb3, 0x5e, 0xcf, 0x6b, 0x86, 0x21, 0x7c, 0xa9, 0x54, 0x77, 0xba, 0x9d, 0xaf, 0x95, - 0xfa, 0x8e, 0x68, 0x7b, 0x5d, 0x12, 0x99, 0x47, 0xc0, 0x7b, 0xd5, 0xda, 0x4e, 0xe1, 0x9f, 0x0a, - 0xe8, 0x77, 0x49, 0xd4, 0xd7, 0x40, 0xdf, 0x00, 0x07, 0x35, 0xf5, 0xe5, 0xd4, 0xfe, 0x1d, 0x00, - 0x00, 0xff, 0xff, 0xb7, 0x73, 0x79, 0xaf, 0x36, 0x0a, 0x00, 0x00, + // 733 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xcf, 0x4e, 0x13, 0x41, + 0x18, 0xcf, 0xb6, 0x50, 0xc3, 0xd7, 0x82, 0x71, 0xc1, 0x52, 0x56, 0x8d, 0xa5, 0x26, 0x88, 0x11, + 0xb7, 0x96, 0xde, 0x3c, 0x09, 0x24, 0x90, 0x5e, 0x6c, 0x53, 0xd4, 0x83, 0x69, 0xd2, 0x2c, 0xbb, + 0x1f, 0x66, 0x62, 0x77, 0x67, 0x99, 0x99, 0xa2, 0xbd, 0xf8, 0x14, 0x3e, 0x81, 0x47, 0x5f, 0xc2, + 0xa3, 0xd1, 0x23, 0x2f, 0xa2, 0x8f, 0x60, 0x76, 0x66, 0xba, 0x2c, 0x65, 0x57, 0x0b, 0x24, 0xc4, + 0x78, 0x6a, 0x67, 0x7e, 0xbf, 0xef, 0xfb, 0x7d, 0xff, 0x66, 0x66, 0xe1, 0xa1, 0xcb, 0x9b, 0x75, + 0xea, 0xfa, 0x75, 0x12, 0x1c, 0x13, 0x81, 0xf5, 0xe3, 0xc6, 0x01, 0x0a, 0xa7, 0xa1, 0x97, 0x7d, + 0x27, 0x24, 0x76, 0xc8, 0xa8, 0xa0, 0x66, 0xd9, 0xe5, 0x4d, 0x9b, 0xba, 0xbe, 0xad, 0x10, 0x5b, + 0x13, 0xad, 0x47, 0x91, 0x03, 0xe2, 0x61, 0x20, 0x88, 0x18, 0xd5, 0x87, 0x1c, 0x59, 0xec, 0x83, + 0x21, 0xa7, 0x43, 0xe6, 0x22, 0x57, 0x2e, 0xac, 0xb5, 0x0c, 0xad, 0x49, 0xde, 0xfa, 0x98, 0x17, + 0x32, 0x7a, 0x4c, 0xbc, 0x3f, 0x78, 0xbc, 0x1b, 0x31, 0x59, 0xe8, 0xc6, 0x04, 0x2e, 0x1c, 0x31, + 0x1c, 0xa3, 0xf7, 0x22, 0x54, 0x8c, 0x42, 0xe4, 0x31, 0x2e, 0x57, 0x0a, 0xae, 0x1d, 0x81, 0xb5, + 0x87, 0x01, 0x32, 0x47, 0x60, 0x4b, 0x06, 0xf4, 0x92, 0xbe, 0xc3, 0xa0, 0x8b, 0x47, 0x43, 0xe4, + 0xc2, 0x6c, 0x40, 0x81, 0x86, 0xce, 0xd1, 0x10, 0x2b, 0x46, 0xd5, 0x58, 0x2f, 0x6e, 0xae, 0xd8, + 0x51, 0x01, 0x94, 0xbd, 0xf6, 0x66, 0xb7, 0x25, 0xa1, 0xab, 0x89, 0x66, 0x15, 0x8a, 0x1e, 0x72, + 0x97, 0x91, 0x50, 0x10, 0x1a, 0x54, 0x72, 0x55, 0x63, 0x7d, 0xae, 0x9b, 0xdc, 0xaa, 0x7d, 0x37, + 0xe0, 0x4e, 0xaa, 0x26, 0x0f, 0x69, 0xc0, 0xd1, 0xac, 0x43, 0x41, 0x65, 0xa0, 0x45, 0x97, 0xa5, + 0x28, 0x0b, 0xdd, 0x58, 0x72, 0x5f, 0xc2, 0x5d, 0x4d, 0x4b, 0x44, 0x99, 0x9b, 0x36, 0xca, 0x5d, + 0x28, 0xe9, 0xe6, 0x8a, 0x48, 0xbb, 0x92, 0x97, 0x86, 0x0f, 0xec, 0xf4, 0xfe, 0xda, 0xc9, 0x30, + 0x8b, 0xe4, 0x74, 0x51, 0xfb, 0x69, 0xc0, 0xd2, 0x2e, 0x65, 0xef, 0x1d, 0xe6, 0x29, 0xce, 0x15, + 0x2a, 0x37, 0x19, 0x53, 0xee, 0x72, 0x31, 0x99, 0x3d, 0x28, 0x53, 0x46, 0xde, 0x92, 0xa0, 0xcf, + 0x47, 0x5c, 0xa0, 0xdf, 0x1f, 0x4f, 0x90, 0xce, 0x72, 0x2d, 0xf6, 0x38, 0x06, 0x62, 0x9f, 0x1d, + 0xbd, 0xd1, 0x0a, 0x0e, 0x69, 0x77, 0x49, 0x79, 0xd9, 0x97, 0x4e, 0xc6, 0x48, 0xed, 0x97, 0x01, + 0xb7, 0x27, 0x32, 0xbe, 0xc6, 0xbe, 0x3d, 0x83, 0x1b, 0xd1, 0xe9, 0xea, 0x13, 0x4f, 0x27, 0xb3, + 0x2a, 0x6d, 0xc6, 0x47, 0xcf, 0x8e, 0xc0, 0xd8, 0xf6, 0x15, 0x47, 0xd6, 0xf2, 0xba, 0x85, 0xa1, + 0xfc, 0x35, 0x97, 0x60, 0x16, 0x7d, 0x87, 0x0c, 0x2a, 0x33, 0x72, 0x26, 0xd5, 0xc2, 0x5c, 0x85, + 0x92, 0x47, 0x78, 0x38, 0x70, 0x46, 0xfd, 0xc0, 0xf1, 0xb1, 0x32, 0xab, 0x07, 0x56, 0xed, 0xbd, + 0x70, 0x7c, 0xac, 0x9d, 0x18, 0xb0, 0xb8, 0xe5, 0xba, 0x18, 0x8a, 0x7f, 0xa6, 0xc7, 0xcf, 0xa1, + 0xc8, 0xd0, 0xa7, 0x02, 0xfb, 0x51, 0x72, 0xba, 0x16, 0xf7, 0xff, 0x52, 0x8b, 0x2e, 0x28, 0x9b, + 0xe8, 0xbf, 0x9c, 0xdc, 0xb3, 0x49, 0xfd, 0xef, 0x6d, 0xfc, 0x64, 0x40, 0x79, 0x0f, 0x85, 0x4a, + 0x1a, 0x3d, 0x59, 0x91, 0xcb, 0x77, 0x72, 0x0f, 0x16, 0x12, 0x1d, 0x88, 0x32, 0xc9, 0x4d, 0x9b, + 0x49, 0xe9, 0xb4, 0x0d, 0x2d, 0xaf, 0xf6, 0xd5, 0x80, 0xe5, 0x73, 0x61, 0x5d, 0x63, 0x2f, 0xae, + 0x3e, 0x4a, 0x08, 0x95, 0x5d, 0x12, 0x78, 0xc9, 0x0c, 0xf8, 0x15, 0x2a, 0x5b, 0x86, 0xc2, 0x21, + 0x19, 0x08, 0x64, 0xfa, 0xf1, 0xd0, 0xab, 0xda, 0x37, 0x03, 0x56, 0x52, 0x74, 0xae, 0xf5, 0xd5, + 0x58, 0x70, 0xb4, 0xb8, 0x2c, 0x16, 0xaf, 0xe4, 0xab, 0xf9, 0x69, 0xaa, 0x35, 0xef, 0x24, 0x63, + 0xde, 0x3c, 0x99, 0x81, 0x39, 0x75, 0xea, 0xb6, 0x3a, 0x2d, 0xf3, 0x23, 0x2c, 0xa6, 0x3c, 0x87, + 0xe6, 0x66, 0xd6, 0xa5, 0x90, 0xfd, 0x5e, 0x5b, 0xcd, 0x0b, 0xd9, 0xe8, 0xca, 0x0d, 0x60, 0xfe, + 0xcc, 0x85, 0x6e, 0x6e, 0x64, 0x79, 0x49, 0x7b, 0xe9, 0xac, 0x27, 0x53, 0xb2, 0xb5, 0x1a, 0x81, + 0x52, 0xf2, 0xda, 0x31, 0x1f, 0x67, 0x99, 0xa7, 0xdc, 0xb8, 0xd6, 0xc6, 0x74, 0x64, 0x2d, 0xc5, + 0xe0, 0xe6, 0xc4, 0xc1, 0x32, 0xed, 0xec, 0x02, 0xa5, 0x5d, 0x0c, 0x56, 0x7d, 0x6a, 0xbe, 0xd6, + 0xfc, 0x00, 0xb7, 0xce, 0xcd, 0xa8, 0xf9, 0x34, 0xb3, 0x44, 0x19, 0xc7, 0xc6, 0x6a, 0x5c, 0xc0, + 0x42, 0x29, 0x6f, 0x0f, 0xc1, 0x72, 0xa9, 0x9f, 0x61, 0xb7, 0xbd, 0xa0, 0xe7, 0x2d, 0x24, 0x9d, + 0xe8, 0xbb, 0xaf, 0x63, 0xbc, 0x99, 0x57, 0x0c, 0x4d, 0xf8, 0x9c, 0xcb, 0xef, 0xb4, 0x5b, 0x5f, + 0x72, 0xe5, 0x1d, 0xde, 0xb4, 0xdb, 0xae, 0xaf, 0x9f, 0x1e, 0xfb, 0x75, 0x63, 0x3b, 0x82, 0x7f, + 0x48, 0xa0, 0xd7, 0x76, 0xfd, 0x9e, 0x02, 0x7a, 0x1a, 0x38, 0x28, 0xc8, 0xef, 0xc8, 0xe6, 0xef, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xbe, 0x67, 0xda, 0x44, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -656,10 +730,18 @@ type InviteAPIClient interface { // Generates a new token for the user with a validity of 24 hours. GenerateInviteToken(ctx context.Context, in *GenerateInviteTokenRequest, opts ...grpc.CallOption) (*GenerateInviteTokenResponse, error) // Forwards a received invite to the sync'n'share system provider. + // MUST return CODE_NOT_FOUND if the token does not exist. + // MUST return CODE_INVALID_ARGUMENT if the token expired. + // MUST return CODE_ALREADY_EXISTS if the user already accepted an invite. + // MUST return CODE_PERMISSION_DENIED if the remote service is not trusted to accept invitations. ForwardInvite(ctx context.Context, in *ForwardInviteRequest, opts ...grpc.CallOption) (*ForwardInviteResponse, error) // Completes an invitation acceptance. + // MUST return CODE_NOT_FOUND if the token does not exist. + // MUST return CODE_INVALID_ARGUMENT if the token expired. + // MUST return CODE_ALREADY_EXISTS if the user already accepted an invite. AcceptInvite(ctx context.Context, in *AcceptInviteRequest, opts ...grpc.CallOption) (*AcceptInviteResponse, error) // Retrieves details about a remote user who has accepted an invite to share. + // MUST return CODE_NOT_FOUND if the user does not exist. GetAcceptedUser(ctx context.Context, in *GetAcceptedUserRequest, opts ...grpc.CallOption) (*GetAcceptedUserResponse, error) // Finds users who accepted invite tokens by their attributes. FindAcceptedUsers(ctx context.Context, in *FindAcceptedUsersRequest, opts ...grpc.CallOption) (*FindAcceptedUsersResponse, error) @@ -723,10 +805,18 @@ type InviteAPIServer interface { // Generates a new token for the user with a validity of 24 hours. GenerateInviteToken(context.Context, *GenerateInviteTokenRequest) (*GenerateInviteTokenResponse, error) // Forwards a received invite to the sync'n'share system provider. + // MUST return CODE_NOT_FOUND if the token does not exist. + // MUST return CODE_INVALID_ARGUMENT if the token expired. + // MUST return CODE_ALREADY_EXISTS if the user already accepted an invite. + // MUST return CODE_PERMISSION_DENIED if the remote service is not trusted to accept invitations. ForwardInvite(context.Context, *ForwardInviteRequest) (*ForwardInviteResponse, error) // Completes an invitation acceptance. + // MUST return CODE_NOT_FOUND if the token does not exist. + // MUST return CODE_INVALID_ARGUMENT if the token expired. + // MUST return CODE_ALREADY_EXISTS if the user already accepted an invite. AcceptInvite(context.Context, *AcceptInviteRequest) (*AcceptInviteResponse, error) // Retrieves details about a remote user who has accepted an invite to share. + // MUST return CODE_NOT_FOUND if the user does not exist. GetAcceptedUser(context.Context, *GetAcceptedUserRequest) (*GetAcceptedUserResponse, error) // Finds users who accepted invite tokens by their attributes. FindAcceptedUsers(context.Context, *FindAcceptedUsersRequest) (*FindAcceptedUsersResponse, error) diff --git a/vendor/github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1/code.pb.go b/vendor/github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1/code.pb.go index d90ad452d..60512cffe 100644 --- a/vendor/github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1/code.pb.go +++ b/vendor/github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1/code.pb.go @@ -185,6 +185,13 @@ const ( // // HTTP Mapping: 507 Insufficient Storage Code_CODE_INSUFFICIENT_STORAGE Code = 19 + // + // The ability to lock a resource is specific to some WebDAV servers. + // The HTTP 423 Locked error response code indicates that either + // the resources tentatively targeted by is locked, meaning it can't be accessed. + // + // HTTP Mapping: 423 Locked + Code_CODE_LOCKED Code = 20 ) var Code_name = map[int32]string{ @@ -208,6 +215,7 @@ var Code_name = map[int32]string{ 17: "CODE_DATA_LOSS", 18: "CODE_REDIRECTION", 19: "CODE_INSUFFICIENT_STORAGE", + 20: "CODE_LOCKED", } var Code_value = map[string]int32{ @@ -231,6 +239,7 @@ var Code_value = map[string]int32{ "CODE_DATA_LOSS": 17, "CODE_REDIRECTION": 18, "CODE_INSUFFICIENT_STORAGE": 19, + "CODE_LOCKED": 20, } func (x Code) String() string { @@ -248,32 +257,33 @@ func init() { func init() { proto.RegisterFile("cs3/rpc/v1beta1/code.proto", fileDescriptor_d7978aa548ead3ec) } var fileDescriptor_d7978aa548ead3ec = []byte{ - // 427 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xdd, 0x6e, 0xd3, 0x30, - 0x14, 0xc7, 0x59, 0x3b, 0x36, 0x76, 0xf6, 0xd1, 0x53, 0x77, 0xdf, 0xc0, 0x0b, 0x70, 0x91, 0xaa, - 0xea, 0x13, 0x38, 0xf6, 0x49, 0x67, 0xcd, 0xb5, 0x23, 0xdb, 0x29, 0x05, 0x4d, 0xb2, 0x58, 0xd6, - 0x4b, 0x94, 0xa8, 0xad, 0x78, 0x20, 0x2e, 0x79, 0x14, 0x6e, 0x79, 0x21, 0x94, 0x10, 0x22, 0xc4, - 0xa5, 0xff, 0xbf, 0xe3, 0xff, 0xf9, 0x84, 0xfb, 0x72, 0x37, 0x9f, 0x6e, 0xeb, 0x72, 0xfa, 0x6d, - 0xf6, 0xbc, 0xd9, 0x7f, 0x99, 0x4d, 0xcb, 0xea, 0x65, 0x93, 0xd4, 0xdb, 0x6a, 0x5f, 0xb1, 0x51, - 0xb9, 0x9b, 0x27, 0xdb, 0xba, 0x4c, 0x3a, 0xf6, 0xe1, 0xd7, 0x10, 0x0e, 0x45, 0xf5, 0xb2, 0x61, - 0x08, 0x67, 0xc2, 0x4a, 0x8a, 0xca, 0xac, 0xb8, 0x56, 0x12, 0x5f, 0xb1, 0x53, 0x38, 0x6e, 0x15, - 0xfb, 0x88, 0x07, 0x8c, 0xc1, 0x45, 0xfb, 0x10, 0xdc, 0x08, 0xd2, 0x9a, 0x24, 0x0e, 0xfa, 0x2f, - 0x85, 0x79, 0x34, 0xf6, 0xa3, 0xc1, 0x21, 0xbb, 0x83, 0xab, 0x7f, 0x4d, 0x22, 0x77, 0x8b, 0x62, - 0x49, 0x26, 0xe0, 0x21, 0xbb, 0x87, 0xeb, 0x16, 0x49, 0xe2, 0x52, 0x2b, 0x43, 0x91, 0xd6, 0x82, - 0x48, 0x92, 0xc4, 0xd7, 0xbd, 0xb9, 0xb1, 0x21, 0x66, 0xb6, 0x30, 0x12, 0x8f, 0xd8, 0x0d, 0x4c, - 0x5a, 0x8d, 0x6b, 0x47, 0x5c, 0x7e, 0x8a, 0xb4, 0x56, 0x3e, 0x78, 0x3c, 0xee, 0x8d, 0x72, 0x72, - 0x4b, 0xe5, 0xbd, 0xb2, 0x26, 0x4a, 0x32, 0x8a, 0x24, 0xbe, 0x61, 0xb7, 0x70, 0xd9, 0x55, 0xc4, - 0x8b, 0xf0, 0x40, 0x26, 0x28, 0xc1, 0x03, 0x49, 0x3c, 0x61, 0x6f, 0xe1, 0xa6, 0x25, 0x8e, 0xbc, - 0x2d, 0x9c, 0x68, 0xd2, 0x3f, 0xf0, 0xc2, 0x37, 0x10, 0xd8, 0x3b, 0xb8, 0x6d, 0x61, 0xc6, 0x95, - 0x26, 0x19, 0x73, 0x47, 0xc2, 0x1a, 0xa9, 0x82, 0xb2, 0x06, 0x4f, 0xfb, 0x36, 0x79, 0x6a, 0x5d, - 0x13, 0x7f, 0xc6, 0xae, 0x60, 0xfc, 0x67, 0x32, 0x45, 0x88, 0x36, 0x8b, 0x8e, 0x9b, 0x05, 0xe1, - 0x39, 0xbb, 0x06, 0xd6, 0x65, 0x57, 0xcb, 0x5c, 0x53, 0xd3, 0x38, 0x49, 0xbc, 0x60, 0x63, 0x38, - 0xef, 0xa6, 0x12, 0xc8, 0x19, 0xae, 0x71, 0xc4, 0x2e, 0x01, 0xff, 0x16, 0xba, 0xe2, 0x4a, 0xf3, - 0x54, 0x13, 0x62, 0x3f, 0x07, 0xc9, 0x03, 0x8f, 0xda, 0x7a, 0x8f, 0xe3, 0x3e, 0xd2, 0x91, 0x54, - 0x8e, 0x44, 0x5b, 0x13, 0x63, 0xef, 0xe1, 0xae, 0xb3, 0xf4, 0x45, 0x96, 0x29, 0xa1, 0xc8, 0x84, - 0xe8, 0x83, 0x75, 0x7c, 0x41, 0x38, 0x49, 0xd7, 0x30, 0x29, 0xab, 0xaf, 0xc9, 0x7f, 0xcb, 0x4e, - 0x4f, 0x9a, 0x4d, 0xe7, 0xcd, 0x21, 0xe4, 0x07, 0x9f, 0x61, 0x5b, 0x97, 0x1d, 0xf8, 0x3e, 0x18, - 0x0a, 0xb7, 0xfe, 0x31, 0x18, 0x89, 0xdd, 0x3c, 0x71, 0x75, 0x99, 0xac, 0x66, 0x69, 0xa3, 0xff, - 0x6c, 0x95, 0x27, 0x57, 0x97, 0x4f, 0x9d, 0xf2, 0x7c, 0xd4, 0xde, 0xd1, 0xfc, 0x77, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xca, 0x09, 0x0e, 0x95, 0x65, 0x02, 0x00, 0x00, + // 437 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0x5d, 0x6e, 0x13, 0x31, + 0x10, 0xc7, 0x69, 0x52, 0x5a, 0x3a, 0x69, 0x9b, 0x89, 0x93, 0x7e, 0x02, 0x17, 0xe0, 0x61, 0xa3, + 0x28, 0x27, 0x70, 0xec, 0x49, 0x6a, 0xc5, 0xb1, 0x23, 0xdb, 0x1b, 0x02, 0xaa, 0x64, 0xd1, 0x6d, + 0x1e, 0xd1, 0xae, 0x92, 0x8a, 0x03, 0xf1, 0xc8, 0x51, 0x38, 0x07, 0x07, 0x41, 0x6b, 0x96, 0x15, + 0xe2, 0xd1, 0xff, 0xdf, 0xf8, 0x3f, 0x9f, 0x70, 0x5f, 0x1c, 0xa6, 0xe3, 0x7d, 0x55, 0x8c, 0xbf, + 0x4d, 0x9e, 0x76, 0x2f, 0x5f, 0x26, 0xe3, 0xa2, 0x7c, 0xde, 0x65, 0xd5, 0xbe, 0x7c, 0x29, 0x59, + 0xbf, 0x38, 0x4c, 0xb3, 0x7d, 0x55, 0x64, 0x0d, 0xfb, 0xf0, 0xab, 0x0b, 0xc7, 0xa2, 0x7c, 0xde, + 0x31, 0x84, 0x73, 0x61, 0x25, 0x45, 0x65, 0x36, 0x5c, 0x2b, 0x89, 0xaf, 0x58, 0x0f, 0x4e, 0x93, + 0x62, 0x97, 0x78, 0xc4, 0x18, 0x5c, 0xa6, 0x87, 0xe0, 0x46, 0x90, 0xd6, 0x24, 0xb1, 0xd3, 0x7e, + 0xc9, 0xcd, 0xd2, 0xd8, 0x8f, 0x06, 0xbb, 0xec, 0x0e, 0xae, 0xfe, 0x35, 0x89, 0xdc, 0x2d, 0xf2, + 0x15, 0x99, 0x80, 0xc7, 0xec, 0x1e, 0xae, 0x13, 0x92, 0xc4, 0xa5, 0x56, 0x86, 0x22, 0x6d, 0x05, + 0x91, 0x24, 0x89, 0xaf, 0x5b, 0x73, 0x63, 0x43, 0x9c, 0xdb, 0xdc, 0x48, 0x3c, 0x61, 0x37, 0x30, + 0x4c, 0x1a, 0xd7, 0x8e, 0xb8, 0xfc, 0x14, 0x69, 0xab, 0x7c, 0xf0, 0x78, 0xda, 0x1a, 0xad, 0xc9, + 0xad, 0x94, 0xf7, 0xca, 0x9a, 0x28, 0xc9, 0x28, 0x92, 0xf8, 0x86, 0xdd, 0xc2, 0xa8, 0xa9, 0x88, + 0xe7, 0xe1, 0x81, 0x4c, 0x50, 0x82, 0x07, 0x92, 0x78, 0xc6, 0xde, 0xc2, 0x4d, 0x22, 0x8e, 0xbc, + 0xcd, 0x9d, 0xa8, 0xd3, 0x3f, 0xf0, 0xdc, 0xd7, 0x10, 0xd8, 0x3b, 0xb8, 0x4d, 0x70, 0xce, 0x95, + 0x26, 0x19, 0xd7, 0x8e, 0x84, 0x35, 0x52, 0x05, 0x65, 0x0d, 0xf6, 0xda, 0x36, 0xf9, 0xcc, 0xba, + 0x3a, 0xfe, 0x9c, 0x5d, 0xc1, 0xe0, 0xcf, 0x64, 0xf2, 0x10, 0xed, 0x3c, 0x3a, 0x6e, 0x16, 0x84, + 0x17, 0xec, 0x1a, 0x58, 0x93, 0x5d, 0xad, 0xd6, 0x9a, 0xea, 0xc6, 0x49, 0xe2, 0x25, 0x1b, 0xc0, + 0x45, 0x33, 0x95, 0x40, 0xce, 0x70, 0x8d, 0x7d, 0x36, 0x02, 0xfc, 0x5b, 0xe8, 0x86, 0x2b, 0xcd, + 0x67, 0x9a, 0x10, 0xdb, 0x39, 0x48, 0x1e, 0x78, 0xd4, 0xd6, 0x7b, 0x1c, 0xb4, 0x91, 0x8e, 0xa4, + 0x72, 0x24, 0x52, 0x4d, 0x8c, 0xbd, 0x87, 0xbb, 0xc6, 0xd2, 0xe7, 0xf3, 0xb9, 0x12, 0x8a, 0x4c, + 0x88, 0x3e, 0x58, 0xc7, 0x17, 0x84, 0x43, 0xd6, 0x87, 0x5e, 0xc2, 0xda, 0x8a, 0x25, 0x49, 0x1c, + 0xcd, 0xb6, 0x30, 0x2c, 0xca, 0xaf, 0xd9, 0x7f, 0xdb, 0x9f, 0x9d, 0xd5, 0xab, 0x5f, 0xd7, 0x97, + 0xb1, 0x3e, 0xfa, 0x0c, 0xfb, 0xaa, 0x68, 0xc0, 0xf7, 0x4e, 0x57, 0xb8, 0xed, 0x8f, 0x4e, 0x5f, + 0x1c, 0xa6, 0x99, 0xab, 0x8a, 0x6c, 0x33, 0x99, 0xd5, 0xfa, 0xcf, 0xa4, 0x3c, 0xba, 0xaa, 0x78, + 0x6c, 0x94, 0xa7, 0x93, 0x74, 0x58, 0xd3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x1f, 0x7f, + 0x3c, 0x76, 0x02, 0x00, 0x00, } diff --git a/vendor/github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go b/vendor/github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go index 9d8adbe00..2b190625f 100644 --- a/vendor/github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go +++ b/vendor/github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1/collaboration_api.pb.go @@ -1222,6 +1222,7 @@ const _ = grpc.SupportPackageIsVersion4 type CollaborationAPIClient interface { // Creates a new share. // MUST return CODE_NOT_FOUND if the resource reference does not exist. + // MUST return CODE_LOCKED if the resource reference already locked. // MUST return CODE_ALREADY_EXISTS if the share already exists for the 4-tuple consisting of // (owner, shared_resource, grantee). // New shares MUST be created in the state SHARE_STATE_PENDING. @@ -1333,6 +1334,7 @@ func (c *collaborationAPIClient) GetReceivedShare(ctx context.Context, in *GetRe type CollaborationAPIServer interface { // Creates a new share. // MUST return CODE_NOT_FOUND if the resource reference does not exist. + // MUST return CODE_LOCKED if the resource reference already locked. // MUST return CODE_ALREADY_EXISTS if the share already exists for the 4-tuple consisting of // (owner, shared_resource, grantee). // New shares MUST be created in the state SHARE_STATE_PENDING. diff --git a/vendor/github.com/cs3org/go-cs3apis/cs3/tx/v1beta1/tx_api.pb.go b/vendor/github.com/cs3org/go-cs3apis/cs3/tx/v1beta1/tx_api.pb.go index 240252ef0..ed2a26e8d 100644 --- a/vendor/github.com/cs3org/go-cs3apis/cs3/tx/v1beta1/tx_api.pb.go +++ b/vendor/github.com/cs3org/go-cs3apis/cs3/tx/v1beta1/tx_api.pb.go @@ -6,9 +6,9 @@ package txv1beta1 import ( context "context" fmt "fmt" - v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - v1beta12 "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" - v1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" + v1beta12 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" + v1beta1 "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" + v1beta11 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -59,7 +59,7 @@ func (ListTransfersRequest_Filter_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor_13b0cfd696cc0a1f, []int{6, 0, 0} } -type PullTransferRequest struct { +type CreateTransferRequest struct { // REQUIRED. // The source target URI. Should include at the minimum all the info needed to access the source. // https://golang.org/pkg/net/url/#URL provides a quick view of the format. @@ -68,115 +68,125 @@ type PullTransferRequest struct { // The destination target URI. Should include at the minimum all the info needed to access the destination. // https://golang.org/pkg/net/url/#URL provides a quick view of the format. DestTargetUri string `protobuf:"bytes,2,opt,name=dest_target_uri,json=destTargetUri,proto3" json:"dest_target_uri,omitempty"` + // REQUIRED. + // The share Id of the share this transfer is based on. + ShareId *v1beta1.ShareId `protobuf:"bytes,3,opt,name=share_id,json=shareId,proto3" json:"share_id,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,4,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PullTransferRequest) Reset() { *m = PullTransferRequest{} } -func (m *PullTransferRequest) String() string { return proto.CompactTextString(m) } -func (*PullTransferRequest) ProtoMessage() {} -func (*PullTransferRequest) Descriptor() ([]byte, []int) { +func (m *CreateTransferRequest) Reset() { *m = CreateTransferRequest{} } +func (m *CreateTransferRequest) String() string { return proto.CompactTextString(m) } +func (*CreateTransferRequest) ProtoMessage() {} +func (*CreateTransferRequest) Descriptor() ([]byte, []int) { return fileDescriptor_13b0cfd696cc0a1f, []int{0} } -func (m *PullTransferRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PullTransferRequest.Unmarshal(m, b) +func (m *CreateTransferRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateTransferRequest.Unmarshal(m, b) } -func (m *PullTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PullTransferRequest.Marshal(b, m, deterministic) +func (m *CreateTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateTransferRequest.Marshal(b, m, deterministic) } -func (m *PullTransferRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PullTransferRequest.Merge(m, src) +func (m *CreateTransferRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateTransferRequest.Merge(m, src) } -func (m *PullTransferRequest) XXX_Size() int { - return xxx_messageInfo_PullTransferRequest.Size(m) +func (m *CreateTransferRequest) XXX_Size() int { + return xxx_messageInfo_CreateTransferRequest.Size(m) } -func (m *PullTransferRequest) XXX_DiscardUnknown() { - xxx_messageInfo_PullTransferRequest.DiscardUnknown(m) +func (m *CreateTransferRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CreateTransferRequest.DiscardUnknown(m) } -var xxx_messageInfo_PullTransferRequest proto.InternalMessageInfo +var xxx_messageInfo_CreateTransferRequest proto.InternalMessageInfo -func (m *PullTransferRequest) GetSrcTargetUri() string { +func (m *CreateTransferRequest) GetSrcTargetUri() string { if m != nil { return m.SrcTargetUri } return "" } -func (m *PullTransferRequest) GetDestTargetUri() string { +func (m *CreateTransferRequest) GetDestTargetUri() string { if m != nil { return m.DestTargetUri } return "" } -func (m *PullTransferRequest) GetOpaque() *v1beta1.Opaque { +func (m *CreateTransferRequest) GetShareId() *v1beta1.ShareId { + if m != nil { + return m.ShareId + } + return nil +} + +func (m *CreateTransferRequest) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } return nil } -type PullTransferResponse struct { +type CreateTransferResponse struct { // REQUIRED. // The response status. - Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + Status *v1beta12.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // REQUIRED. // TxInfo, includes transfer id, status, description. TxInfo *TxInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *PullTransferResponse) Reset() { *m = PullTransferResponse{} } -func (m *PullTransferResponse) String() string { return proto.CompactTextString(m) } -func (*PullTransferResponse) ProtoMessage() {} -func (*PullTransferResponse) Descriptor() ([]byte, []int) { +func (m *CreateTransferResponse) Reset() { *m = CreateTransferResponse{} } +func (m *CreateTransferResponse) String() string { return proto.CompactTextString(m) } +func (*CreateTransferResponse) ProtoMessage() {} +func (*CreateTransferResponse) Descriptor() ([]byte, []int) { return fileDescriptor_13b0cfd696cc0a1f, []int{1} } -func (m *PullTransferResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PullTransferResponse.Unmarshal(m, b) +func (m *CreateTransferResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateTransferResponse.Unmarshal(m, b) } -func (m *PullTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PullTransferResponse.Marshal(b, m, deterministic) +func (m *CreateTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateTransferResponse.Marshal(b, m, deterministic) } -func (m *PullTransferResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PullTransferResponse.Merge(m, src) +func (m *CreateTransferResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateTransferResponse.Merge(m, src) } -func (m *PullTransferResponse) XXX_Size() int { - return xxx_messageInfo_PullTransferResponse.Size(m) +func (m *CreateTransferResponse) XXX_Size() int { + return xxx_messageInfo_CreateTransferResponse.Size(m) } -func (m *PullTransferResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PullTransferResponse.DiscardUnknown(m) +func (m *CreateTransferResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CreateTransferResponse.DiscardUnknown(m) } -var xxx_messageInfo_PullTransferResponse proto.InternalMessageInfo +var xxx_messageInfo_CreateTransferResponse proto.InternalMessageInfo -func (m *PullTransferResponse) GetStatus() *v1beta11.Status { +func (m *CreateTransferResponse) GetStatus() *v1beta12.Status { if m != nil { return m.Status } return nil } -func (m *PullTransferResponse) GetTxInfo() *TxInfo { +func (m *CreateTransferResponse) GetTxInfo() *TxInfo { if m != nil { return m.TxInfo } return nil } -func (m *PullTransferResponse) GetOpaque() *v1beta1.Opaque { +func (m *CreateTransferResponse) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -189,10 +199,10 @@ type GetTransferStatusRequest struct { TxId *TxId `protobuf:"bytes,1,opt,name=tx_id,json=txId,proto3" json:"tx_id,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetTransferStatusRequest) Reset() { *m = GetTransferStatusRequest{} } @@ -227,7 +237,7 @@ func (m *GetTransferStatusRequest) GetTxId() *TxId { return nil } -func (m *GetTransferStatusRequest) GetOpaque() *v1beta1.Opaque { +func (m *GetTransferStatusRequest) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -237,16 +247,16 @@ func (m *GetTransferStatusRequest) GetOpaque() *v1beta1.Opaque { type GetTransferStatusResponse struct { // REQUIRED. // The response status. - Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + Status *v1beta12.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // REQUIRED. // TxInfo, includes ao. transfer id, status, description. TxInfo *TxInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetTransferStatusResponse) Reset() { *m = GetTransferStatusResponse{} } @@ -274,7 +284,7 @@ func (m *GetTransferStatusResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetTransferStatusResponse proto.InternalMessageInfo -func (m *GetTransferStatusResponse) GetStatus() *v1beta11.Status { +func (m *GetTransferStatusResponse) GetStatus() *v1beta12.Status { if m != nil { return m.Status } @@ -288,7 +298,7 @@ func (m *GetTransferStatusResponse) GetTxInfo() *TxInfo { return nil } -func (m *GetTransferStatusResponse) GetOpaque() *v1beta1.Opaque { +func (m *GetTransferStatusResponse) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -301,10 +311,10 @@ type CancelTransferRequest struct { TxId *TxId `protobuf:"bytes,1,opt,name=tx_id,json=txId,proto3" json:"tx_id,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CancelTransferRequest) Reset() { *m = CancelTransferRequest{} } @@ -339,7 +349,7 @@ func (m *CancelTransferRequest) GetTxId() *TxId { return nil } -func (m *CancelTransferRequest) GetOpaque() *v1beta1.Opaque { +func (m *CancelTransferRequest) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -349,16 +359,16 @@ func (m *CancelTransferRequest) GetOpaque() *v1beta1.Opaque { type CancelTransferResponse struct { // REQUIRED. // The response status. - Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + Status *v1beta12.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // REQUIRED. // TxInfo, includes ao. transfer id, status, description. TxInfo *TxInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CancelTransferResponse) Reset() { *m = CancelTransferResponse{} } @@ -386,7 +396,7 @@ func (m *CancelTransferResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CancelTransferResponse proto.InternalMessageInfo -func (m *CancelTransferResponse) GetStatus() *v1beta11.Status { +func (m *CancelTransferResponse) GetStatus() *v1beta12.Status { if m != nil { return m.Status } @@ -400,7 +410,7 @@ func (m *CancelTransferResponse) GetTxInfo() *TxInfo { return nil } -func (m *CancelTransferResponse) GetOpaque() *v1beta1.Opaque { +func (m *CancelTransferResponse) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -410,7 +420,7 @@ func (m *CancelTransferResponse) GetOpaque() *v1beta1.Opaque { type ListTransfersRequest struct { // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` + Opaque *v1beta11.Opaque `protobuf:"bytes,1,opt,name=opaque,proto3" json:"opaque,omitempty"` // OPTIONAL. // The list of filters to apply if any. Filters []*ListTransfersRequest_Filter `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"` @@ -444,7 +454,7 @@ func (m *ListTransfersRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ListTransfersRequest proto.InternalMessageInfo -func (m *ListTransfersRequest) GetOpaque() *v1beta1.Opaque { +func (m *ListTransfersRequest) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -516,7 +526,7 @@ type ListTransfersRequest_Filter_Status struct { } type ListTransfersRequest_Filter_ShareId struct { - ShareId *v1beta12.ShareId `protobuf:"bytes,3,opt,name=share_id,json=shareId,proto3,oneof"` + ShareId *v1beta1.ShareId `protobuf:"bytes,3,opt,name=share_id,json=shareId,proto3,oneof"` } type ListTransfersRequest_Filter_TxId struct { @@ -543,7 +553,7 @@ func (m *ListTransfersRequest_Filter) GetStatus() Status { return Status_STATUS_INVALID } -func (m *ListTransfersRequest_Filter) GetShareId() *v1beta12.ShareId { +func (m *ListTransfersRequest_Filter) GetShareId() *v1beta1.ShareId { if x, ok := m.GetTerm().(*ListTransfersRequest_Filter_ShareId); ok { return x.ShareId } @@ -569,16 +579,16 @@ func (*ListTransfersRequest_Filter) XXX_OneofWrappers() []interface{} { type ListTransfersResponse struct { // REQUIRED. // The response status. - Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + Status *v1beta12.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // REQUIRED. // List of TxInfo types representing transfers. Transfers []*TxInfo `protobuf:"bytes,2,rep,name=transfers,proto3" json:"transfers,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListTransfersResponse) Reset() { *m = ListTransfersResponse{} } @@ -606,7 +616,7 @@ func (m *ListTransfersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ListTransfersResponse proto.InternalMessageInfo -func (m *ListTransfersResponse) GetStatus() *v1beta11.Status { +func (m *ListTransfersResponse) GetStatus() *v1beta12.Status { if m != nil { return m.Status } @@ -620,7 +630,7 @@ func (m *ListTransfersResponse) GetTransfers() []*TxInfo { return nil } -func (m *ListTransfersResponse) GetOpaque() *v1beta1.Opaque { +func (m *ListTransfersResponse) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -633,10 +643,10 @@ type RetryTransferRequest struct { TxId *TxId `protobuf:"bytes,1,opt,name=tx_id,json=txId,proto3" json:"tx_id,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,2,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RetryTransferRequest) Reset() { *m = RetryTransferRequest{} } @@ -671,7 +681,7 @@ func (m *RetryTransferRequest) GetTxId() *TxId { return nil } -func (m *RetryTransferRequest) GetOpaque() *v1beta1.Opaque { +func (m *RetryTransferRequest) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -681,16 +691,16 @@ func (m *RetryTransferRequest) GetOpaque() *v1beta1.Opaque { type RetryTransferResponse struct { // REQUIRED. // The response status. - Status *v1beta11.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + Status *v1beta12.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` // REQUIRED. // TxInfo, includes ao. transfer id, status, description. TxInfo *TxInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"` // OPTIONAL. // Opaque information. - Opaque *v1beta1.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Opaque *v1beta11.Opaque `protobuf:"bytes,3,opt,name=opaque,proto3" json:"opaque,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *RetryTransferResponse) Reset() { *m = RetryTransferResponse{} } @@ -718,7 +728,7 @@ func (m *RetryTransferResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RetryTransferResponse proto.InternalMessageInfo -func (m *RetryTransferResponse) GetStatus() *v1beta11.Status { +func (m *RetryTransferResponse) GetStatus() *v1beta12.Status { if m != nil { return m.Status } @@ -732,7 +742,7 @@ func (m *RetryTransferResponse) GetTxInfo() *TxInfo { return nil } -func (m *RetryTransferResponse) GetOpaque() *v1beta1.Opaque { +func (m *RetryTransferResponse) GetOpaque() *v1beta11.Opaque { if m != nil { return m.Opaque } @@ -741,8 +751,8 @@ func (m *RetryTransferResponse) GetOpaque() *v1beta1.Opaque { func init() { proto.RegisterEnum("cs3.tx.v1beta1.ListTransfersRequest_Filter_Type", ListTransfersRequest_Filter_Type_name, ListTransfersRequest_Filter_Type_value) - proto.RegisterType((*PullTransferRequest)(nil), "cs3.tx.v1beta1.PullTransferRequest") - proto.RegisterType((*PullTransferResponse)(nil), "cs3.tx.v1beta1.PullTransferResponse") + proto.RegisterType((*CreateTransferRequest)(nil), "cs3.tx.v1beta1.CreateTransferRequest") + proto.RegisterType((*CreateTransferResponse)(nil), "cs3.tx.v1beta1.CreateTransferResponse") proto.RegisterType((*GetTransferStatusRequest)(nil), "cs3.tx.v1beta1.GetTransferStatusRequest") proto.RegisterType((*GetTransferStatusResponse)(nil), "cs3.tx.v1beta1.GetTransferStatusResponse") proto.RegisterType((*CancelTransferRequest)(nil), "cs3.tx.v1beta1.CancelTransferRequest") @@ -757,55 +767,55 @@ func init() { func init() { proto.RegisterFile("cs3/tx/v1beta1/tx_api.proto", fileDescriptor_13b0cfd696cc0a1f) } var fileDescriptor_13b0cfd696cc0a1f = []byte{ - // 753 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x5d, 0x4f, 0xda, 0x50, - 0x18, 0xa6, 0x05, 0x71, 0xbe, 0x28, 0xe2, 0x19, 0x3a, 0x64, 0x1f, 0x21, 0x4c, 0x1d, 0xc6, 0xa4, - 0x08, 0xec, 0x76, 0x17, 0xa0, 0x6e, 0x90, 0x98, 0x8d, 0xd4, 0x6a, 0x74, 0x31, 0x21, 0xb5, 0x1c, - 0xb4, 0x89, 0xd0, 0x7a, 0xce, 0x61, 0xa9, 0x7f, 0x64, 0x3f, 0x60, 0x97, 0xfb, 0x48, 0xb6, 0xbf, - 0xb0, 0xcb, 0xdd, 0xef, 0x47, 0xec, 0x5f, 0x2c, 0x3d, 0x3d, 0x14, 0x29, 0x75, 0x32, 0x93, 0x2d, - 0x5e, 0x69, 0xdf, 0xf7, 0x79, 0xdf, 0xe7, 0xe1, 0xe9, 0xd3, 0xd3, 0xc2, 0x43, 0x83, 0x56, 0x8a, - 0xcc, 0x29, 0xbe, 0x2b, 0x9d, 0x60, 0xa6, 0x97, 0x8a, 0xcc, 0x69, 0xe9, 0xb6, 0xa9, 0xd8, 0xc4, - 0x62, 0x16, 0x4a, 0x1a, 0xb4, 0xa2, 0x30, 0x47, 0x11, 0xcd, 0xec, 0x23, 0x17, 0x4c, 0x6c, 0xc3, - 0x47, 0x53, 0xa6, 0xb3, 0x3e, 0xf5, 0xd0, 0xd9, 0x67, 0x6e, 0x97, 0x9e, 0xe9, 0xc4, 0xec, 0x9d, - 0x16, 0x2d, 0xa3, 0xeb, 0xa3, 0x08, 0xa6, 0x56, 0x9f, 0x18, 0x78, 0x00, 0x7c, 0x12, 0xe0, 0x0c, - 0xf6, 0x1f, 0xf3, 0xfe, 0xa5, 0x8d, 0xe9, 0x50, 0x96, 0x7b, 0xe5, 0xb5, 0xf3, 0xef, 0x25, 0xb8, - 0xdf, 0xec, 0x9f, 0x9f, 0x6b, 0x44, 0xef, 0xd1, 0x0e, 0x26, 0x2a, 0xbe, 0xe8, 0x63, 0xca, 0xd0, - 0x0a, 0x24, 0x29, 0x31, 0x5a, 0x4c, 0x27, 0xa7, 0x98, 0xb5, 0xfa, 0xc4, 0xcc, 0x48, 0x39, 0xa9, - 0x30, 0xa3, 0xce, 0x52, 0x62, 0x68, 0xbc, 0xb8, 0x4f, 0x4c, 0xb4, 0x06, 0xf3, 0x6d, 0x4c, 0xd9, - 0x55, 0x98, 0xcc, 0x61, 0x73, 0x6e, 0x79, 0x88, 0x2b, 0x41, 0xdc, 0xb2, 0xf5, 0x8b, 0x3e, 0xce, - 0x44, 0x73, 0x52, 0x21, 0x51, 0x5e, 0x56, 0xb8, 0x19, 0x5c, 0x87, 0x50, 0xa5, 0xbc, 0xe1, 0x00, - 0x55, 0x00, 0xf3, 0x9f, 0x24, 0x48, 0x8f, 0x0a, 0xa3, 0xb6, 0xd5, 0xa3, 0x18, 0x15, 0x21, 0xee, - 0x39, 0xc5, 0x15, 0x25, 0xca, 0x0f, 0xf8, 0x2e, 0x62, 0x1b, 0xfe, 0xa6, 0x3d, 0xde, 0x56, 0x05, - 0x0c, 0x15, 0x61, 0x9a, 0x39, 0x2d, 0xb3, 0xd7, 0xb1, 0xb8, 0xb8, 0x44, 0x79, 0x49, 0x19, 0xbd, - 0x15, 0x8a, 0xe6, 0x34, 0x7a, 0x1d, 0x4b, 0x8d, 0x33, 0xfe, 0xf7, 0x36, 0x6a, 0x1d, 0xc8, 0xbc, - 0xc2, 0x6c, 0xa0, 0x55, 0x08, 0x10, 0x56, 0xae, 0xc3, 0x94, 0xcb, 0xdf, 0x16, 0x7a, 0xd3, 0x21, - 0xec, 0x6d, 0x35, 0xc6, 0x9c, 0x46, 0xfb, 0x0a, 0xb3, 0x3c, 0x29, 0xf3, 0x57, 0x09, 0x96, 0x43, - 0xa8, 0xef, 0xb2, 0x59, 0x7d, 0x58, 0xdc, 0xd2, 0x7b, 0x06, 0x1e, 0x0b, 0xdd, 0xbf, 0x75, 0xea, - 0x8b, 0x04, 0x4b, 0x41, 0xde, 0xbb, 0x6c, 0xd3, 0xcf, 0x28, 0xa4, 0x77, 0x4d, 0xea, 0xdf, 0x5a, - 0x3f, 0x50, 0xc3, 0x5d, 0xd2, 0x84, 0xbb, 0xd0, 0x0e, 0x4c, 0x77, 0xcc, 0x73, 0x86, 0x09, 0xcd, - 0xc8, 0xb9, 0x68, 0x21, 0x51, 0xde, 0x08, 0xea, 0x0d, 0x63, 0x52, 0x5e, 0xf2, 0x19, 0x75, 0x30, - 0x9b, 0xfd, 0x2e, 0x43, 0xdc, 0xab, 0xa1, 0x6d, 0x88, 0xb9, 0x8c, 0x5c, 0x42, 0xb2, 0xbc, 0xf9, - 0x17, 0xeb, 0x14, 0xed, 0xd2, 0xc6, 0x2a, 0x9f, 0x46, 0x9b, 0xbe, 0xf1, 0x32, 0xdf, 0x33, 0x66, - 0xa3, 0xe7, 0x7b, 0x3d, 0xe2, 0x3b, 0xff, 0x02, 0xee, 0xb9, 0xc7, 0x22, 0x76, 0x63, 0xe2, 0x59, - 0x99, 0xe3, 0x33, 0xe2, 0xac, 0x54, 0x2c, 0xa3, 0x3b, 0x1c, 0x76, 0x81, 0x8d, 0x76, 0x3d, 0xa2, - 0x4e, 0x53, 0xef, 0x5f, 0xb4, 0x31, 0x88, 0x58, 0xec, 0xfa, 0x88, 0xd5, 0x23, 0x5e, 0xc8, 0xf2, - 0xbb, 0x10, 0x73, 0xb5, 0xa2, 0x14, 0xcc, 0x6a, 0x47, 0xcd, 0x9d, 0x56, 0xe3, 0xf5, 0x41, 0x75, - 0xb7, 0xb1, 0x9d, 0x8a, 0xa0, 0x79, 0x48, 0xf0, 0xca, 0x9e, 0x56, 0xd5, 0xf6, 0xf7, 0x52, 0x12, - 0x5a, 0x80, 0x39, 0xaf, 0x50, 0xaf, 0xaa, 0x3b, 0xad, 0xc6, 0x76, 0x4a, 0x46, 0x49, 0x00, 0x5e, - 0xd2, 0x0e, 0xdd, 0xeb, 0x68, 0x2d, 0x0e, 0x31, 0x86, 0x49, 0x37, 0xff, 0x4d, 0x82, 0xc5, 0x80, - 0x3d, 0xb7, 0x8d, 0xe1, 0x73, 0x98, 0x61, 0x83, 0x2d, 0xe2, 0xc6, 0x5e, 0x17, 0xc4, 0x21, 0xf0, - 0x36, 0x59, 0x64, 0x90, 0x56, 0x31, 0x23, 0x97, 0xff, 0xf7, 0x89, 0xfd, 0x2c, 0xc1, 0x62, 0x80, - 0xf6, 0x0e, 0x3f, 0xb0, 0xe5, 0x5f, 0x51, 0x98, 0xd2, 0x9c, 0x6a, 0xb3, 0x81, 0x8e, 0x60, 0xf6, - 0xea, 0xbb, 0x0b, 0x3d, 0x0d, 0x92, 0x85, 0xbc, 0x72, 0xb3, 0x2b, 0x7f, 0x06, 0x89, 0x5f, 0x7e, - 0x06, 0x0b, 0x63, 0xc7, 0x3d, 0x2a, 0x04, 0x47, 0xaf, 0x7b, 0x19, 0x65, 0xd7, 0x27, 0x40, 0x0a, - 0xa6, 0x16, 0x24, 0x47, 0x8f, 0x4b, 0xb4, 0x1a, 0x1c, 0x0e, 0x3d, 0xc6, 0xb3, 0x6b, 0x37, 0xc1, - 0x04, 0xc1, 0x31, 0xcc, 0x8d, 0x3c, 0x07, 0x68, 0x65, 0x92, 0x53, 0x24, 0xbb, 0x7a, 0x03, 0x6a, - 0xb8, 0x7d, 0x24, 0x3b, 0xe3, 0xdb, 0xc3, 0x12, 0x3d, 0xbe, 0x3d, 0x34, 0x80, 0xb5, 0x7d, 0x40, - 0x86, 0xd5, 0x0d, 0x60, 0x6b, 0xa0, 0x39, 0x55, 0xdb, 0x6c, 0xba, 0x5f, 0x56, 0x4d, 0xe9, 0xed, - 0x0c, 0x73, 0x44, 0xe3, 0x83, 0x1c, 0xdd, 0xd2, 0x0e, 0x3f, 0xca, 0xc9, 0x2d, 0x5a, 0x51, 0x34, - 0x47, 0x39, 0x28, 0xd5, 0xdc, 0xf2, 0x0f, 0x5e, 0x38, 0xd6, 0x9c, 0x63, 0x51, 0x38, 0x89, 0xf3, - 0xaf, 0xb2, 0xca, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x1c, 0xfd, 0x29, 0x4a, 0x0a, 0x00, - 0x00, + // 759 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x5f, 0x4f, 0xda, 0x5c, + 0x18, 0xa7, 0x05, 0xf1, 0xf5, 0x41, 0x11, 0x4f, 0xc4, 0x17, 0x79, 0xff, 0x84, 0x10, 0x75, 0x18, + 0x93, 0x22, 0xb0, 0xbb, 0x65, 0x17, 0x80, 0x6e, 0x90, 0x98, 0x8d, 0xd4, 0x6a, 0xdc, 0x62, 0xd2, + 0xd4, 0x72, 0xd0, 0x26, 0x42, 0xeb, 0x39, 0x87, 0xa5, 0x7e, 0x9d, 0x5d, 0x2e, 0x5b, 0xb2, 0x7d, + 0x85, 0x5d, 0xee, 0xde, 0xcf, 0xb1, 0xaf, 0xb0, 0x9c, 0xd3, 0x42, 0xa5, 0xd4, 0x88, 0x26, 0x5b, + 0xbc, 0x82, 0x3e, 0xcf, 0xef, 0xf9, 0xf7, 0x3b, 0xbf, 0x3e, 0xa7, 0xf0, 0x8f, 0x49, 0x6b, 0x65, + 0xe6, 0x96, 0x3f, 0x54, 0xce, 0x30, 0x33, 0x2a, 0x65, 0xe6, 0xea, 0x86, 0x63, 0x29, 0x0e, 0xb1, + 0x99, 0x8d, 0xd2, 0x26, 0xad, 0x29, 0xcc, 0x55, 0x7c, 0x67, 0xfe, 0x5f, 0x0e, 0x26, 0x8e, 0x39, + 0x46, 0x53, 0x66, 0xb0, 0x21, 0xf5, 0xd0, 0xf9, 0x67, 0xdc, 0x4b, 0x2f, 0x0c, 0x62, 0x0d, 0xce, + 0xcb, 0xb6, 0xd9, 0x1f, 0xa3, 0x08, 0xa6, 0xf6, 0x90, 0x98, 0x78, 0x04, 0xfc, 0x3f, 0x54, 0x33, + 0xec, 0xff, 0x4f, 0xf8, 0xaf, 0x1d, 0x4c, 0x83, 0xb6, 0xf8, 0x93, 0xe7, 0x2e, 0xde, 0x48, 0x90, + 0x6d, 0x12, 0x6c, 0x30, 0xac, 0x11, 0x63, 0x40, 0x7b, 0x98, 0xa8, 0xf8, 0x6a, 0x88, 0x29, 0x43, + 0x1b, 0x90, 0xa6, 0xc4, 0xd4, 0x99, 0x41, 0xce, 0x31, 0xd3, 0x87, 0xc4, 0xca, 0x49, 0x05, 0xa9, + 0xb4, 0xa0, 0x2e, 0x52, 0x62, 0x6a, 0xc2, 0x78, 0x44, 0x2c, 0xb4, 0x05, 0xcb, 0x5d, 0x4c, 0xd9, + 0x6d, 0x98, 0x2c, 0x60, 0x4b, 0xdc, 0x1c, 0xe0, 0x5e, 0xc0, 0x5f, 0x7c, 0x1a, 0xac, 0x5b, 0xdd, + 0x5c, 0xbc, 0x20, 0x95, 0x52, 0xd5, 0x82, 0xc2, 0x09, 0xf1, 0x47, 0x54, 0x6c, 0xb3, 0x3f, 0x62, + 0x46, 0x39, 0xe4, 0xc0, 0x76, 0x57, 0x9d, 0xa7, 0xde, 0x1f, 0x54, 0x81, 0xa4, 0xed, 0x18, 0x57, + 0x43, 0x9c, 0x4b, 0x88, 0xd0, 0x75, 0x11, 0xea, 0x8d, 0x31, 0x0a, 0x7a, 0x2b, 0x00, 0xaa, 0x0f, + 0x2c, 0x7e, 0x91, 0x60, 0x2d, 0x3c, 0x17, 0x75, 0xec, 0x01, 0xc5, 0xa8, 0x0c, 0x49, 0x8f, 0x6a, + 0x31, 0x50, 0xaa, 0xfa, 0xb7, 0xc8, 0x46, 0x1c, 0x33, 0x68, 0x40, 0xb8, 0x55, 0x1f, 0x86, 0xca, + 0x30, 0xcf, 0x5c, 0xdd, 0x1a, 0xf4, 0x6c, 0x31, 0x5b, 0xaa, 0xba, 0xa6, 0x4c, 0x9e, 0xa5, 0xa2, + 0xb9, 0xed, 0x41, 0xcf, 0x56, 0x93, 0x4c, 0xfc, 0xde, 0xea, 0x37, 0x3e, 0x6b, 0xbf, 0x2e, 0xe4, + 0x5e, 0x63, 0x36, 0xea, 0xd5, 0x6f, 0xc0, 0x3f, 0x89, 0x6d, 0x98, 0xe3, 0xf5, 0xbb, 0x7e, 0xbf, + 0xab, 0x11, 0xd5, 0xbb, 0x6a, 0x82, 0xb9, 0x13, 0x4c, 0xc9, 0xb3, 0x56, 0xfe, 0x2a, 0xc1, 0x7a, + 0x44, 0xe9, 0xa7, 0x4c, 0xd6, 0x10, 0xb2, 0x4d, 0x63, 0x60, 0xe2, 0xcb, 0xb0, 0x66, 0x7f, 0x2f, + 0x53, 0x42, 0x53, 0xa1, 0xba, 0x4f, 0x99, 0xa6, 0x9b, 0x38, 0xac, 0x1e, 0x58, 0x74, 0x7c, 0xb4, + 0x63, 0x41, 0x05, 0xb9, 0xa4, 0x19, 0x73, 0xa1, 0x7d, 0x98, 0xef, 0x59, 0x97, 0x0c, 0x13, 0x9a, + 0x93, 0x0b, 0xf1, 0x52, 0xaa, 0xba, 0x13, 0xee, 0x37, 0xaa, 0x92, 0xf2, 0x4a, 0xc4, 0xa8, 0xa3, + 0xd8, 0xfc, 0x77, 0x19, 0x92, 0x9e, 0x0d, 0xed, 0x41, 0x82, 0x57, 0x14, 0x2d, 0xa4, 0xab, 0xbb, + 0x0f, 0x48, 0xa7, 0x68, 0xd7, 0x0e, 0x56, 0x45, 0x34, 0xda, 0x1d, 0x13, 0x2f, 0x8b, 0x3c, 0x53, + 0x34, 0x7a, 0xbc, 0xb7, 0x62, 0x63, 0xe6, 0x5f, 0x3e, 0x7c, 0x13, 0xb5, 0x62, 0xc1, 0x2e, 0xda, + 0x19, 0x49, 0x2c, 0x71, 0xb7, 0xc4, 0x5a, 0x31, 0x4f, 0x64, 0xc5, 0x03, 0x48, 0xf0, 0x5e, 0x51, + 0x06, 0x16, 0xb5, 0x77, 0x9d, 0x7d, 0xbd, 0xfd, 0xe6, 0xb8, 0x7e, 0xd0, 0xde, 0xcb, 0xc4, 0xd0, + 0x32, 0xa4, 0x84, 0xe5, 0x50, 0xab, 0x6b, 0x47, 0x87, 0x19, 0x09, 0xad, 0xc0, 0x92, 0x67, 0x68, + 0xd5, 0xd5, 0x7d, 0xbd, 0xbd, 0x97, 0x91, 0x51, 0x1a, 0x40, 0x98, 0xb4, 0x13, 0xfe, 0x1c, 0x6f, + 0x24, 0x21, 0xc1, 0x30, 0xe9, 0x17, 0xbf, 0x49, 0x90, 0x0d, 0xd1, 0xf3, 0x58, 0x19, 0x3e, 0x87, + 0x05, 0x36, 0xca, 0xe2, 0x1f, 0xec, 0x5d, 0x42, 0x0c, 0x80, 0x8f, 0xd1, 0x22, 0x83, 0x55, 0x15, + 0x33, 0x72, 0xfd, 0x67, 0xdf, 0xd8, 0xcf, 0x12, 0x64, 0x43, 0x65, 0x9f, 0xf0, 0x0b, 0x5b, 0xfd, + 0x19, 0x87, 0x39, 0xcd, 0xad, 0x77, 0xda, 0x48, 0x87, 0xf4, 0xe4, 0xed, 0x85, 0x36, 0xc3, 0xe5, + 0x22, 0x6f, 0xed, 0xfc, 0xd6, 0x7d, 0x30, 0x7f, 0xfe, 0x0b, 0x58, 0x99, 0x5a, 0xfa, 0xa8, 0x14, + 0x0e, 0xbe, 0xeb, 0x4a, 0xca, 0x6f, 0xcf, 0x80, 0xf4, 0x2b, 0xf1, 0x51, 0x26, 0x96, 0x66, 0xc4, + 0x28, 0x51, 0xcb, 0x3c, 0x62, 0x94, 0xe8, 0xdd, 0x7b, 0x0a, 0x4b, 0x13, 0x6f, 0x03, 0xda, 0x98, + 0x65, 0x97, 0xe4, 0x37, 0xef, 0x41, 0x05, 0xd9, 0x27, 0x14, 0x34, 0x9d, 0x3d, 0x4a, 0xd7, 0xd3, + 0xd9, 0x23, 0x65, 0xd8, 0x38, 0x02, 0x64, 0xda, 0xfd, 0x10, 0xb6, 0x01, 0x9a, 0x5b, 0x77, 0xac, + 0x0e, 0xff, 0x40, 0xeb, 0x48, 0xef, 0x17, 0x98, 0xeb, 0x3b, 0x3e, 0xca, 0xf1, 0xa6, 0x76, 0xf2, + 0x49, 0x4e, 0x37, 0x69, 0x4d, 0xd1, 0x5c, 0xe5, 0xb8, 0xd2, 0xe0, 0xe6, 0x1f, 0xc2, 0x70, 0xaa, + 0xb9, 0xa7, 0xbe, 0xe1, 0x2c, 0x29, 0x3e, 0xee, 0x6a, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfc, + 0xba, 0x11, 0x1e, 0x91, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -820,9 +830,9 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type TxAPIClient interface { - // Requests the destination to pull a resource from source. - // Returns a PullTransferResponse - PullTransfer(ctx context.Context, in *PullTransferRequest, opts ...grpc.CallOption) (*PullTransferResponse, error) + // Requests creation of a transfer. + // Returns a CreateTransferResponse. + CreateTransfer(ctx context.Context, in *CreateTransferRequest, opts ...grpc.CallOption) (*CreateTransferResponse, error) // Requests a transfer status. GetTransferStatus(ctx context.Context, in *GetTransferStatusRequest, opts ...grpc.CallOption) (*GetTransferStatusResponse, error) // Requests to cancel a transfer. @@ -842,9 +852,9 @@ func NewTxAPIClient(cc *grpc.ClientConn) TxAPIClient { return &txAPIClient{cc} } -func (c *txAPIClient) PullTransfer(ctx context.Context, in *PullTransferRequest, opts ...grpc.CallOption) (*PullTransferResponse, error) { - out := new(PullTransferResponse) - err := c.cc.Invoke(ctx, "/cs3.tx.v1beta1.TxAPI/PullTransfer", in, out, opts...) +func (c *txAPIClient) CreateTransfer(ctx context.Context, in *CreateTransferRequest, opts ...grpc.CallOption) (*CreateTransferResponse, error) { + out := new(CreateTransferResponse) + err := c.cc.Invoke(ctx, "/cs3.tx.v1beta1.TxAPI/CreateTransfer", in, out, opts...) if err != nil { return nil, err } @@ -889,9 +899,9 @@ func (c *txAPIClient) RetryTransfer(ctx context.Context, in *RetryTransferReques // TxAPIServer is the server API for TxAPI service. type TxAPIServer interface { - // Requests the destination to pull a resource from source. - // Returns a PullTransferResponse - PullTransfer(context.Context, *PullTransferRequest) (*PullTransferResponse, error) + // Requests creation of a transfer. + // Returns a CreateTransferResponse. + CreateTransfer(context.Context, *CreateTransferRequest) (*CreateTransferResponse, error) // Requests a transfer status. GetTransferStatus(context.Context, *GetTransferStatusRequest) (*GetTransferStatusResponse, error) // Requests to cancel a transfer. @@ -907,8 +917,8 @@ type TxAPIServer interface { type UnimplementedTxAPIServer struct { } -func (*UnimplementedTxAPIServer) PullTransfer(ctx context.Context, req *PullTransferRequest) (*PullTransferResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PullTransfer not implemented") +func (*UnimplementedTxAPIServer) CreateTransfer(ctx context.Context, req *CreateTransferRequest) (*CreateTransferResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateTransfer not implemented") } func (*UnimplementedTxAPIServer) GetTransferStatus(ctx context.Context, req *GetTransferStatusRequest) (*GetTransferStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTransferStatus not implemented") @@ -927,20 +937,20 @@ func RegisterTxAPIServer(s *grpc.Server, srv TxAPIServer) { s.RegisterService(&_TxAPI_serviceDesc, srv) } -func _TxAPI_PullTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(PullTransferRequest) +func _TxAPI_CreateTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateTransferRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TxAPIServer).PullTransfer(ctx, in) + return srv.(TxAPIServer).CreateTransfer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cs3.tx.v1beta1.TxAPI/PullTransfer", + FullMethod: "/cs3.tx.v1beta1.TxAPI/CreateTransfer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TxAPIServer).PullTransfer(ctx, req.(*PullTransferRequest)) + return srv.(TxAPIServer).CreateTransfer(ctx, req.(*CreateTransferRequest)) } return interceptor(ctx, in, info, handler) } @@ -1022,8 +1032,8 @@ var _TxAPI_serviceDesc = grpc.ServiceDesc{ HandlerType: (*TxAPIServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "PullTransfer", - Handler: _TxAPI_PullTransfer_Handler, + MethodName: "CreateTransfer", + Handler: _TxAPI_CreateTransfer_Handler, }, { MethodName: "GetTransferStatus", diff --git a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/datatx/datatx.go b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/datatx/datatx.go index b7c364da4..c43e75ec8 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/datatx/datatx.go +++ b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/datatx/datatx.go @@ -156,7 +156,7 @@ func (s *service) UnprotectedEndpoints() []string { return []string{} } -func (s *service) PullTransfer(ctx context.Context, req *datatx.PullTransferRequest) (*datatx.PullTransferResponse, error) { +func (s *service) CreateTransfer(ctx context.Context, req *datatx.CreateTransferRequest) (*datatx.CreateTransferResponse, error) { srcEp, err := s.extractEndpointInfo(ctx, req.SrcTargetUri) if err != nil { return nil, err @@ -189,7 +189,7 @@ func (s *service) PullTransfer(ctx context.Context, req *datatx.PullTransferRequ s.txShareDriver.model.TxShares[txInfo.GetId().OpaqueId] = txShare if err := s.txShareDriver.model.saveTxShare(); err != nil { err = errors.Wrap(err, "datatx service: error saving transfer share: "+datatx.Status_STATUS_INVALID.String()) - return &datatx.PullTransferResponse{ + return &datatx.CreateTransferResponse{ Status: status.NewInvalid(ctx, "error pulling transfer"), }, err } @@ -197,13 +197,13 @@ func (s *service) PullTransfer(ctx context.Context, req *datatx.PullTransferRequ // now check start transfer outcome if startTransferErr != nil { startTransferErr = errors.Wrap(startTransferErr, "datatx service: error starting transfer job") - return &datatx.PullTransferResponse{ + return &datatx.CreateTransferResponse{ Status: status.NewInvalid(ctx, "datatx service: error pulling transfer"), TxInfo: txInfo, }, startTransferErr } - return &datatx.PullTransferResponse{ + return &datatx.CreateTransferResponse{ Status: status.NewOK(ctx), TxInfo: txInfo, }, err diff --git a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/datatx.go b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/datatx.go index 400a87491..4b894922b 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/datatx.go +++ b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/datatx.go @@ -27,15 +27,15 @@ import ( "github.com/pkg/errors" ) -func (s *svc) PullTransfer(ctx context.Context, req *datatx.PullTransferRequest) (*datatx.PullTransferResponse, error) { +func (s *svc) CreateTransfer(ctx context.Context, req *datatx.CreateTransferRequest) (*datatx.CreateTransferResponse, error) { c, err := pool.GetDataTxClient(s.c.DataTxEndpoint) if err != nil { - return &datatx.PullTransferResponse{ + return &datatx.CreateTransferResponse{ Status: status.NewInternal(ctx, "error getting data transfer client"), }, nil } - res, err := c.PullTransfer(ctx, req) + res, err := c.CreateTransfer(ctx, req) if err != nil { return nil, errors.Wrap(err, "gateway: error calling PullTransfer") } diff --git a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/ocmshareprovider.go b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/ocmshareprovider.go index 5db6b0b4b..cd42d6807 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/ocmshareprovider.go +++ b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/ocmshareprovider.go @@ -345,12 +345,12 @@ func (s *svc) UpdateReceivedOCMShare(ctx context.Context, req *ocm.UpdateReceive }, }, } - req := &datatx.PullTransferRequest{ + req := &datatx.CreateTransferRequest{ SrcTargetUri: srcTargetURI, DestTargetUri: destTargetURI, Opaque: opaqueObj, } - res, err := s.PullTransfer(ctx, req) + res, err := s.CreateTransfer(ctx, req) if err != nil { log.Err(err).Msg("gateway: error calling PullTransfer") return &ocm.UpdateReceivedOCMShareResponse{ diff --git a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/usershareprovider.go b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/usershareprovider.go index 81f3ffbe8..7d09bbc83 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/usershareprovider.go +++ b/vendor/github.com/cs3org/reva/v2/internal/grpc/services/gateway/usershareprovider.go @@ -468,6 +468,23 @@ func (s *svc) addShare(ctx context.Context, req *collaboration.CreateShareReques return res, nil } + rollBackFn := func(status *rpc.Status) { + rmvReq := &collaboration.RemoveShareRequest{ + Ref: &collaboration.ShareReference{ + Spec: &collaboration.ShareReference_Key{ + Key: &collaboration.ShareKey{ + ResourceId: req.ResourceInfo.Id, + Grantee: req.Grant.Grantee, + }, + }, + }, + } + appctx.GetLogger(ctx).Debug().Interface("status", status).Interface("req", req).Msg("rollback the CreateShare attempt") + if resp, err := s.removeShare(ctx, rmvReq); err != nil { + appctx.GetLogger(ctx).Debug().Interface("status", resp.GetStatus()).Interface("req", req).Msg(err.Error()) + } + } + if s.c.CommitShareToStorageGrant { // If the share is a denial we call denyGrant instead. var status *rpc.Status @@ -479,6 +496,8 @@ func (s *svc) addShare(ctx context.Context, req *collaboration.CreateShareReques } else { status, err = s.addGrant(ctx, req.ResourceInfo.Id, req.Grant.Grantee, req.Grant.Permissions.Permissions, req.Grant.Expiration, nil) if err != nil { + appctx.GetLogger(ctx).Debug().Interface("status", status).Interface("req", req).Msg(err.Error()) + rollBackFn(status) return nil, errors.Wrap(err, "gateway: error adding grant to storage") } } @@ -488,7 +507,10 @@ func (s *svc) addShare(ctx context.Context, req *collaboration.CreateShareReques s.statCache.RemoveStat(ctxpkg.ContextMustGetUser(ctx).GetId(), req.ResourceInfo.Id) case rpc.Code_CODE_UNIMPLEMENTED: appctx.GetLogger(ctx).Debug().Interface("status", status).Interface("req", req).Msg("storing grants not supported, ignoring") + rollBackFn(status) default: + appctx.GetLogger(ctx).Debug().Interface("status", status).Interface("req", req).Msg("storing grants is not successful") + rollBackFn(status) return &collaboration.CreateShareResponse{ Status: status, }, err diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/interceptors/cors/cors.go b/vendor/github.com/cs3org/reva/v2/internal/http/interceptors/cors/cors.go index a4334b941..cebd93f0f 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/interceptors/cors/cors.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/interceptors/cors/cors.go @@ -112,7 +112,7 @@ func New(m map[string]interface{}) (global.Middleware, int, error) { } // TODO(jfd): use log from request context, otherwise fmt will be used to log, - // preventing us from pinging the log to eg jq + // preventing us from piping the log to eg jq c := cors.New(cors.Options{ AllowCredentials: conf.AllowCredentials, AllowedHeaders: conf.AllowedHeaders, diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/datagateway/datagateway.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/datagateway/datagateway.go index 814e479db..7235483f0 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/datagateway/datagateway.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/datagateway/datagateway.go @@ -393,7 +393,7 @@ func (s *svc) doPatch(w http.ResponseWriter, r *http.Request) { func copyHeader(dst, src http.Header) { for key, values := range src { for i := range values { - dst.Add(key, values[i]) + dst.Set(key, values[i]) } } } diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/tus.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/tus.go index 14a6cd2de..780cb6b0d 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/tus.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/tus.go @@ -92,7 +92,7 @@ func (s *svc) handleSpacesTusPost(w http.ResponseWriter, r *http.Request, spaceI func (s *svc) handleTusPost(ctx context.Context, w http.ResponseWriter, r *http.Request, meta map[string]string, ref *provider.Reference, log zerolog.Logger) { w.Header().Add(net.HeaderAccessControlAllowHeaders, strings.Join([]string{net.HeaderTusResumable, net.HeaderUploadLength, net.HeaderUploadMetadata, net.HeaderIfMatch}, ", ")) - w.Header().Add(net.HeaderAccessControlExposeHeaders, strings.Join([]string{net.HeaderTusResumable, net.HeaderLocation}, ", ")) + w.Header().Add(net.HeaderAccessControlExposeHeaders, strings.Join([]string{net.HeaderTusResumable, net.HeaderUploadOffset, net.HeaderLocation}, ", ")) w.Header().Set(net.HeaderTusExtension, "creation,creation-with-upload,checksum,expiration") w.Header().Set(net.HeaderTusResumable, "1.0.0") diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index 54babc0f2..5fa074205 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -1453,6 +1453,12 @@ func (h *Handler) createCs3Share(ctx context.Context, w http.ResponseWriter, r * Message: createShareResponse.Status.Message, Error: nil, } + case rpc.Code_CODE_LOCKED: + return nil, &ocsError{ + Code: response.MetaLocked.StatusCode, + Message: response.MessageLockedForSharing, + Error: nil, + } default: return nil, &ocsError{ Code: response.MetaServerError.StatusCode, diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response/response.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response/response.go index c72030ead..6e5497dd9 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response/response.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response/response.go @@ -127,6 +127,9 @@ var MetaBadRequest = Meta{Status: "error", StatusCode: 400, Message: "Bad Reques // MetaPathNotFound is returned when trying to share not existing resources var MetaPathNotFound = Meta{Status: "failure", StatusCode: 404, Message: MessagePathNotFound} +// MetaLocked is returned when trying to share not existing resources +var MetaLocked = Meta{Status: "failure", StatusCode: 423, Message: "The file is locked"} + // MetaServerError is returned on server errors var MetaServerError = Meta{Status: "error", StatusCode: 996, Message: "Server Error"} @@ -151,6 +154,9 @@ var MessagePathNotFound = "Wrong path, file/folder doesn't exist" // MessageShareExists is used when a user tries to create a new share for the same user var MessageShareExists = "A share for the recipient already exists" +// MessageLockedForSharing is used when a user tries to create a new share until the file is in use by at least one user +var MessageLockedForSharing = "The file is locked until the file is in use by at least one user" + // WriteOCSSuccess handles writing successful ocs response data func WriteOCSSuccess(w http.ResponseWriter, r *http.Request, d interface{}) { WriteOCSData(w, r, MetaOK, d, nil) diff --git a/vendor/github.com/cs3org/reva/v2/pkg/errtypes/errtypes.go b/vendor/github.com/cs3org/reva/v2/pkg/errtypes/errtypes.go index 197a2c612..affdd0432 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/errtypes/errtypes.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/errtypes/errtypes.go @@ -286,8 +286,8 @@ func NewErrtypeFromStatus(status *rpc.Status) error { return Locked(strings.TrimPrefix(status.Message, "set lock: error: locked by ")) } return PermissionDenied(status.Message) - // case rpc.Code_CODE_LOCKED: - // return Locked(status.Message) + case rpc.Code_CODE_LOCKED: + return Locked(status.Message) // case rpc.Code_CODE_DATA_LOSS: ? // IsPartialContent case rpc.Code_CODE_ABORTED: diff --git a/vendor/github.com/cs3org/reva/v2/pkg/rgrpc/status/status.go b/vendor/github.com/cs3org/reva/v2/pkg/rgrpc/status/status.go index c524c2753..6ca73cb4a 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/rgrpc/status/status.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/rgrpc/status/status.go @@ -144,6 +144,15 @@ func NewConflict(ctx context.Context, err error, msg string) *rpc.Status { } } +// NewLocked returns a status Code_CODE_LOCKED +func NewLocked(ctx context.Context, msg string) *rpc.Status { + return &rpc.Status{ + Code: rpc.Code_CODE_LOCKED, + Message: msg, + Trace: getTrace(ctx), + } +} + // NewStatusFromErrType returns a status that corresponds to the given errtype func NewStatusFromErrType(ctx context.Context, msg string, err error) *rpc.Status { switch e := err.(type) { @@ -161,7 +170,7 @@ func NewStatusFromErrType(ctx context.Context, msg string, err error) *rpc.Statu case errtypes.Locked: // FIXME a locked error returns the current lockid // FIXME use NewAborted as per the rpc code docs - return NewPermissionDenied(ctx, e, msg+": "+err.Error()) + return NewLocked(ctx, msg+": "+err.Error()) case errtypes.Aborted: return NewAborted(ctx, e, msg+": "+err.Error()) case errtypes.PreconditionFailed: @@ -231,6 +240,7 @@ var httpStatusCode = map[rpc.Code]int{ rpc.Code_CODE_UNAVAILABLE: http.StatusServiceUnavailable, rpc.Code_CODE_UNIMPLEMENTED: http.StatusNotImplemented, rpc.Code_CODE_UNKNOWN: http.StatusInternalServerError, + rpc.Code_CODE_LOCKED: http.StatusLocked, } // HTTPStatusFromCode returns an HTTP status code for the rpc code. It returns diff --git a/vendor/github.com/cs3org/reva/v2/tests/cs3mocks/mocks/GatewayAPIClient.go b/vendor/github.com/cs3org/reva/v2/tests/cs3mocks/mocks/GatewayAPIClient.go index 169a60df3..0bf22edfc 100644 --- a/vendor/github.com/cs3org/reva/v2/tests/cs3mocks/mocks/GatewayAPIClient.go +++ b/vendor/github.com/cs3org/reva/v2/tests/cs3mocks/mocks/GatewayAPIClient.go @@ -495,6 +495,39 @@ func (_m *GatewayAPIClient) CreateSymlink(ctx context.Context, in *providerv1bet return r0, r1 } +// CreateTransfer provides a mock function with given fields: ctx, in, opts +func (_m *GatewayAPIClient) CreateTransfer(ctx context.Context, in *txv1beta1.CreateTransferRequest, opts ...grpc.CallOption) (*txv1beta1.CreateTransferResponse, error) { + _va := make([]interface{}, len(opts)) + for _i := range opts { + _va[_i] = opts[_i] + } + var _ca []interface{} + _ca = append(_ca, ctx, in) + _ca = append(_ca, _va...) + ret := _m.Called(_ca...) + + var r0 *txv1beta1.CreateTransferResponse + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, *txv1beta1.CreateTransferRequest, ...grpc.CallOption) (*txv1beta1.CreateTransferResponse, error)); ok { + return rf(ctx, in, opts...) + } + if rf, ok := ret.Get(0).(func(context.Context, *txv1beta1.CreateTransferRequest, ...grpc.CallOption) *txv1beta1.CreateTransferResponse); ok { + r0 = rf(ctx, in, opts...) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*txv1beta1.CreateTransferResponse) + } + } + + if rf, ok := ret.Get(1).(func(context.Context, *txv1beta1.CreateTransferRequest, ...grpc.CallOption) error); ok { + r1 = rf(ctx, in, opts...) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Delete provides a mock function with given fields: ctx, in, opts func (_m *GatewayAPIClient) Delete(ctx context.Context, in *providerv1beta1.DeleteRequest, opts ...grpc.CallOption) (*providerv1beta1.DeleteResponse, error) { _va := make([]interface{}, len(opts)) @@ -2310,39 +2343,6 @@ func (_m *GatewayAPIClient) OpenInApp(ctx context.Context, in *gatewayv1beta1.Op return r0, r1 } -// PullTransfer provides a mock function with given fields: ctx, in, opts -func (_m *GatewayAPIClient) PullTransfer(ctx context.Context, in *txv1beta1.PullTransferRequest, opts ...grpc.CallOption) (*txv1beta1.PullTransferResponse, error) { - _va := make([]interface{}, len(opts)) - for _i := range opts { - _va[_i] = opts[_i] - } - var _ca []interface{} - _ca = append(_ca, ctx, in) - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - var r0 *txv1beta1.PullTransferResponse - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *txv1beta1.PullTransferRequest, ...grpc.CallOption) (*txv1beta1.PullTransferResponse, error)); ok { - return rf(ctx, in, opts...) - } - if rf, ok := ret.Get(0).(func(context.Context, *txv1beta1.PullTransferRequest, ...grpc.CallOption) *txv1beta1.PullTransferResponse); ok { - r0 = rf(ctx, in, opts...) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(*txv1beta1.PullTransferResponse) - } - } - - if rf, ok := ret.Get(1).(func(context.Context, *txv1beta1.PullTransferRequest, ...grpc.CallOption) error); ok { - r1 = rf(ctx, in, opts...) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - // PurgeRecycle provides a mock function with given fields: ctx, in, opts func (_m *GatewayAPIClient) PurgeRecycle(ctx context.Context, in *providerv1beta1.PurgeRecycleRequest, opts ...grpc.CallOption) (*providerv1beta1.PurgeRecycleResponse, error) { _va := make([]interface{}, len(opts)) diff --git a/vendor/modules.txt b/vendor/modules.txt index fe0feb5ff..1ecd24680 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -326,7 +326,7 @@ github.com/crewjam/saml github.com/crewjam/saml/logger github.com/crewjam/saml/samlsp github.com/crewjam/saml/xmlenc -# github.com/cs3org/go-cs3apis v0.0.0-20221012090518-ef2996678965 => github.com/c0rby/go-cs3apis v0.0.0-20230110100311-5b424f1baa35 +# github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d => github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1 ## explicit; go 1.13 github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1 @@ -349,7 +349,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.13.4-0.20230522074943-fde10c4f3dea +# github.com/cs3org/reva/v2 v2.13.4-0.20230522082327-0d66bdd610d3 ## explicit; go 1.19 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime @@ -2123,4 +2123,4 @@ stash.kopano.io/kgol/oidc-go # stash.kopano.io/kgol/rndm v1.1.2 ## explicit; go 1.13 stash.kopano.io/kgol/rndm -# github.com/cs3org/go-cs3apis => github.com/c0rby/go-cs3apis v0.0.0-20230110100311-5b424f1baa35 +# github.com/cs3org/go-cs3apis => github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1