From 92d76e00abef045f091f21686477575f3478aebc Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Tue, 12 Apr 2022 11:07:28 +0200 Subject: [PATCH] refactor proxy Signed-off-by: Christian Richter --- extensions/ocs/pkg/service/v0/service.go | 2 +- {proxy => extensions/proxy}/.dockerignore | 0 {proxy => extensions/proxy}/Makefile | 12 +++++----- {proxy => extensions/proxy}/cmd/proxy/main.go | 4 ++-- .../proxy}/docker/Dockerfile.linux.amd64 | 0 .../proxy}/docker/Dockerfile.linux.arm | 0 .../proxy}/docker/Dockerfile.linux.arm64 | 0 .../proxy}/docker/manifest.tmpl | 0 .../proxy}/pkg/command/health.go | 6 ++--- .../proxy}/pkg/command/root.go | 2 +- .../proxy}/pkg/command/server.go | 22 +++++++++---------- .../proxy}/pkg/command/version.go | 2 +- .../proxy}/pkg/config/config.go | 0 .../proxy}/pkg/config/debug.go | 0 .../pkg/config/defaults/defaultconfig.go | 2 +- .../proxy}/pkg/config/http.go | 0 {proxy => extensions/proxy}/pkg/config/log.go | 0 .../proxy}/pkg/config/parser/parse.go | 4 ++-- .../proxy}/pkg/config/reva.go | 0 .../proxy}/pkg/config/service.go | 0 .../proxy}/pkg/config/tracing.go | 0 {proxy => extensions/proxy}/pkg/cs3/client.go | 2 +- .../proxy}/pkg/logging/logging.go | 2 +- .../proxy}/pkg/metrics/metrics.go | 0 .../proxy}/pkg/middleware/accesslog.go | 0 .../proxy}/pkg/middleware/account_resolver.go | 2 +- .../pkg/middleware/account_resolver_test.go | 6 ++--- .../proxy}/pkg/middleware/authentication.go | 0 .../proxy}/pkg/middleware/basic_auth.go | 4 ++-- .../proxy}/pkg/middleware/basic_auth_test.go | 0 .../proxy}/pkg/middleware/create_home.go | 0 .../proxy}/pkg/middleware/https_redirect.go | 0 .../proxy}/pkg/middleware/oidc_auth.go | 2 +- .../proxy}/pkg/middleware/oidc_auth_test.go | 0 .../proxy}/pkg/middleware/options.go | 4 ++-- .../pkg/middleware/public_share_auth.go | 0 .../proxy}/pkg/middleware/selector_cookie.go | 4 ++-- .../proxy}/pkg/middleware/signed_url_auth.go | 4 ++-- .../pkg/middleware/signed_url_auth_test.go | 0 .../proxy}/pkg/proxy/option.go | 2 +- .../proxy}/pkg/proxy/policy/selector.go | 2 +- .../proxy}/pkg/proxy/policy/selector_test.go | 2 +- .../proxy}/pkg/proxy/proxy.go | 6 ++--- .../pkg/proxy/proxy_integration_test.go | 2 +- .../proxy}/pkg/proxy/proxy_test.go | 2 +- .../proxy}/pkg/server/debug/option.go | 2 +- .../proxy}/pkg/server/debug/server.go | 2 +- .../proxy}/pkg/server/http/option.go | 4 ++-- .../proxy}/pkg/server/http/server.go | 0 .../proxy}/pkg/tracing/tracing.go | 2 +- .../proxy}/pkg/user/backend/accounts.go | 0 .../proxy}/pkg/user/backend/accounts_test.go | 0 .../proxy}/pkg/user/backend/backend.go | 0 .../proxy}/pkg/user/backend/cs3.go | 0 .../pkg/user/backend/test/backend_mock.go | 2 +- .../proxy}/pkg/webdav/response.go | 0 .../proxy}/pkg/webdav/webdav.go | 0 ocis-pkg/config/config.go | 2 +- ocis-pkg/config/defaultconfig.go | 2 +- ocis/pkg/command/proxy.go | 2 +- ocis/pkg/runtime/service/service.go | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) rename {proxy => extensions/proxy}/.dockerignore (100%) rename {proxy => extensions/proxy}/Makefile (78%) rename {proxy => extensions/proxy}/cmd/proxy/main.go (51%) rename {proxy => extensions/proxy}/docker/Dockerfile.linux.amd64 (100%) rename {proxy => extensions/proxy}/docker/Dockerfile.linux.arm (100%) rename {proxy => extensions/proxy}/docker/Dockerfile.linux.arm64 (100%) rename {proxy => extensions/proxy}/docker/manifest.tmpl (100%) rename {proxy => extensions/proxy}/pkg/command/health.go (84%) rename {proxy => extensions/proxy}/pkg/command/root.go (95%) rename {proxy => extensions/proxy}/pkg/command/server.go (90%) rename {proxy => extensions/proxy}/pkg/command/version.go (95%) rename {proxy => extensions/proxy}/pkg/config/config.go (100%) rename {proxy => extensions/proxy}/pkg/config/debug.go (100%) rename {proxy => extensions/proxy}/pkg/config/defaults/defaultconfig.go (98%) rename {proxy => extensions/proxy}/pkg/config/http.go (100%) rename {proxy => extensions/proxy}/pkg/config/log.go (100%) rename {proxy => extensions/proxy}/pkg/config/parser/parse.go (85%) rename {proxy => extensions/proxy}/pkg/config/reva.go (100%) rename {proxy => extensions/proxy}/pkg/config/service.go (100%) rename {proxy => extensions/proxy}/pkg/config/tracing.go (100%) rename {proxy => extensions/proxy}/pkg/cs3/client.go (92%) rename {proxy => extensions/proxy}/pkg/logging/logging.go (85%) rename {proxy => extensions/proxy}/pkg/metrics/metrics.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/accesslog.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/account_resolver.go (98%) rename {proxy => extensions/proxy}/pkg/middleware/account_resolver_test.go (95%) rename {proxy => extensions/proxy}/pkg/middleware/authentication.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/basic_auth.go (97%) rename {proxy => extensions/proxy}/pkg/middleware/basic_auth_test.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/create_home.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/https_redirect.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/oidc_auth.go (98%) rename {proxy => extensions/proxy}/pkg/middleware/oidc_auth_test.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/options.go (98%) rename {proxy => extensions/proxy}/pkg/middleware/public_share_auth.go (100%) rename {proxy => extensions/proxy}/pkg/middleware/selector_cookie.go (92%) rename {proxy => extensions/proxy}/pkg/middleware/signed_url_auth.go (98%) rename {proxy => extensions/proxy}/pkg/middleware/signed_url_auth_test.go (100%) rename {proxy => extensions/proxy}/pkg/proxy/option.go (92%) rename {proxy => extensions/proxy}/pkg/proxy/policy/selector.go (99%) rename {proxy => extensions/proxy}/pkg/proxy/policy/selector_test.go (99%) rename {proxy => extensions/proxy}/pkg/proxy/proxy.go (97%) rename {proxy => extensions/proxy}/pkg/proxy/proxy_integration_test.go (99%) rename {proxy => extensions/proxy}/pkg/proxy/proxy_test.go (97%) rename {proxy => extensions/proxy}/pkg/server/debug/option.go (94%) rename {proxy => extensions/proxy}/pkg/server/debug/server.go (97%) rename {proxy => extensions/proxy}/pkg/server/http/option.go (93%) rename {proxy => extensions/proxy}/pkg/server/http/server.go (100%) rename {proxy => extensions/proxy}/pkg/tracing/tracing.go (90%) rename {proxy => extensions/proxy}/pkg/user/backend/accounts.go (100%) rename {proxy => extensions/proxy}/pkg/user/backend/accounts_test.go (100%) rename {proxy => extensions/proxy}/pkg/user/backend/backend.go (100%) rename {proxy => extensions/proxy}/pkg/user/backend/cs3.go (100%) rename {proxy => extensions/proxy}/pkg/user/backend/test/backend_mock.go (99%) rename {proxy => extensions/proxy}/pkg/webdav/response.go (100%) rename {proxy => extensions/proxy}/pkg/webdav/webdav.go (100%) diff --git a/extensions/ocs/pkg/service/v0/service.go b/extensions/ocs/pkg/service/v0/service.go index be7be13c48..7415d36a27 100644 --- a/extensions/ocs/pkg/service/v0/service.go +++ b/extensions/ocs/pkg/service/v0/service.go @@ -17,12 +17,12 @@ import ( 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/extensions/proxy/pkg/user/backend" "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" settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/proxy/pkg/user/backend" ) // Service defines the extension handlers. diff --git a/proxy/.dockerignore b/extensions/proxy/.dockerignore similarity index 100% rename from proxy/.dockerignore rename to extensions/proxy/.dockerignore diff --git a/proxy/Makefile b/extensions/proxy/Makefile similarity index 78% rename from proxy/Makefile rename to extensions/proxy/Makefile index e700f73359..c53d0e35da 100644 --- a/proxy/Makefile +++ b/extensions/proxy/Makefile @@ -1,27 +1,27 @@ SHELL := bash NAME := proxy -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/proxy/cmd/proxy/main.go b/extensions/proxy/cmd/proxy/main.go similarity index 51% rename from proxy/cmd/proxy/main.go rename to extensions/proxy/cmd/proxy/main.go index 144059b229..059facda44 100644 --- a/proxy/cmd/proxy/main.go +++ b/extensions/proxy/cmd/proxy/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/proxy/pkg/command" - "github.com/owncloud/ocis/proxy/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/proxy/pkg/command" + "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" ) func main() { diff --git a/proxy/docker/Dockerfile.linux.amd64 b/extensions/proxy/docker/Dockerfile.linux.amd64 similarity index 100% rename from proxy/docker/Dockerfile.linux.amd64 rename to extensions/proxy/docker/Dockerfile.linux.amd64 diff --git a/proxy/docker/Dockerfile.linux.arm b/extensions/proxy/docker/Dockerfile.linux.arm similarity index 100% rename from proxy/docker/Dockerfile.linux.arm rename to extensions/proxy/docker/Dockerfile.linux.arm diff --git a/proxy/docker/Dockerfile.linux.arm64 b/extensions/proxy/docker/Dockerfile.linux.arm64 similarity index 100% rename from proxy/docker/Dockerfile.linux.arm64 rename to extensions/proxy/docker/Dockerfile.linux.arm64 diff --git a/proxy/docker/manifest.tmpl b/extensions/proxy/docker/manifest.tmpl similarity index 100% rename from proxy/docker/manifest.tmpl rename to extensions/proxy/docker/manifest.tmpl diff --git a/proxy/pkg/command/health.go b/extensions/proxy/pkg/command/health.go similarity index 84% rename from proxy/pkg/command/health.go rename to extensions/proxy/pkg/command/health.go index ff004eae4b..e3014e5870 100644 --- a/proxy/pkg/command/health.go +++ b/extensions/proxy/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/config/parser" - "github.com/owncloud/ocis/proxy/pkg/logging" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/config/parser" + "github.com/owncloud/ocis/extensions/proxy/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/proxy/pkg/command/root.go b/extensions/proxy/pkg/command/root.go similarity index 95% rename from proxy/pkg/command/root.go rename to extensions/proxy/pkg/command/root.go index cfc2afa629..bcd4fcaec0 100644 --- a/proxy/pkg/command/root.go +++ b/extensions/proxy/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/clihelper" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/proxy/pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/proxy/pkg/command/server.go b/extensions/proxy/pkg/command/server.go similarity index 90% rename from proxy/pkg/command/server.go rename to extensions/proxy/pkg/command/server.go index 8d6f7ce9c7..8332246399 100644 --- a/proxy/pkg/command/server.go +++ b/extensions/proxy/pkg/command/server.go @@ -16,22 +16,22 @@ import ( chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" "github.com/oklog/run" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/config/parser" + "github.com/owncloud/ocis/extensions/proxy/pkg/cs3" + "github.com/owncloud/ocis/extensions/proxy/pkg/logging" + "github.com/owncloud/ocis/extensions/proxy/pkg/metrics" + "github.com/owncloud/ocis/extensions/proxy/pkg/middleware" + "github.com/owncloud/ocis/extensions/proxy/pkg/proxy" + "github.com/owncloud/ocis/extensions/proxy/pkg/server/debug" + proxyHTTP "github.com/owncloud/ocis/extensions/proxy/pkg/server/http" + "github.com/owncloud/ocis/extensions/proxy/pkg/tracing" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" "github.com/owncloud/ocis/ocis-pkg/log" pkgmiddleware "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/owncloud/ocis/ocis-pkg/version" settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/config/parser" - "github.com/owncloud/ocis/proxy/pkg/cs3" - "github.com/owncloud/ocis/proxy/pkg/logging" - "github.com/owncloud/ocis/proxy/pkg/metrics" - "github.com/owncloud/ocis/proxy/pkg/middleware" - "github.com/owncloud/ocis/proxy/pkg/proxy" - "github.com/owncloud/ocis/proxy/pkg/server/debug" - proxyHTTP "github.com/owncloud/ocis/proxy/pkg/server/http" - "github.com/owncloud/ocis/proxy/pkg/tracing" - "github.com/owncloud/ocis/proxy/pkg/user/backend" "github.com/urfave/cli/v2" "golang.org/x/oauth2" ) diff --git a/proxy/pkg/command/version.go b/extensions/proxy/pkg/command/version.go similarity index 95% rename from proxy/pkg/command/version.go rename to extensions/proxy/pkg/command/version.go index e8b907dcad..2faf3b394e 100644 --- a/proxy/pkg/command/version.go +++ b/extensions/proxy/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/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/proxy/pkg/config/config.go b/extensions/proxy/pkg/config/config.go similarity index 100% rename from proxy/pkg/config/config.go rename to extensions/proxy/pkg/config/config.go diff --git a/proxy/pkg/config/debug.go b/extensions/proxy/pkg/config/debug.go similarity index 100% rename from proxy/pkg/config/debug.go rename to extensions/proxy/pkg/config/debug.go diff --git a/proxy/pkg/config/defaults/defaultconfig.go b/extensions/proxy/pkg/config/defaults/defaultconfig.go similarity index 98% rename from proxy/pkg/config/defaults/defaultconfig.go rename to extensions/proxy/pkg/config/defaults/defaultconfig.go index e2689a9f5b..91904ac464 100644 --- a/proxy/pkg/config/defaults/defaultconfig.go +++ b/extensions/proxy/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "path" "strings" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/proxy/pkg/config" ) func DefaultConfig() *config.Config { diff --git a/proxy/pkg/config/http.go b/extensions/proxy/pkg/config/http.go similarity index 100% rename from proxy/pkg/config/http.go rename to extensions/proxy/pkg/config/http.go diff --git a/proxy/pkg/config/log.go b/extensions/proxy/pkg/config/log.go similarity index 100% rename from proxy/pkg/config/log.go rename to extensions/proxy/pkg/config/log.go diff --git a/proxy/pkg/config/parser/parse.go b/extensions/proxy/pkg/config/parser/parse.go similarity index 85% rename from proxy/pkg/config/parser/parse.go rename to extensions/proxy/pkg/config/parser/parse.go index ef6d2cec4d..2f29670f65 100644 --- a/proxy/pkg/config/parser/parse.go +++ b/extensions/proxy/pkg/config/parser/parse.go @@ -3,9 +3,9 @@ package parser import ( "errors" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/config/defaults" "github.com/owncloud/ocis/ocis-pkg/config/envdecode" ) diff --git a/proxy/pkg/config/reva.go b/extensions/proxy/pkg/config/reva.go similarity index 100% rename from proxy/pkg/config/reva.go rename to extensions/proxy/pkg/config/reva.go diff --git a/proxy/pkg/config/service.go b/extensions/proxy/pkg/config/service.go similarity index 100% rename from proxy/pkg/config/service.go rename to extensions/proxy/pkg/config/service.go diff --git a/proxy/pkg/config/tracing.go b/extensions/proxy/pkg/config/tracing.go similarity index 100% rename from proxy/pkg/config/tracing.go rename to extensions/proxy/pkg/config/tracing.go diff --git a/proxy/pkg/cs3/client.go b/extensions/proxy/pkg/cs3/client.go similarity index 92% rename from proxy/pkg/cs3/client.go rename to extensions/proxy/pkg/cs3/client.go index bf8d19871d..9b7f9fba7e 100644 --- a/proxy/pkg/cs3/client.go +++ b/extensions/proxy/pkg/cs3/client.go @@ -2,7 +2,7 @@ package cs3 import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - proxytracing "github.com/owncloud/ocis/proxy/pkg/tracing" + proxytracing "github.com/owncloud/ocis/extensions/proxy/pkg/tracing" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/proxy/pkg/logging/logging.go b/extensions/proxy/pkg/logging/logging.go similarity index 85% rename from proxy/pkg/logging/logging.go rename to extensions/proxy/pkg/logging/logging.go index dfaeabd246..10fa0d4e9d 100644 --- a/proxy/pkg/logging/logging.go +++ b/extensions/proxy/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/proxy/pkg/config" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/proxy/pkg/metrics/metrics.go b/extensions/proxy/pkg/metrics/metrics.go similarity index 100% rename from proxy/pkg/metrics/metrics.go rename to extensions/proxy/pkg/metrics/metrics.go diff --git a/proxy/pkg/middleware/accesslog.go b/extensions/proxy/pkg/middleware/accesslog.go similarity index 100% rename from proxy/pkg/middleware/accesslog.go rename to extensions/proxy/pkg/middleware/accesslog.go diff --git a/proxy/pkg/middleware/account_resolver.go b/extensions/proxy/pkg/middleware/account_resolver.go similarity index 98% rename from proxy/pkg/middleware/account_resolver.go rename to extensions/proxy/pkg/middleware/account_resolver.go index 4a9c1b4e4d..4315794901 100644 --- a/proxy/pkg/middleware/account_resolver.go +++ b/extensions/proxy/pkg/middleware/account_resolver.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - "github.com/owncloud/ocis/proxy/pkg/user/backend" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/log" diff --git a/proxy/pkg/middleware/account_resolver_test.go b/extensions/proxy/pkg/middleware/account_resolver_test.go similarity index 95% rename from proxy/pkg/middleware/account_resolver_test.go rename to extensions/proxy/pkg/middleware/account_resolver_test.go index 825a85cfcb..c12f9f4f17 100644 --- a/proxy/pkg/middleware/account_resolver_test.go +++ b/extensions/proxy/pkg/middleware/account_resolver_test.go @@ -10,11 +10,11 @@ import ( "github.com/cs3org/reva/v2/pkg/auth/scope" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend/test" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/user/backend" - "github.com/owncloud/ocis/proxy/pkg/user/backend/test" "github.com/stretchr/testify/assert" ) diff --git a/proxy/pkg/middleware/authentication.go b/extensions/proxy/pkg/middleware/authentication.go similarity index 100% rename from proxy/pkg/middleware/authentication.go rename to extensions/proxy/pkg/middleware/authentication.go diff --git a/proxy/pkg/middleware/basic_auth.go b/extensions/proxy/pkg/middleware/basic_auth.go similarity index 97% rename from proxy/pkg/middleware/basic_auth.go rename to extensions/proxy/pkg/middleware/basic_auth.go index c7836e6199..0dc50791c9 100644 --- a/proxy/pkg/middleware/basic_auth.go +++ b/extensions/proxy/pkg/middleware/basic_auth.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/extensions/proxy/pkg/webdav" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" - "github.com/owncloud/ocis/proxy/pkg/user/backend" - "github.com/owncloud/ocis/proxy/pkg/webdav" ) // BasicAuth provides a middleware to check if BasicAuth is provided diff --git a/proxy/pkg/middleware/basic_auth_test.go b/extensions/proxy/pkg/middleware/basic_auth_test.go similarity index 100% rename from proxy/pkg/middleware/basic_auth_test.go rename to extensions/proxy/pkg/middleware/basic_auth_test.go diff --git a/proxy/pkg/middleware/create_home.go b/extensions/proxy/pkg/middleware/create_home.go similarity index 100% rename from proxy/pkg/middleware/create_home.go rename to extensions/proxy/pkg/middleware/create_home.go diff --git a/proxy/pkg/middleware/https_redirect.go b/extensions/proxy/pkg/middleware/https_redirect.go similarity index 100% rename from proxy/pkg/middleware/https_redirect.go rename to extensions/proxy/pkg/middleware/https_redirect.go diff --git a/proxy/pkg/middleware/oidc_auth.go b/extensions/proxy/pkg/middleware/oidc_auth.go similarity index 98% rename from proxy/pkg/middleware/oidc_auth.go rename to extensions/proxy/pkg/middleware/oidc_auth.go index ed882f04a8..5797007ac7 100644 --- a/proxy/pkg/middleware/oidc_auth.go +++ b/extensions/proxy/pkg/middleware/oidc_auth.go @@ -9,10 +9,10 @@ import ( "github.com/golang-jwt/jwt/v4" gOidc "github.com/coreos/go-oidc/v3/oidc" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/proxy/pkg/config" "golang.org/x/oauth2" ) diff --git a/proxy/pkg/middleware/oidc_auth_test.go b/extensions/proxy/pkg/middleware/oidc_auth_test.go similarity index 100% rename from proxy/pkg/middleware/oidc_auth_test.go rename to extensions/proxy/pkg/middleware/oidc_auth_test.go diff --git a/proxy/pkg/middleware/options.go b/extensions/proxy/pkg/middleware/options.go similarity index 98% rename from proxy/pkg/middleware/options.go rename to extensions/proxy/pkg/middleware/options.go index f45c428d76..da631f099d 100644 --- a/proxy/pkg/middleware/options.go +++ b/extensions/proxy/pkg/middleware/options.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "github.com/owncloud/ocis/proxy/pkg/user/backend" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/proxy/pkg/config" ) // Option defines a single option function. diff --git a/proxy/pkg/middleware/public_share_auth.go b/extensions/proxy/pkg/middleware/public_share_auth.go similarity index 100% rename from proxy/pkg/middleware/public_share_auth.go rename to extensions/proxy/pkg/middleware/public_share_auth.go diff --git a/proxy/pkg/middleware/selector_cookie.go b/extensions/proxy/pkg/middleware/selector_cookie.go similarity index 92% rename from proxy/pkg/middleware/selector_cookie.go rename to extensions/proxy/pkg/middleware/selector_cookie.go index d76054302b..91d7673839 100644 --- a/proxy/pkg/middleware/selector_cookie.go +++ b/extensions/proxy/pkg/middleware/selector_cookie.go @@ -3,10 +3,10 @@ package middleware import ( "net/http" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/proxy/policy" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/proxy/policy" ) // SelectorCookie provides a middleware which diff --git a/proxy/pkg/middleware/signed_url_auth.go b/extensions/proxy/pkg/middleware/signed_url_auth.go similarity index 98% rename from proxy/pkg/middleware/signed_url_auth.go rename to extensions/proxy/pkg/middleware/signed_url_auth.go index dcf39f6bdb..c453df9382 100644 --- a/proxy/pkg/middleware/signed_url_auth.go +++ b/extensions/proxy/pkg/middleware/signed_url_auth.go @@ -12,11 +12,11 @@ import ( "time" revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" "github.com/owncloud/ocis/ocis-pkg/log" storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/user/backend" "golang.org/x/crypto/pbkdf2" ) diff --git a/proxy/pkg/middleware/signed_url_auth_test.go b/extensions/proxy/pkg/middleware/signed_url_auth_test.go similarity index 100% rename from proxy/pkg/middleware/signed_url_auth_test.go rename to extensions/proxy/pkg/middleware/signed_url_auth_test.go diff --git a/proxy/pkg/proxy/option.go b/extensions/proxy/pkg/proxy/option.go similarity index 92% rename from proxy/pkg/proxy/option.go rename to extensions/proxy/pkg/proxy/option.go index f0a03abbd8..92ce084ef1 100644 --- a/proxy/pkg/proxy/option.go +++ b/extensions/proxy/pkg/proxy/option.go @@ -1,8 +1,8 @@ package proxy import ( + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/proxy/pkg/config" ) // Option defines a single option function. diff --git a/proxy/pkg/proxy/policy/selector.go b/extensions/proxy/pkg/proxy/policy/selector.go similarity index 99% rename from proxy/pkg/proxy/policy/selector.go rename to extensions/proxy/pkg/proxy/policy/selector.go index 86a45ec7fb..3d19bdea50 100644 --- a/proxy/pkg/proxy/policy/selector.go +++ b/extensions/proxy/pkg/proxy/policy/selector.go @@ -10,8 +10,8 @@ import ( "github.com/asim/go-micro/plugins/client/grpc/v4" revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/oidc" - "github.com/owncloud/ocis/proxy/pkg/config" ) var ( diff --git a/proxy/pkg/proxy/policy/selector_test.go b/extensions/proxy/pkg/proxy/policy/selector_test.go similarity index 99% rename from proxy/pkg/proxy/policy/selector_test.go rename to extensions/proxy/pkg/proxy/policy/selector_test.go index c5558c72ce..f4160ad37e 100644 --- a/proxy/pkg/proxy/policy/selector_test.go +++ b/extensions/proxy/pkg/proxy/policy/selector_test.go @@ -9,10 +9,10 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/oidc" accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/proxy/pkg/config" "go-micro.dev/v4/client" ) diff --git a/proxy/pkg/proxy/proxy.go b/extensions/proxy/pkg/proxy/proxy.go similarity index 97% rename from proxy/pkg/proxy/proxy.go rename to extensions/proxy/pkg/proxy/proxy.go index 7681defb80..3f6236ef0f 100644 --- a/proxy/pkg/proxy/proxy.go +++ b/extensions/proxy/pkg/proxy/proxy.go @@ -15,11 +15,11 @@ import ( "go.opentelemetry.io/otel/attribute" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/proxy/policy" + proxytracing "github.com/owncloud/ocis/extensions/proxy/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/log" pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/proxy/policy" - proxytracing "github.com/owncloud/ocis/proxy/pkg/tracing" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" ) diff --git a/proxy/pkg/proxy/proxy_integration_test.go b/extensions/proxy/pkg/proxy/proxy_integration_test.go similarity index 99% rename from proxy/pkg/proxy/proxy_integration_test.go rename to extensions/proxy/pkg/proxy/proxy_integration_test.go index 1491933ad4..a3fedf086e 100644 --- a/proxy/pkg/proxy/proxy_integration_test.go +++ b/extensions/proxy/pkg/proxy/proxy_integration_test.go @@ -10,7 +10,7 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" ) func TestProxyIntegration(t *testing.T) { diff --git a/proxy/pkg/proxy/proxy_test.go b/extensions/proxy/pkg/proxy/proxy_test.go similarity index 97% rename from proxy/pkg/proxy/proxy_test.go rename to extensions/proxy/pkg/proxy/proxy_test.go index f64362c491..a618ffc1b5 100644 --- a/proxy/pkg/proxy/proxy_test.go +++ b/extensions/proxy/pkg/proxy/proxy_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis/proxy/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" ) type matchertest struct { diff --git a/proxy/pkg/server/debug/option.go b/extensions/proxy/pkg/server/debug/option.go similarity index 94% rename from proxy/pkg/server/debug/option.go rename to extensions/proxy/pkg/server/debug/option.go index c34b917cad..3181f385c7 100644 --- a/proxy/pkg/server/debug/option.go +++ b/extensions/proxy/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/proxy/pkg/config" ) // Option defines a single option function. diff --git a/proxy/pkg/server/debug/server.go b/extensions/proxy/pkg/server/debug/server.go similarity index 97% rename from proxy/pkg/server/debug/server.go rename to extensions/proxy/pkg/server/debug/server.go index 9158a697d8..bda49c1995 100644 --- a/proxy/pkg/server/debug/server.go +++ b/extensions/proxy/pkg/server/debug/server.go @@ -5,9 +5,9 @@ import ( "io" "net/http" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/proxy/pkg/config" ) // Server initializes the debug service and server. diff --git a/proxy/pkg/server/http/option.go b/extensions/proxy/pkg/server/http/option.go similarity index 93% rename from proxy/pkg/server/http/option.go rename to extensions/proxy/pkg/server/http/option.go index bad0956ff6..dcd3885be4 100644 --- a/proxy/pkg/server/http/option.go +++ b/extensions/proxy/pkg/server/http/option.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/justinas/alice" + "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/extensions/proxy/pkg/metrics" "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/proxy/pkg/config" - "github.com/owncloud/ocis/proxy/pkg/metrics" "github.com/urfave/cli/v2" ) diff --git a/proxy/pkg/server/http/server.go b/extensions/proxy/pkg/server/http/server.go similarity index 100% rename from proxy/pkg/server/http/server.go rename to extensions/proxy/pkg/server/http/server.go diff --git a/proxy/pkg/tracing/tracing.go b/extensions/proxy/pkg/tracing/tracing.go similarity index 90% rename from proxy/pkg/tracing/tracing.go rename to extensions/proxy/pkg/tracing/tracing.go index 5ab072223f..aa70196354 100644 --- a/proxy/pkg/tracing/tracing.go +++ b/extensions/proxy/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( + "github.com/owncloud/ocis/extensions/proxy/pkg/config" pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" - "github.com/owncloud/ocis/proxy/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/proxy/pkg/user/backend/accounts.go b/extensions/proxy/pkg/user/backend/accounts.go similarity index 100% rename from proxy/pkg/user/backend/accounts.go rename to extensions/proxy/pkg/user/backend/accounts.go diff --git a/proxy/pkg/user/backend/accounts_test.go b/extensions/proxy/pkg/user/backend/accounts_test.go similarity index 100% rename from proxy/pkg/user/backend/accounts_test.go rename to extensions/proxy/pkg/user/backend/accounts_test.go diff --git a/proxy/pkg/user/backend/backend.go b/extensions/proxy/pkg/user/backend/backend.go similarity index 100% rename from proxy/pkg/user/backend/backend.go rename to extensions/proxy/pkg/user/backend/backend.go diff --git a/proxy/pkg/user/backend/cs3.go b/extensions/proxy/pkg/user/backend/cs3.go similarity index 100% rename from proxy/pkg/user/backend/cs3.go rename to extensions/proxy/pkg/user/backend/cs3.go diff --git a/proxy/pkg/user/backend/test/backend_mock.go b/extensions/proxy/pkg/user/backend/test/backend_mock.go similarity index 99% rename from proxy/pkg/user/backend/test/backend_mock.go rename to extensions/proxy/pkg/user/backend/test/backend_mock.go index be27d84b51..1eb489f68c 100644 --- a/proxy/pkg/user/backend/test/backend_mock.go +++ b/extensions/proxy/pkg/user/backend/test/backend_mock.go @@ -8,7 +8,7 @@ import ( "sync" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/proxy/pkg/user/backend" + "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" ) // Ensure, that UserBackendMock does implement UserBackend. diff --git a/proxy/pkg/webdav/response.go b/extensions/proxy/pkg/webdav/response.go similarity index 100% rename from proxy/pkg/webdav/response.go rename to extensions/proxy/pkg/webdav/response.go diff --git a/proxy/pkg/webdav/webdav.go b/extensions/proxy/pkg/webdav/webdav.go similarity index 100% rename from proxy/pkg/webdav/webdav.go rename to extensions/proxy/pkg/webdav/webdav.go diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 67777076bd..d155fc8dae 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -13,7 +13,7 @@ import ( nats "github.com/owncloud/ocis/extensions/nats/pkg/config" notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config" ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config" - proxy "github.com/owncloud/ocis/proxy/pkg/config" + proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config" settings "github.com/owncloud/ocis/settings/pkg/config" storage "github.com/owncloud/ocis/storage/pkg/config" store "github.com/owncloud/ocis/store/pkg/config" diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 1d14ad07cb..224b38bafb 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -11,7 +11,7 @@ import ( 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/extensions/ocs/pkg/config/defaults" - proxy "github.com/owncloud/ocis/proxy/pkg/config/defaults" + proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" settings "github.com/owncloud/ocis/settings/pkg/config/defaults" storage "github.com/owncloud/ocis/storage/pkg/config/defaults" store "github.com/owncloud/ocis/store/pkg/config/defaults" diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go index cd59c60904..429ca83e19 100644 --- a/ocis/pkg/command/proxy.go +++ b/ocis/pkg/command/proxy.go @@ -1,10 +1,10 @@ package command import ( + "github.com/owncloud/ocis/extensions/proxy/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/proxy/pkg/command" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index 97d5617d7e..06b2af6435 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -28,10 +28,10 @@ import ( 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" + proxy "github.com/owncloud/ocis/extensions/proxy/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" - proxy "github.com/owncloud/ocis/proxy/pkg/command" settings "github.com/owncloud/ocis/settings/pkg/command" storage "github.com/owncloud/ocis/storage/pkg/command" store "github.com/owncloud/ocis/store/pkg/command"