From b9798447919e842cd9d80e804c326ae34e2d5b5d Mon Sep 17 00:00:00 2001 From: Julian Koberg Date: Tue, 4 Mar 2025 16:02:36 +0100 Subject: [PATCH] feat(ocis): adjust reva imports Signed-off-by: Julian Koberg --- .../unit-testing/testing-ginkgo.md | 4 +-- ocis-pkg/capabilities/defaults.go | 2 +- ocis-pkg/middleware/account.go | 6 ++--- ocis-pkg/registry/registry.go | 2 +- ocis-pkg/roles/manager.go | 2 +- ocis-pkg/shared/reva.go | 2 +- ocis-pkg/tracing/tracing.go | 2 +- ocis/pkg/backup/provider.go | 2 +- ocis/pkg/command/backup.go | 4 +-- ocis/pkg/command/decomposedfs.go | 22 ++++++++-------- ocis/pkg/command/migrate.go | 26 +++++++++---------- ocis/pkg/command/revisions.go | 8 +++--- ocis/pkg/command/shares.go | 8 +++--- ocis/pkg/revisions/revisions.go | 2 +- ocis/pkg/revisions/revisions_test.go | 2 +- ocis/pkg/runtime/service/service.go | 6 ++--- services/activitylog/pkg/command/server.go | 8 +++--- .../activitylog/pkg/server/http/option.go | 4 +-- services/activitylog/pkg/service/http.go | 8 +++--- services/activitylog/pkg/service/options.go | 4 +-- services/activitylog/pkg/service/response.go | 4 +-- services/activitylog/pkg/service/service.go | 8 +++--- .../activitylog/pkg/service/service_test.go | 2 +- services/antivirus/pkg/scanners/icap.go | 2 +- services/antivirus/pkg/service/service.go | 10 +++---- services/app-provider/pkg/command/server.go | 2 +- services/app-registry/pkg/command/server.go | 2 +- services/audit/pkg/command/server.go | 4 +-- services/audit/pkg/service/service.go | 2 +- services/audit/pkg/service/service_test.go | 2 +- services/audit/pkg/types/conversion.go | 8 +++--- services/audit/pkg/types/events.go | 2 +- services/audit/pkg/types/messages.go | 4 +-- services/audit/pkg/types/types.go | 2 +- services/auth-app/pkg/command/create.go | 6 ++--- services/auth-app/pkg/command/server.go | 4 +-- services/auth-app/pkg/server/http/option.go | 2 +- services/auth-app/pkg/service/option.go | 2 +- services/auth-app/pkg/service/service.go | 10 +++---- services/auth-basic/pkg/command/server.go | 2 +- services/auth-bearer/pkg/command/server.go | 2 +- services/auth-machine/pkg/command/server.go | 2 +- services/auth-service/pkg/command/server.go | 2 +- services/clientlog/pkg/command/server.go | 6 ++--- services/clientlog/pkg/service/options.go | 4 +-- services/clientlog/pkg/service/service.go | 8 +++--- .../collaboration/mocks/gateway_selector.go | 2 +- services/collaboration/pkg/command/server.go | 4 +-- .../pkg/connector/contentconnector.go | 4 +-- .../pkg/connector/contentconnector_test.go | 8 +++--- .../pkg/connector/fileconnector.go | 8 +++--- .../pkg/connector/fileconnector_test.go | 8 +++--- .../pkg/connector/httpadapter.go | 2 +- services/collaboration/pkg/helpers/cs3.go | 2 +- .../collaboration/pkg/helpers/registration.go | 4 +-- .../collaboration/pkg/middleware/tracing.go | 2 +- .../pkg/middleware/wopicontext.go | 4 +-- .../pkg/middleware/wopicontext_test.go | 4 +-- .../pkg/service/grpc/v0/option.go | 2 +- .../pkg/service/grpc/v0/service.go | 6 ++--- .../pkg/service/grpc/v0/service_test.go | 6 ++--- services/eventhistory/pkg/command/server.go | 4 +-- .../eventhistory/pkg/server/grpc/option.go | 2 +- services/eventhistory/pkg/service/service.go | 2 +- .../eventhistory/pkg/service/service_test.go | 6 ++--- services/frontend/pkg/command/events.go | 8 +++--- services/frontend/pkg/command/server.go | 2 +- services/gateway/pkg/command/server.go | 2 +- services/gateway/pkg/revaconfig/config.go | 2 +- services/graph/mocks/gateway_selector.go | 2 +- services/graph/pkg/errorcode/cs3.go | 2 +- services/graph/pkg/identity/cache.go | 4 +-- services/graph/pkg/identity/cs3.go | 2 +- services/graph/pkg/linktype/linktype.go | 2 +- services/graph/pkg/linktype/linktype_test.go | 2 +- services/graph/pkg/middleware/auth.go | 8 +++--- services/graph/pkg/middleware/requireadmin.go | 2 +- services/graph/pkg/server/http/server.go | 4 +-- .../service/v0/api_driveitem_permissions.go | 12 ++++----- .../v0/api_driveitem_permissions_links.go | 4 +-- .../api_driveitem_permissions_links_test.go | 8 +++--- .../v0/api_driveitem_permissions_test.go | 12 ++++----- .../pkg/service/v0/api_drives_drive_item.go | 6 ++--- .../service/v0/api_drives_drive_item_test.go | 4 +-- .../graph/pkg/service/v0/application_test.go | 4 +-- .../pkg/service/v0/approleassignments.go | 6 ++--- .../pkg/service/v0/approleassignments_test.go | 6 ++--- services/graph/pkg/service/v0/base.go | 8 +++--- services/graph/pkg/service/v0/driveitems.go | 6 ++--- .../graph/pkg/service/v0/driveitems_test.go | 10 +++---- services/graph/pkg/service/v0/drives.go | 6 ++--- .../graph/pkg/service/v0/educationclasses.go | 4 +-- .../pkg/service/v0/educationclasses_test.go | 6 ++--- .../pkg/service/v0/educationschools_test.go | 6 ++--- .../graph/pkg/service/v0/educationuser.go | 6 ++--- .../pkg/service/v0/educationuser_test.go | 8 +++--- services/graph/pkg/service/v0/graph.go | 4 +-- services/graph/pkg/service/v0/graph_test.go | 12 ++++----- services/graph/pkg/service/v0/groups.go | 4 +-- services/graph/pkg/service/v0/groups_test.go | 6 ++--- services/graph/pkg/service/v0/option.go | 4 +-- services/graph/pkg/service/v0/password.go | 4 +-- .../graph/pkg/service/v0/password_test.go | 8 +++--- services/graph/pkg/service/v0/personaldata.go | 8 +++--- services/graph/pkg/service/v0/service.go | 8 +++--- .../graph/pkg/service/v0/sharedbyme_test.go | 12 ++++----- .../graph/pkg/service/v0/sharedwithme_test.go | 12 ++++----- .../graph/pkg/service/v0/spacetemplates.go | 6 ++--- services/graph/pkg/service/v0/tags.go | 8 +++--- services/graph/pkg/service/v0/users.go | 8 +++--- services/graph/pkg/service/v0/users_test.go | 8 +++--- services/graph/pkg/service/v0/utils.go | 4 +-- services/graph/pkg/service/v0/utils_test.go | 6 ++--- services/graph/pkg/unifiedrole/conversion.go | 2 +- .../graph/pkg/unifiedrole/conversion_test.go | 2 +- services/graph/pkg/unifiedrole/roles.go | 2 +- services/groups/pkg/command/server.go | 2 +- .../idp/pkg/backends/cs3/identifier/cs3.go | 2 +- .../notifications/pkg/command/send_email.go | 5 ++-- services/notifications/pkg/command/server.go | 13 +++++----- services/notifications/pkg/service/job.go | 3 ++- .../pkg/service/persistence_test.go | 8 +++--- .../notifications/pkg/service/sciencemesh.go | 4 +-- services/notifications/pkg/service/service.go | 9 ++++--- .../notifications/pkg/service/service_test.go | 18 +++++++------ services/notifications/pkg/service/shares.go | 5 ++-- services/notifications/pkg/service/spaces.go | 7 ++--- services/ocdav/pkg/command/server.go | 4 +-- services/ocm/pkg/command/server.go | 2 +- services/ocs/pkg/server/http/server.go | 3 ++- services/ocs/pkg/service/v0/users.go | 2 +- services/policies/pkg/command/server.go | 2 +- .../policies/pkg/engine/opa/rf_resource.go | 2 +- .../policies/pkg/service/event/service.go | 2 +- .../pkg/command/postprocessing.go | 6 ++--- services/postprocessing/pkg/command/server.go | 4 +-- .../postprocessing/pkg/config/parser/parse.go | 2 +- .../pkg/postprocessing/postprocessing.go | 2 +- .../postprocessing/pkg/service/service.go | 6 ++--- services/proxy/pkg/command/server.go | 8 +++--- .../proxy/pkg/middleware/account_resolver.go | 6 ++--- .../pkg/middleware/account_resolver_test.go | 6 ++--- services/proxy/pkg/middleware/app_auth.go | 4 +-- .../proxy/pkg/middleware/app_auth_test.go | 2 +- .../pkg/middleware/authentication_test.go | 2 +- services/proxy/pkg/middleware/create_home.go | 8 +++--- services/proxy/pkg/middleware/options.go | 4 +-- services/proxy/pkg/middleware/policies.go | 6 ++--- .../proxy/pkg/middleware/policies_test.go | 4 +-- .../proxy/pkg/middleware/public_share_auth.go | 2 +- .../pkg/middleware/public_share_auth_test.go | 2 +- .../proxy/pkg/middleware/signed_url_auth.go | 2 +- .../pkg/middleware/signed_url_auth_test.go | 2 +- services/proxy/pkg/proxy/policy/selector.go | 2 +- .../proxy/pkg/proxy/policy/selector_test.go | 2 +- .../pkg/staticroutes/backchannellogout.go | 4 +-- .../proxy/pkg/staticroutes/staticroutes.go | 2 +- services/proxy/pkg/user/backend/cs3.go | 6 ++--- services/proxy/pkg/userroles/defaultrole.go | 2 +- services/proxy/pkg/userroles/oidcroles.go | 2 +- services/proxy/pkg/userroles/userroles.go | 2 +- services/search/pkg/content/basic.go | 4 +-- services/search/pkg/content/cs3.go | 4 +-- services/search/pkg/content/tika.go | 2 +- services/search/pkg/engine/bleve.go | 6 ++--- services/search/pkg/engine/bleve_test.go | 2 +- services/search/pkg/search/events.go | 4 +-- services/search/pkg/search/events_test.go | 2 +- services/search/pkg/search/search.go | 8 +++--- services/search/pkg/search/service.go | 14 +++++----- services/search/pkg/search/service_test.go | 8 +++--- .../search/pkg/service/grpc/v0/service.go | 14 +++++----- services/settings/pkg/service/v0/service.go | 4 +-- .../pkg/store/metadata/assignments.go | 2 +- .../settings/pkg/store/metadata/bundles.go | 2 +- services/settings/pkg/store/metadata/cache.go | 2 +- services/settings/pkg/store/metadata/store.go | 4 +-- .../settings/pkg/store/metadata/store_test.go | 2 +- .../settings/pkg/store/metadata/values.go | 2 +- services/sharing/pkg/command/server.go | 2 +- services/sse/pkg/command/server.go | 4 +-- services/sse/pkg/server/http/option.go | 2 +- services/sse/pkg/server/http/server.go | 2 +- services/sse/pkg/service/service.go | 4 +-- .../storage-publiclink/pkg/command/server.go | 2 +- services/storage-shares/pkg/command/server.go | 2 +- services/storage-system/pkg/command/server.go | 2 +- services/storage-users/pkg/command/server.go | 4 +-- .../storage-users/pkg/command/trash_bin.go | 8 +++--- services/storage-users/pkg/command/uploads.go | 8 +++--- .../storage-users/pkg/command/uploads_test.go | 2 +- services/storage-users/pkg/event/event.go | 2 +- services/storage-users/pkg/event/service.go | 4 +-- services/storage-users/pkg/task/trash_bin.go | 6 ++--- .../storage-users/pkg/task/trash_bin_test.go | 8 +++--- services/thumbnails/pkg/server/grpc/server.go | 4 +-- .../thumbnails/pkg/service/grpc/v0/option.go | 2 +- .../thumbnails/pkg/service/grpc/v0/service.go | 8 +++--- .../thumbnails/pkg/thumbnail/imgsource/cs3.go | 12 ++++----- .../pkg/thumbnail/imgsource/webdav.go | 2 +- services/userlog/pkg/command/server.go | 8 +++--- services/userlog/pkg/server/http/option.go | 4 +-- services/userlog/pkg/service/conversion.go | 8 +++--- services/userlog/pkg/service/filter.go | 3 ++- services/userlog/pkg/service/filter_test.go | 5 ++-- services/userlog/pkg/service/http.go | 6 ++--- services/userlog/pkg/service/options.go | 4 +-- services/userlog/pkg/service/service.go | 6 ++--- services/userlog/pkg/service/service_test.go | 13 +++++----- services/users/pkg/command/server.go | 2 +- services/web/pkg/server/http/server.go | 2 +- services/web/pkg/service/v0/option.go | 2 +- services/web/pkg/service/v0/service.go | 2 +- services/web/pkg/theme/service.go | 4 +-- services/webdav/pkg/dav/requests/thumbnail.go | 4 +-- services/webdav/pkg/errors/error.go | 2 +- services/webdav/pkg/service/v0/search.go | 8 +++--- services/webdav/pkg/service/v0/service.go | 6 ++--- 218 files changed, 536 insertions(+), 522 deletions(-) diff --git a/docs/ocis/development/unit-testing/testing-ginkgo.md b/docs/ocis/development/unit-testing/testing-ginkgo.md index 1617bdd0700..7421de8b921 100644 --- a/docs/ocis/development/unit-testing/testing-ginkgo.md +++ b/docs/ocis/development/unit-testing/testing-ginkgo.md @@ -324,8 +324,8 @@ import ( "time" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "google.golang.org/grpc" diff --git a/ocis-pkg/capabilities/defaults.go b/ocis-pkg/capabilities/defaults.go index a04bcfd0ebb..bcc8d883dfb 100644 --- a/ocis-pkg/capabilities/defaults.go +++ b/ocis-pkg/capabilities/defaults.go @@ -3,7 +3,7 @@ package capabilities import ( "sync/atomic" - "github.com/cs3org/reva/v2/pkg/owncloud/ocs" + "github.com/owncloud/reva/v2/pkg/owncloud/ocs" ) // allow the consuming part to change defaults, e.g., tests diff --git a/ocis-pkg/middleware/account.go b/ocis-pkg/middleware/account.go index aae42be0857..1240bf2b155 100644 --- a/ocis-pkg/middleware/account.go +++ b/ocis-pkg/middleware/account.go @@ -4,11 +4,11 @@ import ( "encoding/json" "net/http" - "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/owncloud/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/v2/ocis-pkg/account" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/token/manager/jwt" "go-micro.dev/v4/metadata" ) diff --git a/ocis-pkg/registry/registry.go b/ocis-pkg/registry/registry.go index ea3c9371678..e9143ab1835 100644 --- a/ocis-pkg/registry/registry.go +++ b/ocis-pkg/registry/registry.go @@ -7,9 +7,9 @@ import ( "sync" "time" - rRegistry "github.com/cs3org/reva/v2/pkg/registry" memr "github.com/go-micro/plugins/v4/registry/memory" "github.com/owncloud/ocis/v2/ocis-pkg/natsjsregistry" + rRegistry "github.com/owncloud/reva/v2/pkg/registry" mRegistry "go-micro.dev/v4/registry" "go-micro.dev/v4/registry/cache" ) diff --git a/ocis-pkg/roles/manager.go b/ocis-pkg/roles/manager.go index 4ac3db2d5f4..a22418a0f2d 100644 --- a/ocis-pkg/roles/manager.go +++ b/ocis-pkg/roles/manager.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/cs3org/reva/v2/pkg/store" "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" + "github.com/owncloud/reva/v2/pkg/store" microstore "go-micro.dev/v4/store" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/ocis-pkg/shared/reva.go b/ocis-pkg/shared/reva.go index a4a9f55553c..1a4db8593c2 100644 --- a/ocis-pkg/shared/reva.go +++ b/ocis-pkg/shared/reva.go @@ -1,7 +1,7 @@ package shared import ( - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) var defaultRevaConfig = Reva{ diff --git a/ocis-pkg/tracing/tracing.go b/ocis-pkg/tracing/tracing.go index 30718d086c7..779cbe292e6 100644 --- a/ocis-pkg/tracing/tracing.go +++ b/ocis-pkg/tracing/tracing.go @@ -8,7 +8,7 @@ import ( "strings" "time" - rtrace "github.com/cs3org/reva/v2/pkg/trace" + rtrace "github.com/owncloud/reva/v2/pkg/trace" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" diff --git a/ocis/pkg/backup/provider.go b/ocis/pkg/backup/provider.go index 02d4fbec81b..0c1c5a877dd 100644 --- a/ocis/pkg/backup/provider.go +++ b/ocis/pkg/backup/provider.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/node" "github.com/shamaton/msgpack/v2" ) diff --git a/ocis/pkg/command/backup.go b/ocis/pkg/command/backup.go index b853f48f83c..14fc60a5e50 100644 --- a/ocis/pkg/command/backup.go +++ b/ocis/pkg/command/backup.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" - s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/owncloud/ocis/v2/ocis/pkg/backup" "github.com/owncloud/ocis/v2/ocis/pkg/register" + ocisbs "github.com/owncloud/reva/v2/pkg/storage/fs/ocis/blobstore" + s3bs "github.com/owncloud/reva/v2/pkg/storage/fs/s3ng/blobstore" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/decomposedfs.go b/ocis/pkg/command/decomposedfs.go index d61f9cf90b6..8a49173030a 100644 --- a/ocis/pkg/command/decomposedfs.go +++ b/ocis/pkg/command/decomposedfs.go @@ -11,19 +11,19 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/storage/cache" - "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" - "github.com/cs3org/reva/v2/pkg/storage/fs/posix/timemanager" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/metadata" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/store" "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/owncloud/ocis/v2/ocis/pkg/register" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/storage/cache" + "github.com/owncloud/reva/v2/pkg/storage/fs/ocis/blobstore" + "github.com/owncloud/reva/v2/pkg/storage/fs/posix/timemanager" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/metadata" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/options" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/tree" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/store" "github.com/rs/zerolog" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/migrate.go b/ocis/pkg/command/migrate.go index aa845395e27..8b0be43c53c 100644 --- a/ocis/pkg/command/migrate.go +++ b/ocis/pkg/command/migrate.go @@ -12,21 +12,21 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/publicshare" - publicregistry "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/share" - "github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3" - "github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3/providercache" - "github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3/shareid" - "github.com/cs3org/reva/v2/pkg/share/manager/registry" - "github.com/cs3org/reva/v2/pkg/storage/fs/posix/timemanager" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/migrator" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options" - "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/mitchellh/mapstructure" tw "github.com/olekukonko/tablewriter" + "github.com/owncloud/reva/v2/pkg/publicshare" + publicregistry "github.com/owncloud/reva/v2/pkg/publicshare/manager/registry" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/share" + "github.com/owncloud/reva/v2/pkg/share/manager/jsoncs3" + "github.com/owncloud/reva/v2/pkg/share/manager/jsoncs3/providercache" + "github.com/owncloud/reva/v2/pkg/share/manager/jsoncs3/shareid" + "github.com/owncloud/reva/v2/pkg/share/manager/registry" + "github.com/owncloud/reva/v2/pkg/storage/fs/posix/timemanager" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/migrator" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/options" + "github.com/owncloud/reva/v2/pkg/storage/utils/metadata" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/ocis/pkg/command/revisions.go b/ocis/pkg/command/revisions.go index 569b7023826..bee3a348a75 100644 --- a/ocis/pkg/command/revisions.go +++ b/ocis/pkg/command/revisions.go @@ -6,15 +6,15 @@ import ( "path/filepath" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" - "github.com/cs3org/reva/v2/pkg/storage/fs/posix/lookup" - s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" - "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" "github.com/owncloud/ocis/v2/ocis/pkg/register" "github.com/owncloud/ocis/v2/ocis/pkg/revisions" + ocisbs "github.com/owncloud/reva/v2/pkg/storage/fs/ocis/blobstore" + "github.com/owncloud/reva/v2/pkg/storage/fs/posix/lookup" + s3bs "github.com/owncloud/reva/v2/pkg/storage/fs/s3ng/blobstore" + "github.com/owncloud/reva/v2/pkg/storagespace" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/shares.go b/ocis/pkg/command/shares.go index 20d46650135..52faaf165df 100644 --- a/ocis/pkg/command/shares.go +++ b/ocis/pkg/command/shares.go @@ -6,10 +6,10 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/share/manager/jsoncs3" - "github.com/cs3org/reva/v2/pkg/share/manager/registry" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/share/manager/jsoncs3" + "github.com/owncloud/reva/v2/pkg/share/manager/registry" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/ocis/pkg/revisions/revisions.go b/ocis/pkg/revisions/revisions.go index bc4dd00a3d0..c9cc57f9f6d 100644 --- a/ocis/pkg/revisions/revisions.go +++ b/ocis/pkg/revisions/revisions.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/node" "github.com/shamaton/msgpack/v2" ) diff --git a/ocis/pkg/revisions/revisions_test.go b/ocis/pkg/revisions/revisions_test.go index c120d9ff420..ab63f95d598 100644 --- a/ocis/pkg/revisions/revisions_test.go +++ b/ocis/pkg/revisions/revisions_test.go @@ -8,8 +8,8 @@ import ( "strconv" "testing" - "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" "github.com/google/uuid" + "github.com/owncloud/reva/v2/pkg/storage/utils/decomposedfs/lookup" "github.com/test-go/testify/require" ) diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index f07fdf98820..ecb2db5853d 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -14,12 +14,12 @@ import ( authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/command" "github.com/cenkalti/backoff" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/logger" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/mohae/deepcopy" "github.com/olekukonko/tablewriter" notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/logger" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/thejerf/suture/v4" ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" diff --git a/services/activitylog/pkg/command/server.go b/services/activitylog/pkg/command/server.go index 9490e588f95..4641e6d8aed 100644 --- a/services/activitylog/pkg/command/server.go +++ b/services/activitylog/pkg/command/server.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/store" "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" diff --git a/services/activitylog/pkg/server/http/option.go b/services/activitylog/pkg/server/http/option.go index 760cb131b3a..b48369d0a73 100644 --- a/services/activitylog/pkg/server/http/option.go +++ b/services/activitylog/pkg/server/http/option.go @@ -4,13 +4,13 @@ import ( "context" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" "github.com/owncloud/ocis/v2/services/activitylog/pkg/metrics" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go index 74a15d0c244..629a057fe4a 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -12,10 +12,10 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" libregraph "github.com/owncloud/libre-graph-api-go" diff --git a/services/activitylog/pkg/service/options.go b/services/activitylog/pkg/service/options.go index 0aa97abfc56..aacc2227837 100644 --- a/services/activitylog/pkg/service/options.go +++ b/services/activitylog/pkg/service/options.go @@ -2,13 +2,13 @@ package service import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" "github.com/owncloud/ocis/v2/ocis-pkg/log" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" microstore "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index f8b37ec74b9..44d665779c0 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -12,9 +12,9 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" libregraph "github.com/owncloud/libre-graph-api-go" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" ) diff --git a/services/activitylog/pkg/service/service.go b/services/activitylog/pkg/service/service.go index a98f541f7b3..6102fdf6902 100644 --- a/services/activitylog/pkg/service/service.go +++ b/services/activitylog/pkg/service/service.go @@ -11,11 +11,11 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" microstore "go-micro.dev/v4/store" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/activitylog/pkg/service/service_test.go b/services/activitylog/pkg/service/service_test.go index 2aa9b92a211..d70cb15e7ad 100644 --- a/services/activitylog/pkg/service/service_test.go +++ b/services/activitylog/pkg/service/service_test.go @@ -5,7 +5,7 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/store" + "github.com/owncloud/reva/v2/pkg/store" "github.com/stretchr/testify/require" ) diff --git a/services/antivirus/pkg/scanners/icap.go b/services/antivirus/pkg/scanners/icap.go index 1f3b2069962..551fbe4e76d 100644 --- a/services/antivirus/pkg/scanners/icap.go +++ b/services/antivirus/pkg/scanners/icap.go @@ -9,7 +9,7 @@ import ( "regexp" "time" - "github.com/cs3org/reva/v2/pkg/mime" + "github.com/owncloud/reva/v2/pkg/mime" ic "github.com/egirna/icap-client" ) diff --git a/services/antivirus/pkg/service/service.go b/services/antivirus/pkg/service/service.go index 099228dd0a6..55a28bd5295 100644 --- a/services/antivirus/pkg/service/service.go +++ b/services/antivirus/pkg/service/service.go @@ -12,11 +12,11 @@ import ( "sync" "time" - "github.com/cs3org/reva/v2/pkg/bytesize" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/owncloud/reva/v2/pkg/bytesize" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rhttp" "go.opentelemetry.io/otel/trace" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/app-provider/pkg/command/server.go b/services/app-provider/pkg/command/server.go index 8267ed8ea69..16363a49f31 100644 --- a/services/app-provider/pkg/command/server.go +++ b/services/app-provider/pkg/command/server.go @@ -6,9 +6,9 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/app-registry/pkg/command/server.go b/services/app-registry/pkg/command/server.go index 651b96c65c9..610db664343 100644 --- a/services/app-registry/pkg/command/server.go +++ b/services/app-registry/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/app-registry/pkg/logging" "github.com/owncloud/ocis/v2/services/app-registry/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/app-registry/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/audit/pkg/command/server.go b/services/audit/pkg/command/server.go index 61503c7fb18..c2bb45b7bee 100644 --- a/services/audit/pkg/command/server.go +++ b/services/audit/pkg/command/server.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/audit/pkg/service/service.go b/services/audit/pkg/service/service.go index 14690f7c709..fdd458839c3 100644 --- a/services/audit/pkg/service/service.go +++ b/services/audit/pkg/service/service.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/audit/pkg/config" "github.com/owncloud/ocis/v2/services/audit/pkg/types" + "github.com/owncloud/reva/v2/pkg/events" ) // Log is used to log to different outputs diff --git a/services/audit/pkg/service/service_test.go b/services/audit/pkg/service/service_test.go index b18209409b3..a9ca7b23a2d 100644 --- a/services/audit/pkg/service/service_test.go +++ b/services/audit/pkg/service/service_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/audit/pkg/types" + "github.com/owncloud/reva/v2/pkg/events" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" diff --git a/services/audit/pkg/types/conversion.go b/services/audit/pkg/types/conversion.go index 62fa363b517..230b398664b 100644 --- a/services/audit/pkg/types/conversion.go +++ b/services/audit/pkg/types/conversion.go @@ -5,16 +5,16 @@ import ( "strings" "time" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - sdk "github.com/cs3org/reva/v2/pkg/sdk/common" + sdk "github.com/owncloud/reva/v2/pkg/sdk/common" ) const _linktype = "link" diff --git a/services/audit/pkg/types/events.go b/services/audit/pkg/types/events.go index abd387dba76..1cf10307b2c 100644 --- a/services/audit/pkg/types/events.go +++ b/services/audit/pkg/types/events.go @@ -1,7 +1,7 @@ package types import ( - "github.com/cs3org/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events" ) // RegisteredEvents returns the events the service is registered for diff --git a/services/audit/pkg/types/messages.go b/services/audit/pkg/types/messages.go index aedef538fbe..dd49cfaccd6 100644 --- a/services/audit/pkg/types/messages.go +++ b/services/audit/pkg/types/messages.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" ) // short identifiers for audit actions diff --git a/services/audit/pkg/types/types.go b/services/audit/pkg/types/types.go index 9e527835162..28e21e3d1f7 100644 --- a/services/audit/pkg/types/types.go +++ b/services/audit/pkg/types/types.go @@ -1,6 +1,6 @@ package types -import "github.com/cs3org/reva/v2/pkg/events" +import "github.com/owncloud/reva/v2/pkg/events" // AuditEvent is the basic audit event type AuditEvent struct { diff --git a/services/auth-app/pkg/command/create.go b/services/auth-app/pkg/command/create.go index 5e2b897f9e6..b3ccab5431d 100644 --- a/services/auth-app/pkg/command/create.go +++ b/services/auth-app/pkg/command/create.go @@ -5,7 +5,7 @@ import ( "fmt" authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/owncloud/reva/v2/pkg/auth/scope" "time" @@ -14,13 +14,13 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/ocis-pkg/registry" "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/parser" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" "google.golang.org/grpc/metadata" ) diff --git a/services/auth-app/pkg/command/server.go b/services/auth-app/pkg/command/server.go index 6debb8a1159..d7f73ca6379 100644 --- a/services/auth-app/pkg/command/server.go +++ b/services/auth-app/pkg/command/server.go @@ -6,8 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -22,6 +20,8 @@ import ( "github.com/owncloud/ocis/v2/services/auth-app/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/auth-app/pkg/server/debug" "github.com/owncloud/ocis/v2/services/auth-app/pkg/server/http" + "github.com/owncloud/reva/v2/cmd/revad/runtime" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" ) diff --git a/services/auth-app/pkg/server/http/option.go b/services/auth-app/pkg/server/http/option.go index 1d141e9e34f..f8c110c7095 100644 --- a/services/auth-app/pkg/server/http/option.go +++ b/services/auth-app/pkg/server/http/option.go @@ -4,10 +4,10 @@ import ( "context" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" "go.opentelemetry.io/otel/trace" ) diff --git a/services/auth-app/pkg/service/option.go b/services/auth-app/pkg/service/option.go index 967001c7cde..7ac82613be6 100644 --- a/services/auth-app/pkg/service/option.go +++ b/services/auth-app/pkg/service/option.go @@ -4,11 +4,11 @@ import ( "context" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" "github.com/owncloud/ocis/v2/ocis-pkg/log" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go.opentelemetry.io/otel/trace" ) diff --git a/services/auth-app/pkg/service/service.go b/services/auth-app/pkg/service/service.go index c4515a57517..7830e984d79 100644 --- a/services/auth-app/pkg/service/service.go +++ b/services/auth-app/pkg/service/service.go @@ -13,16 +13,16 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/appctx" - "github.com/cs3org/reva/v2/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/roles" "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" settings "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + "github.com/owncloud/reva/v2/pkg/appctx" + "github.com/owncloud/reva/v2/pkg/auth/scope" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" ) diff --git a/services/auth-basic/pkg/command/server.go b/services/auth-basic/pkg/command/server.go index d451083b1fa..416dffd6319 100644 --- a/services/auth-basic/pkg/command/server.go +++ b/services/auth-basic/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -19,6 +18,7 @@ import ( "github.com/owncloud/ocis/v2/services/auth-basic/pkg/logging" "github.com/owncloud/ocis/v2/services/auth-basic/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/auth-basic/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go index 7e5e0b447d5..39474a12a32 100644 --- a/services/auth-bearer/pkg/command/server.go +++ b/services/auth-bearer/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/logging" "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/auth-machine/pkg/command/server.go b/services/auth-machine/pkg/command/server.go index 21e8e3ccddc..ad55101fa1a 100644 --- a/services/auth-machine/pkg/command/server.go +++ b/services/auth-machine/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/auth-machine/pkg/logging" "github.com/owncloud/ocis/v2/services/auth-machine/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/auth-machine/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/auth-service/pkg/command/server.go b/services/auth-service/pkg/command/server.go index 69681fc7558..ea6805b48fa 100644 --- a/services/auth-service/pkg/command/server.go +++ b/services/auth-service/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/auth-service/pkg/logging" "github.com/owncloud/ocis/v2/services/auth-service/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/auth-service/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/clientlog/pkg/command/server.go b/services/clientlog/pkg/command/server.go index 9a7a05cf311..4096630a376 100644 --- a/services/clientlog/pkg/command/server.go +++ b/services/clientlog/pkg/command/server.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/clientlog/pkg/service/options.go b/services/clientlog/pkg/service/options.go index 26509a3ed0e..2f1a080342c 100644 --- a/services/clientlog/pkg/service/options.go +++ b/services/clientlog/pkg/service/options.go @@ -2,10 +2,10 @@ package service import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go.opentelemetry.io/otel/trace" ) diff --git a/services/clientlog/pkg/service/service.go b/services/clientlog/pkg/service/service.go index 849c78ce8ec..a88cf12b46c 100644 --- a/services/clientlog/pkg/service/service.go +++ b/services/clientlog/pkg/service/service.go @@ -15,10 +15,10 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "go.opentelemetry.io/otel/trace" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" diff --git a/services/collaboration/mocks/gateway_selector.go b/services/collaboration/mocks/gateway_selector.go index 37821769c3f..1f62fc50acc 100644 --- a/services/collaboration/mocks/gateway_selector.go +++ b/services/collaboration/mocks/gateway_selector.go @@ -3,7 +3,7 @@ package mocks import ( - pool "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + pool "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" mock "github.com/stretchr/testify/mock" ) diff --git a/services/collaboration/pkg/command/server.go b/services/collaboration/pkg/command/server.go index 51c788bc237..e597e7ce38c 100644 --- a/services/collaboration/pkg/command/server.go +++ b/services/collaboration/pkg/command/server.go @@ -5,8 +5,6 @@ import ( "fmt" "net" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" registry "github.com/owncloud/ocis/v2/ocis-pkg/registry" @@ -19,6 +17,8 @@ import ( "github.com/owncloud/ocis/v2/services/collaboration/pkg/server/debug" "github.com/owncloud/ocis/v2/services/collaboration/pkg/server/grpc" "github.com/owncloud/ocis/v2/services/collaboration/pkg/server/http" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/store" "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" ) diff --git a/services/collaboration/pkg/connector/contentconnector.go b/services/collaboration/pkg/connector/contentconnector.go index 0332b09bfd4..675366441c9 100644 --- a/services/collaboration/pkg/connector/contentconnector.go +++ b/services/collaboration/pkg/connector/contentconnector.go @@ -15,11 +15,11 @@ import ( rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/rs/zerolog" "go.opentelemetry.io/otel/propagation" ) diff --git a/services/collaboration/pkg/connector/contentconnector_test.go b/services/collaboration/pkg/connector/contentconnector_test.go index dfe99f09a17..f62c0bd1307 100644 --- a/services/collaboration/pkg/connector/contentconnector_test.go +++ b/services/collaboration/pkg/connector/contentconnector_test.go @@ -8,22 +8,22 @@ import ( "strings" "time" - "github.com/cs3org/reva/v2/pkg/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/services/collaboration/mocks" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/stretchr/testify/mock" appproviderv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" providerv1beta1 "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/v2/services/collaboration/pkg/config" "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" ) var _ = Describe("ContentConnector", func() { diff --git a/services/collaboration/pkg/connector/fileconnector.go b/services/collaboration/pkg/connector/fileconnector.go index 21522e53b51..a64bae5622d 100644 --- a/services/collaboration/pkg/connector/fileconnector.go +++ b/services/collaboration/pkg/connector/fileconnector.go @@ -21,10 +21,6 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/golang/protobuf/proto" "github.com/google/uuid" "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" @@ -32,6 +28,10 @@ import ( "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" "github.com/owncloud/ocis/v2/services/collaboration/pkg/wopisrc" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/rs/zerolog" microstore "go-micro.dev/v4/store" ) diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go index 73e68d0a0b7..3412de77d75 100644 --- a/services/collaboration/pkg/connector/fileconnector_test.go +++ b/services/collaboration/pkg/connector/fileconnector_test.go @@ -16,10 +16,6 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/ocis-pkg/shared" @@ -29,6 +25,10 @@ import ( "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/fileinfo" "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" "github.com/owncloud/ocis/v2/services/graph/mocks" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/collaboration/pkg/connector/httpadapter.go b/services/collaboration/pkg/connector/httpadapter.go index 5cb594731e2..3f711878542 100644 --- a/services/collaboration/pkg/connector/httpadapter.go +++ b/services/collaboration/pkg/connector/httpadapter.go @@ -7,10 +7,10 @@ import ( "strconv" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/utf7" "github.com/owncloud/ocis/v2/services/collaboration/pkg/locks" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/rs/zerolog" microstore "go-micro.dev/v4/store" ) diff --git a/services/collaboration/pkg/helpers/cs3.go b/services/collaboration/pkg/helpers/cs3.go index eeb44eaa99c..62807dfb56c 100644 --- a/services/collaboration/pkg/helpers/cs3.go +++ b/services/collaboration/pkg/helpers/cs3.go @@ -5,7 +5,7 @@ import ( "encoding/hex" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/storagespace" ) // HashResourceId builds a urlsafe and stable file reference that can be used for proxy routing, diff --git a/services/collaboration/pkg/helpers/registration.go b/services/collaboration/pkg/helpers/registration.go index 33430a5d177..7761533bf67 100644 --- a/services/collaboration/pkg/helpers/registration.go +++ b/services/collaboration/pkg/helpers/registration.go @@ -7,8 +7,8 @@ import ( registryv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/mime" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/mime" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/registry" diff --git a/services/collaboration/pkg/middleware/tracing.go b/services/collaboration/pkg/middleware/tracing.go index 869549458a6..7300dd35f0a 100644 --- a/services/collaboration/pkg/middleware/tracing.go +++ b/services/collaboration/pkg/middleware/tracing.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/services/collaboration/pkg/middleware/wopicontext.go b/services/collaboration/pkg/middleware/wopicontext.go index aeb0149c7aa..5c0c9bef679 100644 --- a/services/collaboration/pkg/middleware/wopicontext.go +++ b/services/collaboration/pkg/middleware/wopicontext.go @@ -13,11 +13,11 @@ import ( appproviderv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - rjwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/golang-jwt/jwt/v5" "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + rjwt "github.com/owncloud/reva/v2/pkg/token/manager/jwt" "github.com/rs/zerolog" microstore "go-micro.dev/v4/store" "google.golang.org/grpc/metadata" diff --git a/services/collaboration/pkg/middleware/wopicontext_test.go b/services/collaboration/pkg/middleware/wopicontext_test.go index 0a8c1c661df..5b184481219 100644 --- a/services/collaboration/pkg/middleware/wopicontext_test.go +++ b/services/collaboration/pkg/middleware/wopicontext_test.go @@ -11,14 +11,14 @@ import ( appprovider "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/token" - rjwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" "github.com/owncloud/ocis/v2/services/collaboration/pkg/wopisrc" + "github.com/owncloud/reva/v2/pkg/token" + rjwt "github.com/owncloud/reva/v2/pkg/token/manager/jwt" ) var _ = Describe("Wopi Context Middleware", func() { diff --git a/services/collaboration/pkg/service/grpc/v0/option.go b/services/collaboration/pkg/service/grpc/v0/option.go index c2e5e70c875..11e9eaba918 100644 --- a/services/collaboration/pkg/service/grpc/v0/option.go +++ b/services/collaboration/pkg/service/grpc/v0/option.go @@ -2,7 +2,7 @@ package service import ( gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" microstore "go-micro.dev/v4/store" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/collaboration/pkg/service/grpc/v0/service.go b/services/collaboration/pkg/service/grpc/v0/service.go index 7352ecf961d..ae285fb4dc2 100644 --- a/services/collaboration/pkg/service/grpc/v0/service.go +++ b/services/collaboration/pkg/service/grpc/v0/service.go @@ -13,9 +13,9 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" microstore "go-micro.dev/v4/store" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/collaboration/pkg/service/grpc/v0/service_test.go b/services/collaboration/pkg/service/grpc/v0/service_test.go index 0d164fa9320..f3bc67776c2 100644 --- a/services/collaboration/pkg/service/grpc/v0/service_test.go +++ b/services/collaboration/pkg/service/grpc/v0/service_test.go @@ -12,12 +12,12 @@ import ( rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/golang-jwt/jwt/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/eventhistory/pkg/command/server.go b/services/eventhistory/pkg/command/server.go index 1fc33fdb3a0..122d849b8c1 100644 --- a/services/eventhistory/pkg/command/server.go +++ b/services/eventhistory/pkg/command/server.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/store" "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" diff --git a/services/eventhistory/pkg/server/grpc/option.go b/services/eventhistory/pkg/server/grpc/option.go index 0519117ee36..b758b34f424 100644 --- a/services/eventhistory/pkg/server/grpc/option.go +++ b/services/eventhistory/pkg/server/grpc/option.go @@ -3,10 +3,10 @@ package grpc import ( "context" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" "github.com/owncloud/ocis/v2/services/eventhistory/pkg/metrics" + "github.com/owncloud/reva/v2/pkg/events" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/eventhistory/pkg/service/service.go b/services/eventhistory/pkg/service/service.go index ba2a492986e..bdd45c9df15 100644 --- a/services/eventhistory/pkg/service/service.go +++ b/services/eventhistory/pkg/service/service.go @@ -7,11 +7,11 @@ import ( "fmt" "regexp" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" "go-micro.dev/v4/store" ) diff --git a/services/eventhistory/pkg/service/service_test.go b/services/eventhistory/pkg/service/service_test.go index 84dc58a4650..d7ce26a1477 100644 --- a/services/eventhistory/pkg/service/service_test.go +++ b/services/eventhistory/pkg/service/service_test.go @@ -8,9 +8,6 @@ import ( "time" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/store" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -18,6 +15,9 @@ import ( ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" "github.com/owncloud/ocis/v2/services/eventhistory/pkg/service" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/store" + "github.com/owncloud/reva/v2/pkg/utils" microevents "go-micro.dev/v4/events" microstore "go-micro.dev/v4/store" ) diff --git a/services/frontend/pkg/command/events.go b/services/frontend/pkg/command/events.go index 8875d73efcc..8fae973dd57 100644 --- a/services/frontend/pkg/command/events.go +++ b/services/frontend/pkg/command/events.go @@ -10,10 +10,10 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/rs/zerolog" "go-micro.dev/v4/metadata" "google.golang.org/protobuf/types/known/fieldmaskpb" diff --git a/services/frontend/pkg/command/server.go b/services/frontend/pkg/command/server.go index 263cb0a5672..faa3004b333 100644 --- a/services/frontend/pkg/command/server.go +++ b/services/frontend/pkg/command/server.go @@ -6,9 +6,9 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/gateway/pkg/command/server.go b/services/gateway/pkg/command/server.go index 44e1bfa7093..878d49b0796 100644 --- a/services/gateway/pkg/command/server.go +++ b/services/gateway/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/gateway/pkg/logging" "github.com/owncloud/ocis/v2/services/gateway/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/gateway/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/gateway/pkg/revaconfig/config.go b/services/gateway/pkg/revaconfig/config.go index 73d36b01169..d4589e5d7fb 100644 --- a/services/gateway/pkg/revaconfig/config.go +++ b/services/gateway/pkg/revaconfig/config.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/cs3org/reva/v2/pkg/utils" pkgconfig "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + "github.com/owncloud/reva/v2/pkg/utils" ) // GatewayConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/graph/mocks/gateway_selector.go b/services/graph/mocks/gateway_selector.go index 81d5fe3fcad..de51afa0a7e 100644 --- a/services/graph/mocks/gateway_selector.go +++ b/services/graph/mocks/gateway_selector.go @@ -3,7 +3,7 @@ package mocks import ( - pool "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + pool "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" mock "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/errorcode/cs3.go b/services/graph/pkg/errorcode/cs3.go index 37524bacd5d..97a2da1519d 100644 --- a/services/graph/pkg/errorcode/cs3.go +++ b/services/graph/pkg/errorcode/cs3.go @@ -6,7 +6,7 @@ import ( cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/utils" ) // FromCS3Status converts a CS3 status code and an error into a corresponding local Error representation. diff --git a/services/graph/pkg/identity/cache.go b/services/graph/pkg/identity/cache.go index 4a653b199db..faec8669554 100644 --- a/services/graph/pkg/identity/cache.go +++ b/services/graph/pkg/identity/cache.go @@ -8,11 +8,11 @@ import ( cs3Group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" cs3User "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - revautils "github.com/cs3org/reva/v2/pkg/utils" "github.com/jellydator/ttlcache/v3" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + revautils "github.com/owncloud/reva/v2/pkg/utils" ) // IdentityCache implements a simple ttl based cache for looking up users and groups by ID diff --git a/services/graph/pkg/identity/cs3.go b/services/graph/pkg/identity/cs3.go index e188b4adaa8..b3875e3ab5a 100644 --- a/services/graph/pkg/identity/cs3.go +++ b/services/graph/pkg/identity/cs3.go @@ -10,11 +10,11 @@ import ( cs3group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) var ( diff --git a/services/graph/pkg/linktype/linktype.go b/services/graph/pkg/linktype/linktype.go index e049701d239..60e51f068e9 100644 --- a/services/graph/pkg/linktype/linktype.go +++ b/services/graph/pkg/linktype/linktype.go @@ -5,8 +5,8 @@ import ( linkv1beta1 "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storage/utils/grants" libregraph "github.com/owncloud/libre-graph-api-go" + "github.com/owncloud/reva/v2/pkg/storage/utils/grants" "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" ) diff --git a/services/graph/pkg/linktype/linktype_test.go b/services/graph/pkg/linktype/linktype_test.go index b21eb8ce1be..0370cbdc46b 100644 --- a/services/graph/pkg/linktype/linktype_test.go +++ b/services/graph/pkg/linktype/linktype_test.go @@ -3,11 +3,11 @@ package linktype_test import ( linkv1beta1 "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storage/utils/grants" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" + "github.com/owncloud/reva/v2/pkg/storage/utils/grants" ) var _ = Describe("LinktypeFromPermission", func() { diff --git a/services/graph/pkg/middleware/auth.go b/services/graph/pkg/middleware/auth.go index 0c7fee4ee94..c8de717a051 100644 --- a/services/graph/pkg/middleware/auth.go +++ b/services/graph/pkg/middleware/auth.go @@ -6,14 +6,14 @@ import ( gmmetadata "go-micro.dev/v4/metadata" "google.golang.org/grpc/metadata" - "github.com/cs3org/reva/v2/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "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/services/graph/pkg/errorcode" + "github.com/owncloud/reva/v2/pkg/auth/scope" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/token/manager/jwt" ) // authOptions initializes the available default options. diff --git a/services/graph/pkg/middleware/requireadmin.go b/services/graph/pkg/middleware/requireadmin.go index 6b9d639ea21..63a545c9e9d 100644 --- a/services/graph/pkg/middleware/requireadmin.go +++ b/services/graph/pkg/middleware/requireadmin.go @@ -3,11 +3,11 @@ package middleware import ( "net/http" - revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/roles" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" settings "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" ) // RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions diff --git a/services/graph/pkg/server/http/server.go b/services/graph/pkg/server/http/server.go index 06007056916..17acd53ff1b 100644 --- a/services/graph/pkg/server/http/server.go +++ b/services/graph/pkg/server/http/server.go @@ -5,9 +5,9 @@ import ( stdhttp "net/http" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" chimiddleware "github.com/go-chi/chi/v5/middleware" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" "go-micro.dev/v4" "go-micro.dev/v4/events" diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions.go b/services/graph/pkg/service/v0/api_driveitem_permissions.go index 9cb643cb325..14edc8623bf 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions.go @@ -20,12 +20,12 @@ import ( "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/publicshare" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/share" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/publicshare" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/share" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" l10n_pkg "github.com/owncloud/ocis/v2/services/graph/pkg/l10n" diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_links.go b/services/graph/pkg/service/v0/api_driveitem_permissions_links.go index 1a66adf3993..49b8f5037a6 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_links.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_links.go @@ -11,13 +11,13 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" ) func (s DriveItemPermissionsService) CreateLink(ctx context.Context, driveItemID *storageprovider.ResourceId, createLink libregraph.DriveItemCreateLink) (libregraph.Permission, error) { diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go b/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go index f9e5e420d6d..39f291a01af 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go @@ -9,10 +9,6 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" 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/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" @@ -23,6 +19,10 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/identity" "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_test.go b/services/graph/pkg/service/v0/api_driveitem_permissions_test.go index 2761a23a5b0..1d5e750e9fe 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_test.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_test.go @@ -26,12 +26,12 @@ import ( "github.com/tidwall/gjson" "google.golang.org/grpc" - roleconversions "github.com/cs3org/reva/v2/pkg/conversions" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" + roleconversions "github.com/owncloud/reva/v2/pkg/conversions" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/graph/mocks" diff --git a/services/graph/pkg/service/v0/api_drives_drive_item.go b/services/graph/pkg/service/v0/api_drives_drive_item.go index 4c7d209a28e..f756279d635 100644 --- a/services/graph/pkg/service/v0/api_drives_drive_item.go +++ b/services/graph/pkg/service/v0/api_drives_drive_item.go @@ -14,9 +14,9 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" diff --git a/services/graph/pkg/service/v0/api_drives_drive_item_test.go b/services/graph/pkg/service/v0/api_drives_drive_item_test.go index 7cdc245fb3f..219dff77c4d 100644 --- a/services/graph/pkg/service/v0/api_drives_drive_item_test.go +++ b/services/graph/pkg/service/v0/api_drives_drive_item_test.go @@ -20,8 +20,8 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/owncloud/ocis/v2/ocis-pkg/conversions" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/graph/pkg/service/v0/application_test.go b/services/graph/pkg/service/v0/application_test.go index 38dc96dd3c3..6ee481f35e4 100644 --- a/services/graph/pkg/service/v0/application_test.go +++ b/services/graph/pkg/service/v0/application_test.go @@ -8,8 +8,6 @@ import ( "net/http/httptest" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -22,6 +20,8 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/approleassignments.go b/services/graph/pkg/service/v0/approleassignments.go index ce70a8b133c..b64c91df6a6 100644 --- a/services/graph/pkg/service/v0/approleassignments.go +++ b/services/graph/pkg/service/v0/approleassignments.go @@ -4,15 +4,15 @@ import ( "fmt" "net/http" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" 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/owncloud/ocis/v2/services/graph/pkg/errorcode" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" merrors "go-micro.dev/v4/errors" ) diff --git a/services/graph/pkg/service/v0/approleassignments_test.go b/services/graph/pkg/service/v0/approleassignments_test.go index e27a5b84b6d..d9fbda8d024 100644 --- a/services/graph/pkg/service/v0/approleassignments_test.go +++ b/services/graph/pkg/service/v0/approleassignments_test.go @@ -10,9 +10,6 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" "github.com/golang/protobuf/ptypes/empty" . "github.com/onsi/ginkgo/v2" @@ -26,6 +23,9 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/base.go b/services/graph/pkg/service/v0/base.go index 10b8488113a..9813a6e624b 100644 --- a/services/graph/pkg/service/v0/base.go +++ b/services/graph/pkg/service/v0/base.go @@ -20,10 +20,10 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/share" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/share" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/graph/pkg/config" diff --git a/services/graph/pkg/service/v0/driveitems.go b/services/graph/pkg/service/v0/driveitems.go index 1fcda72e4eb..5e086ed7bcc 100644 --- a/services/graph/pkg/service/v0/driveitems.go +++ b/services/graph/pkg/service/v0/driveitems.go @@ -24,9 +24,9 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "golang.org/x/crypto/sha3" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" diff --git a/services/graph/pkg/service/v0/driveitems_test.go b/services/graph/pkg/service/v0/driveitems_test.go index 36579c68373..4cbe4769097 100644 --- a/services/graph/pkg/service/v0/driveitems_test.go +++ b/services/graph/pkg/service/v0/driveitems_test.go @@ -19,11 +19,11 @@ import ( "github.com/stretchr/testify/mock" "google.golang.org/grpc" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/owncloud/ocis/v2/ocis-pkg/shared" "github.com/owncloud/ocis/v2/services/graph/mocks" diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go index d2e324018f1..47b8908b6d7 100644 --- a/services/graph/pkg/service/v0/drives.go +++ b/services/graph/pkg/service/v0/drives.go @@ -18,11 +18,11 @@ import ( cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/pkg/errors" merrors "go-micro.dev/v4/errors" "golang.org/x/sync/errgroup" diff --git a/services/graph/pkg/service/v0/educationclasses.go b/services/graph/pkg/service/v0/educationclasses.go index 061b2638a6c..06e34b6e829 100644 --- a/services/graph/pkg/service/v0/educationclasses.go +++ b/services/graph/pkg/service/v0/educationclasses.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/CiscoM31/godata" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/services/graph/pkg/service/v0/educationclasses_test.go b/services/graph/pkg/service/v0/educationclasses_test.go index 7f2a63e8b81..ddfe201be92 100644 --- a/services/graph/pkg/service/v0/educationclasses_test.go +++ b/services/graph/pkg/service/v0/educationclasses_test.go @@ -11,9 +11,6 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -25,6 +22,9 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/educationschools_test.go b/services/graph/pkg/service/v0/educationschools_test.go index 3b291bcb708..2e39e576177 100644 --- a/services/graph/pkg/service/v0/educationschools_test.go +++ b/services/graph/pkg/service/v0/educationschools_test.go @@ -12,12 +12,12 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" diff --git a/services/graph/pkg/service/v0/educationuser.go b/services/graph/pkg/service/v0/educationuser.go index 629eead6e33..95170371c17 100644 --- a/services/graph/pkg/service/v0/educationuser.go +++ b/services/graph/pkg/service/v0/educationuser.go @@ -13,10 +13,10 @@ import ( "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" ) // GetEducationUsers implements the Service interface. diff --git a/services/graph/pkg/service/v0/educationuser_test.go b/services/graph/pkg/service/v0/educationuser_test.go index 640f94e055e..24ab811e043 100644 --- a/services/graph/pkg/service/v0/educationuser_test.go +++ b/services/graph/pkg/service/v0/educationuser_test.go @@ -12,10 +12,6 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -27,6 +23,10 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/graph.go b/services/graph/pkg/service/v0/graph.go index e8a6bc24c53..6d87e9c087d 100644 --- a/services/graph/pkg/service/v0/graph.go +++ b/services/graph/pkg/service/v0/graph.go @@ -16,8 +16,8 @@ import ( "go.opentelemetry.io/otel/trace" "google.golang.org/protobuf/types/known/emptypb" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" diff --git a/services/graph/pkg/service/v0/graph_test.go b/services/graph/pkg/service/v0/graph_test.go index 5087de6d84b..86333c5faf7 100644 --- a/services/graph/pkg/service/v0/graph_test.go +++ b/services/graph/pkg/service/v0/graph_test.go @@ -14,16 +14,16 @@ import ( userprovider "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/v2/pkg/conversions" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" + "github.com/owncloud/reva/v2/pkg/conversions" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/pkg/errors" "github.com/stretchr/testify/mock" "github.com/tidwall/gjson" diff --git a/services/graph/pkg/service/v0/groups.go b/services/graph/pkg/service/v0/groups.go index 8f6f707a55e..778d76be385 100644 --- a/services/graph/pkg/service/v0/groups.go +++ b/services/graph/pkg/service/v0/groups.go @@ -12,10 +12,10 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" "github.com/go-chi/chi/v5" "github.com/go-chi/render" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" ) const memberTypeUsers = "users" diff --git a/services/graph/pkg/service/v0/groups_test.go b/services/graph/pkg/service/v0/groups_test.go index b83f3b1626f..869a6892a38 100644 --- a/services/graph/pkg/service/v0/groups_test.go +++ b/services/graph/pkg/service/v0/groups_test.go @@ -11,9 +11,6 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -27,6 +24,9 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/option.go b/services/graph/pkg/service/v0/option.go index e6560fb1a22..a3a110ce301 100644 --- a/services/graph/pkg/service/v0/option.go +++ b/services/graph/pkg/service/v0/option.go @@ -5,8 +5,6 @@ import ( "net/http" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/roles" @@ -15,6 +13,8 @@ import ( settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/graph/pkg/config" "github.com/owncloud/ocis/v2/services/graph/pkg/identity" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go.opentelemetry.io/otel/trace" ) diff --git a/services/graph/pkg/service/v0/password.go b/services/graph/pkg/service/v0/password.go index 8b1c840b1ec..181d7ba5225 100644 --- a/services/graph/pkg/service/v0/password.go +++ b/services/graph/pkg/service/v0/password.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" ) // ChangeOwnPassword implements the Service interface. It allows the user to change diff --git a/services/graph/pkg/service/v0/password_test.go b/services/graph/pkg/service/v0/password_test.go index 6447de5a19a..d42fd0d3106 100644 --- a/services/graph/pkg/service/v0/password_test.go +++ b/services/graph/pkg/service/v0/password_test.go @@ -10,10 +10,6 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-ldap/ldap/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -26,6 +22,10 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/identity" identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/personaldata.go b/services/graph/pkg/service/v0/personaldata.go index 09d90e8f2e0..cc2937ef066 100644 --- a/services/graph/pkg/service/v0/personaldata.go +++ b/services/graph/pkg/service/v0/personaldata.go @@ -16,13 +16,13 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rhttp" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rhttp" + "github.com/owncloud/reva/v2/pkg/utils" ) var ( diff --git a/services/graph/pkg/service/v0/service.go b/services/graph/pkg/service/v0/service.go index 03cc754efd9..306f3cc99ae 100644 --- a/services/graph/pkg/service/v0/service.go +++ b/services/graph/pkg/service/v0/service.go @@ -17,10 +17,10 @@ import ( "github.com/jellydator/ttlcache/v3" microstore "go-micro.dev/v4/store" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/store" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/store" + "github.com/owncloud/reva/v2/pkg/utils" ocisldap "github.com/owncloud/ocis/v2/ocis-pkg/ldap" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/graph/pkg/service/v0/sharedbyme_test.go b/services/graph/pkg/service/v0/sharedbyme_test.go index aa342962943..b3a3f02fd99 100644 --- a/services/graph/pkg/service/v0/sharedbyme_test.go +++ b/services/graph/pkg/service/v0/sharedbyme_test.go @@ -15,12 +15,6 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/conversions" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" @@ -32,6 +26,12 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/owncloud/reva/v2/pkg/conversions" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/sharedwithme_test.go b/services/graph/pkg/service/v0/sharedwithme_test.go index 795ebefd897..31011d1fc43 100644 --- a/services/graph/pkg/service/v0/sharedwithme_test.go +++ b/services/graph/pkg/service/v0/sharedwithme_test.go @@ -13,14 +13,14 @@ import ( collaborationv1beta1 "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - roleconversions "github.com/cs3org/reva/v2/pkg/conversions" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + roleconversions "github.com/owncloud/reva/v2/pkg/conversions" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "github.com/tidwall/gjson" "google.golang.org/grpc" diff --git a/services/graph/pkg/service/v0/spacetemplates.go b/services/graph/pkg/service/v0/spacetemplates.go index 99c64ec41b0..05b7ad02461 100644 --- a/services/graph/pkg/service/v0/spacetemplates.go +++ b/services/graph/pkg/service/v0/spacetemplates.go @@ -11,11 +11,11 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" v1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" l10n_pkg "github.com/owncloud/ocis/v2/services/graph/pkg/l10n" + "github.com/owncloud/reva/v2/pkg/storage/utils/metadata" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" ) var ( diff --git a/services/graph/pkg/service/v0/tags.go b/services/graph/pkg/service/v0/tags.go index b8310c970e6..f6665d048d9 100644 --- a/services/graph/pkg/service/v0/tags.go +++ b/services/graph/pkg/service/v0/tags.go @@ -6,14 +6,14 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revaCtx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/tags" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + revaCtx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/tags" "go-micro.dev/v4/metadata" ) diff --git a/services/graph/pkg/service/v0/users.go b/services/graph/pkg/service/v0/users.go index f0542f09423..685f9694117 100644 --- a/services/graph/pkg/service/v0/users.go +++ b/services/graph/pkg/service/v0/users.go @@ -17,10 +17,6 @@ import ( invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/google/uuid" @@ -31,6 +27,10 @@ import ( "github.com/owncloud/ocis/v2/services/graph/pkg/identity" ocissettingssvc "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/utils" ) // GetMe implements the Service interface. diff --git a/services/graph/pkg/service/v0/users_test.go b/services/graph/pkg/service/v0/users_test.go index 9d3dbb84c89..d2586fcd32d 100644 --- a/services/graph/pkg/service/v0/users_test.go +++ b/services/graph/pkg/service/v0/users_test.go @@ -14,14 +14,14 @@ import ( invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "go-micro.dev/v4/client" "google.golang.org/grpc" diff --git a/services/graph/pkg/service/v0/utils.go b/services/graph/pkg/service/v0/utils.go index 5a0936b8e1c..8f6fd92772d 100644 --- a/services/graph/pkg/service/v0/utils.go +++ b/services/graph/pkg/service/v0/utils.go @@ -13,9 +13,9 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" libregraph "github.com/owncloud/libre-graph-api-go" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "golang.org/x/sync/errgroup" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/graph/pkg/service/v0/utils_test.go b/services/graph/pkg/service/v0/utils_test.go index b9dbc496312..de0828bf5c5 100644 --- a/services/graph/pkg/service/v0/utils_test.go +++ b/services/graph/pkg/service/v0/utils_test.go @@ -6,15 +6,15 @@ import ( "net/http/httptest" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" - rConversions "github.com/cs3org/reva/v2/pkg/conversions" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" + rConversions "github.com/owncloud/reva/v2/pkg/conversions" + "github.com/owncloud/reva/v2/pkg/utils" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/storagespace" "google.golang.org/protobuf/testing/protocmp" "github.com/owncloud/ocis/v2/ocis-pkg/conversions" diff --git a/services/graph/pkg/unifiedrole/conversion.go b/services/graph/pkg/unifiedrole/conversion.go index 80acdfb4667..c05b3ab4773 100644 --- a/services/graph/pkg/unifiedrole/conversion.go +++ b/services/graph/pkg/unifiedrole/conversion.go @@ -4,8 +4,8 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/conversions" libregraph "github.com/owncloud/libre-graph-api-go" + "github.com/owncloud/reva/v2/pkg/conversions" ) // PermissionsToCS3ResourcePermissions converts the provided libregraph UnifiedRolePermissions to a cs3 ResourcePermissions diff --git a/services/graph/pkg/unifiedrole/conversion_test.go b/services/graph/pkg/unifiedrole/conversion_test.go index 99730c34442..0ca1a41a9c7 100644 --- a/services/graph/pkg/unifiedrole/conversion_test.go +++ b/services/graph/pkg/unifiedrole/conversion_test.go @@ -4,10 +4,10 @@ import ( "testing" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - cs3Conversions "github.com/cs3org/reva/v2/pkg/conversions" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" libregraph "github.com/owncloud/libre-graph-api-go" + cs3Conversions "github.com/owncloud/reva/v2/pkg/conversions" "github.com/owncloud/ocis/v2/ocis-pkg/conversions" "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" diff --git a/services/graph/pkg/unifiedrole/roles.go b/services/graph/pkg/unifiedrole/roles.go index 050cabd9bb6..8d4a01ca63d 100644 --- a/services/graph/pkg/unifiedrole/roles.go +++ b/services/graph/pkg/unifiedrole/roles.go @@ -8,7 +8,7 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "google.golang.org/protobuf/proto" - "github.com/cs3org/reva/v2/pkg/conversions" + "github.com/owncloud/reva/v2/pkg/conversions" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" ) diff --git a/services/groups/pkg/command/server.go b/services/groups/pkg/command/server.go index 3e3a911c96b..f5250d37e6e 100644 --- a/services/groups/pkg/command/server.go +++ b/services/groups/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -19,6 +18,7 @@ import ( "github.com/owncloud/ocis/v2/services/groups/pkg/logging" "github.com/owncloud/ocis/v2/services/groups/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/groups/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/idp/pkg/backends/cs3/identifier/cs3.go b/services/idp/pkg/backends/cs3/identifier/cs3.go index 6e5e93125c9..88116126fc6 100644 --- a/services/idp/pkg/backends/cs3/identifier/cs3.go +++ b/services/idp/pkg/backends/cs3/identifier/cs3.go @@ -7,13 +7,13 @@ import ( cs3gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/libregraph/lico" "github.com/libregraph/lico/config" "github.com/libregraph/lico/identifier/backends" "github.com/libregraph/lico/identifier/meta/scopes" "github.com/libregraph/lico/identity" cmap "github.com/orcaman/concurrent-map" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/sirupsen/logrus" ) diff --git a/services/notifications/pkg/command/send_email.go b/services/notifications/pkg/command/send_email.go index d66af993019..52051c55149 100644 --- a/services/notifications/pkg/command/send_email.go +++ b/services/notifications/pkg/command/send_email.go @@ -2,9 +2,10 @@ package command import ( "fmt" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" + "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/services/notifications/pkg/command/server.go b/services/notifications/pkg/command/server.go index 9959e45c7b9..b64745d4e0b 100644 --- a/services/notifications/pkg/command/server.go +++ b/services/notifications/pkg/command/server.go @@ -3,17 +3,18 @@ package command import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/store" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - microstore "go-micro.dev/v4/store" "reflect" + ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + "github.com/owncloud/reva/v2/pkg/store" + microstore "go-micro.dev/v4/store" + "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/ocis-pkg/registry" diff --git a/services/notifications/pkg/service/job.go b/services/notifications/pkg/service/job.go index 5850944ca77..6b7847079fb 100644 --- a/services/notifications/pkg/service/job.go +++ b/services/notifications/pkg/service/job.go @@ -2,11 +2,12 @@ package service import ( "context" - "github.com/cs3org/reva/v2/pkg/events" + "github.com/owncloud/ocis/v2/ocis-pkg/l10n" ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" "github.com/owncloud/ocis/v2/services/notifications/pkg/email" + "github.com/owncloud/reva/v2/pkg/events" "github.com/rs/zerolog" ) diff --git a/services/notifications/pkg/service/persistence_test.go b/services/notifications/pkg/service/persistence_test.go index 262ea4b222e..5919cc78444 100644 --- a/services/notifications/pkg/service/persistence_test.go +++ b/services/notifications/pkg/service/persistence_test.go @@ -3,21 +3,23 @@ package service import ( "context" "encoding/json" + "reflect" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" event "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0/mocks" + "github.com/owncloud/reva/v2/pkg/events" "github.com/stretchr/testify/mock" - "reflect" + + "testing" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "go-micro.dev/v4/store" storemocks "go-micro.dev/v4/store/mocks" - "testing" ) func Test_userEventStore_persist(t *testing.T) { diff --git a/services/notifications/pkg/service/sciencemesh.go b/services/notifications/pkg/service/sciencemesh.go index a1c260414a5..9fa1a13f000 100644 --- a/services/notifications/pkg/service/sciencemesh.go +++ b/services/notifications/pkg/service/sciencemesh.go @@ -3,10 +3,10 @@ package service import ( "context" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" "github.com/owncloud/ocis/v2/services/notifications/pkg/email" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" ) func (s eventsNotifier) handleScienceMeshInviteTokenGenerated(e events.ScienceMeshInviteTokenGenerated) { diff --git a/services/notifications/pkg/service/service.go b/services/notifications/pkg/service/service.go index e95f366b8a5..adebbeb21e4 100644 --- a/services/notifications/pkg/service/service.go +++ b/services/notifications/pkg/service/service.go @@ -4,8 +4,6 @@ import ( "context" "errors" "fmt" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - "go-micro.dev/v4/store" "net/url" "os" "os/signal" @@ -13,6 +11,9 @@ import ( "strings" "syscall" + ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + "go-micro.dev/v4/store" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -22,8 +23,6 @@ import ( "go-micro.dev/v4/metadata" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/middleware" @@ -31,6 +30,8 @@ import ( "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" "github.com/owncloud/ocis/v2/services/notifications/pkg/email" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) // validate is the package level validator instance diff --git a/services/notifications/pkg/service/service_test.go b/services/notifications/pkg/service/service_test.go index 30657c0e7e9..e91c0f01faf 100644 --- a/services/notifications/pkg/service/service_test.go +++ b/services/notifications/pkg/service/service_test.go @@ -4,34 +4,36 @@ import ( "context" "encoding/json" "fmt" + "reflect" + "strings" + group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" - "github.com/cs3org/reva/v2/pkg/store" ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" ehmocks "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0/mocks" settingsmocks "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0/mocks" - "reflect" - "strings" + "github.com/owncloud/reva/v2/pkg/store" microstore "go-micro.dev/v4/store" - storemocks "go-micro.dev/v4/store/mocks" "time" + storemocks "go-micro.dev/v4/store/mocks" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/ocis-pkg/log" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "go-micro.dev/v4/client" "google.golang.org/grpc" diff --git a/services/notifications/pkg/service/shares.go b/services/notifications/pkg/service/shares.go index bcafac297e1..57a81916b52 100644 --- a/services/notifications/pkg/service/shares.go +++ b/services/notifications/pkg/service/shares.go @@ -2,11 +2,12 @@ package service import ( "context" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/services/notifications/pkg/email" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/rs/zerolog" "google.golang.org/protobuf/types/known/fieldmaskpb" ) diff --git a/services/notifications/pkg/service/spaces.go b/services/notifications/pkg/service/spaces.go index 8607acbafde..2ffc4f6ef4b 100644 --- a/services/notifications/pkg/service/spaces.go +++ b/services/notifications/pkg/service/spaces.go @@ -2,12 +2,13 @@ package service import ( "context" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/services/notifications/pkg/email" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/services/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go index e6eaaf4c71f..3f362b0fa46 100644 --- a/services/ocdav/pkg/command/server.go +++ b/services/ocdav/pkg/command/server.go @@ -4,8 +4,6 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/micro/ocdav" - "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/broker" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -16,6 +14,8 @@ import ( "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/parser" "github.com/owncloud/ocis/v2/services/ocdav/pkg/logging" "github.com/owncloud/ocis/v2/services/ocdav/pkg/server/debug" + "github.com/owncloud/reva/v2/pkg/micro/ocdav" + "github.com/owncloud/reva/v2/pkg/sharedconf" "github.com/urfave/cli/v2" ) diff --git a/services/ocm/pkg/command/server.go b/services/ocm/pkg/command/server.go index 3b8dd053b04..88d7ea5cc9b 100644 --- a/services/ocm/pkg/command/server.go +++ b/services/ocm/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/ocm/pkg/logging" "github.com/owncloud/ocis/v2/services/ocm/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/ocm/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/ocs/pkg/server/http/server.go b/services/ocs/pkg/server/http/server.go index eba4c071901..e305603e114 100644 --- a/services/ocs/pkg/server/http/server.go +++ b/services/ocs/pkg/server/http/server.go @@ -2,13 +2,14 @@ package http import ( "fmt" - "github.com/cs3org/reva/v2/pkg/store" + chimiddleware "github.com/go-chi/chi/v5/middleware" "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" svc "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0" + "github.com/owncloud/reva/v2/pkg/store" "go-micro.dev/v4" microstore "go-micro.dev/v4/store" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" diff --git a/services/ocs/pkg/service/v0/users.go b/services/ocs/pkg/service/v0/users.go index 190e9bccd4c..ddbb36413fe 100644 --- a/services/ocs/pkg/service/v0/users.go +++ b/services/ocs/pkg/service/v0/users.go @@ -6,9 +6,9 @@ import ( "errors" "net/http" - revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/response" + revactx "github.com/owncloud/reva/v2/pkg/ctx" "go-micro.dev/v4/store" ) diff --git a/services/policies/pkg/command/server.go b/services/policies/pkg/command/server.go index 832909400ea..7fcd5ec7397 100644 --- a/services/policies/pkg/command/server.go +++ b/services/policies/pkg/command/server.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events/stream" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/policies/pkg/engine/opa/rf_resource.go b/services/policies/pkg/engine/opa/rf_resource.go index 9ff1d0ba1ee..d04e0530cd4 100644 --- a/services/policies/pkg/engine/opa/rf_resource.go +++ b/services/policies/pkg/engine/opa/rf_resource.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/open-policy-agent/opa/ast" "github.com/open-policy-agent/opa/rego" "github.com/open-policy-agent/opa/types" + "github.com/owncloud/reva/v2/pkg/rhttp" ) // RFResourceDownload extends the rego dictionary with the possibility to download oCis resources. diff --git a/services/policies/pkg/service/event/service.go b/services/policies/pkg/service/event/service.go index 756b360a900..2474751db17 100644 --- a/services/policies/pkg/service/event/service.go +++ b/services/policies/pkg/service/event/service.go @@ -3,9 +3,9 @@ package eventSVC import ( "context" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/policies/pkg/engine" + "github.com/owncloud/reva/v2/pkg/events" "go.opentelemetry.io/otel/trace" ) diff --git a/services/postprocessing/pkg/command/postprocessing.go b/services/postprocessing/pkg/command/postprocessing.go index 74af6581fad..e83f746759d 100644 --- a/services/postprocessing/pkg/command/postprocessing.go +++ b/services/postprocessing/pkg/command/postprocessing.go @@ -3,12 +3,12 @@ package command import ( "context" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/parser" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/urfave/cli/v2" ) diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go index ef47a3bebee..2713b86badf 100644 --- a/services/postprocessing/pkg/command/server.go +++ b/services/postprocessing/pkg/command/server.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/store" "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" diff --git a/services/postprocessing/pkg/config/parser/parse.go b/services/postprocessing/pkg/config/parser/parse.go index e10e15291a2..15b89953dc7 100644 --- a/services/postprocessing/pkg/config/parser/parse.go +++ b/services/postprocessing/pkg/config/parser/parse.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/cs3org/reva/v2/pkg/events" ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults" + "github.com/owncloud/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" ) diff --git a/services/postprocessing/pkg/postprocessing/postprocessing.go b/services/postprocessing/pkg/postprocessing/postprocessing.go index f5274e98751..aca4ea3e86d 100644 --- a/services/postprocessing/pkg/postprocessing/postprocessing.go +++ b/services/postprocessing/pkg/postprocessing/postprocessing.go @@ -6,8 +6,8 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" ) // Postprocessing handles postprocessing of a file diff --git a/services/postprocessing/pkg/service/service.go b/services/postprocessing/pkg/service/service.go index 0628fd73f17..c5c293b65ec 100644 --- a/services/postprocessing/pkg/service/service.go +++ b/services/postprocessing/pkg/service/service.go @@ -8,12 +8,12 @@ import ( "sync" "time" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" "github.com/owncloud/ocis/v2/services/postprocessing/pkg/postprocessing" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go index 964e718bf80..1e8e8afdbcf 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -8,10 +8,6 @@ import ( "time" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/store" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" "github.com/oklog/run" @@ -37,6 +33,10 @@ import ( "github.com/owncloud/ocis/v2/services/proxy/pkg/staticroutes" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/store" "github.com/urfave/cli/v2" "go-micro.dev/v4/selector" microstore "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/middleware/account_resolver.go b/services/proxy/pkg/middleware/account_resolver.go index 422d067ed85..e808d3867cf 100644 --- a/services/proxy/pkg/middleware/account_resolver.go +++ b/services/proxy/pkg/middleware/account_resolver.go @@ -10,11 +10,11 @@ import ( "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" ) // AccountResolver provides a middleware which mints a jwt and adds it to the proxied request based diff --git a/services/proxy/pkg/middleware/account_resolver_test.go b/services/proxy/pkg/middleware/account_resolver_test.go index e83c5f7c554..0f2771bd3b4 100644 --- a/services/proxy/pkg/middleware/account_resolver_test.go +++ b/services/proxy/pkg/middleware/account_resolver_test.go @@ -7,14 +7,14 @@ import ( "testing" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "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/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/mocks" userRoleMocks "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles/mocks" + "github.com/owncloud/reva/v2/pkg/auth/scope" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/token/manager/jwt" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/proxy/pkg/middleware/app_auth.go b/services/proxy/pkg/middleware/app_auth.go index b828af4b48e..b63e5430aae 100644 --- a/services/proxy/pkg/middleware/app_auth.go +++ b/services/proxy/pkg/middleware/app_auth.go @@ -5,9 +5,9 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) // AppAuthAuthenticator defines the app auth authenticator diff --git a/services/proxy/pkg/middleware/app_auth_test.go b/services/proxy/pkg/middleware/app_auth_test.go index 79d857019f8..16bf1e6fb31 100644 --- a/services/proxy/pkg/middleware/app_auth_test.go +++ b/services/proxy/pkg/middleware/app_auth_test.go @@ -6,7 +6,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "google.golang.org/grpc" . "github.com/onsi/ginkgo/v2" diff --git a/services/proxy/pkg/middleware/authentication_test.go b/services/proxy/pkg/middleware/authentication_test.go index 4b15deb591b..f0db8affce1 100644 --- a/services/proxy/pkg/middleware/authentication_test.go +++ b/services/proxy/pkg/middleware/authentication_test.go @@ -9,7 +9,6 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/golang-jwt/jwt/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -19,6 +18,7 @@ import ( "github.com/owncloud/ocis/v2/services/proxy/pkg/router" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/mocks" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/stretchr/testify/mock" "go-micro.dev/v4/store" "google.golang.org/grpc" diff --git a/services/proxy/pkg/middleware/create_home.go b/services/proxy/pkg/middleware/create_home.go index e1327d2d196..a71f3825354 100644 --- a/services/proxy/pkg/middleware/create_home.go +++ b/services/proxy/pkg/middleware/create_home.go @@ -8,12 +8,12 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" 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/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" ) diff --git a/services/proxy/pkg/middleware/options.go b/services/proxy/pkg/middleware/options.go index 90b60c45b45..2e993e8f186 100644 --- a/services/proxy/pkg/middleware/options.go +++ b/services/proxy/pkg/middleware/options.go @@ -5,8 +5,6 @@ import ( "time" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" policiessvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" @@ -14,6 +12,8 @@ import ( "github.com/owncloud/ocis/v2/services/proxy/pkg/config" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/proxy/pkg/middleware/policies.go b/services/proxy/pkg/middleware/policies.go index 4861df01051..32fb92408df 100644 --- a/services/proxy/pkg/middleware/policies.go +++ b/services/proxy/pkg/middleware/policies.go @@ -13,9 +13,9 @@ import ( tusd "github.com/tus/tusd/v2/pkg/handler" "google.golang.org/grpc/metadata" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" pService "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" diff --git a/services/proxy/pkg/middleware/policies_test.go b/services/proxy/pkg/middleware/policies_test.go index 33e95f379b2..2853dd90020 100644 --- a/services/proxy/pkg/middleware/policies_test.go +++ b/services/proxy/pkg/middleware/policies_test.go @@ -11,14 +11,14 @@ import ( "testing" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/gomega" pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" policiesPG "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0/mocks" "github.com/owncloud/ocis/v2/services/proxy/pkg/middleware" "github.com/owncloud/ocis/v2/services/webdav/pkg/net" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "go-micro.dev/v4/client" "google.golang.org/grpc" diff --git a/services/proxy/pkg/middleware/public_share_auth.go b/services/proxy/pkg/middleware/public_share_auth.go index c7468d6bbcc..2380b8a8c2f 100644 --- a/services/proxy/pkg/middleware/public_share_auth.go +++ b/services/proxy/pkg/middleware/public_share_auth.go @@ -5,8 +5,8 @@ import ( "strings" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) const ( diff --git a/services/proxy/pkg/middleware/public_share_auth_test.go b/services/proxy/pkg/middleware/public_share_auth_test.go index 9f748c4ed19..7283f43908c 100644 --- a/services/proxy/pkg/middleware/public_share_auth_test.go +++ b/services/proxy/pkg/middleware/public_share_auth_test.go @@ -8,10 +8,10 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "google.golang.org/grpc" ) diff --git a/services/proxy/pkg/middleware/signed_url_auth.go b/services/proxy/pkg/middleware/signed_url_auth.go index 431b8a36e51..776bb0080c4 100644 --- a/services/proxy/pkg/middleware/signed_url_auth.go +++ b/services/proxy/pkg/middleware/signed_url_auth.go @@ -10,11 +10,11 @@ import ( "strings" "time" - revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + revactx "github.com/owncloud/reva/v2/pkg/ctx" microstore "go-micro.dev/v4/store" "golang.org/x/crypto/pbkdf2" ) diff --git a/services/proxy/pkg/middleware/signed_url_auth_test.go b/services/proxy/pkg/middleware/signed_url_auth_test.go index dbbea75d62e..58676aecf97 100644 --- a/services/proxy/pkg/middleware/signed_url_auth_test.go +++ b/services/proxy/pkg/middleware/signed_url_auth_test.go @@ -7,8 +7,8 @@ import ( "time" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + revactx "github.com/owncloud/reva/v2/pkg/ctx" "github.com/stretchr/testify/assert" "go-micro.dev/v4/store" ) diff --git a/services/proxy/pkg/proxy/policy/selector.go b/services/proxy/pkg/proxy/policy/selector.go index bd69aa237b6..ff41226af6a 100644 --- a/services/proxy/pkg/proxy/policy/selector.go +++ b/services/proxy/pkg/proxy/policy/selector.go @@ -6,9 +6,9 @@ import ( "regexp" "sort" - revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + revactx "github.com/owncloud/reva/v2/pkg/ctx" ) var ( diff --git a/services/proxy/pkg/proxy/policy/selector_test.go b/services/proxy/pkg/proxy/policy/selector_test.go index 675a61e42e9..5740ff986eb 100644 --- a/services/proxy/pkg/proxy/policy/selector_test.go +++ b/services/proxy/pkg/proxy/policy/selector_test.go @@ -7,9 +7,9 @@ import ( "testing" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + revactx "github.com/owncloud/reva/v2/pkg/ctx" ) func TestLoadSelector(t *testing.T) { diff --git a/services/proxy/pkg/staticroutes/backchannellogout.go b/services/proxy/pkg/staticroutes/backchannellogout.go index f371fbc2f63..bd7eb79a663 100644 --- a/services/proxy/pkg/staticroutes/backchannellogout.go +++ b/services/proxy/pkg/staticroutes/backchannellogout.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/render" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/pkg/errors" "github.com/shamaton/msgpack/v2" microstore "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/staticroutes/staticroutes.go b/services/proxy/pkg/staticroutes/staticroutes.go index 143503b791f..885f2b04518 100644 --- a/services/proxy/pkg/staticroutes/staticroutes.go +++ b/services/proxy/pkg/staticroutes/staticroutes.go @@ -3,12 +3,12 @@ package staticroutes import ( "net/http" - "github.com/cs3org/reva/v2/pkg/events" "github.com/go-chi/chi/v5" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" + "github.com/owncloud/reva/v2/pkg/events" microstore "go-micro.dev/v4/store" ) diff --git a/services/proxy/pkg/user/backend/cs3.go b/services/proxy/pkg/user/backend/cs3.go index a1021bc4b9a..47460cfe409 100644 --- a/services/proxy/pkg/user/backend/cs3.go +++ b/services/proxy/pkg/user/backend/cs3.go @@ -11,14 +11,14 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - utils "github.com/cs3org/reva/v2/pkg/utils" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + utils "github.com/owncloud/reva/v2/pkg/utils" "go-micro.dev/v4/selector" ) diff --git a/services/proxy/pkg/userroles/defaultrole.go b/services/proxy/pkg/userroles/defaultrole.go index 3ecf03e6ac6..c5f3a092c87 100644 --- a/services/proxy/pkg/userroles/defaultrole.go +++ b/services/proxy/pkg/userroles/defaultrole.go @@ -4,10 +4,10 @@ import ( "context" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/middleware" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" settingsService "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + "github.com/owncloud/reva/v2/pkg/utils" "go-micro.dev/v4/metadata" ) diff --git a/services/proxy/pkg/userroles/oidcroles.go b/services/proxy/pkg/userroles/oidcroles.go index edc1ad327f8..0997271be2d 100644 --- a/services/proxy/pkg/userroles/oidcroles.go +++ b/services/proxy/pkg/userroles/oidcroles.go @@ -7,10 +7,10 @@ import ( "time" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/middleware" "github.com/owncloud/ocis/v2/ocis-pkg/oidc" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/reva/v2/pkg/utils" "go-micro.dev/v4/metadata" ) diff --git a/services/proxy/pkg/userroles/userroles.go b/services/proxy/pkg/userroles/userroles.go index c8e51f54e8f..ba86f6f0ee1 100644 --- a/services/proxy/pkg/userroles/userroles.go +++ b/services/proxy/pkg/userroles/userroles.go @@ -5,10 +5,10 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) // UserRoleAssigner allows providing different implementations for how users get their default roles diff --git a/services/search/pkg/content/basic.go b/services/search/pkg/content/basic.go index 42e2952200d..74b0e337f90 100644 --- a/services/search/pkg/content/basic.go +++ b/services/search/pkg/content/basic.go @@ -5,9 +5,9 @@ import ( "time" storageProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/tags" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/reva/v2/pkg/tags" + "github.com/owncloud/reva/v2/pkg/utils" ) // Basic is the simplest Extractor implementation. diff --git a/services/search/pkg/content/cs3.go b/services/search/pkg/content/cs3.go index 4a90e85a964..fb87592faa5 100644 --- a/services/search/pkg/content/cs3.go +++ b/services/search/pkg/content/cs3.go @@ -10,9 +10,9 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" 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/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) type cs3 struct { diff --git a/services/search/pkg/content/tika.go b/services/search/pkg/content/tika.go index 5db7476c885..d98a6a724f1 100644 --- a/services/search/pkg/content/tika.go +++ b/services/search/pkg/content/tika.go @@ -10,8 +10,8 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/google/go-tika/tika" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/search/pkg/engine/bleve.go b/services/search/pkg/engine/bleve.go index b5170ac7ae6..c6f765b5db5 100644 --- a/services/search/pkg/engine/bleve.go +++ b/services/search/pkg/engine/bleve.go @@ -22,9 +22,9 @@ import ( storageProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/cs3org/reva/v2/pkg/errtypes" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/errtypes" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" libregraph "github.com/owncloud/libre-graph-api-go" diff --git a/services/search/pkg/engine/bleve_test.go b/services/search/pkg/engine/bleve_test.go index 1023ee8da0c..7209487a5d0 100644 --- a/services/search/pkg/engine/bleve_test.go +++ b/services/search/pkg/engine/bleve_test.go @@ -6,9 +6,9 @@ import ( bleveSearch "github.com/blevesearch/bleve/v2" sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/owncloud/reva/v2/pkg/storagespace" libregraph "github.com/owncloud/libre-graph-api-go" searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" diff --git a/services/search/pkg/search/events.go b/services/search/pkg/search/events.go index 0354614c756..b9268461237 100644 --- a/services/search/pkg/search/events.go +++ b/services/search/pkg/search/events.go @@ -4,10 +4,10 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/search/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storagespace" ) // HandleEvents listens to the needed events, diff --git a/services/search/pkg/search/events_test.go b/services/search/pkg/search/events_test.go index db5f56552a6..22159f5fc96 100644 --- a/services/search/pkg/search/events_test.go +++ b/services/search/pkg/search/events_test.go @@ -5,13 +5,13 @@ import ( "sync/atomic" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/search/pkg/config" "github.com/owncloud/ocis/v2/services/search/pkg/search" searchMocks "github.com/owncloud/ocis/v2/services/search/pkg/search/mocks" + "github.com/owncloud/reva/v2/pkg/events" "github.com/stretchr/testify/mock" mEvents "go-micro.dev/v4/events" ) diff --git a/services/search/pkg/search/search.go b/services/search/pkg/search/search.go index 2e97ba65bb3..6c45f9c7a80 100644 --- a/services/search/pkg/search/search.go +++ b/services/search/pkg/search/search.go @@ -10,10 +10,10 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/conversions" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storage/utils/grants" - "github.com/cs3org/reva/v2/pkg/utils" + "github.com/owncloud/reva/v2/pkg/conversions" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storage/utils/grants" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/log" searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" diff --git a/services/search/pkg/search/service.go b/services/search/pkg/search/service.go index 5f74ea56093..e1ce904a8dd 100644 --- a/services/search/pkg/search/service.go +++ b/services/search/pkg/search/service.go @@ -14,13 +14,13 @@ import ( rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" collaborationv1beta1 "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/errtypes" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - sdk "github.com/cs3org/reva/v2/pkg/sdk/common" - "github.com/cs3org/reva/v2/pkg/storage/utils/walker" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/errtypes" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + sdk "github.com/owncloud/reva/v2/pkg/sdk/common" + "github.com/owncloud/reva/v2/pkg/storage/utils/walker" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/fieldmaskpb" diff --git a/services/search/pkg/search/service_test.go b/services/search/pkg/search/service_test.go index b8ab269b743..35ce4ea7b7c 100644 --- a/services/search/pkg/search/service_test.go +++ b/services/search/pkg/search/service_test.go @@ -8,10 +8,6 @@ import ( collaborationv1beta1 "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/ocis-pkg/log" @@ -22,6 +18,10 @@ import ( contentMocks "github.com/owncloud/ocis/v2/services/search/pkg/content/mocks" engineMocks "github.com/owncloud/ocis/v2/services/search/pkg/engine/mocks" "github.com/owncloud/ocis/v2/services/search/pkg/search" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/search/pkg/service/grpc/v0/service.go b/services/search/pkg/service/grpc/v0/service.go index 88cb5c16ab3..da6bf40d797 100644 --- a/services/search/pkg/service/grpc/v0/service.go +++ b/services/search/pkg/service/grpc/v0/service.go @@ -10,14 +10,14 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/errtypes" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "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/jellydator/ttlcache/v2" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/errtypes" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/token" + "github.com/owncloud/reva/v2/pkg/token/manager/jwt" + "github.com/owncloud/reva/v2/pkg/utils" merrors "go-micro.dev/v4/errors" "go-micro.dev/v4/metadata" grpcmetadata "google.golang.org/grpc/metadata" diff --git a/services/settings/pkg/service/v0/service.go b/services/settings/pkg/service/v0/service.go index cc53fabda8a..d8b43e6503a 100644 --- a/services/settings/pkg/service/v0/service.go +++ b/services/settings/pkg/service/v0/service.go @@ -9,8 +9,6 @@ import ( cs3permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/leonelquinteros/gotext" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" "github.com/owncloud/ocis/v2/ocis-pkg/log" @@ -22,6 +20,8 @@ import ( "github.com/owncloud/ocis/v2/services/settings/pkg/settings" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" metastore "github.com/owncloud/ocis/v2/services/settings/pkg/store/metadata" + ctxpkg "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" merrors "go-micro.dev/v4/errors" "go-micro.dev/v4/metadata" "google.golang.org/protobuf/types/known/emptypb" diff --git a/services/settings/pkg/store/metadata/assignments.go b/services/settings/pkg/store/metadata/assignments.go index 61490e8e0fc..5628b09f48b 100644 --- a/services/settings/pkg/store/metadata/assignments.go +++ b/services/settings/pkg/store/metadata/assignments.go @@ -6,11 +6,11 @@ import ( "encoding/json" "fmt" - "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/gofrs/uuid" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/settings" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/errtypes" ) // ListRoleAssignments loads and returns all role assignments matching the given assignment identifier. diff --git a/services/settings/pkg/store/metadata/bundles.go b/services/settings/pkg/store/metadata/bundles.go index ff634e7cadc..c132d7f960f 100644 --- a/services/settings/pkg/store/metadata/bundles.go +++ b/services/settings/pkg/store/metadata/bundles.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/gofrs/uuid" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/settings" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/errtypes" ) // ListBundles returns all bundles in the dataPath folder that match the given type. diff --git a/services/settings/pkg/store/metadata/cache.go b/services/settings/pkg/store/metadata/cache.go index aca47f06d27..3f365e8e466 100644 --- a/services/settings/pkg/store/metadata/cache.go +++ b/services/settings/pkg/store/metadata/cache.go @@ -4,9 +4,9 @@ import ( "context" "path" - "github.com/cs3org/reva/v2/pkg/store" olog "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/settings/pkg/config" + "github.com/owncloud/reva/v2/pkg/store" "github.com/shamaton/msgpack/v2" microstore "go-micro.dev/v4/store" ) diff --git a/services/settings/pkg/store/metadata/store.go b/services/settings/pkg/store/metadata/store.go index 3985e84a1d4..c195aedad5e 100644 --- a/services/settings/pkg/store/metadata/store.go +++ b/services/settings/pkg/store/metadata/store.go @@ -7,14 +7,14 @@ import ( "log" "sync" - "github.com/cs3org/reva/v2/pkg/errtypes" - "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/gofrs/uuid" olog "github.com/owncloud/ocis/v2/ocis-pkg/log" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/config" "github.com/owncloud/ocis/v2/services/settings/pkg/settings" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/errtypes" + "github.com/owncloud/reva/v2/pkg/storage/utils/metadata" ) var ( diff --git a/services/settings/pkg/store/metadata/store_test.go b/services/settings/pkg/store/metadata/store_test.go index e204618f27a..c66b55c23f0 100644 --- a/services/settings/pkg/store/metadata/store_test.go +++ b/services/settings/pkg/store/metadata/store_test.go @@ -6,11 +6,11 @@ import ( "strings" "testing" - "github.com/cs3org/reva/v2/pkg/errtypes" . "github.com/onsi/gomega" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults" rdefaults "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/errtypes" ) const ( diff --git a/services/settings/pkg/store/metadata/values.go b/services/settings/pkg/store/metadata/values.go index c40f859fa73..2c966c678b9 100644 --- a/services/settings/pkg/store/metadata/values.go +++ b/services/settings/pkg/store/metadata/values.go @@ -6,10 +6,10 @@ import ( "encoding/json" "fmt" - "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/gofrs/uuid" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/settings" + "github.com/owncloud/reva/v2/pkg/errtypes" ) // ListValues reads all values that match the given bundleId and accountUUID. diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go index 6d69dd9bd8e..e9e71f66702 100644 --- a/services/sharing/pkg/command/server.go +++ b/services/sharing/pkg/command/server.go @@ -7,7 +7,6 @@ import ( "path" "path/filepath" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -19,6 +18,7 @@ import ( "github.com/owncloud/ocis/v2/services/sharing/pkg/logging" "github.com/owncloud/ocis/v2/services/sharing/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/sharing/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/sse/pkg/command/server.go b/services/sse/pkg/command/server.go index 722eb3970db..a48b128f609 100644 --- a/services/sse/pkg/command/server.go +++ b/services/sse/pkg/command/server.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/sse/pkg/server/http/option.go b/services/sse/pkg/server/http/option.go index 3640ba9ea90..8b6aca9a088 100644 --- a/services/sse/pkg/server/http/option.go +++ b/services/sse/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/sse/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" "go.opentelemetry.io/otel/trace" ) diff --git a/services/sse/pkg/server/http/server.go b/services/sse/pkg/server/http/server.go index a70f6b66b7a..3173fbc6239 100644 --- a/services/sse/pkg/server/http/server.go +++ b/services/sse/pkg/server/http/server.go @@ -5,7 +5,6 @@ import ( stdhttp "net/http" - "github.com/cs3org/reva/v2/pkg/events" "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/google/uuid" @@ -16,6 +15,7 @@ import ( "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "github.com/owncloud/ocis/v2/ocis-pkg/version" svc "github.com/owncloud/ocis/v2/services/sse/pkg/service" + "github.com/owncloud/reva/v2/pkg/events" "github.com/riandyrn/otelchi" "go-micro.dev/v4" ) diff --git a/services/sse/pkg/service/service.go b/services/sse/pkg/service/service.go index df94316acbc..b06c55d7e31 100644 --- a/services/sse/pkg/service/service.go +++ b/services/sse/pkg/service/service.go @@ -7,8 +7,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/r3labs/sse/v2" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/events" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/sse/pkg/config" diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go index 0da457507e5..57a27a3630a 100644 --- a/services/storage-publiclink/pkg/command/server.go +++ b/services/storage-publiclink/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/logging" "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go index 9dd2c525cb8..fb016952136 100644 --- a/services/storage-shares/pkg/command/server.go +++ b/services/storage-shares/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -18,6 +17,7 @@ import ( "github.com/owncloud/ocis/v2/services/storage-shares/pkg/logging" "github.com/owncloud/ocis/v2/services/storage-shares/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/storage-shares/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go index 6afe0878c1c..b4819b53bfb 100644 --- a/services/storage-system/pkg/command/server.go +++ b/services/storage-system/pkg/command/server.go @@ -6,9 +6,9 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go index 1673e301324..c3b8d87c76c 100644 --- a/services/storage-users/pkg/command/server.go +++ b/services/storage-users/pkg/command/server.go @@ -6,8 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -20,6 +18,8 @@ import ( "github.com/owncloud/ocis/v2/services/storage-users/pkg/logging" "github.com/owncloud/ocis/v2/services/storage-users/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/storage-users/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" ) diff --git a/services/storage-users/pkg/command/trash_bin.go b/services/storage-users/pkg/command/trash_bin.go index f641c8b6089..d3c0d3dfffe 100644 --- a/services/storage-users/pkg/command/trash_bin.go +++ b/services/storage-users/pkg/command/trash_bin.go @@ -13,10 +13,6 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/mohae/deepcopy" tw "github.com/olekukonko/tablewriter" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -24,6 +20,10 @@ import ( "github.com/owncloud/ocis/v2/services/storage-users/pkg/config" "github.com/owncloud/ocis/v2/services/storage-users/pkg/config/parser" "github.com/owncloud/ocis/v2/services/storage-users/pkg/event" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/rs/zerolog" "github.com/urfave/cli/v2" ) diff --git a/services/storage-users/pkg/command/uploads.go b/services/storage-users/pkg/command/uploads.go index 2e18a484606..29275bc96bd 100644 --- a/services/storage-users/pkg/command/uploads.go +++ b/services/storage-users/pkg/command/uploads.go @@ -13,15 +13,15 @@ import ( "github.com/urfave/cli/v2" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/storage" - "github.com/cs3org/reva/v2/pkg/storage/fs/registry" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" "github.com/owncloud/ocis/v2/services/storage-users/pkg/config" "github.com/owncloud/ocis/v2/services/storage-users/pkg/config/parser" "github.com/owncloud/ocis/v2/services/storage-users/pkg/event" "github.com/owncloud/ocis/v2/services/storage-users/pkg/revaconfig" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/storage" + "github.com/owncloud/reva/v2/pkg/storage/fs/registry" + "github.com/owncloud/reva/v2/pkg/utils" ) // Session contains the information of an upload session diff --git a/services/storage-users/pkg/command/uploads_test.go b/services/storage-users/pkg/command/uploads_test.go index 4d638eaecab..4c6229e4fe8 100644 --- a/services/storage-users/pkg/command/uploads_test.go +++ b/services/storage-users/pkg/command/uploads_test.go @@ -3,7 +3,7 @@ package command import ( "testing" - "github.com/cs3org/reva/v2/pkg/storage" + "github.com/owncloud/reva/v2/pkg/storage" "github.com/test-go/testify/require" ) diff --git a/services/storage-users/pkg/event/event.go b/services/storage-users/pkg/event/event.go index 44d2c1c9bda..48c2124fff4 100644 --- a/services/storage-users/pkg/event/event.go +++ b/services/storage-users/pkg/event/event.go @@ -1,8 +1,8 @@ package event import ( - "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/owncloud/ocis/v2/services/storage-users/pkg/config" + "github.com/owncloud/reva/v2/pkg/events/stream" "go-micro.dev/v4/events" ) diff --git a/services/storage-users/pkg/event/service.go b/services/storage-users/pkg/event/service.go index eb547bbf9d2..f0b29108d0d 100644 --- a/services/storage-users/pkg/event/service.go +++ b/services/storage-users/pkg/event/service.go @@ -5,11 +5,11 @@ import ( "time" apiGateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/storage-users/pkg/config" "github.com/owncloud/ocis/v2/services/storage-users/pkg/task" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) const ( diff --git a/services/storage-users/pkg/task/trash_bin.go b/services/storage-users/pkg/task/trash_bin.go index 7cccf4032c5..fbce1f6f939 100644 --- a/services/storage-users/pkg/task/trash_bin.go +++ b/services/storage-users/pkg/task/trash_bin.go @@ -6,9 +6,9 @@ import ( apiGateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" apiRpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" apiProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "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/reva/v2/pkg/errtypes" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" ) // PurgeTrashBin can be used to purge space trash-bin's, diff --git a/services/storage-users/pkg/task/trash_bin_test.go b/services/storage-users/pkg/task/trash_bin_test.go index 009b3c15119..8ae106fb25a 100644 --- a/services/storage-users/pkg/task/trash_bin_test.go +++ b/services/storage-users/pkg/task/trash_bin_test.go @@ -12,13 +12,13 @@ import ( apiRpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" apiProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" apiTypes "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/owncloud/ocis/v2/services/storage-users/pkg/task" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/thumbnails/pkg/server/grpc/server.go b/services/thumbnails/pkg/server/grpc/server.go index 3e627b6c220..8f5e440fb8a 100644 --- a/services/thumbnails/pkg/server/grpc/server.go +++ b/services/thumbnails/pkg/server/grpc/server.go @@ -1,8 +1,6 @@ package grpc import ( - "github.com/cs3org/reva/v2/pkg/bytesize" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/registry" "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc/handler/ratelimiter" @@ -12,6 +10,8 @@ import ( "github.com/owncloud/ocis/v2/services/thumbnails/pkg/service/grpc/v0/decorators" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/imgsource" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/reva/v2/pkg/bytesize" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) // NewService initializes the grpc service and server. diff --git a/services/thumbnails/pkg/service/grpc/v0/option.go b/services/thumbnails/pkg/service/grpc/v0/option.go index 07c1556e41b..51c6c69bb51 100644 --- a/services/thumbnails/pkg/service/grpc/v0/option.go +++ b/services/thumbnails/pkg/service/grpc/v0/option.go @@ -4,11 +4,11 @@ import ( "net/http" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/imgsource" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/storage" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" ) // Option defines a single option function. diff --git a/services/thumbnails/pkg/service/grpc/v0/service.go b/services/thumbnails/pkg/service/grpc/v0/service.go index d2909c16152..12140247dc2 100644 --- a/services/thumbnails/pkg/service/grpc/v0/service.go +++ b/services/thumbnails/pkg/service/grpc/v0/service.go @@ -11,11 +11,11 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" 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/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/golang-jwt/jwt/v5" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/pkg/errors" merrors "go-micro.dev/v4/errors" "google.golang.org/grpc/metadata" diff --git a/services/thumbnails/pkg/thumbnail/imgsource/cs3.go b/services/thumbnails/pkg/thumbnail/imgsource/cs3.go index 124685f9b6e..bf78a2bf168 100644 --- a/services/thumbnails/pkg/thumbnail/imgsource/cs3.go +++ b/services/thumbnails/pkg/thumbnail/imgsource/cs3.go @@ -10,19 +10,19 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/bytesize" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/rhttp" - "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/errors" + "github.com/owncloud/reva/v2/pkg/bytesize" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/rhttp" + "github.com/owncloud/reva/v2/pkg/storagespace" "google.golang.org/grpc/metadata" ) const ( // TokenTransportHeader holds the header key for the reva transfer token - // "github.com/cs3org/reva/v2/internal/http/services/datagateway" is internal so we redeclare it here + // "github.com/owncloud/reva/v2/internal/http/services/datagateway" is internal so we redeclare it here TokenTransportHeader = "X-Reva-Transfer" ) diff --git a/services/thumbnails/pkg/thumbnail/imgsource/webdav.go b/services/thumbnails/pkg/thumbnail/imgsource/webdav.go index d81383cab24..4e9e019f598 100644 --- a/services/thumbnails/pkg/thumbnail/imgsource/webdav.go +++ b/services/thumbnails/pkg/thumbnail/imgsource/webdav.go @@ -11,9 +11,9 @@ import ( "net/http" "strconv" - "github.com/cs3org/reva/v2/pkg/bytesize" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" thumbnailerErrors "github.com/owncloud/ocis/v2/services/thumbnails/pkg/errors" + "github.com/owncloud/reva/v2/pkg/bytesize" "github.com/pkg/errors" ) diff --git a/services/userlog/pkg/command/server.go b/services/userlog/pkg/command/server.go index 314d6c24090..ad915611043 100644 --- a/services/userlog/pkg/command/server.go +++ b/services/userlog/pkg/command/server.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/events/stream" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/store" "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" diff --git a/services/userlog/pkg/server/http/option.go b/services/userlog/pkg/server/http/option.go index 44443d57bd4..0c7e7f2c007 100644 --- a/services/userlog/pkg/server/http/option.go +++ b/services/userlog/pkg/server/http/option.go @@ -4,13 +4,13 @@ import ( "context" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/log" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/userlog/pkg/config" "github.com/owncloud/ocis/v2/services/userlog/pkg/metrics" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/urfave/cli/v2" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" diff --git a/services/userlog/pkg/service/conversion.go b/services/userlog/pkg/service/conversion.go index f60f30cc801..d3de5cea977 100644 --- a/services/userlog/pkg/service/conversion.go +++ b/services/userlog/pkg/service/conversion.go @@ -14,11 +14,11 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/l10n" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" ) //go:embed l10n/locale diff --git a/services/userlog/pkg/service/filter.go b/services/userlog/pkg/service/filter.go index 94963678b4d..2236b98e271 100644 --- a/services/userlog/pkg/service/filter.go +++ b/services/userlog/pkg/service/filter.go @@ -3,12 +3,13 @@ package service import ( "context" "errors" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/ocis-pkg/middleware" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/owncloud/reva/v2/pkg/events" micrometadata "go-micro.dev/v4/metadata" ) diff --git a/services/userlog/pkg/service/filter_test.go b/services/userlog/pkg/service/filter_test.go index 1f8c9e4d1bb..8ba52be67a0 100644 --- a/services/userlog/pkg/service/filter_test.go +++ b/services/userlog/pkg/service/filter_test.go @@ -2,15 +2,16 @@ package service import ( "context" + "testing" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/v2/ocis-pkg/log" settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/owncloud/reva/v2/pkg/events" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" - "testing" ) var testLogger = log.NewLogger() diff --git a/services/userlog/pkg/service/http.go b/services/userlog/pkg/service/http.go index 6f8eacf81ec..27181e2bfa8 100644 --- a/services/userlog/pkg/service/http.go +++ b/services/userlog/pkg/service/http.go @@ -6,12 +6,12 @@ import ( "errors" "net/http" - "github.com/cs3org/reva/v2/pkg/appctx" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/ocis-pkg/roles" "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" settings "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + "github.com/owncloud/reva/v2/pkg/appctx" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/utils" "go.opentelemetry.io/otel/attribute" ) diff --git a/services/userlog/pkg/service/options.go b/services/userlog/pkg/service/options.go index 9cd9f97ec01..f2d32f9798e 100644 --- a/services/userlog/pkg/service/options.go +++ b/services/userlog/pkg/service/options.go @@ -2,13 +2,13 @@ package service import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" "github.com/owncloud/ocis/v2/ocis-pkg/log" ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" "github.com/owncloud/ocis/v2/services/userlog/pkg/config" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/userlog/pkg/service/service.go b/services/userlog/pkg/service/service.go index 8de8432b505..9608742f225 100644 --- a/services/userlog/pkg/service/service.go +++ b/services/userlog/pkg/service/service.go @@ -10,10 +10,10 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/utils" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" diff --git a/services/userlog/pkg/service/service_test.go b/services/userlog/pkg/service/service_test.go index be62e3f5b6b..52f5445782b 100644 --- a/services/userlog/pkg/service/service_test.go +++ b/services/userlog/pkg/service/service_test.go @@ -3,23 +3,24 @@ package service_test import ( "context" "encoding/json" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" "reflect" "time" + settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/events" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/store" - "github.com/cs3org/reva/v2/pkg/utils" - cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" "github.com/go-chi/chi/v5" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/owncloud/reva/v2/pkg/events" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/store" + "github.com/owncloud/reva/v2/pkg/utils" + cs3mocks "github.com/owncloud/reva/v2/tests/cs3mocks/mocks" "github.com/stretchr/testify/mock" "go-micro.dev/v4/client" microevents "go-micro.dev/v4/events" diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go index b12b0e5aca5..4843ae4937e 100644 --- a/services/users/pkg/command/server.go +++ b/services/users/pkg/command/server.go @@ -6,7 +6,6 @@ import ( "os" "path" - "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" @@ -19,6 +18,7 @@ import ( "github.com/owncloud/ocis/v2/services/users/pkg/logging" "github.com/owncloud/ocis/v2/services/users/pkg/revaconfig" "github.com/owncloud/ocis/v2/services/users/pkg/server/debug" + "github.com/owncloud/reva/v2/cmd/revad/runtime" "github.com/urfave/cli/v2" ) diff --git a/services/web/pkg/server/http/server.go b/services/web/pkg/server/http/server.go index 164a020030a..d977770a19f 100644 --- a/services/web/pkg/server/http/server.go +++ b/services/web/pkg/server/http/server.go @@ -4,8 +4,8 @@ import ( "fmt" "path" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" chimiddleware "github.com/go-chi/chi/v5/middleware" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go-micro.dev/v4" "github.com/owncloud/ocis/v2/ocis-pkg/cors" diff --git a/services/web/pkg/service/v0/option.go b/services/web/pkg/service/v0/option.go index ea025e5faa7..7663a5fb111 100644 --- a/services/web/pkg/service/v0/option.go +++ b/services/web/pkg/service/v0/option.go @@ -5,7 +5,7 @@ import ( "net/http" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "go.opentelemetry.io/otel/trace" "github.com/owncloud/ocis/v2/ocis-pkg/log" diff --git a/services/web/pkg/service/v0/service.go b/services/web/pkg/service/v0/service.go index 5b0ff3cd222..7701bbd4702 100644 --- a/services/web/pkg/service/v0/service.go +++ b/services/web/pkg/service/v0/service.go @@ -11,8 +11,8 @@ import ( "time" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/riandyrn/otelchi" "github.com/owncloud/ocis/v2/ocis-pkg/account" diff --git a/services/web/pkg/theme/service.go b/services/web/pkg/theme/service.go index 766bf5a353d..fbbaa422298 100644 --- a/services/web/pkg/theme/service.go +++ b/services/web/pkg/theme/service.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/afero" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/v2/ocis-pkg/x/io/fsx" "github.com/owncloud/ocis/v2/ocis-pkg/x/path/filepathx" diff --git a/services/webdav/pkg/dav/requests/thumbnail.go b/services/webdav/pkg/dav/requests/thumbnail.go index 97ee95acf27..f4c6473ed92 100644 --- a/services/webdav/pkg/dav/requests/thumbnail.go +++ b/services/webdav/pkg/dav/requests/thumbnail.go @@ -8,9 +8,9 @@ import ( "strconv" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/utils" "github.com/owncloud/ocis/v2/services/webdav/pkg/constants" ) diff --git a/services/webdav/pkg/errors/error.go b/services/webdav/pkg/errors/error.go index ba7f9b908ad..4e31f9073c1 100644 --- a/services/webdav/pkg/errors/error.go +++ b/services/webdav/pkg/errors/error.go @@ -6,7 +6,7 @@ import ( "net/http" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/owncloud/reva/v2/pkg/rgrpc/status" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/services/webdav/pkg/service/v0/search.go b/services/webdav/pkg/service/v0/search.go index bca14e170fb..fbefe35f420 100644 --- a/services/webdav/pkg/service/v0/search.go +++ b/services/webdav/pkg/service/v0/search.go @@ -14,16 +14,16 @@ import ( merrors "go-micro.dev/v4/errors" "go-micro.dev/v4/metadata" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/cs3org/reva/v2/pkg/tags" - "github.com/cs3org/reva/v2/pkg/utils" 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/owncloud/ocis/v2/services/webdav/pkg/constants" "github.com/owncloud/ocis/v2/services/webdav/pkg/net" "github.com/owncloud/ocis/v2/services/webdav/pkg/prop" "github.com/owncloud/ocis/v2/services/webdav/pkg/propfind" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/storagespace" + "github.com/owncloud/reva/v2/pkg/tags" + "github.com/owncloud/reva/v2/pkg/utils" ) const ( diff --git a/services/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go index 216e9a37ce6..18122d4c731 100644 --- a/services/webdav/pkg/service/v0/service.go +++ b/services/webdav/pkg/service/v0/service.go @@ -15,11 +15,11 @@ import ( gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/go-chi/chi/v5" "github.com/go-chi/render" + revactx "github.com/owncloud/reva/v2/pkg/ctx" + "github.com/owncloud/reva/v2/pkg/rgrpc/todo/pool" + "github.com/owncloud/reva/v2/pkg/storage/utils/templates" "github.com/riandyrn/otelchi" merrors "go-micro.dev/v4/errors" grpcmetadata "google.golang.org/grpc/metadata"