refactor webdav

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

extensions/webdav/Makefile

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

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

extensions/webdav/pkg/command/health.go

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

extensions/webdav/pkg/command/root.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )

extensions/webdav/pkg/command/server.go

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

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

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

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

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

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

extensions/webdav/pkg/logging/logging.go

@@ -1,8 +1,8 @@
 package logging
 
 import (
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // LoggerFromConfig initializes a service-specific logger instance.

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

@@ -3,8 +3,8 @@ package debug
 import (
 	"context"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Option defines a single option function.

extensions/webdav/pkg/server/debug/server.go

@@ -4,9 +4,9 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/version"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Server initializes the debug service and server.

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

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

extensions/webdav/pkg/server/http/server.go

@@ -2,11 +2,11 @@ package http
 
 import (
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
+	svc "github.com/owncloud/ocis/extensions/webdav/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"
-	svc "github.com/owncloud/ocis/webdav/pkg/service/v0"
 	"go-micro.dev/v4"
 )
 

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

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

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

@@ -3,8 +3,8 @@ package svc
 import (
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Option defines a single option function.

extensions/webdav/pkg/service/v0/service.go

@@ -20,10 +20,10 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/dav/requests"
 	thumbnailsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0"
 	thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/dav/requests"
 )
 
 const (

extensions/webdav/pkg/tracing/tracing.go

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

ocis-pkg/config/config.go

@@ -18,8 +18,8 @@ import (
 	storage "github.com/owncloud/ocis/extensions/storage/pkg/config"
 	store "github.com/owncloud/ocis/extensions/store/pkg/config"
 	web "github.com/owncloud/ocis/extensions/web/pkg/config"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config"
-	webdav "github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // TokenManager is the config for using the reva token manager

ocis-pkg/config/defaultconfig.go

@@ -16,8 +16,8 @@ import (
 	storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults"
 	store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults"
 	web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults"
-	webdav "github.com/owncloud/ocis/webdav/pkg/config/defaults"
 )
 
 func DefaultConfig() *Config {

ocis/pkg/command/webdav.go

@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/webdav/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/webdav/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 

ocis/pkg/runtime/service/service.go

@@ -33,11 +33,11 @@ import (
 	storage "github.com/owncloud/ocis/extensions/storage/pkg/command"
 	store "github.com/owncloud/ocis/extensions/store/pkg/command"
 	web "github.com/owncloud/ocis/extensions/web/pkg/command"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command"
-	webdav "github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"
 	"go-micro.dev/v4/logger"