refactor graph

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

extensions/graph/Makefile

@@ -1,27 +1,27 @@
 SHELL := bash
 NAME := graph
 
-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: $(MOCKERY) # CI runs ci-node-generate automatically before this target

extensions/graph/cmd/graph/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/graph/pkg/command"
-	"github.com/owncloud/ocis/graph/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/graph/pkg/command"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
 )
 
 func main() {

extensions/graph/pkg/command/health.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/config/parser"
-	"github.com/owncloud/ocis/graph/pkg/logging"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/graph/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 

extensions/graph/pkg/command/root.go

@@ -7,7 +7,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	"github.com/thejerf/suture/v4"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/urfave/cli/v2"
 )

extensions/graph/pkg/command/server.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/config/parser"
-	"github.com/owncloud/ocis/graph/pkg/logging"
-	"github.com/owncloud/ocis/graph/pkg/metrics"
-	"github.com/owncloud/ocis/graph/pkg/server/debug"
-	"github.com/owncloud/ocis/graph/pkg/server/http"
-	"github.com/owncloud/ocis/graph/pkg/tracing"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/graph/pkg/logging"
+	"github.com/owncloud/ocis/extensions/graph/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/graph/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/graph/pkg/server/http"
+	"github.com/owncloud/ocis/extensions/graph/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 	"github.com/urfave/cli/v2"
 )

extensions/graph/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/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/graph/pkg/config/defaults/defaultconfig.go

@@ -3,7 +3,7 @@ package defaults
 import (
 	"strings"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 )
 
 func DefaultConfig() *config.Config {

extensions/graph/pkg/config/parser/parse.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"

extensions/graph/pkg/identity/cs3.go

@@ -10,8 +10,8 @@ import (
 	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
 	libregraph "github.com/owncloud/libre-graph-api-go"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/graph/pkg/identity/ldap.go

@@ -11,8 +11,8 @@ import (
 	ldapdn "github.com/libregraph/idm/pkg/ldapdn"
 	libregraph "github.com/owncloud/libre-graph-api-go"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/graph/pkg/identity/ldap_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/go-ldap/ldap/v3"
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/graph/pkg/logging/logging.go

@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/graph/pkg/middleware/auth.go

@@ -6,7 +6,7 @@ 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/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/account"
 	"google.golang.org/grpc/metadata"
 )

extensions/graph/pkg/middleware/requireadmin.go

@@ -5,7 +5,7 @@ import (
 
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/roles"
 )

extensions/graph/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/graph/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 )

extensions/graph/pkg/server/http/option.go

@@ -3,8 +3,8 @@ package http
 import (
 	"context"
 
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/metrics"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/urfave/cli/v2"
 )

extensions/graph/pkg/server/http/server.go

@@ -4,8 +4,8 @@ import (
 	"github.com/asim/go-micro/plugins/events/natsjs/v4"
 	"github.com/cs3org/reva/v2/pkg/events/server"
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
-	graphMiddleware "github.com/owncloud/ocis/graph/pkg/middleware"
-	svc "github.com/owncloud/ocis/graph/pkg/service/v0"
+	graphMiddleware "github.com/owncloud/ocis/extensions/graph/pkg/middleware"
+	svc "github.com/owncloud/ocis/extensions/graph/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/account"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/http"

extensions/graph/pkg/service/v0/driveitems.go

@@ -15,7 +15,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/utils/resourceid"
 	"github.com/go-chi/render"
 	libregraph "github.com/owncloud/libre-graph-api-go"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 )
 
 // GetRootDriveChildren implements the Service interface.

extensions/graph/pkg/service/v0/drives.go

@@ -23,7 +23,7 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 	libregraph "github.com/owncloud/libre-graph-api-go"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 	v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
 	settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"

extensions/graph/pkg/service/v0/graph.go

@@ -9,8 +9,8 @@ import (
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/go-chi/chi/v5"
-	"github.com/owncloud/ocis/graph/pkg/config"
-	"github.com/owncloud/ocis/graph/pkg/identity"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/identity"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
 	mevents "go-micro.dev/v4/events"

extensions/graph/pkg/service/v0/graph_test.go

@@ -16,10 +16,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	libregraph "github.com/owncloud/libre-graph-api-go"
-	"github.com/owncloud/ocis/graph/mocks"
-	"github.com/owncloud/ocis/graph/pkg/config/defaults"
-	service "github.com/owncloud/ocis/graph/pkg/service/v0"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/mocks"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
+	service "github.com/owncloud/ocis/extensions/graph/pkg/service/v0"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	"github.com/stretchr/testify/mock"
 )
 

extensions/graph/pkg/service/v0/groups.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/CiscoM31/godata"
 	libregraph "github.com/owncloud/libre-graph-api-go"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/go-chi/chi/v5"

extensions/graph/pkg/service/v0/instrument.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis/graph/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/graph/pkg/metrics"
 )
 
 // NewInstrument returns a service that instruments metrics.

