refactor ocs

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

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

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

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

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

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

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

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 {

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

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.

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

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

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

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

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

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.

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

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

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

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

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

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.

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

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

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

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

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"

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

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"

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"

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

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"

ocs/config/.gitignore

@@ -1,3 +0,0 @@
-*
-!example.json
-!example.yml