From 689ec4f266bb27e0f3f3abe9ace8fcb0af658234 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Tue, 12 Apr 2022 11:02:37 +0200 Subject: [PATCH] refactor ocs Signed-off-by: Christian Richter --- {ocs => extensions/ocs}/.dockerignore | 0 {ocs => extensions/ocs}/Makefile | 12 ++++++------ {ocs => extensions/ocs}/cmd/ocs/main.go | 4 ++-- .../ocs}/docker/Dockerfile.linux.amd64 | 0 .../ocs}/docker/Dockerfile.linux.arm | 0 .../ocs}/docker/Dockerfile.linux.arm64 | 0 {ocs => extensions/ocs}/docker/manifest.tmpl | 0 {ocs => extensions/ocs}/pkg/command/health.go | 6 +++--- {ocs => extensions/ocs}/pkg/command/root.go | 2 +- {ocs => extensions/ocs}/pkg/command/server.go | 14 +++++++------- {ocs => extensions/ocs}/pkg/command/version.go | 2 +- {ocs => extensions/ocs}/pkg/config/config.go | 0 {ocs => extensions/ocs}/pkg/config/debug.go | 0 .../ocs}/pkg/config/defaults/defaultconfig.go | 2 +- {ocs => extensions/ocs}/pkg/config/http.go | 0 {ocs => extensions/ocs}/pkg/config/log.go | 0 {ocs => extensions/ocs}/pkg/config/parser/parse.go | 4 ++-- {ocs => extensions/ocs}/pkg/config/reva.go | 0 {ocs => extensions/ocs}/pkg/config/service.go | 0 {ocs => extensions/ocs}/pkg/config/tracing.go | 0 {ocs => extensions/ocs}/pkg/logging/logging.go | 2 +- {ocs => extensions/ocs}/pkg/metrics/metrics.go | 0 {ocs => extensions/ocs}/pkg/middleware/format.go | 0 {ocs => extensions/ocs}/pkg/middleware/logtrace.go | 2 +- {ocs => extensions/ocs}/pkg/middleware/options.go | 0 .../ocs}/pkg/middleware/requireadmin.go | 4 ++-- .../ocs}/pkg/middleware/requireselforadmin.go | 4 ++-- .../ocs}/pkg/middleware/requireuser.go | 4 ++-- {ocs => extensions/ocs}/pkg/server/debug/option.go | 2 +- {ocs => extensions/ocs}/pkg/server/debug/server.go | 2 +- {ocs => extensions/ocs}/pkg/server/http/option.go | 4 ++-- {ocs => extensions/ocs}/pkg/server/http/server.go | 4 ++-- .../ocs}/pkg/server/http/svc_test.go | 8 ++++---- {ocs => extensions/ocs}/pkg/service/v0/config.go | 4 ++-- .../ocs}/pkg/service/v0/data/config.go | 0 .../ocs}/pkg/service/v0/data/group.go | 0 .../ocs}/pkg/service/v0/data/meta.go | 0 .../ocs}/pkg/service/v0/data/user.go | 0 {ocs => extensions/ocs}/pkg/service/v0/groups.go | 6 +++--- .../ocs}/pkg/service/v0/instrument.go | 2 +- {ocs => extensions/ocs}/pkg/service/v0/logging.go | 0 {ocs => extensions/ocs}/pkg/service/v0/option.go | 2 +- .../ocs}/pkg/service/v0/response/response.go | 2 +- .../ocs}/pkg/service/v0/response/version.go | 2 +- {ocs => extensions/ocs}/pkg/service/v0/service.go | 8 ++++---- {ocs => extensions/ocs}/pkg/service/v0/tracing.go | 0 {ocs => extensions/ocs}/pkg/service/v0/users.go | 6 +++--- {ocs => extensions/ocs}/pkg/tracing/tracing.go | 2 +- {ocs => extensions/ocs}/reflex.conf | 0 ocis-pkg/config/config.go | 2 +- ocis-pkg/config/defaultconfig.go | 2 +- ocis/pkg/command/ocs.go | 2 +- ocis/pkg/runtime/service/service.go | 2 +- ocs/config/.gitignore | 3 --- 54 files changed, 62 insertions(+), 65 deletions(-) rename {ocs => extensions/ocs}/.dockerignore (100%) rename {ocs => extensions/ocs}/Makefile (78%) rename {ocs => extensions/ocs}/cmd/ocs/main.go (52%) rename {ocs => extensions/ocs}/docker/Dockerfile.linux.amd64 (100%) rename {ocs => extensions/ocs}/docker/Dockerfile.linux.arm (100%) rename {ocs => extensions/ocs}/docker/Dockerfile.linux.arm64 (100%) rename {ocs => extensions/ocs}/docker/manifest.tmpl (100%) rename {ocs => extensions/ocs}/pkg/command/health.go (84%) rename {ocs => extensions/ocs}/pkg/command/root.go (96%) rename {ocs => extensions/ocs}/pkg/command/server.go (82%) rename {ocs => extensions/ocs}/pkg/command/version.go (96%) rename {ocs => extensions/ocs}/pkg/config/config.go (100%) rename {ocs => extensions/ocs}/pkg/config/debug.go (100%) rename {ocs => extensions/ocs}/pkg/config/defaults/defaultconfig.go (97%) rename {ocs => extensions/ocs}/pkg/config/http.go (100%) rename {ocs => extensions/ocs}/pkg/config/log.go (100%) rename {ocs => extensions/ocs}/pkg/config/parser/parse.go (85%) rename {ocs => extensions/ocs}/pkg/config/reva.go (100%) rename {ocs => extensions/ocs}/pkg/config/service.go (100%) rename {ocs => extensions/ocs}/pkg/config/tracing.go (100%) rename {ocs => extensions/ocs}/pkg/logging/logging.go (86%) rename {ocs => extensions/ocs}/pkg/metrics/metrics.go (100%) rename {ocs => extensions/ocs}/pkg/middleware/format.go (100%) rename {ocs => extensions/ocs}/pkg/middleware/logtrace.go (89%) rename {ocs => extensions/ocs}/pkg/middleware/options.go (100%) rename {ocs => extensions/ocs}/pkg/middleware/requireadmin.go (91%) rename {ocs => extensions/ocs}/pkg/middleware/requireselforadmin.go (95%) rename {ocs => extensions/ocs}/pkg/middleware/requireuser.go (88%) rename {ocs => extensions/ocs}/pkg/server/debug/option.go (94%) rename {ocs => extensions/ocs}/pkg/server/debug/server.go (97%) rename {ocs => extensions/ocs}/pkg/server/http/option.go (93%) rename {ocs => extensions/ocs}/pkg/server/http/server.go (92%) rename {ocs => extensions/ocs}/pkg/server/http/svc_test.go (99%) rename {ocs => extensions/ocs}/pkg/service/v0/config.go (76%) rename {ocs => extensions/ocs}/pkg/service/v0/data/config.go (100%) rename {ocs => extensions/ocs}/pkg/service/v0/data/group.go (100%) rename {ocs => extensions/ocs}/pkg/service/v0/data/meta.go (100%) rename {ocs => extensions/ocs}/pkg/service/v0/data/user.go (100%) rename {ocs => extensions/ocs}/pkg/service/v0/groups.go (98%) rename {ocs => extensions/ocs}/pkg/service/v0/instrument.go (91%) rename {ocs => extensions/ocs}/pkg/service/v0/logging.go (100%) rename {ocs => extensions/ocs}/pkg/service/v0/option.go (96%) rename {ocs => extensions/ocs}/pkg/service/v0/response/response.go (97%) rename {ocs => extensions/ocs}/pkg/service/v0/response/version.go (97%) rename {ocs => extensions/ocs}/pkg/service/v0/service.go (96%) rename {ocs => extensions/ocs}/pkg/service/v0/tracing.go (100%) rename {ocs => extensions/ocs}/pkg/service/v0/users.go (99%) rename {ocs => extensions/ocs}/pkg/tracing/tracing.go (90%) rename {ocs => extensions/ocs}/reflex.conf (100%) delete mode 100644 ocs/config/.gitignore diff --git a/ocs/.dockerignore b/extensions/ocs/.dockerignore similarity index 100% rename from ocs/.dockerignore rename to extensions/ocs/.dockerignore diff --git a/ocs/Makefile b/extensions/ocs/Makefile similarity index 78% rename from ocs/Makefile rename to extensions/ocs/Makefile index ba3cb5065..51243d83f 100644 --- a/ocs/Makefile +++ b/extensions/ocs/Makefile @@ -1,27 +1,27 @@ SHELL := bash NAME := ocs -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 ############ generate ############ -include ../.make/generate.mk +include ../../.make/generate.mk .PHONY: ci-go-generate ci-go-generate: # CI runs ci-node-generate automatically before this target diff --git a/ocs/cmd/ocs/main.go b/extensions/ocs/cmd/ocs/main.go similarity index 52% rename from ocs/cmd/ocs/main.go rename to extensions/ocs/cmd/ocs/main.go index 22f6a011e..2a4d9bfdb 100644 --- a/ocs/cmd/ocs/main.go +++ b/extensions/ocs/cmd/ocs/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/ocs/pkg/command" - "github.com/owncloud/ocis/ocs/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/ocs/pkg/command" + "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" ) func main() { diff --git a/ocs/docker/Dockerfile.linux.amd64 b/extensions/ocs/docker/Dockerfile.linux.amd64 similarity index 100% rename from ocs/docker/Dockerfile.linux.amd64 rename to extensions/ocs/docker/Dockerfile.linux.amd64 diff --git a/ocs/docker/Dockerfile.linux.arm b/extensions/ocs/docker/Dockerfile.linux.arm similarity index 100% rename from ocs/docker/Dockerfile.linux.arm rename to extensions/ocs/docker/Dockerfile.linux.arm diff --git a/ocs/docker/Dockerfile.linux.arm64 b/extensions/ocs/docker/Dockerfile.linux.arm64 similarity index 100% rename from ocs/docker/Dockerfile.linux.arm64 rename to extensions/ocs/docker/Dockerfile.linux.arm64 diff --git a/ocs/docker/manifest.tmpl b/extensions/ocs/docker/manifest.tmpl similarity index 100% rename from ocs/docker/manifest.tmpl rename to extensions/ocs/docker/manifest.tmpl diff --git a/ocs/pkg/command/health.go b/extensions/ocs/pkg/command/health.go similarity index 84% rename from ocs/pkg/command/health.go rename to extensions/ocs/pkg/command/health.go index b49d3b41a..515f38408 100644 --- a/ocs/pkg/command/health.go +++ b/extensions/ocs/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/ocs/pkg/config" - "github.com/owncloud/ocis/ocs/pkg/config/parser" - "github.com/owncloud/ocis/ocs/pkg/logging" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/config/parser" + "github.com/owncloud/ocis/extensions/ocs/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/ocs/pkg/command/root.go b/extensions/ocs/pkg/command/root.go similarity index 96% rename from ocs/pkg/command/root.go rename to extensions/ocs/pkg/command/root.go index cac620e67..61b65c748 100644 --- a/ocs/pkg/command/root.go +++ b/extensions/ocs/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" "github.com/owncloud/ocis/ocis-pkg/clihelper" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocs/pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/ocs/pkg/command/server.go b/extensions/ocs/pkg/command/server.go similarity index 82% rename from ocs/pkg/command/server.go rename to extensions/ocs/pkg/command/server.go index d8d0acfe4..0b88c9972 100644 --- a/ocs/pkg/command/server.go +++ b/extensions/ocs/pkg/command/server.go @@ -4,16 +4,16 @@ import ( "context" "fmt" + "github.com/owncloud/ocis/extensions/ocs/pkg/config/parser" + "github.com/owncloud/ocis/extensions/ocs/pkg/logging" + "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/ocs/pkg/config/parser" - "github.com/owncloud/ocis/ocs/pkg/logging" - "github.com/owncloud/ocis/ocs/pkg/tracing" "github.com/oklog/run" - "github.com/owncloud/ocis/ocs/pkg/config" - "github.com/owncloud/ocis/ocs/pkg/metrics" - "github.com/owncloud/ocis/ocs/pkg/server/debug" - "github.com/owncloud/ocis/ocs/pkg/server/http" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/metrics" + "github.com/owncloud/ocis/extensions/ocs/pkg/server/debug" + "github.com/owncloud/ocis/extensions/ocs/pkg/server/http" "github.com/urfave/cli/v2" ) diff --git a/ocs/pkg/command/version.go b/extensions/ocs/pkg/command/version.go similarity index 96% rename from ocs/pkg/command/version.go rename to extensions/ocs/pkg/command/version.go index e00e7b980..388a8989c 100644 --- a/ocs/pkg/command/version.go +++ b/extensions/ocs/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/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/ocs/pkg/config/config.go b/extensions/ocs/pkg/config/config.go similarity index 100% rename from ocs/pkg/config/config.go rename to extensions/ocs/pkg/config/config.go diff --git a/ocs/pkg/config/debug.go b/extensions/ocs/pkg/config/debug.go similarity index 100% rename from ocs/pkg/config/debug.go rename to extensions/ocs/pkg/config/debug.go diff --git a/ocs/pkg/config/defaults/defaultconfig.go b/extensions/ocs/pkg/config/defaults/defaultconfig.go similarity index 97% rename from ocs/pkg/config/defaults/defaultconfig.go rename to extensions/ocs/pkg/config/defaults/defaultconfig.go index 9c57e897f..90edea71e 100644 --- a/ocs/pkg/config/defaults/defaultconfig.go +++ b/extensions/ocs/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/ocs/pkg/config/http.go b/extensions/ocs/pkg/config/http.go similarity index 100% rename from ocs/pkg/config/http.go rename to extensions/ocs/pkg/config/http.go diff --git a/ocs/pkg/config/log.go b/extensions/ocs/pkg/config/log.go similarity index 100% rename from ocs/pkg/config/log.go rename to extensions/ocs/pkg/config/log.go diff --git a/ocs/pkg/config/parser/parse.go b/extensions/ocs/pkg/config/parser/parse.go similarity index 85% rename from ocs/pkg/config/parser/parse.go rename to extensions/ocs/pkg/config/parser/parse.go index f5cbc34cb..b9c312ca3 100644 --- a/ocs/pkg/config/parser/parse.go +++ b/extensions/ocs/pkg/config/parser/parse.go @@ -3,9 +3,9 @@ package parser import ( "errors" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocs/pkg/config" - "github.com/owncloud/ocis/ocs/pkg/config/defaults" "github.com/owncloud/ocis/ocis-pkg/config/envdecode" ) diff --git a/ocs/pkg/config/reva.go b/extensions/ocs/pkg/config/reva.go similarity index 100% rename from ocs/pkg/config/reva.go rename to extensions/ocs/pkg/config/reva.go diff --git a/ocs/pkg/config/service.go b/extensions/ocs/pkg/config/service.go similarity index 100% rename from ocs/pkg/config/service.go rename to extensions/ocs/pkg/config/service.go diff --git a/ocs/pkg/config/tracing.go b/extensions/ocs/pkg/config/tracing.go similarity index 100% rename from ocs/pkg/config/tracing.go rename to extensions/ocs/pkg/config/tracing.go diff --git a/ocs/pkg/logging/logging.go b/extensions/ocs/pkg/logging/logging.go similarity index 86% rename from ocs/pkg/logging/logging.go rename to extensions/ocs/pkg/logging/logging.go index 80350b0d0..abd3615c9 100644 --- a/ocs/pkg/logging/logging.go +++ b/extensions/ocs/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( + "github.com/owncloud/ocis/extensions/ocs/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocs/pkg/config" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/ocs/pkg/metrics/metrics.go b/extensions/ocs/pkg/metrics/metrics.go similarity index 100% rename from ocs/pkg/metrics/metrics.go rename to extensions/ocs/pkg/metrics/metrics.go diff --git a/ocs/pkg/middleware/format.go b/extensions/ocs/pkg/middleware/format.go similarity index 100% rename from ocs/pkg/middleware/format.go rename to extensions/ocs/pkg/middleware/format.go diff --git a/ocs/pkg/middleware/logtrace.go b/extensions/ocs/pkg/middleware/logtrace.go similarity index 89% rename from ocs/pkg/middleware/logtrace.go rename to extensions/ocs/pkg/middleware/logtrace.go index d35bd2930..2786ba5f3 100644 --- a/ocs/pkg/middleware/logtrace.go +++ b/extensions/ocs/pkg/middleware/logtrace.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - ocstracing "github.com/owncloud/ocis/ocs/pkg/tracing" + ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" "go.opentelemetry.io/otel/propagation" ) diff --git a/ocs/pkg/middleware/options.go b/extensions/ocs/pkg/middleware/options.go similarity index 100% rename from ocs/pkg/middleware/options.go rename to extensions/ocs/pkg/middleware/options.go diff --git a/ocs/pkg/middleware/requireadmin.go b/extensions/ocs/pkg/middleware/requireadmin.go similarity index 91% rename from ocs/pkg/middleware/requireadmin.go rename to extensions/ocs/pkg/middleware/requireadmin.go index 3ee381a06..b46b6c0ba 100644 --- a/ocs/pkg/middleware/requireadmin.go +++ b/extensions/ocs/pkg/middleware/requireadmin.go @@ -5,9 +5,9 @@ import ( "github.com/go-chi/render" accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" "github.com/owncloud/ocis/ocis-pkg/roles" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" ) // RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions diff --git a/ocs/pkg/middleware/requireselforadmin.go b/extensions/ocs/pkg/middleware/requireselforadmin.go similarity index 95% rename from ocs/pkg/middleware/requireselforadmin.go rename to extensions/ocs/pkg/middleware/requireselforadmin.go index fba196171..00bb9d03a 100644 --- a/ocs/pkg/middleware/requireselforadmin.go +++ b/extensions/ocs/pkg/middleware/requireselforadmin.go @@ -8,9 +8,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" "github.com/owncloud/ocis/ocis-pkg/roles" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" settingsService "github.com/owncloud/ocis/settings/pkg/service/v0" ) diff --git a/ocs/pkg/middleware/requireuser.go b/extensions/ocs/pkg/middleware/requireuser.go similarity index 88% rename from ocs/pkg/middleware/requireuser.go rename to extensions/ocs/pkg/middleware/requireuser.go index ed8d5e4a2..ce9633dcd 100644 --- a/ocs/pkg/middleware/requireuser.go +++ b/extensions/ocs/pkg/middleware/requireuser.go @@ -5,8 +5,8 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/render" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" ) // RequireUser middleware is used to require a user in context diff --git a/ocs/pkg/server/debug/option.go b/extensions/ocs/pkg/server/debug/option.go similarity index 94% rename from ocs/pkg/server/debug/option.go rename to extensions/ocs/pkg/server/debug/option.go index 683f63d90..2d068fb26 100644 --- a/ocs/pkg/server/debug/option.go +++ b/extensions/ocs/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/owncloud/ocis/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/ocs/pkg/server/debug/server.go b/extensions/ocs/pkg/server/debug/server.go similarity index 97% rename from ocs/pkg/server/debug/server.go rename to extensions/ocs/pkg/server/debug/server.go index 7a7b69d80..445d61b9f 100644 --- a/ocs/pkg/server/debug/server.go +++ b/extensions/ocs/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/ocs/pkg/config" ) // Server initializes the debug service and server. diff --git a/ocs/pkg/server/http/option.go b/extensions/ocs/pkg/server/http/option.go similarity index 93% rename from ocs/pkg/server/http/option.go rename to extensions/ocs/pkg/server/http/option.go index 3486588e3..c1185e1d1 100644 --- a/ocs/pkg/server/http/option.go +++ b/extensions/ocs/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/extensions/ocs/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocs/pkg/config" - "github.com/owncloud/ocis/ocs/pkg/metrics" "github.com/urfave/cli/v2" ) diff --git a/ocs/pkg/server/http/server.go b/extensions/ocs/pkg/server/http/server.go similarity index 92% rename from ocs/pkg/server/http/server.go rename to extensions/ocs/pkg/server/http/server.go index 06d380184..0541b3d8c 100644 --- a/ocs/pkg/server/http/server.go +++ b/extensions/ocs/pkg/server/http/server.go @@ -2,12 +2,12 @@ package http import ( chimiddleware "github.com/go-chi/chi/v5/middleware" + ocsmw "github.com/owncloud/ocis/extensions/ocs/pkg/middleware" + svc "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0" "github.com/owncloud/ocis/ocis-pkg/cors" "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/service/http" "github.com/owncloud/ocis/ocis-pkg/version" - ocsmw "github.com/owncloud/ocis/ocs/pkg/middleware" - svc "github.com/owncloud/ocis/ocs/pkg/service/v0" "go-micro.dev/v4" ) diff --git a/ocs/pkg/server/http/svc_test.go b/extensions/ocs/pkg/server/http/svc_test.go similarity index 99% rename from ocs/pkg/server/http/svc_test.go rename to extensions/ocs/pkg/server/http/svc_test.go index fce2b1151..b23e6b29c 100644 --- a/ocs/pkg/server/http/svc_test.go +++ b/extensions/ocs/pkg/server/http/svc_test.go @@ -23,10 +23,10 @@ import ( accountsCfg "github.com/owncloud/ocis/extensions/accounts/pkg/config" accountsLogging "github.com/owncloud/ocis/extensions/accounts/pkg/logging" accountsServiceExt "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" + svc "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0" ocisLog "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocs/pkg/config" - svc "github.com/owncloud/ocis/ocs/pkg/service/v0" accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" @@ -1502,7 +1502,7 @@ func TestGetSingleUser(t *testing.T) { } // This is a bug demonstration test for endpoint '/cloud/user' -// Link to the issue: https://github.com/owncloud/ocis/ocs/issues/53 +// Link to the issue: https://github.com/owncloud/ocis/issues/53 func TestGetUserSigningKey(t *testing.T) { user := User{ Enabled: "true", @@ -1829,7 +1829,7 @@ func TestAddUsersToGroupInvalidGroup(t *testing.T) { cleanUp(t) } -// Issue: https://github.com/owncloud/ocis/ocs/issues/57 - cannot remove user from group +// Issue: https://github.com/owncloud/ocis/issues/57 - cannot remove user from group func TestRemoveUserFromGroup(t *testing.T) { user := User{ Enabled: "true", diff --git a/ocs/pkg/service/v0/config.go b/extensions/ocs/pkg/service/v0/config.go similarity index 76% rename from ocs/pkg/service/v0/config.go rename to extensions/ocs/pkg/service/v0/config.go index e41297e77..6e77c3086 100644 --- a/ocs/pkg/service/v0/config.go +++ b/extensions/ocs/pkg/service/v0/config.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" ) // GetConfig renders the ocs config endpoint diff --git a/ocs/pkg/service/v0/data/config.go b/extensions/ocs/pkg/service/v0/data/config.go similarity index 100% rename from ocs/pkg/service/v0/data/config.go rename to extensions/ocs/pkg/service/v0/data/config.go diff --git a/ocs/pkg/service/v0/data/group.go b/extensions/ocs/pkg/service/v0/data/group.go similarity index 100% rename from ocs/pkg/service/v0/data/group.go rename to extensions/ocs/pkg/service/v0/data/group.go diff --git a/ocs/pkg/service/v0/data/meta.go b/extensions/ocs/pkg/service/v0/data/meta.go similarity index 100% rename from ocs/pkg/service/v0/data/meta.go rename to extensions/ocs/pkg/service/v0/data/meta.go diff --git a/ocs/pkg/service/v0/data/user.go b/extensions/ocs/pkg/service/v0/data/user.go similarity index 100% rename from ocs/pkg/service/v0/data/user.go rename to extensions/ocs/pkg/service/v0/data/user.go diff --git a/ocs/pkg/service/v0/groups.go b/extensions/ocs/pkg/service/v0/groups.go similarity index 98% rename from ocs/pkg/service/v0/groups.go rename to extensions/ocs/pkg/service/v0/groups.go index 7a0162415..9dae5899b 100644 --- a/ocs/pkg/service/v0/groups.go +++ b/extensions/ocs/pkg/service/v0/groups.go @@ -14,9 +14,9 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/chi/v5" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" - ocstracing "github.com/owncloud/ocis/ocs/pkg/tracing" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" + ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" merrors "go-micro.dev/v4/errors" "go.opentelemetry.io/otel/attribute" ) diff --git a/ocs/pkg/service/v0/instrument.go b/extensions/ocs/pkg/service/v0/instrument.go similarity index 91% rename from ocs/pkg/service/v0/instrument.go rename to extensions/ocs/pkg/service/v0/instrument.go index 7e5fb0be1..6940ad28d 100644 --- a/ocs/pkg/service/v0/instrument.go +++ b/extensions/ocs/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocs/pkg/metrics" + "github.com/owncloud/ocis/extensions/ocs/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/ocs/pkg/service/v0/logging.go b/extensions/ocs/pkg/service/v0/logging.go similarity index 100% rename from ocs/pkg/service/v0/logging.go rename to extensions/ocs/pkg/service/v0/logging.go diff --git a/ocs/pkg/service/v0/option.go b/extensions/ocs/pkg/service/v0/option.go similarity index 96% rename from ocs/pkg/service/v0/option.go rename to extensions/ocs/pkg/service/v0/option.go index 4b142ca54..da9e7f6b3 100644 --- a/ocs/pkg/service/v0/option.go +++ b/extensions/ocs/pkg/service/v0/option.go @@ -3,9 +3,9 @@ package svc import ( "net/http" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/roles" - "github.com/owncloud/ocis/ocs/pkg/config" settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" ) diff --git a/ocs/pkg/service/v0/response/response.go b/extensions/ocs/pkg/service/v0/response/response.go similarity index 97% rename from ocs/pkg/service/v0/response/response.go rename to extensions/ocs/pkg/service/v0/response/response.go index 40fecaa38..e1b92f095 100644 --- a/ocs/pkg/service/v0/response/response.go +++ b/extensions/ocs/pkg/service/v0/response/response.go @@ -6,7 +6,7 @@ import ( "reflect" "github.com/go-chi/render" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" ) // Response is the top level response structure diff --git a/ocs/pkg/service/v0/response/version.go b/extensions/ocs/pkg/service/v0/response/version.go similarity index 97% rename from ocs/pkg/service/v0/response/version.go rename to extensions/ocs/pkg/service/v0/response/version.go index c23fddfcd..ddf9e89b4 100644 --- a/ocs/pkg/service/v0/response/version.go +++ b/extensions/ocs/pkg/service/v0/response/version.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" ) type key int diff --git a/ocs/pkg/service/v0/service.go b/extensions/ocs/pkg/service/v0/service.go similarity index 96% rename from ocs/pkg/service/v0/service.go rename to extensions/ocs/pkg/service/v0/service.go index 913aedb5b..be7be13c4 100644 --- a/ocs/pkg/service/v0/service.go +++ b/extensions/ocs/pkg/service/v0/service.go @@ -13,14 +13,14 @@ import ( accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + "github.com/owncloud/ocis/extensions/ocs/pkg/config" + ocsm "github.com/owncloud/ocis/extensions/ocs/pkg/middleware" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" "github.com/owncloud/ocis/ocis-pkg/account" "github.com/owncloud/ocis/ocis-pkg/log" opkgm "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/roles" - "github.com/owncloud/ocis/ocs/pkg/config" - ocsm "github.com/owncloud/ocis/ocs/pkg/middleware" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/proxy/pkg/user/backend" ) diff --git a/ocs/pkg/service/v0/tracing.go b/extensions/ocs/pkg/service/v0/tracing.go similarity index 100% rename from ocs/pkg/service/v0/tracing.go rename to extensions/ocs/pkg/service/v0/tracing.go diff --git a/ocs/pkg/service/v0/users.go b/extensions/ocs/pkg/service/v0/users.go similarity index 99% rename from ocs/pkg/service/v0/users.go rename to extensions/ocs/pkg/service/v0/users.go index 2e4bb68c0..e3a90de2c 100644 --- a/ocs/pkg/service/v0/users.go +++ b/extensions/ocs/pkg/service/v0/users.go @@ -27,9 +27,9 @@ import ( "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/owncloud/ocis/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/ocs/pkg/service/v0/response" - ocstracing "github.com/owncloud/ocis/ocs/pkg/tracing" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" + ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" "github.com/pkg/errors" merrors "go-micro.dev/v4/errors" "google.golang.org/genproto/protobuf/field_mask" diff --git a/ocs/pkg/tracing/tracing.go b/extensions/ocs/pkg/tracing/tracing.go similarity index 90% rename from ocs/pkg/tracing/tracing.go rename to extensions/ocs/pkg/tracing/tracing.go index bd4873036..962bd613b 100644 --- a/ocs/pkg/tracing/tracing.go +++ b/extensions/ocs/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( + "github.com/owncloud/ocis/extensions/ocs/pkg/config" pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" - "github.com/owncloud/ocis/ocs/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/ocs/reflex.conf b/extensions/ocs/reflex.conf similarity index 100% rename from ocs/reflex.conf rename to extensions/ocs/reflex.conf diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 56aee4ab7..67777076b 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -12,7 +12,7 @@ import ( idp "github.com/owncloud/ocis/extensions/idp/pkg/config" nats "github.com/owncloud/ocis/extensions/nats/pkg/config" notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config" - ocs "github.com/owncloud/ocis/ocs/pkg/config" + ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config" proxy "github.com/owncloud/ocis/proxy/pkg/config" settings "github.com/owncloud/ocis/settings/pkg/config" storage "github.com/owncloud/ocis/storage/pkg/config" diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 4ceba483d..1d14ad07c 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -10,7 +10,7 @@ import ( idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults" nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults" notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults" - ocs "github.com/owncloud/ocis/ocs/pkg/config/defaults" + ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" proxy "github.com/owncloud/ocis/proxy/pkg/config/defaults" settings "github.com/owncloud/ocis/settings/pkg/config/defaults" storage "github.com/owncloud/ocis/storage/pkg/config/defaults" diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go index 2570f2a38..2fae3beb9 100644 --- a/ocis/pkg/command/ocs.go +++ b/ocis/pkg/command/ocs.go @@ -1,10 +1,10 @@ package command import ( + "github.com/owncloud/ocis/extensions/ocs/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/ocs/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index b9a1994a0..97d5617d7 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -27,10 +27,10 @@ import ( idp "github.com/owncloud/ocis/extensions/idp/pkg/command" nats "github.com/owncloud/ocis/extensions/nats/pkg/command" notifications "github.com/owncloud/ocis/extensions/notifications/pkg/command" + ocs "github.com/owncloud/ocis/extensions/ocs/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - ocs "github.com/owncloud/ocis/ocs/pkg/command" proxy "github.com/owncloud/ocis/proxy/pkg/command" settings "github.com/owncloud/ocis/settings/pkg/command" storage "github.com/owncloud/ocis/storage/pkg/command" diff --git a/ocs/config/.gitignore b/ocs/config/.gitignore deleted file mode 100644 index 90b39ab06..000000000 --- a/ocs/config/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!example.json -!example.yml