refactor idp

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

extensions/accounts/cmd/helper/defaultconfig/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	accountsdefaults "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
-	idpdefaults "github.com/owncloud/ocis/idp/pkg/config/defaults"
+	idpdefaults "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
 	"gopkg.in/yaml.v2"
 )
 

extensions/idp/Makefile

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

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

extensions/idp/pkg/assets/option.go

@@ -3,8 +3,8 @@ package assets
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis/idp"
-	"github.com/owncloud/ocis/idp/pkg/config"
+	"github.com/owncloud/ocis/extensions/idp"
+	"github.com/owncloud/ocis/extensions/idp/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/assetsfs"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )

extensions/idp/pkg/command/health.go

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

extensions/idp/pkg/command/root.go

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

extensions/idp/pkg/command/server.go

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

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

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

@@ -4,7 +4,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/owncloud/ocis/idp/pkg/config"
+	"github.com/owncloud/ocis/extensions/idp/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 

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

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

extensions/idp/pkg/logging/logging.go

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

extensions/idp/pkg/middleware/static.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	idpTracing "github.com/owncloud/ocis/idp/pkg/tracing"
+	idpTracing "github.com/owncloud/ocis/extensions/idp/pkg/tracing"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 )

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

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

extensions/idp/pkg/server/debug/server.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/owncloud/ocis/idp/pkg/config"
+	"github.com/owncloud/ocis/extensions/idp/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/shared"

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

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

extensions/idp/pkg/server/http/server.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
-	svc "github.com/owncloud/ocis/idp/pkg/service/v0"
+	svc "github.com/owncloud/ocis/extensions/idp/pkg/service/v0"
 	pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/http"

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

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

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

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis/idp/pkg/config"
+	"github.com/owncloud/ocis/extensions/idp/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 

extensions/idp/pkg/service/v0/service.go

@@ -19,9 +19,9 @@ import (
 	ldapBackendSupport "github.com/libregraph/lico/bootstrap/backends/ldap"
 	licoconfig "github.com/libregraph/lico/config"
 	"github.com/libregraph/lico/server"
-	"github.com/owncloud/ocis/idp/pkg/assets"
-	"github.com/owncloud/ocis/idp/pkg/config"
-	"github.com/owncloud/ocis/idp/pkg/middleware"
+	"github.com/owncloud/ocis/extensions/idp/pkg/assets"
+	"github.com/owncloud/ocis/extensions/idp/pkg/config"
+	"github.com/owncloud/ocis/extensions/idp/pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"stash.kopano.io/kgol/rndm"
 )

extensions/idp/pkg/tracing/tracing.go

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