refactor glauth

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

extensions/glauth/Makefile

@@ -1,27 +1,27 @@
 SHELL := bash
 NAME := glauth
 
-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/glauth/cmd/glauth/main.go

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

extensions/glauth/pkg/command/health.go

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

extensions/glauth/pkg/command/root.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/glauth/pkg/config"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"

extensions/glauth/pkg/command/server.go

@@ -8,13 +8,13 @@ import (
 
 	glauthcfg "github.com/glauth/glauth/v2/pkg/config"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/glauth/pkg/config"
-	"github.com/owncloud/ocis/glauth/pkg/config/parser"
-	"github.com/owncloud/ocis/glauth/pkg/logging"
-	"github.com/owncloud/ocis/glauth/pkg/metrics"
-	"github.com/owncloud/ocis/glauth/pkg/server/debug"
-	"github.com/owncloud/ocis/glauth/pkg/server/glauth"
-	"github.com/owncloud/ocis/glauth/pkg/tracing"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/logging"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/server/glauth"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/tracing"
 	pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto"
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 	"github.com/owncloud/ocis/ocis-pkg/version"

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

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

@@ -3,7 +3,7 @@ package defaults
 import (
 	"path"
 
-	"github.com/owncloud/ocis/glauth/pkg/config"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 

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

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

extensions/glauth/pkg/logging/logging.go

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

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

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

extensions/glauth/pkg/server/debug/server.go

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

extensions/glauth/pkg/server/glauth/server.go

@@ -9,7 +9,7 @@ import (
 	"github.com/glauth/glauth/v2/pkg/handler"
 	"github.com/go-logr/logr"
 	"github.com/nmcclain/ldap"
-	"github.com/owncloud/ocis/glauth/pkg/mlogr"
+	"github.com/owncloud/ocis/extensions/glauth/pkg/mlogr"
 )
 
 // LdapSvc holds the ldap server struct

extensions/glauth/pkg/tracing/tracing.go

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

ocis-pkg/config/config.go

@@ -5,7 +5,7 @@ import (
 
 	audit "github.com/owncloud/ocis/audit/pkg/config"
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
-	glauth "github.com/owncloud/ocis/glauth/pkg/config"
+	glauth "github.com/owncloud/ocis/extensions/glauth/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"

ocis-pkg/config/defaultconfig.go

@@ -3,7 +3,7 @@ package config
 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/glauth/pkg/config/defaults"
+	glauth "github.com/owncloud/ocis/extensions/glauth/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"

ocis/pkg/command/glauth.go

@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/glauth/pkg/command"
+	"github.com/owncloud/ocis/extensions/glauth/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

@@ -20,7 +20,7 @@ import (
 	"github.com/olekukonko/tablewriter"
 
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command"
-	glauth "github.com/owncloud/ocis/glauth/pkg/command"
+	glauth "github.com/owncloud/ocis/extensions/glauth/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"