From 04b8ef0fcb86c26ac270943fda1b5ffec44145b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pablo=20Villaf=C3=A1=C3=B1ez?= Date: Fri, 17 Dec 2021 14:25:55 +0100 Subject: [PATCH] Migrate thumbnails proto files and adjust related import paths --- .../ocis/messages/thumbnails/v1/grpc.md | 57 ++ .../ocis/services/thumbnails/v1/grpc.md | 74 +++ .../messages/thumbnails/v1/thumbnails.pb.go | 269 ++++++++ .../thumbnails/v1/thumbnails.pb.micro.go | 15 + .../thumbnails/v1/thumbnails.swagger.json | 43 ++ .../services/thumbnails/v1/thumbnails.pb.go | 413 ++++++++++++ .../thumbnails/v1}/thumbnails.pb.micro.go | 5 +- .../thumbnails/v1}/thumbnails.swagger.json | 6 +- protogen/proto/buf.gen.yaml | 6 +- .../messages/thumbnails/v1/thumbnails.proto | 23 + .../services/thumbnails/v1}/thumbnails.proto | 27 +- thumbnails/pkg/proto/v0/thumbnails.pb.go | 590 ------------------ .../pkg/proto/v0/thumbnails.pb.micro_test.go | 86 --- thumbnails/pkg/proto/v0/thumbnails.pb_test.go | 109 ---- thumbnails/pkg/server/grpc/server.go | 6 +- thumbnails/pkg/service/v0/instrument.go | 8 +- thumbnails/pkg/service/v0/logging.go | 8 +- thumbnails/pkg/service/v0/service.go | 12 +- thumbnails/pkg/service/v0/tracing.go | 8 +- webdav/pkg/service/v0/service.go | 33 +- 20 files changed, 948 insertions(+), 850 deletions(-) create mode 100644 protogen/docs/extensions/ocis/messages/thumbnails/v1/grpc.md create mode 100644 protogen/docs/extensions/ocis/services/thumbnails/v1/grpc.md create mode 100644 protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.go create mode 100644 protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.micro.go create mode 100644 protogen/gen/ocis/messages/thumbnails/v1/thumbnails.swagger.json create mode 100644 protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.go rename {thumbnails/pkg/proto/v0 => protogen/gen/ocis/services/thumbnails/v1}/thumbnails.pb.micro.go (94%) rename {thumbnails/pkg/proto/v0 => protogen/gen/ocis/services/thumbnails/v1}/thumbnails.swagger.json (97%) create mode 100644 protogen/proto/ocis/messages/thumbnails/v1/thumbnails.proto rename {thumbnails/proto/v0 => protogen/proto/ocis/services/thumbnails/v1}/thumbnails.proto (76%) delete mode 100644 thumbnails/pkg/proto/v0/thumbnails.pb.go delete mode 100644 thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go delete mode 100644 thumbnails/pkg/proto/v0/thumbnails.pb_test.go diff --git a/protogen/docs/extensions/ocis/messages/thumbnails/v1/grpc.md b/protogen/docs/extensions/ocis/messages/thumbnails/v1/grpc.md new file mode 100644 index 0000000000..645c3dfc13 --- /dev/null +++ b/protogen/docs/extensions/ocis/messages/thumbnails/v1/grpc.md @@ -0,0 +1,57 @@ +--- +title: "GRPC API" +date: 2018-05-02T00:00:00+00:00 +weight: 50 +geekdocRepo: https://github.com/owncloud/ocis-thumbnails +geekdocEditPath: edit/master/docs +geekdocFilePath: grpc.md +--- + +{{< toc >}} + + + +## ocis/messages/thumbnails/v1/thumbnails.proto + +### CS3Source + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| path | [string](#string) | | | +| authorization | [string](#string) | | | + +### WebdavSource + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| url | [string](#string) | | REQUIRED. | +| is_public_link | [bool](#bool) | | REQUIRED. | +| webdav_authorization | [string](#string) | | OPTIONAL. | +| reva_authorization | [string](#string) | | OPTIONAL. | +| public_link_token | [string](#string) | | OPTIONAL. | + + +## Scalar Value Types + +| .proto Type | Notes | C++ | Java | +| ----------- | ----- | --- | ---- | +| {{< div id="double" content="double" >}} | | double | double | +| {{< div id="float" content="float" >}} | | float | float | +| {{< div id="int32" content="int32" >}} | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead. | int32 | int | +| {{< div id="int64" content="int64" >}} | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead. | int64 | long | +| {{< div id="uint32" content="uint32" >}} | Uses variable-length encoding. | uint32 | int | +| {{< div id="uint64" content="uint64" >}} | Uses variable-length encoding. | uint64 | long | +| {{< div id="sint32" content="sint32" >}} | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s. | int32 | int | +| {{< div id="sint64" content="sint64" >}} | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s. | int64 | long | +| {{< div id="fixed32" content="fixed32" >}} | Always four bytes. More efficient than uint32 if values are often greater than 2^28. | uint32 | int | +| {{< div id="fixed64" content="fixed64" >}} | Always eight bytes. More efficient than uint64 if values are often greater than 2^56. | uint64 | long | +| {{< div id="sfixed32" content="sfixed32" >}} | Always four bytes. | int32 | int | +| {{< div id="sfixed64" content="sfixed64" >}} | Always eight bytes. | int64 | long | +| {{< div id="bool" content="bool" >}} | | bool | boolean | +| {{< div id="string" content="string" >}} | A string must always contain UTF-8 encoded or 7-bit ASCII text. | string | String | +| {{< div id="bytes" content="bytes" >}} | May contain any arbitrary sequence of bytes. | string | ByteString | + diff --git a/protogen/docs/extensions/ocis/services/thumbnails/v1/grpc.md b/protogen/docs/extensions/ocis/services/thumbnails/v1/grpc.md new file mode 100644 index 0000000000..1c95830020 --- /dev/null +++ b/protogen/docs/extensions/ocis/services/thumbnails/v1/grpc.md @@ -0,0 +1,74 @@ +--- +title: "GRPC API" +date: 2018-05-02T00:00:00+00:00 +weight: 50 +geekdocRepo: https://github.com/owncloud/ocis-thumbnails +geekdocEditPath: edit/master/docs +geekdocFilePath: grpc.md +--- + +{{< toc >}} + + + +## ocis/services/thumbnails/v1/thumbnails.proto + +### GetThumbnailRequest + +A request to retrieve a thumbnail + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| filepath | [string](#string) | | The path to the source image | +| thumbnail_type | [GetThumbnailRequest.ThumbnailType](#getthumbnailrequestthumbnailtype) | | The type to which the thumbnail should get encoded to. | +| width | [int32](#int32) | | The width of the thumbnail | +| height | [int32](#int32) | | The height of the thumbnail | +| webdav_source | [ocis.messages.thumbnails.v1.WebdavSource](../../../messages/thumbnails/v1/grpc.md#webdavsource) | | | +| cs3_source | [ocis.messages.thumbnails.v1.CS3Source](../../../messages/thumbnails/v1/grpc.md#cs3source) | | | + +### GetThumbnailResponse + +The service response + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| thumbnail | [bytes](#bytes) | | The thumbnail as a binary | +| mimetype | [string](#string) | | The mimetype of the thumbnail | + +### GetThumbnailRequest.ThumbnailType + +The file types to which the thumbnail can get encoded to. + +| Name | Number | Description | +| ---- | ------ | ----------- | +| PNG | 0 | Represents PNG type | +| JPG | 1 | Represents JPG type | + +### ThumbnailService + +A Service for handling thumbnail generation + +| Method Name | Request Type | Response Type | Description | +| ----------- | ------------ | ------------- | ------------| +| GetThumbnail | [GetThumbnailRequest](#getthumbnailrequest) | [GetThumbnailResponse](#getthumbnailresponse) | Generates the thumbnail and returns it. | + +## Scalar Value Types + +| .proto Type | Notes | C++ | Java | +| ----------- | ----- | --- | ---- | +| {{< div id="double" content="double" >}} | | double | double | +| {{< div id="float" content="float" >}} | | float | float | +| {{< div id="int32" content="int32" >}} | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint32 instead. | int32 | int | +| {{< div id="int64" content="int64" >}} | Uses variable-length encoding. Inefficient for encoding negative numbers – if your field is likely to have negative values, use sint64 instead. | int64 | long | +| {{< div id="uint32" content="uint32" >}} | Uses variable-length encoding. | uint32 | int | +| {{< div id="uint64" content="uint64" >}} | Uses variable-length encoding. | uint64 | long | +| {{< div id="sint32" content="sint32" >}} | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int32s. | int32 | int | +| {{< div id="sint64" content="sint64" >}} | Uses variable-length encoding. Signed int value. These more efficiently encode negative numbers than regular int64s. | int64 | long | +| {{< div id="fixed32" content="fixed32" >}} | Always four bytes. More efficient than uint32 if values are often greater than 2^28. | uint32 | int | +| {{< div id="fixed64" content="fixed64" >}} | Always eight bytes. More efficient than uint64 if values are often greater than 2^56. | uint64 | long | +| {{< div id="sfixed32" content="sfixed32" >}} | Always four bytes. | int32 | int | +| {{< div id="sfixed64" content="sfixed64" >}} | Always eight bytes. | int64 | long | +| {{< div id="bool" content="bool" >}} | | bool | boolean | +| {{< div id="string" content="string" >}} | A string must always contain UTF-8 encoded or 7-bit ASCII text. | string | String | +| {{< div id="bytes" content="bytes" >}} | May contain any arbitrary sequence of bytes. | string | ByteString | + diff --git a/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.go b/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.go new file mode 100644 index 0000000000..f5caeb6e3a --- /dev/null +++ b/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.go @@ -0,0 +1,269 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1 +// protoc v3.17.3 +// source: ocis/messages/thumbnails/v1/thumbnails.proto + +package v1 + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type WebdavSource struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // REQUIRED. + Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` + // REQUIRED. + IsPublicLink bool `protobuf:"varint,2,opt,name=is_public_link,json=isPublicLink,proto3" json:"is_public_link,omitempty"` + // OPTIONAL. + WebdavAuthorization string `protobuf:"bytes,3,opt,name=webdav_authorization,json=webdavAuthorization,proto3" json:"webdav_authorization,omitempty"` + // OPTIONAL. + RevaAuthorization string `protobuf:"bytes,4,opt,name=reva_authorization,json=revaAuthorization,proto3" json:"reva_authorization,omitempty"` + // OPTIONAL. + PublicLinkToken string `protobuf:"bytes,5,opt,name=public_link_token,json=publicLinkToken,proto3" json:"public_link_token,omitempty"` +} + +func (x *WebdavSource) Reset() { + *x = WebdavSource{} + if protoimpl.UnsafeEnabled { + mi := &file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WebdavSource) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WebdavSource) ProtoMessage() {} + +func (x *WebdavSource) ProtoReflect() protoreflect.Message { + mi := &file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WebdavSource.ProtoReflect.Descriptor instead. +func (*WebdavSource) Descriptor() ([]byte, []int) { + return file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescGZIP(), []int{0} +} + +func (x *WebdavSource) GetUrl() string { + if x != nil { + return x.Url + } + return "" +} + +func (x *WebdavSource) GetIsPublicLink() bool { + if x != nil { + return x.IsPublicLink + } + return false +} + +func (x *WebdavSource) GetWebdavAuthorization() string { + if x != nil { + return x.WebdavAuthorization + } + return "" +} + +func (x *WebdavSource) GetRevaAuthorization() string { + if x != nil { + return x.RevaAuthorization + } + return "" +} + +func (x *WebdavSource) GetPublicLinkToken() string { + if x != nil { + return x.PublicLinkToken + } + return "" +} + +type CS3Source struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` + Authorization string `protobuf:"bytes,2,opt,name=authorization,proto3" json:"authorization,omitempty"` +} + +func (x *CS3Source) Reset() { + *x = CS3Source{} + if protoimpl.UnsafeEnabled { + mi := &file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CS3Source) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CS3Source) ProtoMessage() {} + +func (x *CS3Source) ProtoReflect() protoreflect.Message { + mi := &file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CS3Source.ProtoReflect.Descriptor instead. +func (*CS3Source) Descriptor() ([]byte, []int) { + return file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescGZIP(), []int{1} +} + +func (x *CS3Source) GetPath() string { + if x != nil { + return x.Path + } + return "" +} + +func (x *CS3Source) GetAuthorization() string { + if x != nil { + return x.Authorization + } + return "" +} + +var File_ocis_messages_thumbnails_v1_thumbnails_proto protoreflect.FileDescriptor + +var file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDesc = []byte{ + 0x0a, 0x2c, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, + 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1b, + 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x22, 0xd4, 0x01, 0x0a, 0x0c, + 0x57, 0x65, 0x62, 0x64, 0x61, 0x76, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x24, + 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, + 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x31, 0x0a, 0x14, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x5f, 0x61, + 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x13, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, + 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x12, 0x72, 0x65, 0x76, 0x61, 0x5f, + 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x11, 0x72, 0x65, 0x76, 0x61, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, + 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, + 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4c, 0x69, 0x6e, 0x6b, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x22, 0x45, 0x0a, 0x09, 0x43, 0x53, 0x33, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, + 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, + 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x68, + 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, + 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, + 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescOnce sync.Once + file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescData = file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDesc +) + +func file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescGZIP() []byte { + file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescOnce.Do(func() { + file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescData = protoimpl.X.CompressGZIP(file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescData) + }) + return file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDescData +} + +var file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_ocis_messages_thumbnails_v1_thumbnails_proto_goTypes = []interface{}{ + (*WebdavSource)(nil), // 0: ocis.messages.thumbnails.v1.WebdavSource + (*CS3Source)(nil), // 1: ocis.messages.thumbnails.v1.CS3Source +} +var file_ocis_messages_thumbnails_v1_thumbnails_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_ocis_messages_thumbnails_v1_thumbnails_proto_init() } +func file_ocis_messages_thumbnails_v1_thumbnails_proto_init() { + if File_ocis_messages_thumbnails_v1_thumbnails_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WebdavSource); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CS3Source); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_ocis_messages_thumbnails_v1_thumbnails_proto_goTypes, + DependencyIndexes: file_ocis_messages_thumbnails_v1_thumbnails_proto_depIdxs, + MessageInfos: file_ocis_messages_thumbnails_v1_thumbnails_proto_msgTypes, + }.Build() + File_ocis_messages_thumbnails_v1_thumbnails_proto = out.File + file_ocis_messages_thumbnails_v1_thumbnails_proto_rawDesc = nil + file_ocis_messages_thumbnails_v1_thumbnails_proto_goTypes = nil + file_ocis_messages_thumbnails_v1_thumbnails_proto_depIdxs = nil +} diff --git a/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.micro.go b/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.micro.go new file mode 100644 index 0000000000..8e8ae50c72 --- /dev/null +++ b/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.pb.micro.go @@ -0,0 +1,15 @@ +// Code generated by protoc-gen-micro. DO NOT EDIT. +// source: ocis/messages/thumbnails/v1/thumbnails.proto + +package v1 + +import ( + fmt "fmt" + proto "google.golang.org/protobuf/proto" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf diff --git a/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.swagger.json b/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.swagger.json new file mode 100644 index 0000000000..0060cf673d --- /dev/null +++ b/protogen/gen/ocis/messages/thumbnails/v1/thumbnails.swagger.json @@ -0,0 +1,43 @@ +{ + "swagger": "2.0", + "info": { + "title": "ocis/messages/thumbnails/v1/thumbnails.proto", + "version": "version not set" + }, + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": {}, + "definitions": { + "protobufAny": { + "type": "object", + "properties": { + "@type": { + "type": "string" + } + }, + "additionalProperties": {} + }, + "rpcStatus": { + "type": "object", + "properties": { + "code": { + "type": "integer", + "format": "int32" + }, + "message": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/protobufAny" + } + } + } + } + } +} diff --git a/protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.go b/protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.go new file mode 100644 index 0000000000..14adf22d3a --- /dev/null +++ b/protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.go @@ -0,0 +1,413 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.1 +// protoc v3.17.3 +// source: ocis/services/thumbnails/v1/thumbnails.proto + +package v1 + +import ( + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" + v1 "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v1" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// The file types to which the thumbnail can get encoded to. +type GetThumbnailRequest_ThumbnailType int32 + +const ( + GetThumbnailRequest_PNG GetThumbnailRequest_ThumbnailType = 0 // Represents PNG type + GetThumbnailRequest_JPG GetThumbnailRequest_ThumbnailType = 1 // Represents JPG type +) + +// Enum value maps for GetThumbnailRequest_ThumbnailType. +var ( + GetThumbnailRequest_ThumbnailType_name = map[int32]string{ + 0: "PNG", + 1: "JPG", + } + GetThumbnailRequest_ThumbnailType_value = map[string]int32{ + "PNG": 0, + "JPG": 1, + } +) + +func (x GetThumbnailRequest_ThumbnailType) Enum() *GetThumbnailRequest_ThumbnailType { + p := new(GetThumbnailRequest_ThumbnailType) + *p = x + return p +} + +func (x GetThumbnailRequest_ThumbnailType) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (GetThumbnailRequest_ThumbnailType) Descriptor() protoreflect.EnumDescriptor { + return file_ocis_services_thumbnails_v1_thumbnails_proto_enumTypes[0].Descriptor() +} + +func (GetThumbnailRequest_ThumbnailType) Type() protoreflect.EnumType { + return &file_ocis_services_thumbnails_v1_thumbnails_proto_enumTypes[0] +} + +func (x GetThumbnailRequest_ThumbnailType) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use GetThumbnailRequest_ThumbnailType.Descriptor instead. +func (GetThumbnailRequest_ThumbnailType) EnumDescriptor() ([]byte, []int) { + return file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescGZIP(), []int{0, 0} +} + +// A request to retrieve a thumbnail +type GetThumbnailRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // The path to the source image + Filepath string `protobuf:"bytes,1,opt,name=filepath,proto3" json:"filepath,omitempty"` + // The type to which the thumbnail should get encoded to. + ThumbnailType GetThumbnailRequest_ThumbnailType `protobuf:"varint,2,opt,name=thumbnail_type,json=thumbnailType,proto3,enum=ocis.services.thumbnails.v1.GetThumbnailRequest_ThumbnailType" json:"thumbnail_type,omitempty"` + // The width of the thumbnail + Width int32 `protobuf:"varint,3,opt,name=width,proto3" json:"width,omitempty"` + // The height of the thumbnail + Height int32 `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"` + // Types that are assignable to Source: + // *GetThumbnailRequest_WebdavSource + // *GetThumbnailRequest_Cs3Source + Source isGetThumbnailRequest_Source `protobuf_oneof:"source"` +} + +func (x *GetThumbnailRequest) Reset() { + *x = GetThumbnailRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetThumbnailRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetThumbnailRequest) ProtoMessage() {} + +func (x *GetThumbnailRequest) ProtoReflect() protoreflect.Message { + mi := &file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetThumbnailRequest.ProtoReflect.Descriptor instead. +func (*GetThumbnailRequest) Descriptor() ([]byte, []int) { + return file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescGZIP(), []int{0} +} + +func (x *GetThumbnailRequest) GetFilepath() string { + if x != nil { + return x.Filepath + } + return "" +} + +func (x *GetThumbnailRequest) GetThumbnailType() GetThumbnailRequest_ThumbnailType { + if x != nil { + return x.ThumbnailType + } + return GetThumbnailRequest_PNG +} + +func (x *GetThumbnailRequest) GetWidth() int32 { + if x != nil { + return x.Width + } + return 0 +} + +func (x *GetThumbnailRequest) GetHeight() int32 { + if x != nil { + return x.Height + } + return 0 +} + +func (m *GetThumbnailRequest) GetSource() isGetThumbnailRequest_Source { + if m != nil { + return m.Source + } + return nil +} + +func (x *GetThumbnailRequest) GetWebdavSource() *v1.WebdavSource { + if x, ok := x.GetSource().(*GetThumbnailRequest_WebdavSource); ok { + return x.WebdavSource + } + return nil +} + +func (x *GetThumbnailRequest) GetCs3Source() *v1.CS3Source { + if x, ok := x.GetSource().(*GetThumbnailRequest_Cs3Source); ok { + return x.Cs3Source + } + return nil +} + +type isGetThumbnailRequest_Source interface { + isGetThumbnailRequest_Source() +} + +type GetThumbnailRequest_WebdavSource struct { + WebdavSource *v1.WebdavSource `protobuf:"bytes,5,opt,name=webdav_source,json=webdavSource,proto3,oneof"` +} + +type GetThumbnailRequest_Cs3Source struct { + Cs3Source *v1.CS3Source `protobuf:"bytes,6,opt,name=cs3_source,json=cs3Source,proto3,oneof"` +} + +func (*GetThumbnailRequest_WebdavSource) isGetThumbnailRequest_Source() {} + +func (*GetThumbnailRequest_Cs3Source) isGetThumbnailRequest_Source() {} + +// The service response +type GetThumbnailResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // The thumbnail as a binary + Thumbnail []byte `protobuf:"bytes,1,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"` + // The mimetype of the thumbnail + Mimetype string `protobuf:"bytes,2,opt,name=mimetype,proto3" json:"mimetype,omitempty"` +} + +func (x *GetThumbnailResponse) Reset() { + *x = GetThumbnailResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GetThumbnailResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetThumbnailResponse) ProtoMessage() {} + +func (x *GetThumbnailResponse) ProtoReflect() protoreflect.Message { + mi := &file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetThumbnailResponse.ProtoReflect.Descriptor instead. +func (*GetThumbnailResponse) Descriptor() ([]byte, []int) { + return file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescGZIP(), []int{1} +} + +func (x *GetThumbnailResponse) GetThumbnail() []byte { + if x != nil { + return x.Thumbnail + } + return nil +} + +func (x *GetThumbnailResponse) GetMimetype() string { + if x != nil { + return x.Mimetype + } + return "" +} + +var File_ocis_services_thumbnails_v1_thumbnails_proto protoreflect.FileDescriptor + +var file_ocis_services_thumbnails_v1_thumbnails_proto_rawDesc = []byte{ + 0x0a, 0x2c, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, + 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1b, + 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x2c, 0x6f, 0x63, 0x69, + 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, + 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, + 0x69, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x76, 0x32, 0x2f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8e, 0x03, 0x0a, 0x13, 0x47, 0x65, + 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x65, 0x0a, + 0x0e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, + 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, + 0x6c, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x50, 0x0a, 0x0d, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x6f, 0x63, 0x69, 0x73, + 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, + 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x57, 0x65, 0x62, 0x64, 0x61, 0x76, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x53, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x12, 0x47, 0x0a, 0x0a, 0x63, 0x73, 0x33, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, + 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, + 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x53, 0x33, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x48, 0x00, 0x52, 0x09, 0x63, 0x73, 0x33, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x21, 0x0a, + 0x0d, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, + 0x0a, 0x03, 0x50, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4a, 0x50, 0x47, 0x10, 0x01, + 0x42, 0x08, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x65, + 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, + 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6d, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x6d, 0x69, 0x6d, 0x65, 0x74, 0x79, 0x70, 0x65, 0x32, 0x87, 0x01, 0x0a, + 0x10, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x73, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, + 0x6c, 0x12, 0x30, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, + 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xeb, 0x02, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, + 0x63, 0x69, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, + 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x76, 0x31, 0x92, 0x41, 0xa4, 0x02, + 0x12, 0xb8, 0x01, 0x0a, 0x22, 0x6f, 0x77, 0x6e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x20, 0x49, 0x6e, + 0x66, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x20, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x20, 0x74, 0x68, 0x75, + 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x22, 0x47, 0x0a, 0x0d, 0x6f, 0x77, 0x6e, 0x43, 0x6c, + 0x6f, 0x75, 0x64, 0x20, 0x47, 0x6d, 0x62, 0x48, 0x12, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, + 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, + 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x1a, 0x14, 0x73, 0x75, 0x70, 0x70, + 0x6f, 0x72, 0x74, 0x40, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, 0x63, 0x6f, 0x6d, + 0x2a, 0x42, 0x0a, 0x0a, 0x41, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2d, 0x32, 0x2e, 0x30, 0x12, 0x34, + 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, + 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x4c, 0x49, 0x43, + 0x45, 0x4e, 0x53, 0x45, 0x32, 0x05, 0x31, 0x2e, 0x30, 0x2e, 0x30, 0x2a, 0x02, 0x01, 0x02, 0x32, + 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, + 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, + 0x73, 0x6f, 0x6e, 0x72, 0x3f, 0x0a, 0x10, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, + 0x20, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x12, 0x2b, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, + 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x65, 0x78, + 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, + 0x69, 0x6c, 0x73, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescOnce sync.Once + file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescData = file_ocis_services_thumbnails_v1_thumbnails_proto_rawDesc +) + +func file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescGZIP() []byte { + file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescOnce.Do(func() { + file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescData = protoimpl.X.CompressGZIP(file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescData) + }) + return file_ocis_services_thumbnails_v1_thumbnails_proto_rawDescData +} + +var file_ocis_services_thumbnails_v1_thumbnails_proto_enumTypes = make([]protoimpl.EnumInfo, 1) +var file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_ocis_services_thumbnails_v1_thumbnails_proto_goTypes = []interface{}{ + (GetThumbnailRequest_ThumbnailType)(0), // 0: ocis.services.thumbnails.v1.GetThumbnailRequest.ThumbnailType + (*GetThumbnailRequest)(nil), // 1: ocis.services.thumbnails.v1.GetThumbnailRequest + (*GetThumbnailResponse)(nil), // 2: ocis.services.thumbnails.v1.GetThumbnailResponse + (*v1.WebdavSource)(nil), // 3: ocis.messages.thumbnails.v1.WebdavSource + (*v1.CS3Source)(nil), // 4: ocis.messages.thumbnails.v1.CS3Source +} +var file_ocis_services_thumbnails_v1_thumbnails_proto_depIdxs = []int32{ + 0, // 0: ocis.services.thumbnails.v1.GetThumbnailRequest.thumbnail_type:type_name -> ocis.services.thumbnails.v1.GetThumbnailRequest.ThumbnailType + 3, // 1: ocis.services.thumbnails.v1.GetThumbnailRequest.webdav_source:type_name -> ocis.messages.thumbnails.v1.WebdavSource + 4, // 2: ocis.services.thumbnails.v1.GetThumbnailRequest.cs3_source:type_name -> ocis.messages.thumbnails.v1.CS3Source + 1, // 3: ocis.services.thumbnails.v1.ThumbnailService.GetThumbnail:input_type -> ocis.services.thumbnails.v1.GetThumbnailRequest + 2, // 4: ocis.services.thumbnails.v1.ThumbnailService.GetThumbnail:output_type -> ocis.services.thumbnails.v1.GetThumbnailResponse + 4, // [4:5] is the sub-list for method output_type + 3, // [3:4] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name +} + +func init() { file_ocis_services_thumbnails_v1_thumbnails_proto_init() } +func file_ocis_services_thumbnails_v1_thumbnails_proto_init() { + if File_ocis_services_thumbnails_v1_thumbnails_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetThumbnailRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GetThumbnailResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes[0].OneofWrappers = []interface{}{ + (*GetThumbnailRequest_WebdavSource)(nil), + (*GetThumbnailRequest_Cs3Source)(nil), + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_ocis_services_thumbnails_v1_thumbnails_proto_rawDesc, + NumEnums: 1, + NumMessages: 2, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_ocis_services_thumbnails_v1_thumbnails_proto_goTypes, + DependencyIndexes: file_ocis_services_thumbnails_v1_thumbnails_proto_depIdxs, + EnumInfos: file_ocis_services_thumbnails_v1_thumbnails_proto_enumTypes, + MessageInfos: file_ocis_services_thumbnails_v1_thumbnails_proto_msgTypes, + }.Build() + File_ocis_services_thumbnails_v1_thumbnails_proto = out.File + file_ocis_services_thumbnails_v1_thumbnails_proto_rawDesc = nil + file_ocis_services_thumbnails_v1_thumbnails_proto_goTypes = nil + file_ocis_services_thumbnails_v1_thumbnails_proto_depIdxs = nil +} diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb.micro.go b/protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.micro.go similarity index 94% rename from thumbnails/pkg/proto/v0/thumbnails.pb.micro.go rename to protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.micro.go index d0e08ad6f3..281619319e 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.pb.micro.go +++ b/protogen/gen/ocis/services/thumbnails/v1/thumbnails.pb.micro.go @@ -1,11 +1,12 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: proto/v0/thumbnails.proto +// source: ocis/services/thumbnails/v1/thumbnails.proto -package proto +package v1 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" + _ "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v1" proto "google.golang.org/protobuf/proto" math "math" ) diff --git a/thumbnails/pkg/proto/v0/thumbnails.swagger.json b/protogen/gen/ocis/services/thumbnails/v1/thumbnails.swagger.json similarity index 97% rename from thumbnails/pkg/proto/v0/thumbnails.swagger.json rename to protogen/gen/ocis/services/thumbnails/v1/thumbnails.swagger.json index f79a4f1190..982d589206 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.swagger.json +++ b/protogen/gen/ocis/services/thumbnails/v1/thumbnails.swagger.json @@ -66,7 +66,7 @@ } } }, - "v0CS3Source": { + "v1CS3Source": { "type": "object", "properties": { "path": { @@ -77,7 +77,7 @@ } } }, - "v0GetThumbnailResponse": { + "v1GetThumbnailResponse": { "type": "object", "properties": { "thumbnail": { @@ -92,7 +92,7 @@ }, "title": "The service response" }, - "v0WebdavSource": { + "v1WebdavSource": { "type": "object", "properties": { "url": { diff --git a/protogen/proto/buf.gen.yaml b/protogen/proto/buf.gen.yaml index 6c8f06d436..cbd866c277 100644 --- a/protogen/proto/buf.gen.yaml +++ b/protogen/proto/buf.gen.yaml @@ -13,10 +13,14 @@ plugins: - paths=source_relative - name: microweb - path: ../../.bingo/protoc-gen-microweb + #path: ../../.bingo/protoc-gen-microweb + path: ../../../protoc-gen-microweb/protoc-gen-microweb out: ../gen/ opt: - paths=source_relative + - "ignore_packages=\ + ocis.services.thumbnails.v1;\ + ocis.messages.thumbnails.v1" - name: openapiv2 path: ../../.bingo/protoc-gen-openapiv2 diff --git a/protogen/proto/ocis/messages/thumbnails/v1/thumbnails.proto b/protogen/proto/ocis/messages/thumbnails/v1/thumbnails.proto new file mode 100644 index 0000000000..1a3afa174e --- /dev/null +++ b/protogen/proto/ocis/messages/thumbnails/v1/thumbnails.proto @@ -0,0 +1,23 @@ +syntax = "proto3"; + +package ocis.messages.thumbnails.v1; + +option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v1"; + +message WebdavSource { + // REQUIRED. + string url = 1; + // REQUIRED. + bool is_public_link = 2; + // OPTIONAL. + string webdav_authorization = 3; + // OPTIONAL. + string reva_authorization = 4; + // OPTIONAL. + string public_link_token = 5; +} + +message CS3Source { + string path = 1; + string authorization = 2; +} diff --git a/thumbnails/proto/v0/thumbnails.proto b/protogen/proto/ocis/services/thumbnails/v1/thumbnails.proto similarity index 76% rename from thumbnails/proto/v0/thumbnails.proto rename to protogen/proto/ocis/services/thumbnails/v1/thumbnails.proto index 2c5d956daf..3facf001d4 100644 --- a/thumbnails/proto/v0/thumbnails.proto +++ b/protogen/proto/ocis/services/thumbnails/v1/thumbnails.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -package com.owncloud.ocis.thumbnails.v0; +package ocis.services.thumbnails.v1; -option go_package = "github.com/owncloud/ocis/thumbnails/pkg/proto/v0;proto"; +option go_package = "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1"; +import "ocis/messages/thumbnails/v1/thumbnails.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { @@ -52,29 +53,11 @@ message GetThumbnailRequest { // The height of the thumbnail int32 height = 4; oneof source { - WebdavSource webdav_source = 5; - CS3Source cs3_source = 6; + ocis.messages.thumbnails.v1.WebdavSource webdav_source = 5; + ocis.messages.thumbnails.v1.CS3Source cs3_source = 6; } } -message WebdavSource { - // REQUIRED. - string url = 1; - // REQUIRED. - bool is_public_link = 2; - // OPTIONAL. - string webdav_authorization = 3; - // OPTIONAL. - string reva_authorization = 4; - // OPTIONAL. - string public_link_token = 5; -} - -message CS3Source { - string path = 1; - string authorization = 2; -} - // The service response message GetThumbnailResponse { // The thumbnail as a binary diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb.go b/thumbnails/pkg/proto/v0/thumbnails.pb.go deleted file mode 100644 index 009f3362a0..0000000000 --- a/thumbnails/pkg/proto/v0/thumbnails.pb.go +++ /dev/null @@ -1,590 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.27.1 -// protoc v3.17.3 -// source: proto/v0/thumbnails.proto - -package proto - -import ( - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// The file types to which the thumbnail can get encoded to. -type GetThumbnailRequest_ThumbnailType int32 - -const ( - GetThumbnailRequest_PNG GetThumbnailRequest_ThumbnailType = 0 // Represents PNG type - GetThumbnailRequest_JPG GetThumbnailRequest_ThumbnailType = 1 // Represents JPG type -) - -// Enum value maps for GetThumbnailRequest_ThumbnailType. -var ( - GetThumbnailRequest_ThumbnailType_name = map[int32]string{ - 0: "PNG", - 1: "JPG", - } - GetThumbnailRequest_ThumbnailType_value = map[string]int32{ - "PNG": 0, - "JPG": 1, - } -) - -func (x GetThumbnailRequest_ThumbnailType) Enum() *GetThumbnailRequest_ThumbnailType { - p := new(GetThumbnailRequest_ThumbnailType) - *p = x - return p -} - -func (x GetThumbnailRequest_ThumbnailType) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (GetThumbnailRequest_ThumbnailType) Descriptor() protoreflect.EnumDescriptor { - return file_proto_v0_thumbnails_proto_enumTypes[0].Descriptor() -} - -func (GetThumbnailRequest_ThumbnailType) Type() protoreflect.EnumType { - return &file_proto_v0_thumbnails_proto_enumTypes[0] -} - -func (x GetThumbnailRequest_ThumbnailType) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use GetThumbnailRequest_ThumbnailType.Descriptor instead. -func (GetThumbnailRequest_ThumbnailType) EnumDescriptor() ([]byte, []int) { - return file_proto_v0_thumbnails_proto_rawDescGZIP(), []int{0, 0} -} - -// A request to retrieve a thumbnail -type GetThumbnailRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The path to the source image - Filepath string `protobuf:"bytes,1,opt,name=filepath,proto3" json:"filepath,omitempty"` - // The type to which the thumbnail should get encoded to. - ThumbnailType GetThumbnailRequest_ThumbnailType `protobuf:"varint,2,opt,name=thumbnail_type,json=thumbnailType,proto3,enum=com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest_ThumbnailType" json:"thumbnail_type,omitempty"` - // The width of the thumbnail - Width int32 `protobuf:"varint,3,opt,name=width,proto3" json:"width,omitempty"` - // The height of the thumbnail - Height int32 `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"` - // Types that are assignable to Source: - // *GetThumbnailRequest_WebdavSource - // *GetThumbnailRequest_Cs3Source - Source isGetThumbnailRequest_Source `protobuf_oneof:"source"` -} - -func (x *GetThumbnailRequest) Reset() { - *x = GetThumbnailRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_v0_thumbnails_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GetThumbnailRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetThumbnailRequest) ProtoMessage() {} - -func (x *GetThumbnailRequest) ProtoReflect() protoreflect.Message { - mi := &file_proto_v0_thumbnails_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GetThumbnailRequest.ProtoReflect.Descriptor instead. -func (*GetThumbnailRequest) Descriptor() ([]byte, []int) { - return file_proto_v0_thumbnails_proto_rawDescGZIP(), []int{0} -} - -func (x *GetThumbnailRequest) GetFilepath() string { - if x != nil { - return x.Filepath - } - return "" -} - -func (x *GetThumbnailRequest) GetThumbnailType() GetThumbnailRequest_ThumbnailType { - if x != nil { - return x.ThumbnailType - } - return GetThumbnailRequest_PNG -} - -func (x *GetThumbnailRequest) GetWidth() int32 { - if x != nil { - return x.Width - } - return 0 -} - -func (x *GetThumbnailRequest) GetHeight() int32 { - if x != nil { - return x.Height - } - return 0 -} - -func (m *GetThumbnailRequest) GetSource() isGetThumbnailRequest_Source { - if m != nil { - return m.Source - } - return nil -} - -func (x *GetThumbnailRequest) GetWebdavSource() *WebdavSource { - if x, ok := x.GetSource().(*GetThumbnailRequest_WebdavSource); ok { - return x.WebdavSource - } - return nil -} - -func (x *GetThumbnailRequest) GetCs3Source() *CS3Source { - if x, ok := x.GetSource().(*GetThumbnailRequest_Cs3Source); ok { - return x.Cs3Source - } - return nil -} - -type isGetThumbnailRequest_Source interface { - isGetThumbnailRequest_Source() -} - -type GetThumbnailRequest_WebdavSource struct { - WebdavSource *WebdavSource `protobuf:"bytes,5,opt,name=webdav_source,json=webdavSource,proto3,oneof"` -} - -type GetThumbnailRequest_Cs3Source struct { - Cs3Source *CS3Source `protobuf:"bytes,6,opt,name=cs3_source,json=cs3Source,proto3,oneof"` -} - -func (*GetThumbnailRequest_WebdavSource) isGetThumbnailRequest_Source() {} - -func (*GetThumbnailRequest_Cs3Source) isGetThumbnailRequest_Source() {} - -type WebdavSource struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // REQUIRED. - Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` - // REQUIRED. - IsPublicLink bool `protobuf:"varint,2,opt,name=is_public_link,json=isPublicLink,proto3" json:"is_public_link,omitempty"` - // OPTIONAL. - WebdavAuthorization string `protobuf:"bytes,3,opt,name=webdav_authorization,json=webdavAuthorization,proto3" json:"webdav_authorization,omitempty"` - // OPTIONAL. - RevaAuthorization string `protobuf:"bytes,4,opt,name=reva_authorization,json=revaAuthorization,proto3" json:"reva_authorization,omitempty"` - // OPTIONAL. - PublicLinkToken string `protobuf:"bytes,5,opt,name=public_link_token,json=publicLinkToken,proto3" json:"public_link_token,omitempty"` -} - -func (x *WebdavSource) Reset() { - *x = WebdavSource{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_v0_thumbnails_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *WebdavSource) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*WebdavSource) ProtoMessage() {} - -func (x *WebdavSource) ProtoReflect() protoreflect.Message { - mi := &file_proto_v0_thumbnails_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use WebdavSource.ProtoReflect.Descriptor instead. -func (*WebdavSource) Descriptor() ([]byte, []int) { - return file_proto_v0_thumbnails_proto_rawDescGZIP(), []int{1} -} - -func (x *WebdavSource) GetUrl() string { - if x != nil { - return x.Url - } - return "" -} - -func (x *WebdavSource) GetIsPublicLink() bool { - if x != nil { - return x.IsPublicLink - } - return false -} - -func (x *WebdavSource) GetWebdavAuthorization() string { - if x != nil { - return x.WebdavAuthorization - } - return "" -} - -func (x *WebdavSource) GetRevaAuthorization() string { - if x != nil { - return x.RevaAuthorization - } - return "" -} - -func (x *WebdavSource) GetPublicLinkToken() string { - if x != nil { - return x.PublicLinkToken - } - return "" -} - -type CS3Source struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - Authorization string `protobuf:"bytes,2,opt,name=authorization,proto3" json:"authorization,omitempty"` -} - -func (x *CS3Source) Reset() { - *x = CS3Source{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_v0_thumbnails_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CS3Source) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CS3Source) ProtoMessage() {} - -func (x *CS3Source) ProtoReflect() protoreflect.Message { - mi := &file_proto_v0_thumbnails_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CS3Source.ProtoReflect.Descriptor instead. -func (*CS3Source) Descriptor() ([]byte, []int) { - return file_proto_v0_thumbnails_proto_rawDescGZIP(), []int{2} -} - -func (x *CS3Source) GetPath() string { - if x != nil { - return x.Path - } - return "" -} - -func (x *CS3Source) GetAuthorization() string { - if x != nil { - return x.Authorization - } - return "" -} - -// The service response -type GetThumbnailResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // The thumbnail as a binary - Thumbnail []byte `protobuf:"bytes,1,opt,name=thumbnail,proto3" json:"thumbnail,omitempty"` - // The mimetype of the thumbnail - Mimetype string `protobuf:"bytes,2,opt,name=mimetype,proto3" json:"mimetype,omitempty"` -} - -func (x *GetThumbnailResponse) Reset() { - *x = GetThumbnailResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_v0_thumbnails_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GetThumbnailResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetThumbnailResponse) ProtoMessage() {} - -func (x *GetThumbnailResponse) ProtoReflect() protoreflect.Message { - mi := &file_proto_v0_thumbnails_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GetThumbnailResponse.ProtoReflect.Descriptor instead. -func (*GetThumbnailResponse) Descriptor() ([]byte, []int) { - return file_proto_v0_thumbnails_proto_rawDescGZIP(), []int{3} -} - -func (x *GetThumbnailResponse) GetThumbnail() []byte { - if x != nil { - return x.Thumbnail - } - return nil -} - -func (x *GetThumbnailResponse) GetMimetype() string { - if x != nil { - return x.Mimetype - } - return "" -} - -var File_proto_v0_thumbnails_proto protoreflect.FileDescriptor - -var file_proto_v0_thumbnails_proto_rawDesc = []byte{ - 0x0a, 0x19, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x30, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, - 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f, 0x63, 0x6f, 0x6d, - 0x2e, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x74, - 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x30, 0x1a, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x63, 0x2d, 0x67, 0x65, 0x6e, 0x2d, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, - 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9a, 0x03, 0x0a, - 0x13, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, - 0x12, 0x69, 0x0a, 0x0e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x42, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, - 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x74, 0x68, 0x75, - 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x30, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, - 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x54, - 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x74, 0x68, - 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x54, 0x0a, 0x0d, 0x77, 0x65, 0x62, - 0x64, 0x61, 0x76, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x2d, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, - 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, - 0x76, 0x30, 0x2e, 0x57, 0x65, 0x62, 0x64, 0x61, 0x76, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, - 0x00, 0x52, 0x0c, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, - 0x4b, 0x0a, 0x0a, 0x63, 0x73, 0x33, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, - 0x75, 0x64, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, - 0x6c, 0x73, 0x2e, 0x76, 0x30, 0x2e, 0x43, 0x53, 0x33, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, - 0x00, 0x52, 0x09, 0x63, 0x73, 0x33, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x21, 0x0a, 0x0d, - 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, - 0x03, 0x50, 0x4e, 0x47, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4a, 0x50, 0x47, 0x10, 0x01, 0x42, - 0x08, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xd4, 0x01, 0x0a, 0x0c, 0x57, 0x65, - 0x62, 0x64, 0x61, 0x76, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, - 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x24, 0x0a, 0x0e, - 0x69, 0x73, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x73, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4c, 0x69, - 0x6e, 0x6b, 0x12, 0x31, 0x0a, 0x14, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x5f, 0x61, 0x75, 0x74, - 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x13, 0x77, 0x65, 0x62, 0x64, 0x61, 0x76, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2d, 0x0a, 0x12, 0x72, 0x65, 0x76, 0x61, 0x5f, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x11, 0x72, 0x65, 0x76, 0x61, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6c, - 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0f, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4c, 0x69, 0x6e, 0x6b, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x22, 0x45, 0x0a, 0x09, 0x43, 0x53, 0x33, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, - 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, - 0x68, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, - 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x50, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x54, 0x68, - 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x1c, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0c, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x12, 0x1a, 0x0a, - 0x08, 0x6d, 0x69, 0x6d, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6d, 0x69, 0x6d, 0x65, 0x74, 0x79, 0x70, 0x65, 0x32, 0x8f, 0x01, 0x0a, 0x10, 0x54, 0x68, - 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7b, - 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x12, 0x34, - 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, 0x6f, 0x63, - 0x69, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x30, - 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x63, 0x6f, 0x6d, 0x2e, 0x6f, 0x77, 0x6e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, - 0x69, 0x6c, 0x73, 0x2e, 0x76, 0x30, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x68, 0x75, 0x6d, 0x62, 0x6e, - 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xe0, 0x02, 0x5a, 0x36, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, - 0x69, 0x6c, 0x73, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x76, 0x30, - 0x3b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x92, 0x41, 0xa4, 0x02, 0x12, 0xb8, 0x01, 0x0a, 0x22, 0x6f, - 0x77, 0x6e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x20, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x65, - 0x20, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x20, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, - 0x73, 0x22, 0x47, 0x0a, 0x0d, 0x6f, 0x77, 0x6e, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x20, 0x47, 0x6d, - 0x62, 0x48, 0x12, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, - 0x6f, 0x63, 0x69, 0x73, 0x1a, 0x14, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x40, 0x6f, 0x77, - 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2e, 0x63, 0x6f, 0x6d, 0x2a, 0x42, 0x0a, 0x0a, 0x41, 0x70, - 0x61, 0x63, 0x68, 0x65, 0x2d, 0x32, 0x2e, 0x30, 0x12, 0x34, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, - 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, - 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, - 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x32, 0x05, - 0x31, 0x2e, 0x30, 0x2e, 0x30, 0x2a, 0x02, 0x01, 0x02, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, - 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x72, 0x3f, 0x0a, - 0x10, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x20, 0x4d, 0x61, 0x6e, 0x75, 0x61, - 0x6c, 0x12, 0x2b, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, - 0x6f, 0x75, 0x64, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, - 0x6e, 0x73, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x73, 0x2f, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_proto_v0_thumbnails_proto_rawDescOnce sync.Once - file_proto_v0_thumbnails_proto_rawDescData = file_proto_v0_thumbnails_proto_rawDesc -) - -func file_proto_v0_thumbnails_proto_rawDescGZIP() []byte { - file_proto_v0_thumbnails_proto_rawDescOnce.Do(func() { - file_proto_v0_thumbnails_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_v0_thumbnails_proto_rawDescData) - }) - return file_proto_v0_thumbnails_proto_rawDescData -} - -var file_proto_v0_thumbnails_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_proto_v0_thumbnails_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_proto_v0_thumbnails_proto_goTypes = []interface{}{ - (GetThumbnailRequest_ThumbnailType)(0), // 0: com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest.ThumbnailType - (*GetThumbnailRequest)(nil), // 1: com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest - (*WebdavSource)(nil), // 2: com.owncloud.ocis.thumbnails.v0.WebdavSource - (*CS3Source)(nil), // 3: com.owncloud.ocis.thumbnails.v0.CS3Source - (*GetThumbnailResponse)(nil), // 4: com.owncloud.ocis.thumbnails.v0.GetThumbnailResponse -} -var file_proto_v0_thumbnails_proto_depIdxs = []int32{ - 0, // 0: com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest.thumbnail_type:type_name -> com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest.ThumbnailType - 2, // 1: com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest.webdav_source:type_name -> com.owncloud.ocis.thumbnails.v0.WebdavSource - 3, // 2: com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest.cs3_source:type_name -> com.owncloud.ocis.thumbnails.v0.CS3Source - 1, // 3: com.owncloud.ocis.thumbnails.v0.ThumbnailService.GetThumbnail:input_type -> com.owncloud.ocis.thumbnails.v0.GetThumbnailRequest - 4, // 4: com.owncloud.ocis.thumbnails.v0.ThumbnailService.GetThumbnail:output_type -> com.owncloud.ocis.thumbnails.v0.GetThumbnailResponse - 4, // [4:5] is the sub-list for method output_type - 3, // [3:4] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name -} - -func init() { file_proto_v0_thumbnails_proto_init() } -func file_proto_v0_thumbnails_proto_init() { - if File_proto_v0_thumbnails_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_proto_v0_thumbnails_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetThumbnailRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_proto_v0_thumbnails_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WebdavSource); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_proto_v0_thumbnails_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CS3Source); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_proto_v0_thumbnails_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetThumbnailResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_proto_v0_thumbnails_proto_msgTypes[0].OneofWrappers = []interface{}{ - (*GetThumbnailRequest_WebdavSource)(nil), - (*GetThumbnailRequest_Cs3Source)(nil), - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_proto_v0_thumbnails_proto_rawDesc, - NumEnums: 1, - NumMessages: 4, - NumExtensions: 0, - NumServices: 1, - }, - GoTypes: file_proto_v0_thumbnails_proto_goTypes, - DependencyIndexes: file_proto_v0_thumbnails_proto_depIdxs, - EnumInfos: file_proto_v0_thumbnails_proto_enumTypes, - MessageInfos: file_proto_v0_thumbnails_proto_msgTypes, - }.Build() - File_proto_v0_thumbnails_proto = out.File - file_proto_v0_thumbnails_proto_rawDesc = nil - file_proto_v0_thumbnails_proto_goTypes = nil - file_proto_v0_thumbnails_proto_depIdxs = nil -} diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go b/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go deleted file mode 100644 index a435cdf364..0000000000 --- a/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go +++ /dev/null @@ -1,86 +0,0 @@ -package proto_test - -import ( - "context" - "log" - "os" - "path/filepath" - "testing" - - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" - "github.com/stretchr/testify/assert" - - svc "github.com/owncloud/ocis/thumbnails/pkg/service/v0" -) - -var service = grpc.Service{} - -func init() { - service = grpc.NewService( - grpc.Namespace("com.owncloud.api"), - grpc.Name("thumbnails"), - grpc.Address("localhost:9992"), - ) - - cfg := config.DefaultConfig() - cfg.Thumbnail.Resolutions = []string{"16x16", "32x32", "64x64", "128x128"} - - wd, _ := os.Getwd() - fsCfg := config.FileSystemSource{ - BasePath: filepath.Join(wd, "../../../testdata/"), - } - err := proto.RegisterThumbnailServiceHandler( - service.Server(), - svc.NewService( - svc.Config(cfg), - svc.ThumbnailStorage(storage.NewInMemoryStorage()), - svc.ThumbnailSource(imgsource.NewFileSystemSource(fsCfg)), - ), - ) - if err != nil { - log.Fatalf("could not register ThumbnailHandler: %v", err) - } - if err := service.Server().Start(); err != nil { - log.Fatalf("could not start server: %v", err) - } -} - -func TestGetThumbnailInvalidImage(t *testing.T) { - req := proto.GetThumbnailRequest{ - Filepath: "invalid.png", - ThumbnailType: proto.GetThumbnailRequest_PNG, - Height: 32, - Width: 32, - } - client := service.Client() - cl := proto.NewThumbnailService("com.owncloud.api.thumbnails", client) - _, err := cl.GetThumbnail(context.Background(), &req) - - assert.NotNil(t, err) -} - -// TODO(corby) update tests -//func TestGetThumbnail(t *testing.T) { -// req := proto.GetThumbnailRequest{ -// Filepath: "oc.png", -// ThumbnailType: proto.GetThumbnailRequest_PNG, -// Height: 32, -// Width: 32, -// } -// client := service.Client() -// cl := proto.NewThumbnailService("com.owncloud.api.thumbnails", client) -// rsp, err := cl.GetThumbnail(context.Background(), &req) -// if err != nil { -// log.Fatalf("error %s", err.Error()) -// } -// assert.NotEmpty(t, rsp.GetThumbnail()) -// -// img, _, _ := image.Decode(bytes.NewReader(rsp.GetThumbnail())) -// assert.Equal(t, 32, img.Bounds().Size().X) -// -// assert.Equal(t, "image/png", rsp.GetMimetype()) -//} diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb_test.go b/thumbnails/pkg/proto/v0/thumbnails.pb_test.go deleted file mode 100644 index e09610f711..0000000000 --- a/thumbnails/pkg/proto/v0/thumbnails.pb_test.go +++ /dev/null @@ -1,109 +0,0 @@ -package proto_test - -import ( - "testing" - - "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" - "github.com/stretchr/testify/assert" -) - -type TestRequest struct { - testDataName string - filepath string - filetype proto.GetThumbnailRequest_ThumbnailType - Checksum string - width int32 - height int32 - expected proto.GetThumbnailRequest -} - -type TestResponse struct { - testDataName string - img []byte - mimetype string - expected proto.GetThumbnailResponse -} - -func TestRequestString(t *testing.T) { - - var tests = []*TestRequest{ - { - "ASCII", - "Foo.jpg", - proto.GetThumbnailRequest_JPG, - "33a64df551425fcc55e4d42a148795d9f25f89d4", - 24, - 24, - proto.GetThumbnailRequest{ - Filepath: "Foo.jpg", - ThumbnailType: proto.GetThumbnailRequest_JPG, - Width: 24, - Height: 24, - }, - }, - { - "UTF", - "मिलन.jpg", - proto.GetThumbnailRequest_JPG, - "33a64df551425fcc55e4d42a148795d9f25f89d4", - 24, - 24, - proto.GetThumbnailRequest{ - Filepath: "\340\244\256\340\244\277\340\244\262\340\244\250.jpg", - ThumbnailType: proto.GetThumbnailRequest_JPG, - Width: 24, - Height: 24, - }, - }, - { - "PNG", - "Foo.png", - proto.GetThumbnailRequest_PNG, - "33a64df551425fcc55e4d42a148795d9f25f89d4", - 24, - 24, - proto.GetThumbnailRequest{ - Filepath: "Foo.png", - Width: 24, - Height: 24, - }, - }, - } - - for _, testCase := range tests { - t.Run(testCase.testDataName, func(t *testing.T) { - req := proto.GetThumbnailRequest{ - Filepath: testCase.filepath, - ThumbnailType: testCase.filetype, - Height: testCase.height, - Width: testCase.width, - } - assert.Equal(t, testCase.expected.String(), req.String()) - }) - } -} - -func TestResponseString(t *testing.T) { - var tests = []*TestResponse{ - { - "ASCII", - []byte("image data"), - "image/png", - proto.GetThumbnailResponse{ - Thumbnail: []byte("image data"), - Mimetype: "image/png", - }, - }, - } - - for _, testCase := range tests { - t.Run(testCase.testDataName, func(t *testing.T) { - response := proto.GetThumbnailResponse{ - Thumbnail: testCase.img, - Mimetype: testCase.mimetype, - } - - assert.Equal(t, testCase.expected.String(), response.String()) - }) - } -} diff --git a/thumbnails/pkg/server/grpc/server.go b/thumbnails/pkg/server/grpc/server.go index b90dc699e7..318c3dc4bc 100644 --- a/thumbnails/pkg/server/grpc/server.go +++ b/thumbnails/pkg/server/grpc/server.go @@ -4,7 +4,7 @@ import ( "github.com/cs3org/reva/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" + thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1" svc "github.com/owncloud/ocis/thumbnails/pkg/service/v0" "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource" "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" @@ -30,7 +30,7 @@ func NewService(opts ...Option) grpc.Service { options.Logger.Error().Err(err).Msg("could not get gateway client") return grpc.Service{} } - var thumbnail proto.ThumbnailServiceHandler + var thumbnail thumbnailssvc.ThumbnailServiceHandler { thumbnail = svc.NewService( svc.Config(options.Config), @@ -50,7 +50,7 @@ func NewService(opts ...Option) grpc.Service { thumbnail = svc.NewTracing(thumbnail) } - _ = proto.RegisterThumbnailServiceHandler( + _ = thumbnailssvc.RegisterThumbnailServiceHandler( service.Server(), thumbnail, ) diff --git a/thumbnails/pkg/service/v0/instrument.go b/thumbnails/pkg/service/v0/instrument.go index 1c3e77824e..fb3b834107 100644 --- a/thumbnails/pkg/service/v0/instrument.go +++ b/thumbnails/pkg/service/v0/instrument.go @@ -3,13 +3,13 @@ package svc import ( "context" + thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1" "github.com/owncloud/ocis/thumbnails/pkg/metrics" - v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" "github.com/prometheus/client_golang/prometheus" ) // NewInstrument returns a service that instruments metrics. -func NewInstrument(next v0proto.ThumbnailServiceHandler, metrics *metrics.Metrics) v0proto.ThumbnailServiceHandler { +func NewInstrument(next thumbnailssvc.ThumbnailServiceHandler, metrics *metrics.Metrics) thumbnailssvc.ThumbnailServiceHandler { return instrument{ next: next, metrics: metrics, @@ -17,12 +17,12 @@ func NewInstrument(next v0proto.ThumbnailServiceHandler, metrics *metrics.Metric } type instrument struct { - next v0proto.ThumbnailServiceHandler + next thumbnailssvc.ThumbnailServiceHandler metrics *metrics.Metrics } // GetThumbnail implements the ThumbnailServiceHandler interface. -func (i instrument) GetThumbnail(ctx context.Context, req *v0proto.GetThumbnailRequest, rsp *v0proto.GetThumbnailResponse) error { +func (i instrument) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest, rsp *thumbnailssvc.GetThumbnailResponse) error { timer := prometheus.NewTimer(prometheus.ObserverFunc(func(v float64) { us := v * 1000_000 i.metrics.Latency.WithLabelValues().Observe(us) diff --git a/thumbnails/pkg/service/v0/logging.go b/thumbnails/pkg/service/v0/logging.go index 69f74d133d..eb04c263fe 100644 --- a/thumbnails/pkg/service/v0/logging.go +++ b/thumbnails/pkg/service/v0/logging.go @@ -5,11 +5,11 @@ import ( "time" "github.com/owncloud/ocis/ocis-pkg/log" - v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" + thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1" ) // NewLogging returns a service that logs messages. -func NewLogging(next v0proto.ThumbnailServiceHandler, logger log.Logger) v0proto.ThumbnailServiceHandler { +func NewLogging(next thumbnailssvc.ThumbnailServiceHandler, logger log.Logger) thumbnailssvc.ThumbnailServiceHandler { return logging{ next: next, logger: logger, @@ -17,12 +17,12 @@ func NewLogging(next v0proto.ThumbnailServiceHandler, logger log.Logger) v0proto } type logging struct { - next v0proto.ThumbnailServiceHandler + next thumbnailssvc.ThumbnailServiceHandler logger log.Logger } // GetThumbnail implements the ThumbnailServiceHandler interface. -func (l logging) GetThumbnail(ctx context.Context, req *v0proto.GetThumbnailRequest, rsp *v0proto.GetThumbnailResponse) error { +func (l logging) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest, rsp *thumbnailssvc.GetThumbnailResponse) error { start := time.Now() err := l.next.GetThumbnail(ctx, req, rsp) diff --git a/thumbnails/pkg/service/v0/service.go b/thumbnails/pkg/service/v0/service.go index 28a0d4045f..9e7de31923 100644 --- a/thumbnails/pkg/service/v0/service.go +++ b/thumbnails/pkg/service/v0/service.go @@ -12,8 +12,8 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" revactx "github.com/cs3org/reva/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/log" + thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1" "github.com/owncloud/ocis/thumbnails/pkg/preprocessor" - v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" "github.com/owncloud/ocis/thumbnails/pkg/thumbnail" "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource" "github.com/pkg/errors" @@ -22,7 +22,7 @@ import ( ) // NewService returns a service implementation for Service. -func NewService(opts ...Option) v0proto.ThumbnailServiceHandler { +func NewService(opts ...Option) thumbnailssvc.ThumbnailServiceHandler { options := newOptions(opts...) logger := options.Logger resolutions, err := thumbnail.ParseResolutions(options.Config.Thumbnail.Resolutions) @@ -64,8 +64,8 @@ type PreprocessorOpts struct { } // GetThumbnail retrieves a thumbnail for an image -func (g Thumbnail) GetThumbnail(ctx context.Context, req *v0proto.GetThumbnailRequest, rsp *v0proto.GetThumbnailResponse) error { - _, ok := v0proto.GetThumbnailRequest_ThumbnailType_value[req.ThumbnailType.String()] +func (g Thumbnail) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest, rsp *thumbnailssvc.GetThumbnailResponse) error { + _, ok := thumbnailssvc.GetThumbnailRequest_ThumbnailType_value[req.ThumbnailType.String()] if !ok { g.logger.Debug().Str("thumbnail_type", req.ThumbnailType.String()).Msg("unsupported thumbnail type") return nil @@ -96,7 +96,7 @@ func (g Thumbnail) GetThumbnail(ctx context.Context, req *v0proto.GetThumbnailRe return nil } -func (g Thumbnail) handleCS3Source(ctx context.Context, req *v0proto.GetThumbnailRequest, encoder thumbnail.Encoder) ([]byte, error) { +func (g Thumbnail) handleCS3Source(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest, encoder thumbnail.Encoder) ([]byte, error) { src := req.GetCs3Source() sRes, err := g.stat(src.Path, src.Authorization) if err != nil { @@ -135,7 +135,7 @@ func (g Thumbnail) handleCS3Source(ctx context.Context, req *v0proto.GetThumbnai return thumb, nil } -func (g Thumbnail) handleWebdavSource(ctx context.Context, req *v0proto.GetThumbnailRequest, encoder thumbnail.Encoder) ([]byte, error) { +func (g Thumbnail) handleWebdavSource(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest, encoder thumbnail.Encoder) ([]byte, error) { src := req.GetWebdavSource() imgURL, err := url.Parse(src.Url) if err != nil { diff --git a/thumbnails/pkg/service/v0/tracing.go b/thumbnails/pkg/service/v0/tracing.go index f13a21e2f3..25256aafb9 100644 --- a/thumbnails/pkg/service/v0/tracing.go +++ b/thumbnails/pkg/service/v0/tracing.go @@ -5,24 +5,24 @@ import ( "go.opentelemetry.io/otel/trace" - v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" + thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1" thumbnailsTracing "github.com/owncloud/ocis/thumbnails/pkg/tracing" "go.opentelemetry.io/otel/attribute" ) // NewTracing returns a service that instruments traces. -func NewTracing(next v0proto.ThumbnailServiceHandler) v0proto.ThumbnailServiceHandler { +func NewTracing(next thumbnailssvc.ThumbnailServiceHandler) thumbnailssvc.ThumbnailServiceHandler { return tracing{ next: next, } } type tracing struct { - next v0proto.ThumbnailServiceHandler + next thumbnailssvc.ThumbnailServiceHandler } // GetThumbnail implements the ThumbnailServiceHandler interface. -func (t tracing) GetThumbnail(ctx context.Context, req *v0proto.GetThumbnailRequest, rsp *v0proto.GetThumbnailResponse) error { +func (t tracing) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest, rsp *thumbnailssvc.GetThumbnailResponse) error { var span trace.Span if thumbnailsTracing.TraceProvider != nil { diff --git a/webdav/pkg/service/v0/service.go b/webdav/pkg/service/v0/service.go index 64ed700d4e..e2477ad0c3 100644 --- a/webdav/pkg/service/v0/service.go +++ b/webdav/pkg/service/v0/service.go @@ -19,7 +19,8 @@ import ( "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/go-chi/chi/v5" - thumbnails "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" + thumbnailsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v1" + thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v1" "github.com/owncloud/ocis/webdav/pkg/config" "github.com/owncloud/ocis/webdav/pkg/dav/requests" ) @@ -60,7 +61,7 @@ func NewService(opts ...Option) (Service, error) { config: conf, log: options.Logger, mux: m, - thumbnailsClient: thumbnails.NewThumbnailService("com.owncloud.api.thumbnails", grpc.DefaultClient), + thumbnailsClient: thumbnailssvc.NewThumbnailService("com.owncloud.api.thumbnails", grpc.DefaultClient), revaClient: gwc, } @@ -78,7 +79,7 @@ type Webdav struct { config *config.Config log log.Logger mux *chi.Mux - thumbnailsClient thumbnails.ThumbnailService + thumbnailsClient thumbnailssvc.ThumbnailService revaClient gatewayv1beta1.GatewayAPIClient } @@ -109,13 +110,13 @@ func (g Webdav) Thumbnail(w http.ResponseWriter, r *http.Request) { } fullPath := filepath.Join(templates.WithUser(userRes.User, g.config.WebdavNamespace), tr.Filepath) - rsp, err := g.thumbnailsClient.GetThumbnail(r.Context(), &thumbnails.GetThumbnailRequest{ + rsp, err := g.thumbnailsClient.GetThumbnail(r.Context(), &thumbnailssvc.GetThumbnailRequest{ Filepath: strings.TrimLeft(tr.Filepath, "/"), ThumbnailType: extensionToThumbnailType(strings.TrimLeft(tr.Extension, ".")), Width: tr.Width, Height: tr.Height, - Source: &thumbnails.GetThumbnailRequest_Cs3Source{ - Cs3Source: &thumbnails.CS3Source{ + Source: &thumbnailssvc.GetThumbnailRequest_Cs3Source{ + Cs3Source: &thumbnailsmsg.CS3Source{ Path: fullPath, Authorization: t, }, @@ -153,13 +154,13 @@ func (g Webdav) PublicThumbnail(w http.ResponseWriter, r *http.Request) { return } - rsp, err := g.thumbnailsClient.GetThumbnail(r.Context(), &thumbnails.GetThumbnailRequest{ + rsp, err := g.thumbnailsClient.GetThumbnail(r.Context(), &thumbnailssvc.GetThumbnailRequest{ Filepath: strings.TrimLeft(tr.Filepath, "/"), ThumbnailType: extensionToThumbnailType(strings.TrimLeft(tr.Extension, ".")), Width: tr.Width, Height: tr.Height, - Source: &thumbnails.GetThumbnailRequest_WebdavSource{ - WebdavSource: &thumbnails.WebdavSource{ + Source: &thumbnailssvc.GetThumbnailRequest_WebdavSource{ + WebdavSource: &thumbnailsmsg.WebdavSource{ Url: g.config.OcisPublicURL + r.URL.RequestURI(), IsPublicLink: true, PublicLinkToken: tr.PublicLinkToken, @@ -198,13 +199,13 @@ func (g Webdav) PublicThumbnailHead(w http.ResponseWriter, r *http.Request) { return } - rsp, err := g.thumbnailsClient.GetThumbnail(r.Context(), &thumbnails.GetThumbnailRequest{ + rsp, err := g.thumbnailsClient.GetThumbnail(r.Context(), &thumbnailssvc.GetThumbnailRequest{ Filepath: strings.TrimLeft(tr.Filepath, "/"), ThumbnailType: extensionToThumbnailType(strings.TrimLeft(tr.Extension, ".")), Width: tr.Width, Height: tr.Height, - Source: &thumbnails.GetThumbnailRequest_WebdavSource{ - WebdavSource: &thumbnails.WebdavSource{ + Source: &thumbnailssvc.GetThumbnailRequest_WebdavSource{ + WebdavSource: &thumbnailsmsg.WebdavSource{ Url: g.config.OcisPublicURL + r.URL.RequestURI(), IsPublicLink: true, PublicLinkToken: tr.PublicLinkToken, @@ -235,12 +236,12 @@ func (g Webdav) PublicThumbnailHead(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) } -func extensionToThumbnailType(ext string) thumbnails.GetThumbnailRequest_ThumbnailType { +func extensionToThumbnailType(ext string) thumbnailssvc.GetThumbnailRequest_ThumbnailType { switch strings.ToUpper(ext) { case "GIF", "PNG": - return thumbnails.GetThumbnailRequest_PNG + return thumbnailssvc.GetThumbnailRequest_PNG default: - return thumbnails.GetThumbnailRequest_JPG + return thumbnailssvc.GetThumbnailRequest_JPG } } @@ -298,7 +299,7 @@ func (t *thumbnailResponse) Render(w http.ResponseWriter, _ *http.Request) error return err } -func newThumbnailResponse(rsp *thumbnails.GetThumbnailResponse) *thumbnailResponse { +func newThumbnailResponse(rsp *thumbnailssvc.GetThumbnailResponse) *thumbnailResponse { return &thumbnailResponse{ contentType: rsp.Mimetype, thumbnail: rsp.Thumbnail,