refactor proxy

Signed-off-by: Christian Richter <crichter@owncloud.com>

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.

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

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() {

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"
 )
 

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"
 )

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"
 )

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"
 )
 

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 {

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"
 )

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"

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.

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"

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"
 )
 

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

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"
 )
 

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.

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

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"
 )
 

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.

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 (

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"
 )
 

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"
 )

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) {

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 {

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.

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.

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"
 )
 

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"
 )
 

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.

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"

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"

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"
 )
 

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"