diff --git a/docs/helpers/configenvextractor.go b/docs/helpers/configenvextractor.go index f8f071ae02e..358fc005ba6 100644 --- a/docs/helpers/configenvextractor.go +++ b/docs/helpers/configenvextractor.go @@ -25,7 +25,7 @@ func main() { log.Fatal(err) } replacer := strings.NewReplacer( - "../../", "github.com/owncloud/ocis/", + "../../", "github.com/owncloud/ocis/v2/", "/defaultconfig.go", "", ) for i := range paths { diff --git a/extensions/accounts/cmd/accounts/main.go b/extensions/accounts/cmd/accounts/main.go index c74b5e10dd5..bacb43b6373 100644 --- a/extensions/accounts/cmd/accounts/main.go +++ b/extensions/accounts/cmd/accounts/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/accounts/pkg/command" - "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/command" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults" ) func main() { diff --git a/extensions/accounts/pkg/assets/option.go b/extensions/accounts/pkg/assets/option.go index fb409e6aa30..4f842e911e0 100644 --- a/extensions/accounts/pkg/assets/option.go +++ b/extensions/accounts/pkg/assets/option.go @@ -3,10 +3,10 @@ package assets import ( "net/http" - "github.com/owncloud/ocis/extensions/accounts" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/assetsfs" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/accounts" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/assetsfs" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // New returns a new http filesystem to serve assets. diff --git a/extensions/accounts/pkg/command/add_account.go b/extensions/accounts/pkg/command/add_account.go index 76169f7e932..c5b663adc69 100644 --- a/extensions/accounts/pkg/command/add_account.go +++ b/extensions/accounts/pkg/command/add_account.go @@ -3,12 +3,12 @@ package command import ( "fmt" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/go-micro/plugins/v4/client/grpc" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/extensions/accounts/pkg/flagset" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/health.go b/extensions/accounts/pkg/command/health.go index 0590938e938..93f5ffafbc5 100644 --- a/extensions/accounts/pkg/command/health.go +++ b/extensions/accounts/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/extensions/accounts/pkg/config/parser" - "github.com/owncloud/ocis/extensions/accounts/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/inspect_account.go b/extensions/accounts/pkg/command/inspect_account.go index 50bfa1035c1..aac50b9acf1 100644 --- a/extensions/accounts/pkg/command/inspect_account.go +++ b/extensions/accounts/pkg/command/inspect_account.go @@ -5,14 +5,14 @@ import ( "os" "strconv" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/flagset" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset" "github.com/go-micro/plugins/v4/client/grpc" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/list_accounts.go b/extensions/accounts/pkg/command/list_accounts.go index c8bd02439ec..593bd7b22ad 100644 --- a/extensions/accounts/pkg/command/list_accounts.go +++ b/extensions/accounts/pkg/command/list_accounts.go @@ -5,14 +5,14 @@ import ( "os" "strconv" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/flagset" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset" "github.com/go-micro/plugins/v4/client/grpc" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/rebuild_index.go b/extensions/accounts/pkg/command/rebuild_index.go index 9d3d114be50..e9262667a08 100644 --- a/extensions/accounts/pkg/command/rebuild_index.go +++ b/extensions/accounts/pkg/command/rebuild_index.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/go-micro/plugins/v4/client/grpc" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "github.com/urfave/cli/v2" merrors "go-micro.dev/v4/errors" ) diff --git a/extensions/accounts/pkg/command/remove_account.go b/extensions/accounts/pkg/command/remove_account.go index b912c283d68..0d3b876e106 100644 --- a/extensions/accounts/pkg/command/remove_account.go +++ b/extensions/accounts/pkg/command/remove_account.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/flagset" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset" "github.com/go-micro/plugins/v4/client/grpc" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/root.go b/extensions/accounts/pkg/command/root.go index bb68f61678b..8f016b1ebdf 100644 --- a/extensions/accounts/pkg/command/root.go +++ b/extensions/accounts/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/server.go b/extensions/accounts/pkg/command/server.go index 26fb0f1f494..bbed07f84ba 100644 --- a/extensions/accounts/pkg/command/server.go +++ b/extensions/accounts/pkg/command/server.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/extensions/accounts/pkg/config/parser" - "github.com/owncloud/ocis/extensions/accounts/pkg/logging" - "github.com/owncloud/ocis/extensions/accounts/pkg/metrics" - "github.com/owncloud/ocis/extensions/accounts/pkg/server/debug" - "github.com/owncloud/ocis/extensions/accounts/pkg/server/grpc" - "github.com/owncloud/ocis/extensions/accounts/pkg/server/http" - svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/server/grpc" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/server/http" + svc "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/command/update_account.go b/extensions/accounts/pkg/command/update_account.go index 32cc79c9b94..313e97ef961 100644 --- a/extensions/accounts/pkg/command/update_account.go +++ b/extensions/accounts/pkg/command/update_account.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/flagset" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/flagset" "github.com/go-micro/plugins/v4/client/grpc" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "github.com/urfave/cli/v2" "google.golang.org/genproto/protobuf/field_mask" ) diff --git a/extensions/accounts/pkg/command/version.go b/extensions/accounts/pkg/command/version.go index bf6cf5ae714..2cdcb0ba485 100644 --- a/extensions/accounts/pkg/command/version.go +++ b/extensions/accounts/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/config/config.go b/extensions/accounts/pkg/config/config.go index 29c2ce7fe5e..a77b6a71fb9 100644 --- a/extensions/accounts/pkg/config/config.go +++ b/extensions/accounts/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/accounts/pkg/config/defaults/defaultconfig.go b/extensions/accounts/pkg/config/defaults/defaultconfig.go index 6aaea79f334..a6ccf691f8d 100644 --- a/extensions/accounts/pkg/config/defaults/defaultconfig.go +++ b/extensions/accounts/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/accounts/pkg/config/parser/parse.go b/extensions/accounts/pkg/config/parser/parse.go index b052fd59c33..0acb3215d73 100644 --- a/extensions/accounts/pkg/config/parser/parse.go +++ b/extensions/accounts/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - defaults "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + defaults "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/accounts/pkg/flagset/flagset.go b/extensions/accounts/pkg/flagset/flagset.go index 906fe7d7079..02886f2fd4d 100644 --- a/extensions/accounts/pkg/flagset/flagset.go +++ b/extensions/accounts/pkg/flagset/flagset.go @@ -1,10 +1,10 @@ package flagset import ( - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/flags" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/flags" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/logging/logging.go b/extensions/accounts/pkg/logging/logging.go index d149689613d..c18957aad85 100644 --- a/extensions/accounts/pkg/logging/logging.go +++ b/extensions/accounts/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/accounts/pkg/server/debug/option.go b/extensions/accounts/pkg/server/debug/option.go index 39e57736476..92d0baa45e9 100644 --- a/extensions/accounts/pkg/server/debug/option.go +++ b/extensions/accounts/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/accounts/pkg/server/debug/server.go b/extensions/accounts/pkg/server/debug/server.go index e6d1b26c7ce..e4454d09a36 100644 --- a/extensions/accounts/pkg/server/debug/server.go +++ b/extensions/accounts/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/accounts/pkg/server/grpc/option.go b/extensions/accounts/pkg/server/grpc/option.go index 134a8b2943e..527629f3bce 100644 --- a/extensions/accounts/pkg/server/grpc/option.go +++ b/extensions/accounts/pkg/server/grpc/option.go @@ -3,10 +3,10 @@ package grpc import ( "context" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/extensions/accounts/pkg/metrics" - svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/metrics" + svc "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/server/grpc/server.go b/extensions/accounts/pkg/server/grpc/server.go index 48def49bdbb..fa18174cb8d 100644 --- a/extensions/accounts/pkg/server/grpc/server.go +++ b/extensions/accounts/pkg/server/grpc/server.go @@ -1,10 +1,10 @@ package grpc import ( - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes a new go-micro service ready to run diff --git a/extensions/accounts/pkg/server/http/option.go b/extensions/accounts/pkg/server/http/option.go index 67f647b3208..cb4f4f24b9d 100644 --- a/extensions/accounts/pkg/server/http/option.go +++ b/extensions/accounts/pkg/server/http/option.go @@ -3,10 +3,10 @@ package http import ( "context" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/extensions/accounts/pkg/metrics" - svc "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/metrics" + svc "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/accounts/pkg/server/http/server.go b/extensions/accounts/pkg/server/http/server.go index f577dc49469..8a88e494730 100644 --- a/extensions/accounts/pkg/server/http/server.go +++ b/extensions/accounts/pkg/server/http/server.go @@ -1,16 +1,16 @@ package http import ( - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/extensions/accounts/pkg/assets" - "github.com/owncloud/ocis/ocis-pkg/account" - "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" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/assets" + "github.com/owncloud/ocis/v2/ocis-pkg/account" + "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/accounts/pkg/service/v0/accounts.go b/extensions/accounts/pkg/service/v0/accounts.go index ca7a1c2659c..f81bd0ce71d 100644 --- a/extensions/accounts/pkg/service/v0/accounts.go +++ b/extensions/accounts/pkg/service/v0/accounts.go @@ -16,20 +16,20 @@ import ( "go.opentelemetry.io/otel/attribute" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/gofrs/uuid" "github.com/golang/protobuf/ptypes/empty" fieldmask_utils "github.com/mennanov/fieldmask-utils" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" - accTracing "github.com/owncloud/ocis/extensions/accounts/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/middleware" - "github.com/owncloud/ocis/ocis-pkg/roles" - "github.com/owncloud/ocis/ocis-pkg/sync" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" - settings_svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" + accTracing "github.com/owncloud/ocis/v2/extensions/accounts/pkg/tracing" + settings_svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/rs/zerolog" merrors "go-micro.dev/v4/errors" "go-micro.dev/v4/metadata" diff --git a/extensions/accounts/pkg/service/v0/accounts_permission_test.go b/extensions/accounts/pkg/service/v0/accounts_permission_test.go index 88eb12506d9..7de969a13ad 100644 --- a/extensions/accounts/pkg/service/v0/accounts_permission_test.go +++ b/extensions/accounts/pkg/service/v0/accounts_permission_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/golang/protobuf/ptypes/empty" - config "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults" - ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - olog "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/middleware" - "github.com/owncloud/ocis/ocis-pkg/roles" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + config "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults" + ssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" merrors "go-micro.dev/v4/errors" @@ -71,7 +71,7 @@ func TestPermissionsListAccounts(t *testing.T) { query string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged // replace with two tests: // 1: "ListAccounts fails with 403 when roleIDs don't exist in context" // 2: "ListAccounts fails with 403 when ('no admin role in context' AND 'empty query')" @@ -118,7 +118,7 @@ func TestPermissionsListAccounts(t *testing.T) { } // TestPermissionsGetAccount checks permission handling on GetAccount -// TODO: remove this test function entirely, when https://github.com/owncloud/ocis/accounts/pull/111 is merged. GetAccount will not have permission checks for the time being. +// TODO: remove this test function entirely, when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged. GetAccount will not have permission checks for the time being. func TestPermissionsGetAccount(t *testing.T) { var scenarios = []struct { name string @@ -169,7 +169,7 @@ func TestPermissionsCreateAccount(t *testing.T) { roleIDs []string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged // replace with two tests: // 1: "CreateAccount fails with 403 when roleIDs don't exist in context" // 2: "CreateAccount fails with 403 when no admin role in context" @@ -217,7 +217,7 @@ func TestPermissionsUpdateAccount(t *testing.T) { roleIDs []string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged // replace with two tests: // 1: "UpdateAccount fails with 403 when roleIDs don't exist in context" // 2: "UpdateAccount fails with 403 when no admin role in context" @@ -265,7 +265,7 @@ func TestPermissionsDeleteAccount(t *testing.T) { roleIDs []string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/v2/accounts/pull/111 is merged // replace with two tests: // 1: "DeleteAccount fails with 403 when roleIDs don't exist in context" // 2: "DeleteAccount fails with 403 when no admin role in context" diff --git a/extensions/accounts/pkg/service/v0/groups.go b/extensions/accounts/pkg/service/v0/groups.go index 8ad166cdb73..f7b95b90817 100644 --- a/extensions/accounts/pkg/service/v0/groups.go +++ b/extensions/accounts/pkg/service/v0/groups.go @@ -5,12 +5,12 @@ import ( "path" "strconv" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/gofrs/uuid" "github.com/golang/protobuf/ptypes/empty" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" merrors "go-micro.dev/v4/errors" p "google.golang.org/protobuf/proto" ) diff --git a/extensions/accounts/pkg/service/v0/index.go b/extensions/accounts/pkg/service/v0/index.go index 73f35698c0f..a0f9e31920c 100644 --- a/extensions/accounts/pkg/service/v0/index.go +++ b/extensions/accounts/pkg/service/v0/index.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" - "github.com/owncloud/ocis/ocis-pkg/indexer" - "github.com/owncloud/ocis/ocis-pkg/indexer/config" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/config" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" ) // RebuildIndex deletes all indices (in memory and on storage) and rebuilds them from scratch. diff --git a/extensions/accounts/pkg/service/v0/option.go b/extensions/accounts/pkg/service/v0/option.go index 377e071eac7..3296dc95563 100644 --- a/extensions/accounts/pkg/service/v0/option.go +++ b/extensions/accounts/pkg/service/v0/option.go @@ -1,10 +1,10 @@ package service import ( - "github.com/owncloud/ocis/extensions/accounts/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" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // Option defines a single option function. diff --git a/extensions/accounts/pkg/service/v0/permissions.go b/extensions/accounts/pkg/service/v0/permissions.go index 4fce6cc746b..3b1fd71afe1 100644 --- a/extensions/accounts/pkg/service/v0/permissions.go +++ b/extensions/accounts/pkg/service/v0/permissions.go @@ -3,12 +3,12 @@ package service import ( "context" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - olog "github.com/owncloud/ocis/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + ssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) const ( diff --git a/extensions/accounts/pkg/service/v0/service.go b/extensions/accounts/pkg/service/v0/service.go index f5a1041a375..54b9651fb9f 100644 --- a/extensions/accounts/pkg/service/v0/service.go +++ b/extensions/accounts/pkg/service/v0/service.go @@ -8,21 +8,21 @@ import ( "strings" "time" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" "github.com/pkg/errors" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" - "github.com/owncloud/ocis/ocis-pkg/indexer" - idxcfg "github.com/owncloud/ocis/ocis-pkg/indexer/config" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer" + idxcfg "github.com/owncloud/ocis/v2/ocis-pkg/indexer/config" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - oreg "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/roles" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + oreg "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // userDefaultGID is the default integer representing the "users" group. diff --git a/extensions/accounts/pkg/storage/cs3.go b/extensions/accounts/pkg/storage/cs3.go index 9992397f0ec..3a1571f1134 100644 --- a/extensions/accounts/pkg/storage/cs3.go +++ b/extensions/accounts/pkg/storage/cs3.go @@ -15,10 +15,10 @@ import ( "github.com/cs3org/reva/v2/pkg/token" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - olog "github.com/owncloud/ocis/ocis-pkg/log" - metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" "google.golang.org/grpc/metadata" ) diff --git a/extensions/accounts/pkg/storage/cs3_test.go b/extensions/accounts/pkg/storage/cs3_test.go index b5c02380eb1..c71e1782276 100644 --- a/extensions/accounts/pkg/storage/cs3_test.go +++ b/extensions/accounts/pkg/storage/cs3_test.go @@ -4,8 +4,8 @@ package storage //import ( // "context" -// accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" -// "github.com/owncloud/ocis/accounts/pkg/config" +// accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" +// "github.com/owncloud/ocis/v2/accounts/pkg/config" // "github.com/stretchr/testify/assert" // "testing" //) diff --git a/extensions/accounts/pkg/storage/disk.go b/extensions/accounts/pkg/storage/disk.go index 716e99c92f2..8c3714c0a83 100644 --- a/extensions/accounts/pkg/storage/disk.go +++ b/extensions/accounts/pkg/storage/disk.go @@ -8,10 +8,10 @@ import ( "path/filepath" "sync" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - olog "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var groupLock sync.Mutex diff --git a/extensions/accounts/pkg/storage/repo.go b/extensions/accounts/pkg/storage/repo.go index 7b41876c81b..9da9f91d258 100644 --- a/extensions/accounts/pkg/storage/repo.go +++ b/extensions/accounts/pkg/storage/repo.go @@ -3,7 +3,7 @@ package storage import ( "context" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" ) const ( diff --git a/extensions/accounts/pkg/tracing/tracing.go b/extensions/accounts/pkg/tracing/tracing.go index 7896ca3f907..504ef6bfdae 100644 --- a/extensions/accounts/pkg/tracing/tracing.go +++ b/extensions/accounts/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/app-provider/cmd/app-provider/main.go b/extensions/app-provider/cmd/app-provider/main.go index e16c590b729..43c7ac4783f 100644 --- a/extensions/app-provider/cmd/app-provider/main.go +++ b/extensions/app-provider/cmd/app-provider/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/app-provider/pkg/command" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/defaults" ) func main() { diff --git a/extensions/app-provider/pkg/command/health.go b/extensions/app-provider/pkg/command/health.go index 64c46626d0a..f57e9707b9f 100644 --- a/extensions/app-provider/pkg/command/health.go +++ b/extensions/app-provider/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config/parser" - "github.com/owncloud/ocis/extensions/app-provider/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-provider/pkg/command/root.go b/extensions/app-provider/pkg/command/root.go index eb42d7289b2..ba620fd04dc 100644 --- a/extensions/app-provider/pkg/command/root.go +++ b/extensions/app-provider/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-provider/pkg/command/server.go b/extensions/app-provider/pkg/command/server.go index 78ee4ef4206..05d905c5d01 100644 --- a/extensions/app-provider/pkg/command/server.go +++ b/extensions/app-provider/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config/parser" - "github.com/owncloud/ocis/extensions/app-provider/pkg/logging" - "github.com/owncloud/ocis/extensions/app-provider/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/app-provider/pkg/server/debug" - "github.com/owncloud/ocis/extensions/app-provider/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-provider/pkg/command/version.go b/extensions/app-provider/pkg/command/version.go index 9ca6e23d863..0623059e5bf 100644 --- a/extensions/app-provider/pkg/command/version.go +++ b/extensions/app-provider/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-provider/pkg/config/config.go b/extensions/app-provider/pkg/config/config.go index ca0c569ff7c..8ed590b8558 100644 --- a/extensions/app-provider/pkg/config/config.go +++ b/extensions/app-provider/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/app-provider/pkg/config/defaults/defaultconfig.go b/extensions/app-provider/pkg/config/defaults/defaultconfig.go index 22a4d5a0fdc..dc8fc2b0485 100644 --- a/extensions/app-provider/pkg/config/defaults/defaultconfig.go +++ b/extensions/app-provider/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/app-provider/pkg/config/parser/parse.go b/extensions/app-provider/pkg/config/parser/parse.go index 78439f269d3..737ce03237e 100644 --- a/extensions/app-provider/pkg/config/parser/parse.go +++ b/extensions/app-provider/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/app-provider/pkg/logging/logging.go b/extensions/app-provider/pkg/logging/logging.go index 33f9128ba86..5bd741e0638 100644 --- a/extensions/app-provider/pkg/logging/logging.go +++ b/extensions/app-provider/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/app-provider/pkg/revaconfig/config.go b/extensions/app-provider/pkg/revaconfig/config.go index 3f4217e9f33..d8d4f51c8bf 100644 --- a/extensions/app-provider/pkg/revaconfig/config.go +++ b/extensions/app-provider/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" ) // AppProviderConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/app-provider/pkg/server/debug/option.go b/extensions/app-provider/pkg/server/debug/option.go index fb0d4fdf431..b0ca9348acf 100644 --- a/extensions/app-provider/pkg/server/debug/option.go +++ b/extensions/app-provider/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/app-provider/pkg/server/debug/server.go b/extensions/app-provider/pkg/server/debug/server.go index 04b52c3ce9e..ee48d6bc4ed 100644 --- a/extensions/app-provider/pkg/server/debug/server.go +++ b/extensions/app-provider/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/app-provider/pkg/tracing/tracing.go b/extensions/app-provider/pkg/tracing/tracing.go index fa358604ba1..0311f3b8925 100644 --- a/extensions/app-provider/pkg/tracing/tracing.go +++ b/extensions/app-provider/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/app-registry/cmd/app-registry/main.go b/extensions/app-registry/cmd/app-registry/main.go index 19565e1e814..023b61ff432 100644 --- a/extensions/app-registry/cmd/app-registry/main.go +++ b/extensions/app-registry/cmd/app-registry/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/app-registry/pkg/command" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/defaults" ) func main() { diff --git a/extensions/app-registry/pkg/command/health.go b/extensions/app-registry/pkg/command/health.go index c60fd662a93..912ecdfb02b 100644 --- a/extensions/app-registry/pkg/command/health.go +++ b/extensions/app-registry/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config/parser" - "github.com/owncloud/ocis/extensions/app-registry/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-registry/pkg/command/root.go b/extensions/app-registry/pkg/command/root.go index 4525aeefc4d..b2d0fc4dbbc 100644 --- a/extensions/app-registry/pkg/command/root.go +++ b/extensions/app-registry/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-registry/pkg/command/server.go b/extensions/app-registry/pkg/command/server.go index 0ab6f3301c9..ebcc55634e9 100644 --- a/extensions/app-registry/pkg/command/server.go +++ b/extensions/app-registry/pkg/command/server.go @@ -9,14 +9,14 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config/parser" - "github.com/owncloud/ocis/extensions/app-registry/pkg/logging" - "github.com/owncloud/ocis/extensions/app-registry/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/app-registry/pkg/server/debug" - "github.com/owncloud/ocis/extensions/app-registry/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-registry/pkg/command/version.go b/extensions/app-registry/pkg/command/version.go index 04b2d20c619..909f13de0ce 100644 --- a/extensions/app-registry/pkg/command/version.go +++ b/extensions/app-registry/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/app-registry/pkg/config/config.go b/extensions/app-registry/pkg/config/config.go index d3efe36e50e..5211333828e 100644 --- a/extensions/app-registry/pkg/config/config.go +++ b/extensions/app-registry/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/app-registry/pkg/config/defaults/defaultconfig.go b/extensions/app-registry/pkg/config/defaults/defaultconfig.go index 8e24bab7441..1ff3f4c4dbd 100644 --- a/extensions/app-registry/pkg/config/defaults/defaultconfig.go +++ b/extensions/app-registry/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/app-registry/pkg/config/parser/parse.go b/extensions/app-registry/pkg/config/parser/parse.go index 894f938b6ec..5770c4fca9e 100644 --- a/extensions/app-registry/pkg/config/parser/parse.go +++ b/extensions/app-registry/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/app-registry/pkg/logging/logging.go b/extensions/app-registry/pkg/logging/logging.go index f887afef4c7..9776ff7481b 100644 --- a/extensions/app-registry/pkg/logging/logging.go +++ b/extensions/app-registry/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/app-registry/pkg/revaconfig/config.go b/extensions/app-registry/pkg/revaconfig/config.go index 576f1643c6c..7dba83405bb 100644 --- a/extensions/app-registry/pkg/revaconfig/config.go +++ b/extensions/app-registry/pkg/revaconfig/config.go @@ -1,10 +1,10 @@ package revaconfig import ( - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/mitchellh/mapstructure" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" ) // AppRegistryConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/app-registry/pkg/server/debug/option.go b/extensions/app-registry/pkg/server/debug/option.go index 2ccb53ed451..043e3fefe9f 100644 --- a/extensions/app-registry/pkg/server/debug/option.go +++ b/extensions/app-registry/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/app-registry/pkg/server/debug/server.go b/extensions/app-registry/pkg/server/debug/server.go index cf106ef99b0..28fb8245aca 100644 --- a/extensions/app-registry/pkg/server/debug/server.go +++ b/extensions/app-registry/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/app-registry/pkg/tracing/tracing.go b/extensions/app-registry/pkg/tracing/tracing.go index 8d3a2244450..2c975afc520 100644 --- a/extensions/app-registry/pkg/tracing/tracing.go +++ b/extensions/app-registry/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/audit/cmd/audit/main.go b/extensions/audit/cmd/audit/main.go index 82da7af3a75..3263360b48c 100644 --- a/extensions/audit/cmd/audit/main.go +++ b/extensions/audit/cmd/audit/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/audit/pkg/command" - "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/command" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config/defaults" ) func main() { diff --git a/extensions/audit/pkg/command/health.go b/extensions/audit/pkg/command/health.go index 6dfbc30b721..530bf24cb0a 100644 --- a/extensions/audit/pkg/command/health.go +++ b/extensions/audit/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/audit/pkg/command/root.go b/extensions/audit/pkg/command/root.go index 0920b226291..043bf29ef82 100644 --- a/extensions/audit/pkg/command/root.go +++ b/extensions/audit/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/audit/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/audit/pkg/command/server.go b/extensions/audit/pkg/command/server.go index ad4ad4e1752..f3d18cac4a3 100644 --- a/extensions/audit/pkg/command/server.go +++ b/extensions/audit/pkg/command/server.go @@ -7,11 +7,11 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/server" "github.com/go-micro/plugins/v4/events/natsjs" - "github.com/owncloud/ocis/extensions/audit/pkg/config" - "github.com/owncloud/ocis/extensions/audit/pkg/config/parser" - "github.com/owncloud/ocis/extensions/audit/pkg/logging" - svc "github.com/owncloud/ocis/extensions/audit/pkg/service" - "github.com/owncloud/ocis/extensions/audit/pkg/types" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/logging" + svc "github.com/owncloud/ocis/v2/extensions/audit/pkg/service" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/types" "github.com/urfave/cli/v2" ) diff --git a/extensions/audit/pkg/command/version.go b/extensions/audit/pkg/command/version.go index 83bccd714f5..0a90a7e1bbc 100644 --- a/extensions/audit/pkg/command/version.go +++ b/extensions/audit/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/audit/pkg/config/config.go b/extensions/audit/pkg/config/config.go index 6d21112898a..cdb71c79438 100644 --- a/extensions/audit/pkg/config/config.go +++ b/extensions/audit/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/audit/pkg/config/defaults/defaultconfig.go b/extensions/audit/pkg/config/defaults/defaultconfig.go index f6ec2fb31e3..bf732d98ceb 100644 --- a/extensions/audit/pkg/config/defaults/defaultconfig.go +++ b/extensions/audit/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/audit/pkg/config/parser/parse.go b/extensions/audit/pkg/config/parser/parse.go index f34652a3193..677e5906caa 100644 --- a/extensions/audit/pkg/config/parser/parse.go +++ b/extensions/audit/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/audit/pkg/config" - "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/audit/pkg/logging/logging.go b/extensions/audit/pkg/logging/logging.go index c87d7f3280f..17ab56c5c35 100644 --- a/extensions/audit/pkg/logging/logging.go +++ b/extensions/audit/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/audit/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/audit/pkg/service/service.go b/extensions/audit/pkg/service/service.go index 6d42a3b04a1..1b5f7ae0360 100644 --- a/extensions/audit/pkg/service/service.go +++ b/extensions/audit/pkg/service/service.go @@ -7,9 +7,9 @@ import ( "os" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/extensions/audit/pkg/config" - "github.com/owncloud/ocis/extensions/audit/pkg/types" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/types" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Log is used to log to different outputs diff --git a/extensions/audit/pkg/service/service_test.go b/extensions/audit/pkg/service/service_test.go index 6d45dfde1a3..5de097bedf4 100644 --- a/extensions/audit/pkg/service/service_test.go +++ b/extensions/audit/pkg/service/service_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/extensions/audit/pkg/types" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/types" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/test-go/testify/require" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" diff --git a/extensions/auth-basic/cmd/auth-basic/main.go b/extensions/auth-basic/cmd/auth-basic/main.go index de391e6c67e..9aef09d3f72 100644 --- a/extensions/auth-basic/cmd/auth-basic/main.go +++ b/extensions/auth-basic/cmd/auth-basic/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/command" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/defaults" ) func main() { diff --git a/extensions/auth-basic/pkg/command/health.go b/extensions/auth-basic/pkg/command/health.go index 877e1d0c1b6..bb4ac624a2f 100644 --- a/extensions/auth-basic/pkg/command/health.go +++ b/extensions/auth-basic/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/parser" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-basic/pkg/command/root.go b/extensions/auth-basic/pkg/command/root.go index 735941988a2..c7f7dff3b56 100644 --- a/extensions/auth-basic/pkg/command/root.go +++ b/extensions/auth-basic/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-basic/pkg/command/server.go b/extensions/auth-basic/pkg/command/server.go index 642bb759030..a14cdc4bab3 100644 --- a/extensions/auth-basic/pkg/command/server.go +++ b/extensions/auth-basic/pkg/command/server.go @@ -9,16 +9,16 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/parser" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/logging" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/server/debug" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/ldap" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/ldap" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-basic/pkg/command/version.go b/extensions/auth-basic/pkg/command/version.go index f6c6415e74f..ffb931407f5 100644 --- a/extensions/auth-basic/pkg/command/version.go +++ b/extensions/auth-basic/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-basic/pkg/config/config.go b/extensions/auth-basic/pkg/config/config.go index b09148fb137..69b5fba1469 100644 --- a/extensions/auth-basic/pkg/config/config.go +++ b/extensions/auth-basic/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/auth-basic/pkg/config/defaults/defaultconfig.go b/extensions/auth-basic/pkg/config/defaults/defaultconfig.go index 6224e1fb6bb..113e1b11597 100644 --- a/extensions/auth-basic/pkg/config/defaults/defaultconfig.go +++ b/extensions/auth-basic/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/auth-basic/pkg/config/parser/parse.go b/extensions/auth-basic/pkg/config/parser/parse.go index de3b06d5c54..e202c43beed 100644 --- a/extensions/auth-basic/pkg/config/parser/parse.go +++ b/extensions/auth-basic/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/auth-basic/pkg/logging/logging.go b/extensions/auth-basic/pkg/logging/logging.go index 3f997d85022..686e809b634 100644 --- a/extensions/auth-basic/pkg/logging/logging.go +++ b/extensions/auth-basic/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/auth-basic/pkg/revaconfig/config.go b/extensions/auth-basic/pkg/revaconfig/config.go index 59ea585f76d..cba78917880 100644 --- a/extensions/auth-basic/pkg/revaconfig/config.go +++ b/extensions/auth-basic/pkg/revaconfig/config.go @@ -1,6 +1,6 @@ package revaconfig -import "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" +import "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" // AuthBasicConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. func AuthBasicConfigFromStruct(cfg *config.Config) map[string]interface{} { diff --git a/extensions/auth-basic/pkg/server/debug/option.go b/extensions/auth-basic/pkg/server/debug/option.go index ed1658963c2..0af0e350b06 100644 --- a/extensions/auth-basic/pkg/server/debug/option.go +++ b/extensions/auth-basic/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/auth-basic/pkg/server/debug/server.go b/extensions/auth-basic/pkg/server/debug/server.go index e6f813ac974..c3b401ac36c 100644 --- a/extensions/auth-basic/pkg/server/debug/server.go +++ b/extensions/auth-basic/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/auth-basic/pkg/tracing/tracing.go b/extensions/auth-basic/pkg/tracing/tracing.go index 3d6cd1b15d7..bcac0cd9dab 100644 --- a/extensions/auth-basic/pkg/tracing/tracing.go +++ b/extensions/auth-basic/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/auth-bearer/cmd/auth-bearer/main.go b/extensions/auth-bearer/cmd/auth-bearer/main.go index 024879e4528..0a6ebecb979 100644 --- a/extensions/auth-bearer/cmd/auth-bearer/main.go +++ b/extensions/auth-bearer/cmd/auth-bearer/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/defaults" ) func main() { diff --git a/extensions/auth-bearer/pkg/command/health.go b/extensions/auth-bearer/pkg/command/health.go index c38aefdc71a..87cb0991376 100644 --- a/extensions/auth-bearer/pkg/command/health.go +++ b/extensions/auth-bearer/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/parser" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-bearer/pkg/command/root.go b/extensions/auth-bearer/pkg/command/root.go index 41431fd4981..bb78f2efeca 100644 --- a/extensions/auth-bearer/pkg/command/root.go +++ b/extensions/auth-bearer/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-bearer/pkg/command/server.go b/extensions/auth-bearer/pkg/command/server.go index c4d52111804..3beb36c6744 100644 --- a/extensions/auth-bearer/pkg/command/server.go +++ b/extensions/auth-bearer/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/parser" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/logging" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/server/debug" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-bearer/pkg/command/version.go b/extensions/auth-bearer/pkg/command/version.go index c90f60e08f2..0dba13638e5 100644 --- a/extensions/auth-bearer/pkg/command/version.go +++ b/extensions/auth-bearer/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-bearer/pkg/config/config.go b/extensions/auth-bearer/pkg/config/config.go index 6d8fc3faf62..7c1390e2afa 100644 --- a/extensions/auth-bearer/pkg/config/config.go +++ b/extensions/auth-bearer/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go b/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go index 6c37acaf779..2a225d96bc4 100644 --- a/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go +++ b/extensions/auth-bearer/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/auth-bearer/pkg/config/parser/parse.go b/extensions/auth-bearer/pkg/config/parser/parse.go index fc3a1c50206..7ee80bb04e4 100644 --- a/extensions/auth-bearer/pkg/config/parser/parse.go +++ b/extensions/auth-bearer/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/auth-bearer/pkg/logging/logging.go b/extensions/auth-bearer/pkg/logging/logging.go index c92d63022c9..70706b74a4a 100644 --- a/extensions/auth-bearer/pkg/logging/logging.go +++ b/extensions/auth-bearer/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/auth-bearer/pkg/revaconfig/config.go b/extensions/auth-bearer/pkg/revaconfig/config.go index bb88e4b0889..4925ee993b8 100644 --- a/extensions/auth-bearer/pkg/revaconfig/config.go +++ b/extensions/auth-bearer/pkg/revaconfig/config.go @@ -1,6 +1,6 @@ package revaconfig -import "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" +import "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" // AuthBearerConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. func AuthBearerConfigFromStruct(cfg *config.Config) map[string]interface{} { diff --git a/extensions/auth-bearer/pkg/server/debug/option.go b/extensions/auth-bearer/pkg/server/debug/option.go index 8ed17ad2690..07ec936357f 100644 --- a/extensions/auth-bearer/pkg/server/debug/option.go +++ b/extensions/auth-bearer/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/auth-bearer/pkg/server/debug/server.go b/extensions/auth-bearer/pkg/server/debug/server.go index f125a128702..6f2f5d4fbf5 100644 --- a/extensions/auth-bearer/pkg/server/debug/server.go +++ b/extensions/auth-bearer/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/auth-bearer/pkg/tracing/tracing.go b/extensions/auth-bearer/pkg/tracing/tracing.go index cb139893c79..67a0dc3f04a 100644 --- a/extensions/auth-bearer/pkg/tracing/tracing.go +++ b/extensions/auth-bearer/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/auth-machine/cmd/auth-machine/main.go b/extensions/auth-machine/cmd/auth-machine/main.go index 2a29a75e6e7..5ae469c71c8 100644 --- a/extensions/auth-machine/cmd/auth-machine/main.go +++ b/extensions/auth-machine/cmd/auth-machine/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/command" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/defaults" ) func main() { diff --git a/extensions/auth-machine/pkg/command/health.go b/extensions/auth-machine/pkg/command/health.go index ad86b257871..50b886f724a 100644 --- a/extensions/auth-machine/pkg/command/health.go +++ b/extensions/auth-machine/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/parser" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-machine/pkg/command/root.go b/extensions/auth-machine/pkg/command/root.go index 593d455702d..26576299469 100644 --- a/extensions/auth-machine/pkg/command/root.go +++ b/extensions/auth-machine/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-machine/pkg/command/server.go b/extensions/auth-machine/pkg/command/server.go index e65fc000416..03848cba576 100644 --- a/extensions/auth-machine/pkg/command/server.go +++ b/extensions/auth-machine/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/parser" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/logging" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/server/debug" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-machine/pkg/command/version.go b/extensions/auth-machine/pkg/command/version.go index b2977c09530..20a3b29487d 100644 --- a/extensions/auth-machine/pkg/command/version.go +++ b/extensions/auth-machine/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/auth-machine/pkg/config/config.go b/extensions/auth-machine/pkg/config/config.go index d78749ce54d..c51d6a7ac52 100644 --- a/extensions/auth-machine/pkg/config/config.go +++ b/extensions/auth-machine/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/auth-machine/pkg/config/defaults/defaultconfig.go b/extensions/auth-machine/pkg/config/defaults/defaultconfig.go index 6f156446b44..b472bba1522 100644 --- a/extensions/auth-machine/pkg/config/defaults/defaultconfig.go +++ b/extensions/auth-machine/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/auth-machine/pkg/config/parser/parse.go b/extensions/auth-machine/pkg/config/parser/parse.go index 00a46b84693..e5493ffc570 100644 --- a/extensions/auth-machine/pkg/config/parser/parse.go +++ b/extensions/auth-machine/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/auth-machine/pkg/logging/logging.go b/extensions/auth-machine/pkg/logging/logging.go index 0d89a6f4b95..84c3be9c634 100644 --- a/extensions/auth-machine/pkg/logging/logging.go +++ b/extensions/auth-machine/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/auth-machine/pkg/revaconfig/config.go b/extensions/auth-machine/pkg/revaconfig/config.go index c4a1514ec1f..1c9acbacf00 100644 --- a/extensions/auth-machine/pkg/revaconfig/config.go +++ b/extensions/auth-machine/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" ) // AuthMachineConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/auth-machine/pkg/server/debug/option.go b/extensions/auth-machine/pkg/server/debug/option.go index 5666e1b3cc3..057a52990d1 100644 --- a/extensions/auth-machine/pkg/server/debug/option.go +++ b/extensions/auth-machine/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/auth-machine/pkg/server/debug/server.go b/extensions/auth-machine/pkg/server/debug/server.go index b523773ce9c..bc24e75e4e4 100644 --- a/extensions/auth-machine/pkg/server/debug/server.go +++ b/extensions/auth-machine/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/auth-machine/pkg/tracing/tracing.go b/extensions/auth-machine/pkg/tracing/tracing.go index 3536995a760..49a7a96af68 100644 --- a/extensions/auth-machine/pkg/tracing/tracing.go +++ b/extensions/auth-machine/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/frontend/cmd/frontend/main.go b/extensions/frontend/cmd/frontend/main.go index a6135fa78ab..9fdc691924c 100644 --- a/extensions/frontend/cmd/frontend/main.go +++ b/extensions/frontend/cmd/frontend/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/frontend/pkg/command" - "github.com/owncloud/ocis/extensions/frontend/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/command" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config/defaults" ) func main() { diff --git a/extensions/frontend/pkg/command/health.go b/extensions/frontend/pkg/command/health.go index a4cedd367fc..ac1e02c8881 100644 --- a/extensions/frontend/pkg/command/health.go +++ b/extensions/frontend/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/extensions/frontend/pkg/config/parser" - "github.com/owncloud/ocis/extensions/frontend/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/frontend/pkg/command/root.go b/extensions/frontend/pkg/command/root.go index 4905363b296..c5eca20b607 100644 --- a/extensions/frontend/pkg/command/root.go +++ b/extensions/frontend/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/frontend/pkg/command/server.go b/extensions/frontend/pkg/command/server.go index 88631228a25..47de6bc3ead 100644 --- a/extensions/frontend/pkg/command/server.go +++ b/extensions/frontend/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/extensions/frontend/pkg/config/parser" - "github.com/owncloud/ocis/extensions/frontend/pkg/logging" - "github.com/owncloud/ocis/extensions/frontend/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/frontend/pkg/server/debug" - "github.com/owncloud/ocis/extensions/frontend/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/frontend/pkg/command/version.go b/extensions/frontend/pkg/command/version.go index d721db12365..f75a2a72889 100644 --- a/extensions/frontend/pkg/command/version.go +++ b/extensions/frontend/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/frontend/pkg/config/config.go b/extensions/frontend/pkg/config/config.go index 5029c445601..d0afebea71b 100644 --- a/extensions/frontend/pkg/config/config.go +++ b/extensions/frontend/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/frontend/pkg/config/defaults/defaultconfig.go b/extensions/frontend/pkg/config/defaults/defaultconfig.go index eec79986499..7a380ec37d7 100644 --- a/extensions/frontend/pkg/config/defaults/defaultconfig.go +++ b/extensions/frontend/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/frontend/pkg/config/parser/parse.go b/extensions/frontend/pkg/config/parser/parse.go index e2ff551a5c4..6577e7b2306 100644 --- a/extensions/frontend/pkg/config/parser/parse.go +++ b/extensions/frontend/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/extensions/frontend/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/frontend/pkg/logging/logging.go b/extensions/frontend/pkg/logging/logging.go index 19c43464d95..20dc29549f4 100644 --- a/extensions/frontend/pkg/logging/logging.go +++ b/extensions/frontend/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/frontend/pkg/revaconfig/config.go b/extensions/frontend/pkg/revaconfig/config.go index 5fbb40c2ef6..67b0be9bfab 100644 --- a/extensions/frontend/pkg/revaconfig/config.go +++ b/extensions/frontend/pkg/revaconfig/config.go @@ -4,7 +4,7 @@ import ( "path" "strconv" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" ) // FrontendConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/frontend/pkg/server/debug/option.go b/extensions/frontend/pkg/server/debug/option.go index a46ead603ad..b4f5ec064d5 100644 --- a/extensions/frontend/pkg/server/debug/option.go +++ b/extensions/frontend/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/frontend/pkg/server/debug/server.go b/extensions/frontend/pkg/server/debug/server.go index 202c9c3058c..c1258629854 100644 --- a/extensions/frontend/pkg/server/debug/server.go +++ b/extensions/frontend/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/frontend/pkg/tracing/tracing.go b/extensions/frontend/pkg/tracing/tracing.go index 8ce5814dfc2..b55b70c5601 100644 --- a/extensions/frontend/pkg/tracing/tracing.go +++ b/extensions/frontend/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/frontend/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/gateway/cmd/gateway/main.go b/extensions/gateway/cmd/gateway/main.go index adcc697111d..570a3c41a36 100644 --- a/extensions/gateway/cmd/gateway/main.go +++ b/extensions/gateway/cmd/gateway/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/gateway/pkg/command" - "github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/command" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config/defaults" ) func main() { diff --git a/extensions/gateway/pkg/command/health.go b/extensions/gateway/pkg/command/health.go index b9bda87a550..9ff7965c774 100644 --- a/extensions/gateway/pkg/command/health.go +++ b/extensions/gateway/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/extensions/gateway/pkg/config/parser" - "github.com/owncloud/ocis/extensions/gateway/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/gateway/pkg/command/root.go b/extensions/gateway/pkg/command/root.go index a162c6d3d48..058d6b4f062 100644 --- a/extensions/gateway/pkg/command/root.go +++ b/extensions/gateway/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/gateway/pkg/command/server.go b/extensions/gateway/pkg/command/server.go index 7caccfbb3a7..3a0bb4be310 100644 --- a/extensions/gateway/pkg/command/server.go +++ b/extensions/gateway/pkg/command/server.go @@ -9,14 +9,14 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/extensions/gateway/pkg/config/parser" - "github.com/owncloud/ocis/extensions/gateway/pkg/logging" - "github.com/owncloud/ocis/extensions/gateway/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/gateway/pkg/server/debug" - "github.com/owncloud/ocis/extensions/gateway/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/gateway/pkg/command/version.go b/extensions/gateway/pkg/command/version.go index efe2adaf7dd..3b58f8ba42c 100644 --- a/extensions/gateway/pkg/command/version.go +++ b/extensions/gateway/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/gateway/pkg/config/config.go b/extensions/gateway/pkg/config/config.go index 8cd5229aa9f..daa9ec030b9 100644 --- a/extensions/gateway/pkg/config/config.go +++ b/extensions/gateway/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/gateway/pkg/config/defaults/defaultconfig.go b/extensions/gateway/pkg/config/defaults/defaultconfig.go index 3cc5b421163..b4dc0c603ed 100644 --- a/extensions/gateway/pkg/config/defaults/defaultconfig.go +++ b/extensions/gateway/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/gateway/pkg/config/parser/parse.go b/extensions/gateway/pkg/config/parser/parse.go index 424efdbfb21..62146646b34 100644 --- a/extensions/gateway/pkg/config/parser/parse.go +++ b/extensions/gateway/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/gateway/pkg/logging/logging.go b/extensions/gateway/pkg/logging/logging.go index 4623c743c57..6e80a90017c 100644 --- a/extensions/gateway/pkg/logging/logging.go +++ b/extensions/gateway/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/gateway/pkg/revaconfig/config.go b/extensions/gateway/pkg/revaconfig/config.go index eccd39f0a35..2ced3c68a59 100644 --- a/extensions/gateway/pkg/revaconfig/config.go +++ b/extensions/gateway/pkg/revaconfig/config.go @@ -5,10 +5,10 @@ import ( "io/ioutil" "strings" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" ) // GatewayConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/gateway/pkg/server/debug/option.go b/extensions/gateway/pkg/server/debug/option.go index 9bdf55de12d..34edb7f8250 100644 --- a/extensions/gateway/pkg/server/debug/option.go +++ b/extensions/gateway/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/gateway/pkg/server/debug/server.go b/extensions/gateway/pkg/server/debug/server.go index a1470d904c6..0723560a0b9 100644 --- a/extensions/gateway/pkg/server/debug/server.go +++ b/extensions/gateway/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/gateway/pkg/tracing/tracing.go b/extensions/gateway/pkg/tracing/tracing.go index cdc355b20d6..41f6df08f16 100644 --- a/extensions/gateway/pkg/tracing/tracing.go +++ b/extensions/gateway/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/gateway/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/glauth/cmd/glauth/main.go b/extensions/glauth/cmd/glauth/main.go index ecc96b08213..8ea187a7f0a 100644 --- a/extensions/glauth/cmd/glauth/main.go +++ b/extensions/glauth/cmd/glauth/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/glauth/pkg/command" - "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/command" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/defaults" ) func main() { diff --git a/extensions/glauth/pkg/command/health.go b/extensions/glauth/pkg/command/health.go index 0ec61709215..dc602089161 100644 --- a/extensions/glauth/pkg/command/health.go +++ b/extensions/glauth/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "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/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/glauth/pkg/command/root.go b/extensions/glauth/pkg/command/root.go index 27d48cc8cad..e3583072152 100644 --- a/extensions/glauth/pkg/command/root.go +++ b/extensions/glauth/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "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/owncloud/ocis/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/glauth/pkg/command/server.go b/extensions/glauth/pkg/command/server.go index 5a674cdc948..5a83a87d421 100644 --- a/extensions/glauth/pkg/command/server.go +++ b/extensions/glauth/pkg/command/server.go @@ -4,20 +4,20 @@ import ( "context" "fmt" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" glauthcfg "github.com/glauth/glauth/v2/pkg/config" "github.com/oklog/run" - "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" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/server/glauth" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/tracing" + pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/glauth/pkg/command/version.go b/extensions/glauth/pkg/command/version.go index a14d81accb3..326749250d8 100644 --- a/extensions/glauth/pkg/command/version.go +++ b/extensions/glauth/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/glauth/pkg/config/config.go b/extensions/glauth/pkg/config/config.go index aa8479989a3..5d0265764ec 100644 --- a/extensions/glauth/pkg/config/config.go +++ b/extensions/glauth/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/glauth/pkg/config/defaults/defaultconfig.go b/extensions/glauth/pkg/config/defaults/defaultconfig.go index d4508ee9d74..4dd3c907d42 100644 --- a/extensions/glauth/pkg/config/defaults/defaultconfig.go +++ b/extensions/glauth/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/extensions/glauth/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/glauth/pkg/config/parser/parse.go b/extensions/glauth/pkg/config/parser/parse.go index a3598df4bc0..575363e246d 100644 --- a/extensions/glauth/pkg/config/parser/parse.go +++ b/extensions/glauth/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "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/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/glauth/pkg/logging/logging.go b/extensions/glauth/pkg/logging/logging.go index cb8b54ad678..c60357106bc 100644 --- a/extensions/glauth/pkg/logging/logging.go +++ b/extensions/glauth/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/glauth/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/glauth/pkg/mlogr/mlogr.go b/extensions/glauth/pkg/mlogr/mlogr.go index 61cdc8de39b..642e399ffb0 100644 --- a/extensions/glauth/pkg/mlogr/mlogr.go +++ b/extensions/glauth/pkg/mlogr/mlogr.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/go-logr/logr" - plog "github.com/owncloud/ocis/ocis-pkg/log" + plog "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/rs/zerolog" ) diff --git a/extensions/glauth/pkg/server/debug/option.go b/extensions/glauth/pkg/server/debug/option.go index 2ad68fb5d3d..9d9496ca468 100644 --- a/extensions/glauth/pkg/server/debug/option.go +++ b/extensions/glauth/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/glauth/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/glauth/pkg/server/debug/server.go b/extensions/glauth/pkg/server/debug/server.go index 984358a3b12..6dd2d539c91 100644 --- a/extensions/glauth/pkg/server/debug/server.go +++ b/extensions/glauth/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/glauth/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/glauth/pkg/server/glauth/chain.go b/extensions/glauth/pkg/server/glauth/chain.go index e5d45fd5633..d511d62f9aa 100644 --- a/extensions/glauth/pkg/server/glauth/chain.go +++ b/extensions/glauth/pkg/server/glauth/chain.go @@ -6,7 +6,7 @@ import ( "github.com/glauth/glauth/v2/pkg/config" "github.com/glauth/glauth/v2/pkg/handler" "github.com/nmcclain/ldap" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) type chainHandler struct { diff --git a/extensions/glauth/pkg/server/glauth/ocis.go b/extensions/glauth/pkg/server/glauth/ocis.go index ba6c769ac1c..29dd70b89f9 100644 --- a/extensions/glauth/pkg/server/glauth/ocis.go +++ b/extensions/glauth/pkg/server/glauth/ocis.go @@ -8,16 +8,16 @@ import ( "strconv" "strings" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/glauth/glauth/v2/pkg/config" "github.com/glauth/glauth/v2/pkg/handler" "github.com/glauth/glauth/v2/pkg/stats" ber "github.com/nmcclain/asn1-ber" "github.com/nmcclain/ldap" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" "go-micro.dev/v4/metadata" ) diff --git a/extensions/glauth/pkg/server/glauth/option.go b/extensions/glauth/pkg/server/glauth/option.go index 9b244cd5c6b..f4303ec3dfc 100644 --- a/extensions/glauth/pkg/server/glauth/option.go +++ b/extensions/glauth/pkg/server/glauth/option.go @@ -3,10 +3,10 @@ package glauth import ( "context" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "github.com/glauth/glauth/v2/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/glauth/pkg/server/glauth/server.go b/extensions/glauth/pkg/server/glauth/server.go index 2e6394be71d..4ebae251ff0 100644 --- a/extensions/glauth/pkg/server/glauth/server.go +++ b/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/extensions/glauth/pkg/mlogr" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/mlogr" ) // LdapSvc holds the ldap server struct diff --git a/extensions/glauth/pkg/tracing/tracing.go b/extensions/glauth/pkg/tracing/tracing.go index c2e19cce668..ce531006e92 100644 --- a/extensions/glauth/pkg/tracing/tracing.go +++ b/extensions/glauth/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/glauth/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/graph-explorer/cmd/graph-explorer/main.go b/extensions/graph-explorer/cmd/graph-explorer/main.go index 7ef911df6c0..dc1c83a80f7 100644 --- a/extensions/graph-explorer/cmd/graph-explorer/main.go +++ b/extensions/graph-explorer/cmd/graph-explorer/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/defaults" ) func main() { diff --git a/extensions/graph-explorer/pkg/assets/option.go b/extensions/graph-explorer/pkg/assets/option.go index 7b6d12a34cd..d0d5e115503 100644 --- a/extensions/graph-explorer/pkg/assets/option.go +++ b/extensions/graph-explorer/pkg/assets/option.go @@ -3,10 +3,10 @@ package assets import ( "net/http" - graphexplorer "github.com/owncloud/ocis/extensions/graph-explorer" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/assetsfs" - "github.com/owncloud/ocis/ocis-pkg/log" + graphexplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/assetsfs" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // New returns a new http filesystem to serve assets. diff --git a/extensions/graph-explorer/pkg/command/health.go b/extensions/graph-explorer/pkg/command/health.go index 8ee126ebb2d..da1feefd43c 100644 --- a/extensions/graph-explorer/pkg/command/health.go +++ b/extensions/graph-explorer/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/parser" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph-explorer/pkg/command/root.go b/extensions/graph-explorer/pkg/command/root.go index 34bc27c09aa..ce7e1dbafaf 100644 --- a/extensions/graph-explorer/pkg/command/root.go +++ b/extensions/graph-explorer/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph-explorer/pkg/command/server.go b/extensions/graph-explorer/pkg/command/server.go index 562cfa569cc..41d3710de6f 100644 --- a/extensions/graph-explorer/pkg/command/server.go +++ b/extensions/graph-explorer/pkg/command/server.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/parser" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/logging" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/metrics" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/server/debug" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/server/http" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph-explorer/pkg/command/version.go b/extensions/graph-explorer/pkg/command/version.go index a6e0866328e..e180f5a42e5 100644 --- a/extensions/graph-explorer/pkg/command/version.go +++ b/extensions/graph-explorer/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph-explorer/pkg/config/config.go b/extensions/graph-explorer/pkg/config/config.go index 2bd5bd5a62b..4301472d4ab 100644 --- a/extensions/graph-explorer/pkg/config/config.go +++ b/extensions/graph-explorer/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go b/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go index 27b194940a2..1e2d77b1677 100644 --- a/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go +++ b/extensions/graph-explorer/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/graph-explorer/pkg/config/parser/parse.go b/extensions/graph-explorer/pkg/config/parser/parse.go index ae369113fc8..d6f355a2ffe 100644 --- a/extensions/graph-explorer/pkg/config/parser/parse.go +++ b/extensions/graph-explorer/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/graph-explorer/pkg/logging/logging.go b/extensions/graph-explorer/pkg/logging/logging.go index 506cb623de4..bf2db03f50a 100644 --- a/extensions/graph-explorer/pkg/logging/logging.go +++ b/extensions/graph-explorer/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/graph-explorer/pkg/server/debug/option.go b/extensions/graph-explorer/pkg/server/debug/option.go index 8f8078e34ea..f18c953b987 100644 --- a/extensions/graph-explorer/pkg/server/debug/option.go +++ b/extensions/graph-explorer/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/graph-explorer/pkg/server/debug/server.go b/extensions/graph-explorer/pkg/server/debug/server.go index 84ffb3cafa5..7a8a6786a8b 100644 --- a/extensions/graph-explorer/pkg/server/debug/server.go +++ b/extensions/graph-explorer/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/graph-explorer/pkg/server/http/option.go b/extensions/graph-explorer/pkg/server/http/option.go index 327f6968edc..3edd0957825 100644 --- a/extensions/graph-explorer/pkg/server/http/option.go +++ b/extensions/graph-explorer/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph-explorer/pkg/server/http/server.go b/extensions/graph-explorer/pkg/server/http/server.go index 3883399a65f..90fc5b9342b 100644 --- a/extensions/graph-explorer/pkg/server/http/server.go +++ b/extensions/graph-explorer/pkg/server/http/server.go @@ -2,10 +2,10 @@ package http import ( chimiddleware "github.com/go-chi/chi/v5/middleware" - svc "github.com/owncloud/ocis/extensions/graph-explorer/pkg/service/v0" - "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/v2/extensions/graph-explorer/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/graph-explorer/pkg/service/v0/instrument.go b/extensions/graph-explorer/pkg/service/v0/instrument.go index 72407096e3c..82bf24f2be9 100644 --- a/extensions/graph-explorer/pkg/service/v0/instrument.go +++ b/extensions/graph-explorer/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/graph-explorer/pkg/service/v0/logging.go b/extensions/graph-explorer/pkg/service/v0/logging.go index 20e7be12ba0..8ead4de6a9f 100644 --- a/extensions/graph-explorer/pkg/service/v0/logging.go +++ b/extensions/graph-explorer/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/graph-explorer/pkg/service/v0/option.go b/extensions/graph-explorer/pkg/service/v0/option.go index 06a2b1fc7f3..ea1eb949f9e 100644 --- a/extensions/graph-explorer/pkg/service/v0/option.go +++ b/extensions/graph-explorer/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/graph-explorer/pkg/service/v0/service.go b/extensions/graph-explorer/pkg/service/v0/service.go index cb1f210d9d0..3875aa90b67 100644 --- a/extensions/graph-explorer/pkg/service/v0/service.go +++ b/extensions/graph-explorer/pkg/service/v0/service.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/go-chi/chi/v5" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/assets" - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/assets" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Service defines the extension handlers. diff --git a/extensions/graph-explorer/pkg/tracing/tracing.go b/extensions/graph-explorer/pkg/tracing/tracing.go index 1825338f028..12c3f163869 100644 --- a/extensions/graph-explorer/pkg/tracing/tracing.go +++ b/extensions/graph-explorer/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/graph/cmd/graph/main.go b/extensions/graph/cmd/graph/main.go index 4f4377ad1e6..d11a6ed6e96 100644 --- a/extensions/graph/cmd/graph/main.go +++ b/extensions/graph/cmd/graph/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/graph/pkg/command" - "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/command" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults" ) func main() { diff --git a/extensions/graph/pkg/command/health.go b/extensions/graph/pkg/command/health.go index befa8a2e5c7..d6bdf3924e5 100644 --- a/extensions/graph/pkg/command/health.go +++ b/extensions/graph/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "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/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph/pkg/command/root.go b/extensions/graph/pkg/command/root.go index be426b0c797..d1132fbeff3 100644 --- a/extensions/graph/pkg/command/root.go +++ b/extensions/graph/pkg/command/root.go @@ -4,11 +4,11 @@ import ( "context" "os" - "github.com/owncloud/ocis/ocis-pkg/clihelper" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" "github.com/thejerf/suture/v4" - "github.com/owncloud/ocis/extensions/graph/pkg/config" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph/pkg/command/server.go b/extensions/graph/pkg/command/server.go index 1a281fc895c..13eae7398e8 100644 --- a/extensions/graph/pkg/command/server.go +++ b/extensions/graph/pkg/command/server.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/oklog/run" - "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/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph/pkg/command/version.go b/extensions/graph/pkg/command/version.go index d7db81a43c6..ebd159a46ec 100644 --- a/extensions/graph/pkg/command/version.go +++ b/extensions/graph/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph/pkg/config/config.go b/extensions/graph/pkg/config/config.go index c109a402c7d..a5566880ec0 100644 --- a/extensions/graph/pkg/config/config.go +++ b/extensions/graph/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/graph/pkg/config/defaults/defaultconfig.go b/extensions/graph/pkg/config/defaults/defaultconfig.go index a9a50720df9..e2f2da4b996 100644 --- a/extensions/graph/pkg/config/defaults/defaultconfig.go +++ b/extensions/graph/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/graph/pkg/config/parser/parse.go b/extensions/graph/pkg/config/parser/parse.go index f554a623d8e..145c5289448 100644 --- a/extensions/graph/pkg/config/parser/parse.go +++ b/extensions/graph/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "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/shared" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/graph/pkg/identity/cs3.go b/extensions/graph/pkg/identity/cs3.go index e5c0760a6ce..7a6cb282ca9 100644 --- a/extensions/graph/pkg/identity/cs3.go +++ b/extensions/graph/pkg/identity/cs3.go @@ -10,9 +10,9 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" libregraph "github.com/owncloud/libre-graph-api-go" - "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" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/extensions/graph/pkg/identity/ldap.go b/extensions/graph/pkg/identity/ldap.go index afbecb7ed4d..25419455933 100644 --- a/extensions/graph/pkg/identity/ldap.go +++ b/extensions/graph/pkg/identity/ldap.go @@ -11,9 +11,9 @@ import ( ldapdn "github.com/libregraph/idm/pkg/ldapdn" libregraph "github.com/owncloud/libre-graph-api-go" - "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" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/extensions/graph/pkg/identity/ldap/reconnect.go b/extensions/graph/pkg/identity/ldap/reconnect.go index 738aa28180b..d2b2bedbb17 100644 --- a/extensions/graph/pkg/identity/ldap/reconnect.go +++ b/extensions/graph/pkg/identity/ldap/reconnect.go @@ -11,7 +11,7 @@ import ( "github.com/go-ldap/ldap/v3" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/extensions/graph/pkg/identity/ldap_test.go b/extensions/graph/pkg/identity/ldap_test.go index 13937f66c35..d272eb6e36d 100644 --- a/extensions/graph/pkg/identity/ldap_test.go +++ b/extensions/graph/pkg/identity/ldap_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/go-ldap/ldap/v3" - "github.com/owncloud/ocis/extensions/graph/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // ldapMock implements the ldap.Client interfac diff --git a/extensions/graph/pkg/logging/logging.go b/extensions/graph/pkg/logging/logging.go index 97179a8ee53..a62806d0db0 100644 --- a/extensions/graph/pkg/logging/logging.go +++ b/extensions/graph/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/graph/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/graph/pkg/middleware/auth.go b/extensions/graph/pkg/middleware/auth.go index 364cc6e3d96..a460a49823c 100644 --- a/extensions/graph/pkg/middleware/auth.go +++ b/extensions/graph/pkg/middleware/auth.go @@ -6,8 +6,8 @@ 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/extensions/graph/pkg/service/v0/errorcode" - "github.com/owncloud/ocis/ocis-pkg/account" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/v2/ocis-pkg/account" "google.golang.org/grpc/metadata" ) diff --git a/extensions/graph/pkg/middleware/requireadmin.go b/extensions/graph/pkg/middleware/requireadmin.go index 8d637959f8d..7d868e483b4 100644 --- a/extensions/graph/pkg/middleware/requireadmin.go +++ b/extensions/graph/pkg/middleware/requireadmin.go @@ -4,10 +4,10 @@ import ( "net/http" revactx "github.com/cs3org/reva/v2/pkg/ctx" - accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/roles" + accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" ) // RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions diff --git a/extensions/graph/pkg/server/debug/option.go b/extensions/graph/pkg/server/debug/option.go index eaf70143e25..5ad37a18d9e 100644 --- a/extensions/graph/pkg/server/debug/option.go +++ b/extensions/graph/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/graph/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/graph/pkg/server/debug/server.go b/extensions/graph/pkg/server/debug/server.go index ae3c1e2dd17..64bc5b826b2 100644 --- a/extensions/graph/pkg/server/debug/server.go +++ b/extensions/graph/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/graph/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/graph/pkg/server/http/option.go b/extensions/graph/pkg/server/http/option.go index 920c7e4cc96..ff4b19d7210 100644 --- a/extensions/graph/pkg/server/http/option.go +++ b/extensions/graph/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "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/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/graph/pkg/server/http/server.go b/extensions/graph/pkg/server/http/server.go index 39168de027a..7a381a879d9 100644 --- a/extensions/graph/pkg/server/http/server.go +++ b/extensions/graph/pkg/server/http/server.go @@ -4,12 +4,12 @@ import ( "github.com/cs3org/reva/v2/pkg/events/server" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/go-micro/plugins/v4/events/natsjs" - 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" - "github.com/owncloud/ocis/ocis-pkg/version" + graphMiddleware "github.com/owncloud/ocis/v2/extensions/graph/pkg/middleware" + svc "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/account" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/pkg/errors" "go-micro.dev/v4" ) diff --git a/extensions/graph/pkg/service/v0/driveitems.go b/extensions/graph/pkg/service/v0/driveitems.go index 38504ea9925..68c40d58729 100644 --- a/extensions/graph/pkg/service/v0/driveitems.go +++ b/extensions/graph/pkg/service/v0/driveitems.go @@ -15,7 +15,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" ) // GetRootDriveChildren implements the Service interface. diff --git a/extensions/graph/pkg/service/v0/drives.go b/extensions/graph/pkg/service/v0/drives.go index e37302e8628..5482fea4067 100644 --- a/extensions/graph/pkg/service/v0/drives.go +++ b/extensions/graph/pkg/service/v0/drives.go @@ -23,11 +23,11 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode" - settingsServiceExt "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - "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" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" + settingsServiceExt "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" merrors "go-micro.dev/v4/errors" ) diff --git a/extensions/graph/pkg/service/v0/graph.go b/extensions/graph/pkg/service/v0/graph.go index 6389fc7dba2..676c8d7b955 100644 --- a/extensions/graph/pkg/service/v0/graph.go +++ b/extensions/graph/pkg/service/v0/graph.go @@ -9,10 +9,10 @@ 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/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" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/identity" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" mevents "go-micro.dev/v4/events" "google.golang.org/grpc" ) diff --git a/extensions/graph/pkg/service/v0/graph_test.go b/extensions/graph/pkg/service/v0/graph_test.go index 8ad28656ee2..5975ac5d31f 100644 --- a/extensions/graph/pkg/service/v0/graph_test.go +++ b/extensions/graph/pkg/service/v0/graph_test.go @@ -16,11 +16,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/extensions/graph/mocks" - "github.com/owncloud/ocis/extensions/graph/pkg/config" - "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/owncloud/ocis/v2/extensions/graph/mocks" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults" + service "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" "github.com/stretchr/testify/mock" ) diff --git a/extensions/graph/pkg/service/v0/groups.go b/extensions/graph/pkg/service/v0/groups.go index 363e3693632..14a6e9461f6 100644 --- a/extensions/graph/pkg/service/v0/groups.go +++ b/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/extensions/graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" "github.com/cs3org/reva/v2/pkg/events" "github.com/go-chi/chi/v5" diff --git a/extensions/graph/pkg/service/v0/instrument.go b/extensions/graph/pkg/service/v0/instrument.go index f651a6f5b05..0b31c66172d 100644 --- a/extensions/graph/pkg/service/v0/instrument.go +++ b/extensions/graph/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/graph/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/graph/pkg/service/v0/logging.go b/extensions/graph/pkg/service/v0/logging.go index 3ee85ff250f..6b28bf523bb 100644 --- a/extensions/graph/pkg/service/v0/logging.go +++ b/extensions/graph/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/graph/pkg/service/v0/option.go b/extensions/graph/pkg/service/v0/option.go index cf3c993e802..a5feb4e69d4 100644 --- a/extensions/graph/pkg/service/v0/option.go +++ b/extensions/graph/pkg/service/v0/option.go @@ -4,10 +4,10 @@ import ( "net/http" "github.com/cs3org/reva/v2/pkg/events" - "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" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // Option defines a single option function. diff --git a/extensions/graph/pkg/service/v0/service.go b/extensions/graph/pkg/service/v0/service.go index c198834716e..4184a1fea57 100644 --- a/extensions/graph/pkg/service/v0/service.go +++ b/extensions/graph/pkg/service/v0/service.go @@ -11,14 +11,14 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/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" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/identity" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/identity/ldap" + graphm "github.com/owncloud/ocis/v2/extensions/graph/pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/account" + opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) const ( diff --git a/extensions/graph/pkg/service/v0/users.go b/extensions/graph/pkg/service/v0/users.go index e35b632ed53..42a6909d717 100644 --- a/extensions/graph/pkg/service/v0/users.go +++ b/extensions/graph/pkg/service/v0/users.go @@ -16,10 +16,10 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/extensions/graph/pkg/identity" - "github.com/owncloud/ocis/extensions/graph/pkg/service/v0/errorcode" - settingssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - settings "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/identity" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/service/v0/errorcode" + settingssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // GetMe implements the Service interface. diff --git a/extensions/graph/pkg/tracing/tracing.go b/extensions/graph/pkg/tracing/tracing.go index f43926d8caf..fe7439f635e 100644 --- a/extensions/graph/pkg/tracing/tracing.go +++ b/extensions/graph/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/graph/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/group/cmd/group/main.go b/extensions/group/cmd/group/main.go index d459fa32910..f01acb6fdd1 100644 --- a/extensions/group/cmd/group/main.go +++ b/extensions/group/cmd/group/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/group/pkg/command" - "github.com/owncloud/ocis/extensions/group/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/group/pkg/command" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults" ) func main() { diff --git a/extensions/group/pkg/command/health.go b/extensions/group/pkg/command/health.go index 6e6a01e7eb9..a4b5b822dcb 100644 --- a/extensions/group/pkg/command/health.go +++ b/extensions/group/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/extensions/group/pkg/config/parser" - "github.com/owncloud/ocis/extensions/group/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/group/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/group/pkg/command/root.go b/extensions/group/pkg/command/root.go index 7a392363a4b..3b57e02760b 100644 --- a/extensions/group/pkg/command/root.go +++ b/extensions/group/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/group/pkg/command/server.go b/extensions/group/pkg/command/server.go index 2bf18e47483..c83f427af74 100644 --- a/extensions/group/pkg/command/server.go +++ b/extensions/group/pkg/command/server.go @@ -9,16 +9,16 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/extensions/group/pkg/config/parser" - "github.com/owncloud/ocis/extensions/group/pkg/logging" - "github.com/owncloud/ocis/extensions/group/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/group/pkg/server/debug" - "github.com/owncloud/ocis/extensions/group/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/ldap" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/group/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/group/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/group/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/group/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/ldap" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/group/pkg/command/version.go b/extensions/group/pkg/command/version.go index e3f5303faad..dbb93521a03 100644 --- a/extensions/group/pkg/command/version.go +++ b/extensions/group/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/group/pkg/config/config.go b/extensions/group/pkg/config/config.go index a8861c962d5..e0ff9c1ce58 100644 --- a/extensions/group/pkg/config/config.go +++ b/extensions/group/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/group/pkg/config/defaults/defaultconfig.go b/extensions/group/pkg/config/defaults/defaultconfig.go index 57430082908..6ac7e50a14d 100644 --- a/extensions/group/pkg/config/defaults/defaultconfig.go +++ b/extensions/group/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/group/pkg/config/parser/parse.go b/extensions/group/pkg/config/parser/parse.go index f1e7880c9be..999ee18ec54 100644 --- a/extensions/group/pkg/config/parser/parse.go +++ b/extensions/group/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/extensions/group/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/group/pkg/logging/logging.go b/extensions/group/pkg/logging/logging.go index 9aa3b08150d..634491bd785 100644 --- a/extensions/group/pkg/logging/logging.go +++ b/extensions/group/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/group/pkg/revaconfig/config.go b/extensions/group/pkg/revaconfig/config.go index 736956060e3..d7dc200ba09 100644 --- a/extensions/group/pkg/revaconfig/config.go +++ b/extensions/group/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" ) // GroupsConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/group/pkg/server/debug/option.go b/extensions/group/pkg/server/debug/option.go index 6b1c347dd40..a78c48b3083 100644 --- a/extensions/group/pkg/server/debug/option.go +++ b/extensions/group/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/group/pkg/server/debug/server.go b/extensions/group/pkg/server/debug/server.go index e323840caed..e283ca58913 100644 --- a/extensions/group/pkg/server/debug/server.go +++ b/extensions/group/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/group/pkg/tracing/tracing.go b/extensions/group/pkg/tracing/tracing.go index af58cbf4f97..228c9aaddc4 100644 --- a/extensions/group/pkg/tracing/tracing.go +++ b/extensions/group/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/group/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/idm/cmd/idm/main.go b/extensions/idm/cmd/idm/main.go index 53727af5b75..56faeab58cf 100644 --- a/extensions/idm/cmd/idm/main.go +++ b/extensions/idm/cmd/idm/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/idm/pkg/command" - "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/command" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/defaults" ) func main() { diff --git a/extensions/idm/pkg/command/health.go b/extensions/idm/pkg/command/health.go index 22bae6b94f2..9d4cedc4594 100644 --- a/extensions/idm/pkg/command/health.go +++ b/extensions/idm/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/extensions/idm/pkg/config/parser" - "github.com/owncloud/ocis/extensions/idm/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/idm/pkg/command/root.go b/extensions/idm/pkg/command/root.go index 74866c9eccf..c4057e9cf3e 100644 --- a/extensions/idm/pkg/command/root.go +++ b/extensions/idm/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/idm/pkg/command/server.go b/extensions/idm/pkg/command/server.go index 6286cd1f128..6e852d9ac9a 100644 --- a/extensions/idm/pkg/command/server.go +++ b/extensions/idm/pkg/command/server.go @@ -13,12 +13,12 @@ import ( "github.com/libregraph/idm/pkg/ldappassword" "github.com/libregraph/idm/pkg/ldbbolt" "github.com/libregraph/idm/server" - "github.com/owncloud/ocis/extensions/idm" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/extensions/idm/pkg/config/parser" - "github.com/owncloud/ocis/extensions/idm/pkg/logging" - pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idm" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/logging" + pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/idm/pkg/command/version.go b/extensions/idm/pkg/command/version.go index bb49863ba28..d11ce980edd 100644 --- a/extensions/idm/pkg/command/version.go +++ b/extensions/idm/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/idm/pkg/config/config.go b/extensions/idm/pkg/config/config.go index 2706fe673fd..b9734643825 100644 --- a/extensions/idm/pkg/config/config.go +++ b/extensions/idm/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/idm/pkg/config/defaults/defaultconfig.go b/extensions/idm/pkg/config/defaults/defaultconfig.go index 25ea4785fe3..97d976c1a12 100644 --- a/extensions/idm/pkg/config/defaults/defaultconfig.go +++ b/extensions/idm/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/idm/pkg/config/parser/parse.go b/extensions/idm/pkg/config/parser/parse.go index 9fe4a856657..e5c791e1dc0 100644 --- a/extensions/idm/pkg/config/parser/parse.go +++ b/extensions/idm/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/idm/pkg/logging/logging.go b/extensions/idm/pkg/logging/logging.go index 9a957b58994..76d45f3e4d9 100644 --- a/extensions/idm/pkg/logging/logging.go +++ b/extensions/idm/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/idm/pkg/server/debug/option.go b/extensions/idm/pkg/server/debug/option.go index e7ebae29fe3..1eca46af326 100644 --- a/extensions/idm/pkg/server/debug/option.go +++ b/extensions/idm/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/idm/pkg/server/debug/server.go b/extensions/idm/pkg/server/debug/server.go index af1160c2c6d..574bfb32c90 100644 --- a/extensions/idm/pkg/server/debug/server.go +++ b/extensions/idm/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/idm/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/idp/cmd/idp/main.go b/extensions/idp/cmd/idp/main.go index 07489cb705b..d632da7f4a2 100644 --- a/extensions/idp/cmd/idp/main.go +++ b/extensions/idp/cmd/idp/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/idp/pkg/command" - "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/command" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/defaults" ) func main() { diff --git a/extensions/idp/pkg/assets/option.go b/extensions/idp/pkg/assets/option.go index 5fe2871d0e8..6e89ac6f254 100644 --- a/extensions/idp/pkg/assets/option.go +++ b/extensions/idp/pkg/assets/option.go @@ -3,10 +3,10 @@ package assets import ( "net/http" - "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" + "github.com/owncloud/ocis/v2/extensions/idp" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/assetsfs" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // New returns a new http filesystem to serve assets. diff --git a/extensions/idp/pkg/command/health.go b/extensions/idp/pkg/command/health.go index 3ff2833bb24..33376cb6c54 100644 --- a/extensions/idp/pkg/command/health.go +++ b/extensions/idp/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "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/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/idp/pkg/command/root.go b/extensions/idp/pkg/command/root.go index 8e8394ac1c3..c09d8042ecc 100644 --- a/extensions/idp/pkg/command/root.go +++ b/extensions/idp/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "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/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/idp/pkg/command/server.go b/extensions/idp/pkg/command/server.go index 8b3f25e3008..4b989670886 100644 --- a/extensions/idp/pkg/command/server.go +++ b/extensions/idp/pkg/command/server.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/oklog/run" - "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/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/idp/pkg/command/version.go b/extensions/idp/pkg/command/version.go index bcdea66df8f..4751d1f6124 100644 --- a/extensions/idp/pkg/command/version.go +++ b/extensions/idp/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/idp/pkg/config/config.go b/extensions/idp/pkg/config/config.go index 4979fb0f380..ab6a90c1a46 100644 --- a/extensions/idp/pkg/config/config.go +++ b/extensions/idp/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/idp/pkg/config/defaults/defaultconfig.go b/extensions/idp/pkg/config/defaults/defaultconfig.go index b3498b97551..7da2ba89083 100644 --- a/extensions/idp/pkg/config/defaults/defaultconfig.go +++ b/extensions/idp/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "github.com/owncloud/ocis/extensions/idp/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/idp/pkg/config/parser/parse.go b/extensions/idp/pkg/config/parser/parse.go index b75b10b398e..03b4ee59990 100644 --- a/extensions/idp/pkg/config/parser/parse.go +++ b/extensions/idp/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "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/shared" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/idp/pkg/logging/logging.go b/extensions/idp/pkg/logging/logging.go index e6c0535d642..c52de8351e2 100644 --- a/extensions/idp/pkg/logging/logging.go +++ b/extensions/idp/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/idp/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/idp/pkg/middleware/static.go b/extensions/idp/pkg/middleware/static.go index df659b874bb..e7e18caa1d0 100644 --- a/extensions/idp/pkg/middleware/static.go +++ b/extensions/idp/pkg/middleware/static.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - idpTracing "github.com/owncloud/ocis/extensions/idp/pkg/tracing" + idpTracing "github.com/owncloud/ocis/v2/extensions/idp/pkg/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" ) diff --git a/extensions/idp/pkg/server/debug/option.go b/extensions/idp/pkg/server/debug/option.go index 5b0eedf12bc..5648bbbcf33 100644 --- a/extensions/idp/pkg/server/debug/option.go +++ b/extensions/idp/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/idp/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/idp/pkg/server/debug/server.go b/extensions/idp/pkg/server/debug/server.go index 515ef645bc7..f7879124acb 100644 --- a/extensions/idp/pkg/server/debug/server.go +++ b/extensions/idp/pkg/server/debug/server.go @@ -5,11 +5,11 @@ import ( "net/http" "net/url" - "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" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/idp/pkg/server/http/option.go b/extensions/idp/pkg/server/http/option.go index 148c426d1e0..fffc93a8a00 100644 --- a/extensions/idp/pkg/server/http/option.go +++ b/extensions/idp/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "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/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/idp/pkg/server/http/server.go b/extensions/idp/pkg/server/http/server.go index 4f97249b13e..a0c89bb5b40 100644 --- a/extensions/idp/pkg/server/http/server.go +++ b/extensions/idp/pkg/server/http/server.go @@ -5,11 +5,11 @@ import ( "os" chimiddleware "github.com/go-chi/chi/v5/middleware" - 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" - "github.com/owncloud/ocis/ocis-pkg/version" + svc "github.com/owncloud/ocis/v2/extensions/idp/pkg/service/v0" + pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/idp/pkg/service/v0/instrument.go b/extensions/idp/pkg/service/v0/instrument.go index f3f58781641..8c7a948eae4 100644 --- a/extensions/idp/pkg/service/v0/instrument.go +++ b/extensions/idp/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/idp/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/idp/pkg/service/v0/logging.go b/extensions/idp/pkg/service/v0/logging.go index f3dfab793e9..b7a6933c866 100644 --- a/extensions/idp/pkg/service/v0/logging.go +++ b/extensions/idp/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/idp/pkg/service/v0/option.go b/extensions/idp/pkg/service/v0/option.go index 7cb1ba07e2c..d86aa51d330 100644 --- a/extensions/idp/pkg/service/v0/option.go +++ b/extensions/idp/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/idp/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/idp/pkg/service/v0/service.go b/extensions/idp/pkg/service/v0/service.go index d1cced86ef4..51e9969e3cf 100644 --- a/extensions/idp/pkg/service/v0/service.go +++ b/extensions/idp/pkg/service/v0/service.go @@ -19,11 +19,11 @@ import ( ldapBackendSupport "github.com/libregraph/lico/bootstrap/backends/ldap" licoconfig "github.com/libregraph/lico/config" "github.com/libregraph/lico/server" - "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/ldap" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/assets" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/ldap" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "stash.kopano.io/kgol/rndm" ) diff --git a/extensions/idp/pkg/service/v0/tracing.go b/extensions/idp/pkg/service/v0/tracing.go index 2b4b3cf8c09..4a2c04f51fa 100644 --- a/extensions/idp/pkg/service/v0/tracing.go +++ b/extensions/idp/pkg/service/v0/tracing.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" ) // NewTracing returns a service that instruments traces. diff --git a/extensions/idp/pkg/tracing/tracing.go b/extensions/idp/pkg/tracing/tracing.go index 722d27b6aad..43ef5bc0fb2 100644 --- a/extensions/idp/pkg/tracing/tracing.go +++ b/extensions/idp/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/idp/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/nats/cmd/nats/main.go b/extensions/nats/cmd/nats/main.go index f0bab9d6ad8..afd94256874 100644 --- a/extensions/nats/cmd/nats/main.go +++ b/extensions/nats/cmd/nats/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/nats/pkg/command" - "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/command" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config/defaults" ) func main() { diff --git a/extensions/nats/pkg/command/health.go b/extensions/nats/pkg/command/health.go index 9a211848f80..6c6a0d817bb 100644 --- a/extensions/nats/pkg/command/health.go +++ b/extensions/nats/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/nats/pkg/command/root.go b/extensions/nats/pkg/command/root.go index 2a2bdffd6e4..faa30183915 100644 --- a/extensions/nats/pkg/command/root.go +++ b/extensions/nats/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/nats/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/nats/pkg/command/server.go b/extensions/nats/pkg/command/server.go index 14234b42439..f8f0eb61022 100644 --- a/extensions/nats/pkg/command/server.go +++ b/extensions/nats/pkg/command/server.go @@ -6,10 +6,10 @@ import ( "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/nats/pkg/config" - "github.com/owncloud/ocis/extensions/nats/pkg/config/parser" - "github.com/owncloud/ocis/extensions/nats/pkg/logging" - "github.com/owncloud/ocis/extensions/nats/pkg/server/nats" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/server/nats" "github.com/urfave/cli/v2" ) diff --git a/extensions/nats/pkg/command/version.go b/extensions/nats/pkg/command/version.go index f310fc76aa4..fff10c540fb 100644 --- a/extensions/nats/pkg/command/version.go +++ b/extensions/nats/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/nats/pkg/config/config.go b/extensions/nats/pkg/config/config.go index 3d1c279443b..877089ff323 100644 --- a/extensions/nats/pkg/config/config.go +++ b/extensions/nats/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/nats/pkg/config/defaults/defaultconfig.go b/extensions/nats/pkg/config/defaults/defaultconfig.go index a522ca67857..6b33c9cded3 100644 --- a/extensions/nats/pkg/config/defaults/defaultconfig.go +++ b/extensions/nats/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/extensions/nats/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) // NOTE: Most of this configuration is not needed to keep it as simple as possible diff --git a/extensions/nats/pkg/config/parser/parse.go b/extensions/nats/pkg/config/parser/parse.go index a3a27113e2d..2625948bb86 100644 --- a/extensions/nats/pkg/config/parser/parse.go +++ b/extensions/nats/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/nats/pkg/config" - "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/nats/pkg/logging/logging.go b/extensions/nats/pkg/logging/logging.go index 9fe01c4ee25..57b1adac716 100644 --- a/extensions/nats/pkg/logging/logging.go +++ b/extensions/nats/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/nats/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/nats/pkg/logging/nats.go b/extensions/nats/pkg/logging/nats.go index 8074de3d602..548895cf5c2 100644 --- a/extensions/nats/pkg/logging/nats.go +++ b/extensions/nats/pkg/logging/nats.go @@ -3,7 +3,7 @@ package logging import ( "fmt" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) func NewLogWrapper(logger log.Logger) *LogWrapper { diff --git a/extensions/notifications/cmd/notifications/main.go b/extensions/notifications/cmd/notifications/main.go index 1ce61dec5b1..c965086a7a2 100644 --- a/extensions/notifications/cmd/notifications/main.go +++ b/extensions/notifications/cmd/notifications/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/notifications/pkg/command" - "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/command" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config/defaults" ) func main() { diff --git a/extensions/notifications/pkg/channels/channels.go b/extensions/notifications/pkg/channels/channels.go index 956ee692dfc..62881dd750a 100644 --- a/extensions/notifications/pkg/channels/channels.go +++ b/extensions/notifications/pkg/channels/channels.go @@ -9,8 +9,8 @@ import ( groups "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/extensions/notifications/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/pkg/errors" ) diff --git a/extensions/notifications/pkg/command/health.go b/extensions/notifications/pkg/command/health.go index bbaffa27e21..740dd8af8b8 100644 --- a/extensions/notifications/pkg/command/health.go +++ b/extensions/notifications/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/notifications/pkg/command/root.go b/extensions/notifications/pkg/command/root.go index e2534e15a61..bf90ee56bea 100644 --- a/extensions/notifications/pkg/command/root.go +++ b/extensions/notifications/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/notifications/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/notifications/pkg/command/server.go b/extensions/notifications/pkg/command/server.go index a51fda70102..463ad68d2b3 100644 --- a/extensions/notifications/pkg/command/server.go +++ b/extensions/notifications/pkg/command/server.go @@ -6,11 +6,11 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/server" "github.com/go-micro/plugins/v4/events/natsjs" - "github.com/owncloud/ocis/extensions/notifications/pkg/channels" - "github.com/owncloud/ocis/extensions/notifications/pkg/config" - "github.com/owncloud/ocis/extensions/notifications/pkg/config/parser" - "github.com/owncloud/ocis/extensions/notifications/pkg/logging" - "github.com/owncloud/ocis/extensions/notifications/pkg/service" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/channels" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/service" "github.com/urfave/cli/v2" ) diff --git a/extensions/notifications/pkg/command/version.go b/extensions/notifications/pkg/command/version.go index 2b635d640fb..d1b55c18fff 100644 --- a/extensions/notifications/pkg/command/version.go +++ b/extensions/notifications/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/notifications/pkg/config/config.go b/extensions/notifications/pkg/config/config.go index dc49e46cc83..9b1e0c89fbd 100644 --- a/extensions/notifications/pkg/config/config.go +++ b/extensions/notifications/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/notifications/pkg/config/defaults/defaultconfig.go b/extensions/notifications/pkg/config/defaults/defaultconfig.go index 09d08d13fbe..5530b8e38bd 100644 --- a/extensions/notifications/pkg/config/defaults/defaultconfig.go +++ b/extensions/notifications/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/notifications/pkg/config/parser/parse.go b/extensions/notifications/pkg/config/parser/parse.go index 85ac780a342..6bb231a066a 100644 --- a/extensions/notifications/pkg/config/parser/parse.go +++ b/extensions/notifications/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/notifications/pkg/config" - "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/notifications/pkg/logging/logging.go b/extensions/notifications/pkg/logging/logging.go index 72a75231192..ed0042a0e89 100644 --- a/extensions/notifications/pkg/logging/logging.go +++ b/extensions/notifications/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/notifications/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/notifications/pkg/service/service.go b/extensions/notifications/pkg/service/service.go index 09414a1b7d8..a2d4a7cc7db 100644 --- a/extensions/notifications/pkg/service/service.go +++ b/extensions/notifications/pkg/service/service.go @@ -6,8 +6,8 @@ import ( "syscall" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/extensions/notifications/pkg/channels" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/notifications/pkg/channels" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) type Service interface { diff --git a/extensions/ocdav/cmd/ocdav/main.go b/extensions/ocdav/cmd/ocdav/main.go index 0b1035acc64..7346590a0bc 100644 --- a/extensions/ocdav/cmd/ocdav/main.go +++ b/extensions/ocdav/cmd/ocdav/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/ocdav/pkg/command" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/command" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config/defaults" ) func main() { diff --git a/extensions/ocdav/pkg/command/health.go b/extensions/ocdav/pkg/command/health.go index ec3391a168c..128b670aee3 100644 --- a/extensions/ocdav/pkg/command/health.go +++ b/extensions/ocdav/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config/parser" - "github.com/owncloud/ocis/extensions/ocdav/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocdav/pkg/command/root.go b/extensions/ocdav/pkg/command/root.go index c37fdd68522..9b2bbf7d9c0 100644 --- a/extensions/ocdav/pkg/command/root.go +++ b/extensions/ocdav/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go index 55f8a48e482..b26defdfd15 100644 --- a/extensions/ocdav/pkg/command/server.go +++ b/extensions/ocdav/pkg/command/server.go @@ -6,11 +6,11 @@ import ( "github.com/cs3org/reva/v2/pkg/micro/ocdav" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config/parser" - "github.com/owncloud/ocis/extensions/ocdav/pkg/logging" - "github.com/owncloud/ocis/extensions/ocdav/pkg/server/debug" - "github.com/owncloud/ocis/extensions/ocdav/pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/tracing" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocdav/pkg/command/version.go b/extensions/ocdav/pkg/command/version.go index 05bf3972268..e134c1c4063 100644 --- a/extensions/ocdav/pkg/command/version.go +++ b/extensions/ocdav/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocdav/pkg/config/config.go b/extensions/ocdav/pkg/config/config.go index 3b52046d65d..92395e3a43e 100644 --- a/extensions/ocdav/pkg/config/config.go +++ b/extensions/ocdav/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/ocdav/pkg/config/defaults/defaultconfig.go b/extensions/ocdav/pkg/config/defaults/defaultconfig.go index 8567bbdb71a..6917ffe0be1 100644 --- a/extensions/ocdav/pkg/config/defaults/defaultconfig.go +++ b/extensions/ocdav/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/ocdav/pkg/config/parser/parse.go b/extensions/ocdav/pkg/config/parser/parse.go index 77766296bfd..bb7822ca943 100644 --- a/extensions/ocdav/pkg/config/parser/parse.go +++ b/extensions/ocdav/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/ocdav/pkg/logging/logging.go b/extensions/ocdav/pkg/logging/logging.go index 37a48c877ed..eedbb81e235 100644 --- a/extensions/ocdav/pkg/logging/logging.go +++ b/extensions/ocdav/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/ocdav/pkg/server/debug/option.go b/extensions/ocdav/pkg/server/debug/option.go index 01bda4d86c8..ab52227f956 100644 --- a/extensions/ocdav/pkg/server/debug/option.go +++ b/extensions/ocdav/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/ocdav/pkg/server/debug/server.go b/extensions/ocdav/pkg/server/debug/server.go index 6a7838accdb..dcdfefeda40 100644 --- a/extensions/ocdav/pkg/server/debug/server.go +++ b/extensions/ocdav/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/ocdav/pkg/tracing/tracing.go b/extensions/ocdav/pkg/tracing/tracing.go index adcb5931614..334ec29712f 100644 --- a/extensions/ocdav/pkg/tracing/tracing.go +++ b/extensions/ocdav/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/ocs/cmd/ocs/main.go b/extensions/ocs/cmd/ocs/main.go index 2a4d9bfdb74..b40fbb05078 100644 --- a/extensions/ocs/cmd/ocs/main.go +++ b/extensions/ocs/cmd/ocs/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/ocs/pkg/command" - "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/command" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/defaults" ) func main() { diff --git a/extensions/ocs/pkg/command/health.go b/extensions/ocs/pkg/command/health.go index 6e7d9c08b1e..125f0d59003 100644 --- a/extensions/ocs/pkg/command/health.go +++ b/extensions/ocs/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/extensions/ocs/pkg/config/parser" - "github.com/owncloud/ocis/extensions/ocs/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocs/pkg/command/root.go b/extensions/ocs/pkg/command/root.go index 446db14b92a..0ab6e615990 100644 --- a/extensions/ocs/pkg/command/root.go +++ b/extensions/ocs/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocs/pkg/command/server.go b/extensions/ocs/pkg/command/server.go index 5df57b61038..75bcc19fd32 100644 --- a/extensions/ocs/pkg/command/server.go +++ b/extensions/ocs/pkg/command/server.go @@ -4,16 +4,16 @@ import ( "context" "fmt" - "github.com/owncloud/ocis/extensions/ocs/pkg/config/parser" - "github.com/owncloud/ocis/extensions/ocs/pkg/logging" - "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/extensions/ocs/pkg/metrics" - "github.com/owncloud/ocis/extensions/ocs/pkg/server/debug" - "github.com/owncloud/ocis/extensions/ocs/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/server/http" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocs/pkg/command/version.go b/extensions/ocs/pkg/command/version.go index 388a8989c3d..2440047e4f7 100644 --- a/extensions/ocs/pkg/command/version.go +++ b/extensions/ocs/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocs/pkg/config/config.go b/extensions/ocs/pkg/config/config.go index b5e7fbe8594..53ba58276b4 100644 --- a/extensions/ocs/pkg/config/config.go +++ b/extensions/ocs/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/ocs/pkg/config/defaults/defaultconfig.go b/extensions/ocs/pkg/config/defaults/defaultconfig.go index 20a3e3ca9ed..4ea124bb663 100644 --- a/extensions/ocs/pkg/config/defaults/defaultconfig.go +++ b/extensions/ocs/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/ocs/pkg/config/parser/parse.go b/extensions/ocs/pkg/config/parser/parse.go index 536ed52de18..d9e3c559088 100644 --- a/extensions/ocs/pkg/config/parser/parse.go +++ b/extensions/ocs/pkg/config/parser/parse.go @@ -3,13 +3,13 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/ocs/pkg/logging/logging.go b/extensions/ocs/pkg/logging/logging.go index abd3615c9da..9be2a6b5ca5 100644 --- a/extensions/ocs/pkg/logging/logging.go +++ b/extensions/ocs/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/ocs/pkg/middleware/logtrace.go b/extensions/ocs/pkg/middleware/logtrace.go index 2786ba5f34e..7e51bd7f6de 100644 --- a/extensions/ocs/pkg/middleware/logtrace.go +++ b/extensions/ocs/pkg/middleware/logtrace.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" + ocstracing "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing" "go.opentelemetry.io/otel/propagation" ) diff --git a/extensions/ocs/pkg/middleware/options.go b/extensions/ocs/pkg/middleware/options.go index 36853d84f6e..c3f58e51f3a 100644 --- a/extensions/ocs/pkg/middleware/options.go +++ b/extensions/ocs/pkg/middleware/options.go @@ -1,8 +1,8 @@ package middleware import ( - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/roles" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" ) // Option defines a single option function. diff --git a/extensions/ocs/pkg/middleware/requireadmin.go b/extensions/ocs/pkg/middleware/requireadmin.go index b46b6c0bac3..81b2f8c30c2 100644 --- a/extensions/ocs/pkg/middleware/requireadmin.go +++ b/extensions/ocs/pkg/middleware/requireadmin.go @@ -4,10 +4,10 @@ import ( "net/http" "github.com/go-chi/render" - accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" - "github.com/owncloud/ocis/ocis-pkg/roles" + accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" ) // RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions diff --git a/extensions/ocs/pkg/middleware/requireselforadmin.go b/extensions/ocs/pkg/middleware/requireselforadmin.go index b1be692c3e1..96f44b2c071 100644 --- a/extensions/ocs/pkg/middleware/requireselforadmin.go +++ b/extensions/ocs/pkg/middleware/requireselforadmin.go @@ -7,11 +7,11 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/chi/v5" "github.com/go-chi/render" - accounts "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" - settingsService "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/roles" + accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" + settingsService "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" ) // RequireSelfOrAdmin middleware is used to require the requesting user to be an admin or the requested user himself @@ -50,7 +50,7 @@ func RequireSelfOrAdmin(opts ...Option) func(next http.Handler) http.Handler { if len(roleIDs) == 0 { roleIDs = append(roleIDs, settingsService.BundleUUIDRoleUser, settingsService.SelfManagementPermissionID) // if roles are empty, assume we haven't seen the user before and assign a default user role. At least until - // proper roles are provided. See https://github.com/owncloud/ocis/issues/1825 for more context. + // proper roles are provided. See https://github.com/owncloud/ocis/v2/issues/1825 for more context. //return user, nil } } diff --git a/extensions/ocs/pkg/middleware/requireuser.go b/extensions/ocs/pkg/middleware/requireuser.go index ce9633dcd9a..1cb30477a11 100644 --- a/extensions/ocs/pkg/middleware/requireuser.go +++ b/extensions/ocs/pkg/middleware/requireuser.go @@ -5,8 +5,8 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/render" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" ) // RequireUser middleware is used to require a user in context diff --git a/extensions/ocs/pkg/server/debug/option.go b/extensions/ocs/pkg/server/debug/option.go index 2d068fb26f9..a89ad2aa8f9 100644 --- a/extensions/ocs/pkg/server/debug/option.go +++ b/extensions/ocs/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/ocs/pkg/server/debug/server.go b/extensions/ocs/pkg/server/debug/server.go index 445d61b9f77..7ddcc82cfd2 100644 --- a/extensions/ocs/pkg/server/debug/server.go +++ b/extensions/ocs/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/ocs/pkg/server/http/option.go b/extensions/ocs/pkg/server/http/option.go index c1185e1d196..a2e1fc5b399 100644 --- a/extensions/ocs/pkg/server/http/option.go +++ b/extensions/ocs/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - "github.com/owncloud/ocis/extensions/ocs/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/ocs/pkg/server/http/server.go b/extensions/ocs/pkg/server/http/server.go index 0541b3d8c81..5589b17b4d3 100644 --- a/extensions/ocs/pkg/server/http/server.go +++ b/extensions/ocs/pkg/server/http/server.go @@ -2,12 +2,12 @@ package http import ( chimiddleware "github.com/go-chi/chi/v5/middleware" - ocsmw "github.com/owncloud/ocis/extensions/ocs/pkg/middleware" - svc "github.com/owncloud/ocis/extensions/ocs/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" + ocsmw "github.com/owncloud/ocis/v2/extensions/ocs/pkg/middleware" + svc "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/ocs/pkg/server/http/svc_test.go b/extensions/ocs/pkg/server/http/svc_test.go index a6f4051d4ee..e4e2546d4cc 100644 --- a/extensions/ocs/pkg/server/http/svc_test.go +++ b/extensions/ocs/pkg/server/http/svc_test.go @@ -20,18 +20,18 @@ import ( "github.com/cs3org/reva/v2/pkg/token" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/golang/protobuf/ptypes/empty" - accountsCfg "github.com/owncloud/ocis/extensions/accounts/pkg/config" - accountsLogging "github.com/owncloud/ocis/extensions/accounts/pkg/logging" - accountsServiceExt "github.com/owncloud/ocis/extensions/accounts/pkg/service/v0" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - svc "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0" - ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - ocisLog "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + accountsCfg "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + accountsLogging "github.com/owncloud/ocis/v2/extensions/accounts/pkg/logging" + accountsServiceExt "github.com/owncloud/ocis/v2/extensions/accounts/pkg/service/v0" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + svc "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0" + ssvc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + ocisLog "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" ) @@ -805,7 +805,7 @@ func TestCreateUser(t *testing.T) { }, nil, }, - // https://github.com/owncloud/ocis-ocs/issues/49 + // https://github.com/owncloud/ocis/v2-ocs/issues/49 { "User with special character in userid", User{ @@ -1447,7 +1447,7 @@ func TestUpdateUser(t *testing.T) { } // This is a bug verification test for endpoint '/cloud/user' -// Link to the fixed issue: https://github.com/owncloud/ocis-ocs/issues/52 +// Link to the fixed issue: https://github.com/owncloud/ocis/v2-ocs/issues/52 func TestGetSingleUser(t *testing.T) { user := User{ Enabled: "true", @@ -1503,7 +1503,7 @@ func TestGetSingleUser(t *testing.T) { } // This is a bug demonstration test for endpoint '/cloud/user' -// Link to the issue: https://github.com/owncloud/ocis/issues/53 +// Link to the issue: https://github.com/owncloud/ocis/v2/issues/53 func TestGetUserSigningKey(t *testing.T) { user := User{ Enabled: "true", @@ -1830,7 +1830,7 @@ func TestAddUsersToGroupInvalidGroup(t *testing.T) { cleanUp(t) } -// Issue: https://github.com/owncloud/ocis/issues/57 - cannot remove user from group +// Issue: https://github.com/owncloud/ocis/v2/issues/57 - cannot remove user from group func TestRemoveUserFromGroup(t *testing.T) { user := User{ Enabled: "true", @@ -1902,7 +1902,7 @@ func TestRemoveUserFromGroup(t *testing.T) { } } -// Issue: https://github.com/owncloud/ocis-ocs/issues/59 - cloud/capabilities endpoint not implemented +// Issue: https://github.com/owncloud/ocis/v2-ocs/issues/59 - cloud/capabilities endpoint not implemented func TestCapabilities(t *testing.T) { for _, ocsVersion := range ocsVersions { for _, format := range formats { diff --git a/extensions/ocs/pkg/service/v0/config.go b/extensions/ocs/pkg/service/v0/config.go index 6e77c308648..da4b7bc9ffa 100644 --- a/extensions/ocs/pkg/service/v0/config.go +++ b/extensions/ocs/pkg/service/v0/config.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" ) // GetConfig renders the ocs config endpoint diff --git a/extensions/ocs/pkg/service/v0/groups.go b/extensions/ocs/pkg/service/v0/groups.go index 9dae5899b15..89f25f47dcd 100644 --- a/extensions/ocs/pkg/service/v0/groups.go +++ b/extensions/ocs/pkg/service/v0/groups.go @@ -9,14 +9,14 @@ import ( "regexp" "strconv" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/chi/v5" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" - ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" + ocstracing "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing" merrors "go-micro.dev/v4/errors" "go.opentelemetry.io/otel/attribute" ) diff --git a/extensions/ocs/pkg/service/v0/instrument.go b/extensions/ocs/pkg/service/v0/instrument.go index 6940ad28d75..c1398734393 100644 --- a/extensions/ocs/pkg/service/v0/instrument.go +++ b/extensions/ocs/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/ocs/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/ocs/pkg/service/v0/logging.go b/extensions/ocs/pkg/service/v0/logging.go index 30c34598836..bb22e46fccd 100644 --- a/extensions/ocs/pkg/service/v0/logging.go +++ b/extensions/ocs/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/ocs/pkg/service/v0/option.go b/extensions/ocs/pkg/service/v0/option.go index da9e7f6b3d7..ba4a7b9b3a9 100644 --- a/extensions/ocs/pkg/service/v0/option.go +++ b/extensions/ocs/pkg/service/v0/option.go @@ -3,10 +3,10 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/ocs/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" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // Option defines a single option function. diff --git a/extensions/ocs/pkg/service/v0/response/response.go b/extensions/ocs/pkg/service/v0/response/response.go index e1b92f09509..6731d1fa48a 100644 --- a/extensions/ocs/pkg/service/v0/response/response.go +++ b/extensions/ocs/pkg/service/v0/response/response.go @@ -6,7 +6,7 @@ import ( "reflect" "github.com/go-chi/render" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" ) // Response is the top level response structure diff --git a/extensions/ocs/pkg/service/v0/response/version.go b/extensions/ocs/pkg/service/v0/response/version.go index ddf9e89b4a8..fe7f7176067 100644 --- a/extensions/ocs/pkg/service/v0/response/version.go +++ b/extensions/ocs/pkg/service/v0/response/version.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" ) type key int diff --git a/extensions/ocs/pkg/service/v0/service.go b/extensions/ocs/pkg/service/v0/service.go index 7415d36a27a..059d665fb7c 100644 --- a/extensions/ocs/pkg/service/v0/service.go +++ b/extensions/ocs/pkg/service/v0/service.go @@ -5,24 +5,24 @@ import ( "time" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - ocsm "github.com/owncloud/ocis/extensions/ocs/pkg/middleware" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" - "github.com/owncloud/ocis/ocis-pkg/account" - "github.com/owncloud/ocis/ocis-pkg/log" - opkgm "github.com/owncloud/ocis/ocis-pkg/middleware" - "github.com/owncloud/ocis/ocis-pkg/roles" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + ocsm "github.com/owncloud/ocis/v2/extensions/ocs/pkg/middleware" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/ocis-pkg/account" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // Service defines the extension handlers. diff --git a/extensions/ocs/pkg/service/v0/tracing.go b/extensions/ocs/pkg/service/v0/tracing.go index 5403996ce78..6c807d772db 100644 --- a/extensions/ocs/pkg/service/v0/tracing.go +++ b/extensions/ocs/pkg/service/v0/tracing.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" ) // NewTracing returns a service that instruments traces. diff --git a/extensions/ocs/pkg/service/v0/users.go b/extensions/ocs/pkg/service/v0/users.go index 35aeadb7737..4613b729dd3 100644 --- a/extensions/ocs/pkg/service/v0/users.go +++ b/extensions/ocs/pkg/service/v0/users.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" - storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" + storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0" revauser "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" @@ -27,9 +27,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-micro/plugins/v4/client/grpc" "github.com/google/uuid" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/extensions/ocs/pkg/service/v0/response" - ocstracing "github.com/owncloud/ocis/extensions/ocs/pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/data" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/service/v0/response" + ocstracing "github.com/owncloud/ocis/v2/extensions/ocs/pkg/tracing" "github.com/pkg/errors" merrors "go-micro.dev/v4/errors" "google.golang.org/genproto/protobuf/field_mask" diff --git a/extensions/ocs/pkg/tracing/tracing.go b/extensions/ocs/pkg/tracing/tracing.go index 962bd613bcd..ab9d2df2bae 100644 --- a/extensions/ocs/pkg/tracing/tracing.go +++ b/extensions/ocs/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/ocs/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/proxy/cmd/proxy/main.go b/extensions/proxy/cmd/proxy/main.go index 059facda441..b804dd4f8b7 100644 --- a/extensions/proxy/cmd/proxy/main.go +++ b/extensions/proxy/cmd/proxy/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/proxy/pkg/command" - "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/command" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/defaults" ) func main() { diff --git a/extensions/proxy/pkg/command/health.go b/extensions/proxy/pkg/command/health.go index a90cb78b41b..9b2dd4d9f67 100644 --- a/extensions/proxy/pkg/command/health.go +++ b/extensions/proxy/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/config/parser" - "github.com/owncloud/ocis/extensions/proxy/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/proxy/pkg/command/root.go b/extensions/proxy/pkg/command/root.go index 98a47d75712..467a1bfca3a 100644 --- a/extensions/proxy/pkg/command/root.go +++ b/extensions/proxy/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/proxy/pkg/command/server.go b/extensions/proxy/pkg/command/server.go index ed1752ebb7e..eca459e5821 100644 --- a/extensions/proxy/pkg/command/server.go +++ b/extensions/proxy/pkg/command/server.go @@ -7,31 +7,31 @@ import ( "net/http" "time" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" - storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" + storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0" "github.com/coreos/go-oidc/v3/oidc" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/config/parser" - "github.com/owncloud/ocis/extensions/proxy/pkg/cs3" - "github.com/owncloud/ocis/extensions/proxy/pkg/logging" - "github.com/owncloud/ocis/extensions/proxy/pkg/metrics" - "github.com/owncloud/ocis/extensions/proxy/pkg/middleware" - "github.com/owncloud/ocis/extensions/proxy/pkg/proxy" - "github.com/owncloud/ocis/extensions/proxy/pkg/server/debug" - proxyHTTP "github.com/owncloud/ocis/extensions/proxy/pkg/server/http" - "github.com/owncloud/ocis/extensions/proxy/pkg/tracing" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" - "github.com/owncloud/ocis/ocis-pkg/log" - pkgmiddleware "github.com/owncloud/ocis/ocis-pkg/middleware" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocis-pkg/version" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/cs3" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/middleware" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/proxy" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/server/debug" + proxyHTTP "github.com/owncloud/ocis/v2/extensions/proxy/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + pkgmiddleware "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/urfave/cli/v2" "golang.org/x/oauth2" ) diff --git a/extensions/proxy/pkg/command/version.go b/extensions/proxy/pkg/command/version.go index 2faf3b394e3..91f29415210 100644 --- a/extensions/proxy/pkg/command/version.go +++ b/extensions/proxy/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/proxy/pkg/config/config.go b/extensions/proxy/pkg/config/config.go index 032e81efa9b..a8c394f36c8 100644 --- a/extensions/proxy/pkg/config/config.go +++ b/extensions/proxy/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/proxy/pkg/config/defaults/defaultconfig.go b/extensions/proxy/pkg/config/defaults/defaultconfig.go index c04ed2e27c4..ec1bd9af8ee 100644 --- a/extensions/proxy/pkg/config/defaults/defaultconfig.go +++ b/extensions/proxy/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/proxy/pkg/config/parser/parse.go b/extensions/proxy/pkg/config/parser/parse.go index f792d79557e..02f20229bba 100644 --- a/extensions/proxy/pkg/config/parser/parse.go +++ b/extensions/proxy/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/proxy/pkg/cs3/client.go b/extensions/proxy/pkg/cs3/client.go index 9b7f9fba7e1..10b650aef7e 100644 --- a/extensions/proxy/pkg/cs3/client.go +++ b/extensions/proxy/pkg/cs3/client.go @@ -2,7 +2,7 @@ package cs3 import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - proxytracing "github.com/owncloud/ocis/extensions/proxy/pkg/tracing" + proxytracing "github.com/owncloud/ocis/v2/extensions/proxy/pkg/tracing" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/extensions/proxy/pkg/logging/logging.go b/extensions/proxy/pkg/logging/logging.go index 10fa0d4e9d1..c89befa1b58 100644 --- a/extensions/proxy/pkg/logging/logging.go +++ b/extensions/proxy/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/proxy/pkg/middleware/accesslog.go b/extensions/proxy/pkg/middleware/accesslog.go index b57bdaab407..43d96e41bff 100644 --- a/extensions/proxy/pkg/middleware/accesslog.go +++ b/extensions/proxy/pkg/middleware/accesslog.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5/middleware" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // AccessLog is a middleware to log http requests at info level logging. diff --git a/extensions/proxy/pkg/middleware/account_resolver.go b/extensions/proxy/pkg/middleware/account_resolver.go index 43157949011..8de2c37a289 100644 --- a/extensions/proxy/pkg/middleware/account_resolver.go +++ b/extensions/proxy/pkg/middleware/account_resolver.go @@ -4,11 +4,11 @@ import ( "errors" "net/http" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" ) // AccountResolver provides a middleware which mints a jwt and adds it to the proxied request based diff --git a/extensions/proxy/pkg/middleware/account_resolver_test.go b/extensions/proxy/pkg/middleware/account_resolver_test.go index c12f9f4f178..7da0d9a5e7a 100644 --- a/extensions/proxy/pkg/middleware/account_resolver_test.go +++ b/extensions/proxy/pkg/middleware/account_resolver_test.go @@ -10,11 +10,11 @@ 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/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend/test" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend/test" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/stretchr/testify/assert" ) diff --git a/extensions/proxy/pkg/middleware/basic_auth.go b/extensions/proxy/pkg/middleware/basic_auth.go index 0dc50791c92..425fc4ca0a4 100644 --- a/extensions/proxy/pkg/middleware/basic_auth.go +++ b/extensions/proxy/pkg/middleware/basic_auth.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" - "github.com/owncloud/ocis/extensions/proxy/pkg/webdav" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/webdav" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" ) // BasicAuth provides a middleware to check if BasicAuth is provided diff --git a/extensions/proxy/pkg/middleware/create_home.go b/extensions/proxy/pkg/middleware/create_home.go index 4c628eebc8a..5fa30a1a3e2 100644 --- a/extensions/proxy/pkg/middleware/create_home.go +++ b/extensions/proxy/pkg/middleware/create_home.go @@ -8,7 +8,7 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "google.golang.org/grpc/metadata" ) diff --git a/extensions/proxy/pkg/middleware/oidc_auth.go b/extensions/proxy/pkg/middleware/oidc_auth.go index 5797007ac70..a115fd10aa9 100644 --- a/extensions/proxy/pkg/middleware/oidc_auth.go +++ b/extensions/proxy/pkg/middleware/oidc_auth.go @@ -9,10 +9,10 @@ import ( "github.com/golang-jwt/jwt/v4" gOidc "github.com/coreos/go-oidc/v3/oidc" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" - "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" "golang.org/x/oauth2" ) diff --git a/extensions/proxy/pkg/middleware/oidc_auth_test.go b/extensions/proxy/pkg/middleware/oidc_auth_test.go index 3ffb4581fd2..33045101bea 100644 --- a/extensions/proxy/pkg/middleware/oidc_auth_test.go +++ b/extensions/proxy/pkg/middleware/oidc_auth_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/coreos/go-oidc/v3/oidc" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "golang.org/x/oauth2" ) diff --git a/extensions/proxy/pkg/middleware/options.go b/extensions/proxy/pkg/middleware/options.go index da631f099d6..f32491522c9 100644 --- a/extensions/proxy/pkg/middleware/options.go +++ b/extensions/proxy/pkg/middleware/options.go @@ -4,15 +4,15 @@ import ( "net/http" "time" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" - storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/proxy/pkg/middleware/selector_cookie.go b/extensions/proxy/pkg/middleware/selector_cookie.go index 91d76738399..1c99ba411ed 100644 --- a/extensions/proxy/pkg/middleware/selector_cookie.go +++ b/extensions/proxy/pkg/middleware/selector_cookie.go @@ -3,10 +3,10 @@ package middleware import ( "net/http" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/proxy/policy" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/proxy/policy" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" ) // SelectorCookie provides a middleware which diff --git a/extensions/proxy/pkg/middleware/signed_url_auth.go b/extensions/proxy/pkg/middleware/signed_url_auth.go index c453df93827..e917d3e7a9b 100644 --- a/extensions/proxy/pkg/middleware/signed_url_auth.go +++ b/extensions/proxy/pkg/middleware/signed_url_auth.go @@ -12,11 +12,11 @@ import ( "time" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" - "github.com/owncloud/ocis/ocis-pkg/log" - storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" - storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0" "golang.org/x/crypto/pbkdf2" ) diff --git a/extensions/proxy/pkg/proxy/option.go b/extensions/proxy/pkg/proxy/option.go index 92ce084ef1d..13d8b461e24 100644 --- a/extensions/proxy/pkg/proxy/option.go +++ b/extensions/proxy/pkg/proxy/option.go @@ -1,8 +1,8 @@ package proxy import ( - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/proxy/pkg/proxy/policy/selector.go b/extensions/proxy/pkg/proxy/policy/selector.go index 0ce6e567b3a..e3cb824bbf1 100644 --- a/extensions/proxy/pkg/proxy/policy/selector.go +++ b/extensions/proxy/pkg/proxy/policy/selector.go @@ -6,12 +6,12 @@ import ( "regexp" "sort" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-micro/plugins/v4/client/grpc" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/oidc" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" ) var ( diff --git a/extensions/proxy/pkg/proxy/policy/selector_test.go b/extensions/proxy/pkg/proxy/policy/selector_test.go index f4160ad37e5..c09a1ba58a0 100644 --- a/extensions/proxy/pkg/proxy/policy/selector_test.go +++ b/extensions/proxy/pkg/proxy/policy/selector_test.go @@ -9,10 +9,10 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/oidc" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" "go-micro.dev/v4/client" ) diff --git a/extensions/proxy/pkg/proxy/proxy.go b/extensions/proxy/pkg/proxy/proxy.go index b910452c256..6d27096ecb4 100644 --- a/extensions/proxy/pkg/proxy/proxy.go +++ b/extensions/proxy/pkg/proxy/proxy.go @@ -16,12 +16,12 @@ import ( "go.opentelemetry.io/otel/attribute" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/proxy/policy" - proxytracing "github.com/owncloud/ocis/extensions/proxy/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/registry" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/proxy/policy" + proxytracing "github.com/owncloud/ocis/v2/extensions/proxy/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/proxy/pkg/proxy/proxy_integration_test.go b/extensions/proxy/pkg/proxy/proxy_integration_test.go index a3fedf086e9..afe0145cc85 100644 --- a/extensions/proxy/pkg/proxy/proxy_integration_test.go +++ b/extensions/proxy/pkg/proxy/proxy_integration_test.go @@ -10,7 +10,7 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" ) func TestProxyIntegration(t *testing.T) { diff --git a/extensions/proxy/pkg/proxy/proxy_test.go b/extensions/proxy/pkg/proxy/proxy_test.go index 2805ada186e..e270b640f1c 100644 --- a/extensions/proxy/pkg/proxy/proxy_test.go +++ b/extensions/proxy/pkg/proxy/proxy_test.go @@ -7,8 +7,8 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/defaults" ) type matchertest struct { diff --git a/extensions/proxy/pkg/server/debug/option.go b/extensions/proxy/pkg/server/debug/option.go index 3181f385c70..ac8d8dc7e20 100644 --- a/extensions/proxy/pkg/server/debug/option.go +++ b/extensions/proxy/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/proxy/pkg/server/debug/server.go b/extensions/proxy/pkg/server/debug/server.go index bda49c1995a..04b284027a1 100644 --- a/extensions/proxy/pkg/server/debug/server.go +++ b/extensions/proxy/pkg/server/debug/server.go @@ -5,9 +5,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/proxy/pkg/server/http/option.go b/extensions/proxy/pkg/server/http/option.go index dcd3885be45..ebe89721b6a 100644 --- a/extensions/proxy/pkg/server/http/option.go +++ b/extensions/proxy/pkg/server/http/option.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/justinas/alice" - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - "github.com/owncloud/ocis/extensions/proxy/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/proxy/pkg/server/http/server.go b/extensions/proxy/pkg/server/http/server.go index 14b377434ba..f1a4ac009de 100644 --- a/extensions/proxy/pkg/server/http/server.go +++ b/extensions/proxy/pkg/server/http/server.go @@ -4,9 +4,9 @@ import ( "crypto/tls" "os" - pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto" - svc "github.com/owncloud/ocis/ocis-pkg/service/http" - "github.com/owncloud/ocis/ocis-pkg/version" + pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" + svc "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/proxy/pkg/tracing/tracing.go b/extensions/proxy/pkg/tracing/tracing.go index aa701963542..7b6db6d58a1 100644 --- a/extensions/proxy/pkg/tracing/tracing.go +++ b/extensions/proxy/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/proxy/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/proxy/pkg/user/backend/accounts.go b/extensions/proxy/pkg/user/backend/accounts.go index 3fad04671f3..26f836d902c 100644 --- a/extensions/proxy/pkg/user/backend/accounts.go +++ b/extensions/proxy/pkg/user/backend/accounts.go @@ -6,16 +6,16 @@ import ( "net/http" "strings" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" "github.com/cs3org/reva/v2/pkg/auth/scope" "github.com/cs3org/reva/v2/pkg/token" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // NewAccountsServiceUserBackend creates a user-provider which fetches users from the ocis accounts-service diff --git a/extensions/proxy/pkg/user/backend/accounts_test.go b/extensions/proxy/pkg/user/backend/accounts_test.go index ce722ce3a5c..d8fad3fa591 100644 --- a/extensions/proxy/pkg/user/backend/accounts_test.go +++ b/extensions/proxy/pkg/user/backend/accounts_test.go @@ -6,12 +6,12 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/oidc" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + accountssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/accounts/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" diff --git a/extensions/proxy/pkg/user/backend/backend.go b/extensions/proxy/pkg/user/backend/backend.go index 9cfb51d614f..b7aded6d3a6 100644 --- a/extensions/proxy/pkg/user/backend/backend.go +++ b/extensions/proxy/pkg/user/backend/backend.go @@ -8,7 +8,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "google.golang.org/grpc" ) diff --git a/extensions/proxy/pkg/user/backend/cs3.go b/extensions/proxy/pkg/user/backend/cs3.go index 2a39a4830b9..308283cac4b 100644 --- a/extensions/proxy/pkg/user/backend/cs3.go +++ b/extensions/proxy/pkg/user/backend/cs3.go @@ -8,9 +8,9 @@ import ( cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - settingsService "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/log" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + settingsService "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) type cs3backend struct { @@ -63,7 +63,7 @@ func (c *cs3backend) GetUserByClaims(ctx context.Context, claim, value string, w // if roles are empty, assume we haven't seen the user before and assign a // default user role. At least until proper roles are provided. See - // https://github.com/owncloud/ocis/issues/1825 for more context. + // https://github.com/owncloud/ocis/v2/issues/1825 for more context. if len(roleIDs) == 0 { if user.Id.Type == cs3.UserType_USER_TYPE_PRIMARY { c.logger.Info().Str("userid", user.Id.OpaqueId).Msg("user has no role assigned, assigning default user role") diff --git a/extensions/proxy/pkg/user/backend/test/backend_mock.go b/extensions/proxy/pkg/user/backend/test/backend_mock.go index 1eb489f68ca..fbcaf5d7ab3 100644 --- a/extensions/proxy/pkg/user/backend/test/backend_mock.go +++ b/extensions/proxy/pkg/user/backend/test/backend_mock.go @@ -8,7 +8,7 @@ import ( "sync" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/extensions/proxy/pkg/user/backend" + "github.com/owncloud/ocis/v2/extensions/proxy/pkg/user/backend" ) // Ensure, that UserBackendMock does implement UserBackend. diff --git a/extensions/search/cmd/search/main.go b/extensions/search/cmd/search/main.go index aa078dc41c8..c2e4061d8ac 100644 --- a/extensions/search/cmd/search/main.go +++ b/extensions/search/cmd/search/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/search/pkg/command" - "github.com/owncloud/ocis/extensions/search/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/search/pkg/command" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config/defaults" ) func main() { diff --git a/extensions/search/pkg/command/health.go b/extensions/search/pkg/command/health.go index ff4e0ec3010..9ce5a68dd3c 100644 --- a/extensions/search/pkg/command/health.go +++ b/extensions/search/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/extensions/search/pkg/config/parser" - "github.com/owncloud/ocis/extensions/search/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/search/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/search/pkg/command/index.go b/extensions/search/pkg/command/index.go index 3d57e926425..4e6ecc65c91 100644 --- a/extensions/search/pkg/command/index.go +++ b/extensions/search/pkg/command/index.go @@ -6,10 +6,10 @@ import ( "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/extensions/search/pkg/config/parser" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) // Index is the entrypoint for the server command. diff --git a/extensions/search/pkg/command/root.go b/extensions/search/pkg/command/root.go index 41dc43f558a..5bc7db0e429 100644 --- a/extensions/search/pkg/command/root.go +++ b/extensions/search/pkg/command/root.go @@ -4,11 +4,11 @@ import ( "context" "os" - "github.com/owncloud/ocis/ocis-pkg/clihelper" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" "github.com/thejerf/suture/v4" - "github.com/owncloud/ocis/extensions/search/pkg/config" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/search/pkg/command/server.go b/extensions/search/pkg/command/server.go index 2582213c493..d2aed55a42f 100644 --- a/extensions/search/pkg/command/server.go +++ b/extensions/search/pkg/command/server.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/extensions/search/pkg/config/parser" - "github.com/owncloud/ocis/extensions/search/pkg/logging" - "github.com/owncloud/ocis/extensions/search/pkg/metrics" - "github.com/owncloud/ocis/extensions/search/pkg/server/debug" - "github.com/owncloud/ocis/extensions/search/pkg/server/grpc" - "github.com/owncloud/ocis/extensions/search/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/search/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/search/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/search/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/search/pkg/server/grpc" + "github.com/owncloud/ocis/v2/extensions/search/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/search/pkg/command/version.go b/extensions/search/pkg/command/version.go index 12326e77d99..c5d64b2d999 100644 --- a/extensions/search/pkg/command/version.go +++ b/extensions/search/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/search/pkg/config/config.go b/extensions/search/pkg/config/config.go index b1396872ee7..0303ea0fa77 100644 --- a/extensions/search/pkg/config/config.go +++ b/extensions/search/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/search/pkg/config/defaults/defaultconfig.go b/extensions/search/pkg/config/defaults/defaultconfig.go index 62aadc787f8..8eed2a21665 100644 --- a/extensions/search/pkg/config/defaults/defaultconfig.go +++ b/extensions/search/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/search/pkg/config/parser/parse.go b/extensions/search/pkg/config/parser/parse.go index 9183f5be88c..8be7eb621bf 100644 --- a/extensions/search/pkg/config/parser/parse.go +++ b/extensions/search/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/extensions/search/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/search/pkg/logging/logging.go b/extensions/search/pkg/logging/logging.go index 7d80232313d..3fff7ec87ad 100644 --- a/extensions/search/pkg/logging/logging.go +++ b/extensions/search/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/search/pkg/search/index/index.go b/extensions/search/pkg/search/index/index.go index 6d828844277..0c2ffecfd9f 100644 --- a/extensions/search/pkg/search/index/index.go +++ b/extensions/search/pkg/search/index/index.go @@ -32,8 +32,8 @@ import ( sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/cs3org/reva/v2/pkg/utils" - searchmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) type indexDocument struct { diff --git a/extensions/search/pkg/search/index/index_test.go b/extensions/search/pkg/search/index/index_test.go index 8624e55a81a..69f1a17e7f7 100644 --- a/extensions/search/pkg/search/index/index_test.go +++ b/extensions/search/pkg/search/index/index_test.go @@ -6,9 +6,9 @@ import ( "github.com/blevesearch/bleve/v2" sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/owncloud/ocis/extensions/search/pkg/search/index" - searchmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + "github.com/owncloud/ocis/v2/extensions/search/pkg/search/index" + searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/extensions/search/pkg/search/mocks/IndexClient.go b/extensions/search/pkg/search/mocks/IndexClient.go index f87fd726441..ea79cd50648 100644 --- a/extensions/search/pkg/search/mocks/IndexClient.go +++ b/extensions/search/pkg/search/mocks/IndexClient.go @@ -8,7 +8,7 @@ import ( providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) // IndexClient is an autogenerated mock type for the IndexClient type diff --git a/extensions/search/pkg/search/mocks/ProviderClient.go b/extensions/search/pkg/search/mocks/ProviderClient.go index d1d551909e6..7435e78cba3 100644 --- a/extensions/search/pkg/search/mocks/ProviderClient.go +++ b/extensions/search/pkg/search/mocks/ProviderClient.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) // ProviderClient is an autogenerated mock type for the ProviderClient type diff --git a/extensions/search/pkg/search/provider/searchprovider.go b/extensions/search/pkg/search/provider/searchprovider.go index 58865f4c0ad..9356af88a8e 100644 --- a/extensions/search/pkg/search/provider/searchprovider.go +++ b/extensions/search/pkg/search/provider/searchprovider.go @@ -17,12 +17,12 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/utils/walker" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/extensions/search/pkg/search" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/search/pkg/search" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "google.golang.org/grpc/metadata" - searchmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) type Provider struct { diff --git a/extensions/search/pkg/search/provider/searchprovider_test.go b/extensions/search/pkg/search/provider/searchprovider_test.go index 183501e5e45..956d60df0a3 100644 --- a/extensions/search/pkg/search/provider/searchprovider_test.go +++ b/extensions/search/pkg/search/provider/searchprovider_test.go @@ -14,11 +14,11 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/status" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/owncloud/ocis/extensions/search/pkg/search/mocks" - provider "github.com/owncloud/ocis/extensions/search/pkg/search/provider" - "github.com/owncloud/ocis/ocis-pkg/log" - searchmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + "github.com/owncloud/ocis/v2/extensions/search/pkg/search/mocks" + provider "github.com/owncloud/ocis/v2/extensions/search/pkg/search/provider" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) var _ = Describe("Searchprovider", func() { diff --git a/extensions/search/pkg/search/search.go b/extensions/search/pkg/search/search.go index 14f0baf8c63..3e9867c0619 100644 --- a/extensions/search/pkg/search/search.go +++ b/extensions/search/pkg/search/search.go @@ -22,7 +22,7 @@ import ( "context" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) //go:generate mockery --name=ProviderClient diff --git a/extensions/search/pkg/server/debug/option.go b/extensions/search/pkg/server/debug/option.go index 33470673de6..5b18313cec4 100644 --- a/extensions/search/pkg/server/debug/option.go +++ b/extensions/search/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/search/pkg/server/debug/server.go b/extensions/search/pkg/server/debug/server.go index 8fe769df7a4..5adeb0e9d88 100644 --- a/extensions/search/pkg/server/debug/server.go +++ b/extensions/search/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/search/pkg/server/grpc/option.go b/extensions/search/pkg/server/grpc/option.go index b5378458417..ddd6eab8887 100644 --- a/extensions/search/pkg/server/grpc/option.go +++ b/extensions/search/pkg/server/grpc/option.go @@ -3,10 +3,10 @@ package grpc import ( "context" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/extensions/search/pkg/metrics" - svc "github.com/owncloud/ocis/extensions/search/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/metrics" + svc "github.com/owncloud/ocis/v2/extensions/search/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/search/pkg/server/grpc/server.go b/extensions/search/pkg/server/grpc/server.go index ef1ea0c0760..3e4eb1ee99b 100644 --- a/extensions/search/pkg/server/grpc/server.go +++ b/extensions/search/pkg/server/grpc/server.go @@ -1,10 +1,10 @@ package grpc import ( - svc "github.com/owncloud/ocis/extensions/search/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocis-pkg/version" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + svc "github.com/owncloud/ocis/v2/extensions/search/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) // Server initializes a new go-micro service ready to run diff --git a/extensions/search/pkg/service/v0/option.go b/extensions/search/pkg/service/v0/option.go index 1b592e3a3d5..cb4e4bdca62 100644 --- a/extensions/search/pkg/service/v0/option.go +++ b/extensions/search/pkg/service/v0/option.go @@ -1,8 +1,8 @@ package service import ( - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/search/pkg/service/v0/service.go b/extensions/search/pkg/service/v0/service.go index 90349b43937..b2e4873b1a2 100644 --- a/extensions/search/pkg/service/v0/service.go +++ b/extensions/search/pkg/service/v0/service.go @@ -14,13 +14,13 @@ import ( "go-micro.dev/v4/metadata" grpcmetadata "google.golang.org/grpc/metadata" - "github.com/owncloud/ocis/extensions/audit/pkg/types" - "github.com/owncloud/ocis/extensions/search/pkg/config" - "github.com/owncloud/ocis/extensions/search/pkg/search" - "github.com/owncloud/ocis/extensions/search/pkg/search/index" - searchprovider "github.com/owncloud/ocis/extensions/search/pkg/search/provider" - "github.com/owncloud/ocis/ocis-pkg/log" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + "github.com/owncloud/ocis/v2/extensions/audit/pkg/types" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + "github.com/owncloud/ocis/v2/extensions/search/pkg/search" + "github.com/owncloud/ocis/v2/extensions/search/pkg/search/index" + searchprovider "github.com/owncloud/ocis/v2/extensions/search/pkg/search/provider" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" ) // NewHandler returns a service implementation for Service. diff --git a/extensions/search/pkg/tracing/tracing.go b/extensions/search/pkg/tracing/tracing.go index 2f1f8e513f0..fda0ae37342 100644 --- a/extensions/search/pkg/tracing/tracing.go +++ b/extensions/search/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/search/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/settings/cmd/settings/main.go b/extensions/settings/cmd/settings/main.go index ec5a853628e..89d04ef65d8 100644 --- a/extensions/settings/cmd/settings/main.go +++ b/extensions/settings/cmd/settings/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/settings/pkg/command" - "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/command" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults" ) func main() { diff --git a/extensions/settings/pkg/assets/option.go b/extensions/settings/pkg/assets/option.go index a01d6fa8666..0ea16cb54ce 100644 --- a/extensions/settings/pkg/assets/option.go +++ b/extensions/settings/pkg/assets/option.go @@ -3,10 +3,10 @@ package assets import ( "net/http" - "github.com/owncloud/ocis/extensions/settings" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/assetsfs" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/assetsfs" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // New returns a new http filesystem to serve assets. diff --git a/extensions/settings/pkg/command/health.go b/extensions/settings/pkg/command/health.go index 620734e00dd..e0e7397ef4d 100644 --- a/extensions/settings/pkg/command/health.go +++ b/extensions/settings/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/config/parser" - "github.com/owncloud/ocis/extensions/settings/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/settings/pkg/command/root.go b/extensions/settings/pkg/command/root.go index 81a01cc32d9..152045ecd88 100644 --- a/extensions/settings/pkg/command/root.go +++ b/extensions/settings/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/settings/pkg/command/server.go b/extensions/settings/pkg/command/server.go index 407a4f41268..f508235ce1f 100644 --- a/extensions/settings/pkg/command/server.go +++ b/extensions/settings/pkg/command/server.go @@ -5,15 +5,15 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/config/parser" - "github.com/owncloud/ocis/extensions/settings/pkg/logging" - "github.com/owncloud/ocis/extensions/settings/pkg/metrics" - "github.com/owncloud/ocis/extensions/settings/pkg/server/debug" - "github.com/owncloud/ocis/extensions/settings/pkg/server/grpc" - "github.com/owncloud/ocis/extensions/settings/pkg/server/http" - "github.com/owncloud/ocis/extensions/settings/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/server/grpc" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/settings/pkg/command/version.go b/extensions/settings/pkg/command/version.go index 58c2c6f03cd..d8c65d3f703 100644 --- a/extensions/settings/pkg/command/version.go +++ b/extensions/settings/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/settings/pkg/config/config.go b/extensions/settings/pkg/config/config.go index 8182911bf5a..00e0ab70867 100644 --- a/extensions/settings/pkg/config/config.go +++ b/extensions/settings/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/settings/pkg/config/defaults/defaultconfig.go b/extensions/settings/pkg/config/defaults/defaultconfig.go index 6fee017caaa..c01ef9c3eba 100644 --- a/extensions/settings/pkg/config/defaults/defaultconfig.go +++ b/extensions/settings/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/settings/pkg/config/parser/parse.go b/extensions/settings/pkg/config/parser/parse.go index 5fa45bac680..277924f8205 100644 --- a/extensions/settings/pkg/config/parser/parse.go +++ b/extensions/settings/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/settings/pkg/logging/logging.go b/extensions/settings/pkg/logging/logging.go index 1c9e3501129..d8e711fc67f 100644 --- a/extensions/settings/pkg/logging/logging.go +++ b/extensions/settings/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/settings/pkg/server/debug/option.go b/extensions/settings/pkg/server/debug/option.go index 06448e9ecf5..688d997d574 100644 --- a/extensions/settings/pkg/server/debug/option.go +++ b/extensions/settings/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/settings/pkg/server/debug/server.go b/extensions/settings/pkg/server/debug/server.go index 76f5f946924..b5faab4559d 100644 --- a/extensions/settings/pkg/server/debug/server.go +++ b/extensions/settings/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/settings/pkg/server/grpc/option.go b/extensions/settings/pkg/server/grpc/option.go index 4b910fe066b..6268f4be93f 100644 --- a/extensions/settings/pkg/server/grpc/option.go +++ b/extensions/settings/pkg/server/grpc/option.go @@ -3,9 +3,9 @@ package grpc import ( "context" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/settings/pkg/server/grpc/server.go b/extensions/settings/pkg/server/grpc/server.go index bc49aeaaac8..f2d5dafc004 100644 --- a/extensions/settings/pkg/server/grpc/server.go +++ b/extensions/settings/pkg/server/grpc/server.go @@ -4,10 +4,10 @@ import ( "context" permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" - svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocis-pkg/version" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "go-micro.dev/v4/api" "go-micro.dev/v4/server" ) diff --git a/extensions/settings/pkg/server/http/option.go b/extensions/settings/pkg/server/http/option.go index 82d69d5aeee..6d1e81f5e69 100644 --- a/extensions/settings/pkg/server/http/option.go +++ b/extensions/settings/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/settings/pkg/server/http/server.go b/extensions/settings/pkg/server/http/server.go index 6b034631f6a..5c243a6a905 100644 --- a/extensions/settings/pkg/server/http/server.go +++ b/extensions/settings/pkg/server/http/server.go @@ -3,14 +3,14 @@ package http import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/extensions/settings/pkg/assets" - svc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/account" - "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" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/assets" + svc "github.com/owncloud/ocis/v2/extensions/settings/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/account" + "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "go-micro.dev/v4" ) diff --git a/extensions/settings/pkg/service/v0/instrument.go b/extensions/settings/pkg/service/v0/instrument.go index 7995394668c..d5d13961c04 100644 --- a/extensions/settings/pkg/service/v0/instrument.go +++ b/extensions/settings/pkg/service/v0/instrument.go @@ -1,7 +1,7 @@ package svc import ( - "github.com/owncloud/ocis/extensions/settings/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/settings/pkg/service/v0/logging.go b/extensions/settings/pkg/service/v0/logging.go index 5b6afe62c6b..a84dcabeb35 100644 --- a/extensions/settings/pkg/service/v0/logging.go +++ b/extensions/settings/pkg/service/v0/logging.go @@ -1,7 +1,7 @@ package svc import ( - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/settings/pkg/service/v0/option.go b/extensions/settings/pkg/service/v0/option.go index c65665b2533..7aa6e1afbb3 100644 --- a/extensions/settings/pkg/service/v0/option.go +++ b/extensions/settings/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/settings/pkg/service/v0/permissions.go b/extensions/settings/pkg/service/v0/permissions.go index 01645791383..8b4b86c4d73 100644 --- a/extensions/settings/pkg/service/v0/permissions.go +++ b/extensions/settings/pkg/service/v0/permissions.go @@ -1,7 +1,7 @@ package svc import ( - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) func (g Service) hasPermission( diff --git a/extensions/settings/pkg/service/v0/service.go b/extensions/settings/pkg/service/v0/service.go index ee3ced9b4e5..ae3cce17ace 100644 --- a/extensions/settings/pkg/service/v0/service.go +++ b/extensions/settings/pkg/service/v0/service.go @@ -8,15 +8,15 @@ import ( permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/settings" - filestore "github.com/owncloud/ocis/extensions/settings/pkg/store/filesystem" - metastore "github.com/owncloud/ocis/extensions/settings/pkg/store/metadata" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/middleware" - "github.com/owncloud/ocis/ocis-pkg/roles" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/settings" + filestore "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/filesystem" + metastore "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/metadata" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/roles" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" merrors "go-micro.dev/v4/errors" "go-micro.dev/v4/metadata" "google.golang.org/protobuf/types/known/emptypb" diff --git a/extensions/settings/pkg/service/v0/service_test.go b/extensions/settings/pkg/service/v0/service_test.go index 7c39b724a18..2e766b5bf03 100644 --- a/extensions/settings/pkg/service/v0/service_test.go +++ b/extensions/settings/pkg/service/v0/service_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" "github.com/stretchr/testify/assert" "go-micro.dev/v4/metadata" ) diff --git a/extensions/settings/pkg/service/v0/settings.go b/extensions/settings/pkg/service/v0/settings.go index 04b481c782f..35aa78ffa94 100644 --- a/extensions/settings/pkg/service/v0/settings.go +++ b/extensions/settings/pkg/service/v0/settings.go @@ -1,8 +1,8 @@ package svc import ( - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) const ( diff --git a/extensions/settings/pkg/service/v0/validator.go b/extensions/settings/pkg/service/v0/validator.go index 1120af1b599..fa1d6f6137c 100644 --- a/extensions/settings/pkg/service/v0/validator.go +++ b/extensions/settings/pkg/service/v0/validator.go @@ -5,8 +5,8 @@ import ( validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/go-ozzo/ozzo-validation/v4/is" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) var ( diff --git a/extensions/settings/pkg/settings/settings.go b/extensions/settings/pkg/settings/settings.go index 3b09ed6dd11..5037fa1b27f 100644 --- a/extensions/settings/pkg/settings/settings.go +++ b/extensions/settings/pkg/settings/settings.go @@ -3,8 +3,8 @@ package settings import ( "errors" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) var ( diff --git a/extensions/settings/pkg/store/defaults/defaults.go b/extensions/settings/pkg/store/defaults/defaults.go index 2b3e94435fb..c52b32a4326 100644 --- a/extensions/settings/pkg/store/defaults/defaults.go +++ b/extensions/settings/pkg/store/defaults/defaults.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/settings/pkg/config" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) const ( diff --git a/extensions/settings/pkg/store/filesystem/assignments.go b/extensions/settings/pkg/store/filesystem/assignments.go index d34496a7aeb..5144d666212 100644 --- a/extensions/settings/pkg/store/filesystem/assignments.go +++ b/extensions/settings/pkg/store/filesystem/assignments.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/gofrs/uuid" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListRoleAssignments loads and returns all role assignments matching the given assignment identifier. diff --git a/extensions/settings/pkg/store/filesystem/assignments_test.go b/extensions/settings/pkg/store/filesystem/assignments_test.go index 1edeb729601..4f657badc7d 100644 --- a/extensions/settings/pkg/store/filesystem/assignments_test.go +++ b/extensions/settings/pkg/store/filesystem/assignments_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - olog "github.com/owncloud/ocis/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/assert" ) diff --git a/extensions/settings/pkg/store/filesystem/bundles.go b/extensions/settings/pkg/store/filesystem/bundles.go index 71f92ce37dc..3b5430d42de 100644 --- a/extensions/settings/pkg/store/filesystem/bundles.go +++ b/extensions/settings/pkg/store/filesystem/bundles.go @@ -8,8 +8,8 @@ import ( "sync" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/extensions/settings/pkg/store/errortypes" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/errortypes" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) var m = &sync.RWMutex{} diff --git a/extensions/settings/pkg/store/filesystem/bundles_test.go b/extensions/settings/pkg/store/filesystem/bundles_test.go index ddee0f94e6e..c7695bca625 100644 --- a/extensions/settings/pkg/store/filesystem/bundles_test.go +++ b/extensions/settings/pkg/store/filesystem/bundles_test.go @@ -3,8 +3,8 @@ package store import ( "testing" - olog "github.com/owncloud/ocis/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/assert" ) diff --git a/extensions/settings/pkg/store/filesystem/io.go b/extensions/settings/pkg/store/filesystem/io.go index 3de38d0346f..2e59192fda6 100644 --- a/extensions/settings/pkg/store/filesystem/io.go +++ b/extensions/settings/pkg/store/filesystem/io.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "github.com/owncloud/ocis/extensions/settings/pkg/store/errortypes" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/errortypes" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" ) diff --git a/extensions/settings/pkg/store/filesystem/permissions.go b/extensions/settings/pkg/store/filesystem/permissions.go index 66c8a24e551..a84886202d6 100644 --- a/extensions/settings/pkg/store/filesystem/permissions.go +++ b/extensions/settings/pkg/store/filesystem/permissions.go @@ -1,9 +1,9 @@ package store import ( - "github.com/owncloud/ocis/extensions/settings/pkg/settings" - "github.com/owncloud/ocis/extensions/settings/pkg/util" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/settings" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/util" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource diff --git a/extensions/settings/pkg/store/filesystem/store.go b/extensions/settings/pkg/store/filesystem/store.go index 3786cfde4bd..4782648fe5c 100644 --- a/extensions/settings/pkg/store/filesystem/store.go +++ b/extensions/settings/pkg/store/filesystem/store.go @@ -4,9 +4,9 @@ package store import ( "os" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/settings" - olog "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/settings" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/extensions/settings/pkg/store/filesystem/values.go b/extensions/settings/pkg/store/filesystem/values.go index 43245ed3dab..444398e83f5 100644 --- a/extensions/settings/pkg/store/filesystem/values.go +++ b/extensions/settings/pkg/store/filesystem/values.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/gofrs/uuid" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListValues reads all values that match the given bundleId and accountUUID. diff --git a/extensions/settings/pkg/store/filesystem/values_test.go b/extensions/settings/pkg/store/filesystem/values_test.go index f65a94574b3..765947dc177 100644 --- a/extensions/settings/pkg/store/filesystem/values_test.go +++ b/extensions/settings/pkg/store/filesystem/values_test.go @@ -3,8 +3,8 @@ package store import ( "testing" - olog "github.com/owncloud/ocis/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/assert" ) diff --git a/extensions/settings/pkg/store/metadata/assignments.go b/extensions/settings/pkg/store/metadata/assignments.go index 63c7b31121e..8570ca9b1e6 100644 --- a/extensions/settings/pkg/store/metadata/assignments.go +++ b/extensions/settings/pkg/store/metadata/assignments.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/extensions/settings/pkg/store/defaults" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListRoleAssignments loads and returns all role assignments matching the given assignment identifier. diff --git a/extensions/settings/pkg/store/metadata/assignments_test.go b/extensions/settings/pkg/store/metadata/assignments_test.go index 62b0b43682c..19165fac8da 100644 --- a/extensions/settings/pkg/store/metadata/assignments_test.go +++ b/extensions/settings/pkg/store/metadata/assignments_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" - olog "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/shared" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/require" ) diff --git a/extensions/settings/pkg/store/metadata/bundles.go b/extensions/settings/pkg/store/metadata/bundles.go index 574aead6dd5..d55b756c05c 100644 --- a/extensions/settings/pkg/store/metadata/bundles.go +++ b/extensions/settings/pkg/store/metadata/bundles.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/extensions/settings/pkg/store/defaults" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListBundles returns all bundles in the dataPath folder that match the given type. diff --git a/extensions/settings/pkg/store/metadata/bundles_test.go b/extensions/settings/pkg/store/metadata/bundles_test.go index 0aadbd3b72e..f41c75adfb6 100644 --- a/extensions/settings/pkg/store/metadata/bundles_test.go +++ b/extensions/settings/pkg/store/metadata/bundles_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/gofrs/uuid" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/require" ) diff --git a/extensions/settings/pkg/store/metadata/permissions.go b/extensions/settings/pkg/store/metadata/permissions.go index 59cfefab5e7..d70c7dbcee9 100644 --- a/extensions/settings/pkg/store/metadata/permissions.go +++ b/extensions/settings/pkg/store/metadata/permissions.go @@ -1,9 +1,9 @@ package store import ( - "github.com/owncloud/ocis/extensions/settings/pkg/settings" - "github.com/owncloud/ocis/extensions/settings/pkg/util" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/settings" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/util" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource diff --git a/extensions/settings/pkg/store/metadata/permissions_test.go b/extensions/settings/pkg/store/metadata/permissions_test.go index db3283cb461..b0536127769 100644 --- a/extensions/settings/pkg/store/metadata/permissions_test.go +++ b/extensions/settings/pkg/store/metadata/permissions_test.go @@ -3,7 +3,7 @@ package store import ( "testing" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/require" ) diff --git a/extensions/settings/pkg/store/metadata/store.go b/extensions/settings/pkg/store/metadata/store.go index e9d8739dd35..89f8ec422ea 100644 --- a/extensions/settings/pkg/store/metadata/store.go +++ b/extensions/settings/pkg/store/metadata/store.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/extensions/settings/pkg/config" - "github.com/owncloud/ocis/extensions/settings/pkg/settings" - "github.com/owncloud/ocis/extensions/settings/pkg/store/defaults" - olog "github.com/owncloud/ocis/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/settings" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/defaults" + olog "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) var ( diff --git a/extensions/settings/pkg/store/metadata/store_test.go b/extensions/settings/pkg/store/metadata/store_test.go index 6ab658c3929..67956298927 100644 --- a/extensions/settings/pkg/store/metadata/store_test.go +++ b/extensions/settings/pkg/store/metadata/store_test.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults" ) const ( diff --git a/extensions/settings/pkg/store/metadata/values.go b/extensions/settings/pkg/store/metadata/values.go index 9dd73b16d1b..5ab790f5076 100644 --- a/extensions/settings/pkg/store/metadata/values.go +++ b/extensions/settings/pkg/store/metadata/values.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/gofrs/uuid" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // ListValues reads all values that match the given bundleId and accountUUID. diff --git a/extensions/settings/pkg/store/metadata/values_test.go b/extensions/settings/pkg/store/metadata/values_test.go index 62c71867e0d..37c77d4a343 100644 --- a/extensions/settings/pkg/store/metadata/values_test.go +++ b/extensions/settings/pkg/store/metadata/values_test.go @@ -3,7 +3,7 @@ package store import ( "testing" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/require" ) diff --git a/extensions/settings/pkg/store/registry.go b/extensions/settings/pkg/store/registry.go index 26397471cec..d82af83bd6a 100644 --- a/extensions/settings/pkg/store/registry.go +++ b/extensions/settings/pkg/store/registry.go @@ -2,6 +2,6 @@ package store import ( // init filesystem store - _ "github.com/owncloud/ocis/extensions/settings/pkg/store/filesystem" - _ "github.com/owncloud/ocis/extensions/settings/pkg/store/metadata" + _ "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/filesystem" + _ "github.com/owncloud/ocis/v2/extensions/settings/pkg/store/metadata" ) diff --git a/extensions/settings/pkg/tracing/tracing.go b/extensions/settings/pkg/tracing/tracing.go index a9428f34ac4..9532fd2972e 100644 --- a/extensions/settings/pkg/tracing/tracing.go +++ b/extensions/settings/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/settings/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/settings/pkg/util/resource_helper.go b/extensions/settings/pkg/util/resource_helper.go index 95818575c24..f9d2bffec06 100644 --- a/extensions/settings/pkg/util/resource_helper.go +++ b/extensions/settings/pkg/util/resource_helper.go @@ -1,7 +1,7 @@ package util import ( - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) const ( diff --git a/extensions/settings/pkg/util/resource_helper_test.go b/extensions/settings/pkg/util/resource_helper_test.go index 8f864a78e14..aec873a412b 100644 --- a/extensions/settings/pkg/util/resource_helper_test.go +++ b/extensions/settings/pkg/util/resource_helper_test.go @@ -3,7 +3,7 @@ package util import ( "testing" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "gotest.tools/v3/assert" ) diff --git a/extensions/sharing/cmd/sharing/main.go b/extensions/sharing/cmd/sharing/main.go index 8f1936f293a..63938d147e5 100644 --- a/extensions/sharing/cmd/sharing/main.go +++ b/extensions/sharing/cmd/sharing/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/sharing/pkg/command" - "github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/command" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/defaults" ) func main() { diff --git a/extensions/sharing/pkg/command/health.go b/extensions/sharing/pkg/command/health.go index a159314c37b..f0303cc8a7e 100644 --- a/extensions/sharing/pkg/command/health.go +++ b/extensions/sharing/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/extensions/sharing/pkg/config/parser" - "github.com/owncloud/ocis/extensions/sharing/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/sharing/pkg/command/root.go b/extensions/sharing/pkg/command/root.go index c2ce475e8d3..38e6cd0e30e 100644 --- a/extensions/sharing/pkg/command/root.go +++ b/extensions/sharing/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/sharing/pkg/command/server.go b/extensions/sharing/pkg/command/server.go index fe5ad30b6fb..699fb3bbb40 100644 --- a/extensions/sharing/pkg/command/server.go +++ b/extensions/sharing/pkg/command/server.go @@ -10,15 +10,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/extensions/sharing/pkg/config/parser" - "github.com/owncloud/ocis/extensions/sharing/pkg/logging" - "github.com/owncloud/ocis/extensions/sharing/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/sharing/pkg/server/debug" - "github.com/owncloud/ocis/extensions/sharing/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/sharing/pkg/command/version.go b/extensions/sharing/pkg/command/version.go index e54734d0ffe..980376062fc 100644 --- a/extensions/sharing/pkg/command/version.go +++ b/extensions/sharing/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/sharing/pkg/config/config.go b/extensions/sharing/pkg/config/config.go index 553ba05ec76..21f690603a1 100644 --- a/extensions/sharing/pkg/config/config.go +++ b/extensions/sharing/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/sharing/pkg/config/defaults/defaultconfig.go b/extensions/sharing/pkg/config/defaults/defaultconfig.go index 518c0ae58ea..f1e3fa6d59b 100644 --- a/extensions/sharing/pkg/config/defaults/defaultconfig.go +++ b/extensions/sharing/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/sharing/pkg/config/parser/parse.go b/extensions/sharing/pkg/config/parser/parse.go index df63239c292..a50d0dd0f16 100644 --- a/extensions/sharing/pkg/config/parser/parse.go +++ b/extensions/sharing/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/sharing/pkg/logging/logging.go b/extensions/sharing/pkg/logging/logging.go index 364f2a76de8..90114df284f 100644 --- a/extensions/sharing/pkg/logging/logging.go +++ b/extensions/sharing/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/sharing/pkg/revaconfig/config.go b/extensions/sharing/pkg/revaconfig/config.go index 00a8d3a2511..0c5211a4c8f 100644 --- a/extensions/sharing/pkg/revaconfig/config.go +++ b/extensions/sharing/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" ) // SharingConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/sharing/pkg/server/debug/option.go b/extensions/sharing/pkg/server/debug/option.go index 9667bca9e4b..2c59af9067d 100644 --- a/extensions/sharing/pkg/server/debug/option.go +++ b/extensions/sharing/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/sharing/pkg/server/debug/server.go b/extensions/sharing/pkg/server/debug/server.go index d7ce79028f3..87a280bc03c 100644 --- a/extensions/sharing/pkg/server/debug/server.go +++ b/extensions/sharing/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/sharing/pkg/tracing/tracing.go b/extensions/sharing/pkg/tracing/tracing.go index 55a39d9ffc3..f69064d4f02 100644 --- a/extensions/sharing/pkg/tracing/tracing.go +++ b/extensions/sharing/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/sharing/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/storage-publiclink/cmd/storage-publiclink/main.go b/extensions/storage-publiclink/cmd/storage-publiclink/main.go index 55e9f26f95c..d620d0e65b3 100644 --- a/extensions/storage-publiclink/cmd/storage-publiclink/main.go +++ b/extensions/storage-publiclink/cmd/storage-publiclink/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/command" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/command" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config/defaults" ) func main() { diff --git a/extensions/storage-publiclink/pkg/command/health.go b/extensions/storage-publiclink/pkg/command/health.go index f406daeb5fd..679d663f9fb 100644 --- a/extensions/storage-publiclink/pkg/command/health.go +++ b/extensions/storage-publiclink/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-publiclink/pkg/command/root.go b/extensions/storage-publiclink/pkg/command/root.go index 87cb0586c64..c49903d06ef 100644 --- a/extensions/storage-publiclink/pkg/command/root.go +++ b/extensions/storage-publiclink/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-publiclink/pkg/command/server.go b/extensions/storage-publiclink/pkg/command/server.go index eb0a938e63f..3c5976aadcb 100644 --- a/extensions/storage-publiclink/pkg/command/server.go +++ b/extensions/storage-publiclink/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/logging" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/server/debug" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-publiclink/pkg/command/version.go b/extensions/storage-publiclink/pkg/command/version.go index f16c6dca209..676531f5192 100644 --- a/extensions/storage-publiclink/pkg/command/version.go +++ b/extensions/storage-publiclink/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-publiclink/pkg/config/config.go b/extensions/storage-publiclink/pkg/config/config.go index 0420deb666f..0f719b989e5 100644 --- a/extensions/storage-publiclink/pkg/config/config.go +++ b/extensions/storage-publiclink/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go b/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go index d8595c935df..0845d0a0243 100644 --- a/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-publiclink/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/storage-publiclink/pkg/config/parser/parse.go b/extensions/storage-publiclink/pkg/config/parser/parse.go index f0e7cda9922..03549280f27 100644 --- a/extensions/storage-publiclink/pkg/config/parser/parse.go +++ b/extensions/storage-publiclink/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/storage-publiclink/pkg/logging/logging.go b/extensions/storage-publiclink/pkg/logging/logging.go index a3dc14fdeb5..1ee5114d9ab 100644 --- a/extensions/storage-publiclink/pkg/logging/logging.go +++ b/extensions/storage-publiclink/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/storage-publiclink/pkg/revaconfig/config.go b/extensions/storage-publiclink/pkg/revaconfig/config.go index 9d1ac314f8f..8a0f0285ed9 100644 --- a/extensions/storage-publiclink/pkg/revaconfig/config.go +++ b/extensions/storage-publiclink/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" ) // StoragePublicLinkConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/storage-publiclink/pkg/server/debug/option.go b/extensions/storage-publiclink/pkg/server/debug/option.go index d2cccd34371..cae95d69009 100644 --- a/extensions/storage-publiclink/pkg/server/debug/option.go +++ b/extensions/storage-publiclink/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/storage-publiclink/pkg/server/debug/server.go b/extensions/storage-publiclink/pkg/server/debug/server.go index fe2896014f8..ee710ba0e36 100644 --- a/extensions/storage-publiclink/pkg/server/debug/server.go +++ b/extensions/storage-publiclink/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/storage-publiclink/pkg/tracing/tracing.go b/extensions/storage-publiclink/pkg/tracing/tracing.go index 7c3c1bb60dc..cc5342080e5 100644 --- a/extensions/storage-publiclink/pkg/tracing/tracing.go +++ b/extensions/storage-publiclink/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/storage-shares/cmd/storage-shares/main.go b/extensions/storage-shares/cmd/storage-shares/main.go index 6fea0b0df30..e663319fc9a 100644 --- a/extensions/storage-shares/cmd/storage-shares/main.go +++ b/extensions/storage-shares/cmd/storage-shares/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/command" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/command" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config/defaults" ) func main() { diff --git a/extensions/storage-shares/pkg/command/health.go b/extensions/storage-shares/pkg/command/health.go index 8b5505e738e..0be6749a48d 100644 --- a/extensions/storage-shares/pkg/command/health.go +++ b/extensions/storage-shares/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-shares/pkg/command/root.go b/extensions/storage-shares/pkg/command/root.go index bafe1a336b5..062a22e673c 100644 --- a/extensions/storage-shares/pkg/command/root.go +++ b/extensions/storage-shares/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-shares/pkg/command/server.go b/extensions/storage-shares/pkg/command/server.go index 16560c6e94e..6a42690bc46 100644 --- a/extensions/storage-shares/pkg/command/server.go +++ b/extensions/storage-shares/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/logging" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/server/debug" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-shares/pkg/command/version.go b/extensions/storage-shares/pkg/command/version.go index 3687778691c..bf98ef56e52 100644 --- a/extensions/storage-shares/pkg/command/version.go +++ b/extensions/storage-shares/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-shares/pkg/config/config.go b/extensions/storage-shares/pkg/config/config.go index d555ed2d3fb..cb3258648d3 100644 --- a/extensions/storage-shares/pkg/config/config.go +++ b/extensions/storage-shares/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/storage-shares/pkg/config/defaults/defaultconfig.go b/extensions/storage-shares/pkg/config/defaults/defaultconfig.go index 5b1ad7faa2c..f9842e791dd 100644 --- a/extensions/storage-shares/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-shares/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/storage-shares/pkg/config/parser/parse.go b/extensions/storage-shares/pkg/config/parser/parse.go index 6b0efc7aef7..fb0bbf230bf 100644 --- a/extensions/storage-shares/pkg/config/parser/parse.go +++ b/extensions/storage-shares/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/storage-shares/pkg/logging/logging.go b/extensions/storage-shares/pkg/logging/logging.go index 7769e10fe72..b585f564b90 100644 --- a/extensions/storage-shares/pkg/logging/logging.go +++ b/extensions/storage-shares/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/storage-shares/pkg/revaconfig/config.go b/extensions/storage-shares/pkg/revaconfig/config.go index be281c05532..4e69088fec1 100644 --- a/extensions/storage-shares/pkg/revaconfig/config.go +++ b/extensions/storage-shares/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" ) // StorageSharesConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/storage-shares/pkg/server/debug/option.go b/extensions/storage-shares/pkg/server/debug/option.go index a671b3ec76a..a9e1af69fec 100644 --- a/extensions/storage-shares/pkg/server/debug/option.go +++ b/extensions/storage-shares/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/storage-shares/pkg/server/debug/server.go b/extensions/storage-shares/pkg/server/debug/server.go index 666c3b3b14c..05af7b77775 100644 --- a/extensions/storage-shares/pkg/server/debug/server.go +++ b/extensions/storage-shares/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/storage-shares/pkg/tracing/tracing.go b/extensions/storage-shares/pkg/tracing/tracing.go index 3ba5dbbc409..d09325e024b 100644 --- a/extensions/storage-shares/pkg/tracing/tracing.go +++ b/extensions/storage-shares/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/storage-system/cmd/storage-system/main.go b/extensions/storage-system/cmd/storage-system/main.go index 4204447c9e6..1eabece4702 100644 --- a/extensions/storage-system/cmd/storage-system/main.go +++ b/extensions/storage-system/cmd/storage-system/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/storage-system/pkg/command" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/command" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config/defaults" ) func main() { diff --git a/extensions/storage-system/pkg/command/health.go b/extensions/storage-system/pkg/command/health.go index 8c34dc45741..52dc14efb5d 100644 --- a/extensions/storage-system/pkg/command/health.go +++ b/extensions/storage-system/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-system/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-system/pkg/command/root.go b/extensions/storage-system/pkg/command/root.go index c737e75f559..4cc90487d0d 100644 --- a/extensions/storage-system/pkg/command/root.go +++ b/extensions/storage-system/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-system/pkg/command/server.go b/extensions/storage-system/pkg/command/server.go index 026f75bf39a..348909c4474 100644 --- a/extensions/storage-system/pkg/command/server.go +++ b/extensions/storage-system/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-system/pkg/logging" - "github.com/owncloud/ocis/extensions/storage-system/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/storage-system/pkg/server/debug" - "github.com/owncloud/ocis/extensions/storage-system/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-system/pkg/command/version.go b/extensions/storage-system/pkg/command/version.go index b0046435b96..9f36e1bee9f 100644 --- a/extensions/storage-system/pkg/command/version.go +++ b/extensions/storage-system/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-system/pkg/config/config.go b/extensions/storage-system/pkg/config/config.go index 7939194666a..91333662284 100644 --- a/extensions/storage-system/pkg/config/config.go +++ b/extensions/storage-system/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/storage-system/pkg/config/defaults/defaultconfig.go b/extensions/storage-system/pkg/config/defaults/defaultconfig.go index 3fa3162adf3..776e9a36243 100644 --- a/extensions/storage-system/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-system/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/storage-system/pkg/config/parser/parse.go b/extensions/storage-system/pkg/config/parser/parse.go index 7932a4548d7..1dca0d06591 100644 --- a/extensions/storage-system/pkg/config/parser/parse.go +++ b/extensions/storage-system/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/storage-system/pkg/logging/logging.go b/extensions/storage-system/pkg/logging/logging.go index f7fc1ad37ca..5071fda3ec3 100644 --- a/extensions/storage-system/pkg/logging/logging.go +++ b/extensions/storage-system/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/storage-system/pkg/revaconfig/config.go b/extensions/storage-system/pkg/revaconfig/config.go index ab342491970..1dec2be8aaf 100644 --- a/extensions/storage-system/pkg/revaconfig/config.go +++ b/extensions/storage-system/pkg/revaconfig/config.go @@ -2,7 +2,7 @@ package revaconfig import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" ) // StorageMetadataFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/storage-system/pkg/server/debug/option.go b/extensions/storage-system/pkg/server/debug/option.go index 689ead57e3c..a1b8225fcd9 100644 --- a/extensions/storage-system/pkg/server/debug/option.go +++ b/extensions/storage-system/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/storage-system/pkg/server/debug/server.go b/extensions/storage-system/pkg/server/debug/server.go index 6cdfa52efb7..50383c0c7ce 100644 --- a/extensions/storage-system/pkg/server/debug/server.go +++ b/extensions/storage-system/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/storage-system/pkg/tracing/tracing.go b/extensions/storage-system/pkg/tracing/tracing.go index 276c3c0e1db..2a7b1de337e 100644 --- a/extensions/storage-system/pkg/tracing/tracing.go +++ b/extensions/storage-system/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/storage-users/cmd/storage-users/main.go b/extensions/storage-users/cmd/storage-users/main.go index 4e99f593776..efd329fdfd9 100644 --- a/extensions/storage-users/cmd/storage-users/main.go +++ b/extensions/storage-users/cmd/storage-users/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/storage-users/pkg/command" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/defaults" ) func main() { diff --git a/extensions/storage-users/pkg/command/health.go b/extensions/storage-users/pkg/command/health.go index baa4d1a8de7..fb8359bd518 100644 --- a/extensions/storage-users/pkg/command/health.go +++ b/extensions/storage-users/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-users/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-users/pkg/command/root.go b/extensions/storage-users/pkg/command/root.go index 49304eebe2d..9b22048030b 100644 --- a/extensions/storage-users/pkg/command/root.go +++ b/extensions/storage-users/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-users/pkg/command/server.go b/extensions/storage-users/pkg/command/server.go index ae83b2435fd..0c2011a12a3 100644 --- a/extensions/storage-users/pkg/command/server.go +++ b/extensions/storage-users/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config/parser" - "github.com/owncloud/ocis/extensions/storage-users/pkg/logging" - "github.com/owncloud/ocis/extensions/storage-users/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/storage-users/pkg/server/debug" - "github.com/owncloud/ocis/extensions/storage-users/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-users/pkg/command/version.go b/extensions/storage-users/pkg/command/version.go index 597dcc14df9..1c046b5c0f8 100644 --- a/extensions/storage-users/pkg/command/version.go +++ b/extensions/storage-users/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/storage-users/pkg/config/config.go b/extensions/storage-users/pkg/config/config.go index 59f95849cc0..be37a5bfbc9 100644 --- a/extensions/storage-users/pkg/config/config.go +++ b/extensions/storage-users/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/storage-users/pkg/config/defaults/defaultconfig.go b/extensions/storage-users/pkg/config/defaults/defaultconfig.go index fb36a5073df..aec7a9d68c9 100644 --- a/extensions/storage-users/pkg/config/defaults/defaultconfig.go +++ b/extensions/storage-users/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/storage-users/pkg/config/parser/parse.go b/extensions/storage-users/pkg/config/parser/parse.go index b6a55e1aef6..ab352d004d5 100644 --- a/extensions/storage-users/pkg/config/parser/parse.go +++ b/extensions/storage-users/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/storage-users/pkg/logging/logging.go b/extensions/storage-users/pkg/logging/logging.go index 3c9fb9c6617..d719f39b3ff 100644 --- a/extensions/storage-users/pkg/logging/logging.go +++ b/extensions/storage-users/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/storage-users/pkg/revaconfig/config.go b/extensions/storage-users/pkg/revaconfig/config.go index 77947946292..cf2d64ac1ff 100644 --- a/extensions/storage-users/pkg/revaconfig/config.go +++ b/extensions/storage-users/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" ) // StorageUsersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/storage-users/pkg/revaconfig/user.go b/extensions/storage-users/pkg/revaconfig/user.go index a8c7d733634..139c47027f5 100644 --- a/extensions/storage-users/pkg/revaconfig/user.go +++ b/extensions/storage-users/pkg/revaconfig/user.go @@ -1,6 +1,6 @@ package revaconfig -import "github.com/owncloud/ocis/extensions/storage-users/pkg/config" +import "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" func UserDrivers(cfg *config.Config) map[string]interface{} { return map[string]interface{}{ diff --git a/extensions/storage-users/pkg/server/debug/option.go b/extensions/storage-users/pkg/server/debug/option.go index 7493b21c486..61ac5dd87cb 100644 --- a/extensions/storage-users/pkg/server/debug/option.go +++ b/extensions/storage-users/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/storage-users/pkg/server/debug/server.go b/extensions/storage-users/pkg/server/debug/server.go index 65c9fdc7a87..9c6d2b08693 100644 --- a/extensions/storage-users/pkg/server/debug/server.go +++ b/extensions/storage-users/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/storage-users/pkg/tracing/tracing.go b/extensions/storage-users/pkg/tracing/tracing.go index d0bcbb55388..2806dd93b0c 100644 --- a/extensions/storage-users/pkg/tracing/tracing.go +++ b/extensions/storage-users/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/store/cmd/store/main.go b/extensions/store/cmd/store/main.go index c520658d53e..db1f85bac01 100644 --- a/extensions/store/cmd/store/main.go +++ b/extensions/store/cmd/store/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/store/pkg/command" - "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/store/pkg/command" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config/defaults" ) func main() { diff --git a/extensions/store/pkg/command/health.go b/extensions/store/pkg/command/health.go index 341f59317c6..ccb7b8b7031 100644 --- a/extensions/store/pkg/command/health.go +++ b/extensions/store/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/extensions/store/pkg/config/parser" - "github.com/owncloud/ocis/extensions/store/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/store/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/store/pkg/command/root.go b/extensions/store/pkg/command/root.go index 4ab42c4465f..2d9a1d28800 100644 --- a/extensions/store/pkg/command/root.go +++ b/extensions/store/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/store/pkg/command/server.go b/extensions/store/pkg/command/server.go index a2995507e79..51dfe971a50 100644 --- a/extensions/store/pkg/command/server.go +++ b/extensions/store/pkg/command/server.go @@ -6,14 +6,14 @@ import ( "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/extensions/store/pkg/config/parser" - "github.com/owncloud/ocis/extensions/store/pkg/logging" - "github.com/owncloud/ocis/extensions/store/pkg/metrics" - "github.com/owncloud/ocis/extensions/store/pkg/server/debug" - "github.com/owncloud/ocis/extensions/store/pkg/server/grpc" - "github.com/owncloud/ocis/extensions/store/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/store/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/store/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/store/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/store/pkg/server/grpc" + "github.com/owncloud/ocis/v2/extensions/store/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/store/pkg/command/version.go b/extensions/store/pkg/command/version.go index 0991017721c..48c6f1318d5 100644 --- a/extensions/store/pkg/command/version.go +++ b/extensions/store/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/store/pkg/config/config.go b/extensions/store/pkg/config/config.go index 2c210a34a8a..ac71316bd9e 100644 --- a/extensions/store/pkg/config/config.go +++ b/extensions/store/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/store/pkg/config/defaults/defaultconfig.go b/extensions/store/pkg/config/defaults/defaultconfig.go index 8932d4266a2..3f765cda5a0 100644 --- a/extensions/store/pkg/config/defaults/defaultconfig.go +++ b/extensions/store/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/store/pkg/config/parser/parse.go b/extensions/store/pkg/config/parser/parse.go index 68045ecf751..2729c98a1e8 100644 --- a/extensions/store/pkg/config/parser/parse.go +++ b/extensions/store/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/store/pkg/logging/logging.go b/extensions/store/pkg/logging/logging.go index ae9008b4e25..62e29b14ab7 100644 --- a/extensions/store/pkg/logging/logging.go +++ b/extensions/store/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/store/pkg/server/debug/option.go b/extensions/store/pkg/server/debug/option.go index c911ff703de..e0c72f37092 100644 --- a/extensions/store/pkg/server/debug/option.go +++ b/extensions/store/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/store/pkg/server/debug/server.go b/extensions/store/pkg/server/debug/server.go index b82ec6a2fab..c02b18c4aa9 100644 --- a/extensions/store/pkg/server/debug/server.go +++ b/extensions/store/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/store/pkg/server/grpc/option.go b/extensions/store/pkg/server/grpc/option.go index 4e4bc9c8874..2e3813dd40a 100644 --- a/extensions/store/pkg/server/grpc/option.go +++ b/extensions/store/pkg/server/grpc/option.go @@ -3,9 +3,9 @@ package grpc import ( "context" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/extensions/store/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/extensions/store/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/store/pkg/server/grpc/server.go b/extensions/store/pkg/server/grpc/server.go index cf75ac3a25b..a7cfcf793bb 100644 --- a/extensions/store/pkg/server/grpc/server.go +++ b/extensions/store/pkg/server/grpc/server.go @@ -1,10 +1,10 @@ package grpc import ( - svc "github.com/owncloud/ocis/extensions/store/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocis-pkg/version" - storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" + svc "github.com/owncloud/ocis/v2/extensions/store/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0" ) // Server initializes a new go-micro service ready to run diff --git a/extensions/store/pkg/service/v0/option.go b/extensions/store/pkg/service/v0/option.go index 5b53e01ee0c..7cd8f707896 100644 --- a/extensions/store/pkg/service/v0/option.go +++ b/extensions/store/pkg/service/v0/option.go @@ -1,8 +1,8 @@ package service import ( - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/store/pkg/service/v0/service.go b/extensions/store/pkg/service/v0/service.go index 72dcf6170f6..50919c2f0e7 100644 --- a/extensions/store/pkg/service/v0/service.go +++ b/extensions/store/pkg/service/v0/service.go @@ -9,10 +9,10 @@ import ( "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/keyword" - "github.com/owncloud/ocis/extensions/store/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" - storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + storemsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + storesvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/store/v0" merrors "go-micro.dev/v4/errors" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/extensions/store/pkg/tracing/tracing.go b/extensions/store/pkg/tracing/tracing.go index 1c67fa097dd..4bb2401ad3f 100644 --- a/extensions/store/pkg/tracing/tracing.go +++ b/extensions/store/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/store/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/thumbnails/cmd/thumbnails/main.go b/extensions/thumbnails/cmd/thumbnails/main.go index 89f908cca2b..43d9153c763 100644 --- a/extensions/thumbnails/cmd/thumbnails/main.go +++ b/extensions/thumbnails/cmd/thumbnails/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/command" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/defaults" ) func main() { diff --git a/extensions/thumbnails/pkg/command/health.go b/extensions/thumbnails/pkg/command/health.go index 17e93587716..94f2322bd44 100644 --- a/extensions/thumbnails/pkg/command/health.go +++ b/extensions/thumbnails/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/parser" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/thumbnails/pkg/command/root.go b/extensions/thumbnails/pkg/command/root.go index 07fca1eae43..f270959d2ad 100644 --- a/extensions/thumbnails/pkg/command/root.go +++ b/extensions/thumbnails/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/thumbnails/pkg/command/server.go b/extensions/thumbnails/pkg/command/server.go index 7244a7c86c7..8144937f552 100644 --- a/extensions/thumbnails/pkg/command/server.go +++ b/extensions/thumbnails/pkg/command/server.go @@ -5,15 +5,15 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/parser" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/logging" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/server/debug" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/server/grpc" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/server/http" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/server/grpc" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/thumbnails/pkg/command/version.go b/extensions/thumbnails/pkg/command/version.go index ce2752f9e7b..0d3e771eeb0 100644 --- a/extensions/thumbnails/pkg/command/version.go +++ b/extensions/thumbnails/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/thumbnails/pkg/config/config.go b/extensions/thumbnails/pkg/config/config.go index 4e65f12e826..5592422174a 100644 --- a/extensions/thumbnails/pkg/config/config.go +++ b/extensions/thumbnails/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/thumbnails/pkg/config/defaults/defaultconfig.go b/extensions/thumbnails/pkg/config/defaults/defaultconfig.go index b24c9e3d114..b3d2203c9b3 100644 --- a/extensions/thumbnails/pkg/config/defaults/defaultconfig.go +++ b/extensions/thumbnails/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/thumbnails/pkg/config/parser/parse.go b/extensions/thumbnails/pkg/config/parser/parse.go index 4c47c635ddd..936ce8c6c8d 100644 --- a/extensions/thumbnails/pkg/config/parser/parse.go +++ b/extensions/thumbnails/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/thumbnails/pkg/logging/logging.go b/extensions/thumbnails/pkg/logging/logging.go index d63c5a3f7b6..acdafff1b87 100644 --- a/extensions/thumbnails/pkg/logging/logging.go +++ b/extensions/thumbnails/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/thumbnails/pkg/preprocessor/fontloader.go b/extensions/thumbnails/pkg/preprocessor/fontloader.go index 3053abaed9b..eb5a60789d2 100644 --- a/extensions/thumbnails/pkg/preprocessor/fontloader.go +++ b/extensions/thumbnails/pkg/preprocessor/fontloader.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" "golang.org/x/image/font" "golang.org/x/image/font/gofont/goregular" "golang.org/x/image/font/opentype" diff --git a/extensions/thumbnails/pkg/server/debug/option.go b/extensions/thumbnails/pkg/server/debug/option.go index 73020357314..dfced5ae678 100644 --- a/extensions/thumbnails/pkg/server/debug/option.go +++ b/extensions/thumbnails/pkg/server/debug/option.go @@ -1,8 +1,8 @@ package debug import ( - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/thumbnails/pkg/server/debug/server.go b/extensions/thumbnails/pkg/server/debug/server.go index 2492f95c3ce..1d1706d4d35 100644 --- a/extensions/thumbnails/pkg/server/debug/server.go +++ b/extensions/thumbnails/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/thumbnails/pkg/server/grpc/option.go b/extensions/thumbnails/pkg/server/grpc/option.go index a9c4491a0ca..c5cd4f3e300 100644 --- a/extensions/thumbnails/pkg/server/grpc/option.go +++ b/extensions/thumbnails/pkg/server/grpc/option.go @@ -3,9 +3,9 @@ package grpc import ( "context" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/thumbnails/pkg/server/grpc/server.go b/extensions/thumbnails/pkg/server/grpc/server.go index 49fb39e0058..9ae79b981e4 100644 --- a/extensions/thumbnails/pkg/server/grpc/server.go +++ b/extensions/thumbnails/pkg/server/grpc/server.go @@ -2,13 +2,13 @@ package grpc import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/ocis-pkg/version" - thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" + svc "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/grpc/v0" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/grpc/v0/decorators" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/imgsource" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" ) // NewService initializes the grpc service and server. diff --git a/extensions/thumbnails/pkg/server/http/option.go b/extensions/thumbnails/pkg/server/http/option.go index b75f298beb3..5cdd52aa83a 100644 --- a/extensions/thumbnails/pkg/server/http/option.go +++ b/extensions/thumbnails/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/thumbnails/pkg/server/http/server.go b/extensions/thumbnails/pkg/server/http/server.go index 50f3e6b82f5..2ae2f697bd0 100644 --- a/extensions/thumbnails/pkg/server/http/server.go +++ b/extensions/thumbnails/pkg/server/http/server.go @@ -2,11 +2,11 @@ package http import ( "github.com/go-chi/chi/v5/middleware" - svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/http/v0" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" - ocismiddleware "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/v2/extensions/thumbnails/pkg/service/http/v0" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage" + ocismiddleware "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go index d2970886afd..040d2f922a6 100644 --- a/extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/decorators/base.go @@ -3,7 +3,7 @@ package decorators import ( "context" - thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" ) // Interface acting as facade, holding all the interfaces that this diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go index bafbb828740..df1359417ee 100644 --- a/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/decorators/instrument.go @@ -3,8 +3,8 @@ package decorators import ( "context" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" - thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" "github.com/prometheus/client_golang/prometheus" ) diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go index 8a69a392f29..d37d8278034 100644 --- a/extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/decorators/logging.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/owncloud/ocis/ocis-pkg/log" - thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" ) // NewLogging returns a service that logs messages. diff --git a/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go b/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go index 53d219b8865..1f5f24dc235 100644 --- a/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/decorators/tracing.go @@ -5,8 +5,8 @@ import ( "go.opentelemetry.io/otel/trace" - thumbnailsTracing "github.com/owncloud/ocis/extensions/thumbnails/pkg/tracing" - thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" + thumbnailsTracing "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/tracing" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" "go.opentelemetry.io/otel/attribute" ) diff --git a/extensions/thumbnails/pkg/service/grpc/v0/option.go b/extensions/thumbnails/pkg/service/grpc/v0/option.go index 1d75bb98cb0..e62d9613309 100644 --- a/extensions/thumbnails/pkg/service/grpc/v0/option.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/option.go @@ -5,10 +5,10 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/imgsource" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/thumbnails/pkg/service/grpc/v0/service.go b/extensions/thumbnails/pkg/service/grpc/v0/service.go index b114df40a8f..ba6c35f929d 100644 --- a/extensions/thumbnails/pkg/service/grpc/v0/service.go +++ b/extensions/thumbnails/pkg/service/grpc/v0/service.go @@ -14,14 +14,14 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/golang-jwt/jwt/v4" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/preprocessor" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators" - tjwt "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/jwt" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource" - "github.com/owncloud/ocis/ocis-pkg/log" - 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/v2/extensions/thumbnails/pkg/preprocessor" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/grpc/v0/decorators" + tjwt "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/jwt" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/imgsource" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + thumbnailsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" "github.com/pkg/errors" merrors "go-micro.dev/v4/errors" "google.golang.org/grpc/metadata" diff --git a/extensions/thumbnails/pkg/service/http/v0/instrument.go b/extensions/thumbnails/pkg/service/http/v0/instrument.go index 95454462b8d..259a5dc4d6c 100644 --- a/extensions/thumbnails/pkg/service/http/v0/instrument.go +++ b/extensions/thumbnails/pkg/service/http/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/thumbnails/pkg/service/http/v0/logging.go b/extensions/thumbnails/pkg/service/http/v0/logging.go index 84701b1b072..724760d4544 100644 --- a/extensions/thumbnails/pkg/service/http/v0/logging.go +++ b/extensions/thumbnails/pkg/service/http/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/thumbnails/pkg/service/http/v0/option.go b/extensions/thumbnails/pkg/service/http/v0/option.go index b45429224e9..e3535ed66ac 100644 --- a/extensions/thumbnails/pkg/service/http/v0/option.go +++ b/extensions/thumbnails/pkg/service/http/v0/option.go @@ -3,9 +3,9 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/thumbnails/pkg/service/http/v0/service.go b/extensions/thumbnails/pkg/service/http/v0/service.go index 944020cb5ad..b715dddd27c 100644 --- a/extensions/thumbnails/pkg/service/http/v0/service.go +++ b/extensions/thumbnails/pkg/service/http/v0/service.go @@ -9,10 +9,10 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang-jwt/jwt/v4" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - tjwt "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/jwt" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + tjwt "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/service/jwt" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) type contextKey string diff --git a/extensions/thumbnails/pkg/service/http/v0/tracing.go b/extensions/thumbnails/pkg/service/http/v0/tracing.go index ce9a01d0f03..94acf496a1b 100644 --- a/extensions/thumbnails/pkg/service/http/v0/tracing.go +++ b/extensions/thumbnails/pkg/service/http/v0/tracing.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" ) // NewTracing returns a service that instruments traces. diff --git a/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go b/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go index 696e8638804..40e9cbd4387 100644 --- a/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go +++ b/extensions/thumbnails/pkg/thumbnail/imgsource/cs3.go @@ -13,7 +13,7 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" "github.com/pkg/errors" "google.golang.org/grpc/metadata" ) diff --git a/extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go b/extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go index 641d19ab2d8..c3924140ac8 100644 --- a/extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go +++ b/extensions/thumbnails/pkg/thumbnail/imgsource/filesystem.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" "github.com/pkg/errors" ) diff --git a/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go b/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go index db24ea9e5a1..00287d102d5 100644 --- a/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go +++ b/extensions/thumbnails/pkg/thumbnail/imgsource/webdav.go @@ -10,7 +10,7 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" "github.com/pkg/errors" ) diff --git a/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go b/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go index 102bbc876f1..4b4d9fc7ff5 100644 --- a/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go +++ b/extensions/thumbnails/pkg/thumbnail/storage/filesystem.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strconv" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/pkg/errors" ) diff --git a/extensions/thumbnails/pkg/thumbnail/thumbnail.go b/extensions/thumbnails/pkg/thumbnail/thumbnail.go index 587d623f3d1..6a156410e81 100644 --- a/extensions/thumbnails/pkg/thumbnail/thumbnail.go +++ b/extensions/thumbnails/pkg/thumbnail/thumbnail.go @@ -6,8 +6,8 @@ import ( "image/gif" "mime" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go b/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go index 97120ebf0ee..3b368d12cdc 100644 --- a/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go +++ b/extensions/thumbnails/pkg/thumbnail/thumbnail_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) type NoOpManager struct { diff --git a/extensions/thumbnails/pkg/tracing/tracing.go b/extensions/thumbnails/pkg/tracing/tracing.go index 11c8490ec13..3b2ea32fbf3 100644 --- a/extensions/thumbnails/pkg/tracing/tracing.go +++ b/extensions/thumbnails/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/user/cmd/user/main.go b/extensions/user/cmd/user/main.go index 97d008cb00a..1a554120e54 100644 --- a/extensions/user/cmd/user/main.go +++ b/extensions/user/cmd/user/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/user/pkg/command" - "github.com/owncloud/ocis/extensions/user/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/user/pkg/command" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults" ) func main() { diff --git a/extensions/user/pkg/command/health.go b/extensions/user/pkg/command/health.go index 1039a0efc01..245824ceb23 100644 --- a/extensions/user/pkg/command/health.go +++ b/extensions/user/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/extensions/user/pkg/config/parser" - "github.com/owncloud/ocis/extensions/user/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/user/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/user/pkg/command/root.go b/extensions/user/pkg/command/root.go index 2f4c83aca62..3956add4477 100644 --- a/extensions/user/pkg/command/root.go +++ b/extensions/user/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/user/pkg/command/server.go b/extensions/user/pkg/command/server.go index 97baa1f9c41..032738a5f86 100644 --- a/extensions/user/pkg/command/server.go +++ b/extensions/user/pkg/command/server.go @@ -9,16 +9,16 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/extensions/user/pkg/config/parser" - "github.com/owncloud/ocis/extensions/user/pkg/logging" - "github.com/owncloud/ocis/extensions/user/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/user/pkg/server/debug" - "github.com/owncloud/ocis/extensions/user/pkg/tracing" - "github.com/owncloud/ocis/ocis-pkg/ldap" - "github.com/owncloud/ocis/ocis-pkg/service/external" - "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/user/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/user/pkg/revaconfig" + "github.com/owncloud/ocis/v2/extensions/user/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/user/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/ldap" + "github.com/owncloud/ocis/v2/ocis-pkg/service/external" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/user/pkg/command/version.go b/extensions/user/pkg/command/version.go index 83306704287..954ab25b366 100644 --- a/extensions/user/pkg/command/version.go +++ b/extensions/user/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/user/pkg/config/config.go b/extensions/user/pkg/config/config.go index c044b2adab1..55cb4c5d134 100644 --- a/extensions/user/pkg/config/config.go +++ b/extensions/user/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) type Config struct { diff --git a/extensions/user/pkg/config/defaults/defaultconfig.go b/extensions/user/pkg/config/defaults/defaultconfig.go index b3f4ac33864..0513df5a986 100644 --- a/extensions/user/pkg/config/defaults/defaultconfig.go +++ b/extensions/user/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/user/pkg/config/parser/parse.go b/extensions/user/pkg/config/parser/parse.go index 2b5f8030a50..6a78d37ba4b 100644 --- a/extensions/user/pkg/config/parser/parse.go +++ b/extensions/user/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/extensions/user/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/user/pkg/logging/logging.go b/extensions/user/pkg/logging/logging.go index d855cfeb946..0726daa5713 100644 --- a/extensions/user/pkg/logging/logging.go +++ b/extensions/user/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/user/pkg/revaconfig/config.go b/extensions/user/pkg/revaconfig/config.go index 1ce6e51b1ad..7959ffeea87 100644 --- a/extensions/user/pkg/revaconfig/config.go +++ b/extensions/user/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" ) // UsersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/user/pkg/server/debug/option.go b/extensions/user/pkg/server/debug/option.go index 31bbf15052f..8b6c13c9e0b 100644 --- a/extensions/user/pkg/server/debug/option.go +++ b/extensions/user/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/user/pkg/server/debug/server.go b/extensions/user/pkg/server/debug/server.go index 27adbcdc64f..12bec6fb6f9 100644 --- a/extensions/user/pkg/server/debug/server.go +++ b/extensions/user/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/user/pkg/tracing/tracing.go b/extensions/user/pkg/tracing/tracing.go index 836d0516c1d..eac15c5dd9e 100644 --- a/extensions/user/pkg/tracing/tracing.go +++ b/extensions/user/pkg/tracing/tracing.go @@ -1,9 +1,9 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/user/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/web/cmd/web/main.go b/extensions/web/cmd/web/main.go index cde38ffeee2..1c6a3e87fb7 100644 --- a/extensions/web/cmd/web/main.go +++ b/extensions/web/cmd/web/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/web/pkg/command" - "github.com/owncloud/ocis/extensions/web/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/web/pkg/command" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults" ) func main() { diff --git a/extensions/web/pkg/assets/option.go b/extensions/web/pkg/assets/option.go index 0112dab5916..78cdb2e994e 100644 --- a/extensions/web/pkg/assets/option.go +++ b/extensions/web/pkg/assets/option.go @@ -3,10 +3,10 @@ package assets import ( "net/http" - "github.com/owncloud/ocis/extensions/web" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/assetsfs" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/web" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/assetsfs" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // New returns a new http filesystem to serve assets. diff --git a/extensions/web/pkg/command/health.go b/extensions/web/pkg/command/health.go index 70e33f31e1e..640ed8bd803 100644 --- a/extensions/web/pkg/command/health.go +++ b/extensions/web/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/extensions/web/pkg/config/parser" - "github.com/owncloud/ocis/extensions/web/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/web/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/web/pkg/command/root.go b/extensions/web/pkg/command/root.go index ce1b7b69376..73381e194b1 100644 --- a/extensions/web/pkg/command/root.go +++ b/extensions/web/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/web/pkg/command/server.go b/extensions/web/pkg/command/server.go index d95587aa25b..c293022349e 100644 --- a/extensions/web/pkg/command/server.go +++ b/extensions/web/pkg/command/server.go @@ -7,13 +7,13 @@ import ( "io/ioutil" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/extensions/web/pkg/config/parser" - "github.com/owncloud/ocis/extensions/web/pkg/logging" - "github.com/owncloud/ocis/extensions/web/pkg/metrics" - "github.com/owncloud/ocis/extensions/web/pkg/server/debug" - "github.com/owncloud/ocis/extensions/web/pkg/server/http" - "github.com/owncloud/ocis/extensions/web/pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/web/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/web/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/web/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/web/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/web/pkg/tracing" "github.com/urfave/cli/v2" ) diff --git a/extensions/web/pkg/command/version.go b/extensions/web/pkg/command/version.go index 121572ceb13..a7826f0fd1f 100644 --- a/extensions/web/pkg/command/version.go +++ b/extensions/web/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/web/pkg/config/config.go b/extensions/web/pkg/config/config.go index dbc7feee051..a01b8f82b1c 100644 --- a/extensions/web/pkg/config/config.go +++ b/extensions/web/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/web/pkg/config/defaults/defaultconfig.go b/extensions/web/pkg/config/defaults/defaultconfig.go index baa74517b05..3fe1da708b5 100644 --- a/extensions/web/pkg/config/defaults/defaultconfig.go +++ b/extensions/web/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/web/pkg/config/parser/parse.go b/extensions/web/pkg/config/parser/parse.go index c2d87716033..2732411aadf 100644 --- a/extensions/web/pkg/config/parser/parse.go +++ b/extensions/web/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/extensions/web/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/web/pkg/logging/logging.go b/extensions/web/pkg/logging/logging.go index ed81b87a1da..29e1f8742f8 100644 --- a/extensions/web/pkg/logging/logging.go +++ b/extensions/web/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/web/pkg/server/debug/option.go b/extensions/web/pkg/server/debug/option.go index f875a21097d..360025b0000 100644 --- a/extensions/web/pkg/server/debug/option.go +++ b/extensions/web/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/web/pkg/server/debug/server.go b/extensions/web/pkg/server/debug/server.go index 0557fc70b81..32c4566bbf4 100644 --- a/extensions/web/pkg/server/debug/server.go +++ b/extensions/web/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/service/debug" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/web/pkg/server/http/option.go b/extensions/web/pkg/server/http/option.go index ee00b4c1de8..98462b72a6a 100644 --- a/extensions/web/pkg/server/http/option.go +++ b/extensions/web/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/extensions/web/pkg/metrics" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/extensions/web/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/web/pkg/server/http/server.go b/extensions/web/pkg/server/http/server.go index 9ee620cc1c3..3ffa8653e43 100644 --- a/extensions/web/pkg/server/http/server.go +++ b/extensions/web/pkg/server/http/server.go @@ -2,11 +2,11 @@ package http import ( chimiddleware "github.com/go-chi/chi/v5/middleware" - webmid "github.com/owncloud/ocis/extensions/web/pkg/middleware" - svc "github.com/owncloud/ocis/extensions/web/pkg/service/v0" - "github.com/owncloud/ocis/ocis-pkg/middleware" - "github.com/owncloud/ocis/ocis-pkg/service/http" - "github.com/owncloud/ocis/ocis-pkg/version" + webmid "github.com/owncloud/ocis/v2/extensions/web/pkg/middleware" + svc "github.com/owncloud/ocis/v2/extensions/web/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/web/pkg/service/v0/instrument.go b/extensions/web/pkg/service/v0/instrument.go index 49cef7036c4..7a625b7eb0f 100644 --- a/extensions/web/pkg/service/v0/instrument.go +++ b/extensions/web/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/web/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/web/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/web/pkg/service/v0/logging.go b/extensions/web/pkg/service/v0/logging.go index 9677931fcb6..9e2c9e31ea4 100644 --- a/extensions/web/pkg/service/v0/logging.go +++ b/extensions/web/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/web/pkg/service/v0/option.go b/extensions/web/pkg/service/v0/option.go index bd55a2b1a75..ae058da847b 100644 --- a/extensions/web/pkg/service/v0/option.go +++ b/extensions/web/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/web/pkg/service/v0/service.go b/extensions/web/pkg/service/v0/service.go index f77074a4399..32af6f5330b 100644 --- a/extensions/web/pkg/service/v0/service.go +++ b/extensions/web/pkg/service/v0/service.go @@ -12,9 +12,9 @@ import ( "time" "github.com/go-chi/chi/v5" - "github.com/owncloud/ocis/extensions/web/pkg/assets" - "github.com/owncloud/ocis/extensions/web/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/extensions/web/pkg/assets" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/extensions/web/pkg/tracing/tracing.go b/extensions/web/pkg/tracing/tracing.go index f6e977d24fe..b23c4605dc7 100644 --- a/extensions/web/pkg/tracing/tracing.go +++ b/extensions/web/pkg/tracing/tracing.go @@ -1,8 +1,8 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/web/pkg/config" - pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing" + "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/extensions/webdav/cmd/webdav/main.go b/extensions/webdav/cmd/webdav/main.go index 0a65c6442fb..48bb27dc789 100644 --- a/extensions/webdav/cmd/webdav/main.go +++ b/extensions/webdav/cmd/webdav/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/owncloud/ocis/extensions/webdav/pkg/command" - "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/command" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/defaults" ) func main() { diff --git a/extensions/webdav/pkg/command/health.go b/extensions/webdav/pkg/command/health.go index 9882d035bfe..bf31f5c79d9 100644 --- a/extensions/webdav/pkg/command/health.go +++ b/extensions/webdav/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/webdav/pkg/command/root.go b/extensions/webdav/pkg/command/root.go index d8b32188e57..9501820cdae 100644 --- a/extensions/webdav/pkg/command/root.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" ) diff --git a/extensions/webdav/pkg/command/server.go b/extensions/webdav/pkg/command/server.go index b603681a0f6..7da34413621 100644 --- a/extensions/webdav/pkg/command/server.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/parser" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/logging" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/server/debug" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/server/http" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/tracing" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/extensions/webdav/pkg/command/version.go b/extensions/webdav/pkg/command/version.go index b4568470895..215d37e5d4b 100644 --- a/extensions/webdav/pkg/command/version.go +++ b/extensions/webdav/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/webdav/pkg/config/config.go b/extensions/webdav/pkg/config/config.go index 4efe95ebdfe..014624ee323 100644 --- a/extensions/webdav/pkg/config/config.go +++ b/extensions/webdav/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/extensions/webdav/pkg/config/defaults/defaultconfig.go b/extensions/webdav/pkg/config/defaults/defaultconfig.go index 3c975cfa709..57e8564e51a 100644 --- a/extensions/webdav/pkg/config/defaults/defaultconfig.go +++ b/extensions/webdav/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/extensions/webdav/pkg/config/parser/parse.go b/extensions/webdav/pkg/config/parser/parse.go index be9d202072b..898249ef25a 100644 --- a/extensions/webdav/pkg/config/parser/parse.go +++ b/extensions/webdav/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ 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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/defaults" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/extensions/webdav/pkg/logging/logging.go b/extensions/webdav/pkg/logging/logging.go index 454e207cf6a..1d43635959c 100644 --- a/extensions/webdav/pkg/logging/logging.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // LoggerFromConfig initializes a service-specific logger instance. diff --git a/extensions/webdav/pkg/propfind/propfind.go b/extensions/webdav/pkg/propfind/propfind.go index 8be26112fb4..a747b5860f8 100644 --- a/extensions/webdav/pkg/propfind/propfind.go +++ b/extensions/webdav/pkg/propfind/propfind.go @@ -6,8 +6,8 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/webdav/pkg/errors" - "github.com/owncloud/ocis/extensions/webdav/pkg/prop" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/errors" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/prop" ) const ( diff --git a/extensions/webdav/pkg/server/debug/option.go b/extensions/webdav/pkg/server/debug/option.go index 629ebebcdb0..8f070a68e11 100644 --- a/extensions/webdav/pkg/server/debug/option.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/webdav/pkg/server/debug/server.go b/extensions/webdav/pkg/server/debug/server.go index a17e167528a..f9021c3b0fc 100644 --- a/extensions/webdav/pkg/server/debug/server.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" + "github.com/owncloud/ocis/v2/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/extensions/webdav/pkg/server/http/option.go b/extensions/webdav/pkg/server/http/option.go index 352d103cf43..ceff8482c1a 100644 --- a/extensions/webdav/pkg/server/http/option.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/metrics" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/extensions/webdav/pkg/server/http/server.go b/extensions/webdav/pkg/server/http/server.go index c23a5516e7b..a39756b9428 100644 --- a/extensions/webdav/pkg/server/http/server.go +++ b/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/v2/extensions/webdav/pkg/service/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "go-micro.dev/v4" ) diff --git a/extensions/webdav/pkg/service/v0/instrument.go b/extensions/webdav/pkg/service/v0/instrument.go index d476f363020..34e318c5899 100644 --- a/extensions/webdav/pkg/service/v0/instrument.go +++ b/extensions/webdav/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/extensions/webdav/pkg/metrics" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/extensions/webdav/pkg/service/v0/logging.go b/extensions/webdav/pkg/service/v0/logging.go index ff1c67e5930..b1d7f898275 100644 --- a/extensions/webdav/pkg/service/v0/logging.go +++ b/extensions/webdav/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/extensions/webdav/pkg/service/v0/option.go b/extensions/webdav/pkg/service/v0/option.go index e1e88b2cf27..1bdab9a32f4 100644 --- a/extensions/webdav/pkg/service/v0/option.go +++ b/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/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/extensions/webdav/pkg/service/v0/search.go b/extensions/webdav/pkg/service/v0/search.go index 5a7d15f5457..e90382984fa 100644 --- a/extensions/webdav/pkg/service/v0/search.go +++ b/extensions/webdav/pkg/service/v0/search.go @@ -10,11 +10,11 @@ import ( "time" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/extensions/webdav/pkg/net" - "github.com/owncloud/ocis/extensions/webdav/pkg/prop" - "github.com/owncloud/ocis/extensions/webdav/pkg/propfind" - searchmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/net" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/prop" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/propfind" + searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" merrors "go-micro.dev/v4/errors" "go-micro.dev/v4/metadata" ) diff --git a/extensions/webdav/pkg/service/v0/service.go b/extensions/webdav/pkg/service/v0/service.go index d4aa39f8a91..43d9929b70d 100644 --- a/extensions/webdav/pkg/service/v0/service.go +++ b/extensions/webdav/pkg/service/v0/service.go @@ -17,15 +17,15 @@ import ( merrors "go-micro.dev/v4/errors" "google.golang.org/grpc/metadata" - "github.com/owncloud/ocis/ocis-pkg/log" - "github.com/owncloud/ocis/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/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" - searchsvc "github.com/owncloud/ocis/protogen/gen/ocis/services/search/v0" - thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config" + "github.com/owncloud/ocis/v2/extensions/webdav/pkg/dav/requests" + thumbnailsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" + searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" + thumbnailssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" ) const ( diff --git a/extensions/webdav/pkg/tracing/tracing.go b/extensions/webdav/pkg/tracing/tracing.go index 2412c736622..6e7d39a3bba 100644 --- a/extensions/webdav/pkg/tracing/tracing.go +++ b/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/v2/extensions/webdav/pkg/config" + pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" ) diff --git a/go.mod b/go.mod index 394b2abf657..478dcc2892c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis +module github.com/owncloud/ocis/v2 go 1.17 diff --git a/ocis-pkg/account/option.go b/ocis-pkg/account/option.go index 9a5bfa55f7c..fe4d07040ae 100644 --- a/ocis-pkg/account/option.go +++ b/ocis-pkg/account/option.go @@ -1,7 +1,7 @@ package account import ( - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/assetsfs/assetsfs.go b/ocis-pkg/assetsfs/assetsfs.go index 6f7c2ebbe9e..1b6e9cbacd7 100644 --- a/ocis-pkg/assetsfs/assetsfs.go +++ b/ocis-pkg/assetsfs/assetsfs.go @@ -8,7 +8,7 @@ import ( "os" "path" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // FileSystem customized to load assets diff --git a/ocis-pkg/clihelper/app.go b/ocis-pkg/clihelper/app.go index 4ea39ace310..fcaa792d619 100644 --- a/ocis-pkg/clihelper/app.go +++ b/ocis-pkg/clihelper/app.go @@ -1,7 +1,7 @@ package clihelper import ( - "github.com/owncloud/ocis/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 2d5474e4b82..e5cb19143af 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -1,40 +1,40 @@ package config import ( - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" - accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config" - appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/config" - appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - audit "github.com/owncloud/ocis/extensions/audit/pkg/config" - authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" - authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" - authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/config" - frontend "github.com/owncloud/ocis/extensions/frontend/pkg/config" - gateway "github.com/owncloud/ocis/extensions/gateway/pkg/config" - glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config" - graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config" - graph "github.com/owncloud/ocis/extensions/graph/pkg/config" - group "github.com/owncloud/ocis/extensions/group/pkg/config" - idm "github.com/owncloud/ocis/extensions/idm/pkg/config" - idp "github.com/owncloud/ocis/extensions/idp/pkg/config" - nats "github.com/owncloud/ocis/extensions/nats/pkg/config" - notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config" - ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/config" - ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config" - proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config" - search "github.com/owncloud/ocis/extensions/search/pkg/config" - settings "github.com/owncloud/ocis/extensions/settings/pkg/config" - sharing "github.com/owncloud/ocis/extensions/sharing/pkg/config" - storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config" - storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/config" - storagesystem "github.com/owncloud/ocis/extensions/storage-system/pkg/config" - storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/config" - store "github.com/owncloud/ocis/extensions/store/pkg/config" - thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config" - user "github.com/owncloud/ocis/extensions/user/pkg/config" - web "github.com/owncloud/ocis/extensions/web/pkg/config" - webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config" + accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config" + appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config" + audit "github.com/owncloud/ocis/v2/extensions/audit/pkg/config" + authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config" + authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config" + authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config" + frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config" + gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config" + glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config" + graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config" + graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/config" + group "github.com/owncloud/ocis/v2/extensions/group/pkg/config" + idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/config" + idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/config" + nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/config" + notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config" + ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config" + ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config" + proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config" + search "github.com/owncloud/ocis/v2/extensions/search/pkg/config" + settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/config" + sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config" + storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config" + storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config" + storagesystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config" + storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config" + store "github.com/owncloud/ocis/v2/extensions/store/pkg/config" + thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config" + user "github.com/owncloud/ocis/v2/extensions/user/pkg/config" + web "github.com/owncloud/ocis/v2/extensions/web/pkg/config" + webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config" ) const ( diff --git a/ocis-pkg/config/config_test.go b/ocis-pkg/config/config_test.go index bfbc7b40873..cd125e2c0d7 100644 --- a/ocis-pkg/config/config_test.go +++ b/ocis-pkg/config/config_test.go @@ -3,7 +3,7 @@ package config_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config" "gopkg.in/yaml.v2" ) diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index 907ae069f5b..665b5fdd3e0 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -1,38 +1,38 @@ package config import ( - accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults" - appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults" - appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults" - audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults" - authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults" - authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults" - authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/config/defaults" - frontend "github.com/owncloud/ocis/extensions/frontend/pkg/config/defaults" - gateway "github.com/owncloud/ocis/extensions/gateway/pkg/config/defaults" - glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults" - graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults" - graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults" - group "github.com/owncloud/ocis/extensions/group/pkg/config/defaults" - idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults" - idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults" - nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults" - notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults" - ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/config/defaults" - ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults" - proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults" - search "github.com/owncloud/ocis/extensions/search/pkg/config/defaults" - settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults" - sharing "github.com/owncloud/ocis/extensions/sharing/pkg/config/defaults" - storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/config/defaults" - storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/config/defaults" - storageSystem "github.com/owncloud/ocis/extensions/storage-system/pkg/config/defaults" - storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/config/defaults" - store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults" - thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults" - user "github.com/owncloud/ocis/extensions/user/pkg/config/defaults" - web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults" - webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults" + accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config/defaults" + appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/config/defaults" + appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/config/defaults" + audit "github.com/owncloud/ocis/v2/extensions/audit/pkg/config/defaults" + authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/config/defaults" + authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/config/defaults" + authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/config/defaults" + frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/config/defaults" + gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/config/defaults" + glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/config/defaults" + graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/config/defaults" + graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/config/defaults" + group "github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults" + idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/config/defaults" + idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/config/defaults" + nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/config/defaults" + notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/config/defaults" + ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config/defaults" + ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/config/defaults" + proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/config/defaults" + search "github.com/owncloud/ocis/v2/extensions/search/pkg/config/defaults" + settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/config/defaults" + sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/defaults" + storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/config/defaults" + storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/config/defaults" + storageSystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/config/defaults" + storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/config/defaults" + store "github.com/owncloud/ocis/v2/extensions/store/pkg/config/defaults" + thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/config/defaults" + user "github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults" + web "github.com/owncloud/ocis/v2/extensions/web/pkg/config/defaults" + webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/config/defaults" ) func DefaultConfig() *Config { diff --git a/ocis-pkg/config/environment.go b/ocis-pkg/config/environment.go index d30c2642284..23b72d26c24 100644 --- a/ocis-pkg/config/environment.go +++ b/ocis-pkg/config/environment.go @@ -6,7 +6,7 @@ import ( "strings" gofig "github.com/gookit/config/v2" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // BindEnv takes a config `c` and a EnvBinding and binds the values from the environment to the address location in cfg. diff --git a/ocis-pkg/config/environment_test.go b/ocis-pkg/config/environment_test.go index 32a22ef1f32..8313bef7eb1 100644 --- a/ocis-pkg/config/environment_test.go +++ b/ocis-pkg/config/environment_test.go @@ -4,8 +4,8 @@ import ( gofig "github.com/gookit/config/v2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/shared" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) var _ = Describe("Environment", func() { diff --git a/ocis-pkg/config/helpers.go b/ocis-pkg/config/helpers.go index b12803c52b4..df4ec4437f3 100644 --- a/ocis-pkg/config/helpers.go +++ b/ocis-pkg/config/helpers.go @@ -5,7 +5,7 @@ import ( gofig "github.com/gookit/config/v2" gooyaml "github.com/gookit/config/v2/yaml" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) var ( diff --git a/ocis-pkg/config/parser/parse.go b/ocis-pkg/config/parser/parse.go index b5381afc563..7a186cfcc1d 100644 --- a/ocis-pkg/config/parser/parse.go +++ b/ocis-pkg/config/parser/parse.go @@ -3,9 +3,9 @@ package parser import ( "errors" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/envdecode" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" ) // ParseConfig loads the ocis configuration and diff --git a/ocis-pkg/cors/option.go b/ocis-pkg/cors/option.go index e53454191dd..0ac1d1c4c97 100644 --- a/ocis-pkg/cors/option.go +++ b/ocis-pkg/cors/option.go @@ -1,7 +1,7 @@ package cors import ( - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/crypto/crypto_test.go b/ocis-pkg/crypto/crypto_test.go index 0f547962558..e61c0a82a61 100644 --- a/ocis-pkg/crypto/crypto_test.go +++ b/ocis-pkg/crypto/crypto_test.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis/ocis-pkg/crypto" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/crypto" + "github.com/owncloud/ocis/v2/ocis-pkg/log" . "github.com/onsi/ginkgo/v2" - cfg "github.com/owncloud/ocis/ocis-pkg/config" + cfg "github.com/owncloud/ocis/v2/ocis-pkg/config" ) var _ = Describe("Crypto", func() { diff --git a/ocis-pkg/crypto/gencert.go b/ocis-pkg/crypto/gencert.go index 42f646b5e91..581f14e68e0 100644 --- a/ocis-pkg/crypto/gencert.go +++ b/ocis-pkg/crypto/gencert.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) var ( diff --git a/ocis-pkg/crypto/gencert_test.go b/ocis-pkg/crypto/gencert_test.go index 2ee323104c8..9a57630df5f 100644 --- a/ocis-pkg/crypto/gencert_test.go +++ b/ocis-pkg/crypto/gencert_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) func TestEnsureExistsDir(t *testing.T) { diff --git a/ocis-pkg/indexer/config/config.go b/ocis-pkg/indexer/config/config.go index 1fd1ec72404..010d2f5de4e 100644 --- a/ocis-pkg/indexer/config/config.go +++ b/ocis-pkg/indexer/config/config.go @@ -2,7 +2,7 @@ package config import ( - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" ) // Repo defines which storage implementation is to be used. diff --git a/ocis-pkg/indexer/index/cs3/autoincrement.go b/ocis-pkg/indexer/index/cs3/autoincrement.go index ceffd36530a..95ac79834cf 100644 --- a/ocis-pkg/indexer/index/cs3/autoincrement.go +++ b/ocis-pkg/indexer/index/cs3/autoincrement.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" @@ -22,10 +22,10 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" - metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" + metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage" ) // Autoincrement are fields for an index of type autoincrement. diff --git a/ocis-pkg/indexer/index/cs3/autoincrement_test.go b/ocis-pkg/indexer/index/cs3/autoincrement_test.go index 6d15a742997..207aa69fc58 100644 --- a/ocis-pkg/indexer/index/cs3/autoincrement_test.go +++ b/ocis-pkg/indexer/index/cs3/autoincrement_test.go @@ -5,9 +5,9 @@ package cs3 // "os" // "testing" // -// "github.com/owncloud/ocis/accounts/pkg/config" -// "github.com/owncloud/ocis/ocis-pkg/indexer/option" -// . "github.com/owncloud/ocis/ocis-pkg/indexer/test" +// "github.com/owncloud/ocis/v2/accounts/pkg/config" +// "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" +// . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" // "github.com/stretchr/testify/assert" //) // diff --git a/ocis-pkg/indexer/index/cs3/config.go b/ocis-pkg/indexer/index/cs3/config.go index c87e24c9058..87ceffc607f 100644 --- a/ocis-pkg/indexer/index/cs3/config.go +++ b/ocis-pkg/indexer/index/cs3/config.go @@ -1,7 +1,7 @@ package cs3 import ( - acccfg "github.com/owncloud/ocis/extensions/accounts/pkg/config" + acccfg "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" ) // Config represents cs3conf. Should be deprecated in favor of config.Config. diff --git a/ocis-pkg/indexer/index/cs3/non_unique.go b/ocis-pkg/indexer/index/cs3/non_unique.go index 19df6f5c273..34978105ab3 100644 --- a/ocis-pkg/indexer/index/cs3/non_unique.go +++ b/ocis-pkg/indexer/index/cs3/non_unique.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" @@ -16,11 +16,11 @@ import ( "github.com/cs3org/reva/v2/pkg/token" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/cs3org/reva/v2/pkg/utils" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" - metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" + metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage" "google.golang.org/grpc/metadata" ) diff --git a/ocis-pkg/indexer/index/cs3/non_unique_test.go b/ocis-pkg/indexer/index/cs3/non_unique_test.go index 3dd0527daff..ec82b3aba59 100644 --- a/ocis-pkg/indexer/index/cs3/non_unique_test.go +++ b/ocis-pkg/indexer/index/cs3/non_unique_test.go @@ -6,9 +6,9 @@ package cs3 // "path" // "testing" // -// "github.com/owncloud/ocis/accounts/pkg/config" -// "github.com/owncloud/ocis/ocis-pkg/indexer/option" -// . "github.com/owncloud/ocis/ocis-pkg/indexer/test" +// "github.com/owncloud/ocis/v2/accounts/pkg/config" +// "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" +// . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" // "github.com/stretchr/testify/assert" //) // diff --git a/ocis-pkg/indexer/index/cs3/unique.go b/ocis-pkg/indexer/index/cs3/unique.go index f916d5c699f..c249ea63b43 100644 --- a/ocis-pkg/indexer/index/cs3/unique.go +++ b/ocis-pkg/indexer/index/cs3/unique.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/owncloud/ocis/extensions/accounts/pkg/storage" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/storage" v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" @@ -16,11 +16,11 @@ import ( "github.com/cs3org/reva/v2/pkg/token" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/cs3org/reva/v2/pkg/utils" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" - metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" + metadatastorage "github.com/owncloud/ocis/v2/ocis-pkg/metadata_storage" "google.golang.org/grpc/metadata" ) diff --git a/ocis-pkg/indexer/index/cs3/unique_test.go b/ocis-pkg/indexer/index/cs3/unique_test.go index 6c282e9085f..2a883ccea97 100644 --- a/ocis-pkg/indexer/index/cs3/unique_test.go +++ b/ocis-pkg/indexer/index/cs3/unique_test.go @@ -6,9 +6,9 @@ package cs3 // "path" // "testing" // -// "github.com/owncloud/ocis/accounts/pkg/config" -// "github.com/owncloud/ocis/ocis-pkg/indexer/option" -// . "github.com/owncloud/ocis/ocis-pkg/indexer/test" +// "github.com/owncloud/ocis/v2/accounts/pkg/config" +// "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" +// . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" // "github.com/stretchr/testify/assert" //) // diff --git a/ocis-pkg/indexer/index/disk/autoincrement.go b/ocis-pkg/indexer/index/disk/autoincrement.go index c045e89d8bc..25892109c67 100644 --- a/ocis-pkg/indexer/index/disk/autoincrement.go +++ b/ocis-pkg/indexer/index/disk/autoincrement.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" ) // Autoincrement are fields for an index of type autoincrement. diff --git a/ocis-pkg/indexer/index/disk/autoincrement_test.go b/ocis-pkg/indexer/index/disk/autoincrement_test.go index 78f2ef6cd6d..5d4b38dd348 100644 --- a/ocis-pkg/indexer/index/disk/autoincrement_test.go +++ b/ocis-pkg/indexer/index/disk/autoincrement_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - //. "github.com/owncloud/ocis/ocis-pkg/indexer/test" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + //. "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/indexer/index/disk/non_unique.go b/ocis-pkg/indexer/index/disk/non_unique.go index 90c4ed035ad..cbf759637df 100644 --- a/ocis-pkg/indexer/index/disk/non_unique.go +++ b/ocis-pkg/indexer/index/disk/non_unique.go @@ -8,10 +8,10 @@ import ( "path/filepath" "strings" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" ) // NonUnique is able to index an document by a key which might contain non-unique values diff --git a/ocis-pkg/indexer/index/disk/non_unique_test.go b/ocis-pkg/indexer/index/disk/non_unique_test.go index 5d0a25ca08d..eac3da1994f 100644 --- a/ocis-pkg/indexer/index/disk/non_unique_test.go +++ b/ocis-pkg/indexer/index/disk/non_unique_test.go @@ -6,11 +6,11 @@ import ( "path" "testing" - "github.com/owncloud/ocis/ocis-pkg/indexer/config" - "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - . "github.com/owncloud/ocis/ocis-pkg/indexer/test" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/config" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/indexer/index/disk/unique.go b/ocis-pkg/indexer/index/disk/unique.go index edcf74dd041..afce71295a5 100644 --- a/ocis-pkg/indexer/index/disk/unique.go +++ b/ocis-pkg/indexer/index/disk/unique.go @@ -8,10 +8,10 @@ import ( "path/filepath" "strings" - idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" + idxerrs "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" ) // Unique ensures that only one document of the same type and key-value combination can exist in the index. diff --git a/ocis-pkg/indexer/index/disk/unique_test.go b/ocis-pkg/indexer/index/disk/unique_test.go index 4804691bdce..fbd9d6a50f4 100644 --- a/ocis-pkg/indexer/index/disk/unique_test.go +++ b/ocis-pkg/indexer/index/disk/unique_test.go @@ -5,11 +5,11 @@ import ( "path" "testing" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" - "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - . "github.com/owncloud/ocis/ocis-pkg/indexer/test" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/indexer/indexer.go b/ocis-pkg/indexer/indexer.go index 84189be0add..3e406b86d41 100644 --- a/ocis-pkg/indexer/indexer.go +++ b/ocis-pkg/indexer/indexer.go @@ -7,17 +7,17 @@ import ( "path" "strings" - "github.com/owncloud/ocis/ocis-pkg/sync" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" "github.com/CiscoM31/godata" "github.com/iancoleman/strcase" - "github.com/owncloud/ocis/ocis-pkg/indexer/config" - "github.com/owncloud/ocis/ocis-pkg/indexer/errors" - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - _ "github.com/owncloud/ocis/ocis-pkg/indexer/index/cs3" // to populate index - _ "github.com/owncloud/ocis/ocis-pkg/indexer/index/disk" // to populate index - "github.com/owncloud/ocis/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/config" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/errors" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + _ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/cs3" // to populate index + _ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/disk" // to populate index + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/registry" ) // Indexer is a facade to configure and query over multiple indices. diff --git a/ocis-pkg/indexer/indexer_test.go b/ocis-pkg/indexer/indexer_test.go index 9cf9e74ad34..25ac2f8da75 100644 --- a/ocis-pkg/indexer/indexer_test.go +++ b/ocis-pkg/indexer/indexer_test.go @@ -6,12 +6,12 @@ import ( "path" "testing" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" - "github.com/owncloud/ocis/ocis-pkg/indexer/config" - _ "github.com/owncloud/ocis/ocis-pkg/indexer/index/cs3" - _ "github.com/owncloud/ocis/ocis-pkg/indexer/index/disk" - . "github.com/owncloud/ocis/ocis-pkg/indexer/test" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/config" + _ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/cs3" + _ "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index/disk" + . "github.com/owncloud/ocis/v2/ocis-pkg/indexer/test" "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/indexer/map.go b/ocis-pkg/indexer/map.go index 682218fdb99..f58a4eafc78 100644 --- a/ocis-pkg/indexer/map.go +++ b/ocis-pkg/indexer/map.go @@ -1,6 +1,6 @@ package indexer -import "github.com/owncloud/ocis/ocis-pkg/indexer/index" +import "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" // typeMap stores the indexer layout at runtime. diff --git a/ocis-pkg/indexer/option/option.go b/ocis-pkg/indexer/option/option.go index 13316fd0c6f..36d68ac84e2 100644 --- a/ocis-pkg/indexer/option/option.go +++ b/ocis-pkg/indexer/option/option.go @@ -1,6 +1,6 @@ package option -import "github.com/owncloud/ocis/extensions/accounts/pkg/config" +import "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" // Option defines a single option function. type Option func(o *Options) diff --git a/ocis-pkg/indexer/registry/registry.go b/ocis-pkg/indexer/registry/registry.go index ff93d06c826..1760dc7c563 100644 --- a/ocis-pkg/indexer/registry/registry.go +++ b/ocis-pkg/indexer/registry/registry.go @@ -1,8 +1,8 @@ package registry import ( - "github.com/owncloud/ocis/ocis-pkg/indexer/index" - "github.com/owncloud/ocis/ocis-pkg/indexer/option" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/index" + "github.com/owncloud/ocis/v2/ocis-pkg/indexer/option" ) // IndexConstructor is a constructor function for creating index.Index. diff --git a/ocis-pkg/ldap/ldap.go b/ocis-pkg/ldap/ldap.go index 6ad6951a33f..a03d5884865 100644 --- a/ocis-pkg/ldap/ldap.go +++ b/ocis-pkg/ldap/ldap.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) const _caTimeout = 5 diff --git a/ocis-pkg/log/log.go b/ocis-pkg/log/log.go index 255950df4b1..ea33f50741c 100644 --- a/ocis-pkg/log/log.go +++ b/ocis-pkg/log/log.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/ocis-pkg/metadata_storage/metadata_storage.go b/ocis-pkg/metadata_storage/metadata_storage.go index b5cbfc0ff1c..d3de12f62b3 100644 --- a/ocis-pkg/metadata_storage/metadata_storage.go +++ b/ocis-pkg/metadata_storage/metadata_storage.go @@ -15,7 +15,7 @@ import ( "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/extensions/accounts/pkg/config" + "github.com/owncloud/ocis/v2/extensions/accounts/pkg/config" "google.golang.org/grpc/metadata" ) diff --git a/ocis-pkg/middleware/account.go b/ocis-pkg/middleware/account.go index 51b2b37c22f..aae42be0857 100644 --- a/ocis-pkg/middleware/account.go +++ b/ocis-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/owncloud/ocis/ocis-pkg/account" + "github.com/owncloud/ocis/v2/ocis-pkg/account" "go-micro.dev/v4/metadata" ) @@ -64,7 +64,7 @@ func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler ctx := revactx.ContextSetUser(r.Context(), u) // Important: user.Id.OpaqueId is the AccountUUID. Set this way in the account uuid middleware in ocis-proxy. - // https://github.com/owncloud/ocis-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109 + // https://github.com/owncloud/ocis/v2-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109 // TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header. ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId) if u.Opaque != nil { diff --git a/ocis-pkg/middleware/header.go b/ocis-pkg/middleware/header.go index 9c94e6a2e0a..9db2908148d 100644 --- a/ocis-pkg/middleware/header.go +++ b/ocis-pkg/middleware/header.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/cors" chicors "github.com/go-chi/cors" ) diff --git a/ocis-pkg/middleware/logger.go b/ocis-pkg/middleware/logger.go index c5250b6e1bf..c879de63d54 100644 --- a/ocis-pkg/middleware/logger.go +++ b/ocis-pkg/middleware/logger.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-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). diff --git a/ocis-pkg/middleware/openidconnect.go b/ocis-pkg/middleware/openidconnect.go index d9610b41a72..2d48bad6401 100644 --- a/ocis-pkg/middleware/openidconnect.go +++ b/ocis-pkg/middleware/openidconnect.go @@ -9,7 +9,7 @@ import ( "time" oidc "github.com/coreos/go-oidc/v3/oidc" - ocisoidc "github.com/owncloud/ocis/ocis-pkg/oidc" + ocisoidc "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "golang.org/x/oauth2" ) diff --git a/ocis-pkg/middleware/static.go b/ocis-pkg/middleware/static.go index 2cfcc230c20..3daf8d24ff9 100644 --- a/ocis-pkg/middleware/static.go +++ b/ocis-pkg/middleware/static.go @@ -20,7 +20,7 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha ), ) - // TODO: investigate broken caching - https://github.com/owncloud/ocis/issues/1094 + // TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094 // we don't have a last modification date of the static assets, so we use the service start date //lastModified := time.Now().UTC().Format(http.TimeFormat) //expires := time.Now().Add(time.Second * time.Duration(ttl)).UTC().Format(http.TimeFormat) @@ -30,7 +30,7 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha if strings.HasPrefix(r.URL.Path, path.Join(root, "api")) { next.ServeHTTP(w, r) } else { - // TODO: investigate broken caching - https://github.com/owncloud/ocis/issues/1094 + // TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094 //w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s, must-revalidate", strconv.Itoa(ttl))) //w.Header().Set("Expires", expires) //w.Header().Set("Last-Modified", lastModified) diff --git a/ocis-pkg/oidc/option.go b/ocis-pkg/oidc/option.go index d477f9d754c..19fe5913a5f 100644 --- a/ocis-pkg/oidc/option.go +++ b/ocis-pkg/oidc/option.go @@ -1,7 +1,7 @@ package oidc import ( - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/roles/cache.go b/ocis-pkg/roles/cache.go index f356a6903c4..f98ecc59162 100644 --- a/ocis-pkg/roles/cache.go +++ b/ocis-pkg/roles/cache.go @@ -3,8 +3,8 @@ package roles import ( "time" - "github.com/owncloud/ocis/ocis-pkg/sync" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/sync" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" ) // cache is a cache implementation for roles, keyed by roleIDs. diff --git a/ocis-pkg/roles/cache_test.go b/ocis-pkg/roles/cache_test.go index e85666ba567..936929783a3 100644 --- a/ocis-pkg/roles/cache_test.go +++ b/ocis-pkg/roles/cache_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/roles/manager.go b/ocis-pkg/roles/manager.go index 6c58239ed75..f6a59758a63 100644 --- a/ocis-pkg/roles/manager.go +++ b/ocis-pkg/roles/manager.go @@ -3,9 +3,9 @@ package roles import ( "context" - "github.com/owncloud/ocis/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // Manager manages a cache of roles by fetching unknown roles from the settings.RoleService. diff --git a/ocis-pkg/roles/option.go b/ocis-pkg/roles/option.go index 74f688cecd0..2e8790f3fb4 100644 --- a/ocis-pkg/roles/option.go +++ b/ocis-pkg/roles/option.go @@ -3,8 +3,8 @@ package roles import ( "time" - "github.com/owncloud/ocis/ocis-pkg/log" - settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" ) // Options are all the possible options. diff --git a/ocis-pkg/roles/util.go b/ocis-pkg/roles/util.go index 8b5d25b8c96..796dcaa2233 100644 --- a/ocis-pkg/roles/util.go +++ b/ocis-pkg/roles/util.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" "go-micro.dev/v4/metadata" ) diff --git a/ocis-pkg/service/debug/option.go b/ocis-pkg/service/debug/option.go index d33420ca492..60029fa274b 100644 --- a/ocis-pkg/service/debug/option.go +++ b/ocis-pkg/service/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/service/debug/service.go b/ocis-pkg/service/debug/service.go index 8112618a53a..4a73742204a 100644 --- a/ocis-pkg/service/debug/service.go +++ b/ocis-pkg/service/debug/service.go @@ -6,8 +6,8 @@ import ( chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" - "github.com/owncloud/ocis/ocis-pkg/cors" - "github.com/owncloud/ocis/ocis-pkg/middleware" + "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/owncloud/ocis/v2/ocis-pkg/middleware" "github.com/prometheus/client_golang/prometheus/promhttp" "go.opencensus.io/zpages" ) diff --git a/ocis-pkg/service/external/external.go b/ocis-pkg/service/external/external.go index 02310c33395..325dac4035b 100644 --- a/ocis-pkg/service/external/external.go +++ b/ocis-pkg/service/external/external.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/owncloud/ocis/ocis-pkg/log" - oregistry "github.com/owncloud/ocis/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/log" + oregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry" "go-micro.dev/v4/broker" "go-micro.dev/v4/registry" ) diff --git a/ocis-pkg/service/external/external_test.go b/ocis-pkg/service/external/external_test.go index 4b65ad12061..637d8601cc3 100644 --- a/ocis-pkg/service/external/external_test.go +++ b/ocis-pkg/service/external/external_test.go @@ -6,7 +6,7 @@ package external // "testing" // // "github.com/micro/go-micro/v2/registry" -// "github.com/owncloud/ocis/ocis-pkg/log" +// "github.com/owncloud/ocis/v2/ocis-pkg/log" //) // //func TestRegisterGRPCEndpoint(t *testing.T) { diff --git a/ocis-pkg/service/grpc/option.go b/ocis-pkg/service/grpc/option.go index b2fa3823b17..7004c1a9e5a 100644 --- a/ocis-pkg/service/grpc/option.go +++ b/ocis-pkg/service/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go index 9c7f83750c4..64e87e4d495 100644 --- a/ocis-pkg/service/grpc/service.go +++ b/ocis-pkg/service/grpc/service.go @@ -9,7 +9,7 @@ import ( mbreaker "github.com/go-micro/plugins/v4/wrapper/breaker/gobreaker" "github.com/go-micro/plugins/v4/wrapper/monitoring/prometheus" "github.com/go-micro/plugins/v4/wrapper/trace/opencensus" - "github.com/owncloud/ocis/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" "go-micro.dev/v4" "go-micro.dev/v4/client" ) diff --git a/ocis-pkg/service/http/option.go b/ocis-pkg/service/http/option.go index 108dcc9e76c..8176187205e 100644 --- a/ocis-pkg/service/http/option.go +++ b/ocis-pkg/service/http/option.go @@ -5,7 +5,7 @@ import ( "crypto/tls" "net/http" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/ocis-pkg/service/http/service.go b/ocis-pkg/service/http/service.go index 15ed2b8ce0c..cf06288bf3f 100644 --- a/ocis-pkg/service/http/service.go +++ b/ocis-pkg/service/http/service.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" mhttps "github.com/go-micro/plugins/v4/server/http" "go-micro.dev/v4" diff --git a/ocis-pkg/shared/errors.go b/ocis-pkg/shared/errors.go index 394407bba40..8b05a2ff87a 100644 --- a/ocis-pkg/shared/errors.go +++ b/ocis-pkg/shared/errors.go @@ -3,7 +3,7 @@ package shared import ( "fmt" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" ) func MissingMachineAuthApiKeyError(service string) error { diff --git a/ocis-pkg/tracing/tracing.go b/ocis-pkg/tracing/tracing.go index 15ed62101ed..6fd5f245041 100644 --- a/ocis-pkg/tracing/tracing.go +++ b/ocis-pkg/tracing/tracing.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/sdk/resource" diff --git a/ocis/cmd/ocis/main.go b/ocis/cmd/ocis/main.go index 42a1137e1fb..308bfed1962 100644 --- a/ocis/cmd/ocis/main.go +++ b/ocis/cmd/ocis/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis/ocis/pkg/command" + "github.com/owncloud/ocis/v2/ocis/pkg/command" ) func main() { diff --git a/ocis/pkg/command/accounts.go b/ocis/pkg/command/accounts.go index e9981b9f540..70d39e948ce 100644 --- a/ocis/pkg/command/accounts.go +++ b/ocis/pkg/command/accounts.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/accounts/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/v2/extensions/accounts/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/app-registry.go b/ocis/pkg/command/app-registry.go index 74dcb85ab54..cdef223eb7f 100644 --- a/ocis/pkg/command/app-registry.go +++ b/ocis/pkg/command/app-registry.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/app-registry/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/v2/extensions/app-registry/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/appprovider.go b/ocis/pkg/command/appprovider.go index 0c10f0d2bc5..c4aa60a94be 100644 --- a/ocis/pkg/command/appprovider.go +++ b/ocis/pkg/command/appprovider.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/app-provider/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/v2/extensions/app-provider/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/audit.go b/ocis/pkg/command/audit.go index 03d390e6324..2f8618096c4 100644 --- a/ocis/pkg/command/audit.go +++ b/ocis/pkg/command/audit.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/audit/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/v2/extensions/audit/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/auth-basic.go b/ocis/pkg/command/auth-basic.go index 569ca434b6d..de542f44666 100644 --- a/ocis/pkg/command/auth-basic.go +++ b/ocis/pkg/command/auth-basic.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/auth-basic/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/v2/extensions/auth-basic/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/auth-bearer.go b/ocis/pkg/command/auth-bearer.go index e44fcb88c02..83d96733466 100644 --- a/ocis/pkg/command/auth-bearer.go +++ b/ocis/pkg/command/auth-bearer.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/auth-bearer/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/v2/extensions/auth-bearer/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/auth-machine.go b/ocis/pkg/command/auth-machine.go index 4ed22342f3d..733b6a0d0ba 100644 --- a/ocis/pkg/command/auth-machine.go +++ b/ocis/pkg/command/auth-machine.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/auth-machine/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/v2/extensions/auth-machine/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/frontend.go b/ocis/pkg/command/frontend.go index 0e8ad6142e4..e0aa238fc99 100644 --- a/ocis/pkg/command/frontend.go +++ b/ocis/pkg/command/frontend.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/frontend/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/v2/extensions/frontend/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/gateway.go b/ocis/pkg/command/gateway.go index b6af96d0675..068c892042b 100644 --- a/ocis/pkg/command/gateway.go +++ b/ocis/pkg/command/gateway.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/gateway/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/v2/extensions/gateway/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/glauth.go b/ocis/pkg/command/glauth.go index 8a3059efff4..ddcff0b6936 100644 --- a/ocis/pkg/command/glauth.go +++ b/ocis/pkg/command/glauth.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "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" + "github.com/owncloud/ocis/v2/extensions/glauth/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/graph.go b/ocis/pkg/command/graph.go index 89dc41f64cf..36c529ee44a 100644 --- a/ocis/pkg/command/graph.go +++ b/ocis/pkg/command/graph.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "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" + "github.com/owncloud/ocis/v2/extensions/graph/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/graphexplorer.go b/ocis/pkg/command/graphexplorer.go index ad33cf7b4a2..fcbb0fe0f84 100644 --- a/ocis/pkg/command/graphexplorer.go +++ b/ocis/pkg/command/graphexplorer.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/graph-explorer/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/v2/extensions/graph-explorer/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/group.go b/ocis/pkg/command/group.go index fe40ba15cef..b67ed713cce 100644 --- a/ocis/pkg/command/group.go +++ b/ocis/pkg/command/group.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/group/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/v2/extensions/group/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/idm.go b/ocis/pkg/command/idm.go index 9a375c8c68f..d711dd6c526 100644 --- a/ocis/pkg/command/idm.go +++ b/ocis/pkg/command/idm.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/idm/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/v2/extensions/idm/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go index 82909ee9a84..0a25333086d 100644 --- a/ocis/pkg/command/idp.go +++ b/ocis/pkg/command/idp.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/idp/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/v2/extensions/idp/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/init.go b/ocis/pkg/command/init.go index 4c697011ccc..141c55b6113 100644 --- a/ocis/pkg/command/init.go +++ b/ocis/pkg/command/init.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/config/defaults" - ocisinit "github.com/owncloud/ocis/ocis/pkg/init" - "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" + ocisinit "github.com/owncloud/ocis/v2/ocis/pkg/init" + "github.com/owncloud/ocis/v2/ocis/pkg/register" cli "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/kill.go b/ocis/pkg/command/kill.go index 51b8b426186..27770ece2ae 100644 --- a/ocis/pkg/command/kill.go +++ b/ocis/pkg/command/kill.go @@ -7,8 +7,8 @@ import ( "net/rpc" "os" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/list.go b/ocis/pkg/command/list.go index 64a3f6d14d9..2078775ad40 100644 --- a/ocis/pkg/command/list.go +++ b/ocis/pkg/command/list.go @@ -6,8 +6,8 @@ import ( "net" "net/rpc" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/natsserver.go b/ocis/pkg/command/natsserver.go index 48cf8174a8a..17fa6023ed8 100644 --- a/ocis/pkg/command/natsserver.go +++ b/ocis/pkg/command/natsserver.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/nats/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/v2/extensions/nats/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/notifications.go b/ocis/pkg/command/notifications.go index ee362dc7ed1..0a004ef20dd 100644 --- a/ocis/pkg/command/notifications.go +++ b/ocis/pkg/command/notifications.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/notifications/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/v2/extensions/notifications/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/ocdav.go b/ocis/pkg/command/ocdav.go index b9adf249240..4e60e0bd1e7 100644 --- a/ocis/pkg/command/ocdav.go +++ b/ocis/pkg/command/ocdav.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/ocdav/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/v2/extensions/ocdav/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go index b2f1b5bd620..90c3f446aa0 100644 --- a/ocis/pkg/command/ocs.go +++ b/ocis/pkg/command/ocs.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/ocs/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/v2/extensions/ocs/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go index 219a4c06e15..d25e06ec56e 100644 --- a/ocis/pkg/command/proxy.go +++ b/ocis/pkg/command/proxy.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/proxy/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/v2/extensions/proxy/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/root.go b/ocis/pkg/command/root.go index 7fb3551afd1..d03ca62acfe 100644 --- a/ocis/pkg/command/root.go +++ b/ocis/pkg/command/root.go @@ -3,9 +3,9 @@ package command import ( "os" - "github.com/owncloud/ocis/ocis-pkg/clihelper" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/run.go b/ocis/pkg/command/run.go index 5259bdec51d..d5e264f4471 100644 --- a/ocis/pkg/command/run.go +++ b/ocis/pkg/command/run.go @@ -9,8 +9,8 @@ import ( cli "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis/pkg/register" ) // RunCommand is the entrypoint for the run command. diff --git a/ocis/pkg/command/search.go b/ocis/pkg/command/search.go index 61ef308842d..cf18ac356e1 100644 --- a/ocis/pkg/command/search.go +++ b/ocis/pkg/command/search.go @@ -1,10 +1,10 @@ package command import ( - "github.com/owncloud/ocis/extensions/search/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/v2/extensions/search/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/server.go b/ocis/pkg/command/server.go index c4bba27eb08..1a3c9febb3c 100644 --- a/ocis/pkg/command/server.go +++ b/ocis/pkg/command/server.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "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/ocis/pkg/runtime" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis/pkg/runtime" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go index 1a454bf58c0..e107c206e00 100644 --- a/ocis/pkg/command/settings.go +++ b/ocis/pkg/command/settings.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/settings/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/v2/extensions/settings/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/sharing.go b/ocis/pkg/command/sharing.go index de5b391a955..dc2ffb1012a 100644 --- a/ocis/pkg/command/sharing.go +++ b/ocis/pkg/command/sharing.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/sharing/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/v2/extensions/sharing/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storage-metadata.go b/ocis/pkg/command/storage-metadata.go index 4ced6435c3e..f829d3f37f7 100644 --- a/ocis/pkg/command/storage-metadata.go +++ b/ocis/pkg/command/storage-metadata.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/storage-system/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/v2/extensions/storage-system/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storage-publiclink.go b/ocis/pkg/command/storage-publiclink.go index c084b66439f..5f03f64efb8 100644 --- a/ocis/pkg/command/storage-publiclink.go +++ b/ocis/pkg/command/storage-publiclink.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/storage-publiclink/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/v2/extensions/storage-publiclink/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storage-shares.go b/ocis/pkg/command/storage-shares.go index dd337dc5e9b..ee993955baa 100644 --- a/ocis/pkg/command/storage-shares.go +++ b/ocis/pkg/command/storage-shares.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/storage-shares/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/v2/extensions/storage-shares/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/storage-users.go b/ocis/pkg/command/storage-users.go index e1a4aaf3eac..9da811b506f 100644 --- a/ocis/pkg/command/storage-users.go +++ b/ocis/pkg/command/storage-users.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/storage-users/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/v2/extensions/storage-users/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go index 50d1f92cdd0..55fd40a7615 100644 --- a/ocis/pkg/command/store.go +++ b/ocis/pkg/command/store.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/store/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/v2/extensions/store/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go index 6b888fb177e..12fa79b3346 100644 --- a/ocis/pkg/command/thumbnails.go +++ b/ocis/pkg/command/thumbnails.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/thumbnails/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/v2/extensions/thumbnails/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/user.go b/ocis/pkg/command/user.go index 7685f1fc42b..eb218f5bd47 100644 --- a/ocis/pkg/command/user.go +++ b/ocis/pkg/command/user.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/user/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/v2/extensions/user/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/version.go b/ocis/pkg/command/version.go index 4254a46df4a..c088ebd15d7 100644 --- a/ocis/pkg/command/version.go +++ b/ocis/pkg/command/version.go @@ -5,10 +5,10 @@ import ( "os" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/registry" - "github.com/owncloud/ocis/ocis-pkg/version" - "github.com/owncloud/ocis/ocis/pkg/register" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" mreg "go-micro.dev/v4/registry" ) diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go index d3e93e4b070..a9acaf06dc0 100644 --- a/ocis/pkg/command/web.go +++ b/ocis/pkg/command/web.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/web/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/v2/extensions/web/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go index 693f237d8a8..157d85b9968 100644 --- a/ocis/pkg/command/webdav.go +++ b/ocis/pkg/command/webdav.go @@ -3,10 +3,10 @@ package command import ( "fmt" - "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/v2/extensions/webdav/pkg/command" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" + "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go index b88acc580dc..ca7f65b3698 100644 --- a/ocis/pkg/init/init.go +++ b/ocis/pkg/init/init.go @@ -10,7 +10,7 @@ import ( "time" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/ocis-pkg/generators" + "github.com/owncloud/ocis/v2/ocis-pkg/generators" "gopkg.in/yaml.v2" ) diff --git a/ocis/pkg/register/command.go b/ocis/pkg/register/command.go index 87af6b80a35..3f02526055c 100644 --- a/ocis/pkg/register/command.go +++ b/ocis/pkg/register/command.go @@ -1,7 +1,7 @@ package register import ( - "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/cmd/kill.go b/ocis/pkg/runtime/cmd/kill.go index d3a5855b81b..42622bb3db2 100644 --- a/ocis/pkg/runtime/cmd/kill.go +++ b/ocis/pkg/runtime/cmd/kill.go @@ -6,7 +6,7 @@ import ( "net" "net/rpc" - "github.com/owncloud/ocis/ocis/pkg/runtime/config" + "github.com/owncloud/ocis/v2/ocis/pkg/runtime/config" "github.com/spf13/cobra" ) diff --git a/ocis/pkg/runtime/cmd/list.go b/ocis/pkg/runtime/cmd/list.go index 1965acf2687..64e2a9f8bfb 100644 --- a/ocis/pkg/runtime/cmd/list.go +++ b/ocis/pkg/runtime/cmd/list.go @@ -6,7 +6,7 @@ import ( "net" "net/rpc" - "github.com/owncloud/ocis/ocis/pkg/runtime/config" + "github.com/owncloud/ocis/v2/ocis/pkg/runtime/config" "github.com/spf13/cobra" ) diff --git a/ocis/pkg/runtime/cmd/run.go b/ocis/pkg/runtime/cmd/run.go index c529d376427..83b82add333 100644 --- a/ocis/pkg/runtime/cmd/run.go +++ b/ocis/pkg/runtime/cmd/run.go @@ -6,7 +6,7 @@ import ( "net" "net/rpc" - "github.com/owncloud/ocis/ocis/pkg/runtime/config" + "github.com/owncloud/ocis/v2/ocis/pkg/runtime/config" "github.com/spf13/cobra" ) diff --git a/ocis/pkg/runtime/options.go b/ocis/pkg/runtime/options.go index 4c943d2995d..4c92e673cdd 100644 --- a/ocis/pkg/runtime/options.go +++ b/ocis/pkg/runtime/options.go @@ -1,7 +1,7 @@ package runtime import ( - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go index 5a79631a8a2..32e6b8e1a91 100644 --- a/ocis/pkg/runtime/runtime.go +++ b/ocis/pkg/runtime/runtime.go @@ -1,8 +1,8 @@ package runtime import ( - "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis/pkg/runtime/service" + "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis/pkg/runtime/service" ) // Runtime represents an oCIS runtime environment. diff --git a/ocis/pkg/runtime/service/option.go b/ocis/pkg/runtime/service/option.go index 0ad83d3e7a9..7343fc9745f 100644 --- a/ocis/pkg/runtime/service/option.go +++ b/ocis/pkg/runtime/service/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/owncloud/ocis/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/config" ) // Log configures a structure logger. diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index 8e431ba8181..aed84df2fae 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -13,45 +13,45 @@ import ( "syscall" "time" - "github.com/owncloud/ocis/ocis-pkg/shared" + "github.com/owncloud/ocis/v2/ocis-pkg/shared" mzlog "github.com/go-micro/plugins/v4/logger/zerolog" "github.com/mohae/deepcopy" "github.com/olekukonko/tablewriter" - accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command" - appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/command" - appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/command" - authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/command" - authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command" - authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/command" - frontend "github.com/owncloud/ocis/extensions/frontend/pkg/command" - gateway "github.com/owncloud/ocis/extensions/gateway/pkg/command" - glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command" - graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command" - graph "github.com/owncloud/ocis/extensions/graph/pkg/command" - group "github.com/owncloud/ocis/extensions/group/pkg/command" - idm "github.com/owncloud/ocis/extensions/idm/pkg/command" - idp "github.com/owncloud/ocis/extensions/idp/pkg/command" - nats "github.com/owncloud/ocis/extensions/nats/pkg/command" - notifications "github.com/owncloud/ocis/extensions/notifications/pkg/command" - ocdav "github.com/owncloud/ocis/extensions/ocdav/pkg/command" - ocs "github.com/owncloud/ocis/extensions/ocs/pkg/command" - proxy "github.com/owncloud/ocis/extensions/proxy/pkg/command" - search "github.com/owncloud/ocis/extensions/search/pkg/command" - settings "github.com/owncloud/ocis/extensions/settings/pkg/command" - sharing "github.com/owncloud/ocis/extensions/sharing/pkg/command" - storagepublic "github.com/owncloud/ocis/extensions/storage-publiclink/pkg/command" - storageshares "github.com/owncloud/ocis/extensions/storage-shares/pkg/command" - storageSystem "github.com/owncloud/ocis/extensions/storage-system/pkg/command" - storageusers "github.com/owncloud/ocis/extensions/storage-users/pkg/command" - store "github.com/owncloud/ocis/extensions/store/pkg/command" - thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/command" - user "github.com/owncloud/ocis/extensions/user/pkg/command" - web "github.com/owncloud/ocis/extensions/web/pkg/command" - webdav "github.com/owncloud/ocis/extensions/webdav/pkg/command" - ociscfg "github.com/owncloud/ocis/ocis-pkg/config" - "github.com/owncloud/ocis/ocis-pkg/log" + accounts "github.com/owncloud/ocis/v2/extensions/accounts/pkg/command" + appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command" + appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command" + authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command" + authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command" + authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command" + frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/command" + gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/command" + glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/command" + graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command" + graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/command" + group "github.com/owncloud/ocis/v2/extensions/group/pkg/command" + idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/command" + idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/command" + nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/command" + notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/command" + ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/command" + ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/command" + proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/command" + search "github.com/owncloud/ocis/v2/extensions/search/pkg/command" + settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/command" + sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/command" + storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/command" + storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/command" + storageSystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/command" + storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command" + store "github.com/owncloud/ocis/v2/extensions/store/pkg/command" + thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command" + user "github.com/owncloud/ocis/v2/extensions/user/pkg/command" + web "github.com/owncloud/ocis/v2/extensions/web/pkg/command" + webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/command" + ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/rs/zerolog" "github.com/thejerf/suture/v4" "go-micro.dev/v4/logger" diff --git a/protogen/gen/ocis/services/accounts/v0/accounts.mock.go b/protogen/gen/ocis/services/accounts/v0/accounts.mock.go index d5e408864c1..bc82e23a8fa 100644 --- a/protogen/gen/ocis/services/accounts/v0/accounts.mock.go +++ b/protogen/gen/ocis/services/accounts/v0/accounts.mock.go @@ -3,7 +3,7 @@ package v0 import ( context "context" - accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + accountsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" client "go-micro.dev/v4/client" empty "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/protogen/gen/ocis/services/accounts/v0/accounts.pb.go b/protogen/gen/ocis/services/accounts/v0/accounts.pb.go index e5ff1ca4ca3..437c039a80f 100644 --- a/protogen/gen/ocis/services/accounts/v0/accounts.pb.go +++ b/protogen/gen/ocis/services/accounts/v0/accounts.pb.go @@ -7,15 +7,16 @@ package v0 import ( + reflect "reflect" + sync "sync" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" - reflect "reflect" - sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go b/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go index 583becb1670..bc2aabfad4f 100644 --- a/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go +++ b/protogen/gen/ocis/services/accounts/v0/accounts.pb.micro.go @@ -5,19 +5,21 @@ package v0 import ( fmt "fmt" + math "math" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" emptypb "google.golang.org/protobuf/types/known/emptypb" _ "google.golang.org/protobuf/types/known/fieldmaskpb" - math "math" -) -import ( context "context" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/accounts/v0/accounts.pb.web.go b/protogen/gen/ocis/services/accounts/v0/accounts.pb.web.go index 1d18174a331..2c0c07be6a8 100644 --- a/protogen/gen/ocis/services/accounts/v0/accounts.pb.web.go +++ b/protogen/gen/ocis/services/accounts/v0/accounts.pb.web.go @@ -13,7 +13,7 @@ import ( "github.com/golang/protobuf/jsonpb" ptypesempty "github.com/golang/protobuf/ptypes/empty" - accountsv0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" + accountsv0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/accounts/v0" ) type webAccountsServiceHandler struct { diff --git a/protogen/gen/ocis/services/search/v0/search.pb.go b/protogen/gen/ocis/services/search/v0/search.pb.go index 236bfe95a01..a6f300f23f9 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.go @@ -7,14 +7,15 @@ package v0 import ( + reflect "reflect" + sync "sync" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" _ "google.golang.org/protobuf/types/known/fieldmaskpb" - reflect "reflect" - sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/search/v0/search.pb.micro.go b/protogen/gen/ocis/services/search/v0/search.pb.micro.go index 06e5ea9aedb..c4bb3e55d57 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.micro.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.micro.go @@ -5,18 +5,20 @@ package v0 import ( fmt "fmt" + math "math" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/protogen/gen/ocis/messages/search/v0" + _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" _ "google.golang.org/protobuf/types/known/fieldmaskpb" - math "math" -) -import ( context "context" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.go b/protogen/gen/ocis/services/settings/v0/settings.pb.go index 52afe123ca1..f25491a9bd5 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.go @@ -7,14 +7,15 @@ package v0 import ( + reflect "reflect" + sync "sync" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - reflect "reflect" - sync "sync" ) const ( diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go b/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go index fedae644826..1ad8adb3eab 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go @@ -5,18 +5,20 @@ package v0 import ( fmt "fmt" + math "math" + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0" + _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" emptypb "google.golang.org/protobuf/types/known/emptypb" - math "math" -) -import ( context "context" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/store/v0/store.pb.go b/protogen/gen/ocis/services/store/v0/store.pb.go index 7d5b055470d..adfd63bee60 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.go @@ -7,12 +7,13 @@ package v0 import ( - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/protogen/gen/ocis/services/store/v0/store.pb.micro.go b/protogen/gen/ocis/services/store/v0/store.pb.micro.go index 308060106f8..8be5b4ca687 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.micro.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.micro.go @@ -5,16 +5,18 @@ package v0 import ( fmt "fmt" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" - proto "google.golang.org/protobuf/proto" math "math" -) -import ( + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" + _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + proto "google.golang.org/protobuf/proto" + context "context" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" ) diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go index 03daa47a76b..4bd11aa0539 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go +++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go @@ -7,12 +7,13 @@ package v0 import ( - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" + v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go index 701f1d58ce3..eb7ddb5f9eb 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go +++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go @@ -5,16 +5,18 @@ package v0 import ( fmt "fmt" - _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0" - proto "google.golang.org/protobuf/proto" math "math" -) -import ( + _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" + _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" + proto "google.golang.org/protobuf/proto" + context "context" + api "go-micro.dev/v4/api" + client "go-micro.dev/v4/client" + server "go-micro.dev/v4/server" )