use plain pkg module

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

docs/helpers/markdowncreation.go

@@ -10,7 +10,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/markdown"
+	"github.com/opencloud-eu/opencloud/pkg/markdown"
 )
 
 var _configMarkdown = `{{< include file="services/_includes/%s-config-example.yaml"  language="yaml" >}}

opencloud/pkg/command/backup.go

@@ -6,11 +6,11 @@ import (
 
 	ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore"
 	s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/backup"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/benchmark.go

@@ -15,9 +15,9 @@ import (
 	"time"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 	"github.com/pkg/xattr"
 	"github.com/rogpeppe/go-internal/lockedfile"
 	"github.com/urfave/cli/v2"

opencloud/pkg/command/decomposedfs.go

@@ -22,8 +22,8 @@ import (
 	"github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree"
 	"github.com/cs3org/reva/v2/pkg/storagespace"
 	"github.com/cs3org/reva/v2/pkg/store"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/rs/zerolog"
 	"github.com/urfave/cli/v2"
 )

opencloud/pkg/command/init.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
 	ocisinit "github.com/opencloud-eu/opencloud/opencloud/pkg/init"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/defaults"
 	cli "github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/list.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"net/rpc"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/migrate.go

@@ -30,12 +30,12 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	oclog "github.com/opencloud-eu/opencloud/ocis-pkg/log"
-	mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
+	oclog "github.com/opencloud-eu/opencloud/pkg/log"
+	mregistry "github.com/opencloud-eu/opencloud/pkg/registry"
 	sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config"
 	sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser"
 	"github.com/urfave/cli/v2"

opencloud/pkg/command/revisions.go

@@ -10,11 +10,11 @@ import (
 	"github.com/cs3org/reva/v2/pkg/storage/fs/posix/lookup"
 	s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore"
 	"github.com/cs3org/reva/v2/pkg/storagespace"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/revisions"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/root.go

@@ -6,9 +6,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/clihelper"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/server.go

@@ -1,11 +1,11 @@
 package command
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/runtime"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/services.go

@@ -3,11 +3,11 @@ package command
 import (
 	"github.com/urfave/cli/v2"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/command/helper"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
 	activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
 	antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
 	appprovider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"

opencloud/pkg/command/shares.go

@@ -11,11 +11,11 @@ import (
 	"github.com/cs3org/reva/v2/pkg/share/manager/registry"
 	"github.com/cs3org/reva/v2/pkg/utils"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
+	mregistry "github.com/opencloud-eu/opencloud/pkg/registry"
 	sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser"
 )
 

opencloud/pkg/command/trash.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/trash"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/configlog"
+	"github.com/opencloud-eu/opencloud/pkg/config/parser"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/version.go

@@ -8,10 +8,10 @@ import (
 	"github.com/urfave/cli/v2"
 	mreg "go-micro.dev/v4/registry"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/registry"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 )
 
 const (

opencloud/pkg/init/init.go

@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/gofrs/uuid"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/generators"
+	"github.com/opencloud-eu/opencloud/pkg/generators"
 	"gopkg.in/yaml.v2"
 )
 

opencloud/pkg/register/command.go

@@ -1,7 +1,7 @@
 package register
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/runtime/options.go

@@ -1,7 +1,7 @@
 package runtime
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/runtime/runtime.go

@@ -3,8 +3,8 @@ package runtime
 import (
 	"context"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/opencloud/pkg/runtime/service"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 )
 
 // Runtime represents an oCIS runtime environment.

opencloud/pkg/runtime/service/option.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 )
 
 // Log configures a structure logger.

opencloud/pkg/runtime/service/service.go

@@ -22,10 +22,10 @@ import (
 	notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command"
 	"github.com/thejerf/suture/v4"
 
-	ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
-	ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
+	ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/log"
+	ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
 	activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
 	antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
 	appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"

opencloud/pkg/runtime/service/sutureservice.go

@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 
-	ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
+	ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
 	"github.com/thejerf/suture/v4"
 )
 

pkg/account/option.go

@@ -1,7 +1,7 @@
 package account
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 // Option defines a single option function.

pkg/ast/test/test.go

@@ -4,7 +4,7 @@ package test
 import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
 )
 
 // DiffAst returns a human-readable report of the differences between two values

pkg/checks/checkgrpc.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
+	"github.com/opencloud-eu/opencloud/pkg/handlers"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

pkg/checks/checkhttp.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
+	"github.com/opencloud-eu/opencloud/pkg/handlers"
 )
 
 // NewHTTPCheck checks the reachability of a http server.

pkg/checks/checktcp.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
+	"github.com/opencloud-eu/opencloud/pkg/handlers"
 )
 
 // NewTCPCheck returns a check that connects to a given tcp endpoint.

pkg/clihelper/app.go

@@ -1,7 +1,7 @@
 package clihelper
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
+	"github.com/opencloud-eu/opencloud/pkg/version"
 	"github.com/urfave/cli/v2"
 )
 

pkg/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
 	activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config"
 	antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config"
 	appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config"

pkg/config/config_test.go

@@ -3,7 +3,7 @@ package config_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config"
 	"gopkg.in/yaml.v2"
 )
 

pkg/config/defaultconfig.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
 	activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
 	antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults"
 	appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults"

pkg/config/helpers.go

@@ -8,7 +8,7 @@ import (
 
 	gofig "github.com/gookit/config/v2"
 	gooyaml "github.com/gookit/config/v2/yaml"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
+	"github.com/opencloud-eu/opencloud/pkg/config/defaults"
 )
 
 var (

pkg/config/parser/parse.go

@@ -3,10 +3,10 @@ package parser
 import (
 	"errors"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/shared"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/structs"
+	"github.com/opencloud-eu/opencloud/pkg/config"
+	"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
+	"github.com/opencloud-eu/opencloud/pkg/shared"
+	"github.com/opencloud-eu/opencloud/pkg/structs"
 )
 
 // ParseConfig loads the ocis configuration and

pkg/conversions/ptr_test.go

@@ -6,7 +6,7 @@ import (
 
 	libregraph "github.com/owncloud/libre-graph-api-go"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/conversions"
+	"github.com/opencloud-eu/opencloud/pkg/conversions"
 )
 
 func checkIdentical[T any](t *testing.T, p T, want string) {

pkg/cors/option.go

@@ -1,7 +1,7 @@
 package cors
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 // Option defines a single option function.

pkg/crypto/crypto_test.go

@@ -5,11 +5,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/crypto"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/crypto"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 
 	. "github.com/onsi/ginkgo/v2"
-	cfg "github.com/opencloud-eu/opencloud/ocis-pkg/config"
+	cfg "github.com/opencloud-eu/opencloud/pkg/config"
 )
 
 var _ = Describe("Crypto", func() {

pkg/crypto/gencert.go

@@ -12,7 +12,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	mtls "go-micro.dev/v4/util/tls"
 )
 

pkg/crypto/gencert_test.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 func TestEnsureExistsDir(t *testing.T) {

pkg/handlers/checker.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 	"golang.org/x/sync/errgroup"
 )
 

pkg/handlers/checker_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/test-go/testify/require"
 	"github.com/tidwall/gjson"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/handlers"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/handlers"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 func TestCheckHandlerConfiguration(t *testing.T) {

pkg/kql/cast.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/now"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
 	"github.com/opencloud-eu/opencloud/services/search/pkg/query"
 )
 

pkg/kql/connect.go

@@ -3,7 +3,7 @@ package kql
 import (
 	"strings"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
 )
 
 // connectNodes connects given nodes

pkg/kql/dictionary_test.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/jinzhu/now"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast/test"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/kql"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast/test"
+	"github.com/opencloud-eu/opencloud/pkg/kql"
 	"github.com/opencloud-eu/opencloud/services/search/pkg/query"
 	tAssert "github.com/stretchr/testify/assert"
 )

pkg/kql/factory.go

@@ -3,7 +3,7 @@ package kql
 import (
 	"strings"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
 )
 
 func base(text []byte, pos position) (*ast.Base, error) {

pkg/kql/kql.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
 )
 
 // The operator node value definition

pkg/kql/kql_test.go

@@ -3,8 +3,8 @@ package kql_test
 import (
 	"testing"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/kql"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/kql"
 	"github.com/opencloud-eu/opencloud/services/search/pkg/query"
 	tAssert "github.com/stretchr/testify/assert"
 )

pkg/kql/validate.go

@@ -1,7 +1,7 @@
 package kql
 
 import (
-	"github.com/opencloud-eu/opencloud/ocis-pkg/ast"
+	"github.com/opencloud-eu/opencloud/pkg/ast"
 	"github.com/opencloud-eu/opencloud/services/search/pkg/query"
 )
 

pkg/l10n/l10n.go

@@ -9,7 +9,7 @@ import (
 	"reflect"
 
 	"github.com/leonelquinteros/gotext"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/middleware"
+	"github.com/opencloud-eu/opencloud/pkg/middleware"
 	settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0"
 	micrometadata "go-micro.dev/v4/metadata"
 )

pkg/ldap/ldap.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 const (

pkg/log/log_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/onsi/gomega"
 
 	"github.com/opencloud-eu/opencloud/internal/testenv"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 func TestDeprecation(t *testing.T) {

pkg/middleware/account.go

@@ -8,7 +8,7 @@ import (
 
 	revactx "github.com/cs3org/reva/v2/pkg/ctx"
 	"github.com/cs3org/reva/v2/pkg/token/manager/jwt"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/account"
+	"github.com/opencloud-eu/opencloud/pkg/account"
 	"go-micro.dev/v4/metadata"
 )
 

pkg/middleware/header.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/opencloud-eu/opencloud/ocis-pkg/cors"
+	"github.com/opencloud-eu/opencloud/pkg/cors"
 
 	rscors "github.com/rs/cors"
 )

pkg/middleware/logger.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5/middleware"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 // Logger is a middleware to log http requests. It uses debug level logging and should be used by all services save the proxy (which uses info level logging).

pkg/middleware/oidc.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	goidc "github.com/coreos/go-oidc/v3/oidc"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/oidc"
+	"github.com/opencloud-eu/opencloud/pkg/oidc"
 	"golang.org/x/oauth2"
 )
 

pkg/middleware/options.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
-	"github.com/opencloud-eu/opencloud/ocis-pkg/log"
+	"github.com/opencloud-eu/opencloud/pkg/log"
 )
 
 // Option defines a single option function.