From 45f8b7c4036897dcaa1d471b10684ff01e35dd8e Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 18 Sep 2020 13:03:45 +0200 Subject: [PATCH] update thumbnails import paths and module name --- thumbnails/.github/config.yml | 2 +- thumbnails/CHANGELOG.md | 76 +++++++++---------- .../0.1.0_2020-03-31/initial-version.md | 2 +- .../predefined-resolutions.md | 4 +- .../0.1.0_2020-03-31/thumbnail-service.md | 2 +- .../changelog/0.1.1_2020-04-21/fix-flags.md | 4 +- .../0.1.2_2020-05-11/fix-context-handling.md | 4 +- .../0.2.0_2020-07-10/add-resolutions.md | 4 +- .../0.2.0_2020-07-10/fix-code-smells.md | 4 +- .../group-thumbnails-by-users.md | 2 +- .../0.2.0_2020-07-10/use-micro-error-api.md | 2 +- .../0.3.0_2020-08-17/serve-metrics.md | 2 +- .../0.3.0_2020-08-17/use-alpine-latest.md | 2 +- thumbnails/changelog/CHANGELOG.tmpl | 6 +- thumbnails/changelog/TEMPLATE | 4 +- thumbnails/cmd/ocis-thumbnails/main.go | 4 +- thumbnails/docs/getting-started.md | 2 +- thumbnails/docs/license.md | 2 +- thumbnails/go.mod | 5 +- thumbnails/go.sum | 29 +------ thumbnails/pkg/command/health.go | 6 +- thumbnails/pkg/command/root.go | 6 +- thumbnails/pkg/command/server.go | 10 +-- thumbnails/pkg/flagset/flagset.go | 2 +- .../pkg/proto/v0/thumbnails.pb.micro_test.go | 10 +-- thumbnails/pkg/proto/v0/thumbnails.pb_test.go | 2 +- thumbnails/pkg/server/debug/option.go | 2 +- thumbnails/pkg/server/debug/server.go | 4 +- thumbnails/pkg/server/grpc/option.go | 4 +- thumbnails/pkg/server/grpc/server.go | 10 +-- thumbnails/pkg/service/v0/instrument.go | 4 +- thumbnails/pkg/service/v0/logging.go | 2 +- thumbnails/pkg/service/v0/option.go | 6 +- thumbnails/pkg/service/v0/service.go | 8 +- thumbnails/pkg/service/v0/tracing.go | 2 +- .../pkg/thumbnail/imgsource/filesystem.go | 2 +- thumbnails/pkg/thumbnail/imgsource/webdav.go | 2 +- .../pkg/thumbnail/storage/filesystem.go | 2 +- thumbnails/pkg/thumbnail/storage/storage.go | 2 +- thumbnails/pkg/thumbnail/thumbnails.go | 4 +- thumbnails/sonar-project.properties | 4 +- 41 files changed, 115 insertions(+), 141 deletions(-) diff --git a/thumbnails/.github/config.yml b/thumbnails/.github/config.yml index 229466c7c1..81ed5ce40b 100644 --- a/thumbnails/.github/config.yml +++ b/thumbnails/.github/config.yml @@ -2,7 +2,7 @@ # Comment to be posted to on PRs that don't update documentation updateDocsComment: > - Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-thumbnails/blob/master/changelog/README.md) item based on your changes. + Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/thumbnails/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only diff --git a/thumbnails/CHANGELOG.md b/thumbnails/CHANGELOG.md index 08769b343b..c176626ba0 100644 --- a/thumbnails/CHANGELOG.md +++ b/thumbnails/CHANGELOG.md @@ -2,146 +2,146 @@ The following sections list the changes in ocis-thumbnails 0.3.0. -[0.3.0]: https://github.com/owncloud/ocis-thumbnails/compare/v0.2.0...v0.3.0 +[0.3.0]: https://github.com/owncloud/ocis/thumbnails/compare/v0.2.0...v0.3.0 ## Summary -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#35](https://github.com/owncloud/ocis-thumbnails/pull/35) -* Enhancement - Serve the metrics endpoint: [#37](https://github.com/owncloud/ocis-thumbnails/issues/37) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#35](https://github.com/owncloud/ocis/thumbnails/pull/35) +* Enhancement - Serve the metrics endpoint: [#37](https://github.com/owncloud/ocis/thumbnails/issues/37) ## Details -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#35](https://github.com/owncloud/ocis-thumbnails/pull/35) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#35](https://github.com/owncloud/ocis/thumbnails/pull/35) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-thumbnails/pull/35 + https://github.com/owncloud/ocis/thumbnails/pull/35 -* Enhancement - Serve the metrics endpoint: [#37](https://github.com/owncloud/ocis-thumbnails/issues/37) +* Enhancement - Serve the metrics endpoint: [#37](https://github.com/owncloud/ocis/thumbnails/issues/37) Added the metrics endpoint to be able to monitor this service like the other services - https://github.com/owncloud/ocis-thumbnails/issues/37 + https://github.com/owncloud/ocis/thumbnails/issues/37 # Changelog for [0.2.0] (2020-07-10) The following sections list the changes in ocis-thumbnails 0.2.0. -[0.2.0]: https://github.com/owncloud/ocis-thumbnails/compare/v0.1.2...v0.2.0 +[0.2.0]: https://github.com/owncloud/ocis/thumbnails/compare/v0.1.2...v0.2.0 ## Summary -* Change - Add more default resolutions: [#23](https://github.com/owncloud/ocis-thumbnails/issues/23) -* Change - Refactor code to remove code smells: [#21](https://github.com/owncloud/ocis-thumbnails/issues/21) -* Change - Use micro service error api: [#31](https://github.com/owncloud/ocis-thumbnails/issues/31) -* Enhancement - Limit users to access own thumbnails: [#5](https://github.com/owncloud/ocis-thumbnails/issues/5) +* Change - Add more default resolutions: [#23](https://github.com/owncloud/ocis/thumbnails/issues/23) +* Change - Refactor code to remove code smells: [#21](https://github.com/owncloud/ocis/thumbnails/issues/21) +* Change - Use micro service error api: [#31](https://github.com/owncloud/ocis/thumbnails/issues/31) +* Enhancement - Limit users to access own thumbnails: [#5](https://github.com/owncloud/ocis/thumbnails/issues/5) ## Details -* Change - Add more default resolutions: [#23](https://github.com/owncloud/ocis-thumbnails/issues/23) +* Change - Add more default resolutions: [#23](https://github.com/owncloud/ocis/thumbnails/issues/23) The `ocis-thumbnails` service was also used by the mediaviewer but the returned images were too small since the highest resolution was 128x128 pixels. - https://github.com/owncloud/ocis-thumbnails/issues/23 + https://github.com/owncloud/ocis/thumbnails/issues/23 -* Change - Refactor code to remove code smells: [#21](https://github.com/owncloud/ocis-thumbnails/issues/21) +* Change - Refactor code to remove code smells: [#21](https://github.com/owncloud/ocis/thumbnails/issues/21) Scanning the code using a static code analyzer showed some code smells. This change fixes them. - https://github.com/owncloud/ocis-thumbnails/issues/21 + https://github.com/owncloud/ocis/thumbnails/issues/21 -* Change - Use micro service error api: [#31](https://github.com/owncloud/ocis-thumbnails/issues/31) +* Change - Use micro service error api: [#31](https://github.com/owncloud/ocis/thumbnails/issues/31) The service now also returns a status code when an error occurs. - https://github.com/owncloud/ocis-thumbnails/issues/31 + https://github.com/owncloud/ocis/thumbnails/issues/31 -* Enhancement - Limit users to access own thumbnails: [#5](https://github.com/owncloud/ocis-thumbnails/issues/5) +* Enhancement - Limit users to access own thumbnails: [#5](https://github.com/owncloud/ocis/thumbnails/issues/5) Users of the service can no longer request thumbnails of another users by guessing the etag. The thumbnails are now only accessible by the users who created the thumbnail. - https://github.com/owncloud/ocis-thumbnails/issues/5 + https://github.com/owncloud/ocis/thumbnails/issues/5 # Changelog for [0.1.2] (2020-05-11) The following sections list the changes in ocis-thumbnails 0.1.2. -[0.1.2]: https://github.com/owncloud/ocis-thumbnails/compare/v0.1.1...v0.1.2 +[0.1.2]: https://github.com/owncloud/ocis/thumbnails/compare/v0.1.1...v0.1.2 ## Summary -* Bugfix - Fix usage of context.Context: [#18](https://github.com/owncloud/ocis-thumbnails/issues/18) +* Bugfix - Fix usage of context.Context: [#18](https://github.com/owncloud/ocis/thumbnails/issues/18) ## Details -* Bugfix - Fix usage of context.Context: [#18](https://github.com/owncloud/ocis-thumbnails/issues/18) +* Bugfix - Fix usage of context.Context: [#18](https://github.com/owncloud/ocis/thumbnails/issues/18) The context was filled with a key defined in the package service but read with a key from the package imgsource. Since `service.key` and `imgsource.key` are different types imgsource could not read the value provided by service. - https://github.com/owncloud/ocis-thumbnails/issues/18 + https://github.com/owncloud/ocis/thumbnails/issues/18 # Changelog for [0.1.1] (2020-04-21) The following sections list the changes in ocis-thumbnails 0.1.1. -[0.1.1]: https://github.com/owncloud/ocis-thumbnails/compare/v0.1.0...v0.1.1 +[0.1.1]: https://github.com/owncloud/ocis/thumbnails/compare/v0.1.0...v0.1.1 ## Summary -* Bugfix - Fix execution when passing program flags: [#15](https://github.com/owncloud/ocis-thumbnails/issues/15) +* Bugfix - Fix execution when passing program flags: [#15](https://github.com/owncloud/ocis/thumbnails/issues/15) ## Details -* Bugfix - Fix execution when passing program flags: [#15](https://github.com/owncloud/ocis-thumbnails/issues/15) +* Bugfix - Fix execution when passing program flags: [#15](https://github.com/owncloud/ocis/thumbnails/issues/15) The program flags where not correctly recognized because we didn't pass them to the micro framework when initializing a grpc service. - https://github.com/owncloud/ocis-thumbnails/issues/15 + https://github.com/owncloud/ocis/thumbnails/issues/15 # Changelog for [0.1.0] (2020-03-31) The following sections list the changes in ocis-thumbnails 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-thumbnails/compare/c43f3a33cb0b57d7e25ebc88c138d22e95f88cfe...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/thumbnails/compare/c43f3a33cb0b57d7e25ebc88c138d22e95f88cfe...v0.1.0 ## Summary -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-thumbnails/issues/1) -* Change - Use predefined resolutions for thumbnail generation: [#7](https://github.com/owncloud/ocis-thumbnails/issues/7) -* Change - Implement the first working version: [#3](https://github.com/owncloud/ocis-thumbnails/pull/3) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/thumbnails/issues/1) +* Change - Use predefined resolutions for thumbnail generation: [#7](https://github.com/owncloud/ocis/thumbnails/issues/7) +* Change - Implement the first working version: [#3](https://github.com/owncloud/ocis/thumbnails/pull/3) ## Details -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-thumbnails/issues/1) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/thumbnails/issues/1) Just prepare an initial basic version to embed a thumbnailer into our microservice infrastructure in the scope of the ownCloud Infinite Scale project. - https://github.com/owncloud/ocis-thumbnails/issues/1 + https://github.com/owncloud/ocis/thumbnails/issues/1 -* Change - Use predefined resolutions for thumbnail generation: [#7](https://github.com/owncloud/ocis-thumbnails/issues/7) +* Change - Use predefined resolutions for thumbnail generation: [#7](https://github.com/owncloud/ocis/thumbnails/issues/7) We implemented predefined resolutions to prevent attacker from flooding the service with a large number of thumbnails. The requested resolution gets mapped to the closest matching predefined resolution. - https://github.com/owncloud/ocis-thumbnails/issues/7 + https://github.com/owncloud/ocis/thumbnails/issues/7 -* Change - Implement the first working version: [#3](https://github.com/owncloud/ocis-thumbnails/pull/3) +* Change - Implement the first working version: [#3](https://github.com/owncloud/ocis/thumbnails/pull/3) We implemented the first simple version. It can load images via webdav and store them locally in the filesystem. - https://github.com/owncloud/ocis-thumbnails/pull/3 + https://github.com/owncloud/ocis/thumbnails/pull/3 diff --git a/thumbnails/changelog/0.1.0_2020-03-31/initial-version.md b/thumbnails/changelog/0.1.0_2020-03-31/initial-version.md index eeb21e0af1..b41e872d2b 100644 --- a/thumbnails/changelog/0.1.0_2020-03-31/initial-version.md +++ b/thumbnails/changelog/0.1.0_2020-03-31/initial-version.md @@ -4,4 +4,4 @@ Just prepare an initial basic version to embed a thumbnailer into our microservice infrastructure in the scope of the ownCloud Infinite Scale project. -https://github.com/owncloud/ocis-thumbnails/issues/1 +https://github.com/owncloud/ocis/thumbnails/issues/1 diff --git a/thumbnails/changelog/0.1.0_2020-03-31/predefined-resolutions.md b/thumbnails/changelog/0.1.0_2020-03-31/predefined-resolutions.md index ce8d3e1989..514ccdb4dc 100644 --- a/thumbnails/changelog/0.1.0_2020-03-31/predefined-resolutions.md +++ b/thumbnails/changelog/0.1.0_2020-03-31/predefined-resolutions.md @@ -1,6 +1,6 @@ -Change: Use predefined resolutions for thumbnail generation +Change: Use predefined resolutions for thumbnail generation We implemented predefined resolutions to prevent attacker from flooding the service with a large number of thumbnails. The requested resolution gets mapped to the closest matching predefined resolution. -https://github.com/owncloud/ocis-thumbnails/issues/7 +https://github.com/owncloud/ocis/thumbnails/issues/7 diff --git a/thumbnails/changelog/0.1.0_2020-03-31/thumbnail-service.md b/thumbnails/changelog/0.1.0_2020-03-31/thumbnail-service.md index b67eb4988a..4d527436ae 100644 --- a/thumbnails/changelog/0.1.0_2020-03-31/thumbnail-service.md +++ b/thumbnails/changelog/0.1.0_2020-03-31/thumbnail-service.md @@ -3,4 +3,4 @@ Change: implement the first working version We implemented the first simple version. It can load images via webdav and store them locally in the filesystem. -https://github.com/owncloud/ocis-thumbnails/pull/3 +https://github.com/owncloud/ocis/thumbnails/pull/3 diff --git a/thumbnails/changelog/0.1.1_2020-04-21/fix-flags.md b/thumbnails/changelog/0.1.1_2020-04-21/fix-flags.md index 23d2b20500..d806ffef88 100644 --- a/thumbnails/changelog/0.1.1_2020-04-21/fix-flags.md +++ b/thumbnails/changelog/0.1.1_2020-04-21/fix-flags.md @@ -1,6 +1,6 @@ -Bugfix: Fix execution when passing program flags +Bugfix: Fix execution when passing program flags The program flags where not correctly recognized because we didn't pass them to the micro framework when initializing a grpc service. -https://github.com/owncloud/ocis-thumbnails/issues/15 +https://github.com/owncloud/ocis/thumbnails/issues/15 diff --git a/thumbnails/changelog/0.1.2_2020-05-11/fix-context-handling.md b/thumbnails/changelog/0.1.2_2020-05-11/fix-context-handling.md index 61e1dba33e..4350211b4d 100644 --- a/thumbnails/changelog/0.1.2_2020-05-11/fix-context-handling.md +++ b/thumbnails/changelog/0.1.2_2020-05-11/fix-context-handling.md @@ -1,6 +1,6 @@ -Bugfix: Fix usage of context.Context +Bugfix: Fix usage of context.Context The context was filled with a key defined in the package service but read with a key from the package imgsource. Since `service.key` and `imgsource.key` are different types imgsource could not read the value provided by service. -https://github.com/owncloud/ocis-thumbnails/issues/18 +https://github.com/owncloud/ocis/thumbnails/issues/18 diff --git a/thumbnails/changelog/0.2.0_2020-07-10/add-resolutions.md b/thumbnails/changelog/0.2.0_2020-07-10/add-resolutions.md index b2449e9f38..a138a1b804 100644 --- a/thumbnails/changelog/0.2.0_2020-07-10/add-resolutions.md +++ b/thumbnails/changelog/0.2.0_2020-07-10/add-resolutions.md @@ -1,6 +1,6 @@ -Change: add more default resolutions +Change: add more default resolutions The `ocis-thumbnails` service was also used by the mediaviewer but the returned images were too small since the highest resolution was 128x128 pixels. -https://github.com/owncloud/ocis-thumbnails/issues/23 +https://github.com/owncloud/ocis/thumbnails/issues/23 diff --git a/thumbnails/changelog/0.2.0_2020-07-10/fix-code-smells.md b/thumbnails/changelog/0.2.0_2020-07-10/fix-code-smells.md index 8d15094a8a..b862343260 100644 --- a/thumbnails/changelog/0.2.0_2020-07-10/fix-code-smells.md +++ b/thumbnails/changelog/0.2.0_2020-07-10/fix-code-smells.md @@ -1,6 +1,6 @@ -Change: refactor code to remove code smells +Change: refactor code to remove code smells Scanning the code using a static code analyzer showed some code smells. This change fixes them. -https://github.com/owncloud/ocis-thumbnails/issues/21 +https://github.com/owncloud/ocis/thumbnails/issues/21 diff --git a/thumbnails/changelog/0.2.0_2020-07-10/group-thumbnails-by-users.md b/thumbnails/changelog/0.2.0_2020-07-10/group-thumbnails-by-users.md index 2ccb43a229..5422f8e055 100644 --- a/thumbnails/changelog/0.2.0_2020-07-10/group-thumbnails-by-users.md +++ b/thumbnails/changelog/0.2.0_2020-07-10/group-thumbnails-by-users.md @@ -3,4 +3,4 @@ Enhancement: Limit users to access own thumbnails Users of the service can no longer request thumbnails of another users by guessing the etag. The thumbnails are now only accessible by the users who created the thumbnail. -https://github.com/owncloud/ocis-thumbnails/issues/5 +https://github.com/owncloud/ocis/thumbnails/issues/5 diff --git a/thumbnails/changelog/0.2.0_2020-07-10/use-micro-error-api.md b/thumbnails/changelog/0.2.0_2020-07-10/use-micro-error-api.md index ecc65833a3..f12239ce7a 100644 --- a/thumbnails/changelog/0.2.0_2020-07-10/use-micro-error-api.md +++ b/thumbnails/changelog/0.2.0_2020-07-10/use-micro-error-api.md @@ -2,4 +2,4 @@ Change: use micro service error api The service now also returns a status code when an error occurs. -https://github.com/owncloud/ocis-thumbnails/issues/31 +https://github.com/owncloud/ocis/thumbnails/issues/31 diff --git a/thumbnails/changelog/0.3.0_2020-08-17/serve-metrics.md b/thumbnails/changelog/0.3.0_2020-08-17/serve-metrics.md index 72c003bebd..f63b3816d2 100644 --- a/thumbnails/changelog/0.3.0_2020-08-17/serve-metrics.md +++ b/thumbnails/changelog/0.3.0_2020-08-17/serve-metrics.md @@ -2,4 +2,4 @@ Enhancement: serve the metrics endpoint Added the metrics endpoint to be able to monitor this service like the other services -https://github.com/owncloud/ocis-thumbnails/issues/37 +https://github.com/owncloud/ocis/thumbnails/issues/37 diff --git a/thumbnails/changelog/0.3.0_2020-08-17/use-alpine-latest.md b/thumbnails/changelog/0.3.0_2020-08-17/use-alpine-latest.md index c841551834..7f5f75c03b 100644 --- a/thumbnails/changelog/0.3.0_2020-08-17/use-alpine-latest.md +++ b/thumbnails/changelog/0.3.0_2020-08-17/use-alpine-latest.md @@ -2,4 +2,4 @@ Bugfix: build docker images with alpine:latest instead of alpine:edge ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. -https://github.com/owncloud/ocis-thumbnails/pull/35 +https://github.com/owncloud/ocis/thumbnails/pull/35 diff --git a/thumbnails/changelog/CHANGELOG.tmpl b/thumbnails/changelog/CHANGELOG.tmpl index caa3daa890..2dedb96955 100644 --- a/thumbnails/changelog/CHANGELOG.tmpl +++ b/thumbnails/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes in ocis-thumbnails {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-thumbnails/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/thumbnails/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-thumbnails/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/thumbnails/compare/v{{ $previousVersion }}...v{{ .Version }} {{ end -}} {{ end -}} {{- /* last version managed by calens, end of the loop */ -}} {{ if eq .Version "0.1.0" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-thumbnails/compare/c43f3a33cb0b57d7e25ebc88c138d22e95f88cfe...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/thumbnails/compare/c43f3a33cb0b57d7e25ebc88c138d22e95f88cfe...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/thumbnails/changelog/TEMPLATE b/thumbnails/changelog/TEMPLATE index 0cf2d8a051..ce373730a8 100644 --- a/thumbnails/changelog/TEMPLATE +++ b/thumbnails/changelog/TEMPLATE @@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID, in case there aren't any issue links) is used as the primary ID. -https://github.com/owncloud/ocis-thumbnails/issues/1234 -https://github.com/owncloud/ocis-thumbnails/pull/55555 +https://github.com/owncloud/ocis/thumbnails/issues/1234 +https://github.com/owncloud/ocis/thumbnails/pull/55555 diff --git a/thumbnails/cmd/ocis-thumbnails/main.go b/thumbnails/cmd/ocis-thumbnails/main.go index bdbbc1b462..df37440368 100644 --- a/thumbnails/cmd/ocis-thumbnails/main.go +++ b/thumbnails/cmd/ocis-thumbnails/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/owncloud/ocis-thumbnails/pkg/command" + "github.com/owncloud/ocis/thumbnails/pkg/command" ) func main() { if err := command.Execute(); err != nil { os.Exit(1) } -} \ No newline at end of file +} diff --git a/thumbnails/docs/getting-started.md b/thumbnails/docs/getting-started.md index 0efc461b48..2bcbd07e45 100644 --- a/thumbnails/docs/getting-started.md +++ b/thumbnails/docs/getting-started.md @@ -167,7 +167,7 @@ If you prefer to configure the service with commandline flags you can see the av ### Configuration file -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis-thumbnails/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/thumbnails.yml`, `${HOME}/.ocis/thumbnails.yml` or `$(pwd)/config/thumbnails.yml`. +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/thumbnails/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/thumbnails.yml`, `${HOME}/.ocis/thumbnails.yml` or `$(pwd)/config/thumbnails.yml`. ## Usage diff --git a/thumbnails/docs/license.md b/thumbnails/docs/license.md index 8a930291c9..69cda13beb 100644 --- a/thumbnails/docs/license.md +++ b/thumbnails/docs/license.md @@ -7,4 +7,4 @@ geekdocEditPath: edit/master/docs geekdocFilePath: license.md --- -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-thumbnails/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. +This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/thumbnails/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/thumbnails/go.mod b/thumbnails/go.mod index 3096f178d7..d706c932e0 100644 --- a/thumbnails/go.mod +++ b/thumbnails/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-thumbnails +module github.com/owncloud/ocis/thumbnails go 1.13 @@ -12,7 +12,6 @@ require ( github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31 // indirect github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect github.com/golang/protobuf v1.3.2 - github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 // indirect github.com/imdario/mergo v0.3.9 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/mattn/go-colorable v0.1.2 // indirect @@ -37,3 +36,5 @@ require ( gopkg.in/square/go-jose.v2 v2.3.1 honnef.co/go/tools v0.0.1-2020.1.3 // indirect ) + +replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 diff --git a/thumbnails/go.sum b/thumbnails/go.sum index 07112a389f..7b943186b8 100644 --- a/thumbnails/go.sum +++ b/thumbnails/go.sum @@ -1,4 +1,3 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= @@ -97,7 +96,6 @@ github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReG github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.10.2/go.mod h1:qhVI5MKwBGhdNU89ZRz2plgYutcJ5PCekLxXn56w6SY= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= @@ -151,8 +149,6 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= @@ -193,7 +189,6 @@ github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31 h1:28FVBuwkwowZMjbA github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= @@ -263,8 +258,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 h1:FdBGmSkD2QpQzRWup//SGObvWf2nq89zj9+ta9OvI3A= -github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5/go.mod h1:0YZ2wQSuwviXXXGUiK6zXzskyBLAbLXhamxzcFHSLoM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= @@ -333,7 +326,6 @@ github.com/lucas-clemente/quic-go v0.13.1 h1:CxtJTXQIh2aboCPk0M6vf530XOov6DZjVBi github.com/lucas-clemente/quic-go v0.13.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU= github.com/lucas-clemente/quic-go v0.14.1 h1:c1aKoBZKOPA+49q96B1wGkibyPP0AxYh45WuAoq+87E= github.com/lucas-clemente/quic-go v0.14.1/go.mod h1:Vn3/Fb0/77b02SGhQk36KzOUmXgVpFfizUfW5WMaqyU= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/marten-seemann/chacha20 v0.2.0 h1:f40vqzzx+3GdOmzQoItkLX5WLvHgPgyYqFFIO5Gh4hQ= @@ -643,10 +635,8 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= @@ -706,7 +696,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181019160139-8e24a49d80f8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -748,10 +737,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -759,7 +746,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -795,6 +781,7 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -811,18 +798,6 @@ google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvx google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba h1:pRj9OXZbwNtbtZtOB4dLwfK4u+EVRMvP+e9zKkg2grM= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= -google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -854,11 +829,9 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= diff --git a/thumbnails/pkg/command/health.go b/thumbnails/pkg/command/health.go index c2c9a1c8e2..c1d6796bd4 100644 --- a/thumbnails/pkg/command/health.go +++ b/thumbnails/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-thumbnails/pkg/config" - "github.com/owncloud/ocis-thumbnails/pkg/flagset" + "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/flagset" ) // Health is the entrypoint for the health command. @@ -46,4 +46,4 @@ func Health(cfg *config.Config) *cli.Command { return nil }, } -} \ No newline at end of file +} diff --git a/thumbnails/pkg/command/root.go b/thumbnails/pkg/command/root.go index 4143bd885d..d81e082a0e 100644 --- a/thumbnails/pkg/command/root.go +++ b/thumbnails/pkg/command/root.go @@ -6,9 +6,9 @@ import ( "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-thumbnails/pkg/config" - "github.com/owncloud/ocis-thumbnails/pkg/flagset" - "github.com/owncloud/ocis-thumbnails/pkg/version" + "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/flagset" + "github.com/owncloud/ocis/thumbnails/pkg/version" "github.com/spf13/viper" ) diff --git a/thumbnails/pkg/command/server.go b/thumbnails/pkg/command/server.go index 44a89a79f8..7b00cc9861 100644 --- a/thumbnails/pkg/command/server.go +++ b/thumbnails/pkg/command/server.go @@ -14,11 +14,11 @@ import ( "github.com/oklog/run" openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/owncloud/ocis-thumbnails/pkg/config" - "github.com/owncloud/ocis-thumbnails/pkg/flagset" - "github.com/owncloud/ocis-thumbnails/pkg/metrics" - "github.com/owncloud/ocis-thumbnails/pkg/server/debug" - "github.com/owncloud/ocis-thumbnails/pkg/server/grpc" + "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/flagset" + "github.com/owncloud/ocis/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/thumbnails/pkg/server/debug" + "github.com/owncloud/ocis/thumbnails/pkg/server/grpc" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go index b8027badce..80325ea52b 100644 --- a/thumbnails/pkg/flagset/flagset.go +++ b/thumbnails/pkg/flagset/flagset.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go b/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go index 4f7ccf556c..a5255ca0c1 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go +++ b/thumbnails/pkg/proto/v0/thumbnails.pb.micro_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/owncloud/ocis-pkg/v2/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/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" + svc "github.com/owncloud/ocis/thumbnails/pkg/service/v0" ) var service = grpc.Service{} diff --git a/thumbnails/pkg/proto/v0/thumbnails.pb_test.go b/thumbnails/pkg/proto/v0/thumbnails.pb_test.go index 56af7f2988..4370ff2b6d 100644 --- a/thumbnails/pkg/proto/v0/thumbnails.pb_test.go +++ b/thumbnails/pkg/proto/v0/thumbnails.pb_test.go @@ -3,7 +3,7 @@ package proto_test import ( "testing" - "github.com/owncloud/ocis-thumbnails/pkg/proto/v0" + "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" "github.com/stretchr/testify/assert" ) diff --git a/thumbnails/pkg/server/debug/option.go b/thumbnails/pkg/server/debug/option.go index 3349a7875e..70a0bbb161 100644 --- a/thumbnails/pkg/server/debug/option.go +++ b/thumbnails/pkg/server/debug/option.go @@ -2,7 +2,7 @@ package debug import ( "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/config" ) // Option defines a single option function. diff --git a/thumbnails/pkg/server/debug/server.go b/thumbnails/pkg/server/debug/server.go index cb3603536b..c587f76dd1 100644 --- a/thumbnails/pkg/server/debug/server.go +++ b/thumbnails/pkg/server/debug/server.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/owncloud/ocis-pkg/v2/service/debug" - "github.com/owncloud/ocis-thumbnails/pkg/config" - "github.com/owncloud/ocis-thumbnails/pkg/version" + "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/version" ) // Server initializes the debug service and server. diff --git a/thumbnails/pkg/server/grpc/option.go b/thumbnails/pkg/server/grpc/option.go index 0d015101f9..c76d0ce327 100644 --- a/thumbnails/pkg/server/grpc/option.go +++ b/thumbnails/pkg/server/grpc/option.go @@ -5,8 +5,8 @@ import ( "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-thumbnails/pkg/config" - "github.com/owncloud/ocis-thumbnails/pkg/metrics" + "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/metrics" ) // Option defines a single option function. diff --git a/thumbnails/pkg/server/grpc/server.go b/thumbnails/pkg/server/grpc/server.go index 588abbbb2c..ecb1e4d224 100644 --- a/thumbnails/pkg/server/grpc/server.go +++ b/thumbnails/pkg/server/grpc/server.go @@ -2,11 +2,11 @@ package grpc import ( "github.com/owncloud/ocis-pkg/v2/service/grpc" - "github.com/owncloud/ocis-thumbnails/pkg/proto/v0" - 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" - "github.com/owncloud/ocis-thumbnails/pkg/version" + "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" + 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" + "github.com/owncloud/ocis/thumbnails/pkg/version" ) // NewService initializes the grpc service and server. diff --git a/thumbnails/pkg/service/v0/instrument.go b/thumbnails/pkg/service/v0/instrument.go index dbd9026c02..a06f865680 100644 --- a/thumbnails/pkg/service/v0/instrument.go +++ b/thumbnails/pkg/service/v0/instrument.go @@ -3,8 +3,8 @@ package svc import ( "context" - "github.com/owncloud/ocis-thumbnails/pkg/metrics" - v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0" + "github.com/owncloud/ocis/thumbnails/pkg/metrics" + v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" "github.com/prometheus/client_golang/prometheus" ) diff --git a/thumbnails/pkg/service/v0/logging.go b/thumbnails/pkg/service/v0/logging.go index 0972efadba..293f72e4f6 100644 --- a/thumbnails/pkg/service/v0/logging.go +++ b/thumbnails/pkg/service/v0/logging.go @@ -5,7 +5,7 @@ import ( "time" "github.com/owncloud/ocis-pkg/v2/log" - v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0" + v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" ) // NewLogging returns a service that logs messages. diff --git a/thumbnails/pkg/service/v0/option.go b/thumbnails/pkg/service/v0/option.go index c870c70968..d1c070405e 100644 --- a/thumbnails/pkg/service/v0/option.go +++ b/thumbnails/pkg/service/v0/option.go @@ -4,9 +4,9 @@ import ( "net/http" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-thumbnails/pkg/config" - "github.com/owncloud/ocis-thumbnails/pkg/thumbnail/imgsource" - "github.com/owncloud/ocis-thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource" + "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" ) // Option defines a single option function. diff --git a/thumbnails/pkg/service/v0/service.go b/thumbnails/pkg/service/v0/service.go index e432d4d3f9..cfe09adafb 100644 --- a/thumbnails/pkg/service/v0/service.go +++ b/thumbnails/pkg/service/v0/service.go @@ -7,10 +7,10 @@ import ( merrors "github.com/micro/go-micro/v2/errors" "github.com/owncloud/ocis-pkg/v2/log" - 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/owncloud/ocis-thumbnails/pkg/thumbnail/resolution" + 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/owncloud/ocis/thumbnails/pkg/thumbnail/resolution" "github.com/pkg/errors" ) diff --git a/thumbnails/pkg/service/v0/tracing.go b/thumbnails/pkg/service/v0/tracing.go index cf88e0f015..c56767126e 100644 --- a/thumbnails/pkg/service/v0/tracing.go +++ b/thumbnails/pkg/service/v0/tracing.go @@ -3,7 +3,7 @@ package svc import ( "context" - v0proto "github.com/owncloud/ocis-thumbnails/pkg/proto/v0" + v0proto "github.com/owncloud/ocis/thumbnails/pkg/proto/v0" "go.opencensus.io/trace" ) diff --git a/thumbnails/pkg/thumbnail/imgsource/filesystem.go b/thumbnails/pkg/thumbnail/imgsource/filesystem.go index 78439db702..22710b1cd6 100644 --- a/thumbnails/pkg/thumbnail/imgsource/filesystem.go +++ b/thumbnails/pkg/thumbnail/imgsource/filesystem.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis-thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/config" ) // NewFileSystemSource return a new FileSystem instance diff --git a/thumbnails/pkg/thumbnail/imgsource/webdav.go b/thumbnails/pkg/thumbnail/imgsource/webdav.go index 3d173793bf..56503395aa 100644 --- a/thumbnails/pkg/thumbnail/imgsource/webdav.go +++ b/thumbnails/pkg/thumbnail/imgsource/webdav.go @@ -9,7 +9,7 @@ import ( "net/url" "path" - "github.com/owncloud/ocis-thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/config" ) // NewWebDavSource creates a new webdav instance. diff --git a/thumbnails/pkg/thumbnail/storage/filesystem.go b/thumbnails/pkg/thumbnail/storage/filesystem.go index 7173d813ff..7251f7b01e 100644 --- a/thumbnails/pkg/thumbnail/storage/filesystem.go +++ b/thumbnails/pkg/thumbnail/storage/filesystem.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-thumbnails/pkg/config" + "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/pkg/errors" ) diff --git a/thumbnails/pkg/thumbnail/storage/storage.go b/thumbnails/pkg/thumbnail/storage/storage.go index 55d9682696..5b17c25de4 100644 --- a/thumbnails/pkg/thumbnail/storage/storage.go +++ b/thumbnails/pkg/thumbnail/storage/storage.go @@ -1,6 +1,6 @@ package storage -import "github.com/owncloud/ocis-thumbnails/pkg/thumbnail/resolution" +import "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/resolution" // Request combines different attributes needed for storage operations. type Request struct { diff --git a/thumbnails/pkg/thumbnail/thumbnails.go b/thumbnails/pkg/thumbnail/thumbnails.go index d600b53ad6..d6b5268cd8 100644 --- a/thumbnails/pkg/thumbnail/thumbnails.go +++ b/thumbnails/pkg/thumbnail/thumbnails.go @@ -6,8 +6,8 @@ import ( "github.com/nfnt/resize" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-thumbnails/pkg/thumbnail/resolution" - "github.com/owncloud/ocis-thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/resolution" + "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" ) // Request bundles information needed to generate a thumbnail for afile diff --git a/thumbnails/sonar-project.properties b/thumbnails/sonar-project.properties index e9cc5c0de1..299aef553d 100644 --- a/thumbnails/sonar-project.properties +++ b/thumbnails/sonar-project.properties @@ -12,7 +12,7 @@ sonar.host.url=https://sonarcloud.io sonar.links.homepage=https://github.com/owncloud/ocis-thumbnails sonar.links.ci=https://cloud.drone.io/owncloud/ocis-thumbnails/ sonar.links.scm=https://github.com/owncloud/ocis-thumbnails -sonar.links.issue=https://github.com/owncloud/ocis-thumbnails/issues +sonar.links.issue=https://github.com/owncloud/ocis/thumbnails/issues # ===================================================== # Properties that will be shared amongst all modules @@ -32,4 +32,4 @@ sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY} sonar.go.coverage.reportPaths=coverage.out # Exclude protobuf files -sonar.exclusions=pkg/proto/**, changelog/**, docs/**, package.json, rollup.config.js, changelog.md \ No newline at end of file +sonar.exclusions=pkg/proto/**, changelog/**, docs/**, package.json, rollup.config.js, changelog.md