extensions/graph/pkg/service/v0/option.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/cs3org/reva/v2/pkg/events"
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/roles"
 	settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"

extensions/graph/pkg/service/v0/service.go

@@ -11,9 +11,9 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 
-	"github.com/owncloud/ocis/graph/pkg/identity"
-	"github.com/owncloud/ocis/graph/pkg/identity/ldap"
-	graphm "github.com/owncloud/ocis/graph/pkg/middleware"
+	"github.com/owncloud/ocis/extensions/graph/pkg/identity"
+	"github.com/owncloud/ocis/extensions/graph/pkg/identity/ldap"
+	graphm "github.com/owncloud/ocis/extensions/graph/pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/account"
 	opkgm "github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/roles"

extensions/graph/pkg/service/v0/users.go

@@ -16,8 +16,8 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 	libregraph "github.com/owncloud/libre-graph-api-go"
-	"github.com/owncloud/ocis/graph/pkg/identity"
-	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
+	"github.com/owncloud/ocis/extensions/graph/pkg/identity"
+	"github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode"
 	settings "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0"
 	settingssvc "github.com/owncloud/ocis/settings/pkg/service/v0"
 )

extensions/graph/pkg/tracing/tracing.go

@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/extensions/graph/pkg/config"
 	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"
 )

ocis-pkg/config/config.go

@@ -6,8 +6,8 @@ import (
 	audit "github.com/owncloud/ocis/audit/pkg/config"
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
+	graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config"
-	graph "github.com/owncloud/ocis/graph/pkg/config"
 	idm "github.com/owncloud/ocis/idm/pkg/config"
 	idp "github.com/owncloud/ocis/idp/pkg/config"
 	nats "github.com/owncloud/ocis/nats/pkg/config"

ocis-pkg/config/defaultconfig.go

@@ -4,8 +4,8 @@ import (
 	audit "github.com/owncloud/ocis/audit/pkg/config/defaults"
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
+	graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config/defaults"
-	graph "github.com/owncloud/ocis/graph/pkg/config/defaults"
 	idm "github.com/owncloud/ocis/idm/pkg/config/defaults"
 	idp "github.com/owncloud/ocis/idp/pkg/config/defaults"
 	nats "github.com/owncloud/ocis/nats/pkg/config/defaults"

ocis/pkg/command/graph.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/graph/pkg/command"
+	"github.com/owncloud/ocis/extensions/graph/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"

ocis/pkg/runtime/service/service.go

@@ -21,8 +21,8 @@ import (
 
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command"
+	graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
 	graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/command"
-	graph "github.com/owncloud/ocis/graph/pkg/command"
 	idm "github.com/owncloud/ocis/idm/pkg/command"
 	idp "github.com/owncloud/ocis/idp/pkg/command"
 	nats "github.com/owncloud/ocis/nats/pkg/command"