From a919195f340414de5abc311c1086fd2d2611e6be Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Wed, 13 Apr 2022 11:25:17 +0200 Subject: [PATCH] refactor thumbnails Signed-off-by: Christian Richter --- {thumbnails => extensions/thumbnails}/Makefile | 14 +++++++------- .../thumbnails}/cmd/thumbnails/main.go | 4 ++-- .../thumbnails}/docker/Dockerfile.linux.amd64 | 0 .../thumbnails}/docker/Dockerfile.linux.arm | 0 .../thumbnails}/docker/Dockerfile.linux.arm64 | 0 .../thumbnails}/docker/manifest.tmpl | 0 .../thumbnails}/pkg/command/health.go | 6 +++--- .../thumbnails}/pkg/command/root.go | 2 +- .../thumbnails}/pkg/command/server.go | 16 ++++++++-------- .../thumbnails}/pkg/command/version.go | 2 +- .../thumbnails}/pkg/config/config.go | 0 .../thumbnails}/pkg/config/debug.go | 0 .../pkg/config/defaults/defaultconfig.go | 2 +- .../thumbnails}/pkg/config/grpc.go | 0 .../thumbnails}/pkg/config/http.go | 0 .../thumbnails}/pkg/config/log.go | 0 .../thumbnails}/pkg/config/parser/parse.go | 4 ++-- .../thumbnails}/pkg/config/service.go | 0 .../thumbnails}/pkg/config/tracing.go | 0 .../thumbnails}/pkg/logging/logging.go | 2 +- .../thumbnails}/pkg/metrics/metrics.go | 0 .../thumbnails}/pkg/preprocessor/fontloader.go | 0 .../pkg/preprocessor/preprocessor.go | 0 .../pkg/preprocessor/textanalyzer.go | 0 .../pkg/preprocessor/textanalyzer_test.go | 0 .../thumbnails}/pkg/server/debug/option.go | 2 +- .../thumbnails}/pkg/server/debug/server.go | 2 +- .../thumbnails}/pkg/server/grpc/option.go | 4 ++-- .../thumbnails}/pkg/server/grpc/server.go | 8 ++++---- .../thumbnails}/pkg/server/http/option.go | 4 ++-- .../thumbnails}/pkg/server/http/server.go | 4 ++-- .../pkg/service/grpc/v0/decorators/base.go | 0 .../service/grpc/v0/decorators/instrument.go | 2 +- .../pkg/service/grpc/v0/decorators/logging.go | 0 .../pkg/service/grpc/v0/decorators/tracing.go | 2 +- .../thumbnails}/pkg/service/grpc/v0/option.go | 9 +++++---- .../thumbnails}/pkg/service/grpc/v0/service.go | 10 +++++----- .../pkg/service/http/v0/instrument.go | 2 +- .../thumbnails}/pkg/service/http/v0/logging.go | 0 .../thumbnails}/pkg/service/http/v0/option.go | 4 ++-- .../thumbnails}/pkg/service/http/v0/service.go | 6 +++--- .../thumbnails}/pkg/service/http/v0/tracing.go | 0 .../thumbnails}/pkg/service/jwt/jwt.go | 0 .../thumbnails}/pkg/thumbnail/encoding.go | 0 .../thumbnails}/pkg/thumbnail/encoding_test.go | 0 .../thumbnails}/pkg/thumbnail/generator.go | 0 .../thumbnails}/pkg/thumbnail/imgsource/cs3.go | 2 +- .../pkg/thumbnail/imgsource/filesystem.go | 2 +- .../pkg/thumbnail/imgsource/imgsource.go | 0 .../pkg/thumbnail/imgsource/webdav.go | 5 +++-- .../thumbnails}/pkg/thumbnail/resolutions.go | 0 .../pkg/thumbnail/resolutions_test.go | 0 .../pkg/thumbnail/storage/filesystem.go | 2 +- .../pkg/thumbnail/storage/inmemory.go | 0 .../pkg/thumbnail/storage/storage.go | 0 .../thumbnails}/pkg/thumbnail/thumbnail.go | 2 +- .../thumbnails}/pkg/thumbnail/thumbnail_test.go | 2 +- .../thumbnails}/pkg/tracing/tracing.go | 2 +- .../thumbnails}/reflex.conf | 0 .../thumbnails}/testdata/oc.png | Bin ocis-pkg/config/config.go | 2 +- ocis-pkg/config/defaultconfig.go | 2 +- ocis/pkg/command/thumbnails.go | 2 +- ocis/pkg/runtime/service/service.go | 2 +- 64 files changed, 69 insertions(+), 67 deletions(-) rename {thumbnails => extensions/thumbnails}/Makefile (78%) rename {thumbnails => extensions/thumbnails}/cmd/thumbnails/main.go (50%) rename {thumbnails => extensions/thumbnails}/docker/Dockerfile.linux.amd64 (100%) rename {thumbnails => extensions/thumbnails}/docker/Dockerfile.linux.arm (100%) rename {thumbnails => extensions/thumbnails}/docker/Dockerfile.linux.arm64 (100%) rename {thumbnails => extensions/thumbnails}/docker/manifest.tmpl (100%) rename {thumbnails => extensions/thumbnails}/pkg/command/health.go (83%) rename {thumbnails => extensions/thumbnails}/pkg/command/root.go (95%) rename {thumbnails => extensions/thumbnails}/pkg/command/server.go (80%) rename {thumbnails => extensions/thumbnails}/pkg/command/version.go (95%) rename {thumbnails => extensions/thumbnails}/pkg/config/config.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/config/debug.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/config/defaults/defaultconfig.go (97%) rename {thumbnails => extensions/thumbnails}/pkg/config/grpc.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/config/http.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/config/log.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/config/parser/parse.go (84%) rename {thumbnails => extensions/thumbnails}/pkg/config/service.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/config/tracing.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/logging/logging.go (84%) rename {thumbnails => extensions/thumbnails}/pkg/metrics/metrics.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/preprocessor/fontloader.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/preprocessor/preprocessor.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/preprocessor/textanalyzer.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/preprocessor/textanalyzer_test.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/server/debug/option.go (92%) rename {thumbnails => extensions/thumbnails}/pkg/server/debug/server.go (96%) rename {thumbnails => extensions/thumbnails}/pkg/server/grpc/option.go (93%) rename {thumbnails => extensions/thumbnails}/pkg/server/grpc/server.go (83%) rename {thumbnails => extensions/thumbnails}/pkg/server/http/option.go (91%) rename {thumbnails => extensions/thumbnails}/pkg/server/http/server.go (90%) rename {thumbnails => extensions/thumbnails}/pkg/service/grpc/v0/decorators/base.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/service/grpc/v0/decorators/instrument.go (94%) rename {thumbnails => extensions/thumbnails}/pkg/service/grpc/v0/decorators/logging.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/service/grpc/v0/decorators/tracing.go (93%) rename {thumbnails => extensions/thumbnails}/pkg/service/grpc/v0/option.go (89%) rename {thumbnails => extensions/thumbnails}/pkg/service/grpc/v0/service.go (96%) rename {thumbnails => extensions/thumbnails}/pkg/service/http/v0/instrument.go (90%) rename {thumbnails => extensions/thumbnails}/pkg/service/http/v0/logging.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/service/http/v0/option.go (90%) rename {thumbnails => extensions/thumbnails}/pkg/service/http/v0/service.go (93%) rename {thumbnails => extensions/thumbnails}/pkg/service/http/v0/tracing.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/service/jwt/jwt.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/encoding.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/encoding_test.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/generator.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/imgsource/cs3.go (97%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/imgsource/filesystem.go (92%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/imgsource/imgsource.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/imgsource/webdav.go (96%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/resolutions.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/resolutions_test.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/storage/filesystem.go (97%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/storage/inmemory.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/storage/storage.go (100%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/thumbnail.go (97%) rename {thumbnails => extensions/thumbnails}/pkg/thumbnail/thumbnail_test.go (91%) rename {thumbnails => extensions/thumbnails}/pkg/tracing/tracing.go (89%) rename {thumbnails => extensions/thumbnails}/reflex.conf (100%) rename {thumbnails => extensions/thumbnails}/testdata/oc.png (100%) diff --git a/thumbnails/Makefile b/extensions/thumbnails/Makefile similarity index 78% rename from thumbnails/Makefile rename to extensions/thumbnails/Makefile index d5444df91..9e2fe5df8 100644 --- a/thumbnails/Makefile +++ b/extensions/thumbnails/Makefile @@ -1,28 +1,28 @@ SHELL := bash NAME := thumbnails -include ../.make/recursion.mk +include ../../.make/recursion.mk ############ tooling ############ ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI -include ../.bingo/Variables.mk +include ../../.bingo/Variables.mk endif ############ go tooling ############ -include ../.make/go.mk +include ../../.make/go.mk ############ release ######### -include ../.make/release.mk +include ../../.make/release.mk ############ docs generate ############ -include ../.make/docs.mk +include ../../.make/docs.mk .PHONY: docs-generate docs-generate: config-docs-generate \ grpc-docs-generate ############ generate ############ -include ../.make/generate.mk +include ../../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target @@ -31,7 +31,7 @@ ci-go-generate: protobuf # CI runs ci-node-generate automatically before this ta ci-node-generate: ############ protobuf ############ -include ../.make/protobuf.mk +include ../../.make/protobuf.mk .PHONY: protobuf protobuf: buf-generate diff --git a/thumbnails/cmd/thumbnails/main.go b/extensions/thumbnails/cmd/thumbnails/main.go similarity index 50% rename from thumbnails/cmd/thumbnails/main.go rename to extensions/thumbnails/cmd/thumbnails/main.go index 945b3ec15..89f908cca 100644 --- a/thumbnails/cmd/thumbnails/main.go +++ b/extensions/thumbnails/cmd/thumbnails/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/thumbnails/pkg/command" - "github.com/owncloud/ocis/thumbnails/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/command" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults" ) func main() { diff --git a/thumbnails/docker/Dockerfile.linux.amd64 b/extensions/thumbnails/docker/Dockerfile.linux.amd64 similarity index 100% rename from thumbnails/docker/Dockerfile.linux.amd64 rename to extensions/thumbnails/docker/Dockerfile.linux.amd64 diff --git a/thumbnails/docker/Dockerfile.linux.arm b/extensions/thumbnails/docker/Dockerfile.linux.arm similarity index 100% rename from thumbnails/docker/Dockerfile.linux.arm rename to extensions/thumbnails/docker/Dockerfile.linux.arm diff --git a/thumbnails/docker/Dockerfile.linux.arm64 b/extensions/thumbnails/docker/Dockerfile.linux.arm64 similarity index 100% rename from thumbnails/docker/Dockerfile.linux.arm64 rename to extensions/thumbnails/docker/Dockerfile.linux.arm64 diff --git a/thumbnails/docker/manifest.tmpl b/extensions/thumbnails/docker/manifest.tmpl similarity index 100% rename from thumbnails/docker/manifest.tmpl rename to extensions/thumbnails/docker/manifest.tmpl diff --git a/thumbnails/pkg/command/health.go b/extensions/thumbnails/pkg/command/health.go similarity index 83% rename from thumbnails/pkg/command/health.go rename to extensions/thumbnails/pkg/command/health.go index 7eb462475..f63d023d5 100644 --- a/thumbnails/pkg/command/health.go +++ b/extensions/thumbnails/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/config/parser" - "github.com/owncloud/ocis/thumbnails/pkg/logging" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/parser" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/thumbnails/pkg/command/root.go b/extensions/thumbnails/pkg/command/root.go similarity index 95% rename from thumbnails/pkg/command/root.go rename to extensions/thumbnails/pkg/command/root.go index 83b311196..44d4948db 100644 --- a/thumbnails/pkg/command/root.go +++ b/extensions/thumbnails/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/owncloud/ocis/ocis-pkg/clihelper" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/thumbnails/pkg/command/server.go b/extensions/thumbnails/pkg/command/server.go similarity index 80% rename from thumbnails/pkg/command/server.go rename to extensions/thumbnails/pkg/command/server.go index 86fb9d91a..8bfd35a1b 100644 --- a/thumbnails/pkg/command/server.go +++ b/extensions/thumbnails/pkg/command/server.go @@ -5,15 +5,15 @@ import ( "fmt" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/parser" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/logging" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/server/debug" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/server/grpc" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/server/http" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/config/parser" - "github.com/owncloud/ocis/thumbnails/pkg/logging" - "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/server/http" - "github.com/owncloud/ocis/thumbnails/pkg/tracing" "github.com/urfave/cli/v2" ) diff --git a/thumbnails/pkg/command/version.go b/extensions/thumbnails/pkg/command/version.go similarity index 95% rename from thumbnails/pkg/command/version.go rename to extensions/thumbnails/pkg/command/version.go index b909db37d..ce2752f9e 100644 --- a/thumbnails/pkg/command/version.go +++ b/extensions/thumbnails/pkg/command/version.go @@ -8,7 +8,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/thumbnails/pkg/config/config.go b/extensions/thumbnails/pkg/config/config.go similarity index 100% rename from thumbnails/pkg/config/config.go rename to extensions/thumbnails/pkg/config/config.go diff --git a/thumbnails/pkg/config/debug.go b/extensions/thumbnails/pkg/config/debug.go similarity index 100% rename from thumbnails/pkg/config/debug.go rename to extensions/thumbnails/pkg/config/debug.go diff --git a/thumbnails/pkg/config/defaults/defaultconfig.go b/extensions/thumbnails/pkg/config/defaults/defaultconfig.go similarity index 97% rename from thumbnails/pkg/config/defaults/defaultconfig.go rename to extensions/thumbnails/pkg/config/defaults/defaultconfig.go index f52e21232..c74b85065 100644 --- a/thumbnails/pkg/config/defaults/defaultconfig.go +++ b/extensions/thumbnails/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/thumbnails/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/thumbnails/pkg/config/grpc.go b/extensions/thumbnails/pkg/config/grpc.go similarity index 100% rename from thumbnails/pkg/config/grpc.go rename to extensions/thumbnails/pkg/config/grpc.go diff --git a/thumbnails/pkg/config/http.go b/extensions/thumbnails/pkg/config/http.go similarity index 100% rename from thumbnails/pkg/config/http.go rename to extensions/thumbnails/pkg/config/http.go diff --git a/thumbnails/pkg/config/log.go b/extensions/thumbnails/pkg/config/log.go similarity index 100% rename from thumbnails/pkg/config/log.go rename to extensions/thumbnails/pkg/config/log.go diff --git a/thumbnails/pkg/config/parser/parse.go b/extensions/thumbnails/pkg/config/parser/parse.go similarity index 84% rename from thumbnails/pkg/config/parser/parse.go rename to extensions/thumbnails/pkg/config/parser/parse.go index 705425a65..4ed732553 100644 --- a/thumbnails/pkg/config/parser/parse.go +++ b/extensions/thumbnails/pkg/config/parser/parse.go @@ -3,9 +3,9 @@ package parser import ( "errors" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/config/defaults" "github.com/owncloud/ocis/ocis-pkg/config/envdecode" ) diff --git a/thumbnails/pkg/config/service.go b/extensions/thumbnails/pkg/config/service.go similarity index 100% rename from thumbnails/pkg/config/service.go rename to extensions/thumbnails/pkg/config/service.go diff --git a/thumbnails/pkg/config/tracing.go b/extensions/thumbnails/pkg/config/tracing.go similarity index 100% rename from thumbnails/pkg/config/tracing.go rename to extensions/thumbnails/pkg/config/tracing.go diff --git a/thumbnails/pkg/logging/logging.go b/extensions/thumbnails/pkg/logging/logging.go similarity index 84% rename from thumbnails/pkg/logging/logging.go rename to extensions/thumbnails/pkg/logging/logging.go index 41d558326..d63c5a3f7 100644 --- a/thumbnails/pkg/logging/logging.go +++ b/extensions/thumbnails/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/thumbnails/pkg/metrics/metrics.go b/extensions/thumbnails/pkg/metrics/metrics.go similarity index 100% rename from thumbnails/pkg/metrics/metrics.go rename to extensions/thumbnails/pkg/metrics/metrics.go diff --git a/thumbnails/pkg/preprocessor/fontloader.go b/extensions/thumbnails/pkg/preprocessor/fontloader.go similarity index 100% rename from thumbnails/pkg/preprocessor/fontloader.go rename to extensions/thumbnails/pkg/preprocessor/fontloader.go diff --git a/thumbnails/pkg/preprocessor/preprocessor.go b/extensions/thumbnails/pkg/preprocessor/preprocessor.go similarity index 100% rename from thumbnails/pkg/preprocessor/preprocessor.go rename to extensions/thumbnails/pkg/preprocessor/preprocessor.go diff --git a/thumbnails/pkg/preprocessor/textanalyzer.go b/extensions/thumbnails/pkg/preprocessor/textanalyzer.go similarity index 100% rename from thumbnails/pkg/preprocessor/textanalyzer.go rename to extensions/thumbnails/pkg/preprocessor/textanalyzer.go diff --git a/thumbnails/pkg/preprocessor/textanalyzer_test.go b/extensions/thumbnails/pkg/preprocessor/textanalyzer_test.go similarity index 100% rename from thumbnails/pkg/preprocessor/textanalyzer_test.go rename to extensions/thumbnails/pkg/preprocessor/textanalyzer_test.go diff --git a/thumbnails/pkg/server/debug/option.go b/extensions/thumbnails/pkg/server/debug/option.go similarity index 92% rename from thumbnails/pkg/server/debug/option.go rename to extensions/thumbnails/pkg/server/debug/option.go index df3947209..730203573 100644 --- a/thumbnails/pkg/server/debug/option.go +++ b/extensions/thumbnails/pkg/server/debug/option.go @@ -1,8 +1,8 @@ package debug import ( + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" ) // Option defines a single option function. diff --git a/thumbnails/pkg/server/debug/server.go b/extensions/thumbnails/pkg/server/debug/server.go similarity index 96% rename from thumbnails/pkg/server/debug/server.go rename to extensions/thumbnails/pkg/server/debug/server.go index dd7b40a1f..2492f95c3 100644 --- a/thumbnails/pkg/server/debug/server.go +++ b/extensions/thumbnails/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/thumbnails/pkg/config" ) // Server initializes the debug service and server. diff --git a/thumbnails/pkg/server/grpc/option.go b/extensions/thumbnails/pkg/server/grpc/option.go similarity index 93% rename from thumbnails/pkg/server/grpc/option.go rename to extensions/thumbnails/pkg/server/grpc/option.go index aa14ccbde..a9c4491a0 100644 --- a/thumbnails/pkg/server/grpc/option.go +++ b/extensions/thumbnails/pkg/server/grpc/option.go @@ -3,9 +3,9 @@ package grpc import ( "context" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/metrics" "github.com/urfave/cli/v2" ) diff --git a/thumbnails/pkg/server/grpc/server.go b/extensions/thumbnails/pkg/server/grpc/server.go similarity index 83% rename from thumbnails/pkg/server/grpc/server.go rename to extensions/thumbnails/pkg/server/grpc/server.go index f4e11e451..49fb39e00 100644 --- a/thumbnails/pkg/server/grpc/server.go +++ b/extensions/thumbnails/pkg/server/grpc/server.go @@ -2,13 +2,13 @@ package grpc import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/owncloud/ocis/ocis-pkg/version" thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" - svc "github.com/owncloud/ocis/thumbnails/pkg/service/grpc/v0" - "github.com/owncloud/ocis/thumbnails/pkg/service/grpc/v0/decorators" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" ) // NewService initializes the grpc service and server. diff --git a/thumbnails/pkg/server/http/option.go b/extensions/thumbnails/pkg/server/http/option.go similarity index 91% rename from thumbnails/pkg/server/http/option.go rename to extensions/thumbnails/pkg/server/http/option.go index 9f1fa828e..b75f298be 100644 --- a/thumbnails/pkg/server/http/option.go +++ b/extensions/thumbnails/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/metrics" "github.com/urfave/cli/v2" ) diff --git a/thumbnails/pkg/server/http/server.go b/extensions/thumbnails/pkg/server/http/server.go similarity index 90% rename from thumbnails/pkg/server/http/server.go rename to extensions/thumbnails/pkg/server/http/server.go index 10d013a34..50f3e6b82 100644 --- a/thumbnails/pkg/server/http/server.go +++ b/extensions/thumbnails/pkg/server/http/server.go @@ -2,11 +2,11 @@ package http import ( "github.com/go-chi/chi/v5/middleware" + svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/http/v0" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" ocismiddleware "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/service/http" "github.com/owncloud/ocis/ocis-pkg/version" - svc "github.com/owncloud/ocis/thumbnails/pkg/service/http/v0" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" "go-micro.dev/v4" ) diff --git a/thumbnails/pkg/service/grpc/v0/decorators/base.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go similarity index 100% rename from thumbnails/pkg/service/grpc/v0/decorators/base.go rename to extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go diff --git a/thumbnails/pkg/service/grpc/v0/decorators/instrument.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go similarity index 94% rename from thumbnails/pkg/service/grpc/v0/decorators/instrument.go rename to extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go index 32db036f1..bafbb8287 100644 --- a/thumbnails/pkg/service/grpc/v0/decorators/instrument.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go @@ -3,8 +3,8 @@ package decorators import ( "context" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" - "github.com/owncloud/ocis/thumbnails/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/thumbnails/pkg/service/grpc/v0/decorators/logging.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go similarity index 100% rename from thumbnails/pkg/service/grpc/v0/decorators/logging.go rename to extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go diff --git a/thumbnails/pkg/service/grpc/v0/decorators/tracing.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go similarity index 93% rename from thumbnails/pkg/service/grpc/v0/decorators/tracing.go rename to extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go index 634cc348b..53d219b88 100644 --- a/thumbnails/pkg/service/grpc/v0/decorators/tracing.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go @@ -5,8 +5,8 @@ import ( "go.opentelemetry.io/otel/trace" + thumbnailsTracing "github.com/owncloud/ocis/extensions/thumbnails/pkg/tracing" thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" - thumbnailsTracing "github.com/owncloud/ocis/thumbnails/pkg/tracing" "go.opentelemetry.io/otel/attribute" ) diff --git a/thumbnails/pkg/service/grpc/v0/option.go b/extensions/thumbnails/pkg/service/grpc/v0/option.go similarity index 89% rename from thumbnails/pkg/service/grpc/v0/option.go rename to extensions/thumbnails/pkg/service/grpc/v0/option.go index 06b8013b5..1d75bb98c 100644 --- a/thumbnails/pkg/service/grpc/v0/option.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/option.go @@ -1,13 +1,14 @@ package svc import ( - gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "net/http" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" + + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" "github.com/owncloud/ocis/ocis-pkg/log" - "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/grpc/v0/service.go b/extensions/thumbnails/pkg/service/grpc/v0/service.go similarity index 96% rename from thumbnails/pkg/service/grpc/v0/service.go rename to extensions/thumbnails/pkg/service/grpc/v0/service.go index ef1b16b87..b5f34f32f 100644 --- a/thumbnails/pkg/service/grpc/v0/service.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/service.go @@ -13,14 +13,14 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/golang-jwt/jwt/v4" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/preprocessor" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators" + tjwt "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/jwt" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource" "github.com/owncloud/ocis/ocis-pkg/log" thumbnailsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0" thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" - "github.com/owncloud/ocis/thumbnails/pkg/preprocessor" - "github.com/owncloud/ocis/thumbnails/pkg/service/grpc/v0/decorators" - tjwt "github.com/owncloud/ocis/thumbnails/pkg/service/jwt" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/imgsource" "github.com/pkg/errors" merrors "go-micro.dev/v4/errors" "google.golang.org/grpc/metadata" diff --git a/thumbnails/pkg/service/http/v0/instrument.go b/extensions/thumbnails/pkg/service/http/v0/instrument.go similarity index 90% rename from thumbnails/pkg/service/http/v0/instrument.go rename to extensions/thumbnails/pkg/service/http/v0/instrument.go index baab1c6fe..95454462b 100644 --- a/thumbnails/pkg/service/http/v0/instrument.go +++ b/extensions/thumbnails/pkg/service/http/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/thumbnails/pkg/service/http/v0/logging.go b/extensions/thumbnails/pkg/service/http/v0/logging.go similarity index 100% rename from thumbnails/pkg/service/http/v0/logging.go rename to extensions/thumbnails/pkg/service/http/v0/logging.go diff --git a/thumbnails/pkg/service/http/v0/option.go b/extensions/thumbnails/pkg/service/http/v0/option.go similarity index 90% rename from thumbnails/pkg/service/http/v0/option.go rename to extensions/thumbnails/pkg/service/http/v0/option.go index efcf65f35..b45429224 100644 --- a/thumbnails/pkg/service/http/v0/option.go +++ b/extensions/thumbnails/pkg/service/http/v0/option.go @@ -3,9 +3,9 @@ package svc import ( "net/http" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" ) // Option defines a single option function. diff --git a/thumbnails/pkg/service/http/v0/service.go b/extensions/thumbnails/pkg/service/http/v0/service.go similarity index 93% rename from thumbnails/pkg/service/http/v0/service.go rename to extensions/thumbnails/pkg/service/http/v0/service.go index 76df357a2..864dca0ae 100644 --- a/thumbnails/pkg/service/http/v0/service.go +++ b/extensions/thumbnails/pkg/service/http/v0/service.go @@ -9,10 +9,10 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang-jwt/jwt/v4" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + tjwt "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/jwt" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" - tjwt "github.com/owncloud/ocis/thumbnails/pkg/service/jwt" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail" ) type contextKey string diff --git a/thumbnails/pkg/service/http/v0/tracing.go b/extensions/thumbnails/pkg/service/http/v0/tracing.go similarity index 100% rename from thumbnails/pkg/service/http/v0/tracing.go rename to extensions/thumbnails/pkg/service/http/v0/tracing.go diff --git a/thumbnails/pkg/service/jwt/jwt.go b/extensions/thumbnails/pkg/service/jwt/jwt.go similarity index 100% rename from thumbnails/pkg/service/jwt/jwt.go rename to extensions/thumbnails/pkg/service/jwt/jwt.go diff --git a/thumbnails/pkg/thumbnail/encoding.go b/extensions/thumbnails/pkg/thumbnail/encoding.go similarity index 100% rename from thumbnails/pkg/thumbnail/encoding.go rename to extensions/thumbnails/pkg/thumbnail/encoding.go diff --git a/thumbnails/pkg/thumbnail/encoding_test.go b/extensions/thumbnails/pkg/thumbnail/encoding_test.go similarity index 100% rename from thumbnails/pkg/thumbnail/encoding_test.go rename to extensions/thumbnails/pkg/thumbnail/encoding_test.go diff --git a/thumbnails/pkg/thumbnail/generator.go b/extensions/thumbnails/pkg/thumbnail/generator.go similarity index 100% rename from thumbnails/pkg/thumbnail/generator.go rename to extensions/thumbnails/pkg/thumbnail/generator.go diff --git a/thumbnails/pkg/thumbnail/imgsource/cs3.go b/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go similarity index 97% rename from thumbnails/pkg/thumbnail/imgsource/cs3.go rename to extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go index d7343e72f..9b0cdfa25 100644 --- a/thumbnails/pkg/thumbnail/imgsource/cs3.go +++ b/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go @@ -13,7 +13,7 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rhttp" - "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/pkg/errors" "google.golang.org/grpc/metadata" ) diff --git a/thumbnails/pkg/thumbnail/imgsource/filesystem.go b/extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go similarity index 92% rename from thumbnails/pkg/thumbnail/imgsource/filesystem.go rename to extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go index 68f0ce35b..641d19ab2 100644 --- a/thumbnails/pkg/thumbnail/imgsource/filesystem.go +++ b/extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis/thumbnails/pkg/config" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/pkg/errors" ) diff --git a/thumbnails/pkg/thumbnail/imgsource/imgsource.go b/extensions/thumbnails/pkg/thumbnail/imgsource/imgsource.go similarity index 100% rename from thumbnails/pkg/thumbnail/imgsource/imgsource.go rename to extensions/thumbnails/pkg/thumbnail/imgsource/imgsource.go diff --git a/thumbnails/pkg/thumbnail/imgsource/webdav.go b/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go similarity index 96% rename from thumbnails/pkg/thumbnail/imgsource/webdav.go rename to extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go index ea95ea32a..db24ea9e5 100644 --- a/thumbnails/pkg/thumbnail/imgsource/webdav.go +++ b/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go @@ -4,13 +4,14 @@ import ( "context" "crypto/tls" "fmt" - "github.com/owncloud/ocis/thumbnails/pkg/config" - "github.com/pkg/errors" _ "image/gif" // Import the gif package so that image.Decode can understand gifs _ "image/jpeg" // Import the jpeg package so that image.Decode can understand jpegs _ "image/png" // Import the png package so that image.Decode can understand pngs "io" "net/http" + + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/pkg/errors" ) // NewWebDavSource creates a new webdav instance. diff --git a/thumbnails/pkg/thumbnail/resolutions.go b/extensions/thumbnails/pkg/thumbnail/resolutions.go similarity index 100% rename from thumbnails/pkg/thumbnail/resolutions.go rename to extensions/thumbnails/pkg/thumbnail/resolutions.go diff --git a/thumbnails/pkg/thumbnail/resolutions_test.go b/extensions/thumbnails/pkg/thumbnail/resolutions_test.go similarity index 100% rename from thumbnails/pkg/thumbnail/resolutions_test.go rename to extensions/thumbnails/pkg/thumbnail/resolutions_test.go diff --git a/thumbnails/pkg/thumbnail/storage/filesystem.go b/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go similarity index 97% rename from thumbnails/pkg/thumbnail/storage/filesystem.go rename to extensions/thumbnails/pkg/thumbnail/storage/filesystem.go index 980adedd3..102bbc876 100644 --- a/thumbnails/pkg/thumbnail/storage/filesystem.go +++ b/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strconv" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/pkg/errors" ) diff --git a/thumbnails/pkg/thumbnail/storage/inmemory.go b/extensions/thumbnails/pkg/thumbnail/storage/inmemory.go similarity index 100% rename from thumbnails/pkg/thumbnail/storage/inmemory.go rename to extensions/thumbnails/pkg/thumbnail/storage/inmemory.go diff --git a/thumbnails/pkg/thumbnail/storage/storage.go b/extensions/thumbnails/pkg/thumbnail/storage/storage.go similarity index 100% rename from thumbnails/pkg/thumbnail/storage/storage.go rename to extensions/thumbnails/pkg/thumbnail/storage/storage.go diff --git a/thumbnails/pkg/thumbnail/thumbnail.go b/extensions/thumbnails/pkg/thumbnail/thumbnail.go similarity index 97% rename from thumbnails/pkg/thumbnail/thumbnail.go rename to extensions/thumbnails/pkg/thumbnail/thumbnail.go index b4f2f7b80..587d623f3 100644 --- a/thumbnails/pkg/thumbnail/thumbnail.go +++ b/extensions/thumbnails/pkg/thumbnail/thumbnail.go @@ -6,8 +6,8 @@ import ( "image/gif" "mime" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" ) var ( diff --git a/thumbnails/pkg/thumbnail/thumbnail_test.go b/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go similarity index 91% rename from thumbnails/pkg/thumbnail/thumbnail_test.go rename to extensions/thumbnails/pkg/thumbnail/thumbnail_test.go index 76be41a66..97120ebf0 100644 --- a/thumbnails/pkg/thumbnail/thumbnail_test.go +++ b/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" + "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/thumbnails/pkg/thumbnail/storage" ) type NoOpManager struct { diff --git a/thumbnails/pkg/tracing/tracing.go b/extensions/thumbnails/pkg/tracing/tracing.go similarity index 89% rename from thumbnails/pkg/tracing/tracing.go rename to extensions/thumbnails/pkg/tracing/tracing.go index 16db3bb6f..11c8490ec 100644 --- a/thumbnails/pkg/tracing/tracing.go +++ b/extensions/thumbnails/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( + "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" - "github.com/owncloud/ocis/thumbnails/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/thumbnails/reflex.conf b/extensions/thumbnails/reflex.conf similarity index 100% rename from thumbnails/reflex.conf rename to extensions/thumbnails/reflex.conf diff --git a/thumbnails/testdata/oc.png b/extensions/thumbnails/testdata/oc.png similarity index 100% rename from thumbnails/testdata/oc.png rename to extensions/thumbnails/testdata/oc.png diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index f687f7bef..5ebcfd860 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -17,9 +17,9 @@ import ( settings "github.com/owncloud/ocis/extensions/settings/pkg/config" storage "github.com/owncloud/ocis/extensions/storage/pkg/config" store "github.com/owncloud/ocis/extensions/store/pkg/config" + thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" web "github.com/owncloud/ocis/extensions/web/pkg/config" webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config" - thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config" ) // TokenManager is the config for using the reva token manager diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 519f803e0..9e3a1648b 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -15,9 +15,9 @@ import ( settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults" store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" + thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults" web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults" webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults" - thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults" ) func DefaultConfig() *Config { diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go index f2c2284b9..8409c98dc 100644 --- a/ocis/pkg/command/thumbnails.go +++ b/ocis/pkg/command/thumbnails.go @@ -1,10 +1,10 @@ package command import ( + "github.com/owncloud/ocis/extensions/thumbnails/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/parser" "github.com/owncloud/ocis/ocis/pkg/register" - "github.com/owncloud/ocis/thumbnails/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index a88c98635..2e02e0f74 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -32,12 +32,12 @@ import ( settings "github.com/owncloud/ocis/extensions/settings/pkg/command" storage "github.com/owncloud/ocis/extensions/storage/pkg/command" store "github.com/owncloud/ocis/extensions/store/pkg/command" + thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/command" web "github.com/owncloud/ocis/extensions/web/pkg/command" webdav "github.com/owncloud/ocis/extensions/webdav/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command" "github.com/rs/zerolog" "github.com/thejerf/suture/v4" "go-micro.dev/v4/logger"