From 282bc4b128731adf348a39802d88576e19841608 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 3 Mar 2022 13:41:47 +0100 Subject: [PATCH] [build-deps] Release 2.0.0 (#2609) * generate docs * v2.0.0 --- CHANGELOG.md | 745 +++++++++++++++++ RELEASE_DATE | 2 +- VERSION | 2 +- .../activate-statcache.md | 0 .../applockslocked.md | 0 .../cephfs-driver.md | 0 .../change-public-link-hash.md | 0 .../change-remove-owncloud-storage-driver.md | 0 .../change-space-attributes.md | 0 .../change-status-values.md | 0 ...e-use-description-during-space-creation.md | 0 .../clean-dfs1.md | 0 .../cleanup-code.md | 0 .../consolidate-xattr.md | 0 .../cs3-permissions-service.md | 0 ...sedfs-allow-multiple-space-type-filters.md | 0 .../decomposedfs-locking.md | 0 .../decomposedfs-shard-nodes-per-space.md | 0 .../decomposedfs-xattr-errors.md | 0 .../do-not-log-nodes.md | 0 .../do-not-swallow-error.md | 0 .../edge-handle-spaces-does-not-exist-case.md | 0 .../enable-edge-changelog.md | 0 ...ement-add-locking-methods-to-interfaces.md | 0 .../enhancement-add-new-file-capability.md | 0 .../enhancement-add-touch-file.md | 0 .../enhancement-app-new-public-link.md | 0 ...nhancement-product-field-in-ocs-version.md | 0 .../enhancement-update-tusd.md | 0 .../eos-fixes.md | 0 .../events.md | 0 .../extract-space-grants.md | 0 .../fix-aggregated-child-folder-id.md | 0 .../fix-archiver.md | 0 .../fix-create-space-error-msg.md | 0 .../fix-id-checking-in-decomposedfs.md | 0 .../fix-ocmd-tutorial.md | 0 .../fix-ocs-config-unprotected.md | 0 .../fix-public-share-path.md | 0 .../fix-registry-caching.md | 0 .../fix-share-recyclebin.md | 0 .../fix-shares-provider-filter.md | 0 .../fix-statcache.md | 0 .../fix-webdav-copy-zero-byte-file.md | 0 .../flock-xattr-set-multiple.md | 0 .../group-integration-tests.md | 0 .../handle-public-link-permissions-all.md | 0 .../harden-xattrs-errors.md | 0 .../ignore-known-erros.md | 0 .../improve_statcache.md | 0 .../invalidate-listproviders-cache.md | 0 .../ldap-group-id.md | 0 .../ldap-guid.md | 0 .../ldap-integration-tests.md | 0 .../ldap-usergroupfilter-template.md | 0 .../locksMutexed.md | 0 .../make-archiver-id-based.md | 0 .../make-owncloudsql-spaces-aware.md | 0 .../metadata-storage.md | 0 .../multiple-spaces-per-provider.md | 0 .../nextcloud-ocm-share-manager.md | 0 .../ocdav-spaces-aware.md | 0 .../oidc-lw-users.md | 0 .../pass-complete-spaces-as-json.md | 0 .../propfind-listing.md | 0 .../public-link-propfind.md | 0 .../purge-spaces.md | 0 .../recyclebin-access-control.md | 0 .../reduce-log-output.md | 0 .../refactor-ocdav.md | 0 .../remove-base64-encoding-of-ids.md | 0 .../remove-dot-space.md | 0 .../remove-logic-from-gateway.md | 0 .../remove-space-members.md | 0 .../remove-unused-home-provider-config.md | 0 .../restore-spaces.md | 0 .../revert-upload-fix.md | 8 +- ...uld-never-return-transport-level-errors.md | 0 .../sharestorageprovider.md | 0 .../spaces-fixes.md | 0 .../spaces-grants.md | 0 .../spaces-registry-allow-list-all.md | 0 .../spaces-registry.md | 0 .../spaces-stat.md | 0 .../static-registry.md | 0 .../static-registry2.md | 0 .../storage-if-match.md | 0 .../update-cs3-lock-api.md | 0 .../update-handle-empty-spaces.md | 0 .../update-linter-config.md | 0 .../upgrade-ginkgo.md | 0 .../use-space-reference.md | 0 .../waitForNats.md | 0 .../webdav-path-fix.md | 0 .../wrap-unwrap-in-gateway.md | 0 changelog/NOTE.md | 750 +++++++++++++++-- cmd/reva/app-tokens-create.go | 4 +- cmd/reva/app-tokens-list.go | 2 +- cmd/reva/app-tokens-remove.go | 2 +- cmd/reva/download.go | 10 +- cmd/reva/grpc.go | 2 +- cmd/reva/import.go | 2 +- cmd/reva/main.go | 2 +- cmd/reva/ocm-share-create.go | 2 +- cmd/reva/ocm-share-list.go | 2 +- cmd/reva/open-in-app.go | 2 +- cmd/reva/public-share-list.go | 2 +- cmd/reva/share-create.go | 2 +- cmd/reva/share-list.go | 2 +- cmd/reva/transfer-create.go | 2 +- cmd/reva/upload.go | 14 +- cmd/revad/main.go | 8 +- cmd/revad/runtime/loader.go | 56 +- cmd/revad/runtime/option.go | 2 +- cmd/revad/runtime/runtime.go | 16 +- .../content/en/docs/changelog/2.0.0/_index.md | 754 ++++++++++++++++++ docs/content/en/docs/concepts/plugins.md | 4 +- .../grpc/services/permissions/_index.md | 26 + .../packages/app/provider/wopi/_index.md | 18 +- .../packages/auth/manager/nextcloud/_index.md | 2 +- .../packages/auth/manager/oidc/_index.md | 12 +- .../ocm/share/manager/nextcloud/_index.md | 2 +- .../packages/storage/fs/local/_index.md | 16 + .../packages/user/manager/nextcloud/_index.md | 2 +- examples/plugin/json/json.go | 4 +- examples/sdk/sdk.go | 4 +- go.mod | 6 +- internal/grpc/interceptors/appctx/appctx.go | 4 +- internal/grpc/interceptors/auth/auth.go | 18 +- internal/grpc/interceptors/auth/scope.go | 16 +- .../eventsmiddleware/conversion.go | 2 +- .../interceptors/eventsmiddleware/events.go | 6 +- internal/grpc/interceptors/loader/loader.go | 4 +- internal/grpc/interceptors/log/log.go | 4 +- .../grpc/interceptors/readonly/readonly.go | 6 +- .../grpc/interceptors/recovery/recovery.go | 2 +- internal/grpc/interceptors/token/token.go | 2 +- .../grpc/interceptors/useragent/useragent.go | 2 +- .../applicationauth/applicationauth.go | 10 +- .../grpc/services/appprovider/appprovider.go | 16 +- .../grpc/services/appregistry/appregistry.go | 10 +- .../services/appregistry/appregistry_test.go | 2 +- .../services/authprovider/authprovider.go | 14 +- .../services/authregistry/authregistry.go | 10 +- internal/grpc/services/datatx/datatx.go | 6 +- .../grpc/services/gateway/applicationauth.go | 4 +- internal/grpc/services/gateway/appprovider.go | 10 +- internal/grpc/services/gateway/appregistry.go | 4 +- .../grpc/services/gateway/authprovider.go | 16 +- .../grpc/services/gateway/authregistry.go | 4 +- internal/grpc/services/gateway/datatx.go | 4 +- internal/grpc/services/gateway/gateway.go | 10 +- .../grpc/services/gateway/groupprovider.go | 4 +- internal/grpc/services/gateway/ocmcore.go | 4 +- .../grpc/services/gateway/ocminvitemanager.go | 4 +- .../services/gateway/ocmproviderauthorizer.go | 4 +- .../grpc/services/gateway/ocmshareprovider.go | 8 +- internal/grpc/services/gateway/permissions.go | 4 +- internal/grpc/services/gateway/preferences.go | 4 +- .../services/gateway/publicshareprovider.go | 6 +- .../grpc/services/gateway/storageprovider.go | 18 +- .../services/gateway/storageprovidercache.go | 6 +- .../grpc/services/gateway/userprovider.go | 4 +- .../services/gateway/usershareprovider.go | 14 +- .../services/gateway/webdavstorageprovider.go | 2 +- .../services/groupprovider/groupprovider.go | 10 +- .../grpc/services/helloworld/helloworld.go | 4 +- internal/grpc/services/loader/loader.go | 44 +- internal/grpc/services/ocmcore/ocmcore.go | 10 +- .../ocminvitemanager/ocminvitemanager.go | 10 +- .../ocmproviderauthorizer.go | 10 +- .../ocmshareprovider/ocmshareprovider.go | 10 +- .../grpc/services/permissions/permissions.go | 6 +- .../grpc/services/preferences/preferences.go | 6 +- .../publicshareprovider.go | 14 +- .../publicstorageprovider.go | 14 +- .../sharesstorageprovider.go | 14 +- .../sharesstorageprovider_test.go | 12 +- .../storageprovider/storageprovider.go | 22 +- .../storageregistry/storageregistry.go | 12 +- .../services/userprovider/userprovider.go | 12 +- .../usershareprovider/usershareprovider.go | 14 +- internal/http/interceptors/appctx/appctx.go | 4 +- internal/http/interceptors/auth/auth.go | 26 +- .../auth/credential/loader/loader.go | 4 +- .../auth/credential/registry/registry.go | 2 +- .../auth/credential/strategy/basic/basic.go | 4 +- .../auth/credential/strategy/bearer/bearer.go | 4 +- .../interceptors/auth/token/loader/loader.go | 2 +- .../auth/token/registry/registry.go | 2 +- .../auth/token/strategy/header/header.go | 6 +- .../auth/tokenwriter/loader/loader.go | 2 +- .../auth/tokenwriter/registry/registry.go | 2 +- .../tokenwriter/strategy/header/header.go | 6 +- internal/http/interceptors/cors/cors.go | 2 +- internal/http/interceptors/loader/loader.go | 4 +- internal/http/interceptors/log/log.go | 2 +- .../providerauthorizer/providerauthorizer.go | 14 +- .../http/services/appprovider/appprovider.go | 18 +- internal/http/services/appprovider/errors.go | 2 +- internal/http/services/archiver/handler.go | 18 +- .../services/archiver/manager/archiver.go | 4 +- .../archiver/manager/archiver_test.go | 6 +- .../http/services/datagateway/datagateway.go | 10 +- .../services/dataprovider/dataprovider.go | 12 +- .../http/services/helloworld/helloworld.go | 4 +- internal/http/services/loader/loader.go | 32 +- internal/http/services/mentix/mentix.go | 10 +- .../services/meshdirectory/meshdirectory.go | 10 +- internal/http/services/metrics/metrics.go | 8 +- internal/http/services/ocmd/config.go | 2 +- internal/http/services/ocmd/invites.go | 12 +- internal/http/services/ocmd/notifications.go | 4 +- internal/http/services/ocmd/ocmd.go | 10 +- internal/http/services/ocmd/reqres.go | 2 +- internal/http/services/ocmd/send.go | 6 +- internal/http/services/ocmd/shares.go | 8 +- .../http/services/owncloud/ocdav/avatars.go | 6 +- internal/http/services/owncloud/ocdav/copy.go | 18 +- internal/http/services/owncloud/ocdav/dav.go | 14 +- .../http/services/owncloud/ocdav/delete.go | 14 +- .../services/owncloud/ocdav/errors/error.go | 2 +- internal/http/services/owncloud/ocdav/get.go | 20 +- internal/http/services/owncloud/ocdav/head.go | 16 +- .../http/services/owncloud/ocdav/locks.go | 16 +- internal/http/services/owncloud/ocdav/meta.go | 4 +- .../http/services/owncloud/ocdav/mkcol.go | 8 +- internal/http/services/owncloud/ocdav/move.go | 16 +- .../services/owncloud/ocdav/net/context.go | 2 +- .../owncloud/ocdav/net/context_test.go | 4 +- .../services/owncloud/ocdav/net/net_test.go | 2 +- .../http/services/owncloud/ocdav/ocdav.go | 24 +- .../services/owncloud/ocdav/ocdav_test.go | 4 +- .../http/services/owncloud/ocdav/options.go | 2 +- .../owncloud/ocdav/propfind/propfind.go | 26 +- .../owncloud/ocdav/propfind/propfind_test.go | 8 +- .../http/services/owncloud/ocdav/proppatch.go | 16 +- .../services/owncloud/ocdav/publicfile.go | 10 +- internal/http/services/owncloud/ocdav/put.go | 22 +- .../http/services/owncloud/ocdav/report.go | 8 +- .../owncloud/ocdav/spacelookup/spacelookup.go | 4 +- .../http/services/owncloud/ocdav/spaces.go | 10 +- .../http/services/owncloud/ocdav/status.go | 4 +- .../http/services/owncloud/ocdav/trashbin.go | 24 +- internal/http/services/owncloud/ocdav/tus.go | 18 +- .../http/services/owncloud/ocdav/versions.go | 14 +- .../http/services/owncloud/ocdav/webdav.go | 8 +- internal/http/services/owncloud/ocs/cache.go | 4 +- .../services/owncloud/ocs/config/config.go | 4 +- .../services/owncloud/ocs/conversions/main.go | 8 +- .../handlers/apps/sharing/sharees/sharees.go | 12 +- .../ocs/handlers/apps/sharing/shares/group.go | 4 +- .../handlers/apps/sharing/shares/pending.go | 8 +- .../apps/sharing/shares/pending_test.go | 10 +- .../handlers/apps/sharing/shares/public.go | 8 +- .../handlers/apps/sharing/shares/remote.go | 6 +- .../handlers/apps/sharing/shares/shares.go | 26 +- .../apps/sharing/shares/shares_test.go | 10 +- .../handlers/apps/sharing/shares/spaces.go | 16 +- .../ocs/handlers/apps/sharing/shares/user.go | 8 +- .../cloud/capabilities/capabilities.go | 6 +- .../cloud/capabilities/capabilities_test.go | 2 +- .../handlers/cloud/capabilities/uploads.go | 2 +- .../owncloud/ocs/handlers/cloud/user/user.go | 6 +- .../ocs/handlers/cloud/users/users.go | 14 +- .../owncloud/ocs/handlers/config/config.go | 6 +- internal/http/services/owncloud/ocs/ocs.go | 20 +- .../owncloud/ocs/response/response.go | 2 +- .../http/services/prometheus/prometheus.go | 2 +- .../services/reverseproxy/reverseproxy.go | 4 +- internal/http/services/siteacc/siteacc.go | 6 +- internal/http/services/sysinfo/sysinfo.go | 6 +- .../services/wellknown/openidconfiguration.go | 2 +- internal/http/services/wellknown/wellknown.go | 6 +- pkg/app/provider/demo/demo.go | 4 +- pkg/app/provider/loader/loader.go | 4 +- pkg/app/provider/registry/registry.go | 2 +- pkg/app/provider/wopi/wopi.go | 16 +- pkg/app/registry/loader/loader.go | 2 +- pkg/app/registry/registry/registry.go | 2 +- pkg/app/registry/static/static.go | 6 +- pkg/app/registry/static/static_test.go | 2 +- pkg/appauth/manager/json/json.go | 8 +- pkg/appauth/manager/json/json_test.go | 2 +- pkg/appauth/manager/loader/loader.go | 2 +- pkg/appauth/manager/registry/registry.go | 2 +- pkg/auth/auth.go | 2 +- pkg/auth/manager/appauth/appauth.go | 8 +- pkg/auth/manager/demo/demo.go | 8 +- pkg/auth/manager/impersonator/impersonator.go | 6 +- pkg/auth/manager/json/json.go | 8 +- pkg/auth/manager/ldap/ldap.go | 18 +- pkg/auth/manager/loader/loader.go | 22 +- pkg/auth/manager/machine/machine.go | 10 +- pkg/auth/manager/nextcloud/nextcloud.go | 6 +- pkg/auth/manager/nextcloud/nextcloud_test.go | 8 +- pkg/auth/manager/oidc/oidc.go | 12 +- pkg/auth/manager/oidcmapping/oidcmapping.go | 16 +- .../manager/owncloudsql/accounts/accounts.go | 2 +- .../owncloudsql/accounts/accounts_test.go | 2 +- pkg/auth/manager/owncloudsql/owncloudsql.go | 12 +- .../manager/owncloudsql/owncloudsql_test.go | 2 +- pkg/auth/manager/publicshares/publicshares.go | 10 +- pkg/auth/manager/registry/registry.go | 2 +- pkg/auth/registry/loader/loader.go | 2 +- pkg/auth/registry/registry/registry.go | 2 +- pkg/auth/registry/static/static.go | 8 +- pkg/auth/rpc_auth.go | 4 +- pkg/auth/scope/lightweight.go | 2 +- pkg/auth/scope/publicshare.go | 4 +- pkg/auth/scope/receivedshare.go | 4 +- pkg/auth/scope/resourceinfo.go | 4 +- pkg/auth/scope/scope.go | 2 +- pkg/auth/scope/share.go | 4 +- pkg/auth/scope/user.go | 2 +- pkg/auth/scope/utils.go | 4 +- pkg/cbox/favorite/sql/sql.go | 8 +- pkg/cbox/group/rest/rest.go | 8 +- pkg/cbox/loader/loader.go | 14 +- pkg/cbox/publicshare/sql/sql.go | 10 +- pkg/cbox/share/sql/sql.go | 12 +- .../storage/eoshomewrapper/eoshomewrapper.go | 8 +- pkg/cbox/storage/eoswrapper/eoswrapper.go | 8 +- pkg/cbox/user/rest/rest.go | 8 +- pkg/cbox/utils/tokenmanagement.go | 2 +- pkg/eosclient/eosbinary/eosbinary.go | 8 +- pkg/eosclient/eosclient.go | 2 +- pkg/eosclient/eosgrpc/eosgrpc.go | 12 +- pkg/eosclient/eosgrpc/eoshttp.go | 8 +- pkg/events/example/consumer/consumer.go | 2 +- pkg/events/example/example.go | 8 +- pkg/events/example/publisher/publisher.go | 2 +- pkg/group/manager/json/json.go | 6 +- pkg/group/manager/json/json_test.go | 2 +- pkg/group/manager/ldap/ldap.go | 10 +- pkg/group/manager/loader/loader.go | 4 +- pkg/group/manager/registry/registry.go | 2 +- pkg/mentix/accservice/accservice.go | 4 +- pkg/mentix/connectors/connector.go | 6 +- pkg/mentix/connectors/connectors.go | 4 +- pkg/mentix/connectors/gocdb.go | 10 +- pkg/mentix/connectors/gocdb/query.go | 2 +- pkg/mentix/connectors/localfile.go | 4 +- pkg/mentix/entity/entities.go | 2 +- pkg/mentix/entity/entity.go | 2 +- pkg/mentix/exchangers/exchanger.go | 6 +- pkg/mentix/exchangers/exchangers.go | 2 +- pkg/mentix/exchangers/exporters/cs3api.go | 4 +- .../exchangers/exporters/cs3api/query.go | 6 +- pkg/mentix/exchangers/exporters/exporter.go | 4 +- pkg/mentix/exchangers/exporters/exporters.go | 6 +- pkg/mentix/exchangers/exporters/metrics.go | 6 +- .../exchangers/exporters/metrics/metrics.go | 4 +- pkg/mentix/exchangers/exporters/promsd.go | 8 +- .../exchangers/exporters/reqexporter.go | 4 +- .../exchangers/exporters/siteloc/query.go | 4 +- .../exchangers/exporters/sitelocations.go | 4 +- pkg/mentix/exchangers/exporters/webapi.go | 4 +- .../exchangers/exporters/webapi/query.go | 4 +- pkg/mentix/exchangers/importers/importer.go | 6 +- pkg/mentix/exchangers/importers/importers.go | 6 +- .../exchangers/importers/reqimporter.go | 6 +- pkg/mentix/exchangers/importers/sitereg.go | 4 +- .../exchangers/importers/sitereg/query.go | 10 +- .../exchangers/importers/sitereg/types.go | 8 +- pkg/mentix/exchangers/reqexchanger.go | 4 +- pkg/mentix/mentix.go | 18 +- pkg/mentix/meshdata/service.go | 2 +- pkg/mentix/meshdata/site.go | 4 +- pkg/metrics/driver/dummy/dummy.go | 4 +- pkg/metrics/driver/json/json.go | 6 +- pkg/metrics/driver/loader/loader.go | 6 +- pkg/metrics/driver/registry/registry.go | 2 +- pkg/metrics/driver/xcloud/xcloud.go | 6 +- pkg/metrics/metrics.go | 8 +- pkg/metrics/reader/reader.go | 2 +- pkg/ocm/invite/manager/json/json.go | 12 +- pkg/ocm/invite/manager/loader/loader.go | 4 +- pkg/ocm/invite/manager/memory/memory.go | 12 +- pkg/ocm/invite/manager/registry/registry.go | 2 +- pkg/ocm/provider/authorizer/json/json.go | 6 +- pkg/ocm/provider/authorizer/loader/loader.go | 6 +- pkg/ocm/provider/authorizer/mentix/mentix.go | 8 +- pkg/ocm/provider/authorizer/open/open.go | 6 +- .../provider/authorizer/registry/registry.go | 2 +- pkg/ocm/share/manager/json/json.go | 12 +- pkg/ocm/share/manager/loader/loader.go | 4 +- pkg/ocm/share/manager/nextcloud/nextcloud.go | 14 +- .../share/manager/nextcloud/nextcloud_test.go | 8 +- pkg/ocm/share/manager/registry/registry.go | 2 +- pkg/ocm/share/sender/sender.go | 2 +- pkg/permission/manager/demo/demo.go | 4 +- pkg/permission/manager/loader/loader.go | 2 +- pkg/permission/manager/registry/registry.go | 2 +- pkg/plugin/loader.go | 2 +- pkg/publicshare/manager/json/json.go | 10 +- pkg/publicshare/manager/loader/loader.go | 4 +- pkg/publicshare/manager/memory/memory.go | 10 +- pkg/publicshare/manager/registry/registry.go | 2 +- pkg/publicshare/publicshare.go | 2 +- pkg/registry/memory/memory.go | 2 +- pkg/registry/memory/service.go | 2 +- pkg/rgrpc/rgrpc.go | 16 +- pkg/rgrpc/status/status.go | 2 +- pkg/rgrpc/todo/pool/pool.go | 2 +- pkg/rhttp/client.go | 2 +- pkg/rhttp/datatx/datatx.go | 2 +- pkg/rhttp/datatx/manager/loader/loader.go | 6 +- pkg/rhttp/datatx/manager/registry/registry.go | 2 +- pkg/rhttp/datatx/manager/simple/simple.go | 12 +- pkg/rhttp/datatx/manager/spaces/spaces.go | 16 +- pkg/rhttp/datatx/manager/tus/tus.go | 10 +- pkg/rhttp/datatx/utils/download/download.go | 8 +- pkg/rhttp/rhttp.go | 14 +- pkg/sdk/action/action.go | 2 +- pkg/sdk/action/download.go | 6 +- pkg/sdk/action/enumfiles.go | 4 +- pkg/sdk/action/fileops.go | 4 +- pkg/sdk/action/upload.go | 10 +- pkg/sdk/common/crypto/crypto.go | 4 +- pkg/sdk/common/net/net.go | 4 +- pkg/sdk/common/net/tus.go | 2 +- pkg/sdk/common/net/webdav.go | 2 +- pkg/sdk/session.go | 4 +- pkg/share/cache/cbox/cbox.go | 12 +- pkg/share/cache/loader/loader.go | 2 +- pkg/share/cache/registry/registry.go | 2 +- pkg/share/manager/json/json.go | 10 +- pkg/share/manager/loader/loader.go | 6 +- pkg/share/manager/memory/memory.go | 10 +- pkg/share/manager/registry/registry.go | 2 +- pkg/share/manager/sql/conversions.go | 6 +- pkg/share/manager/sql/sql.go | 10 +- pkg/share/manager/sql/sql_test.go | 8 +- pkg/share/share.go | 4 +- pkg/siteacc/account/contact/contact.go | 2 +- pkg/siteacc/account/edit/edit.go | 2 +- pkg/siteacc/account/login/login.go | 2 +- pkg/siteacc/account/manage/manage.go | 2 +- pkg/siteacc/account/panel.go | 18 +- .../account/registration/registration.go | 2 +- pkg/siteacc/account/settings/settings.go | 2 +- pkg/siteacc/admin/panel.go | 6 +- pkg/siteacc/alerting/dispatcher.go | 8 +- pkg/siteacc/config/config.go | 2 +- pkg/siteacc/data/account.go | 6 +- pkg/siteacc/data/filestorage.go | 2 +- pkg/siteacc/data/sites.go | 2 +- pkg/siteacc/email/email.go | 6 +- pkg/siteacc/endpoints.go | 10 +- pkg/siteacc/html/panel.go | 4 +- pkg/siteacc/html/session.go | 2 +- pkg/siteacc/html/sessionmanager.go | 2 +- pkg/siteacc/manager/acclistener.go | 2 +- pkg/siteacc/manager/accmanager.go | 14 +- pkg/siteacc/manager/gocdb/account.go | 4 +- pkg/siteacc/manager/gocdb/gocdb.go | 4 +- pkg/siteacc/manager/usersmanager.go | 4 +- pkg/siteacc/siteacc.go | 12 +- pkg/siteacc/sitereg/sitereg.go | 4 +- pkg/storage/favorite/loader/loader.go | 2 +- pkg/storage/favorite/memory/memory.go | 4 +- pkg/storage/favorite/memory/memory_test.go | 2 +- pkg/storage/favorite/registry/registry.go | 2 +- pkg/storage/fs/cephfs/cephfs.go | 8 +- pkg/storage/fs/cephfs/connections.go | 2 +- pkg/storage/fs/cephfs/errors.go | 2 +- pkg/storage/fs/cephfs/options.go | 2 +- pkg/storage/fs/cephfs/unsupported.go | 4 +- pkg/storage/fs/cephfs/upload.go | 8 +- pkg/storage/fs/cephfs/user.go | 8 +- pkg/storage/fs/eos/eos.go | 6 +- pkg/storage/fs/eosgrpc/eosgrpc.go | 6 +- pkg/storage/fs/eosgrpchome/eosgrpchome.go | 6 +- pkg/storage/fs/eoshome/eoshome.go | 6 +- pkg/storage/fs/loader/loader.go | 24 +- pkg/storage/fs/local/local.go | 6 +- pkg/storage/fs/localhome/localhome.go | 6 +- pkg/storage/fs/nextcloud/nextcloud.go | 10 +- pkg/storage/fs/nextcloud/nextcloud_test.go | 8 +- .../fs/ocis/blobstore/blobstore_test.go | 4 +- pkg/storage/fs/ocis/ocis.go | 10 +- pkg/storage/fs/ocis/ocis_test.go | 4 +- .../fs/owncloudsql/filecache/filecache.go | 2 +- .../owncloudsql/filecache/filecache_test.go | 2 +- pkg/storage/fs/owncloudsql/owncloudsql.go | 28 +- .../fs/owncloudsql/owncloudsql_unix.go | 2 +- .../fs/owncloudsql/owncloudsql_windows.go | 2 +- pkg/storage/fs/owncloudsql/spaces.go | 8 +- pkg/storage/fs/owncloudsql/upload.go | 16 +- pkg/storage/fs/registry/registry.go | 2 +- pkg/storage/fs/s3/s3.go | 10 +- pkg/storage/fs/s3/upload.go | 2 +- pkg/storage/fs/s3ng/option_test.go | 2 +- pkg/storage/fs/s3ng/s3ng.go | 8 +- pkg/storage/fs/s3ng/s3ng_test.go | 4 +- pkg/storage/registry/loader/loader.go | 4 +- pkg/storage/registry/registry/registry.go | 2 +- pkg/storage/registry/spaces/spaces.go | 16 +- pkg/storage/registry/spaces/spaces_test.go | 8 +- pkg/storage/registry/static/static.go | 12 +- pkg/storage/registry/static/static_test.go | 4 +- pkg/storage/utils/ace/ace_test.go | 2 +- .../utils/decomposedfs/decomposedfs.go | 30 +- .../decomposedfs_concurrency_test.go | 4 +- .../utils/decomposedfs/decomposedfs_test.go | 6 +- pkg/storage/utils/decomposedfs/grants.go | 12 +- pkg/storage/utils/decomposedfs/grants_test.go | 4 +- .../utils/decomposedfs/lookup/lookup.go | 10 +- .../utils/decomposedfs/lookup/lookup_test.go | 4 +- pkg/storage/utils/decomposedfs/metadata.go | 12 +- .../decomposedfs/mocks/PermissionsChecker.go | 2 +- pkg/storage/utils/decomposedfs/mocks/Tree.go | 2 +- pkg/storage/utils/decomposedfs/node/locks.go | 10 +- .../utils/decomposedfs/node/locks_test.go | 6 +- pkg/storage/utils/decomposedfs/node/node.go | 16 +- .../utils/decomposedfs/node/node_test.go | 4 +- .../utils/decomposedfs/node/permissions.go | 8 +- .../decomposedfs/options/options_test.go | 2 +- pkg/storage/utils/decomposedfs/recycle.go | 10 +- .../utils/decomposedfs/recycle_test.go | 6 +- pkg/storage/utils/decomposedfs/revisions.go | 6 +- pkg/storage/utils/decomposedfs/spaces.go | 20 +- .../utils/decomposedfs/testhelpers/helpers.go | 22 +- pkg/storage/utils/decomposedfs/tree/tree.go | 14 +- .../utils/decomposedfs/tree/tree_test.go | 10 +- pkg/storage/utils/decomposedfs/upload.go | 18 +- pkg/storage/utils/decomposedfs/upload_test.go | 24 +- .../utils/decomposedfs/xattrs/xattrs.go | 2 +- pkg/storage/utils/downloader/downloader.go | 6 +- .../utils/downloader/mock/downloader_mock.go | 2 +- pkg/storage/utils/eosfs/eosfs.go | 30 +- pkg/storage/utils/eosfs/eosfs_test.go | 4 +- pkg/storage/utils/eosfs/upload.go | 4 +- pkg/storage/utils/grants/grants.go | 2 +- pkg/storage/utils/indexer/errors/errors.go | 2 +- .../utils/indexer/index/autoincrement.go | 6 +- .../utils/indexer/index/autoincrement_test.go | 6 +- pkg/storage/utils/indexer/index/index.go | 2 +- pkg/storage/utils/indexer/index/non_unique.go | 6 +- .../utils/indexer/index/non_unique_test.go | 10 +- pkg/storage/utils/indexer/index/unique.go | 6 +- .../utils/indexer/index/unique_test.go | 10 +- pkg/storage/utils/indexer/indexer.go | 10 +- pkg/storage/utils/indexer/indexer_test.go | 8 +- pkg/storage/utils/indexer/map.go | 2 +- pkg/storage/utils/indexer/option/option.go | 2 +- pkg/storage/utils/indexer/reflect.go | 2 +- pkg/storage/utils/indexer/reflect_test.go | 6 +- pkg/storage/utils/localfs/localfs.go | 18 +- pkg/storage/utils/localfs/localfs_unix.go | 2 +- pkg/storage/utils/localfs/localfs_windows.go | 2 +- pkg/storage/utils/localfs/upload.go | 10 +- pkg/storage/utils/metadata/cs3.go | 10 +- pkg/storage/utils/walker/mock/walker_mock.go | 2 +- pkg/storage/utils/walker/walker.go | 2 +- pkg/sysinfo/metrics.go | 2 +- pkg/token/manager/demo/demo.go | 4 +- pkg/token/manager/jwt/jwt.go | 8 +- pkg/token/manager/loader/loader.go | 4 +- pkg/token/manager/registry/registry.go | 2 +- pkg/user/manager/demo/demo.go | 6 +- pkg/user/manager/demo/demo_test.go | 2 +- pkg/user/manager/json/json.go | 6 +- pkg/user/manager/json/json_test.go | 2 +- pkg/user/manager/ldap/ldap.go | 10 +- pkg/user/manager/loader/loader.go | 10 +- pkg/user/manager/nextcloud/nextcloud.go | 10 +- pkg/user/manager/nextcloud/nextcloud_test.go | 10 +- .../manager/owncloudsql/accounts/accounts.go | 2 +- .../owncloudsql/accounts/accounts_test.go | 2 +- pkg/user/manager/owncloudsql/owncloudsql.go | 10 +- pkg/user/manager/registry/registry.go | 2 +- pkg/user/rpc_user.go | 4 +- pkg/user/user.go | 2 +- pkg/utils/resourceid/owncloud_test.go | 2 +- pkg/utils/utils.go | 4 +- tests/helpers/helpers.go | 2 +- .../gateway_storageprovider_static_test.go | 8 +- .../grpc/gateway_storageprovider_test.go | 16 +- tests/integration/grpc/groupprovider_test.go | 8 +- .../integration/grpc/storageprovider_test.go | 18 +- tests/integration/grpc/userprovider_test.go | 8 +- 583 files changed, 3953 insertions(+), 1788 deletions(-) rename changelog/{unreleased => 2.0.0_2022-03-03}/activate-statcache.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/applockslocked.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/cephfs-driver.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/change-public-link-hash.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/change-remove-owncloud-storage-driver.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/change-space-attributes.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/change-status-values.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/change-use-description-during-space-creation.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/clean-dfs1.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/cleanup-code.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/consolidate-xattr.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/cs3-permissions-service.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/decomposedfs-allow-multiple-space-type-filters.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/decomposedfs-locking.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/decomposedfs-shard-nodes-per-space.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/decomposedfs-xattr-errors.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/do-not-log-nodes.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/do-not-swallow-error.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/edge-handle-spaces-does-not-exist-case.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enable-edge-changelog.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enhancement-add-locking-methods-to-interfaces.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enhancement-add-new-file-capability.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enhancement-add-touch-file.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enhancement-app-new-public-link.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enhancement-product-field-in-ocs-version.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/enhancement-update-tusd.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/eos-fixes.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/events.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/extract-space-grants.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-aggregated-child-folder-id.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-archiver.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-create-space-error-msg.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-id-checking-in-decomposedfs.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-ocmd-tutorial.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-ocs-config-unprotected.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-public-share-path.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-registry-caching.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-share-recyclebin.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-shares-provider-filter.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-statcache.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/fix-webdav-copy-zero-byte-file.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/flock-xattr-set-multiple.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/group-integration-tests.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/handle-public-link-permissions-all.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/harden-xattrs-errors.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/ignore-known-erros.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/improve_statcache.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/invalidate-listproviders-cache.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/ldap-group-id.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/ldap-guid.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/ldap-integration-tests.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/ldap-usergroupfilter-template.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/locksMutexed.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/make-archiver-id-based.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/make-owncloudsql-spaces-aware.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/metadata-storage.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/multiple-spaces-per-provider.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/nextcloud-ocm-share-manager.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/ocdav-spaces-aware.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/oidc-lw-users.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/pass-complete-spaces-as-json.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/propfind-listing.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/public-link-propfind.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/purge-spaces.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/recyclebin-access-control.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/reduce-log-output.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/refactor-ocdav.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/remove-base64-encoding-of-ids.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/remove-dot-space.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/remove-logic-from-gateway.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/remove-space-members.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/remove-unused-home-provider-config.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/restore-spaces.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/revert-upload-fix.md (97%) rename changelog/{unreleased => 2.0.0_2022-03-03}/services-should-never-return-transport-level-errors.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/sharestorageprovider.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/spaces-fixes.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/spaces-grants.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/spaces-registry-allow-list-all.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/spaces-registry.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/spaces-stat.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/static-registry.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/static-registry2.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/storage-if-match.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/update-cs3-lock-api.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/update-handle-empty-spaces.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/update-linter-config.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/upgrade-ginkgo.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/use-space-reference.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/waitForNats.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/webdav-path-fix.md (100%) rename changelog/{unreleased => 2.0.0_2022-03-03}/wrap-unwrap-in-gateway.md (100%) create mode 100644 docs/content/en/docs/changelog/2.0.0/_index.md create mode 100644 docs/content/en/docs/config/grpc/services/permissions/_index.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 825b70bcaf..a050e46e60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,748 @@ +Changelog for reva 2.0.0 (2022-03-03) +======================================= + +The following sections list the changes in reva 2.0.0 relevant to +reva users. The changes are ordered by importance. + +Summary +------- + + * Fix #2457: Do not swallow error + * Fix #2422: Handle non existing spaces correctly + * Fix #2327: Enable changelog on edge branch + * Fix #2370: Fixes for apps in public shares, project spaces for EOS driver + * Fix #2464: Pass spacegrants when adding member to space + * Fix #2430: Fix aggregated child folder id + * Fix #2348: Make archiver handle spaces protocol + * Fix #2452: Fix create space error message + * Fix #2445: Don't handle ids containing "/" in decomposedfs + * Fix #2285: Accept new userid idp format + * Fix #2503: Remove the protection from /v?.php/config endpoints + * Fix #2462: Public shares path needs to be set + * Fix #2427: Fix registry caching + * Fix #2298: Remove share refs from trashbin + * Fix #2433: Fix shares provider filter + * Fix #2351: Fix Statcache removing + * Fix #2374: Fix webdav copy of zero byte files + * Fix #2336: Handle sending all permissions when creating public links + * Fix #2440: Add ArbitraryMetadataKeys to statcache key + * Fix #2582: Keep lock structs in a local map protected by a mutex + * Fix #2372: Make owncloudsql work with the spaces registry + * Fix #2416: The registry now returns complete space structs + * Fix #3066: Fix propfind listing for files + * Fix #2428: Remove unused home provider from config + * Fix #2334: Revert fix decomposedfs upload + * Fix #2415: Services should never return transport level errors + * Fix #2419: List project spaces for share recipients + * Fix #2501: Fix spaces stat + * Fix #2432: Use space reference when listing containers + * Fix #2572: Wait for nats server on middleware start + * Fix #2454: Fix webdav paths in PROPFINDS + * Chg #2329: Activate the statcache + * Chg #2596: Remove hash from public link urls + * Chg #2495: Remove the ownCloud storage driver + * Chg #2527: Store space attributes in decomposedFS + * Chg #2581: Update hard-coded status values + * Chg #2524: Use description during space creation + * Chg #2554: Shard nodes per space in decomposedfs + * Chg #2576: Harden xattrs errors + * Chg #2436: Replace template in GroupFilter for UserProvider with a simple string + * Chg #2429: Make archiver id based + * Chg #2340: Allow multiple space configurations per provider + * Chg #2396: The ocdav handler is now spaces aware + * Chg #2349: Require `ListRecycle` when listing trashbin + * Chg #2353: Reduce log output + * Chg #2542: Do not encode webDAV ids to base64 + * Chg #2519: Remove the auto creation of the .space folder + * Chg #2394: Remove logic from gateway + * Chg #2023: Add a sharestorageprovider + * Chg #2234: Add a spaces registry + * Chg #2339: Fix static registry regressions + * Chg #2370: Fix static registry regressions + * Chg #2354: Return not found when updating non existent space + * Chg #2589: Remove deprecated linter modules + * Chg #2016: Move wrapping and unwrapping of paths to the storage gateway + * Enh #2591: Set up App Locks with basic locks + * Enh #1209: Reva CephFS module v0.2.1 + * Enh #2511: Error handling cleanup in decomposed FS + * Enh #2516: Cleaned up some code + * Enh #2512: Consolidate xattr setter and getter + * Enh #2341: Use CS3 permissions API + * Enh #2343: Allow multiple space type fileters on decomposedfs + * Enh #2460: Add locking support to decomposedfs + * Enh #2540: Refactored the xattrs package in the decomposedfs + * Enh #2463: Do not log whole nodes + * Enh #2350: Add file locking methods to the storage and filesystem interfaces + * Enh #2379: Add new file url of the app provider to the ocs capabilities + * Enh #2369: Implement TouchFile from the CS3apis + * Enh #2385: Allow to create new files with the app provider on public links + * Enh #2397: Product field in OCS version + * Enh #2393: Update tus/tusd to version 1.8.0 + * Enh #2522: Introduce events + * Enh #2528: Use an exclcusive write lock when writing multiple attributes + * Enh #2595: Add integration test for the groupprovider + * Enh #2439: Ignore handled errors when creating spaces + * Enh #2500: Invalidate listproviders cache + * Enh #2345: Don't assume that the LDAP groupid in reva matches the name + * Enh #2525: Allow using AD UUID as userId values + * Enh #2584: Allow running userprovider integration tests for the LDAP driver + * Enh #2585: Add metadata storage layer and indexer + * Enh #2163: Nextcloud-based share manager for pkg/ocm/share + * Enh #2278: OIDC driver changes for lightweight users + * Enh #2315: Add new attributes to public link propfinds + * Enh #2431: Delete shares when purging spaces + * Enh #2434: Refactor ocdav into smaller chunks + * Enh #2524: Add checks when removing space members + * Enh #2457: Restore spaces that were previously deleted + * Enh #2498: Include grants in list storage spaces response + * Enh #2344: Allow listing all storage spaces + * Enh #2547: Add an if-match check to the storage provider + * Enh #2486: Update cs3apis to include lock api changes + * Enh #2526: Upgrade ginkgo to v2 + +Details +------- + + * Bugfix #2457: Do not swallow error + + Decomposedfs not longer swallows errors when creating a node fails. + + https://github.com/cs3org/reva/pull/2457 + + * Bugfix #2422: Handle non existing spaces correctly + + When looking up a space by id we returned the wrong status code. + + https://github.com/cs3org/reva/pull/2422 + + * Bugfix #2327: Enable changelog on edge branch + + We added a `branch` flag to the `tools/check-changelog/main.go` to fix changelog checks on + the edge branch. + + https://github.com/cs3org/reva/pull/2327 + + * Bugfix #2370: Fixes for apps in public shares, project spaces for EOS driver + + https://github.com/cs3org/reva/pull/2370 + + * Bugfix #2464: Pass spacegrants when adding member to space + + When creating a space grant there should not be created a new space. Unfortunately SpaceGrant + didn't work when adding members to a space. Now a value is placed in the ctx of the + storageprovider on which decomposedfs reacts + + https://github.com/cs3org/reva/pull/2464 + + * Bugfix #2430: Fix aggregated child folder id + + Propfind now returns the correct id and correctly aggregates the mtime and etag. + + https://github.com/cs3org/reva/pull/2430 + + * Bugfix #2348: Make archiver handle spaces protocol + + The archiver can now handle the spaces protocol + + https://github.com/cs3org/reva/pull/2348 + + * Bugfix #2452: Fix create space error message + + Create space no longer errors with list spaces error messages. + + https://github.com/cs3org/reva/pull/2452 + + * Bugfix #2445: Don't handle ids containing "/" in decomposedfs + + The storageprovider previously checked all ids without checking their validity this lead to + flaky test because it shouldn't check ids that are used from the public storage provider + + https://github.com/cs3org/reva/pull/2445 + + * Bugfix #2285: Accept new userid idp format + + The format for userid idp [changed](https://github.com/cs3org/cs3apis/pull/159) and + this broke [the ocmd + tutorial](https://reva.link/docs/tutorials/share-tutorial/#5-1-4-create-the-share) + This PR makes the provider authorizer interceptor accept both the old and the new string + format. + + https://github.com/cs3org/reva/issues/2285 + https://github.com/cs3org/reva/issues/2285 + See + and + + * Bugfix #2503: Remove the protection from /v?.php/config endpoints + + We've removed the protection from the "/v1.php/config" and "/v2.php/config" endpoints to be + API compatible with ownCloud 10. + + https://github.com/cs3org/reva/issues/2503 + https://github.com/owncloud/ocis/issues/1338 + + * Bugfix #2462: Public shares path needs to be set + + We need to set the relative path to the space root for public link shares to identify them in the + shares list. + + https://github.com/owncloud/ocis/issues/2462 + https://github.com/cs3org/reva/pull/2580 + + * Bugfix #2427: Fix registry caching + + We now cache space lookups per user. + + https://github.com/cs3org/reva/pull/2427 + + * Bugfix #2298: Remove share refs from trashbin + + https://github.com/cs3org/reva/pull/2298 + + * Bugfix #2433: Fix shares provider filter + + The shares storage provider now correctly filters space types + + https://github.com/cs3org/reva/pull/2433 + + * Bugfix #2351: Fix Statcache removing + + Removing from statcache didn't work correctly with different setups. Unified and fixed + + https://github.com/cs3org/reva/pull/2351 + + * Bugfix #2374: Fix webdav copy of zero byte files + + We've fixed the webdav copy action of zero byte files, which was not performed because the + webdav api assumed, that zero byte uploads are created when initiating the upload, which was + recently removed from all storage drivers. Therefore the webdav api also uploads zero byte + files after initiating the upload. + + https://github.com/cs3org/reva/pull/2374 + https://github.com/cs3org/reva/pull/2309 + + * Bugfix #2336: Handle sending all permissions when creating public links + + For backwards compatability we now reduce permissions to readonly when a create public link + carries all permissions. + + https://github.com/cs3org/reva/issues/2336 + https://github.com/owncloud/ocis/issues/1269 + + * Bugfix #2440: Add ArbitraryMetadataKeys to statcache key + + Otherwise stating with and without them would return the same result (because it is cached) + + https://github.com/cs3org/reva/pull/2440 + + * Bugfix #2582: Keep lock structs in a local map protected by a mutex + + Make sure that only one go routine or process can get the lock. + + https://github.com/cs3org/reva/pull/2582 + + * Bugfix #2372: Make owncloudsql work with the spaces registry + + Owncloudsql now works properly with the spaces registry. + + https://github.com/cs3org/reva/pull/2372 + + * Bugfix #2416: The registry now returns complete space structs + + We now return the complete space info, including name, path, owner, etc. instead of only path + and id. + + https://github.com/cs3org/reva/pull/2416 + + * Bugfix #3066: Fix propfind listing for files + + When doing a propfind for a file the result contained the files twice. + + https://github.com/owncloud/ocis/issues/3066 + https://github.com/cs3org/reva/pull/2506 + + * Bugfix #2428: Remove unused home provider from config + + The spaces registry does not use a home provider config. + + https://github.com/cs3org/reva/pull/2428 + + * Bugfix #2334: Revert fix decomposedfs upload + + Reverting https://github.com/cs3org/reva/pull/2330 to fix it properly + + https://github.com/cs3org/reva/pull/2334 + + * Bugfix #2415: Services should never return transport level errors + + The CS3 API adopted the grpc error codes from the [google grpc status + package](https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto). + It also separates transport level errors from application level errors on purpose. This + allows sending CS3 messages over protocols other than GRPC. To keep that seperation, the + server side must always return `nil`, even though the code generation for go produces function + signatures for rpcs with an `error` return property. That allows clients to clearly + distinguish between transport level errors indicated by `err != nil` the error and + application level errors by checking the status code. + + https://github.com/cs3org/reva/pull/2415 + + * Bugfix #2419: List project spaces for share recipients + + The sharing handler now uses the ListProvider call on the registry when sharing by reference. + Furthermore, the decomposedfs now checks permissions on the root of a space so that a space is + listed for users that have access to a space. + + https://github.com/cs3org/reva/pull/2419 + + * Bugfix #2501: Fix spaces stat + + When stating a space e.g. the Share Jail and that space contains another space, in this case a + share then the stat would sometimes get the sub space instead of the Share Jail itself. + + https://github.com/cs3org/reva/pull/2501 + + * Bugfix #2432: Use space reference when listing containers + + The propfind handler now uses the reference for a space to make lookups relative. + + https://github.com/cs3org/reva/pull/2432 + + * Bugfix #2572: Wait for nats server on middleware start + + Use a retry mechanism to connect to the nats server when it is not ready yet + + https://github.com/cs3org/reva/pull/2572 + + * Bugfix #2454: Fix webdav paths in PROPFINDS + + The WebDAV Api was handling paths on spaces propfinds in the wrong way. This has been fixed in the + WebDAV layer. + + https://github.com/cs3org/reva/pull/2454 + + * Change #2329: Activate the statcache + + Activates the cache of stat request/responses in the gateway. + + https://github.com/cs3org/reva/pull/2329 + + * Change #2596: Remove hash from public link urls + + Public link urls do not contain the hash anymore, this is needed to support the ocis and web + history mode. + + https://github.com/cs3org/reva/pull/2596 + https://github.com/owncloud/ocis/pull/3109 + https://github.com/owncloud/web/pull/6363 + + * Change #2495: Remove the ownCloud storage driver + + We've removed the ownCloud storage driver because it was no longer maintained after the + ownCloud SQL storage driver was added. + + If you have been using the ownCloud storage driver, please switch to the ownCloud SQL storage + driver which brings you more features and is under active maintenance. + + https://github.com/cs3org/reva/pull/2495 + + * Change #2527: Store space attributes in decomposedFS + + We need to store more space attributes in the storage. This implements extended space + attributes in the decomposedFS + + https://github.com/cs3org/reva/pull/2527 + + * Change #2581: Update hard-coded status values + + The hard-coded version and product values have been updated to be consistent in all places in + the code. + + https://github.com/cs3org/reva/pull/2581 + + * Change #2524: Use description during space creation + + We can now use a space description during space creation. We also fixed a bug in the spaces roles. + Co-owners are now maintainers. + + https://github.com/cs3org/reva/pull/2524 + + * Change #2554: Shard nodes per space in decomposedfs + + The decomposedfs changas the on disk layout to shard nodes per space. + + https://github.com/cs3org/reva/pull/2554 + + * Change #2576: Harden xattrs errors + + Unwrap the error to get the root error. + + https://github.com/cs3org/reva/pull/2576 + + * Change #2436: Replace template in GroupFilter for UserProvider with a simple string + + Previously the "groupfilter" configuration for the UserProvider expected a go-template + value (based of of an `userpb.UserId` as it's input). And it assumed we could run a single LDAP + query to get all groups a user is member of by specifying the userid. However most LDAP Servers + store the GroupMembership by either username (e.g. in memberUID Attribute) or by the user's DN + (e.g. in member/uniqueMember). + + This change removes the userpb.UserId template processing from the groupfilter and replaces + it with a single string (the username) to cleanup the config a bit. Existing configs need to be + update to replace the go template references in `groupfilter` (e.g. `{{.}}` or + `{{.OpaqueId}}`) with `{{query}}`. + + https://github.com/cs3org/reva/pull/2436 + + * Change #2429: Make archiver id based + + The archiver now uses ids to walk the tree instead of paths + + https://github.com/cs3org/reva/pull/2429 + + * Change #2340: Allow multiple space configurations per provider + + The spaces registry can now use multiple space configurations to allow personal and project + spaces on the same provider + + https://github.com/cs3org/reva/pull/2340 + + * Change #2396: The ocdav handler is now spaces aware + + It will use LookupStorageSpaces and make only relative requests to the gateway. Temp comment + + https://github.com/cs3org/reva/pull/2396 + + * Change #2349: Require `ListRecycle` when listing trashbin + + Previously there was no check, so anyone could list anyones trash + + https://github.com/cs3org/reva/pull/2349 + + * Change #2353: Reduce log output + + Reduced log output. Some errors or warnings were logged multiple times or even unnecesarily. + + https://github.com/cs3org/reva/pull/2353 + + * Change #2542: Do not encode webDAV ids to base64 + + We removed the base64 encoding of the IDs and use the format ! with a `!` + delimiter. As a reserved delimiter it is URL safe. The IDs will be XML and JSON encoded as + necessary. + + https://github.com/cs3org/reva/pull/2542 + https://github.com/cs3org/reva/pull/2558 + + * Change #2519: Remove the auto creation of the .space folder + + We removed the auto creation of the .space folder because we don't develop this feature + further. + + https://github.com/cs3org/reva/pull/2519 + + * Change #2394: Remove logic from gateway + + The gateway will now hold no logic except forwarding the requests to other services. + + https://github.com/cs3org/reva/pull/2394 + + * Change #2023: Add a sharestorageprovider + + This PR adds a ShareStorageProvider which enables us to get rid of a lot of special casing in + other parts of the code. It also fixes several issues regarding shares and group shares. + + https://github.com/cs3org/reva/pull/2023 + + * Change #2234: Add a spaces registry + + Spaces registry is supposed to manage spaces. Read + `pkg/storage/registry/spaces/Readme.md` for full details + + https://github.com/cs3org/reva/pull/2234 + + * Change #2339: Fix static registry regressions + + We fixed some smaller issues with using the static registry which were introduced with the + spaces registry changes. + + https://github.com/cs3org/reva/pull/2339 + + * Change #2370: Fix static registry regressions + + We fixed some smaller issues with using the static registry which were introduced with the + spaces registry changes. + + https://github.com/cs3org/reva/pull/2370 + + * Change #2354: Return not found when updating non existent space + + If a spaceid of a space which is updated doesn't exist, handle it as a not found error. + + https://github.com/cs3org/reva/pull/2354 + + * Change #2589: Remove deprecated linter modules + + Replaced the deprecated linter modules with the recommended ones. + + https://github.com/cs3org/reva/pull/2589 + + * Change #2016: Move wrapping and unwrapping of paths to the storage gateway + + We've moved the wrapping and unwrapping of reference paths to the storage gateway so that the + storageprovider doesn't have to know its mount path. + + https://github.com/cs3org/reva/pull/2016 + + * Enhancement #2591: Set up App Locks with basic locks + + To set up App Locks basic locks are used now + + https://github.com/cs3org/reva/pull/2591 + + * Enhancement #1209: Reva CephFS module v0.2.1 + + https://github.com/cs3org/reva/pull/1209 + + * Enhancement #2511: Error handling cleanup in decomposed FS + + - Avoid inconsensitencies by cleaning up actions in case of err + + https://github.com/cs3org/reva/pull/2511 + + * Enhancement #2516: Cleaned up some code + + - Reduced type conversions []byte <-> string - pre-compile chunking regex + + https://github.com/cs3org/reva/pull/2516 + + * Enhancement #2512: Consolidate xattr setter and getter + + - Consolidate all metadata Get's and Set's to central functions. - Cleaner code by reduction of + casts - Easier to hook functionality like indexing + + https://github.com/cs3org/reva/pull/2512 + + * Enhancement #2341: Use CS3 permissions API + + Added calls to the CS3 permissions API to the decomposedfs in order to check the user + permissions. + + https://github.com/cs3org/reva/pull/2341 + + * Enhancement #2343: Allow multiple space type fileters on decomposedfs + + The decomposedfs driver now evaluates multiple space type filters when listing storage + spaces. + + https://github.com/cs3org/reva/pull/2343 + + * Enhancement #2460: Add locking support to decomposedfs + + The decomposedfs now implements application level locking + + https://github.com/cs3org/reva/pull/2460 + + * Enhancement #2540: Refactored the xattrs package in the decomposedfs + + The xattrs package now uses the xattr.ENOATTR instead of os.ENODATA or os.ENOATTR to check + attribute existence. + + https://github.com/cs3org/reva/pull/2540 + https://github.com/cs3org/reva/pull/2541 + + * Enhancement #2463: Do not log whole nodes + + It turns out that logging whole node objects is very expensive and also spams the logs quite a + bit. Instead we just log the node ID now. + + https://github.com/cs3org/reva/pull/2463 + + * Enhancement #2350: Add file locking methods to the storage and filesystem interfaces + + We've added the file locking methods from the CS3apis to the storage and filesystem + interfaces. As of now they are dummy implementations and will only return "unimplemented" + errors. + + https://github.com/cs3org/reva/pull/2350 + https://github.com/cs3org/cs3apis/pull/160 + + * Enhancement #2379: Add new file url of the app provider to the ocs capabilities + + We've added the new file capability of the app provider to the ocs capabilities, so that clients + can discover this url analogous to the app list and file open urls. + + https://github.com/cs3org/reva/pull/2379 + https://github.com/owncloud/ocis/pull/2884 + https://github.com/owncloud/web/pull/5890#issuecomment-993905242 + + * Enhancement #2369: Implement TouchFile from the CS3apis + + We've updated the CS3apis and implemented the TouchFile method. + + https://github.com/cs3org/reva/pull/2369 + https://github.com/cs3org/cs3apis/pull/154 + + * Enhancement #2385: Allow to create new files with the app provider on public links + + We've added the option to create files with the app provider on public links. + + https://github.com/cs3org/reva/pull/2385 + + * Enhancement #2397: Product field in OCS version + + We've added a new field to the OCS Version, which is supposed to announce the product name. The + web ui as a client will make use of it to make the backend product and version available (e.g. for + easier bug reports). + + https://github.com/cs3org/reva/pull/2397 + + * Enhancement #2393: Update tus/tusd to version 1.8.0 + + We've update tus/tusd to version 1.8.0. + + https://github.com/cs3org/reva/issues/2393 + https://github.com/cs3org/reva/pull/2224 + + * Enhancement #2522: Introduce events + + This will introduce events into the system. Events are a simple way to bring information from + one service to another. Read `pkg/events/example` and subfolders for more information + + https://github.com/cs3org/reva/pull/2522 + + * Enhancement #2528: Use an exclcusive write lock when writing multiple attributes + + The xattr package can use an exclusive write lock when writing multiple extended attributes + + https://github.com/cs3org/reva/pull/2528 + + * Enhancement #2595: Add integration test for the groupprovider + + Some new integration tests were added to cover the groupprovider. + + https://github.com/cs3org/reva/pull/2595 + + * Enhancement #2439: Ignore handled errors when creating spaces + + The CreateStorageSpace no longer logs all error cases with error level logging + + https://github.com/cs3org/reva/pull/2439 + + * Enhancement #2500: Invalidate listproviders cache + + We now invalidate the related listproviders cache entries when updating or deleting a storage + space. + + https://github.com/cs3org/reva/pull/2500 + + * Enhancement #2345: Don't assume that the LDAP groupid in reva matches the name + + This allows using attributes like e.g. `entryUUID` or any custom id attribute as the id for + groups. + + https://github.com/cs3org/reva/pull/2345 + + * Enhancement #2525: Allow using AD UUID as userId values + + Active Directory UUID attributes (like e.g. objectGUID) use the LDAP octectString Syntax. In + order to be able to use them as userids in reva, they need to be converted to their string + representation. + + https://github.com/cs3org/reva/pull/2525 + + * Enhancement #2584: Allow running userprovider integration tests for the LDAP driver + + We extended the integration test suite for the userprovider to allow running it with an LDAP + server. + + https://github.com/cs3org/reva/pull/2584 + + * Enhancement #2585: Add metadata storage layer and indexer + + We ported over and enhanced the metadata storage layer and indexer from ocis-pkg so that it can + be used by reva services as well. + + https://github.com/cs3org/reva/pull/2585 + + * Enhancement #2163: Nextcloud-based share manager for pkg/ocm/share + + Note that pkg/ocm/share is very similar to pkg/share, but it deals with cs3/sharing/ocm + whereas pkg/share deals with cs3/sharing/collaboration + + https://github.com/cs3org/reva/pull/2163 + + * Enhancement #2278: OIDC driver changes for lightweight users + + https://github.com/cs3org/reva/pull/2278 + + * Enhancement #2315: Add new attributes to public link propfinds + + Added a new property "oc:signature-auth" to public link propfinds. This is a necessary change + to be able to support archive downloads in password protected public links. + + https://github.com/cs3org/reva/pull/2315 + + * Enhancement #2431: Delete shares when purging spaces + + Implemented the second step of the two step spaces delete process. The first step is marking the + space as deleted, the second step is actually purging the space. During the second step all + shares, including public shares, in the space will be deleted. When deleting a space the blobs + are currently not yet deleted since the decomposedfs will receive some changes soon. + + https://github.com/cs3org/reva/pull/2431 + https://github.com/cs3org/reva/pull/2458 + + * Enhancement #2434: Refactor ocdav into smaller chunks + + That increases code clarity and enables testing. + + https://github.com/cs3org/reva/pull/2434 + + * Enhancement #2524: Add checks when removing space members + + - Removed owners from project spaces - Prevent deletion of last space manager - Viewers and + editors can always be deleted - Managers can only be deleted when there will be at least one + remaining + + https://github.com/cs3org/reva/pull/2524 + + * Enhancement #2457: Restore spaces that were previously deleted + + After the first step of the two step delete process an admin can decide to restore the space + instead of deleting it. This will undo the deletion and all files and shares are accessible + again + + https://github.com/cs3org/reva/pull/2457 + + * Enhancement #2498: Include grants in list storage spaces response + + Added the grants to the response of list storage spaces. This allows service clients to show who + has access to a space. + + https://github.com/cs3org/reva/pull/2498 + + * Enhancement #2344: Allow listing all storage spaces + + To implement the drives api we now list all spaces when no filter is given. The Provider info will + not contain any spaces as the client is responsible for looking up the spaces. + + https://github.com/cs3org/reva/pull/2344 + + * Enhancement #2547: Add an if-match check to the storage provider + + Implement a check for the if-match value in InitiateFileUpload to prevent overwrites of newer + versions. + + https://github.com/cs3org/reva/pull/2547 + + * Enhancement #2486: Update cs3apis to include lock api changes + + https://github.com/cs3org/reva/pull/2486 + + * Enhancement #2526: Upgrade ginkgo to v2 + + https://github.com/cs3org/reva/pull/2526 + + Changelog for reva 1.17.0 (2021-12-09) ======================================= diff --git a/RELEASE_DATE b/RELEASE_DATE index 3b6b771b94..8dc27fbeaa 100644 --- a/RELEASE_DATE +++ b/RELEASE_DATE @@ -1 +1 @@ -2021-12-09 \ No newline at end of file +2022-03-03 \ No newline at end of file diff --git a/VERSION b/VERSION index 73d74673c7..359a5b952d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.0 \ No newline at end of file +2.0.0 \ No newline at end of file diff --git a/changelog/unreleased/activate-statcache.md b/changelog/2.0.0_2022-03-03/activate-statcache.md similarity index 100% rename from changelog/unreleased/activate-statcache.md rename to changelog/2.0.0_2022-03-03/activate-statcache.md diff --git a/changelog/unreleased/applockslocked.md b/changelog/2.0.0_2022-03-03/applockslocked.md similarity index 100% rename from changelog/unreleased/applockslocked.md rename to changelog/2.0.0_2022-03-03/applockslocked.md diff --git a/changelog/unreleased/cephfs-driver.md b/changelog/2.0.0_2022-03-03/cephfs-driver.md similarity index 100% rename from changelog/unreleased/cephfs-driver.md rename to changelog/2.0.0_2022-03-03/cephfs-driver.md diff --git a/changelog/unreleased/change-public-link-hash.md b/changelog/2.0.0_2022-03-03/change-public-link-hash.md similarity index 100% rename from changelog/unreleased/change-public-link-hash.md rename to changelog/2.0.0_2022-03-03/change-public-link-hash.md diff --git a/changelog/unreleased/change-remove-owncloud-storage-driver.md b/changelog/2.0.0_2022-03-03/change-remove-owncloud-storage-driver.md similarity index 100% rename from changelog/unreleased/change-remove-owncloud-storage-driver.md rename to changelog/2.0.0_2022-03-03/change-remove-owncloud-storage-driver.md diff --git a/changelog/unreleased/change-space-attributes.md b/changelog/2.0.0_2022-03-03/change-space-attributes.md similarity index 100% rename from changelog/unreleased/change-space-attributes.md rename to changelog/2.0.0_2022-03-03/change-space-attributes.md diff --git a/changelog/unreleased/change-status-values.md b/changelog/2.0.0_2022-03-03/change-status-values.md similarity index 100% rename from changelog/unreleased/change-status-values.md rename to changelog/2.0.0_2022-03-03/change-status-values.md diff --git a/changelog/unreleased/change-use-description-during-space-creation.md b/changelog/2.0.0_2022-03-03/change-use-description-during-space-creation.md similarity index 100% rename from changelog/unreleased/change-use-description-during-space-creation.md rename to changelog/2.0.0_2022-03-03/change-use-description-during-space-creation.md diff --git a/changelog/unreleased/clean-dfs1.md b/changelog/2.0.0_2022-03-03/clean-dfs1.md similarity index 100% rename from changelog/unreleased/clean-dfs1.md rename to changelog/2.0.0_2022-03-03/clean-dfs1.md diff --git a/changelog/unreleased/cleanup-code.md b/changelog/2.0.0_2022-03-03/cleanup-code.md similarity index 100% rename from changelog/unreleased/cleanup-code.md rename to changelog/2.0.0_2022-03-03/cleanup-code.md diff --git a/changelog/unreleased/consolidate-xattr.md b/changelog/2.0.0_2022-03-03/consolidate-xattr.md similarity index 100% rename from changelog/unreleased/consolidate-xattr.md rename to changelog/2.0.0_2022-03-03/consolidate-xattr.md diff --git a/changelog/unreleased/cs3-permissions-service.md b/changelog/2.0.0_2022-03-03/cs3-permissions-service.md similarity index 100% rename from changelog/unreleased/cs3-permissions-service.md rename to changelog/2.0.0_2022-03-03/cs3-permissions-service.md diff --git a/changelog/unreleased/decomposedfs-allow-multiple-space-type-filters.md b/changelog/2.0.0_2022-03-03/decomposedfs-allow-multiple-space-type-filters.md similarity index 100% rename from changelog/unreleased/decomposedfs-allow-multiple-space-type-filters.md rename to changelog/2.0.0_2022-03-03/decomposedfs-allow-multiple-space-type-filters.md diff --git a/changelog/unreleased/decomposedfs-locking.md b/changelog/2.0.0_2022-03-03/decomposedfs-locking.md similarity index 100% rename from changelog/unreleased/decomposedfs-locking.md rename to changelog/2.0.0_2022-03-03/decomposedfs-locking.md diff --git a/changelog/unreleased/decomposedfs-shard-nodes-per-space.md b/changelog/2.0.0_2022-03-03/decomposedfs-shard-nodes-per-space.md similarity index 100% rename from changelog/unreleased/decomposedfs-shard-nodes-per-space.md rename to changelog/2.0.0_2022-03-03/decomposedfs-shard-nodes-per-space.md diff --git a/changelog/unreleased/decomposedfs-xattr-errors.md b/changelog/2.0.0_2022-03-03/decomposedfs-xattr-errors.md similarity index 100% rename from changelog/unreleased/decomposedfs-xattr-errors.md rename to changelog/2.0.0_2022-03-03/decomposedfs-xattr-errors.md diff --git a/changelog/unreleased/do-not-log-nodes.md b/changelog/2.0.0_2022-03-03/do-not-log-nodes.md similarity index 100% rename from changelog/unreleased/do-not-log-nodes.md rename to changelog/2.0.0_2022-03-03/do-not-log-nodes.md diff --git a/changelog/unreleased/do-not-swallow-error.md b/changelog/2.0.0_2022-03-03/do-not-swallow-error.md similarity index 100% rename from changelog/unreleased/do-not-swallow-error.md rename to changelog/2.0.0_2022-03-03/do-not-swallow-error.md diff --git a/changelog/unreleased/edge-handle-spaces-does-not-exist-case.md b/changelog/2.0.0_2022-03-03/edge-handle-spaces-does-not-exist-case.md similarity index 100% rename from changelog/unreleased/edge-handle-spaces-does-not-exist-case.md rename to changelog/2.0.0_2022-03-03/edge-handle-spaces-does-not-exist-case.md diff --git a/changelog/unreleased/enable-edge-changelog.md b/changelog/2.0.0_2022-03-03/enable-edge-changelog.md similarity index 100% rename from changelog/unreleased/enable-edge-changelog.md rename to changelog/2.0.0_2022-03-03/enable-edge-changelog.md diff --git a/changelog/unreleased/enhancement-add-locking-methods-to-interfaces.md b/changelog/2.0.0_2022-03-03/enhancement-add-locking-methods-to-interfaces.md similarity index 100% rename from changelog/unreleased/enhancement-add-locking-methods-to-interfaces.md rename to changelog/2.0.0_2022-03-03/enhancement-add-locking-methods-to-interfaces.md diff --git a/changelog/unreleased/enhancement-add-new-file-capability.md b/changelog/2.0.0_2022-03-03/enhancement-add-new-file-capability.md similarity index 100% rename from changelog/unreleased/enhancement-add-new-file-capability.md rename to changelog/2.0.0_2022-03-03/enhancement-add-new-file-capability.md diff --git a/changelog/unreleased/enhancement-add-touch-file.md b/changelog/2.0.0_2022-03-03/enhancement-add-touch-file.md similarity index 100% rename from changelog/unreleased/enhancement-add-touch-file.md rename to changelog/2.0.0_2022-03-03/enhancement-add-touch-file.md diff --git a/changelog/unreleased/enhancement-app-new-public-link.md b/changelog/2.0.0_2022-03-03/enhancement-app-new-public-link.md similarity index 100% rename from changelog/unreleased/enhancement-app-new-public-link.md rename to changelog/2.0.0_2022-03-03/enhancement-app-new-public-link.md diff --git a/changelog/unreleased/enhancement-product-field-in-ocs-version.md b/changelog/2.0.0_2022-03-03/enhancement-product-field-in-ocs-version.md similarity index 100% rename from changelog/unreleased/enhancement-product-field-in-ocs-version.md rename to changelog/2.0.0_2022-03-03/enhancement-product-field-in-ocs-version.md diff --git a/changelog/unreleased/enhancement-update-tusd.md b/changelog/2.0.0_2022-03-03/enhancement-update-tusd.md similarity index 100% rename from changelog/unreleased/enhancement-update-tusd.md rename to changelog/2.0.0_2022-03-03/enhancement-update-tusd.md diff --git a/changelog/unreleased/eos-fixes.md b/changelog/2.0.0_2022-03-03/eos-fixes.md similarity index 100% rename from changelog/unreleased/eos-fixes.md rename to changelog/2.0.0_2022-03-03/eos-fixes.md diff --git a/changelog/unreleased/events.md b/changelog/2.0.0_2022-03-03/events.md similarity index 100% rename from changelog/unreleased/events.md rename to changelog/2.0.0_2022-03-03/events.md diff --git a/changelog/unreleased/extract-space-grants.md b/changelog/2.0.0_2022-03-03/extract-space-grants.md similarity index 100% rename from changelog/unreleased/extract-space-grants.md rename to changelog/2.0.0_2022-03-03/extract-space-grants.md diff --git a/changelog/unreleased/fix-aggregated-child-folder-id.md b/changelog/2.0.0_2022-03-03/fix-aggregated-child-folder-id.md similarity index 100% rename from changelog/unreleased/fix-aggregated-child-folder-id.md rename to changelog/2.0.0_2022-03-03/fix-aggregated-child-folder-id.md diff --git a/changelog/unreleased/fix-archiver.md b/changelog/2.0.0_2022-03-03/fix-archiver.md similarity index 100% rename from changelog/unreleased/fix-archiver.md rename to changelog/2.0.0_2022-03-03/fix-archiver.md diff --git a/changelog/unreleased/fix-create-space-error-msg.md b/changelog/2.0.0_2022-03-03/fix-create-space-error-msg.md similarity index 100% rename from changelog/unreleased/fix-create-space-error-msg.md rename to changelog/2.0.0_2022-03-03/fix-create-space-error-msg.md diff --git a/changelog/unreleased/fix-id-checking-in-decomposedfs.md b/changelog/2.0.0_2022-03-03/fix-id-checking-in-decomposedfs.md similarity index 100% rename from changelog/unreleased/fix-id-checking-in-decomposedfs.md rename to changelog/2.0.0_2022-03-03/fix-id-checking-in-decomposedfs.md diff --git a/changelog/unreleased/fix-ocmd-tutorial.md b/changelog/2.0.0_2022-03-03/fix-ocmd-tutorial.md similarity index 100% rename from changelog/unreleased/fix-ocmd-tutorial.md rename to changelog/2.0.0_2022-03-03/fix-ocmd-tutorial.md diff --git a/changelog/unreleased/fix-ocs-config-unprotected.md b/changelog/2.0.0_2022-03-03/fix-ocs-config-unprotected.md similarity index 100% rename from changelog/unreleased/fix-ocs-config-unprotected.md rename to changelog/2.0.0_2022-03-03/fix-ocs-config-unprotected.md diff --git a/changelog/unreleased/fix-public-share-path.md b/changelog/2.0.0_2022-03-03/fix-public-share-path.md similarity index 100% rename from changelog/unreleased/fix-public-share-path.md rename to changelog/2.0.0_2022-03-03/fix-public-share-path.md diff --git a/changelog/unreleased/fix-registry-caching.md b/changelog/2.0.0_2022-03-03/fix-registry-caching.md similarity index 100% rename from changelog/unreleased/fix-registry-caching.md rename to changelog/2.0.0_2022-03-03/fix-registry-caching.md diff --git a/changelog/unreleased/fix-share-recyclebin.md b/changelog/2.0.0_2022-03-03/fix-share-recyclebin.md similarity index 100% rename from changelog/unreleased/fix-share-recyclebin.md rename to changelog/2.0.0_2022-03-03/fix-share-recyclebin.md diff --git a/changelog/unreleased/fix-shares-provider-filter.md b/changelog/2.0.0_2022-03-03/fix-shares-provider-filter.md similarity index 100% rename from changelog/unreleased/fix-shares-provider-filter.md rename to changelog/2.0.0_2022-03-03/fix-shares-provider-filter.md diff --git a/changelog/unreleased/fix-statcache.md b/changelog/2.0.0_2022-03-03/fix-statcache.md similarity index 100% rename from changelog/unreleased/fix-statcache.md rename to changelog/2.0.0_2022-03-03/fix-statcache.md diff --git a/changelog/unreleased/fix-webdav-copy-zero-byte-file.md b/changelog/2.0.0_2022-03-03/fix-webdav-copy-zero-byte-file.md similarity index 100% rename from changelog/unreleased/fix-webdav-copy-zero-byte-file.md rename to changelog/2.0.0_2022-03-03/fix-webdav-copy-zero-byte-file.md diff --git a/changelog/unreleased/flock-xattr-set-multiple.md b/changelog/2.0.0_2022-03-03/flock-xattr-set-multiple.md similarity index 100% rename from changelog/unreleased/flock-xattr-set-multiple.md rename to changelog/2.0.0_2022-03-03/flock-xattr-set-multiple.md diff --git a/changelog/unreleased/group-integration-tests.md b/changelog/2.0.0_2022-03-03/group-integration-tests.md similarity index 100% rename from changelog/unreleased/group-integration-tests.md rename to changelog/2.0.0_2022-03-03/group-integration-tests.md diff --git a/changelog/unreleased/handle-public-link-permissions-all.md b/changelog/2.0.0_2022-03-03/handle-public-link-permissions-all.md similarity index 100% rename from changelog/unreleased/handle-public-link-permissions-all.md rename to changelog/2.0.0_2022-03-03/handle-public-link-permissions-all.md diff --git a/changelog/unreleased/harden-xattrs-errors.md b/changelog/2.0.0_2022-03-03/harden-xattrs-errors.md similarity index 100% rename from changelog/unreleased/harden-xattrs-errors.md rename to changelog/2.0.0_2022-03-03/harden-xattrs-errors.md diff --git a/changelog/unreleased/ignore-known-erros.md b/changelog/2.0.0_2022-03-03/ignore-known-erros.md similarity index 100% rename from changelog/unreleased/ignore-known-erros.md rename to changelog/2.0.0_2022-03-03/ignore-known-erros.md diff --git a/changelog/unreleased/improve_statcache.md b/changelog/2.0.0_2022-03-03/improve_statcache.md similarity index 100% rename from changelog/unreleased/improve_statcache.md rename to changelog/2.0.0_2022-03-03/improve_statcache.md diff --git a/changelog/unreleased/invalidate-listproviders-cache.md b/changelog/2.0.0_2022-03-03/invalidate-listproviders-cache.md similarity index 100% rename from changelog/unreleased/invalidate-listproviders-cache.md rename to changelog/2.0.0_2022-03-03/invalidate-listproviders-cache.md diff --git a/changelog/unreleased/ldap-group-id.md b/changelog/2.0.0_2022-03-03/ldap-group-id.md similarity index 100% rename from changelog/unreleased/ldap-group-id.md rename to changelog/2.0.0_2022-03-03/ldap-group-id.md diff --git a/changelog/unreleased/ldap-guid.md b/changelog/2.0.0_2022-03-03/ldap-guid.md similarity index 100% rename from changelog/unreleased/ldap-guid.md rename to changelog/2.0.0_2022-03-03/ldap-guid.md diff --git a/changelog/unreleased/ldap-integration-tests.md b/changelog/2.0.0_2022-03-03/ldap-integration-tests.md similarity index 100% rename from changelog/unreleased/ldap-integration-tests.md rename to changelog/2.0.0_2022-03-03/ldap-integration-tests.md diff --git a/changelog/unreleased/ldap-usergroupfilter-template.md b/changelog/2.0.0_2022-03-03/ldap-usergroupfilter-template.md similarity index 100% rename from changelog/unreleased/ldap-usergroupfilter-template.md rename to changelog/2.0.0_2022-03-03/ldap-usergroupfilter-template.md diff --git a/changelog/unreleased/locksMutexed.md b/changelog/2.0.0_2022-03-03/locksMutexed.md similarity index 100% rename from changelog/unreleased/locksMutexed.md rename to changelog/2.0.0_2022-03-03/locksMutexed.md diff --git a/changelog/unreleased/make-archiver-id-based.md b/changelog/2.0.0_2022-03-03/make-archiver-id-based.md similarity index 100% rename from changelog/unreleased/make-archiver-id-based.md rename to changelog/2.0.0_2022-03-03/make-archiver-id-based.md diff --git a/changelog/unreleased/make-owncloudsql-spaces-aware.md b/changelog/2.0.0_2022-03-03/make-owncloudsql-spaces-aware.md similarity index 100% rename from changelog/unreleased/make-owncloudsql-spaces-aware.md rename to changelog/2.0.0_2022-03-03/make-owncloudsql-spaces-aware.md diff --git a/changelog/unreleased/metadata-storage.md b/changelog/2.0.0_2022-03-03/metadata-storage.md similarity index 100% rename from changelog/unreleased/metadata-storage.md rename to changelog/2.0.0_2022-03-03/metadata-storage.md diff --git a/changelog/unreleased/multiple-spaces-per-provider.md b/changelog/2.0.0_2022-03-03/multiple-spaces-per-provider.md similarity index 100% rename from changelog/unreleased/multiple-spaces-per-provider.md rename to changelog/2.0.0_2022-03-03/multiple-spaces-per-provider.md diff --git a/changelog/unreleased/nextcloud-ocm-share-manager.md b/changelog/2.0.0_2022-03-03/nextcloud-ocm-share-manager.md similarity index 100% rename from changelog/unreleased/nextcloud-ocm-share-manager.md rename to changelog/2.0.0_2022-03-03/nextcloud-ocm-share-manager.md diff --git a/changelog/unreleased/ocdav-spaces-aware.md b/changelog/2.0.0_2022-03-03/ocdav-spaces-aware.md similarity index 100% rename from changelog/unreleased/ocdav-spaces-aware.md rename to changelog/2.0.0_2022-03-03/ocdav-spaces-aware.md diff --git a/changelog/unreleased/oidc-lw-users.md b/changelog/2.0.0_2022-03-03/oidc-lw-users.md similarity index 100% rename from changelog/unreleased/oidc-lw-users.md rename to changelog/2.0.0_2022-03-03/oidc-lw-users.md diff --git a/changelog/unreleased/pass-complete-spaces-as-json.md b/changelog/2.0.0_2022-03-03/pass-complete-spaces-as-json.md similarity index 100% rename from changelog/unreleased/pass-complete-spaces-as-json.md rename to changelog/2.0.0_2022-03-03/pass-complete-spaces-as-json.md diff --git a/changelog/unreleased/propfind-listing.md b/changelog/2.0.0_2022-03-03/propfind-listing.md similarity index 100% rename from changelog/unreleased/propfind-listing.md rename to changelog/2.0.0_2022-03-03/propfind-listing.md diff --git a/changelog/unreleased/public-link-propfind.md b/changelog/2.0.0_2022-03-03/public-link-propfind.md similarity index 100% rename from changelog/unreleased/public-link-propfind.md rename to changelog/2.0.0_2022-03-03/public-link-propfind.md diff --git a/changelog/unreleased/purge-spaces.md b/changelog/2.0.0_2022-03-03/purge-spaces.md similarity index 100% rename from changelog/unreleased/purge-spaces.md rename to changelog/2.0.0_2022-03-03/purge-spaces.md diff --git a/changelog/unreleased/recyclebin-access-control.md b/changelog/2.0.0_2022-03-03/recyclebin-access-control.md similarity index 100% rename from changelog/unreleased/recyclebin-access-control.md rename to changelog/2.0.0_2022-03-03/recyclebin-access-control.md diff --git a/changelog/unreleased/reduce-log-output.md b/changelog/2.0.0_2022-03-03/reduce-log-output.md similarity index 100% rename from changelog/unreleased/reduce-log-output.md rename to changelog/2.0.0_2022-03-03/reduce-log-output.md diff --git a/changelog/unreleased/refactor-ocdav.md b/changelog/2.0.0_2022-03-03/refactor-ocdav.md similarity index 100% rename from changelog/unreleased/refactor-ocdav.md rename to changelog/2.0.0_2022-03-03/refactor-ocdav.md diff --git a/changelog/unreleased/remove-base64-encoding-of-ids.md b/changelog/2.0.0_2022-03-03/remove-base64-encoding-of-ids.md similarity index 100% rename from changelog/unreleased/remove-base64-encoding-of-ids.md rename to changelog/2.0.0_2022-03-03/remove-base64-encoding-of-ids.md diff --git a/changelog/unreleased/remove-dot-space.md b/changelog/2.0.0_2022-03-03/remove-dot-space.md similarity index 100% rename from changelog/unreleased/remove-dot-space.md rename to changelog/2.0.0_2022-03-03/remove-dot-space.md diff --git a/changelog/unreleased/remove-logic-from-gateway.md b/changelog/2.0.0_2022-03-03/remove-logic-from-gateway.md similarity index 100% rename from changelog/unreleased/remove-logic-from-gateway.md rename to changelog/2.0.0_2022-03-03/remove-logic-from-gateway.md diff --git a/changelog/unreleased/remove-space-members.md b/changelog/2.0.0_2022-03-03/remove-space-members.md similarity index 100% rename from changelog/unreleased/remove-space-members.md rename to changelog/2.0.0_2022-03-03/remove-space-members.md diff --git a/changelog/unreleased/remove-unused-home-provider-config.md b/changelog/2.0.0_2022-03-03/remove-unused-home-provider-config.md similarity index 100% rename from changelog/unreleased/remove-unused-home-provider-config.md rename to changelog/2.0.0_2022-03-03/remove-unused-home-provider-config.md diff --git a/changelog/unreleased/restore-spaces.md b/changelog/2.0.0_2022-03-03/restore-spaces.md similarity index 100% rename from changelog/unreleased/restore-spaces.md rename to changelog/2.0.0_2022-03-03/restore-spaces.md diff --git a/changelog/unreleased/revert-upload-fix.md b/changelog/2.0.0_2022-03-03/revert-upload-fix.md similarity index 97% rename from changelog/unreleased/revert-upload-fix.md rename to changelog/2.0.0_2022-03-03/revert-upload-fix.md index f285a5b152..adcddefd35 100644 --- a/changelog/unreleased/revert-upload-fix.md +++ b/changelog/2.0.0_2022-03-03/revert-upload-fix.md @@ -1,5 +1,5 @@ -Bugfix: revert fix decomposedfs upload - -reverting https://github.com/cs3org/reva/pull/2330 to fix it properly - +Bugfix: revert fix decomposedfs upload + +reverting https://github.com/cs3org/reva/pull/2330 to fix it properly + https://github.com/cs3org/reva/pull/2334 \ No newline at end of file diff --git a/changelog/unreleased/services-should-never-return-transport-level-errors.md b/changelog/2.0.0_2022-03-03/services-should-never-return-transport-level-errors.md similarity index 100% rename from changelog/unreleased/services-should-never-return-transport-level-errors.md rename to changelog/2.0.0_2022-03-03/services-should-never-return-transport-level-errors.md diff --git a/changelog/unreleased/sharestorageprovider.md b/changelog/2.0.0_2022-03-03/sharestorageprovider.md similarity index 100% rename from changelog/unreleased/sharestorageprovider.md rename to changelog/2.0.0_2022-03-03/sharestorageprovider.md diff --git a/changelog/unreleased/spaces-fixes.md b/changelog/2.0.0_2022-03-03/spaces-fixes.md similarity index 100% rename from changelog/unreleased/spaces-fixes.md rename to changelog/2.0.0_2022-03-03/spaces-fixes.md diff --git a/changelog/unreleased/spaces-grants.md b/changelog/2.0.0_2022-03-03/spaces-grants.md similarity index 100% rename from changelog/unreleased/spaces-grants.md rename to changelog/2.0.0_2022-03-03/spaces-grants.md diff --git a/changelog/unreleased/spaces-registry-allow-list-all.md b/changelog/2.0.0_2022-03-03/spaces-registry-allow-list-all.md similarity index 100% rename from changelog/unreleased/spaces-registry-allow-list-all.md rename to changelog/2.0.0_2022-03-03/spaces-registry-allow-list-all.md diff --git a/changelog/unreleased/spaces-registry.md b/changelog/2.0.0_2022-03-03/spaces-registry.md similarity index 100% rename from changelog/unreleased/spaces-registry.md rename to changelog/2.0.0_2022-03-03/spaces-registry.md diff --git a/changelog/unreleased/spaces-stat.md b/changelog/2.0.0_2022-03-03/spaces-stat.md similarity index 100% rename from changelog/unreleased/spaces-stat.md rename to changelog/2.0.0_2022-03-03/spaces-stat.md diff --git a/changelog/unreleased/static-registry.md b/changelog/2.0.0_2022-03-03/static-registry.md similarity index 100% rename from changelog/unreleased/static-registry.md rename to changelog/2.0.0_2022-03-03/static-registry.md diff --git a/changelog/unreleased/static-registry2.md b/changelog/2.0.0_2022-03-03/static-registry2.md similarity index 100% rename from changelog/unreleased/static-registry2.md rename to changelog/2.0.0_2022-03-03/static-registry2.md diff --git a/changelog/unreleased/storage-if-match.md b/changelog/2.0.0_2022-03-03/storage-if-match.md similarity index 100% rename from changelog/unreleased/storage-if-match.md rename to changelog/2.0.0_2022-03-03/storage-if-match.md diff --git a/changelog/unreleased/update-cs3-lock-api.md b/changelog/2.0.0_2022-03-03/update-cs3-lock-api.md similarity index 100% rename from changelog/unreleased/update-cs3-lock-api.md rename to changelog/2.0.0_2022-03-03/update-cs3-lock-api.md diff --git a/changelog/unreleased/update-handle-empty-spaces.md b/changelog/2.0.0_2022-03-03/update-handle-empty-spaces.md similarity index 100% rename from changelog/unreleased/update-handle-empty-spaces.md rename to changelog/2.0.0_2022-03-03/update-handle-empty-spaces.md diff --git a/changelog/unreleased/update-linter-config.md b/changelog/2.0.0_2022-03-03/update-linter-config.md similarity index 100% rename from changelog/unreleased/update-linter-config.md rename to changelog/2.0.0_2022-03-03/update-linter-config.md diff --git a/changelog/unreleased/upgrade-ginkgo.md b/changelog/2.0.0_2022-03-03/upgrade-ginkgo.md similarity index 100% rename from changelog/unreleased/upgrade-ginkgo.md rename to changelog/2.0.0_2022-03-03/upgrade-ginkgo.md diff --git a/changelog/unreleased/use-space-reference.md b/changelog/2.0.0_2022-03-03/use-space-reference.md similarity index 100% rename from changelog/unreleased/use-space-reference.md rename to changelog/2.0.0_2022-03-03/use-space-reference.md diff --git a/changelog/unreleased/waitForNats.md b/changelog/2.0.0_2022-03-03/waitForNats.md similarity index 100% rename from changelog/unreleased/waitForNats.md rename to changelog/2.0.0_2022-03-03/waitForNats.md diff --git a/changelog/unreleased/webdav-path-fix.md b/changelog/2.0.0_2022-03-03/webdav-path-fix.md similarity index 100% rename from changelog/unreleased/webdav-path-fix.md rename to changelog/2.0.0_2022-03-03/webdav-path-fix.md diff --git a/changelog/unreleased/wrap-unwrap-in-gateway.md b/changelog/2.0.0_2022-03-03/wrap-unwrap-in-gateway.md similarity index 100% rename from changelog/unreleased/wrap-unwrap-in-gateway.md rename to changelog/2.0.0_2022-03-03/wrap-unwrap-in-gateway.md diff --git a/changelog/NOTE.md b/changelog/NOTE.md index 07b1251bac..ab43283ad6 100644 --- a/changelog/NOTE.md +++ b/changelog/NOTE.md @@ -1,97 +1,678 @@ -Changelog for reva 1.17.0 (2021-12-09) +Changelog for reva 2.0.0 (2022-03-03) ======================================= -The following sections list the changes in reva 1.17.0 relevant to +The following sections list the changes in reva 2.0.0 relevant to reva users. The changes are ordered by importance. Summary ------- - * Fix #2305: Make sure /app/new takes `target` as absolute path - * Fix #2303: Fix content disposition header for public links files - * Fix #2316: Fix the share types in propfinds - * Fix #2803: Fix app provider for editor public links + * Fix #2457: Do not swallow error + * Fix #2422: Handle non existing spaces correctly + * Fix #2327: Enable changelog on edge branch + * Fix #2370: Fixes for apps in public shares, project spaces for EOS driver + * Fix #2464: Pass spacegrants when adding member to space + * Fix #2430: Fix aggregated child folder id + * Fix #2348: Make archiver handle spaces protocol + * Fix #2452: Fix create space error message + * Fix #2445: Don't handle ids containing "/" in decomposedfs + * Fix #2285: Accept new userid idp format + * Fix #2503: Remove the protection from /v?.php/config endpoints + * Fix #2462: Public shares path needs to be set + * Fix #2427: Fix registry caching * Fix #2298: Remove share refs from trashbin - * Fix #2309: Remove early finish for zero byte file uploads - * Fix #1941: Fix TUS uploads with transfer token only - * Chg #2210: Fix app provider new file creation and improved error codes - * Enh #2217: OIDC auth driver for ESCAPE IAM - * Enh #2256: Return user type in the response of the ocs GET user call + * Fix #2433: Fix shares provider filter + * Fix #2351: Fix Statcache removing + * Fix #2374: Fix webdav copy of zero byte files + * Fix #2336: Handle sending all permissions when creating public links + * Fix #2440: Add ArbitraryMetadataKeys to statcache key + * Fix #2582: Keep lock structs in a local map protected by a mutex + * Fix #2372: Make owncloudsql work with the spaces registry + * Fix #2416: The registry now returns complete space structs + * Fix #3066: Fix propfind listing for files + * Fix #2428: Remove unused home provider from config + * Fix #2334: Revert fix decomposedfs upload + * Fix #2415: Services should never return transport level errors + * Fix #2419: List project spaces for share recipients + * Fix #2501: Fix spaces stat + * Fix #2432: Use space reference when listing containers + * Fix #2572: Wait for nats server on middleware start + * Fix #2454: Fix webdav paths in PROPFINDS + * Chg #2329: Activate the statcache + * Chg #2596: Remove hash from public link urls + * Chg #2495: Remove the ownCloud storage driver + * Chg #2527: Store space attributes in decomposedFS + * Chg #2581: Update hard-coded status values + * Chg #2524: Use description during space creation + * Chg #2554: Shard nodes per space in decomposedfs + * Chg #2576: Harden xattrs errors + * Chg #2436: Replace template in GroupFilter for UserProvider with a simple string + * Chg #2429: Make archiver id based + * Chg #2340: Allow multiple space configurations per provider + * Chg #2396: The ocdav handler is now spaces aware + * Chg #2349: Require `ListRecycle` when listing trashbin + * Chg #2353: Reduce log output + * Chg #2542: Do not encode webDAV ids to base64 + * Chg #2519: Remove the auto creation of the .space folder + * Chg #2394: Remove logic from gateway + * Chg #2023: Add a sharestorageprovider + * Chg #2234: Add a spaces registry + * Chg #2339: Fix static registry regressions + * Chg #2370: Fix static registry regressions + * Chg #2354: Return not found when updating non existent space + * Chg #2589: Remove deprecated linter modules + * Chg #2016: Move wrapping and unwrapping of paths to the storage gateway + * Enh #2591: Set up App Locks with basic locks + * Enh #1209: Reva CephFS module v0.2.1 + * Enh #2511: Error handling cleanup in decomposed FS + * Enh #2516: Cleaned up some code + * Enh #2512: Consolidate xattr setter and getter + * Enh #2341: Use CS3 permissions API + * Enh #2343: Allow multiple space type fileters on decomposedfs + * Enh #2460: Add locking support to decomposedfs + * Enh #2540: Refactored the xattrs package in the decomposedfs + * Enh #2463: Do not log whole nodes + * Enh #2350: Add file locking methods to the storage and filesystem interfaces + * Enh #2379: Add new file url of the app provider to the ocs capabilities + * Enh #2369: Implement TouchFile from the CS3apis + * Enh #2385: Allow to create new files with the app provider on public links + * Enh #2397: Product field in OCS version + * Enh #2393: Update tus/tusd to version 1.8.0 + * Enh #2522: Introduce events + * Enh #2528: Use an exclcusive write lock when writing multiple attributes + * Enh #2595: Add integration test for the groupprovider + * Enh #2439: Ignore handled errors when creating spaces + * Enh #2500: Invalidate listproviders cache + * Enh #2345: Don't assume that the LDAP groupid in reva matches the name + * Enh #2525: Allow using AD UUID as userId values + * Enh #2584: Allow running userprovider integration tests for the LDAP driver + * Enh #2585: Add metadata storage layer and indexer + * Enh #2163: Nextcloud-based share manager for pkg/ocm/share + * Enh #2278: OIDC driver changes for lightweight users * Enh #2315: Add new attributes to public link propfinds - * Enh #2740: Implement space membership endpoints - * Enh #2252: Add the xattr sys.acl to SysACL (eosgrpc) - * Enh #2314: OIDC: fallback if IDP doesn't provide "preferred_username" claim + * Enh #2431: Delete shares when purging spaces + * Enh #2434: Refactor ocdav into smaller chunks + * Enh #2524: Add checks when removing space members + * Enh #2457: Restore spaces that were previously deleted + * Enh #2498: Include grants in list storage spaces response + * Enh #2344: Allow listing all storage spaces + * Enh #2547: Add an if-match check to the storage provider + * Enh #2486: Update cs3apis to include lock api changes + * Enh #2526: Upgrade ginkgo to v2 Details ------- - * Bugfix #2305: Make sure /app/new takes `target` as absolute path + * Bugfix #2457: Do not swallow error - A mini-PR to make the `target` parameter absolute (by prepending `/` if missing). + Decomposedfs not longer swallows errors when creating a node fails. - https://github.com/cs3org/reva/pull/2305 + https://github.com/cs3org/reva/pull/2457 - * Bugfix #2303: Fix content disposition header for public links files + * Bugfix #2422: Handle non existing spaces correctly - https://github.com/cs3org/reva/pull/2303 - https://github.com/cs3org/reva/pull/2297 - https://github.com/cs3org/reva/pull/2332 - https://github.com/cs3org/reva/pull/2346 + When looking up a space by id we returned the wrong status code. - * Bugfix #2316: Fix the share types in propfinds + https://github.com/cs3org/reva/pull/2422 - The share types for public links were not correctly added to propfinds. + * Bugfix #2327: Enable changelog on edge branch - https://github.com/cs3org/reva/pull/2316 + We added a `branch` flag to the `tools/check-changelog/main.go` to fix changelog checks on + the edge branch. - * Bugfix #2803: Fix app provider for editor public links + https://github.com/cs3org/reva/pull/2327 - Fixed opening the app provider in public links with the editor permission. The app provider - failed to open the file in read write mode. + * Bugfix #2370: Fixes for apps in public shares, project spaces for EOS driver - https://github.com/owncloud/ocis/issues/2803 - https://github.com/cs3org/reva/pull/2310 + https://github.com/cs3org/reva/pull/2370 + + * Bugfix #2464: Pass spacegrants when adding member to space + + When creating a space grant there should not be created a new space. Unfortunately SpaceGrant + didn't work when adding members to a space. Now a value is placed in the ctx of the + storageprovider on which decomposedfs reacts + + https://github.com/cs3org/reva/pull/2464 + + * Bugfix #2430: Fix aggregated child folder id + + Propfind now returns the correct id and correctly aggregates the mtime and etag. + + https://github.com/cs3org/reva/pull/2430 + + * Bugfix #2348: Make archiver handle spaces protocol + + The archiver can now handle the spaces protocol + + https://github.com/cs3org/reva/pull/2348 + + * Bugfix #2452: Fix create space error message + + Create space no longer errors with list spaces error messages. + + https://github.com/cs3org/reva/pull/2452 + + * Bugfix #2445: Don't handle ids containing "/" in decomposedfs + + The storageprovider previously checked all ids without checking their validity this lead to + flaky test because it shouldn't check ids that are used from the public storage provider + + https://github.com/cs3org/reva/pull/2445 + + * Bugfix #2285: Accept new userid idp format + + The format for userid idp [changed](https://github.com/cs3org/cs3apis/pull/159) and + this broke [the ocmd + tutorial](https://reva.link/docs/tutorials/share-tutorial/#5-1-4-create-the-share) + This PR makes the provider authorizer interceptor accept both the old and the new string + format. + + https://github.com/cs3org/reva/issues/2285 + https://github.com/cs3org/reva/issues/2285 + See + and + + * Bugfix #2503: Remove the protection from /v?.php/config endpoints + + We've removed the protection from the "/v1.php/config" and "/v2.php/config" endpoints to be + API compatible with ownCloud 10. + + https://github.com/cs3org/reva/issues/2503 + https://github.com/owncloud/ocis/issues/1338 + + * Bugfix #2462: Public shares path needs to be set + + We need to set the relative path to the space root for public link shares to identify them in the + shares list. + + https://github.com/owncloud/ocis/issues/2462 + https://github.com/cs3org/reva/pull/2580 + + * Bugfix #2427: Fix registry caching + + We now cache space lookups per user. + + https://github.com/cs3org/reva/pull/2427 * Bugfix #2298: Remove share refs from trashbin https://github.com/cs3org/reva/pull/2298 - * Bugfix #2309: Remove early finish for zero byte file uploads + * Bugfix #2433: Fix shares provider filter + + The shares storage provider now correctly filters space types + + https://github.com/cs3org/reva/pull/2433 + + * Bugfix #2351: Fix Statcache removing + + Removing from statcache didn't work correctly with different setups. Unified and fixed + + https://github.com/cs3org/reva/pull/2351 + + * Bugfix #2374: Fix webdav copy of zero byte files + + We've fixed the webdav copy action of zero byte files, which was not performed because the + webdav api assumed, that zero byte uploads are created when initiating the upload, which was + recently removed from all storage drivers. Therefore the webdav api also uploads zero byte + files after initiating the upload. + + https://github.com/cs3org/reva/pull/2374 + https://github.com/cs3org/reva/pull/2309 + + * Bugfix #2336: Handle sending all permissions when creating public links + + For backwards compatability we now reduce permissions to readonly when a create public link + carries all permissions. + + https://github.com/cs3org/reva/issues/2336 + https://github.com/owncloud/ocis/issues/1269 + + * Bugfix #2440: Add ArbitraryMetadataKeys to statcache key + + Otherwise stating with and without them would return the same result (because it is cached) + + https://github.com/cs3org/reva/pull/2440 + + * Bugfix #2582: Keep lock structs in a local map protected by a mutex + + Make sure that only one go routine or process can get the lock. + + https://github.com/cs3org/reva/pull/2582 + + * Bugfix #2372: Make owncloudsql work with the spaces registry + + Owncloudsql now works properly with the spaces registry. + + https://github.com/cs3org/reva/pull/2372 + + * Bugfix #2416: The registry now returns complete space structs + + We now return the complete space info, including name, path, owner, etc. instead of only path + and id. + + https://github.com/cs3org/reva/pull/2416 + + * Bugfix #3066: Fix propfind listing for files + + When doing a propfind for a file the result contained the files twice. + + https://github.com/owncloud/ocis/issues/3066 + https://github.com/cs3org/reva/pull/2506 + + * Bugfix #2428: Remove unused home provider from config + + The spaces registry does not use a home provider config. + + https://github.com/cs3org/reva/pull/2428 + + * Bugfix #2334: Revert fix decomposedfs upload + + Reverting https://github.com/cs3org/reva/pull/2330 to fix it properly + + https://github.com/cs3org/reva/pull/2334 + + * Bugfix #2415: Services should never return transport level errors + + The CS3 API adopted the grpc error codes from the [google grpc status + package](https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto). + It also separates transport level errors from application level errors on purpose. This + allows sending CS3 messages over protocols other than GRPC. To keep that seperation, the + server side must always return `nil`, even though the code generation for go produces function + signatures for rpcs with an `error` return property. That allows clients to clearly + distinguish between transport level errors indicated by `err != nil` the error and + application level errors by checking the status code. + + https://github.com/cs3org/reva/pull/2415 + + * Bugfix #2419: List project spaces for share recipients + + The sharing handler now uses the ListProvider call on the registry when sharing by reference. + Furthermore, the decomposedfs now checks permissions on the root of a space so that a space is + listed for users that have access to a space. + + https://github.com/cs3org/reva/pull/2419 + + * Bugfix #2501: Fix spaces stat + + When stating a space e.g. the Share Jail and that space contains another space, in this case a + share then the stat would sometimes get the sub space instead of the Share Jail itself. + + https://github.com/cs3org/reva/pull/2501 + + * Bugfix #2432: Use space reference when listing containers + + The propfind handler now uses the reference for a space to make lookups relative. + + https://github.com/cs3org/reva/pull/2432 + + * Bugfix #2572: Wait for nats server on middleware start + + Use a retry mechanism to connect to the nats server when it is not ready yet + + https://github.com/cs3org/reva/pull/2572 + + * Bugfix #2454: Fix webdav paths in PROPFINDS + + The WebDAV Api was handling paths on spaces propfinds in the wrong way. This has been fixed in the + WebDAV layer. + + https://github.com/cs3org/reva/pull/2454 + + * Change #2329: Activate the statcache + + Activates the cache of stat request/responses in the gateway. + + https://github.com/cs3org/reva/pull/2329 + + * Change #2596: Remove hash from public link urls + + Public link urls do not contain the hash anymore, this is needed to support the ocis and web + history mode. + + https://github.com/cs3org/reva/pull/2596 + https://github.com/owncloud/ocis/pull/3109 + https://github.com/owncloud/web/pull/6363 + + * Change #2495: Remove the ownCloud storage driver + + We've removed the ownCloud storage driver because it was no longer maintained after the + ownCloud SQL storage driver was added. + + If you have been using the ownCloud storage driver, please switch to the ownCloud SQL storage + driver which brings you more features and is under active maintenance. + + https://github.com/cs3org/reva/pull/2495 + + * Change #2527: Store space attributes in decomposedFS + + We need to store more space attributes in the storage. This implements extended space + attributes in the decomposedFS + + https://github.com/cs3org/reva/pull/2527 + + * Change #2581: Update hard-coded status values + + The hard-coded version and product values have been updated to be consistent in all places in + the code. + + https://github.com/cs3org/reva/pull/2581 + + * Change #2524: Use description during space creation + + We can now use a space description during space creation. We also fixed a bug in the spaces roles. + Co-owners are now maintainers. + + https://github.com/cs3org/reva/pull/2524 + + * Change #2554: Shard nodes per space in decomposedfs + + The decomposedfs changas the on disk layout to shard nodes per space. + + https://github.com/cs3org/reva/pull/2554 + + * Change #2576: Harden xattrs errors + + Unwrap the error to get the root error. + + https://github.com/cs3org/reva/pull/2576 + + * Change #2436: Replace template in GroupFilter for UserProvider with a simple string + + Previously the "groupfilter" configuration for the UserProvider expected a go-template + value (based of of an `userpb.UserId` as it's input). And it assumed we could run a single LDAP + query to get all groups a user is member of by specifying the userid. However most LDAP Servers + store the GroupMembership by either username (e.g. in memberUID Attribute) or by the user's DN + (e.g. in member/uniqueMember). + + This change removes the userpb.UserId template processing from the groupfilter and replaces + it with a single string (the username) to cleanup the config a bit. Existing configs need to be + update to replace the go template references in `groupfilter` (e.g. `{{.}}` or + `{{.OpaqueId}}`) with `{{query}}`. + + https://github.com/cs3org/reva/pull/2436 + + * Change #2429: Make archiver id based + + The archiver now uses ids to walk the tree instead of paths + + https://github.com/cs3org/reva/pull/2429 + + * Change #2340: Allow multiple space configurations per provider + + The spaces registry can now use multiple space configurations to allow personal and project + spaces on the same provider + + https://github.com/cs3org/reva/pull/2340 + + * Change #2396: The ocdav handler is now spaces aware + + It will use LookupStorageSpaces and make only relative requests to the gateway. Temp comment + + https://github.com/cs3org/reva/pull/2396 + + * Change #2349: Require `ListRecycle` when listing trashbin + + Previously there was no check, so anyone could list anyones trash - We've fixed the upload of zero byte files by removing the early upload finishing mechanism. + https://github.com/cs3org/reva/pull/2349 - https://github.com/cs3org/reva/issues/2309 - https://github.com/owncloud/ocis/issues/2609 + * Change #2353: Reduce log output - * Bugfix #1941: Fix TUS uploads with transfer token only + Reduced log output. Some errors or warnings were logged multiple times or even unnecesarily. - TUS uploads had been stopped when the user JWT token expired, even if only the transfer token - should be validated. Now uploads will continue as intended. + https://github.com/cs3org/reva/pull/2353 - https://github.com/cs3org/reva/pull/1941 + * Change #2542: Do not encode webDAV ids to base64 - * Change #2210: Fix app provider new file creation and improved error codes + We removed the base64 encoding of the IDs and use the format ! with a `!` + delimiter. As a reserved delimiter it is URL safe. The IDs will be XML and JSON encoded as + necessary. - We've fixed the behavior for the app provider when creating new files. Previously the app - provider would overwrite already existing files when creating a new file, this is now handled - and prevented. The new file endpoint accepted a path to a file, but this does not work for spaces. - Therefore we now use the resource id of the folder where the file should be created and a filename - to create the new file. Also the app provider returns more useful error codes in a lot of cases. + https://github.com/cs3org/reva/pull/2542 + https://github.com/cs3org/reva/pull/2558 - https://github.com/cs3org/reva/pull/2210 + * Change #2519: Remove the auto creation of the .space folder - * Enhancement #2217: OIDC auth driver for ESCAPE IAM + We removed the auto creation of the .space folder because we don't develop this feature + further. - This enhancement allows for oidc token authentication via the ESCAPE IAM service. - Authentication relies on mappings of ESCAPE IAM groups to REVA users. For a valid token, if at - the most one group from the groups claim is mapped to one REVA user, authentication can take - place. + https://github.com/cs3org/reva/pull/2519 - https://github.com/cs3org/reva/pull/2217 + * Change #2394: Remove logic from gateway - * Enhancement #2256: Return user type in the response of the ocs GET user call + The gateway will now hold no logic except forwarding the requests to other services. - https://github.com/cs3org/reva/pull/2256 + https://github.com/cs3org/reva/pull/2394 + + * Change #2023: Add a sharestorageprovider + + This PR adds a ShareStorageProvider which enables us to get rid of a lot of special casing in + other parts of the code. It also fixes several issues regarding shares and group shares. + + https://github.com/cs3org/reva/pull/2023 + + * Change #2234: Add a spaces registry + + Spaces registry is supposed to manage spaces. Read + `pkg/storage/registry/spaces/Readme.md` for full details + + https://github.com/cs3org/reva/pull/2234 + + * Change #2339: Fix static registry regressions + + We fixed some smaller issues with using the static registry which were introduced with the + spaces registry changes. + + https://github.com/cs3org/reva/pull/2339 + + * Change #2370: Fix static registry regressions + + We fixed some smaller issues with using the static registry which were introduced with the + spaces registry changes. + + https://github.com/cs3org/reva/pull/2370 + + * Change #2354: Return not found when updating non existent space + + If a spaceid of a space which is updated doesn't exist, handle it as a not found error. + + https://github.com/cs3org/reva/pull/2354 + + * Change #2589: Remove deprecated linter modules + + Replaced the deprecated linter modules with the recommended ones. + + https://github.com/cs3org/reva/pull/2589 + + * Change #2016: Move wrapping and unwrapping of paths to the storage gateway + + We've moved the wrapping and unwrapping of reference paths to the storage gateway so that the + storageprovider doesn't have to know its mount path. + + https://github.com/cs3org/reva/pull/2016 + + * Enhancement #2591: Set up App Locks with basic locks + + To set up App Locks basic locks are used now + + https://github.com/cs3org/reva/pull/2591 + + * Enhancement #1209: Reva CephFS module v0.2.1 + + https://github.com/cs3org/reva/pull/1209 + + * Enhancement #2511: Error handling cleanup in decomposed FS + + - Avoid inconsensitencies by cleaning up actions in case of err + + https://github.com/cs3org/reva/pull/2511 + + * Enhancement #2516: Cleaned up some code + + - Reduced type conversions []byte <-> string - pre-compile chunking regex + + https://github.com/cs3org/reva/pull/2516 + + * Enhancement #2512: Consolidate xattr setter and getter + + - Consolidate all metadata Get's and Set's to central functions. - Cleaner code by reduction of + casts - Easier to hook functionality like indexing + + https://github.com/cs3org/reva/pull/2512 + + * Enhancement #2341: Use CS3 permissions API + + Added calls to the CS3 permissions API to the decomposedfs in order to check the user + permissions. + + https://github.com/cs3org/reva/pull/2341 + + * Enhancement #2343: Allow multiple space type fileters on decomposedfs + + The decomposedfs driver now evaluates multiple space type filters when listing storage + spaces. + + https://github.com/cs3org/reva/pull/2343 + + * Enhancement #2460: Add locking support to decomposedfs + + The decomposedfs now implements application level locking + + https://github.com/cs3org/reva/pull/2460 + + * Enhancement #2540: Refactored the xattrs package in the decomposedfs + + The xattrs package now uses the xattr.ENOATTR instead of os.ENODATA or os.ENOATTR to check + attribute existence. + + https://github.com/cs3org/reva/pull/2540 + https://github.com/cs3org/reva/pull/2541 + + * Enhancement #2463: Do not log whole nodes + + It turns out that logging whole node objects is very expensive and also spams the logs quite a + bit. Instead we just log the node ID now. + + https://github.com/cs3org/reva/pull/2463 + + * Enhancement #2350: Add file locking methods to the storage and filesystem interfaces + + We've added the file locking methods from the CS3apis to the storage and filesystem + interfaces. As of now they are dummy implementations and will only return "unimplemented" + errors. + + https://github.com/cs3org/reva/pull/2350 + https://github.com/cs3org/cs3apis/pull/160 + + * Enhancement #2379: Add new file url of the app provider to the ocs capabilities + + We've added the new file capability of the app provider to the ocs capabilities, so that clients + can discover this url analogous to the app list and file open urls. + + https://github.com/cs3org/reva/pull/2379 + https://github.com/owncloud/ocis/pull/2884 + https://github.com/owncloud/web/pull/5890#issuecomment-993905242 + + * Enhancement #2369: Implement TouchFile from the CS3apis + + We've updated the CS3apis and implemented the TouchFile method. + + https://github.com/cs3org/reva/pull/2369 + https://github.com/cs3org/cs3apis/pull/154 + + * Enhancement #2385: Allow to create new files with the app provider on public links + + We've added the option to create files with the app provider on public links. + + https://github.com/cs3org/reva/pull/2385 + + * Enhancement #2397: Product field in OCS version + + We've added a new field to the OCS Version, which is supposed to announce the product name. The + web ui as a client will make use of it to make the backend product and version available (e.g. for + easier bug reports). + + https://github.com/cs3org/reva/pull/2397 + + * Enhancement #2393: Update tus/tusd to version 1.8.0 + + We've update tus/tusd to version 1.8.0. + + https://github.com/cs3org/reva/issues/2393 + https://github.com/cs3org/reva/pull/2224 + + * Enhancement #2522: Introduce events + + This will introduce events into the system. Events are a simple way to bring information from + one service to another. Read `pkg/events/example` and subfolders for more information + + https://github.com/cs3org/reva/pull/2522 + + * Enhancement #2528: Use an exclcusive write lock when writing multiple attributes + + The xattr package can use an exclusive write lock when writing multiple extended attributes + + https://github.com/cs3org/reva/pull/2528 + + * Enhancement #2595: Add integration test for the groupprovider + + Some new integration tests were added to cover the groupprovider. + + https://github.com/cs3org/reva/pull/2595 + + * Enhancement #2439: Ignore handled errors when creating spaces + + The CreateStorageSpace no longer logs all error cases with error level logging + + https://github.com/cs3org/reva/pull/2439 + + * Enhancement #2500: Invalidate listproviders cache + + We now invalidate the related listproviders cache entries when updating or deleting a storage + space. + + https://github.com/cs3org/reva/pull/2500 + + * Enhancement #2345: Don't assume that the LDAP groupid in reva matches the name + + This allows using attributes like e.g. `entryUUID` or any custom id attribute as the id for + groups. + + https://github.com/cs3org/reva/pull/2345 + + * Enhancement #2525: Allow using AD UUID as userId values + + Active Directory UUID attributes (like e.g. objectGUID) use the LDAP octectString Syntax. In + order to be able to use them as userids in reva, they need to be converted to their string + representation. + + https://github.com/cs3org/reva/pull/2525 + + * Enhancement #2584: Allow running userprovider integration tests for the LDAP driver + + We extended the integration test suite for the userprovider to allow running it with an LDAP + server. + + https://github.com/cs3org/reva/pull/2584 + + * Enhancement #2585: Add metadata storage layer and indexer + + We ported over and enhanced the metadata storage layer and indexer from ocis-pkg so that it can + be used by reva services as well. + + https://github.com/cs3org/reva/pull/2585 + + * Enhancement #2163: Nextcloud-based share manager for pkg/ocm/share + + Note that pkg/ocm/share is very similar to pkg/share, but it deals with cs3/sharing/ocm + whereas pkg/share deals with cs3/sharing/collaboration + + https://github.com/cs3org/reva/pull/2163 + + * Enhancement #2278: OIDC driver changes for lightweight users + + https://github.com/cs3org/reva/pull/2278 * Enhancement #2315: Add new attributes to public link propfinds @@ -100,22 +681,65 @@ Details https://github.com/cs3org/reva/pull/2315 - * Enhancement #2740: Implement space membership endpoints + * Enhancement #2431: Delete shares when purging spaces + + Implemented the second step of the two step spaces delete process. The first step is marking the + space as deleted, the second step is actually purging the space. During the second step all + shares, including public shares, in the space will be deleted. When deleting a space the blobs + are currently not yet deleted since the decomposedfs will receive some changes soon. + + https://github.com/cs3org/reva/pull/2431 + https://github.com/cs3org/reva/pull/2458 + + * Enhancement #2434: Refactor ocdav into smaller chunks + + That increases code clarity and enables testing. + + https://github.com/cs3org/reva/pull/2434 + + * Enhancement #2524: Add checks when removing space members + + - Removed owners from project spaces - Prevent deletion of last space manager - Viewers and + editors can always be deleted - Managers can only be deleted when there will be at least one + remaining + + https://github.com/cs3org/reva/pull/2524 + + * Enhancement #2457: Restore spaces that were previously deleted + + After the first step of the two step delete process an admin can decide to restore the space + instead of deleting it. This will undo the deletion and all files and shares are accessible + again + + https://github.com/cs3org/reva/pull/2457 + + * Enhancement #2498: Include grants in list storage spaces response + + Added the grants to the response of list storage spaces. This allows service clients to show who + has access to a space. + + https://github.com/cs3org/reva/pull/2498 + + * Enhancement #2344: Allow listing all storage spaces + + To implement the drives api we now list all spaces when no filter is given. The Provider info will + not contain any spaces as the client is responsible for looking up the spaces. + + https://github.com/cs3org/reva/pull/2344 - Implemented endpoints to add and remove members to spaces. + * Enhancement #2547: Add an if-match check to the storage provider - https://github.com/owncloud/ocis/issues/2740 - https://github.com/cs3org/reva/pull/2250 + Implement a check for the if-match value in InitiateFileUpload to prevent overwrites of newer + versions. - * Enhancement #2252: Add the xattr sys.acl to SysACL (eosgrpc) + https://github.com/cs3org/reva/pull/2547 - https://github.com/cs3org/reva/pull/2252 + * Enhancement #2486: Update cs3apis to include lock api changes - * Enhancement #2314: OIDC: fallback if IDP doesn't provide "preferred_username" claim + https://github.com/cs3org/reva/pull/2486 - Some IDPs don't support the "preferred_username" claim. Fallback to the "email" claim in that - case. + * Enhancement #2526: Upgrade ginkgo to v2 - https://github.com/cs3org/reva/pull/2314 + https://github.com/cs3org/reva/pull/2526 diff --git a/cmd/reva/app-tokens-create.go b/cmd/reva/app-tokens-create.go index 64da5ef530..20231f6073 100644 --- a/cmd/reva/app-tokens-create.go +++ b/cmd/reva/app-tokens-create.go @@ -31,8 +31,8 @@ import ( share "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" ) type appTokenCreateOpts struct { diff --git a/cmd/reva/app-tokens-list.go b/cmd/reva/app-tokens-list.go index 62605d434f..d4e46a3d9e 100644 --- a/cmd/reva/app-tokens-list.go +++ b/cmd/reva/app-tokens-list.go @@ -28,7 +28,7 @@ import ( authpv "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - scope "github.com/cs3org/reva/pkg/auth/scope" + scope "github.com/cs3org/reva/v2/pkg/auth/scope" "github.com/jedib0t/go-pretty/table" ) diff --git a/cmd/reva/app-tokens-remove.go b/cmd/reva/app-tokens-remove.go index 1fc0fcf8ea..8bd9334f0d 100644 --- a/cmd/reva/app-tokens-remove.go +++ b/cmd/reva/app-tokens-remove.go @@ -24,7 +24,7 @@ import ( applicationsv1beta1 "github.com/cs3org/go-cs3apis/cs3/auth/applications/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) func appTokensRemoveCommand() *command { diff --git a/cmd/reva/download.go b/cmd/reva/download.go index 194f415c57..1d373ea72a 100644 --- a/cmd/reva/download.go +++ b/cmd/reva/download.go @@ -29,11 +29,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" - "github.com/cs3org/reva/internal/http/services/datagateway" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" "github.com/studio-b12/gowebdav" ) diff --git a/cmd/reva/grpc.go b/cmd/reva/grpc.go index 71282c99e6..65d4011340 100644 --- a/cmd/reva/grpc.go +++ b/cmd/reva/grpc.go @@ -28,7 +28,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/cmd/reva/import.go b/cmd/reva/import.go index 649c4bd211..8a9ff50d39 100644 --- a/cmd/reva/import.go +++ b/cmd/reva/import.go @@ -23,7 +23,7 @@ import ( "log" "path" - "github.com/cs3org/reva/pkg/storage/migrate" + "github.com/cs3org/reva/v2/pkg/storage/migrate" "github.com/pkg/errors" ) diff --git a/cmd/reva/main.go b/cmd/reva/main.go index a77df4b34f..c46bd27f53 100644 --- a/cmd/reva/main.go +++ b/cmd/reva/main.go @@ -27,7 +27,7 @@ import ( "time" "github.com/c-bata/go-prompt" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp" ) var ( diff --git a/cmd/reva/ocm-share-create.go b/cmd/reva/ocm-share-create.go index 06ce7c9105..089c7920c4 100644 --- a/cmd/reva/ocm-share-create.go +++ b/cmd/reva/ocm-share-create.go @@ -31,7 +31,7 @@ import ( ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/jedib0t/go-pretty/table" "github.com/pkg/errors" ) diff --git a/cmd/reva/ocm-share-list.go b/cmd/reva/ocm-share-list.go index ed246a8c26..185a15d398 100644 --- a/cmd/reva/ocm-share-list.go +++ b/cmd/reva/ocm-share-list.go @@ -29,7 +29,7 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/ocm/share" + "github.com/cs3org/reva/v2/pkg/ocm/share" "github.com/jedib0t/go-pretty/table" ) diff --git a/cmd/reva/open-in-app.go b/cmd/reva/open-in-app.go index feaa676664..a831c676ae 100644 --- a/cmd/reva/open-in-app.go +++ b/cmd/reva/open-in-app.go @@ -26,7 +26,7 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" ) diff --git a/cmd/reva/public-share-list.go b/cmd/reva/public-share-list.go index baa13e4ad5..b21a15c18b 100644 --- a/cmd/reva/public-share-list.go +++ b/cmd/reva/public-share-list.go @@ -29,7 +29,7 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/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/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/publicshare" "github.com/jedib0t/go-pretty/table" ) diff --git a/cmd/reva/share-create.go b/cmd/reva/share-create.go index 3713b76e6e..fe915ebd06 100644 --- a/cmd/reva/share-create.go +++ b/cmd/reva/share-create.go @@ -28,7 +28,7 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/jedib0t/go-pretty/table" "github.com/pkg/errors" ) diff --git a/cmd/reva/share-list.go b/cmd/reva/share-list.go index fa00b1dc0b..6f5f326399 100644 --- a/cmd/reva/share-list.go +++ b/cmd/reva/share-list.go @@ -29,7 +29,7 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/share" + "github.com/cs3org/reva/v2/pkg/share" "github.com/jedib0t/go-pretty/table" ) diff --git a/cmd/reva/transfer-create.go b/cmd/reva/transfer-create.go index 44654f9104..be0666d2dd 100644 --- a/cmd/reva/transfer-create.go +++ b/cmd/reva/transfer-create.go @@ -32,7 +32,7 @@ import ( ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/jedib0t/go-pretty/table" "github.com/pkg/errors" ) diff --git a/cmd/reva/upload.go b/cmd/reva/upload.go index 9dd54df050..0967798806 100644 --- a/cmd/reva/upload.go +++ b/cmd/reva/upload.go @@ -27,24 +27,24 @@ import ( "path/filepath" "strconv" - "github.com/cs3org/reva/internal/http/services/datagateway" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" "github.com/pkg/errors" 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" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/eventials/go-tus" "github.com/eventials/go-tus/memorystore" "github.com/studio-b12/gowebdav" // TODO(labkode): this should not come from this package. - "github.com/cs3org/reva/internal/grpc/services/storageprovider" - "github.com/cs3org/reva/pkg/crypto" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + "github.com/cs3org/reva/v2/pkg/crypto" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/utils" ) func uploadCommand() *command { diff --git a/cmd/revad/main.go b/cmd/revad/main.go index e803757c3d..d1470f8c27 100644 --- a/cmd/revad/main.go +++ b/cmd/revad/main.go @@ -28,10 +28,10 @@ import ( "sync" "syscall" - "github.com/cs3org/reva/cmd/revad/internal/config" - "github.com/cs3org/reva/cmd/revad/internal/grace" - "github.com/cs3org/reva/cmd/revad/runtime" - "github.com/cs3org/reva/pkg/sysinfo" + "github.com/cs3org/reva/v2/cmd/revad/internal/config" + "github.com/cs3org/reva/v2/cmd/revad/internal/grace" + "github.com/cs3org/reva/v2/cmd/revad/runtime" + "github.com/cs3org/reva/v2/pkg/sysinfo" "github.com/google/uuid" ) diff --git a/cmd/revad/runtime/loader.go b/cmd/revad/runtime/loader.go index a0df692027..4f2f3830a8 100644 --- a/cmd/revad/runtime/loader.go +++ b/cmd/revad/runtime/loader.go @@ -20,32 +20,32 @@ package runtime import ( // These are all the extensions points for REVA - _ "github.com/cs3org/reva/internal/grpc/interceptors/loader" - _ "github.com/cs3org/reva/internal/grpc/services/loader" - _ "github.com/cs3org/reva/internal/http/interceptors/auth/credential/loader" - _ "github.com/cs3org/reva/internal/http/interceptors/auth/token/loader" - _ "github.com/cs3org/reva/internal/http/interceptors/auth/tokenwriter/loader" - _ "github.com/cs3org/reva/internal/http/interceptors/loader" - _ "github.com/cs3org/reva/internal/http/services/loader" - _ "github.com/cs3org/reva/pkg/app/provider/loader" - _ "github.com/cs3org/reva/pkg/app/registry/loader" - _ "github.com/cs3org/reva/pkg/appauth/manager/loader" - _ "github.com/cs3org/reva/pkg/auth/manager/loader" - _ "github.com/cs3org/reva/pkg/auth/registry/loader" - _ "github.com/cs3org/reva/pkg/cbox/loader" - _ "github.com/cs3org/reva/pkg/group/manager/loader" - _ "github.com/cs3org/reva/pkg/metrics/driver/loader" - _ "github.com/cs3org/reva/pkg/ocm/invite/manager/loader" - _ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/loader" - _ "github.com/cs3org/reva/pkg/ocm/share/manager/loader" - _ "github.com/cs3org/reva/pkg/permission/manager/loader" - _ "github.com/cs3org/reva/pkg/publicshare/manager/loader" - _ "github.com/cs3org/reva/pkg/rhttp/datatx/manager/loader" - _ "github.com/cs3org/reva/pkg/share/cache/loader" - _ "github.com/cs3org/reva/pkg/share/manager/loader" - _ "github.com/cs3org/reva/pkg/storage/favorite/loader" - _ "github.com/cs3org/reva/pkg/storage/fs/loader" - _ "github.com/cs3org/reva/pkg/storage/registry/loader" - _ "github.com/cs3org/reva/pkg/token/manager/loader" - _ "github.com/cs3org/reva/pkg/user/manager/loader" + _ "github.com/cs3org/reva/v2/internal/grpc/interceptors/loader" + _ "github.com/cs3org/reva/v2/internal/grpc/services/loader" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/credential/loader" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/token/loader" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/tokenwriter/loader" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/loader" + _ "github.com/cs3org/reva/v2/internal/http/services/loader" + _ "github.com/cs3org/reva/v2/pkg/app/provider/loader" + _ "github.com/cs3org/reva/v2/pkg/app/registry/loader" + _ "github.com/cs3org/reva/v2/pkg/appauth/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/auth/registry/loader" + _ "github.com/cs3org/reva/v2/pkg/cbox/loader" + _ "github.com/cs3org/reva/v2/pkg/group/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/metrics/driver/loader" + _ "github.com/cs3org/reva/v2/pkg/ocm/invite/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/loader" + _ "github.com/cs3org/reva/v2/pkg/ocm/share/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/permission/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/publicshare/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/share/cache/loader" + _ "github.com/cs3org/reva/v2/pkg/share/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/storage/favorite/loader" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/loader" + _ "github.com/cs3org/reva/v2/pkg/storage/registry/loader" + _ "github.com/cs3org/reva/v2/pkg/token/manager/loader" + _ "github.com/cs3org/reva/v2/pkg/user/manager/loader" ) diff --git a/cmd/revad/runtime/option.go b/cmd/revad/runtime/option.go index 1b4084cb7b..44be8f9591 100644 --- a/cmd/revad/runtime/option.go +++ b/cmd/revad/runtime/option.go @@ -19,7 +19,7 @@ package runtime import ( - "github.com/cs3org/reva/pkg/registry" + "github.com/cs3org/reva/v2/pkg/registry" "github.com/rs/zerolog" ) diff --git a/cmd/revad/runtime/runtime.go b/cmd/revad/runtime/runtime.go index 22d55eb30b..8535cb65b3 100644 --- a/cmd/revad/runtime/runtime.go +++ b/cmd/revad/runtime/runtime.go @@ -28,14 +28,14 @@ import ( "strconv" "strings" - "github.com/cs3org/reva/cmd/revad/internal/grace" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/registry/memory" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/sharedconf" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/cmd/revad/internal/grace" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/registry/memory" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/sharedconf" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/docs/content/en/docs/changelog/2.0.0/_index.md b/docs/content/en/docs/changelog/2.0.0/_index.md new file mode 100644 index 0000000000..5eb7c517cb --- /dev/null +++ b/docs/content/en/docs/changelog/2.0.0/_index.md @@ -0,0 +1,754 @@ + +--- +title: "v2.0.0" +linkTitle: "v2.0.0" +weight: 40 +description: > + Changelog for Reva v2.0.0 (2022-03-03) +--- + +Changelog for reva 2.0.0 (2022-03-03) +======================================= + +The following sections list the changes in reva 2.0.0 relevant to +reva users. The changes are ordered by importance. + +Summary +------- + + * Fix #2457: Do not swallow error + * Fix #2422: Handle non existing spaces correctly + * Fix #2327: Enable changelog on edge branch + * Fix #2370: Fixes for apps in public shares, project spaces for EOS driver + * Fix #2464: Pass spacegrants when adding member to space + * Fix #2430: Fix aggregated child folder id + * Fix #2348: Make archiver handle spaces protocol + * Fix #2452: Fix create space error message + * Fix #2445: Don't handle ids containing "/" in decomposedfs + * Fix #2285: Accept new userid idp format + * Fix #2503: Remove the protection from /v?.php/config endpoints + * Fix #2462: Public shares path needs to be set + * Fix #2427: Fix registry caching + * Fix #2298: Remove share refs from trashbin + * Fix #2433: Fix shares provider filter + * Fix #2351: Fix Statcache removing + * Fix #2374: Fix webdav copy of zero byte files + * Fix #2336: Handle sending all permissions when creating public links + * Fix #2440: Add ArbitraryMetadataKeys to statcache key + * Fix #2582: Keep lock structs in a local map protected by a mutex + * Fix #2372: Make owncloudsql work with the spaces registry + * Fix #2416: The registry now returns complete space structs + * Fix #3066: Fix propfind listing for files + * Fix #2428: Remove unused home provider from config + * Fix #2334: Revert fix decomposedfs upload + * Fix #2415: Services should never return transport level errors + * Fix #2419: List project spaces for share recipients + * Fix #2501: Fix spaces stat + * Fix #2432: Use space reference when listing containers + * Fix #2572: Wait for nats server on middleware start + * Fix #2454: Fix webdav paths in PROPFINDS + * Chg #2329: Activate the statcache + * Chg #2596: Remove hash from public link urls + * Chg #2495: Remove the ownCloud storage driver + * Chg #2527: Store space attributes in decomposedFS + * Chg #2581: Update hard-coded status values + * Chg #2524: Use description during space creation + * Chg #2554: Shard nodes per space in decomposedfs + * Chg #2576: Harden xattrs errors + * Chg #2436: Replace template in GroupFilter for UserProvider with a simple string + * Chg #2429: Make archiver id based + * Chg #2340: Allow multiple space configurations per provider + * Chg #2396: The ocdav handler is now spaces aware + * Chg #2349: Require `ListRecycle` when listing trashbin + * Chg #2353: Reduce log output + * Chg #2542: Do not encode webDAV ids to base64 + * Chg #2519: Remove the auto creation of the .space folder + * Chg #2394: Remove logic from gateway + * Chg #2023: Add a sharestorageprovider + * Chg #2234: Add a spaces registry + * Chg #2339: Fix static registry regressions + * Chg #2370: Fix static registry regressions + * Chg #2354: Return not found when updating non existent space + * Chg #2589: Remove deprecated linter modules + * Chg #2016: Move wrapping and unwrapping of paths to the storage gateway + * Enh #2591: Set up App Locks with basic locks + * Enh #1209: Reva CephFS module v0.2.1 + * Enh #2511: Error handling cleanup in decomposed FS + * Enh #2516: Cleaned up some code + * Enh #2512: Consolidate xattr setter and getter + * Enh #2341: Use CS3 permissions API + * Enh #2343: Allow multiple space type fileters on decomposedfs + * Enh #2460: Add locking support to decomposedfs + * Enh #2540: Refactored the xattrs package in the decomposedfs + * Enh #2463: Do not log whole nodes + * Enh #2350: Add file locking methods to the storage and filesystem interfaces + * Enh #2379: Add new file url of the app provider to the ocs capabilities + * Enh #2369: Implement TouchFile from the CS3apis + * Enh #2385: Allow to create new files with the app provider on public links + * Enh #2397: Product field in OCS version + * Enh #2393: Update tus/tusd to version 1.8.0 + * Enh #2522: Introduce events + * Enh #2528: Use an exclcusive write lock when writing multiple attributes + * Enh #2595: Add integration test for the groupprovider + * Enh #2439: Ignore handled errors when creating spaces + * Enh #2500: Invalidate listproviders cache + * Enh #2345: Don't assume that the LDAP groupid in reva matches the name + * Enh #2525: Allow using AD UUID as userId values + * Enh #2584: Allow running userprovider integration tests for the LDAP driver + * Enh #2585: Add metadata storage layer and indexer + * Enh #2163: Nextcloud-based share manager for pkg/ocm/share + * Enh #2278: OIDC driver changes for lightweight users + * Enh #2315: Add new attributes to public link propfinds + * Enh #2431: Delete shares when purging spaces + * Enh #2434: Refactor ocdav into smaller chunks + * Enh #2524: Add checks when removing space members + * Enh #2457: Restore spaces that were previously deleted + * Enh #2498: Include grants in list storage spaces response + * Enh #2344: Allow listing all storage spaces + * Enh #2547: Add an if-match check to the storage provider + * Enh #2486: Update cs3apis to include lock api changes + * Enh #2526: Upgrade ginkgo to v2 + +Details +------- + + * Bugfix #2457: Do not swallow error + + Decomposedfs not longer swallows errors when creating a node fails. + + https://github.com/cs3org/reva/pull/2457 + + * Bugfix #2422: Handle non existing spaces correctly + + When looking up a space by id we returned the wrong status code. + + https://github.com/cs3org/reva/pull/2422 + + * Bugfix #2327: Enable changelog on edge branch + + We added a `branch` flag to the `tools/check-changelog/main.go` to fix changelog checks on + the edge branch. + + https://github.com/cs3org/reva/pull/2327 + + * Bugfix #2370: Fixes for apps in public shares, project spaces for EOS driver + + https://github.com/cs3org/reva/pull/2370 + + * Bugfix #2464: Pass spacegrants when adding member to space + + When creating a space grant there should not be created a new space. Unfortunately SpaceGrant + didn't work when adding members to a space. Now a value is placed in the ctx of the + storageprovider on which decomposedfs reacts + + https://github.com/cs3org/reva/pull/2464 + + * Bugfix #2430: Fix aggregated child folder id + + Propfind now returns the correct id and correctly aggregates the mtime and etag. + + https://github.com/cs3org/reva/pull/2430 + + * Bugfix #2348: Make archiver handle spaces protocol + + The archiver can now handle the spaces protocol + + https://github.com/cs3org/reva/pull/2348 + + * Bugfix #2452: Fix create space error message + + Create space no longer errors with list spaces error messages. + + https://github.com/cs3org/reva/pull/2452 + + * Bugfix #2445: Don't handle ids containing "/" in decomposedfs + + The storageprovider previously checked all ids without checking their validity this lead to + flaky test because it shouldn't check ids that are used from the public storage provider + + https://github.com/cs3org/reva/pull/2445 + + * Bugfix #2285: Accept new userid idp format + + The format for userid idp [changed](https://github.com/cs3org/cs3apis/pull/159) and + this broke [the ocmd + tutorial](https://reva.link/docs/tutorials/share-tutorial/#5-1-4-create-the-share) + This PR makes the provider authorizer interceptor accept both the old and the new string + format. + + https://github.com/cs3org/reva/issues/2285 + https://github.com/cs3org/reva/issues/2285 + See + and + + * Bugfix #2503: Remove the protection from /v?.php/config endpoints + + We've removed the protection from the "/v1.php/config" and "/v2.php/config" endpoints to be + API compatible with ownCloud 10. + + https://github.com/cs3org/reva/issues/2503 + https://github.com/owncloud/ocis/issues/1338 + + * Bugfix #2462: Public shares path needs to be set + + We need to set the relative path to the space root for public link shares to identify them in the + shares list. + + https://github.com/owncloud/ocis/issues/2462 + https://github.com/cs3org/reva/pull/2580 + + * Bugfix #2427: Fix registry caching + + We now cache space lookups per user. + + https://github.com/cs3org/reva/pull/2427 + + * Bugfix #2298: Remove share refs from trashbin + + https://github.com/cs3org/reva/pull/2298 + + * Bugfix #2433: Fix shares provider filter + + The shares storage provider now correctly filters space types + + https://github.com/cs3org/reva/pull/2433 + + * Bugfix #2351: Fix Statcache removing + + Removing from statcache didn't work correctly with different setups. Unified and fixed + + https://github.com/cs3org/reva/pull/2351 + + * Bugfix #2374: Fix webdav copy of zero byte files + + We've fixed the webdav copy action of zero byte files, which was not performed because the + webdav api assumed, that zero byte uploads are created when initiating the upload, which was + recently removed from all storage drivers. Therefore the webdav api also uploads zero byte + files after initiating the upload. + + https://github.com/cs3org/reva/pull/2374 + https://github.com/cs3org/reva/pull/2309 + + * Bugfix #2336: Handle sending all permissions when creating public links + + For backwards compatability we now reduce permissions to readonly when a create public link + carries all permissions. + + https://github.com/cs3org/reva/issues/2336 + https://github.com/owncloud/ocis/issues/1269 + + * Bugfix #2440: Add ArbitraryMetadataKeys to statcache key + + Otherwise stating with and without them would return the same result (because it is cached) + + https://github.com/cs3org/reva/pull/2440 + + * Bugfix #2582: Keep lock structs in a local map protected by a mutex + + Make sure that only one go routine or process can get the lock. + + https://github.com/cs3org/reva/pull/2582 + + * Bugfix #2372: Make owncloudsql work with the spaces registry + + Owncloudsql now works properly with the spaces registry. + + https://github.com/cs3org/reva/pull/2372 + + * Bugfix #2416: The registry now returns complete space structs + + We now return the complete space info, including name, path, owner, etc. instead of only path + and id. + + https://github.com/cs3org/reva/pull/2416 + + * Bugfix #3066: Fix propfind listing for files + + When doing a propfind for a file the result contained the files twice. + + https://github.com/owncloud/ocis/issues/3066 + https://github.com/cs3org/reva/pull/2506 + + * Bugfix #2428: Remove unused home provider from config + + The spaces registry does not use a home provider config. + + https://github.com/cs3org/reva/pull/2428 + + * Bugfix #2334: Revert fix decomposedfs upload + + Reverting https://github.com/cs3org/reva/pull/2330 to fix it properly + + https://github.com/cs3org/reva/pull/2334 + + * Bugfix #2415: Services should never return transport level errors + + The CS3 API adopted the grpc error codes from the [google grpc status + package](https://github.com/googleapis/googleapis/blob/master/google/rpc/status.proto). + It also separates transport level errors from application level errors on purpose. This + allows sending CS3 messages over protocols other than GRPC. To keep that seperation, the + server side must always return `nil`, even though the code generation for go produces function + signatures for rpcs with an `error` return property. That allows clients to clearly + distinguish between transport level errors indicated by `err != nil` the error and + application level errors by checking the status code. + + https://github.com/cs3org/reva/pull/2415 + + * Bugfix #2419: List project spaces for share recipients + + The sharing handler now uses the ListProvider call on the registry when sharing by reference. + Furthermore, the decomposedfs now checks permissions on the root of a space so that a space is + listed for users that have access to a space. + + https://github.com/cs3org/reva/pull/2419 + + * Bugfix #2501: Fix spaces stat + + When stating a space e.g. the Share Jail and that space contains another space, in this case a + share then the stat would sometimes get the sub space instead of the Share Jail itself. + + https://github.com/cs3org/reva/pull/2501 + + * Bugfix #2432: Use space reference when listing containers + + The propfind handler now uses the reference for a space to make lookups relative. + + https://github.com/cs3org/reva/pull/2432 + + * Bugfix #2572: Wait for nats server on middleware start + + Use a retry mechanism to connect to the nats server when it is not ready yet + + https://github.com/cs3org/reva/pull/2572 + + * Bugfix #2454: Fix webdav paths in PROPFINDS + + The WebDAV Api was handling paths on spaces propfinds in the wrong way. This has been fixed in the + WebDAV layer. + + https://github.com/cs3org/reva/pull/2454 + + * Change #2329: Activate the statcache + + Activates the cache of stat request/responses in the gateway. + + https://github.com/cs3org/reva/pull/2329 + + * Change #2596: Remove hash from public link urls + + Public link urls do not contain the hash anymore, this is needed to support the ocis and web + history mode. + + https://github.com/cs3org/reva/pull/2596 + https://github.com/owncloud/ocis/pull/3109 + https://github.com/owncloud/web/pull/6363 + + * Change #2495: Remove the ownCloud storage driver + + We've removed the ownCloud storage driver because it was no longer maintained after the + ownCloud SQL storage driver was added. + + If you have been using the ownCloud storage driver, please switch to the ownCloud SQL storage + driver which brings you more features and is under active maintenance. + + https://github.com/cs3org/reva/pull/2495 + + * Change #2527: Store space attributes in decomposedFS + + We need to store more space attributes in the storage. This implements extended space + attributes in the decomposedFS + + https://github.com/cs3org/reva/pull/2527 + + * Change #2581: Update hard-coded status values + + The hard-coded version and product values have been updated to be consistent in all places in + the code. + + https://github.com/cs3org/reva/pull/2581 + + * Change #2524: Use description during space creation + + We can now use a space description during space creation. We also fixed a bug in the spaces roles. + Co-owners are now maintainers. + + https://github.com/cs3org/reva/pull/2524 + + * Change #2554: Shard nodes per space in decomposedfs + + The decomposedfs changas the on disk layout to shard nodes per space. + + https://github.com/cs3org/reva/pull/2554 + + * Change #2576: Harden xattrs errors + + Unwrap the error to get the root error. + + https://github.com/cs3org/reva/pull/2576 + + * Change #2436: Replace template in GroupFilter for UserProvider with a simple string + + Previously the "groupfilter" configuration for the UserProvider expected a go-template + value (based of of an `userpb.UserId` as it's input). And it assumed we could run a single LDAP + query to get all groups a user is member of by specifying the userid. However most LDAP Servers + store the GroupMembership by either username (e.g. in memberUID Attribute) or by the user's DN + (e.g. in member/uniqueMember). + + This change removes the userpb.UserId template processing from the groupfilter and replaces + it with a single string (the username) to cleanup the config a bit. Existing configs need to be + update to replace the go template references in `groupfilter` (e.g. `{{.}}` or + `{{.OpaqueId}}`) with `{{query}}`. + + https://github.com/cs3org/reva/pull/2436 + + * Change #2429: Make archiver id based + + The archiver now uses ids to walk the tree instead of paths + + https://github.com/cs3org/reva/pull/2429 + + * Change #2340: Allow multiple space configurations per provider + + The spaces registry can now use multiple space configurations to allow personal and project + spaces on the same provider + + https://github.com/cs3org/reva/pull/2340 + + * Change #2396: The ocdav handler is now spaces aware + + It will use LookupStorageSpaces and make only relative requests to the gateway. Temp comment + + https://github.com/cs3org/reva/pull/2396 + + * Change #2349: Require `ListRecycle` when listing trashbin + + Previously there was no check, so anyone could list anyones trash + + https://github.com/cs3org/reva/pull/2349 + + * Change #2353: Reduce log output + + Reduced log output. Some errors or warnings were logged multiple times or even unnecesarily. + + https://github.com/cs3org/reva/pull/2353 + + * Change #2542: Do not encode webDAV ids to base64 + + We removed the base64 encoding of the IDs and use the format ! with a `!` + delimiter. As a reserved delimiter it is URL safe. The IDs will be XML and JSON encoded as + necessary. + + https://github.com/cs3org/reva/pull/2542 + https://github.com/cs3org/reva/pull/2558 + + * Change #2519: Remove the auto creation of the .space folder + + We removed the auto creation of the .space folder because we don't develop this feature + further. + + https://github.com/cs3org/reva/pull/2519 + + * Change #2394: Remove logic from gateway + + The gateway will now hold no logic except forwarding the requests to other services. + + https://github.com/cs3org/reva/pull/2394 + + * Change #2023: Add a sharestorageprovider + + This PR adds a ShareStorageProvider which enables us to get rid of a lot of special casing in + other parts of the code. It also fixes several issues regarding shares and group shares. + + https://github.com/cs3org/reva/pull/2023 + + * Change #2234: Add a spaces registry + + Spaces registry is supposed to manage spaces. Read + `pkg/storage/registry/spaces/Readme.md` for full details + + https://github.com/cs3org/reva/pull/2234 + + * Change #2339: Fix static registry regressions + + We fixed some smaller issues with using the static registry which were introduced with the + spaces registry changes. + + https://github.com/cs3org/reva/pull/2339 + + * Change #2370: Fix static registry regressions + + We fixed some smaller issues with using the static registry which were introduced with the + spaces registry changes. + + https://github.com/cs3org/reva/pull/2370 + + * Change #2354: Return not found when updating non existent space + + If a spaceid of a space which is updated doesn't exist, handle it as a not found error. + + https://github.com/cs3org/reva/pull/2354 + + * Change #2589: Remove deprecated linter modules + + Replaced the deprecated linter modules with the recommended ones. + + https://github.com/cs3org/reva/pull/2589 + + * Change #2016: Move wrapping and unwrapping of paths to the storage gateway + + We've moved the wrapping and unwrapping of reference paths to the storage gateway so that the + storageprovider doesn't have to know its mount path. + + https://github.com/cs3org/reva/pull/2016 + + * Enhancement #2591: Set up App Locks with basic locks + + To set up App Locks basic locks are used now + + https://github.com/cs3org/reva/pull/2591 + + * Enhancement #1209: Reva CephFS module v0.2.1 + + https://github.com/cs3org/reva/pull/1209 + + * Enhancement #2511: Error handling cleanup in decomposed FS + + - Avoid inconsensitencies by cleaning up actions in case of err + + https://github.com/cs3org/reva/pull/2511 + + * Enhancement #2516: Cleaned up some code + + - Reduced type conversions []byte <-> string - pre-compile chunking regex + + https://github.com/cs3org/reva/pull/2516 + + * Enhancement #2512: Consolidate xattr setter and getter + + - Consolidate all metadata Get's and Set's to central functions. - Cleaner code by reduction of + casts - Easier to hook functionality like indexing + + https://github.com/cs3org/reva/pull/2512 + + * Enhancement #2341: Use CS3 permissions API + + Added calls to the CS3 permissions API to the decomposedfs in order to check the user + permissions. + + https://github.com/cs3org/reva/pull/2341 + + * Enhancement #2343: Allow multiple space type fileters on decomposedfs + + The decomposedfs driver now evaluates multiple space type filters when listing storage + spaces. + + https://github.com/cs3org/reva/pull/2343 + + * Enhancement #2460: Add locking support to decomposedfs + + The decomposedfs now implements application level locking + + https://github.com/cs3org/reva/pull/2460 + + * Enhancement #2540: Refactored the xattrs package in the decomposedfs + + The xattrs package now uses the xattr.ENOATTR instead of os.ENODATA or os.ENOATTR to check + attribute existence. + + https://github.com/cs3org/reva/pull/2540 + https://github.com/cs3org/reva/pull/2541 + + * Enhancement #2463: Do not log whole nodes + + It turns out that logging whole node objects is very expensive and also spams the logs quite a + bit. Instead we just log the node ID now. + + https://github.com/cs3org/reva/pull/2463 + + * Enhancement #2350: Add file locking methods to the storage and filesystem interfaces + + We've added the file locking methods from the CS3apis to the storage and filesystem + interfaces. As of now they are dummy implementations and will only return "unimplemented" + errors. + + https://github.com/cs3org/reva/pull/2350 + https://github.com/cs3org/cs3apis/pull/160 + + * Enhancement #2379: Add new file url of the app provider to the ocs capabilities + + We've added the new file capability of the app provider to the ocs capabilities, so that clients + can discover this url analogous to the app list and file open urls. + + https://github.com/cs3org/reva/pull/2379 + https://github.com/owncloud/ocis/pull/2884 + https://github.com/owncloud/web/pull/5890#issuecomment-993905242 + + * Enhancement #2369: Implement TouchFile from the CS3apis + + We've updated the CS3apis and implemented the TouchFile method. + + https://github.com/cs3org/reva/pull/2369 + https://github.com/cs3org/cs3apis/pull/154 + + * Enhancement #2385: Allow to create new files with the app provider on public links + + We've added the option to create files with the app provider on public links. + + https://github.com/cs3org/reva/pull/2385 + + * Enhancement #2397: Product field in OCS version + + We've added a new field to the OCS Version, which is supposed to announce the product name. The + web ui as a client will make use of it to make the backend product and version available (e.g. for + easier bug reports). + + https://github.com/cs3org/reva/pull/2397 + + * Enhancement #2393: Update tus/tusd to version 1.8.0 + + We've update tus/tusd to version 1.8.0. + + https://github.com/cs3org/reva/issues/2393 + https://github.com/cs3org/reva/pull/2224 + + * Enhancement #2522: Introduce events + + This will introduce events into the system. Events are a simple way to bring information from + one service to another. Read `pkg/events/example` and subfolders for more information + + https://github.com/cs3org/reva/pull/2522 + + * Enhancement #2528: Use an exclcusive write lock when writing multiple attributes + + The xattr package can use an exclusive write lock when writing multiple extended attributes + + https://github.com/cs3org/reva/pull/2528 + + * Enhancement #2595: Add integration test for the groupprovider + + Some new integration tests were added to cover the groupprovider. + + https://github.com/cs3org/reva/pull/2595 + + * Enhancement #2439: Ignore handled errors when creating spaces + + The CreateStorageSpace no longer logs all error cases with error level logging + + https://github.com/cs3org/reva/pull/2439 + + * Enhancement #2500: Invalidate listproviders cache + + We now invalidate the related listproviders cache entries when updating or deleting a storage + space. + + https://github.com/cs3org/reva/pull/2500 + + * Enhancement #2345: Don't assume that the LDAP groupid in reva matches the name + + This allows using attributes like e.g. `entryUUID` or any custom id attribute as the id for + groups. + + https://github.com/cs3org/reva/pull/2345 + + * Enhancement #2525: Allow using AD UUID as userId values + + Active Directory UUID attributes (like e.g. objectGUID) use the LDAP octectString Syntax. In + order to be able to use them as userids in reva, they need to be converted to their string + representation. + + https://github.com/cs3org/reva/pull/2525 + + * Enhancement #2584: Allow running userprovider integration tests for the LDAP driver + + We extended the integration test suite for the userprovider to allow running it with an LDAP + server. + + https://github.com/cs3org/reva/pull/2584 + + * Enhancement #2585: Add metadata storage layer and indexer + + We ported over and enhanced the metadata storage layer and indexer from ocis-pkg so that it can + be used by reva services as well. + + https://github.com/cs3org/reva/pull/2585 + + * Enhancement #2163: Nextcloud-based share manager for pkg/ocm/share + + Note that pkg/ocm/share is very similar to pkg/share, but it deals with cs3/sharing/ocm + whereas pkg/share deals with cs3/sharing/collaboration + + https://github.com/cs3org/reva/pull/2163 + + * Enhancement #2278: OIDC driver changes for lightweight users + + https://github.com/cs3org/reva/pull/2278 + + * Enhancement #2315: Add new attributes to public link propfinds + + Added a new property "oc:signature-auth" to public link propfinds. This is a necessary change + to be able to support archive downloads in password protected public links. + + https://github.com/cs3org/reva/pull/2315 + + * Enhancement #2431: Delete shares when purging spaces + + Implemented the second step of the two step spaces delete process. The first step is marking the + space as deleted, the second step is actually purging the space. During the second step all + shares, including public shares, in the space will be deleted. When deleting a space the blobs + are currently not yet deleted since the decomposedfs will receive some changes soon. + + https://github.com/cs3org/reva/pull/2431 + https://github.com/cs3org/reva/pull/2458 + + * Enhancement #2434: Refactor ocdav into smaller chunks + + That increases code clarity and enables testing. + + https://github.com/cs3org/reva/pull/2434 + + * Enhancement #2524: Add checks when removing space members + + - Removed owners from project spaces - Prevent deletion of last space manager - Viewers and + editors can always be deleted - Managers can only be deleted when there will be at least one + remaining + + https://github.com/cs3org/reva/pull/2524 + + * Enhancement #2457: Restore spaces that were previously deleted + + After the first step of the two step delete process an admin can decide to restore the space + instead of deleting it. This will undo the deletion and all files and shares are accessible + again + + https://github.com/cs3org/reva/pull/2457 + + * Enhancement #2498: Include grants in list storage spaces response + + Added the grants to the response of list storage spaces. This allows service clients to show who + has access to a space. + + https://github.com/cs3org/reva/pull/2498 + + * Enhancement #2344: Allow listing all storage spaces + + To implement the drives api we now list all spaces when no filter is given. The Provider info will + not contain any spaces as the client is responsible for looking up the spaces. + + https://github.com/cs3org/reva/pull/2344 + + * Enhancement #2547: Add an if-match check to the storage provider + + Implement a check for the if-match value in InitiateFileUpload to prevent overwrites of newer + versions. + + https://github.com/cs3org/reva/pull/2547 + + * Enhancement #2486: Update cs3apis to include lock api changes + + https://github.com/cs3org/reva/pull/2486 + + * Enhancement #2526: Upgrade ginkgo to v2 + + https://github.com/cs3org/reva/pull/2526 + + diff --git a/docs/content/en/docs/concepts/plugins.md b/docs/content/en/docs/concepts/plugins.md index f9638a3544..2a7c6f21c3 100644 --- a/docs/content/en/docs/concepts/plugins.md +++ b/docs/content/en/docs/concepts/plugins.md @@ -45,9 +45,9 @@ Basic example of serving your component is shown below. This example consists of // main.go import ( - "github.com/cs3org/reva/pkg/user" + "github.com/cs3org/reva/v2/pkg/user" "github.com/hashicorp/go-plugin" - revaPlugin "github.com/cs3org/reva/pkg/plugin" + revaPlugin "github.com/cs3org/reva/v2/pkg/plugin" ) // Assume this implements the user.Manager interface diff --git a/docs/content/en/docs/config/grpc/services/permissions/_index.md b/docs/content/en/docs/config/grpc/services/permissions/_index.md new file mode 100644 index 0000000000..af355d5064 --- /dev/null +++ b/docs/content/en/docs/config/grpc/services/permissions/_index.md @@ -0,0 +1,26 @@ +--- +title: "permissions" +linkTitle: "permissions" +weight: 10 +description: > + Configuration for the permissions service +--- + +# _struct: config_ + +{{% dir name="driver" type="string" default="localhome" %}} +The permission driver to be used. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/permissions/permissions.go#L40) +{{< highlight toml >}} +[grpc.services.permissions] +driver = "localhome" +{{< /highlight >}} +{{% /dir %}} + +{{% dir name="drivers" type="map[string]map[string]interface{}" default="permission" %}} + [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/permissions/permissions.go#L41) +{{< highlight toml >}} +[grpc.services.permissions.drivers.permission] + +{{< /highlight >}} +{{% /dir %}} + diff --git a/docs/content/en/docs/config/packages/app/provider/wopi/_index.md b/docs/content/en/docs/config/packages/app/provider/wopi/_index.md index edcff15d39..85b3055369 100644 --- a/docs/content/en/docs/config/packages/app/provider/wopi/_index.md +++ b/docs/content/en/docs/config/packages/app/provider/wopi/_index.md @@ -9,7 +9,7 @@ description: > # _struct: config_ {{% dir name="iop_secret" type="string" default="" %}} -The IOP secret used to connect to the wopiserver. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L58) +The IOP secret used to connect to the wopiserver. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L59) {{< highlight toml >}} [app.provider.wopi] iop_secret = "" @@ -17,7 +17,7 @@ iop_secret = "" {{% /dir %}} {{% dir name="wopi_url" type="string" default="" %}} -The wopiserver's URL. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L59) +The wopiserver's URL. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L60) {{< highlight toml >}} [app.provider.wopi] wopi_url = "" @@ -25,7 +25,7 @@ wopi_url = "" {{% /dir %}} {{% dir name="app_name" type="string" default="" %}} -The App user-friendly name. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L60) +The App user-friendly name. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L61) {{< highlight toml >}} [app.provider.wopi] app_name = "" @@ -33,7 +33,7 @@ app_name = "" {{% /dir %}} {{% dir name="app_icon_uri" type="string" default="" %}} -A URI to a static asset which represents the app icon. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L61) +A URI to a static asset which represents the app icon. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L62) {{< highlight toml >}} [app.provider.wopi] app_icon_uri = "" @@ -41,7 +41,7 @@ app_icon_uri = "" {{% /dir %}} {{% dir name="app_url" type="string" default="" %}} -The App URL. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L62) +The App URL. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L63) {{< highlight toml >}} [app.provider.wopi] app_url = "" @@ -49,7 +49,7 @@ app_url = "" {{% /dir %}} {{% dir name="app_int_url" type="string" default="" %}} -The internal app URL in case of dockerized deployments. Defaults to AppURL [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L63) +The internal app URL in case of dockerized deployments. Defaults to AppURL [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L64) {{< highlight toml >}} [app.provider.wopi] app_int_url = "" @@ -57,7 +57,7 @@ app_int_url = "" {{% /dir %}} {{% dir name="app_api_key" type="string" default="" %}} -The API key used by the app, if applicable. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L64) +The API key used by the app, if applicable. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L65) {{< highlight toml >}} [app.provider.wopi] app_api_key = "" @@ -65,7 +65,7 @@ app_api_key = "" {{% /dir %}} {{% dir name="jwt_secret" type="string" default="" %}} -The JWT secret to be used to retrieve the token TTL. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L65) +The JWT secret to be used to retrieve the token TTL. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L66) {{< highlight toml >}} [app.provider.wopi] jwt_secret = "" @@ -73,7 +73,7 @@ jwt_secret = "" {{% /dir %}} {{% dir name="app_desktop_only" type="bool" default=false %}} -Specifies if the app can be opened only on desktop. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L66) +Specifies if the app can be opened only on desktop. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/app/provider/wopi/wopi.go#L67) {{< highlight toml >}} [app.provider.wopi] app_desktop_only = false diff --git a/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md b/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md index 3e1c46f976..42d65aec0c 100644 --- a/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md +++ b/docs/content/en/docs/config/packages/auth/manager/nextcloud/_index.md @@ -9,7 +9,7 @@ description: > # _struct: AuthManagerConfig_ {{% dir name="endpoint" type="string" default="" %}} -The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/nextcloud/nextcloud.go#L51) +The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/nextcloud/nextcloud.go#L52) {{< highlight toml >}} [auth.manager.nextcloud] endpoint = "" diff --git a/docs/content/en/docs/config/packages/auth/manager/oidc/_index.md b/docs/content/en/docs/config/packages/auth/manager/oidc/_index.md index 0f5a4c1b70..6abc8039f1 100644 --- a/docs/content/en/docs/config/packages/auth/manager/oidc/_index.md +++ b/docs/content/en/docs/config/packages/auth/manager/oidc/_index.md @@ -9,7 +9,7 @@ description: > # _struct: config_ {{% dir name="insecure" type="bool" default=false %}} -Whether to skip certificate checks when sending requests. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L54) +Whether to skip certificate checks when sending requests. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L55) {{< highlight toml >}} [auth.manager.oidc] insecure = false @@ -17,7 +17,7 @@ insecure = false {{% /dir %}} {{% dir name="issuer" type="string" default="" %}} -The issuer of the OIDC token. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L55) +The issuer of the OIDC token. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L56) {{< highlight toml >}} [auth.manager.oidc] issuer = "" @@ -25,7 +25,7 @@ issuer = "" {{% /dir %}} {{% dir name="id_claim" type="string" default="sub" %}} -The claim containing the ID of the user. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L56) +The claim containing the ID of the user. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L57) {{< highlight toml >}} [auth.manager.oidc] id_claim = "sub" @@ -33,7 +33,7 @@ id_claim = "sub" {{% /dir %}} {{% dir name="uid_claim" type="string" default="" %}} -The claim containing the UID of the user. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L57) +The claim containing the UID of the user. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L58) {{< highlight toml >}} [auth.manager.oidc] uid_claim = "" @@ -41,7 +41,7 @@ uid_claim = "" {{% /dir %}} {{% dir name="gid_claim" type="string" default="" %}} -The claim containing the GID of the user. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L58) +The claim containing the GID of the user. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L59) {{< highlight toml >}} [auth.manager.oidc] gid_claim = "" @@ -49,7 +49,7 @@ gid_claim = "" {{% /dir %}} {{% dir name="gatewaysvc" type="string" default="" %}} -The endpoint at which the GRPC gateway is exposed. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L59) +The endpoint at which the GRPC gateway is exposed. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/auth/manager/oidc/oidc.go#L60) {{< highlight toml >}} [auth.manager.oidc] gatewaysvc = "" diff --git a/docs/content/en/docs/config/packages/ocm/share/manager/nextcloud/_index.md b/docs/content/en/docs/config/packages/ocm/share/manager/nextcloud/_index.md index 4fbb6018cd..2c9bfffe85 100644 --- a/docs/content/en/docs/config/packages/ocm/share/manager/nextcloud/_index.md +++ b/docs/content/en/docs/config/packages/ocm/share/manager/nextcloud/_index.md @@ -9,7 +9,7 @@ description: > # _struct: ShareManagerConfig_ {{% dir name="endpoint" type="string" default="" %}} -The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/manager/nextcloud/nextcloud.go#L59) +The Nextcloud backend endpoint for user check [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/ocm/share/manager/nextcloud/nextcloud.go#L75) {{< highlight toml >}} [ocm.share.manager.nextcloud] endpoint = "" diff --git a/docs/content/en/docs/config/packages/storage/fs/local/_index.md b/docs/content/en/docs/config/packages/storage/fs/local/_index.md index 2443783511..4e9bb339a1 100644 --- a/docs/content/en/docs/config/packages/storage/fs/local/_index.md +++ b/docs/content/en/docs/config/packages/storage/fs/local/_index.md @@ -24,3 +24,19 @@ share_folder = "/MyShares" {{< /highlight >}} {{% /dir %}} +{{% dir name="user_layout" type="string" default="{{.Username}}" %}} +Template used for building the user's root path. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/storage/fs/local/local.go#L36) +{{< highlight toml >}} +[storage.fs.local] +user_layout = "{{.Username}}" +{{< /highlight >}} +{{% /dir %}} + +{{% dir name="disable_home" type="bool" default=false %}} +Enable/disable special /home handling. [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/storage/fs/local/local.go#L37) +{{< highlight toml >}} +[storage.fs.local] +disable_home = false +{{< /highlight >}} +{{% /dir %}} + diff --git a/docs/content/en/docs/config/packages/user/manager/nextcloud/_index.md b/docs/content/en/docs/config/packages/user/manager/nextcloud/_index.md index c4974097ee..8785a2c3c3 100644 --- a/docs/content/en/docs/config/packages/user/manager/nextcloud/_index.md +++ b/docs/content/en/docs/config/packages/user/manager/nextcloud/_index.md @@ -9,7 +9,7 @@ description: > # _struct: UserManagerConfig_ {{% dir name="endpoint" type="string" default="" %}} -The Nextcloud backend endpoint for user management [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/user/manager/nextcloud/nextcloud.go#L53) +The Nextcloud backend endpoint for user management [[Ref]](https://github.com/cs3org/reva/tree/master/pkg/user/manager/nextcloud/nextcloud.go#L55) {{< highlight toml >}} [user.manager.nextcloud] endpoint = "" diff --git a/examples/plugin/json/json.go b/examples/plugin/json/json.go index ce9cd59c54..c56aec065c 100644 --- a/examples/plugin/json/json.go +++ b/examples/plugin/json/json.go @@ -26,8 +26,8 @@ import ( "strings" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/user" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/user" "github.com/hashicorp/go-plugin" "github.com/mitchellh/mapstructure" ) diff --git a/examples/sdk/sdk.go b/examples/sdk/sdk.go index 05cee60f5b..aa366aefc7 100644 --- a/examples/sdk/sdk.go +++ b/examples/sdk/sdk.go @@ -22,8 +22,8 @@ import ( "fmt" "log" - "github.com/cs3org/reva/pkg/sdk" - "github.com/cs3org/reva/pkg/sdk/action" + "github.com/cs3org/reva/v2/pkg/sdk" + "github.com/cs3org/reva/v2/pkg/sdk/action" ) func runActions(session *sdk.Session) { diff --git a/go.mod b/go.mod index 6fc98f28d2..8cf32f39c8 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/cs3org/reva +module github.com/cs3org/reva/v2 require ( bou.ke/monkey v1.0.2 contrib.go.opencensus.io/exporter/prometheus v0.4.0 github.com/BurntSushi/toml v1.0.0 - github.com/CiscoM31/godata v1.0.5 // indirect + github.com/CiscoM31/godata v1.0.5 github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/sprig v2.22.0+incompatible @@ -42,7 +42,7 @@ require ( github.com/hashicorp/go-hclog v1.1.0 github.com/hashicorp/go-plugin v1.4.3 github.com/huandu/xstrings v1.3.2 // indirect - github.com/iancoleman/strcase v0.2.0 // indirect + github.com/iancoleman/strcase v0.2.0 github.com/jedib0t/go-pretty v4.3.0+incompatible github.com/juliangruber/go-intersect v1.1.0 github.com/mattn/go-sqlite3 v1.14.10 diff --git a/internal/grpc/interceptors/appctx/appctx.go b/internal/grpc/interceptors/appctx/appctx.go index 1bb8238c46..8a4d2502c2 100644 --- a/internal/grpc/interceptors/appctx/appctx.go +++ b/internal/grpc/interceptors/appctx/appctx.go @@ -21,8 +21,8 @@ package appctx import ( "context" - "github.com/cs3org/reva/pkg/appctx" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/pkg/appctx" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/rs/zerolog" "go.opentelemetry.io/otel/trace" "google.golang.org/grpc" diff --git a/internal/grpc/interceptors/auth/auth.go b/internal/grpc/interceptors/auth/auth.go index c84ba51083..3d339290b4 100644 --- a/internal/grpc/interceptors/auth/auth.go +++ b/internal/grpc/interceptors/auth/auth.go @@ -25,15 +25,15 @@ import ( "github.com/bluele/gcache" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/token" - tokenmgr "github.com/cs3org/reva/pkg/token/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "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/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/token" + tokenmgr "github.com/cs3org/reva/v2/pkg/token/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/interceptors/auth/scope.go b/internal/grpc/interceptors/auth/scope.go index 8eec835ea1..4edae8b025 100644 --- a/internal/grpc/interceptors/auth/scope.go +++ b/internal/grpc/interceptors/auth/scope.go @@ -32,14 +32,14 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - statuspkg "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/utils" + "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/errtypes" + statuspkg "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" ) diff --git a/internal/grpc/interceptors/eventsmiddleware/conversion.go b/internal/grpc/interceptors/eventsmiddleware/conversion.go index aa1ef2453d..78989557fa 100644 --- a/internal/grpc/interceptors/eventsmiddleware/conversion.go +++ b/internal/grpc/interceptors/eventsmiddleware/conversion.go @@ -20,7 +20,7 @@ package eventsmiddleware import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" - "github.com/cs3org/reva/pkg/events" + "github.com/cs3org/reva/v2/pkg/events" ) // ShareCreated converts response to event diff --git a/internal/grpc/interceptors/eventsmiddleware/events.go b/internal/grpc/interceptors/eventsmiddleware/events.go index d7603e74c5..7f484b4386 100644 --- a/internal/grpc/interceptors/eventsmiddleware/events.go +++ b/internal/grpc/interceptors/eventsmiddleware/events.go @@ -27,9 +27,9 @@ import ( "github.com/asim/go-micro/plugins/events/nats/v4" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" - "github.com/cs3org/reva/pkg/events" - "github.com/cs3org/reva/pkg/events/server" - "github.com/cs3org/reva/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/events" + "github.com/cs3org/reva/v2/pkg/events/server" + "github.com/cs3org/reva/v2/pkg/rgrpc" ) const ( diff --git a/internal/grpc/interceptors/loader/loader.go b/internal/grpc/interceptors/loader/loader.go index f0d525f045..f2b7d9238d 100644 --- a/internal/grpc/interceptors/loader/loader.go +++ b/internal/grpc/interceptors/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core GRPC services - _ "github.com/cs3org/reva/internal/grpc/interceptors/eventsmiddleware" - _ "github.com/cs3org/reva/internal/grpc/interceptors/readonly" + _ "github.com/cs3org/reva/v2/internal/grpc/interceptors/eventsmiddleware" + _ "github.com/cs3org/reva/v2/internal/grpc/interceptors/readonly" // Add your own service here ) diff --git a/internal/grpc/interceptors/log/log.go b/internal/grpc/interceptors/log/log.go index ded8982f9f..0da26c81cd 100644 --- a/internal/grpc/interceptors/log/log.go +++ b/internal/grpc/interceptors/log/log.go @@ -22,8 +22,8 @@ import ( "context" "time" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/rs/zerolog" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/grpc/interceptors/readonly/readonly.go b/internal/grpc/interceptors/readonly/readonly.go index d1d8801c2d..5ee9aafb5f 100644 --- a/internal/grpc/interceptors/readonly/readonly.go +++ b/internal/grpc/interceptors/readonly/readonly.go @@ -23,9 +23,9 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc" - rstatus "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc" + rstatus "github.com/cs3org/reva/v2/pkg/rgrpc/status" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/grpc/interceptors/recovery/recovery.go b/internal/grpc/interceptors/recovery/recovery.go index 7abda41ad6..ba3d1ec60f 100644 --- a/internal/grpc/interceptors/recovery/recovery.go +++ b/internal/grpc/interceptors/recovery/recovery.go @@ -23,7 +23,7 @@ import ( "runtime/debug" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/grpc/interceptors/token/token.go b/internal/grpc/interceptors/token/token.go index e306f87062..c3628ffb9c 100644 --- a/internal/grpc/interceptors/token/token.go +++ b/internal/grpc/interceptors/token/token.go @@ -21,7 +21,7 @@ package token import ( "context" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/internal/grpc/interceptors/useragent/useragent.go b/internal/grpc/interceptors/useragent/useragent.go index d39642e59e..9f64d453b6 100644 --- a/internal/grpc/interceptors/useragent/useragent.go +++ b/internal/grpc/interceptors/useragent/useragent.go @@ -21,7 +21,7 @@ package useragent import ( "context" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/internal/grpc/services/applicationauth/applicationauth.go b/internal/grpc/services/applicationauth/applicationauth.go index 3e437541cc..3aa6061df4 100644 --- a/internal/grpc/services/applicationauth/applicationauth.go +++ b/internal/grpc/services/applicationauth/applicationauth.go @@ -22,11 +22,11 @@ import ( "context" appauthpb "github.com/cs3org/go-cs3apis/cs3/auth/applications/v1beta1" - "github.com/cs3org/reva/pkg/appauth" - "github.com/cs3org/reva/pkg/appauth/manager/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/appauth" + "github.com/cs3org/reva/v2/pkg/appauth/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/appprovider/appprovider.go b/internal/grpc/services/appprovider/appprovider.go index b95a152203..aa5d0a1df4 100644 --- a/internal/grpc/services/appprovider/appprovider.go +++ b/internal/grpc/services/appprovider/appprovider.go @@ -28,14 +28,14 @@ import ( registrypb "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/app" - "github.com/cs3org/reva/pkg/app/provider/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/app" + "github.com/cs3org/reva/v2/pkg/app/provider/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/juliangruber/go-intersect" "github.com/mitchellh/mapstructure" "google.golang.org/grpc" diff --git a/internal/grpc/services/appregistry/appregistry.go b/internal/grpc/services/appregistry/appregistry.go index e2d5e04df0..a31c556b46 100644 --- a/internal/grpc/services/appregistry/appregistry.go +++ b/internal/grpc/services/appregistry/appregistry.go @@ -24,11 +24,11 @@ import ( "google.golang.org/grpc" registrypb "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" - "github.com/cs3org/reva/pkg/app" - "github.com/cs3org/reva/pkg/app/registry/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/app" + "github.com/cs3org/reva/v2/pkg/app/registry/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" ) diff --git a/internal/grpc/services/appregistry/appregistry_test.go b/internal/grpc/services/appregistry/appregistry_test.go index 4230a1ffe8..da5b2ecc5c 100644 --- a/internal/grpc/services/appregistry/appregistry_test.go +++ b/internal/grpc/services/appregistry/appregistry_test.go @@ -26,7 +26,7 @@ import ( registrypb "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/app/registry/static" + "github.com/cs3org/reva/v2/pkg/app/registry/static" "github.com/stretchr/testify/assert" ) diff --git a/internal/grpc/services/authprovider/authprovider.go b/internal/grpc/services/authprovider/authprovider.go index 8f76f1500b..5145285ea2 100644 --- a/internal/grpc/services/authprovider/authprovider.go +++ b/internal/grpc/services/authprovider/authprovider.go @@ -24,13 +24,13 @@ import ( "path/filepath" provider "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/plugin" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/plugin" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/authregistry/authregistry.go b/internal/grpc/services/authregistry/authregistry.go index ea13f2a76f..0a51d93448 100644 --- a/internal/grpc/services/authregistry/authregistry.go +++ b/internal/grpc/services/authregistry/authregistry.go @@ -22,11 +22,11 @@ import ( "context" registrypb "github.com/cs3org/go-cs3apis/cs3/auth/registry/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/registry/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/registry/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "google.golang.org/grpc" ) diff --git a/internal/grpc/services/datatx/datatx.go b/internal/grpc/services/datatx/datatx.go index 33e9f73d56..c9649a6ca5 100644 --- a/internal/grpc/services/datatx/datatx.go +++ b/internal/grpc/services/datatx/datatx.go @@ -22,9 +22,9 @@ import ( "context" datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/gateway/applicationauth.go b/internal/grpc/services/gateway/applicationauth.go index 0bb67b3521..2fa921541f 100644 --- a/internal/grpc/services/gateway/applicationauth.go +++ b/internal/grpc/services/gateway/applicationauth.go @@ -22,8 +22,8 @@ import ( "context" appauthpb "github.com/cs3org/go-cs3apis/cs3/auth/applications/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/appprovider.go b/internal/grpc/services/gateway/appprovider.go index 66cfdaad10..3e7f035f51 100644 --- a/internal/grpc/services/gateway/appprovider.go +++ b/internal/grpc/services/gateway/appprovider.go @@ -32,11 +32,11 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/internal/grpc/services/gateway/appregistry.go b/internal/grpc/services/gateway/appregistry.go index 2ddd771ad6..4f5a3e0787 100644 --- a/internal/grpc/services/gateway/appregistry.go +++ b/internal/grpc/services/gateway/appregistry.go @@ -22,8 +22,8 @@ import ( "context" registry "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/authprovider.go b/internal/grpc/services/gateway/authprovider.go index ed8357ab7f..f807099127 100644 --- a/internal/grpc/services/gateway/authprovider.go +++ b/internal/grpc/services/gateway/authprovider.go @@ -31,14 +31,14 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/utils" + "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/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" "google.golang.org/grpc/metadata" ) diff --git a/internal/grpc/services/gateway/authregistry.go b/internal/grpc/services/gateway/authregistry.go index d993fd4733..a8070d3182 100644 --- a/internal/grpc/services/gateway/authregistry.go +++ b/internal/grpc/services/gateway/authregistry.go @@ -24,8 +24,8 @@ import ( registry "github.com/cs3org/go-cs3apis/cs3/auth/registry/v1beta1" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) func (s *svc) ListAuthProviders(ctx context.Context, req *registry.ListAuthProvidersRequest) (*gateway.ListAuthProvidersResponse, error) { diff --git a/internal/grpc/services/gateway/datatx.go b/internal/grpc/services/gateway/datatx.go index 01b5d08f13..c9309d1b74 100644 --- a/internal/grpc/services/gateway/datatx.go +++ b/internal/grpc/services/gateway/datatx.go @@ -22,8 +22,8 @@ import ( "context" datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/gateway.go b/internal/grpc/services/gateway/gateway.go index d5afca23b4..f2829ebea8 100644 --- a/internal/grpc/services/gateway/gateway.go +++ b/internal/grpc/services/gateway/gateway.go @@ -25,11 +25,11 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/gateway/groupprovider.go b/internal/grpc/services/gateway/groupprovider.go index 2bcbdf0022..0331a66fa0 100644 --- a/internal/grpc/services/gateway/groupprovider.go +++ b/internal/grpc/services/gateway/groupprovider.go @@ -22,8 +22,8 @@ import ( "context" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/ocmcore.go b/internal/grpc/services/gateway/ocmcore.go index b3153001a6..9d47f28098 100644 --- a/internal/grpc/services/gateway/ocmcore.go +++ b/internal/grpc/services/gateway/ocmcore.go @@ -22,8 +22,8 @@ import ( "context" ocmcore "github.com/cs3org/go-cs3apis/cs3/ocm/core/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/ocminvitemanager.go b/internal/grpc/services/gateway/ocminvitemanager.go index e5862ab964..bbbc67961d 100644 --- a/internal/grpc/services/gateway/ocminvitemanager.go +++ b/internal/grpc/services/gateway/ocminvitemanager.go @@ -22,8 +22,8 @@ import ( "context" invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/ocmproviderauthorizer.go b/internal/grpc/services/gateway/ocmproviderauthorizer.go index c40a69b159..91a3d83dba 100644 --- a/internal/grpc/services/gateway/ocmproviderauthorizer.go +++ b/internal/grpc/services/gateway/ocmproviderauthorizer.go @@ -22,8 +22,8 @@ import ( "context" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/ocmshareprovider.go b/internal/grpc/services/gateway/ocmshareprovider.go index ce6ef77546..0c146ac01c 100644 --- a/internal/grpc/services/gateway/ocmshareprovider.go +++ b/internal/grpc/services/gateway/ocmshareprovider.go @@ -26,10 +26,10 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/permissions.go b/internal/grpc/services/gateway/permissions.go index 537f614031..ad7ef50122 100644 --- a/internal/grpc/services/gateway/permissions.go +++ b/internal/grpc/services/gateway/permissions.go @@ -22,8 +22,8 @@ import ( "context" permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) func (s *svc) CheckPermission(ctx context.Context, req *permissions.CheckPermissionRequest) (*permissions.CheckPermissionResponse, error) { diff --git a/internal/grpc/services/gateway/preferences.go b/internal/grpc/services/gateway/preferences.go index 33b3abca7e..59c82c7356 100644 --- a/internal/grpc/services/gateway/preferences.go +++ b/internal/grpc/services/gateway/preferences.go @@ -22,8 +22,8 @@ import ( "context" preferences "github.com/cs3org/go-cs3apis/cs3/preferences/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/publicshareprovider.go b/internal/grpc/services/gateway/publicshareprovider.go index e29e34fc4e..c77fbe86d0 100644 --- a/internal/grpc/services/gateway/publicshareprovider.go +++ b/internal/grpc/services/gateway/publicshareprovider.go @@ -23,9 +23,9 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/storageprovider.go b/internal/grpc/services/gateway/storageprovider.go index 4c28d856d6..517373292d 100644 --- a/internal/grpc/services/gateway/storageprovider.go +++ b/internal/grpc/services/gateway/storageprovider.go @@ -37,15 +37,15 @@ import ( typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" "google.golang.org/grpc/codes" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - sdk "github.com/cs3org/reva/pkg/sdk/common" - "github.com/cs3org/reva/pkg/share" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + sdk "github.com/cs3org/reva/v2/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/share" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/golang-jwt/jwt" "github.com/pkg/errors" gstatus "google.golang.org/grpc/status" diff --git a/internal/grpc/services/gateway/storageprovidercache.go b/internal/grpc/services/gateway/storageprovidercache.go index 6a5ee43028..0cf855d0e5 100644 --- a/internal/grpc/services/gateway/storageprovidercache.go +++ b/internal/grpc/services/gateway/storageprovidercache.go @@ -29,9 +29,9 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - sdk "github.com/cs3org/reva/pkg/sdk/common" - "github.com/cs3org/reva/pkg/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + sdk "github.com/cs3org/reva/v2/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc" ) diff --git a/internal/grpc/services/gateway/userprovider.go b/internal/grpc/services/gateway/userprovider.go index ad7722e3cc..aeb59009d8 100644 --- a/internal/grpc/services/gateway/userprovider.go +++ b/internal/grpc/services/gateway/userprovider.go @@ -22,8 +22,8 @@ import ( "context" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/usershareprovider.go b/internal/grpc/services/gateway/usershareprovider.go index 2d40c80ffe..1965289f5a 100644 --- a/internal/grpc/services/gateway/usershareprovider.go +++ b/internal/grpc/services/gateway/usershareprovider.go @@ -26,13 +26,13 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/storage/utils/grants" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/storage/utils/grants" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/gateway/webdavstorageprovider.go b/internal/grpc/services/gateway/webdavstorageprovider.go index 10782dba91..8f0ae988b2 100644 --- a/internal/grpc/services/gateway/webdavstorageprovider.go +++ b/internal/grpc/services/gateway/webdavstorageprovider.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/groupprovider/groupprovider.go b/internal/grpc/services/groupprovider/groupprovider.go index 578438b3af..c7463e86a3 100644 --- a/internal/grpc/services/groupprovider/groupprovider.go +++ b/internal/grpc/services/groupprovider/groupprovider.go @@ -24,11 +24,11 @@ import ( "sort" grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/group" - "github.com/cs3org/reva/pkg/group/manager/registry" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/group" + "github.com/cs3org/reva/v2/pkg/group/manager/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/helloworld/helloworld.go b/internal/grpc/services/helloworld/helloworld.go index 1f8bac3815..3186eb04d2 100644 --- a/internal/grpc/services/helloworld/helloworld.go +++ b/internal/grpc/services/helloworld/helloworld.go @@ -22,8 +22,8 @@ import ( "context" "fmt" - "github.com/cs3org/reva/internal/grpc/services/helloworld/proto" - "github.com/cs3org/reva/pkg/rgrpc" + "github.com/cs3org/reva/v2/internal/grpc/services/helloworld/proto" + "github.com/cs3org/reva/v2/pkg/rgrpc" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/loader/loader.go b/internal/grpc/services/loader/loader.go index b28fbdec5c..825d9ea6ad 100644 --- a/internal/grpc/services/loader/loader.go +++ b/internal/grpc/services/loader/loader.go @@ -20,27 +20,27 @@ package loader import ( // Load core gRPC services. - _ "github.com/cs3org/reva/internal/grpc/services/applicationauth" - _ "github.com/cs3org/reva/internal/grpc/services/appprovider" - _ "github.com/cs3org/reva/internal/grpc/services/appregistry" - _ "github.com/cs3org/reva/internal/grpc/services/authprovider" - _ "github.com/cs3org/reva/internal/grpc/services/authregistry" - _ "github.com/cs3org/reva/internal/grpc/services/datatx" - _ "github.com/cs3org/reva/internal/grpc/services/gateway" - _ "github.com/cs3org/reva/internal/grpc/services/groupprovider" - _ "github.com/cs3org/reva/internal/grpc/services/helloworld" - _ "github.com/cs3org/reva/internal/grpc/services/ocmcore" - _ "github.com/cs3org/reva/internal/grpc/services/ocminvitemanager" - _ "github.com/cs3org/reva/internal/grpc/services/ocmproviderauthorizer" - _ "github.com/cs3org/reva/internal/grpc/services/ocmshareprovider" - _ "github.com/cs3org/reva/internal/grpc/services/permissions" - _ "github.com/cs3org/reva/internal/grpc/services/preferences" - _ "github.com/cs3org/reva/internal/grpc/services/publicshareprovider" - _ "github.com/cs3org/reva/internal/grpc/services/publicstorageprovider" - _ "github.com/cs3org/reva/internal/grpc/services/sharesstorageprovider" - _ "github.com/cs3org/reva/internal/grpc/services/storageprovider" - _ "github.com/cs3org/reva/internal/grpc/services/storageregistry" - _ "github.com/cs3org/reva/internal/grpc/services/userprovider" - _ "github.com/cs3org/reva/internal/grpc/services/usershareprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/applicationauth" + _ "github.com/cs3org/reva/v2/internal/grpc/services/appprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/appregistry" + _ "github.com/cs3org/reva/v2/internal/grpc/services/authprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/authregistry" + _ "github.com/cs3org/reva/v2/internal/grpc/services/datatx" + _ "github.com/cs3org/reva/v2/internal/grpc/services/gateway" + _ "github.com/cs3org/reva/v2/internal/grpc/services/groupprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/helloworld" + _ "github.com/cs3org/reva/v2/internal/grpc/services/ocmcore" + _ "github.com/cs3org/reva/v2/internal/grpc/services/ocminvitemanager" + _ "github.com/cs3org/reva/v2/internal/grpc/services/ocmproviderauthorizer" + _ "github.com/cs3org/reva/v2/internal/grpc/services/ocmshareprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/permissions" + _ "github.com/cs3org/reva/v2/internal/grpc/services/preferences" + _ "github.com/cs3org/reva/v2/internal/grpc/services/publicshareprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/publicstorageprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/storageregistry" + _ "github.com/cs3org/reva/v2/internal/grpc/services/userprovider" + _ "github.com/cs3org/reva/v2/internal/grpc/services/usershareprovider" // Add your own service here ) diff --git a/internal/grpc/services/ocmcore/ocmcore.go b/internal/grpc/services/ocmcore/ocmcore.go index 745306fd41..9782688f3d 100644 --- a/internal/grpc/services/ocmcore/ocmcore.go +++ b/internal/grpc/services/ocmcore/ocmcore.go @@ -27,11 +27,11 @@ import ( ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/share" - "github.com/cs3org/reva/pkg/ocm/share/manager/registry" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/share" + "github.com/cs3org/reva/v2/pkg/ocm/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/ocminvitemanager/ocminvitemanager.go b/internal/grpc/services/ocminvitemanager/ocminvitemanager.go index 08cfbdaced..7af7125c28 100644 --- a/internal/grpc/services/ocminvitemanager/ocminvitemanager.go +++ b/internal/grpc/services/ocminvitemanager/ocminvitemanager.go @@ -22,11 +22,11 @@ import ( "context" invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/invite" - "github.com/cs3org/reva/pkg/ocm/invite/manager/registry" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/invite" + "github.com/cs3org/reva/v2/pkg/ocm/invite/manager/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/ocmproviderauthorizer/ocmproviderauthorizer.go b/internal/grpc/services/ocmproviderauthorizer/ocmproviderauthorizer.go index 00e41f881c..374ebd3f83 100644 --- a/internal/grpc/services/ocmproviderauthorizer/ocmproviderauthorizer.go +++ b/internal/grpc/services/ocmproviderauthorizer/ocmproviderauthorizer.go @@ -22,11 +22,11 @@ import ( "context" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/provider" - "github.com/cs3org/reva/pkg/ocm/provider/authorizer/registry" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/provider" + "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/ocmshareprovider/ocmshareprovider.go b/internal/grpc/services/ocmshareprovider/ocmshareprovider.go index d850933d41..09d9c70510 100644 --- a/internal/grpc/services/ocmshareprovider/ocmshareprovider.go +++ b/internal/grpc/services/ocmshareprovider/ocmshareprovider.go @@ -22,11 +22,11 @@ import ( "context" ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/share" - "github.com/cs3org/reva/pkg/ocm/share/manager/registry" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/share" + "github.com/cs3org/reva/v2/pkg/ocm/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/permissions/permissions.go b/internal/grpc/services/permissions/permissions.go index 4479fdb88c..1312a7f750 100644 --- a/internal/grpc/services/permissions/permissions.go +++ b/internal/grpc/services/permissions/permissions.go @@ -24,9 +24,9 @@ import ( permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/permission" - "github.com/cs3org/reva/pkg/permission/manager/registry" - "github.com/cs3org/reva/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/permission" + "github.com/cs3org/reva/v2/pkg/permission/manager/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/preferences/preferences.go b/internal/grpc/services/preferences/preferences.go index c51e874cdb..2241a2a8cf 100644 --- a/internal/grpc/services/preferences/preferences.go +++ b/internal/grpc/services/preferences/preferences.go @@ -26,9 +26,9 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" preferences "github.com/cs3org/go-cs3apis/cs3/preferences/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/publicshareprovider/publicshareprovider.go b/internal/grpc/services/publicshareprovider/publicshareprovider.go index 7174ce3e2f..ffa59209c8 100644 --- a/internal/grpc/services/publicshareprovider/publicshareprovider.go +++ b/internal/grpc/services/publicshareprovider/publicshareprovider.go @@ -24,13 +24,13 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/publicshare/manager/registry" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/publicstorageprovider/publicstorageprovider.go b/internal/grpc/services/publicstorageprovider/publicstorageprovider.go index 0b450d1435..4f496143ea 100644 --- a/internal/grpc/services/publicstorageprovider/publicstorageprovider.go +++ b/internal/grpc/services/publicstorageprovider/publicstorageprovider.go @@ -29,13 +29,13 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "go.opentelemetry.io/otel/attribute" diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go index 2aae3fd8bf..4df9bfdda0 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider.go @@ -35,13 +35,13 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go index bdd4109796..bc02caba99 100644 --- a/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go +++ b/internal/grpc/services/sharesstorageprovider/sharesstorageprovider_test.go @@ -29,12 +29,12 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - provider "github.com/cs3org/reva/internal/grpc/services/sharesstorageprovider" - mocks "github.com/cs3org/reva/internal/grpc/services/sharesstorageprovider/mocks" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/status" - _ "github.com/cs3org/reva/pkg/share/manager/loader" - "github.com/cs3org/reva/pkg/utils" + provider "github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider" + mocks "github.com/cs3org/reva/v2/internal/grpc/services/sharesstorageprovider/mocks" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + _ "github.com/cs3org/reva/v2/pkg/share/manager/loader" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc" . "github.com/onsi/ginkgo/v2" diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go index f87ccafaf9..e492783b9e 100644 --- a/internal/grpc/services/storageprovider/storageprovider.go +++ b/internal/grpc/services/storageprovider/storageprovider.go @@ -29,17 +29,17 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "go.opentelemetry.io/otel/attribute" diff --git a/internal/grpc/services/storageregistry/storageregistry.go b/internal/grpc/services/storageregistry/storageregistry.go index bab1bd2f17..210c7d1d00 100644 --- a/internal/grpc/services/storageregistry/storageregistry.go +++ b/internal/grpc/services/storageregistry/storageregistry.go @@ -28,12 +28,12 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registrypb "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - sdk "github.com/cs3org/reva/pkg/sdk/common" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/registry/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + sdk "github.com/cs3org/reva/v2/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/registry/registry" "github.com/mitchellh/mapstructure" "google.golang.org/grpc" ) diff --git a/internal/grpc/services/userprovider/userprovider.go b/internal/grpc/services/userprovider/userprovider.go index 013d6784b8..097aad98f4 100644 --- a/internal/grpc/services/userprovider/userprovider.go +++ b/internal/grpc/services/userprovider/userprovider.go @@ -25,12 +25,12 @@ import ( "sort" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/plugin" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/plugin" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/grpc/services/usershareprovider/usershareprovider.go b/internal/grpc/services/usershareprovider/usershareprovider.go index c241fc5f0a..dbd0d34f54 100644 --- a/internal/grpc/services/usershareprovider/usershareprovider.go +++ b/internal/grpc/services/usershareprovider/usershareprovider.go @@ -25,13 +25,13 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/share" - "github.com/cs3org/reva/pkg/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/share" + "github.com/cs3org/reva/v2/pkg/share/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/internal/http/interceptors/appctx/appctx.go b/internal/http/interceptors/appctx/appctx.go index 9d34a78981..4145e10f4e 100644 --- a/internal/http/interceptors/appctx/appctx.go +++ b/internal/http/interceptors/appctx/appctx.go @@ -24,8 +24,8 @@ package appctx import ( "net/http" - "github.com/cs3org/reva/pkg/appctx" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/pkg/appctx" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/rs/zerolog" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/http/interceptors/auth/auth.go b/internal/http/interceptors/auth/auth.go index 4e5a07c80e..102ede554b 100644 --- a/internal/http/interceptors/auth/auth.go +++ b/internal/http/interceptors/auth/auth.go @@ -28,19 +28,19 @@ 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/internal/http/interceptors/auth/credential/registry" - tokenregistry "github.com/cs3org/reva/internal/http/interceptors/auth/token/registry" - tokenwriterregistry "github.com/cs3org/reva/internal/http/interceptors/auth/tokenwriter/registry" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/sharedconf" - tokenmgr "github.com/cs3org/reva/pkg/token/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/interceptors/auth/credential/registry" + tokenregistry "github.com/cs3org/reva/v2/internal/http/interceptors/auth/token/registry" + tokenwriterregistry "github.com/cs3org/reva/v2/internal/http/interceptors/auth/tokenwriter/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/scope" + ctxpkg "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/rhttp/global" + "github.com/cs3org/reva/v2/pkg/sharedconf" + tokenmgr "github.com/cs3org/reva/v2/pkg/token/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc/metadata" diff --git a/internal/http/interceptors/auth/credential/loader/loader.go b/internal/http/interceptors/auth/credential/loader/loader.go index d67ab160bd..dd1bbf328d 100644 --- a/internal/http/interceptors/auth/credential/loader/loader.go +++ b/internal/http/interceptors/auth/credential/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core authentication strategies. - _ "github.com/cs3org/reva/internal/http/interceptors/auth/credential/strategy/basic" - _ "github.com/cs3org/reva/internal/http/interceptors/auth/credential/strategy/bearer" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/credential/strategy/basic" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/credential/strategy/bearer" // Add your own here. ) diff --git a/internal/http/interceptors/auth/credential/registry/registry.go b/internal/http/interceptors/auth/credential/registry/registry.go index 0edce0feb3..4c5f4b2051 100644 --- a/internal/http/interceptors/auth/credential/registry/registry.go +++ b/internal/http/interceptors/auth/credential/registry/registry.go @@ -19,7 +19,7 @@ package registry import ( - "github.com/cs3org/reva/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth" ) // NewCredentialFunc is the function that credential strategies diff --git a/internal/http/interceptors/auth/credential/strategy/basic/basic.go b/internal/http/interceptors/auth/credential/strategy/basic/basic.go index ab41523981..1d4b617b9a 100644 --- a/internal/http/interceptors/auth/credential/strategy/basic/basic.go +++ b/internal/http/interceptors/auth/credential/strategy/basic/basic.go @@ -22,8 +22,8 @@ import ( "fmt" "net/http" - "github.com/cs3org/reva/internal/http/interceptors/auth/credential/registry" - "github.com/cs3org/reva/pkg/auth" + "github.com/cs3org/reva/v2/internal/http/interceptors/auth/credential/registry" + "github.com/cs3org/reva/v2/pkg/auth" ) func init() { diff --git a/internal/http/interceptors/auth/credential/strategy/bearer/bearer.go b/internal/http/interceptors/auth/credential/strategy/bearer/bearer.go index 713aa46396..0942009d04 100644 --- a/internal/http/interceptors/auth/credential/strategy/bearer/bearer.go +++ b/internal/http/interceptors/auth/credential/strategy/bearer/bearer.go @@ -23,8 +23,8 @@ import ( "net/http" "strings" - "github.com/cs3org/reva/internal/http/interceptors/auth/credential/registry" - "github.com/cs3org/reva/pkg/auth" + "github.com/cs3org/reva/v2/internal/http/interceptors/auth/credential/registry" + "github.com/cs3org/reva/v2/pkg/auth" ) func init() { diff --git a/internal/http/interceptors/auth/token/loader/loader.go b/internal/http/interceptors/auth/token/loader/loader.go index 504306c227..ff03781f58 100644 --- a/internal/http/interceptors/auth/token/loader/loader.go +++ b/internal/http/interceptors/auth/token/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load core token strategies. - _ "github.com/cs3org/reva/internal/http/interceptors/auth/token/strategy/header" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/token/strategy/header" // Add your own here. ) diff --git a/internal/http/interceptors/auth/token/registry/registry.go b/internal/http/interceptors/auth/token/registry/registry.go index 8df2110b61..f6426adc41 100644 --- a/internal/http/interceptors/auth/token/registry/registry.go +++ b/internal/http/interceptors/auth/token/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/auth" +import "github.com/cs3org/reva/v2/pkg/auth" // NewTokenFunc is the function that token strategies // should register at init time. diff --git a/internal/http/interceptors/auth/token/strategy/header/header.go b/internal/http/interceptors/auth/token/strategy/header/header.go index 4cf6974f29..08ebef3395 100644 --- a/internal/http/interceptors/auth/token/strategy/header/header.go +++ b/internal/http/interceptors/auth/token/strategy/header/header.go @@ -21,9 +21,9 @@ package header import ( "net/http" - "github.com/cs3org/reva/internal/http/interceptors/auth/token/registry" - "github.com/cs3org/reva/pkg/auth" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/internal/http/interceptors/auth/token/registry" + "github.com/cs3org/reva/v2/pkg/auth" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) func init() { diff --git a/internal/http/interceptors/auth/tokenwriter/loader/loader.go b/internal/http/interceptors/auth/tokenwriter/loader/loader.go index 92be200869..1f7902e645 100644 --- a/internal/http/interceptors/auth/tokenwriter/loader/loader.go +++ b/internal/http/interceptors/auth/tokenwriter/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load core token writer strategies. - _ "github.com/cs3org/reva/internal/http/interceptors/auth/tokenwriter/strategy/header" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/auth/tokenwriter/strategy/header" // Add your own here. ) diff --git a/internal/http/interceptors/auth/tokenwriter/registry/registry.go b/internal/http/interceptors/auth/tokenwriter/registry/registry.go index a0ebd97d9b..8755bcdffe 100644 --- a/internal/http/interceptors/auth/tokenwriter/registry/registry.go +++ b/internal/http/interceptors/auth/tokenwriter/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/auth" +import "github.com/cs3org/reva/v2/pkg/auth" // NewTokenFunc is the function that token writers // should register at init time. diff --git a/internal/http/interceptors/auth/tokenwriter/strategy/header/header.go b/internal/http/interceptors/auth/tokenwriter/strategy/header/header.go index ecc047afb6..fd9bb0b2b2 100644 --- a/internal/http/interceptors/auth/tokenwriter/strategy/header/header.go +++ b/internal/http/interceptors/auth/tokenwriter/strategy/header/header.go @@ -21,9 +21,9 @@ package header import ( "net/http" - "github.com/cs3org/reva/internal/http/interceptors/auth/tokenwriter/registry" - "github.com/cs3org/reva/pkg/auth" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/internal/http/interceptors/auth/tokenwriter/registry" + "github.com/cs3org/reva/v2/pkg/auth" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) func init() { diff --git a/internal/http/interceptors/cors/cors.go b/internal/http/interceptors/cors/cors.go index 1d7080ac09..a4334b941b 100644 --- a/internal/http/interceptors/cors/cors.go +++ b/internal/http/interceptors/cors/cors.go @@ -19,7 +19,7 @@ package cors import ( - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/global" "github.com/mitchellh/mapstructure" "github.com/rs/cors" ) diff --git a/internal/http/interceptors/loader/loader.go b/internal/http/interceptors/loader/loader.go index da5745b7de..546adeb732 100644 --- a/internal/http/interceptors/loader/loader.go +++ b/internal/http/interceptors/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core HTTP middlewares. - _ "github.com/cs3org/reva/internal/http/interceptors/cors" - _ "github.com/cs3org/reva/internal/http/interceptors/providerauthorizer" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/cors" + _ "github.com/cs3org/reva/v2/internal/http/interceptors/providerauthorizer" // Add your own middleware. ) diff --git a/internal/http/interceptors/log/log.go b/internal/http/interceptors/log/log.go index 3255cc7ad6..dafb761f27 100644 --- a/internal/http/interceptors/log/log.go +++ b/internal/http/interceptors/log/log.go @@ -26,7 +26,7 @@ import ( "net/url" "time" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "github.com/rs/zerolog" ) diff --git a/internal/http/interceptors/providerauthorizer/providerauthorizer.go b/internal/http/interceptors/providerauthorizer/providerauthorizer.go index 450614dcc8..6370973800 100644 --- a/internal/http/interceptors/providerauthorizer/providerauthorizer.go +++ b/internal/http/interceptors/providerauthorizer/providerauthorizer.go @@ -25,13 +25,13 @@ import ( "strings" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/ocm/provider" - "github.com/cs3org/reva/pkg/ocm/provider/authorizer/registry" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/ocm/provider" + "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/registry" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" ) diff --git a/internal/http/services/appprovider/appprovider.go b/internal/http/services/appprovider/appprovider.go index ed101a0f3c..92b30ba271 100644 --- a/internal/http/services/appprovider/appprovider.go +++ b/internal/http/services/appprovider/appprovider.go @@ -28,15 +28,15 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/datagateway" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" ua "github.com/mileusna/useragent" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/internal/http/services/appprovider/errors.go b/internal/http/services/appprovider/errors.go index 353925423d..139724c608 100644 --- a/internal/http/services/appprovider/errors.go +++ b/internal/http/services/appprovider/errors.go @@ -22,7 +22,7 @@ import ( "encoding/json" "net/http" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" ) // appErrorCode stores the type of error encountered diff --git a/internal/http/services/archiver/handler.go b/internal/http/services/archiver/handler.go index a660573ced..c56eae581c 100644 --- a/internal/http/services/archiver/handler.go +++ b/internal/http/services/archiver/handler.go @@ -31,15 +31,15 @@ import ( "regexp" - "github.com/cs3org/reva/internal/http/services/archiver/manager" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/storage/utils/downloader" - "github.com/cs3org/reva/pkg/storage/utils/walker" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/archiver/manager" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storage/utils/downloader" + "github.com/cs3org/reva/v2/pkg/storage/utils/walker" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/gdexlab/go-render/render" ua "github.com/mileusna/useragent" "github.com/mitchellh/mapstructure" diff --git a/internal/http/services/archiver/manager/archiver.go b/internal/http/services/archiver/manager/archiver.go index 58a513d122..3415058618 100644 --- a/internal/http/services/archiver/manager/archiver.go +++ b/internal/http/services/archiver/manager/archiver.go @@ -27,8 +27,8 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/downloader" - "github.com/cs3org/reva/pkg/storage/utils/walker" + "github.com/cs3org/reva/v2/pkg/storage/utils/downloader" + "github.com/cs3org/reva/v2/pkg/storage/utils/walker" ) // Config is the config for the Archiver diff --git a/internal/http/services/archiver/manager/archiver_test.go b/internal/http/services/archiver/manager/archiver_test.go index 1574ae7fb0..0214ae621c 100644 --- a/internal/http/services/archiver/manager/archiver_test.go +++ b/internal/http/services/archiver/manager/archiver_test.go @@ -31,9 +31,9 @@ import ( "testing" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - downMock "github.com/cs3org/reva/pkg/storage/utils/downloader/mock" - walkerMock "github.com/cs3org/reva/pkg/storage/utils/walker/mock" - "github.com/cs3org/reva/pkg/test" + downMock "github.com/cs3org/reva/v2/pkg/storage/utils/downloader/mock" + walkerMock "github.com/cs3org/reva/v2/pkg/storage/utils/walker/mock" + "github.com/cs3org/reva/v2/pkg/test" ) func UnTar(dir string, r io.Reader) error { diff --git a/internal/http/services/datagateway/datagateway.go b/internal/http/services/datagateway/datagateway.go index 5a24bb2b0b..382ef6c978 100644 --- a/internal/http/services/datagateway/datagateway.go +++ b/internal/http/services/datagateway/datagateway.go @@ -27,11 +27,11 @@ import ( "strconv" "time" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/golang-jwt/jwt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/internal/http/services/dataprovider/dataprovider.go b/internal/http/services/dataprovider/dataprovider.go index 1b8a58fc00..2591ad80b7 100644 --- a/internal/http/services/dataprovider/dataprovider.go +++ b/internal/http/services/dataprovider/dataprovider.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - "github.com/cs3org/reva/pkg/appctx" - datatxregistry "github.com/cs3org/reva/pkg/rhttp/datatx/manager/registry" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + datatxregistry "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/registry" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" ) diff --git a/internal/http/services/helloworld/helloworld.go b/internal/http/services/helloworld/helloworld.go index f194b34602..bcb5adff9f 100644 --- a/internal/http/services/helloworld/helloworld.go +++ b/internal/http/services/helloworld/helloworld.go @@ -21,8 +21,8 @@ package helloworld import ( "net/http" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/global" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" ) diff --git a/internal/http/services/loader/loader.go b/internal/http/services/loader/loader.go index 7548a93f32..f15a46bb3c 100644 --- a/internal/http/services/loader/loader.go +++ b/internal/http/services/loader/loader.go @@ -20,21 +20,21 @@ package loader import ( // Load core HTTP services - _ "github.com/cs3org/reva/internal/http/services/appprovider" - _ "github.com/cs3org/reva/internal/http/services/archiver" - _ "github.com/cs3org/reva/internal/http/services/datagateway" - _ "github.com/cs3org/reva/internal/http/services/dataprovider" - _ "github.com/cs3org/reva/internal/http/services/helloworld" - _ "github.com/cs3org/reva/internal/http/services/mentix" - _ "github.com/cs3org/reva/internal/http/services/meshdirectory" - _ "github.com/cs3org/reva/internal/http/services/metrics" - _ "github.com/cs3org/reva/internal/http/services/ocmd" - _ "github.com/cs3org/reva/internal/http/services/owncloud/ocdav" - _ "github.com/cs3org/reva/internal/http/services/owncloud/ocs" - _ "github.com/cs3org/reva/internal/http/services/prometheus" - _ "github.com/cs3org/reva/internal/http/services/reverseproxy" - _ "github.com/cs3org/reva/internal/http/services/siteacc" - _ "github.com/cs3org/reva/internal/http/services/sysinfo" - _ "github.com/cs3org/reva/internal/http/services/wellknown" + _ "github.com/cs3org/reva/v2/internal/http/services/appprovider" + _ "github.com/cs3org/reva/v2/internal/http/services/archiver" + _ "github.com/cs3org/reva/v2/internal/http/services/datagateway" + _ "github.com/cs3org/reva/v2/internal/http/services/dataprovider" + _ "github.com/cs3org/reva/v2/internal/http/services/helloworld" + _ "github.com/cs3org/reva/v2/internal/http/services/mentix" + _ "github.com/cs3org/reva/v2/internal/http/services/meshdirectory" + _ "github.com/cs3org/reva/v2/internal/http/services/metrics" + _ "github.com/cs3org/reva/v2/internal/http/services/ocmd" + _ "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav" + _ "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs" + _ "github.com/cs3org/reva/v2/internal/http/services/prometheus" + _ "github.com/cs3org/reva/v2/internal/http/services/reverseproxy" + _ "github.com/cs3org/reva/v2/internal/http/services/siteacc" + _ "github.com/cs3org/reva/v2/internal/http/services/sysinfo" + _ "github.com/cs3org/reva/v2/internal/http/services/wellknown" // Add your own service here ) diff --git a/internal/http/services/mentix/mentix.go b/internal/http/services/mentix/mentix.go index 4a9332164e..09294cbd17 100644 --- a/internal/http/services/mentix/mentix.go +++ b/internal/http/services/mentix/mentix.go @@ -21,15 +21,15 @@ package mentix import ( "net/http" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/mentix" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/rhttp/global" ) func init() { diff --git a/internal/http/services/meshdirectory/meshdirectory.go b/internal/http/services/meshdirectory/meshdirectory.go index 828abe37fc..120e7f2c52 100644 --- a/internal/http/services/meshdirectory/meshdirectory.go +++ b/internal/http/services/meshdirectory/meshdirectory.go @@ -28,14 +28,14 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/ocmd" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/internal/http/services/ocmd" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/global" "github.com/mitchellh/mapstructure" ) diff --git a/internal/http/services/metrics/metrics.go b/internal/http/services/metrics/metrics.go index 7fee35c6c4..3f23fe8e95 100644 --- a/internal/http/services/metrics/metrics.go +++ b/internal/http/services/metrics/metrics.go @@ -25,13 +25,13 @@ import ( "net/http" "os" - "github.com/cs3org/reva/pkg/logger" + "github.com/cs3org/reva/v2/pkg/logger" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/metrics" - "github.com/cs3org/reva/pkg/metrics/config" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/metrics" + "github.com/cs3org/reva/v2/pkg/metrics/config" + "github.com/cs3org/reva/v2/pkg/rhttp/global" ) func init() { diff --git a/internal/http/services/ocmd/config.go b/internal/http/services/ocmd/config.go index 79364d890b..8d7b0b419a 100644 --- a/internal/http/services/ocmd/config.go +++ b/internal/http/services/ocmd/config.go @@ -23,7 +23,7 @@ import ( "fmt" "net/http" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" ) type configData struct { diff --git a/internal/http/services/ocmd/invites.go b/internal/http/services/ocmd/invites.go index 0b0c3ff1c8..2a667d7a8b 100644 --- a/internal/http/services/ocmd/invites.go +++ b/internal/http/services/ocmd/invites.go @@ -32,12 +32,12 @@ import ( invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/smtpclient" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/smtpclient" + "github.com/cs3org/reva/v2/pkg/utils" ) type invitesHandler struct { diff --git a/internal/http/services/ocmd/notifications.go b/internal/http/services/ocmd/notifications.go index a8a13021a4..48f5f9c043 100644 --- a/internal/http/services/ocmd/notifications.go +++ b/internal/http/services/ocmd/notifications.go @@ -21,8 +21,8 @@ package ocmd import ( "net/http" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/router" ) type notificationsHandler struct { diff --git a/internal/http/services/ocmd/ocmd.go b/internal/http/services/ocmd/ocmd.go index 776cf36414..9448318521 100644 --- a/internal/http/services/ocmd/ocmd.go +++ b/internal/http/services/ocmd/ocmd.go @@ -21,11 +21,11 @@ package ocmd import ( "net/http" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/smtpclient" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/smtpclient" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" ) diff --git a/internal/http/services/ocmd/reqres.go b/internal/http/services/ocmd/reqres.go index d37824a8fc..f0fd55be9e 100644 --- a/internal/http/services/ocmd/reqres.go +++ b/internal/http/services/ocmd/reqres.go @@ -22,7 +22,7 @@ import ( "encoding/json" "net/http" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" ) // APIErrorCode stores the type of error encountered diff --git a/internal/http/services/ocmd/send.go b/internal/http/services/ocmd/send.go index 7391a9c0ec..a4a84e284e 100644 --- a/internal/http/services/ocmd/send.go +++ b/internal/http/services/ocmd/send.go @@ -33,11 +33,11 @@ import ( ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "google.golang.org/grpc/metadata" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) type sendHandler struct { diff --git a/internal/http/services/ocmd/shares.go b/internal/http/services/ocmd/shares.go index c9d625b68d..4a6d5537d6 100644 --- a/internal/http/services/ocmd/shares.go +++ b/internal/http/services/ocmd/shares.go @@ -35,10 +35,10 @@ import ( ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/utils" ) type sharesHandler struct { diff --git a/internal/http/services/owncloud/ocdav/avatars.go b/internal/http/services/owncloud/ocdav/avatars.go index 6815d36ad3..89d3559272 100644 --- a/internal/http/services/owncloud/ocdav/avatars.go +++ b/internal/http/services/owncloud/ocdav/avatars.go @@ -22,9 +22,9 @@ import ( "encoding/hex" "net/http" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/router" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/router" ) // AvatarsHandler handles avatar requests diff --git a/internal/http/services/owncloud/ocdav/copy.go b/internal/http/services/owncloud/ocdav/copy.go index 53889dc8d4..351070ba77 100644 --- a/internal/http/services/owncloud/ocdav/copy.go +++ b/internal/http/services/owncloud/ocdav/copy.go @@ -31,15 +31,15 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/datagateway" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/rhttp/router" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/dav.go b/internal/http/services/owncloud/ocdav/dav.go index 84f757ddcb..babb166ca6 100644 --- a/internal/http/services/owncloud/ocdav/dav.go +++ b/internal/http/services/owncloud/ocdav/dav.go @@ -29,13 +29,13 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" ) diff --git a/internal/http/services/owncloud/ocdav/delete.go b/internal/http/services/owncloud/ocdav/delete.go index 4df9b67bb6..b156d5fba5 100644 --- a/internal/http/services/owncloud/ocdav/delete.go +++ b/internal/http/services/owncloud/ocdav/delete.go @@ -26,13 +26,13 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/status" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/errors/error.go b/internal/http/services/owncloud/ocdav/errors/error.go index b2dd46c0d4..8968181b47 100644 --- a/internal/http/services/owncloud/ocdav/errors/error.go +++ b/internal/http/services/owncloud/ocdav/errors/error.go @@ -24,7 +24,7 @@ import ( "net/http" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/get.go b/internal/http/services/owncloud/ocdav/get.go index 80443edc79..6b1413ac68 100644 --- a/internal/http/services/owncloud/ocdav/get.go +++ b/internal/http/services/owncloud/ocdav/get.go @@ -30,16 +30,16 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/grpc/services/storageprovider" - "github.com/cs3org/reva/internal/http/services/datagateway" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/head.go b/internal/http/services/owncloud/ocdav/head.go index 3836ea17a5..1882d52a20 100644 --- a/internal/http/services/owncloud/ocdav/head.go +++ b/internal/http/services/owncloud/ocdav/head.go @@ -27,17 +27,17 @@ import ( "strings" "time" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils/resourceid" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/grpc/services/storageprovider" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/locks.go b/internal/http/services/owncloud/ocdav/locks.go index daee6d8dba..d88bd1d986 100644 --- a/internal/http/services/owncloud/ocdav/locks.go +++ b/internal/http/services/owncloud/ocdav/locks.go @@ -34,14 +34,14 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/props" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/props" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" ) diff --git a/internal/http/services/owncloud/ocdav/meta.go b/internal/http/services/owncloud/ocdav/meta.go index 7aaffea142..0acc610ec5 100644 --- a/internal/http/services/owncloud/ocdav/meta.go +++ b/internal/http/services/owncloud/ocdav/meta.go @@ -21,8 +21,8 @@ package ocdav import ( "net/http" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" ) // MetaHandler handles meta requests diff --git a/internal/http/services/owncloud/ocdav/mkcol.go b/internal/http/services/owncloud/ocdav/mkcol.go index 2d55f1b3e2..ceb11a901a 100644 --- a/internal/http/services/owncloud/ocdav/mkcol.go +++ b/internal/http/services/owncloud/ocdav/mkcol.go @@ -26,10 +26,10 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/move.go b/internal/http/services/owncloud/ocdav/move.go index 8947ff8bf9..b682acfbc2 100644 --- a/internal/http/services/owncloud/ocdav/move.go +++ b/internal/http/services/owncloud/ocdav/move.go @@ -27,14 +27,14 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/router" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/net/context.go b/internal/http/services/owncloud/ocdav/net/context.go index d3069e8972..f5236d995f 100644 --- a/internal/http/services/owncloud/ocdav/net/context.go +++ b/internal/http/services/owncloud/ocdav/net/context.go @@ -22,7 +22,7 @@ import ( "context" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) // IsCurrentUserOwner returns whether the context user is the given owner or not diff --git a/internal/http/services/owncloud/ocdav/net/context_test.go b/internal/http/services/owncloud/ocdav/net/context_test.go index af653e7477..0cd6b0af7c 100644 --- a/internal/http/services/owncloud/ocdav/net/context_test.go +++ b/internal/http/services/owncloud/ocdav/net/context_test.go @@ -22,8 +22,8 @@ import ( "context" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/http/services/owncloud/ocdav/net/net_test.go b/internal/http/services/owncloud/ocdav/net/net_test.go index 17c8eb27a0..ed40f19263 100644 --- a/internal/http/services/owncloud/ocdav/net/net_test.go +++ b/internal/http/services/owncloud/ocdav/net/net_test.go @@ -21,7 +21,7 @@ package net_test import ( "time" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/http/services/owncloud/ocdav/ocdav.go b/internal/http/services/owncloud/ocdav/ocdav.go index e925a645fb..1b6594990e 100644 --- a/internal/http/services/owncloud/ocdav/ocdav.go +++ b/internal/http/services/owncloud/ocdav/ocdav.go @@ -29,18 +29,18 @@ 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/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/storage/favorite" - "github.com/cs3org/reva/pkg/storage/favorite/registry" - "github.com/cs3org/reva/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storage/favorite" + "github.com/cs3org/reva/v2/pkg/storage/favorite/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/internal/http/services/owncloud/ocdav/ocdav_test.go b/internal/http/services/owncloud/ocdav/ocdav_test.go index b9a2f5d094..d4b3f11014 100644 --- a/internal/http/services/owncloud/ocdav/ocdav_test.go +++ b/internal/http/services/owncloud/ocdav/ocdav_test.go @@ -25,8 +25,8 @@ import ( "testing" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" ) func TestWrapResourceID(t *testing.T) { diff --git a/internal/http/services/owncloud/ocdav/options.go b/internal/http/services/owncloud/ocdav/options.go index abe4917cf7..0cfb0b9e1f 100644 --- a/internal/http/services/owncloud/ocdav/options.go +++ b/internal/http/services/owncloud/ocdav/options.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" ) func (s *svc) handleOptions(w http.ResponseWriter, r *http.Request) { diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind.go b/internal/http/services/owncloud/ocdav/propfind/propfind.go index 59043a3950..e03ab5b8c0 100644 --- a/internal/http/services/owncloud/ocdav/propfind/propfind.go +++ b/internal/http/services/owncloud/ocdav/propfind/propfind.go @@ -36,19 +36,19 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/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/internal/grpc/services/storageprovider" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/props" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/rhttp/router" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/props" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/rs/zerolog" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/internal/http/services/owncloud/ocdav/propfind/propfind_test.go b/internal/http/services/owncloud/ocdav/propfind/propfind_test.go index 5cd80be3cb..e943eefeb3 100644 --- a/internal/http/services/owncloud/ocdav/propfind/propfind_test.go +++ b/internal/http/services/owncloud/ocdav/propfind/propfind_test.go @@ -30,10 +30,10 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind/mocks" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind/mocks" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/stretchr/testify/mock" "google.golang.org/grpc" diff --git a/internal/http/services/owncloud/ocdav/proppatch.go b/internal/http/services/owncloud/ocdav/proppatch.go index 696331cfc1..8d28bb2e13 100644 --- a/internal/http/services/owncloud/ocdav/proppatch.go +++ b/internal/http/services/owncloud/ocdav/proppatch.go @@ -30,14 +30,14 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/props" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/props" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/publicfile.go b/internal/http/services/owncloud/ocdav/publicfile.go index 1cf12b7e2f..b74d8eb8a9 100644 --- a/internal/http/services/owncloud/ocdav/publicfile.go +++ b/internal/http/services/owncloud/ocdav/publicfile.go @@ -25,11 +25,11 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/router" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + rtrace "github.com/cs3org/reva/v2/pkg/trace" ) // PublicFileHandler handles requests on a shared file. it needs to be wrapped in a collection diff --git a/internal/http/services/owncloud/ocdav/put.go b/internal/http/services/owncloud/ocdav/put.go index 481f4fe27e..2bd34dbd67 100644 --- a/internal/http/services/owncloud/ocdav/put.go +++ b/internal/http/services/owncloud/ocdav/put.go @@ -29,17 +29,17 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/datagateway" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/rs/zerolog" ) diff --git a/internal/http/services/owncloud/ocdav/report.go b/internal/http/services/owncloud/ocdav/report.go index 89785f9294..9561a628a7 100644 --- a/internal/http/services/owncloud/ocdav/report.go +++ b/internal/http/services/owncloud/ocdav/report.go @@ -27,10 +27,10 @@ import ( rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) const ( diff --git a/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go b/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go index 9f44450509..dfd887b03e 100644 --- a/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go +++ b/internal/http/services/owncloud/ocdav/spacelookup/spacelookup.go @@ -28,8 +28,8 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/utils" ) // LookupReferenceForPath returns: diff --git a/internal/http/services/owncloud/ocdav/spaces.go b/internal/http/services/owncloud/ocdav/spaces.go index 21036c0b1f..901083e452 100644 --- a/internal/http/services/owncloud/ocdav/spaces.go +++ b/internal/http/services/owncloud/ocdav/spaces.go @@ -22,11 +22,11 @@ import ( "net/http" "path" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp/router" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp/router" ) // SpacesHandler handles trashbin requests diff --git a/internal/http/services/owncloud/ocdav/status.go b/internal/http/services/owncloud/ocdav/status.go index d7257acf06..dd81c078c9 100644 --- a/internal/http/services/owncloud/ocdav/status.go +++ b/internal/http/services/owncloud/ocdav/status.go @@ -22,8 +22,8 @@ import ( "encoding/json" "net/http" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/data" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data" + "github.com/cs3org/reva/v2/pkg/appctx" ) func (s *svc) doStatus(w http.ResponseWriter, r *http.Request) { diff --git a/internal/http/services/owncloud/ocdav/trashbin.go b/internal/http/services/owncloud/ocdav/trashbin.go index 2e28a9be1a..38cc799097 100644 --- a/internal/http/services/owncloud/ocdav/trashbin.go +++ b/internal/http/services/owncloud/ocdav/trashbin.go @@ -30,22 +30,22 @@ import ( "strings" "time" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/props" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/props" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" userpb "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/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/utils" ) // TrashbinHandler handles trashbin requests diff --git a/internal/http/services/owncloud/ocdav/tus.go b/internal/http/services/owncloud/ocdav/tus.go index 104429b926..1506f82f25 100644 --- a/internal/http/services/owncloud/ocdav/tus.go +++ b/internal/http/services/owncloud/ocdav/tus.go @@ -31,15 +31,15 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/spacelookup" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/spacelookup" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/rs/zerolog" tusd "github.com/tus/tusd/pkg/handler" ) diff --git a/internal/http/services/owncloud/ocdav/versions.go b/internal/http/services/owncloud/ocdav/versions.go index 2bb5391683..e1fa7064b7 100644 --- a/internal/http/services/owncloud/ocdav/versions.go +++ b/internal/http/services/owncloud/ocdav/versions.go @@ -23,17 +23,17 @@ import ( "net/http" "path" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/net" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/net" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/router" ) // VersionsHandler handles version requests diff --git a/internal/http/services/owncloud/ocdav/webdav.go b/internal/http/services/owncloud/ocdav/webdav.go index 7b8c15b57f..e3239f651e 100644 --- a/internal/http/services/owncloud/ocdav/webdav.go +++ b/internal/http/services/owncloud/ocdav/webdav.go @@ -23,10 +23,10 @@ import ( "net/http" "path" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocdav/propfind" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/propfind" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) // Common Webdav methods. diff --git a/internal/http/services/owncloud/ocs/cache.go b/internal/http/services/owncloud/ocs/cache.go index 8381f6150e..c83d4561f0 100644 --- a/internal/http/services/owncloud/ocs/cache.go +++ b/internal/http/services/owncloud/ocs/cache.go @@ -23,8 +23,8 @@ import ( "net/http" "net/http/httptest" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "google.golang.org/grpc/metadata" ) diff --git a/internal/http/services/owncloud/ocs/config/config.go b/internal/http/services/owncloud/ocs/config/config.go index 6d29e95f8d..f5e1b92b82 100644 --- a/internal/http/services/owncloud/ocs/config/config.go +++ b/internal/http/services/owncloud/ocs/config/config.go @@ -19,8 +19,8 @@ package config import ( - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/data" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data" + "github.com/cs3org/reva/v2/pkg/sharedconf" ) // Config holds the config options that need to be passed down to all ocs handlers diff --git a/internal/http/services/owncloud/ocs/conversions/main.go b/internal/http/services/owncloud/ocs/conversions/main.go index c8cb64e801..21be8c9cef 100644 --- a/internal/http/services/owncloud/ocs/conversions/main.go +++ b/internal/http/services/owncloud/ocs/conversions/main.go @@ -26,8 +26,8 @@ import ( "path" "time" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/user" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/user" grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -35,8 +35,8 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - publicsharemgr "github.com/cs3org/reva/pkg/publicshare/manager/registry" - usermgr "github.com/cs3org/reva/pkg/user/manager/registry" + publicsharemgr "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry" + usermgr "github.com/cs3org/reva/v2/pkg/user/manager/registry" ) const ( diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/sharees.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/sharees.go index f15192d725..9445937334 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/sharees.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/sharees.go @@ -24,12 +24,12 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" ) // Handler implements the ownCloud sharing API diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/group.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/group.go index abd00d2faf..8dab153723 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/group.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/group.go @@ -27,8 +27,8 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" ) func (h *Handler) createGroupShare(w http.ResponseWriter, r *http.Request, statInfo *provider.ResourceInfo, role *conversions.Role, roleVal []byte) (*collaboration.Share, *ocsError) { diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending.go index 8f74cb08c6..2a5ca0bfc4 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending.go @@ -28,10 +28,10 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" "github.com/pkg/errors" "google.golang.org/protobuf/types/known/fieldmaskpb" diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending_test.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending_test.go index 253370e10f..925409accd 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending_test.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/pending_test.go @@ -25,11 +25,11 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/mocks" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/mocks" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/mock" diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go index 4c8e73396f..c7e8eddbe9 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go @@ -30,10 +30,10 @@ import ( types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" "github.com/rs/zerolog/log" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" ) diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/remote.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/remote.go index bdc77662a7..cb4afe9d9b 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/remote.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/remote.go @@ -31,9 +31,9 @@ import ( types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" "github.com/go-chi/chi/v5" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) func (h *Handler) createFederatedCloudShare(w http.ResponseWriter, r *http.Request, statInfo *provider.ResourceInfo, role *conversions.Role, roleVal []byte) { diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index 8674a824c3..0b0b29264c 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -46,19 +46,19 @@ import ( "github.com/ReneKroon/ttlcache/v2" "github.com/bluele/gcache" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/share" - "github.com/cs3org/reva/pkg/share/cache" - "github.com/cs3org/reva/pkg/share/cache/registry" - "github.com/cs3org/reva/pkg/storage/utils/templates" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "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/share/cache" + "github.com/cs3org/reva/v2/pkg/share/cache/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/pkg/errors" ) diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares_test.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares_test.go index 53ec6744c9..d15943959a 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares_test.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares_test.go @@ -29,11 +29,11 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/mocks" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/mocks" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/stretchr/testify/mock" . "github.com/onsi/ginkgo/v2" diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go index 5f3a5b5871..45c352ced4 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/spaces.go @@ -29,14 +29,14 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - sdk "github.com/cs3org/reva/pkg/sdk/common" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + sdk "github.com/cs3org/reva/v2/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" ) diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/user.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/user.go index 492ad807ea..3f326e0b83 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/user.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/user.go @@ -26,10 +26,10 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) func (h *Handler) createUserShare(w http.ResponseWriter, r *http.Request, statInfo *provider.ResourceInfo, role *conversions.Role, roleVal []byte) (*collaboration.Share, *ocsError) { diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go index 9c977ca5bf..0f37986a2d 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities.go @@ -21,9 +21,9 @@ package capabilities import ( "net/http" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/data" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" ) // Handler renders the capability endpoint diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities_test.go b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities_test.go index ada4f4c56b..4aab4ae276 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities_test.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/capabilities_test.go @@ -23,7 +23,7 @@ import ( "encoding/xml" "testing" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/data" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data" ) func TestMarshal(t *testing.T) { diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/uploads.go b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/uploads.go index 4fba150d25..ffa09b2983 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/uploads.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/capabilities/uploads.go @@ -21,7 +21,7 @@ package capabilities import ( "strings" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/data" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data" ) type chunkProtocol string diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/user/user.go b/internal/http/services/owncloud/ocs/handlers/cloud/user/user.go index 22c7190846..287d9a982e 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/user/user.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/user/user.go @@ -22,9 +22,9 @@ import ( "fmt" "net/http" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) // The Handler renders the user endpoint diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/users/users.go b/internal/http/services/owncloud/ocs/handlers/cloud/users/users.go index 8a0214cd18..38894e08d1 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/users/users.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/users/users.go @@ -26,13 +26,13 @@ import ( userpb "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/internal/http/services/owncloud/ocdav/errors" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocdav/errors" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" ) diff --git a/internal/http/services/owncloud/ocs/handlers/config/config.go b/internal/http/services/owncloud/ocs/handlers/config/config.go index 852e12b813..a870b4c3de 100644 --- a/internal/http/services/owncloud/ocs/handlers/config/config.go +++ b/internal/http/services/owncloud/ocs/handlers/config/config.go @@ -21,9 +21,9 @@ package ocs import ( "net/http" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/data" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" ) // Handler renders the config endpoint diff --git a/internal/http/services/owncloud/ocs/ocs.go b/internal/http/services/owncloud/ocs/ocs.go index 702358b978..03544f54e6 100644 --- a/internal/http/services/owncloud/ocs/ocs.go +++ b/internal/http/services/owncloud/ocs/ocs.go @@ -23,16 +23,16 @@ import ( "time" "github.com/ReneKroon/ttlcache/v2" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/cloud/capabilities" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/cloud/user" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/cloud/users" - configHandler "github.com/cs3org/reva/internal/http/services/owncloud/ocs/handlers/config" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/response" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/capabilities" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/user" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/cloud/users" + configHandler "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/handlers/config" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/response" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/global" "github.com/go-chi/chi/v5" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" diff --git a/internal/http/services/owncloud/ocs/response/response.go b/internal/http/services/owncloud/ocs/response/response.go index a13fb851bb..534bf5eb06 100644 --- a/internal/http/services/owncloud/ocs/response/response.go +++ b/internal/http/services/owncloud/ocs/response/response.go @@ -26,7 +26,7 @@ import ( "net/http" "reflect" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "github.com/go-chi/chi/v5" ) diff --git a/internal/http/services/prometheus/prometheus.go b/internal/http/services/prometheus/prometheus.go index 14b6b9ed2f..81f9453d4f 100644 --- a/internal/http/services/prometheus/prometheus.go +++ b/internal/http/services/prometheus/prometheus.go @@ -27,7 +27,7 @@ import ( "github.com/rs/zerolog" "go.opencensus.io/stats/view" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/global" ) func init() { diff --git a/internal/http/services/reverseproxy/reverseproxy.go b/internal/http/services/reverseproxy/reverseproxy.go index 09d7d968a3..964297c8a7 100644 --- a/internal/http/services/reverseproxy/reverseproxy.go +++ b/internal/http/services/reverseproxy/reverseproxy.go @@ -25,8 +25,8 @@ import ( "net/http/httputil" "net/url" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rhttp/global" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rhttp/global" "github.com/go-chi/chi/v5" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" diff --git a/internal/http/services/siteacc/siteacc.go b/internal/http/services/siteacc/siteacc.go index 16eef4a857..e53b68685c 100644 --- a/internal/http/services/siteacc/siteacc.go +++ b/internal/http/services/siteacc/siteacc.go @@ -21,13 +21,13 @@ package siteacc import ( "net/http" - "github.com/cs3org/reva/pkg/siteacc" - "github.com/cs3org/reva/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc" + "github.com/cs3org/reva/v2/pkg/siteacc/config" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/global" ) func init() { diff --git a/internal/http/services/sysinfo/sysinfo.go b/internal/http/services/sysinfo/sysinfo.go index 65ce0d7949..fc8f8873c1 100644 --- a/internal/http/services/sysinfo/sysinfo.go +++ b/internal/http/services/sysinfo/sysinfo.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/sysinfo" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/sysinfo" ) func init() { diff --git a/internal/http/services/wellknown/openidconfiguration.go b/internal/http/services/wellknown/openidconfiguration.go index eb7da95a6a..15a8385e22 100644 --- a/internal/http/services/wellknown/openidconfiguration.go +++ b/internal/http/services/wellknown/openidconfiguration.go @@ -22,7 +22,7 @@ import ( "encoding/json" "net/http" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" ) func (s *svc) doOpenidConfiguration(w http.ResponseWriter, r *http.Request) { diff --git a/internal/http/services/wellknown/wellknown.go b/internal/http/services/wellknown/wellknown.go index 524cc4cffd..8083928ace 100644 --- a/internal/http/services/wellknown/wellknown.go +++ b/internal/http/services/wellknown/wellknown.go @@ -21,9 +21,9 @@ package wellknown import ( "net/http" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog" ) diff --git a/pkg/app/provider/demo/demo.go b/pkg/app/provider/demo/demo.go index 896893fa65..5a1672f9f3 100644 --- a/pkg/app/provider/demo/demo.go +++ b/pkg/app/provider/demo/demo.go @@ -25,8 +25,8 @@ import ( appprovider "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" appregistry "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/app" - "github.com/cs3org/reva/pkg/app/provider/registry" + "github.com/cs3org/reva/v2/pkg/app" + "github.com/cs3org/reva/v2/pkg/app/provider/registry" "github.com/mitchellh/mapstructure" ) diff --git a/pkg/app/provider/loader/loader.go b/pkg/app/provider/loader/loader.go index f373136de9..5b1b9a436b 100644 --- a/pkg/app/provider/loader/loader.go +++ b/pkg/app/provider/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core application providers. - _ "github.com/cs3org/reva/pkg/app/provider/demo" - _ "github.com/cs3org/reva/pkg/app/provider/wopi" + _ "github.com/cs3org/reva/v2/pkg/app/provider/demo" + _ "github.com/cs3org/reva/v2/pkg/app/provider/wopi" // Add your own here ) diff --git a/pkg/app/provider/registry/registry.go b/pkg/app/provider/registry/registry.go index 43d5ed0188..f90dc6cc4f 100644 --- a/pkg/app/provider/registry/registry.go +++ b/pkg/app/provider/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/app" +import "github.com/cs3org/reva/v2/pkg/app" // NewFunc is the function that app provider implementations // should register to at init time. diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go index cca3222713..b01e15382b 100644 --- a/pkg/app/provider/wopi/wopi.go +++ b/pkg/app/provider/wopi/wopi.go @@ -38,14 +38,14 @@ import ( appregistry "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/app" - "github.com/cs3org/reva/pkg/app/provider/registry" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/app" + "github.com/cs3org/reva/v2/pkg/app/provider/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/golang-jwt/jwt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/app/registry/loader/loader.go b/pkg/app/registry/loader/loader.go index 7c06a89f92..862c15ce25 100644 --- a/pkg/app/registry/loader/loader.go +++ b/pkg/app/registry/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load core app registry drivers. - _ "github.com/cs3org/reva/pkg/app/registry/static" + _ "github.com/cs3org/reva/v2/pkg/app/registry/static" // Add your own here ) diff --git a/pkg/app/registry/registry/registry.go b/pkg/app/registry/registry/registry.go index 0650a2a75f..6cc653e165 100644 --- a/pkg/app/registry/registry/registry.go +++ b/pkg/app/registry/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/app" +import "github.com/cs3org/reva/v2/pkg/app" // NewFunc is the function that app provider implementations // should register to at init time. diff --git a/pkg/app/registry/static/static.go b/pkg/app/registry/static/static.go index 255627b0b7..c1e288d7e4 100644 --- a/pkg/app/registry/static/static.go +++ b/pkg/app/registry/static/static.go @@ -27,9 +27,9 @@ import ( "sync" registrypb "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" - "github.com/cs3org/reva/pkg/app" - "github.com/cs3org/reva/pkg/app/registry/registry" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/app" + "github.com/cs3org/reva/v2/pkg/app/registry/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/mitchellh/mapstructure" "github.com/rs/zerolog/log" orderedmap "github.com/wk8/go-ordered-map" diff --git a/pkg/app/registry/static/static_test.go b/pkg/app/registry/static/static_test.go index f23d4005c5..144837acc1 100644 --- a/pkg/app/registry/static/static_test.go +++ b/pkg/app/registry/static/static_test.go @@ -25,7 +25,7 @@ import ( registrypb "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) func TestFindProviders(t *testing.T) { diff --git a/pkg/appauth/manager/json/json.go b/pkg/appauth/manager/json/json.go index 955d8de8b4..0397c27fad 100644 --- a/pkg/appauth/manager/json/json.go +++ b/pkg/appauth/manager/json/json.go @@ -30,10 +30,10 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appauth" - "github.com/cs3org/reva/pkg/appauth/manager/registry" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/appauth" + "github.com/cs3org/reva/v2/pkg/appauth/manager/registry" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/sethvargo/go-password/password" diff --git a/pkg/appauth/manager/json/json_test.go b/pkg/appauth/manager/json/json_test.go index 6cc1ae6e7d..cf8368053e 100644 --- a/pkg/appauth/manager/json/json_test.go +++ b/pkg/appauth/manager/json/json_test.go @@ -32,7 +32,7 @@ import ( apppb "github.com/cs3org/go-cs3apis/cs3/auth/applications/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/gdexlab/go-render/render" "github.com/sethvargo/go-password/password" "golang.org/x/crypto/bcrypt" diff --git a/pkg/appauth/manager/loader/loader.go b/pkg/appauth/manager/loader/loader.go index ffe3ce1a18..a218cb19af 100644 --- a/pkg/appauth/manager/loader/loader.go +++ b/pkg/appauth/manager/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load core application auth manager drivers. - _ "github.com/cs3org/reva/pkg/appauth/manager/json" + _ "github.com/cs3org/reva/v2/pkg/appauth/manager/json" // Add your own here ) diff --git a/pkg/appauth/manager/registry/registry.go b/pkg/appauth/manager/registry/registry.go index 340eb9b433..bf6fe552a2 100644 --- a/pkg/appauth/manager/registry/registry.go +++ b/pkg/appauth/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/appauth" +import "github.com/cs3org/reva/v2/pkg/appauth" // NewFunc is the function that application auth implementations // should register at init time. diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index a3cd390338..b9eecf8865 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -25,7 +25,7 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/auth/registry/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/plugin" + "github.com/cs3org/reva/v2/pkg/plugin" ) // Manager is the interface to implement to authenticate users diff --git a/pkg/auth/manager/appauth/appauth.go b/pkg/auth/manager/appauth/appauth.go index 738f51b4cd..76030d94cf 100644 --- a/pkg/auth/manager/appauth/appauth.go +++ b/pkg/auth/manager/appauth/appauth.go @@ -25,10 +25,10 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/demo/demo.go b/pkg/auth/manager/demo/demo.go index 7f2e1ddd6d..a8c10f4b59 100644 --- a/pkg/auth/manager/demo/demo.go +++ b/pkg/auth/manager/demo/demo.go @@ -23,10 +23,10 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" ) func init() { diff --git a/pkg/auth/manager/impersonator/impersonator.go b/pkg/auth/manager/impersonator/impersonator.go index 19d7f88000..4807e5c446 100644 --- a/pkg/auth/manager/impersonator/impersonator.go +++ b/pkg/auth/manager/impersonator/impersonator.go @@ -24,9 +24,9 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" ) func init() { diff --git a/pkg/auth/manager/json/json.go b/pkg/auth/manager/json/json.go index daf81e25b3..267fc09b7a 100644 --- a/pkg/auth/manager/json/json.go +++ b/pkg/auth/manager/json/json.go @@ -26,10 +26,10 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/ldap/ldap.go b/pkg/auth/manager/ldap/ldap.go index ce08648213..0b55045492 100644 --- a/pkg/auth/manager/ldap/ldap.go +++ b/pkg/auth/manager/ldap/ldap.go @@ -26,15 +26,15 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-ldap/ldap/v3" "github.com/google/uuid" "github.com/mitchellh/mapstructure" diff --git a/pkg/auth/manager/loader/loader.go b/pkg/auth/manager/loader/loader.go index bc162229d6..b4737b62a0 100644 --- a/pkg/auth/manager/loader/loader.go +++ b/pkg/auth/manager/loader/loader.go @@ -20,16 +20,16 @@ package loader import ( // Load core authentication managers. - _ "github.com/cs3org/reva/pkg/auth/manager/appauth" - _ "github.com/cs3org/reva/pkg/auth/manager/demo" - _ "github.com/cs3org/reva/pkg/auth/manager/impersonator" - _ "github.com/cs3org/reva/pkg/auth/manager/json" - _ "github.com/cs3org/reva/pkg/auth/manager/ldap" - _ "github.com/cs3org/reva/pkg/auth/manager/machine" - _ "github.com/cs3org/reva/pkg/auth/manager/nextcloud" - _ "github.com/cs3org/reva/pkg/auth/manager/oidc" - _ "github.com/cs3org/reva/pkg/auth/manager/oidcmapping" - _ "github.com/cs3org/reva/pkg/auth/manager/owncloudsql" - _ "github.com/cs3org/reva/pkg/auth/manager/publicshares" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/appauth" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/demo" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/impersonator" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/json" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/ldap" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/machine" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/nextcloud" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/oidc" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/oidcmapping" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/owncloudsql" + _ "github.com/cs3org/reva/v2/pkg/auth/manager/publicshares" // Add your own here ) diff --git a/pkg/auth/manager/machine/machine.go b/pkg/auth/manager/machine/machine.go index c1a3b42cbb..21677b4d66 100644 --- a/pkg/auth/manager/machine/machine.go +++ b/pkg/auth/manager/machine/machine.go @@ -25,11 +25,11 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/nextcloud/nextcloud.go b/pkg/auth/manager/nextcloud/nextcloud.go index 5d01d264b1..2951a1b076 100644 --- a/pkg/auth/manager/nextcloud/nextcloud.go +++ b/pkg/auth/manager/nextcloud/nextcloud.go @@ -28,9 +28,9 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/nextcloud/nextcloud_test.go b/pkg/auth/manager/nextcloud/nextcloud_test.go index ce10328843..95e7f3ac2e 100644 --- a/pkg/auth/manager/nextcloud/nextcloud_test.go +++ b/pkg/auth/manager/nextcloud/nextcloud_test.go @@ -29,10 +29,10 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth/manager/nextcloud" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/auth/manager/nextcloud" + "github.com/cs3org/reva/v2/pkg/auth/scope" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/auth/manager/oidc/oidc.go b/pkg/auth/manager/oidc/oidc.go index e882b399ba..6eba498cfa 100644 --- a/pkg/auth/manager/oidc/oidc.go +++ b/pkg/auth/manager/oidc/oidc.go @@ -30,12 +30,12 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/pkg/auth/manager/oidcmapping/oidcmapping.go b/pkg/auth/manager/oidcmapping/oidcmapping.go index 8dbef88079..bfc9de3c6e 100644 --- a/pkg/auth/manager/oidcmapping/oidcmapping.go +++ b/pkg/auth/manager/oidcmapping/oidcmapping.go @@ -29,14 +29,14 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/juliangruber/go-intersect" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/auth/manager/owncloudsql/accounts/accounts.go b/pkg/auth/manager/owncloudsql/accounts/accounts.go index 1489669892..3b74facda5 100644 --- a/pkg/auth/manager/owncloudsql/accounts/accounts.go +++ b/pkg/auth/manager/owncloudsql/accounts/accounts.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/owncloudsql/accounts/accounts_test.go b/pkg/auth/manager/owncloudsql/accounts/accounts_test.go index 02fa613b04..8921077d1d 100644 --- a/pkg/auth/manager/owncloudsql/accounts/accounts_test.go +++ b/pkg/auth/manager/owncloudsql/accounts/accounts_test.go @@ -26,7 +26,7 @@ import ( _ "github.com/mattn/go-sqlite3" - "github.com/cs3org/reva/pkg/auth/manager/owncloudsql/accounts" + "github.com/cs3org/reva/v2/pkg/auth/manager/owncloudsql/accounts" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/auth/manager/owncloudsql/owncloudsql.go b/pkg/auth/manager/owncloudsql/owncloudsql.go index b700b63805..b2846462ea 100644 --- a/pkg/auth/manager/owncloudsql/owncloudsql.go +++ b/pkg/auth/manager/owncloudsql/owncloudsql.go @@ -30,12 +30,12 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/owncloudsql/accounts" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/owncloudsql/accounts" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/auth/manager/owncloudsql/owncloudsql_test.go b/pkg/auth/manager/owncloudsql/owncloudsql_test.go index 302e482b6e..f83f48d0c5 100644 --- a/pkg/auth/manager/owncloudsql/owncloudsql_test.go +++ b/pkg/auth/manager/owncloudsql/owncloudsql_test.go @@ -21,7 +21,7 @@ package owncloudsql import ( "testing" - "github.com/cs3org/reva/pkg/auth/manager/owncloudsql/accounts" + "github.com/cs3org/reva/v2/pkg/auth/manager/owncloudsql/accounts" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/publicshares/publicshares.go b/pkg/auth/manager/publicshares/publicshares.go index 0dc4de28be..70ccd58187 100644 --- a/pkg/auth/manager/publicshares/publicshares.go +++ b/pkg/auth/manager/publicshares/publicshares.go @@ -29,11 +29,11 @@ import ( rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/manager/registry" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/manager/registry" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/auth/manager/registry/registry.go b/pkg/auth/manager/registry/registry.go index 52141f3d07..aea682f79d 100644 --- a/pkg/auth/manager/registry/registry.go +++ b/pkg/auth/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/auth" +import "github.com/cs3org/reva/v2/pkg/auth" // NewFunc is the function that auth implementations // should register to at init time. diff --git a/pkg/auth/registry/loader/loader.go b/pkg/auth/registry/loader/loader.go index fe0f1ef8be..1caad10cef 100644 --- a/pkg/auth/registry/loader/loader.go +++ b/pkg/auth/registry/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load core storage broker drivers. - _ "github.com/cs3org/reva/pkg/auth/registry/static" + _ "github.com/cs3org/reva/v2/pkg/auth/registry/static" // Add your own here ) diff --git a/pkg/auth/registry/registry/registry.go b/pkg/auth/registry/registry/registry.go index 0170885f37..eed39a1a0a 100644 --- a/pkg/auth/registry/registry/registry.go +++ b/pkg/auth/registry/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/auth" +import "github.com/cs3org/reva/v2/pkg/auth" // NewFunc is the function that auth registry implementations // should register at init time. diff --git a/pkg/auth/registry/static/static.go b/pkg/auth/registry/static/static.go index cb34592bc8..d290edcc18 100644 --- a/pkg/auth/registry/static/static.go +++ b/pkg/auth/registry/static/static.go @@ -22,10 +22,10 @@ import ( "context" registrypb "github.com/cs3org/go-cs3apis/cs3/auth/registry/v1beta1" - "github.com/cs3org/reva/pkg/auth" - "github.com/cs3org/reva/pkg/auth/registry/registry" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/auth" + "github.com/cs3org/reva/v2/pkg/auth/registry/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/mitchellh/mapstructure" ) diff --git a/pkg/auth/rpc_auth.go b/pkg/auth/rpc_auth.go index 92dbee5bb4..73dc4882c2 100644 --- a/pkg/auth/rpc_auth.go +++ b/pkg/auth/rpc_auth.go @@ -24,8 +24,8 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/plugin" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/plugin" hcplugin "github.com/hashicorp/go-plugin" ) diff --git a/pkg/auth/scope/lightweight.go b/pkg/auth/scope/lightweight.go index 5ebc8d2225..ad86772b25 100644 --- a/pkg/auth/scope/lightweight.go +++ b/pkg/auth/scope/lightweight.go @@ -26,7 +26,7 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/pkg/auth/scope/publicshare.go b/pkg/auth/scope/publicshare.go index 0ca65d8729..c5160e536b 100644 --- a/pkg/auth/scope/publicshare.go +++ b/pkg/auth/scope/publicshare.go @@ -32,8 +32,8 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/pkg/auth/scope/receivedshare.go b/pkg/auth/scope/receivedshare.go index 81236a3c35..6fff31d7cb 100644 --- a/pkg/auth/scope/receivedshare.go +++ b/pkg/auth/scope/receivedshare.go @@ -25,8 +25,8 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/pkg/auth/scope/resourceinfo.go b/pkg/auth/scope/resourceinfo.go index d5860d897a..f89ac832ba 100644 --- a/pkg/auth/scope/resourceinfo.go +++ b/pkg/auth/scope/resourceinfo.go @@ -31,8 +31,8 @@ import ( "github.com/rs/zerolog" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/utils" ) func resourceinfoScope(_ context.Context, scope *authpb.Scope, resource interface{}, logger *zerolog.Logger) (bool, error) { diff --git a/pkg/auth/scope/scope.go b/pkg/auth/scope/scope.go index 4c4ddc2c67..c09e3b511e 100644 --- a/pkg/auth/scope/scope.go +++ b/pkg/auth/scope/scope.go @@ -23,7 +23,7 @@ import ( "strings" authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "github.com/rs/zerolog" ) diff --git a/pkg/auth/scope/share.go b/pkg/auth/scope/share.go index 6284efd007..27772691c7 100644 --- a/pkg/auth/scope/share.go +++ b/pkg/auth/scope/share.go @@ -28,8 +28,8 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/pkg/auth/scope/user.go b/pkg/auth/scope/user.go index b20330caf1..f59bd56a34 100644 --- a/pkg/auth/scope/user.go +++ b/pkg/auth/scope/user.go @@ -24,7 +24,7 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/pkg/auth/scope/utils.go b/pkg/auth/scope/utils.go index a442db9901..e100662b5e 100644 --- a/pkg/auth/scope/utils.go +++ b/pkg/auth/scope/utils.go @@ -25,8 +25,8 @@ import ( authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/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/pkg/errtypes" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/utils" ) // FormatScope create a pretty print of the scope diff --git a/pkg/cbox/favorite/sql/sql.go b/pkg/cbox/favorite/sql/sql.go index ebb6c85ec9..1c783c7bf0 100644 --- a/pkg/cbox/favorite/sql/sql.go +++ b/pkg/cbox/favorite/sql/sql.go @@ -25,10 +25,10 @@ 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/pkg/cbox/utils" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage/favorite" - "github.com/cs3org/reva/pkg/storage/favorite/registry" + "github.com/cs3org/reva/v2/pkg/cbox/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage/favorite" + "github.com/cs3org/reva/v2/pkg/storage/favorite/registry" "github.com/mitchellh/mapstructure" ) diff --git a/pkg/cbox/group/rest/rest.go b/pkg/cbox/group/rest/rest.go index 439ec9c6c9..375bdc9a9c 100644 --- a/pkg/cbox/group/rest/rest.go +++ b/pkg/cbox/group/rest/rest.go @@ -28,10 +28,10 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - utils "github.com/cs3org/reva/pkg/cbox/utils" - "github.com/cs3org/reva/pkg/group" - "github.com/cs3org/reva/pkg/group/manager/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + utils "github.com/cs3org/reva/v2/pkg/cbox/utils" + "github.com/cs3org/reva/v2/pkg/group" + "github.com/cs3org/reva/v2/pkg/group/manager/registry" "github.com/gomodule/redigo/redis" "github.com/mitchellh/mapstructure" ) diff --git a/pkg/cbox/loader/loader.go b/pkg/cbox/loader/loader.go index 0dd9d07c4b..a481d08907 100644 --- a/pkg/cbox/loader/loader.go +++ b/pkg/cbox/loader/loader.go @@ -20,11 +20,11 @@ package loader import ( // Load cbox specific drivers. - _ "github.com/cs3org/reva/pkg/cbox/favorite/sql" - _ "github.com/cs3org/reva/pkg/cbox/group/rest" - _ "github.com/cs3org/reva/pkg/cbox/publicshare/sql" - _ "github.com/cs3org/reva/pkg/cbox/share/sql" - _ "github.com/cs3org/reva/pkg/cbox/storage/eoshomewrapper" - _ "github.com/cs3org/reva/pkg/cbox/storage/eoswrapper" - _ "github.com/cs3org/reva/pkg/cbox/user/rest" + _ "github.com/cs3org/reva/v2/pkg/cbox/favorite/sql" + _ "github.com/cs3org/reva/v2/pkg/cbox/group/rest" + _ "github.com/cs3org/reva/v2/pkg/cbox/publicshare/sql" + _ "github.com/cs3org/reva/v2/pkg/cbox/share/sql" + _ "github.com/cs3org/reva/v2/pkg/cbox/storage/eoshomewrapper" + _ "github.com/cs3org/reva/v2/pkg/cbox/storage/eoswrapper" + _ "github.com/cs3org/reva/v2/pkg/cbox/user/rest" ) diff --git a/pkg/cbox/publicshare/sql/sql.go b/pkg/cbox/publicshare/sql/sql.go index b086426dfe..415efcab15 100644 --- a/pkg/cbox/publicshare/sql/sql.go +++ b/pkg/cbox/publicshare/sql/sql.go @@ -35,11 +35,11 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - conversions "github.com/cs3org/reva/pkg/cbox/utils" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/publicshare/manager/registry" - "github.com/cs3org/reva/pkg/utils" + conversions "github.com/cs3org/reva/v2/pkg/cbox/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/cbox/share/sql/sql.go b/pkg/cbox/share/sql/sql.go index d8eac6acc1..8c3d73ec81 100644 --- a/pkg/cbox/share/sql/sql.go +++ b/pkg/cbox/share/sql/sql.go @@ -30,12 +30,12 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - conversions "github.com/cs3org/reva/pkg/cbox/utils" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/share" - "github.com/cs3org/reva/pkg/share/manager/registry" - "github.com/cs3org/reva/pkg/utils" + conversions "github.com/cs3org/reva/v2/pkg/cbox/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/share" + "github.com/cs3org/reva/v2/pkg/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/genproto/protobuf/field_mask" diff --git a/pkg/cbox/storage/eoshomewrapper/eoshomewrapper.go b/pkg/cbox/storage/eoshomewrapper/eoshomewrapper.go index 7160967ff8..d1d5748a40 100644 --- a/pkg/cbox/storage/eoshomewrapper/eoshomewrapper.go +++ b/pkg/cbox/storage/eoshomewrapper/eoshomewrapper.go @@ -25,10 +25,10 @@ import ( "github.com/Masterminds/sprig" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/eosfs" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/eosfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/cbox/storage/eoswrapper/eoswrapper.go b/pkg/cbox/storage/eoswrapper/eoswrapper.go index bc4467ba5d..3c2a3294ca 100644 --- a/pkg/cbox/storage/eoswrapper/eoswrapper.go +++ b/pkg/cbox/storage/eoswrapper/eoswrapper.go @@ -26,10 +26,10 @@ import ( "github.com/Masterminds/sprig" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/eosfs" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/eosfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/cbox/user/rest/rest.go b/pkg/cbox/user/rest/rest.go index fbd1b125b2..47b839f4d1 100644 --- a/pkg/cbox/user/rest/rest.go +++ b/pkg/cbox/user/rest/rest.go @@ -28,10 +28,10 @@ import ( "strings" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - utils "github.com/cs3org/reva/pkg/cbox/utils" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + utils "github.com/cs3org/reva/v2/pkg/cbox/utils" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" "github.com/gomodule/redigo/redis" "github.com/mitchellh/mapstructure" ) diff --git a/pkg/cbox/utils/tokenmanagement.go b/pkg/cbox/utils/tokenmanagement.go index e16fd503ba..0753cde28f 100644 --- a/pkg/cbox/utils/tokenmanagement.go +++ b/pkg/cbox/utils/tokenmanagement.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp" ) // APITokenManager stores config related to api management diff --git a/pkg/eosclient/eosbinary/eosbinary.go b/pkg/eosclient/eosbinary/eosbinary.go index 0da98de2d6..3546c54a0c 100644 --- a/pkg/eosclient/eosbinary/eosbinary.go +++ b/pkg/eosclient/eosbinary/eosbinary.go @@ -33,10 +33,10 @@ import ( "syscall" "time" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/eosclient" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/acl" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/eosclient" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/acl" "github.com/google/uuid" "github.com/pkg/errors" "go.opentelemetry.io/otel/trace" diff --git a/pkg/eosclient/eosclient.go b/pkg/eosclient/eosclient.go index 5e52854c78..c85081164f 100644 --- a/pkg/eosclient/eosclient.go +++ b/pkg/eosclient/eosclient.go @@ -22,7 +22,7 @@ import ( "context" "io" - "github.com/cs3org/reva/pkg/storage/utils/acl" + "github.com/cs3org/reva/v2/pkg/storage/utils/acl" ) // EOSClient is the interface which enables access to EOS instances through various interfaces. diff --git a/pkg/eosclient/eosgrpc/eosgrpc.go b/pkg/eosclient/eosgrpc/eosgrpc.go index 8cd4c62b6a..bc49c1af59 100644 --- a/pkg/eosclient/eosgrpc/eosgrpc.go +++ b/pkg/eosclient/eosgrpc/eosgrpc.go @@ -33,13 +33,13 @@ import ( "strings" "syscall" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/eosclient" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/eosclient" - erpc "github.com/cs3org/reva/pkg/eosclient/eosgrpc/eos_grpc" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/storage/utils/acl" + erpc "github.com/cs3org/reva/v2/pkg/eosclient/eosgrpc/eos_grpc" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/storage/utils/acl" "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/pkg/eosclient/eosgrpc/eoshttp.go b/pkg/eosclient/eosgrpc/eoshttp.go index e7631b8951..f9caf89b47 100644 --- a/pkg/eosclient/eosgrpc/eoshttp.go +++ b/pkg/eosclient/eosgrpc/eoshttp.go @@ -30,10 +30,10 @@ import ( "strconv" "time" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/eosclient" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/eosclient" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" ) // HTTPOptions to configure the Client. diff --git a/pkg/events/example/consumer/consumer.go b/pkg/events/example/consumer/consumer.go index caeaac2e16..a5a347f3c5 100644 --- a/pkg/events/example/consumer/consumer.go +++ b/pkg/events/example/consumer/consumer.go @@ -23,7 +23,7 @@ import ( "fmt" "log" - "github.com/cs3org/reva/pkg/events" + "github.com/cs3org/reva/v2/pkg/events" ) // Example consumes events from the queue diff --git a/pkg/events/example/example.go b/pkg/events/example/example.go index 9240fc74db..f84b377411 100644 --- a/pkg/events/example/example.go +++ b/pkg/events/example/example.go @@ -23,10 +23,10 @@ import ( "time" "github.com/asim/go-micro/plugins/events/nats/v4" - "github.com/cs3org/reva/pkg/events" - "github.com/cs3org/reva/pkg/events/example/consumer" - "github.com/cs3org/reva/pkg/events/example/publisher" - "github.com/cs3org/reva/pkg/events/server" + "github.com/cs3org/reva/v2/pkg/events" + "github.com/cs3org/reva/v2/pkg/events/example/consumer" + "github.com/cs3org/reva/v2/pkg/events/example/publisher" + "github.com/cs3org/reva/v2/pkg/events/server" ) // Simple example of an event workflow diff --git a/pkg/events/example/publisher/publisher.go b/pkg/events/example/publisher/publisher.go index ac7ccd686a..59239f4461 100644 --- a/pkg/events/example/publisher/publisher.go +++ b/pkg/events/example/publisher/publisher.go @@ -23,7 +23,7 @@ import ( "log" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/events" + "github.com/cs3org/reva/v2/pkg/events" ) // Example publishes events to the queue diff --git a/pkg/group/manager/json/json.go b/pkg/group/manager/json/json.go index a5a976a287..885cb04c21 100644 --- a/pkg/group/manager/json/json.go +++ b/pkg/group/manager/json/json.go @@ -27,9 +27,9 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/group" - "github.com/cs3org/reva/pkg/group/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/group" + "github.com/cs3org/reva/v2/pkg/group/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/group/manager/json/json_test.go b/pkg/group/manager/json/json_test.go index b79f1c2762..c14ae04bf1 100644 --- a/pkg/group/manager/json/json_test.go +++ b/pkg/group/manager/json/json_test.go @@ -27,7 +27,7 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) var ctx = context.Background() diff --git a/pkg/group/manager/ldap/ldap.go b/pkg/group/manager/ldap/ldap.go index 3d05f40abc..1bd5b1fa64 100644 --- a/pkg/group/manager/ldap/ldap.go +++ b/pkg/group/manager/ldap/ldap.go @@ -29,11 +29,11 @@ import ( "github.com/Masterminds/sprig" grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/group" - "github.com/cs3org/reva/pkg/group/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/group" + "github.com/cs3org/reva/v2/pkg/group/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-ldap/ldap/v3" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/group/manager/loader/loader.go b/pkg/group/manager/loader/loader.go index 04d40f66be..d5d523664c 100644 --- a/pkg/group/manager/loader/loader.go +++ b/pkg/group/manager/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core group manager drivers. - _ "github.com/cs3org/reva/pkg/group/manager/json" - _ "github.com/cs3org/reva/pkg/group/manager/ldap" + _ "github.com/cs3org/reva/v2/pkg/group/manager/json" + _ "github.com/cs3org/reva/v2/pkg/group/manager/ldap" // Add your own here ) diff --git a/pkg/group/manager/registry/registry.go b/pkg/group/manager/registry/registry.go index c3b77ad455..a5cba3c8a0 100644 --- a/pkg/group/manager/registry/registry.go +++ b/pkg/group/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/group" +import "github.com/cs3org/reva/v2/pkg/group" // NewFunc is the function that group managers // should register at init time. diff --git a/pkg/mentix/accservice/accservice.go b/pkg/mentix/accservice/accservice.go index 8d53bbba50..b856f8ab39 100644 --- a/pkg/mentix/accservice/accservice.go +++ b/pkg/mentix/accservice/accservice.go @@ -27,8 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) // RequestResponse holds the response of an accounts service query. diff --git a/pkg/mentix/connectors/connector.go b/pkg/mentix/connectors/connector.go index 1d9504819b..e4e73a9034 100755 --- a/pkg/mentix/connectors/connector.go +++ b/pkg/mentix/connectors/connector.go @@ -23,9 +23,9 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/entity" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // Connector is the interface that all connectors must implement. diff --git a/pkg/mentix/connectors/connectors.go b/pkg/mentix/connectors/connectors.go index ceae58107e..d606ab61e3 100644 --- a/pkg/mentix/connectors/connectors.go +++ b/pkg/mentix/connectors/connectors.go @@ -21,8 +21,8 @@ package connectors import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/entity" ) var ( diff --git a/pkg/mentix/connectors/gocdb.go b/pkg/mentix/connectors/gocdb.go index bfa28fe256..980aa9bc9e 100755 --- a/pkg/mentix/connectors/gocdb.go +++ b/pkg/mentix/connectors/gocdb.go @@ -26,13 +26,13 @@ import ( "strings" "time" - "github.com/cs3org/reva/pkg/mentix/utils" + "github.com/cs3org/reva/v2/pkg/mentix/utils" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/connectors/gocdb" - "github.com/cs3org/reva/pkg/mentix/meshdata" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/connectors/gocdb" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) // GOCDBConnector is used to read mesh data from a GOCDB instance. diff --git a/pkg/mentix/connectors/gocdb/query.go b/pkg/mentix/connectors/gocdb/query.go index 9ce86958c5..5346fa1acc 100755 --- a/pkg/mentix/connectors/gocdb/query.go +++ b/pkg/mentix/connectors/gocdb/query.go @@ -21,7 +21,7 @@ package gocdb import ( "fmt" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) // QueryGOCDB retrieves data from one of GOCDB's endpoints. diff --git a/pkg/mentix/connectors/localfile.go b/pkg/mentix/connectors/localfile.go index 8ed918ec31..60eb521928 100755 --- a/pkg/mentix/connectors/localfile.go +++ b/pkg/mentix/connectors/localfile.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // LocalFileConnector is used to read sites from a local file. diff --git a/pkg/mentix/entity/entities.go b/pkg/mentix/entity/entities.go index cb18220f6e..048c8ae612 100644 --- a/pkg/mentix/entity/entities.go +++ b/pkg/mentix/entity/entities.go @@ -21,7 +21,7 @@ package entity import ( "fmt" - "github.com/cs3org/reva/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/config" "github.com/rs/zerolog" ) diff --git a/pkg/mentix/entity/entity.go b/pkg/mentix/entity/entity.go index c4f051de64..02dacd2e93 100644 --- a/pkg/mentix/entity/entity.go +++ b/pkg/mentix/entity/entity.go @@ -19,7 +19,7 @@ package entity import ( - "github.com/cs3org/reva/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/config" "github.com/rs/zerolog" ) diff --git a/pkg/mentix/exchangers/exchanger.go b/pkg/mentix/exchangers/exchanger.go index 46ce511280..9d45eebf82 100644 --- a/pkg/mentix/exchangers/exchanger.go +++ b/pkg/mentix/exchangers/exchanger.go @@ -25,9 +25,9 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/entity" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // Exchanger is the base interface for importers and exporters. diff --git a/pkg/mentix/exchangers/exchangers.go b/pkg/mentix/exchangers/exchangers.go index cf1789d33e..849bdd48cd 100644 --- a/pkg/mentix/exchangers/exchangers.go +++ b/pkg/mentix/exchangers/exchangers.go @@ -21,7 +21,7 @@ package exchangers import ( "fmt" - "github.com/cs3org/reva/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/entity" ) // Collection is an interface for exchanger collections. diff --git a/pkg/mentix/exchangers/exporters/cs3api.go b/pkg/mentix/exchangers/exporters/cs3api.go index 983c661070..e94c9b8b7a 100755 --- a/pkg/mentix/exchangers/exporters/cs3api.go +++ b/pkg/mentix/exchangers/exporters/cs3api.go @@ -21,8 +21,8 @@ package exporters import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers/exporters/cs3api" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/exporters/cs3api" ) // CS3APIExporter implements the CS3API exporter. diff --git a/pkg/mentix/exchangers/exporters/cs3api/query.go b/pkg/mentix/exchangers/exporters/cs3api/query.go index 2bdc056f72..ada29f7435 100755 --- a/pkg/mentix/exchangers/exporters/cs3api/query.go +++ b/pkg/mentix/exchangers/exporters/cs3api/query.go @@ -25,11 +25,11 @@ import ( "net/url" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/mentix/utils" + "github.com/cs3org/reva/v2/pkg/mentix/utils" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // HandleDefaultQuery processes a basic query. diff --git a/pkg/mentix/exchangers/exporters/exporter.go b/pkg/mentix/exchangers/exporters/exporter.go index 29df416fbc..78e0675651 100755 --- a/pkg/mentix/exchangers/exporters/exporter.go +++ b/pkg/mentix/exchangers/exporters/exporter.go @@ -19,8 +19,8 @@ package exporters import ( - "github.com/cs3org/reva/pkg/mentix/exchangers" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // Exporter is the interface that all exporters must implement. diff --git a/pkg/mentix/exchangers/exporters/exporters.go b/pkg/mentix/exchangers/exporters/exporters.go index 98d6040100..6f43b29610 100644 --- a/pkg/mentix/exchangers/exporters/exporters.go +++ b/pkg/mentix/exchangers/exporters/exporters.go @@ -21,9 +21,9 @@ package exporters import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/entity" - "github.com/cs3org/reva/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" ) // Collection represents a collection of exporters. diff --git a/pkg/mentix/exchangers/exporters/metrics.go b/pkg/mentix/exchangers/exporters/metrics.go index 21635b0b6f..40e6c97b88 100644 --- a/pkg/mentix/exchangers/exporters/metrics.go +++ b/pkg/mentix/exchangers/exporters/metrics.go @@ -19,9 +19,9 @@ package exporters import ( - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers/exporters/metrics" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/exporters/metrics" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/mentix/exchangers/exporters/metrics/metrics.go b/pkg/mentix/exchangers/exporters/metrics/metrics.go index 812435b7da..2f424f2d43 100644 --- a/pkg/mentix/exchangers/exporters/metrics/metrics.go +++ b/pkg/mentix/exchangers/exporters/metrics/metrics.go @@ -21,8 +21,8 @@ package metrics import ( "context" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" "github.com/pkg/errors" "github.com/rs/zerolog" "go.opencensus.io/stats" diff --git a/pkg/mentix/exchangers/exporters/promsd.go b/pkg/mentix/exchangers/exporters/promsd.go index 1c4a596ef9..96e0e59b2d 100755 --- a/pkg/mentix/exchangers/exporters/promsd.go +++ b/pkg/mentix/exchangers/exporters/promsd.go @@ -26,12 +26,12 @@ import ( "os" "path/filepath" - "github.com/cs3org/reva/pkg/mentix/utils" + "github.com/cs3org/reva/v2/pkg/mentix/utils" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers/exporters/prometheus" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/exporters/prometheus" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) type prometheusSDScrapeCreatorCallback = func(site *meshdata.Site, service *meshdata.Service, endpoint *meshdata.ServiceEndpoint) *prometheus.ScrapeConfig diff --git a/pkg/mentix/exchangers/exporters/reqexporter.go b/pkg/mentix/exchangers/exporters/reqexporter.go index 59c15439ce..4ab920fdd4 100644 --- a/pkg/mentix/exchangers/exporters/reqexporter.go +++ b/pkg/mentix/exchangers/exporters/reqexporter.go @@ -25,8 +25,8 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" ) // BaseRequestExporter implements basic exporter functionality common to all request exporters. diff --git a/pkg/mentix/exchangers/exporters/siteloc/query.go b/pkg/mentix/exchangers/exporters/siteloc/query.go index ba534e7597..ebbf103b58 100755 --- a/pkg/mentix/exchangers/exporters/siteloc/query.go +++ b/pkg/mentix/exchangers/exporters/siteloc/query.go @@ -26,8 +26,8 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // HandleDefaultQuery processes a basic query. diff --git a/pkg/mentix/exchangers/exporters/sitelocations.go b/pkg/mentix/exchangers/exporters/sitelocations.go index d3f8f1b352..1ee3d471b4 100755 --- a/pkg/mentix/exchangers/exporters/sitelocations.go +++ b/pkg/mentix/exchangers/exporters/sitelocations.go @@ -21,8 +21,8 @@ package exporters import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers/exporters/siteloc" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/exporters/siteloc" ) // SiteLocationsExporter implements the Site Locations exporter to use with Grafana. diff --git a/pkg/mentix/exchangers/exporters/webapi.go b/pkg/mentix/exchangers/exporters/webapi.go index e65b00c662..00fbf012f6 100755 --- a/pkg/mentix/exchangers/exporters/webapi.go +++ b/pkg/mentix/exchangers/exporters/webapi.go @@ -21,8 +21,8 @@ package exporters import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers/exporters/webapi" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/exporters/webapi" ) // WebAPIExporter implements the generic Web API exporter. diff --git a/pkg/mentix/exchangers/exporters/webapi/query.go b/pkg/mentix/exchangers/exporters/webapi/query.go index aa664bdff5..4eab5d3424 100755 --- a/pkg/mentix/exchangers/exporters/webapi/query.go +++ b/pkg/mentix/exchangers/exporters/webapi/query.go @@ -26,8 +26,8 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // HandleDefaultQuery processes a basic query. diff --git a/pkg/mentix/exchangers/importers/importer.go b/pkg/mentix/exchangers/importers/importer.go index d955f3608a..bd1c58672b 100755 --- a/pkg/mentix/exchangers/importers/importer.go +++ b/pkg/mentix/exchangers/importers/importer.go @@ -23,9 +23,9 @@ import ( "strings" "sync" - "github.com/cs3org/reva/pkg/mentix/connectors" - "github.com/cs3org/reva/pkg/mentix/exchangers" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/connectors" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // Importer is the interface that all importers must implement. diff --git a/pkg/mentix/exchangers/importers/importers.go b/pkg/mentix/exchangers/importers/importers.go index 152a2a1b55..e9ea3e9277 100644 --- a/pkg/mentix/exchangers/importers/importers.go +++ b/pkg/mentix/exchangers/importers/importers.go @@ -21,9 +21,9 @@ package importers import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/entity" - "github.com/cs3org/reva/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" ) // Collection represents a collection of importers. diff --git a/pkg/mentix/exchangers/importers/reqimporter.go b/pkg/mentix/exchangers/importers/reqimporter.go index 933db84fa5..0496a1482f 100644 --- a/pkg/mentix/exchangers/importers/reqimporter.go +++ b/pkg/mentix/exchangers/importers/reqimporter.go @@ -25,9 +25,9 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // BaseRequestImporter implements basic importer functionality common to all request importers. diff --git a/pkg/mentix/exchangers/importers/sitereg.go b/pkg/mentix/exchangers/importers/sitereg.go index 34c642527c..34c1090f84 100644 --- a/pkg/mentix/exchangers/importers/sitereg.go +++ b/pkg/mentix/exchangers/importers/sitereg.go @@ -21,8 +21,8 @@ package importers import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/exchangers/importers/sitereg" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/importers/sitereg" ) // SiteRegistrationImporter implements the external site registration importer. diff --git a/pkg/mentix/exchangers/importers/sitereg/query.go b/pkg/mentix/exchangers/importers/sitereg/query.go index bf43a53ceb..00e5a888fc 100755 --- a/pkg/mentix/exchangers/importers/sitereg/query.go +++ b/pkg/mentix/exchangers/importers/sitereg/query.go @@ -27,11 +27,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/accservice" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/key" - "github.com/cs3org/reva/pkg/mentix/meshdata" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/accservice" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/key" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) func decodeQueryData(data []byte) (*siteRegistrationData, error) { diff --git a/pkg/mentix/exchangers/importers/sitereg/types.go b/pkg/mentix/exchangers/importers/sitereg/types.go index 6350289f2a..eb3e7e1ddc 100644 --- a/pkg/mentix/exchangers/importers/sitereg/types.go +++ b/pkg/mentix/exchangers/importers/sitereg/types.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" - "github.com/cs3org/reva/pkg/mentix/key" - "github.com/cs3org/reva/pkg/mentix/meshdata" - "github.com/cs3org/reva/pkg/mentix/utils/countries" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/key" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/utils/countries" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) type siteRegistrationData struct { diff --git a/pkg/mentix/exchangers/reqexchanger.go b/pkg/mentix/exchangers/reqexchanger.go index 7539b4cfa9..ce36ff7961 100644 --- a/pkg/mentix/exchangers/reqexchanger.go +++ b/pkg/mentix/exchangers/reqexchanger.go @@ -26,8 +26,8 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // RequestExchanger is the interface implemented by exchangers that offer an HTTP endpoint. diff --git a/pkg/mentix/mentix.go b/pkg/mentix/mentix.go index 856d857af2..79752406c3 100644 --- a/pkg/mentix/mentix.go +++ b/pkg/mentix/mentix.go @@ -26,15 +26,15 @@ import ( "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/mentix/accservice" - "github.com/cs3org/reva/pkg/mentix/config" - "github.com/cs3org/reva/pkg/mentix/connectors" - "github.com/cs3org/reva/pkg/mentix/entity" - "github.com/cs3org/reva/pkg/mentix/exchangers" - "github.com/cs3org/reva/pkg/mentix/exchangers/exporters" - "github.com/cs3org/reva/pkg/mentix/exchangers/importers" - "github.com/cs3org/reva/pkg/mentix/meshdata" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/mentix/accservice" + "github.com/cs3org/reva/v2/pkg/mentix/config" + "github.com/cs3org/reva/v2/pkg/mentix/connectors" + "github.com/cs3org/reva/v2/pkg/mentix/entity" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/exporters" + "github.com/cs3org/reva/v2/pkg/mentix/exchangers/importers" + "github.com/cs3org/reva/v2/pkg/mentix/meshdata" ) // Mentix represents the main Mentix service object. diff --git a/pkg/mentix/meshdata/service.go b/pkg/mentix/meshdata/service.go index 6cf66c27ca..2949d11d02 100644 --- a/pkg/mentix/meshdata/service.go +++ b/pkg/mentix/meshdata/service.go @@ -23,7 +23,7 @@ import ( "net/url" "strings" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) // Service represents a service managed by Mentix. diff --git a/pkg/mentix/meshdata/site.go b/pkg/mentix/meshdata/site.go index a6866a15d1..bcc0058b2e 100644 --- a/pkg/mentix/meshdata/site.go +++ b/pkg/mentix/meshdata/site.go @@ -23,8 +23,8 @@ import ( "net/url" "strings" - "github.com/cs3org/reva/pkg/mentix/accservice" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/accservice" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) const ( diff --git a/pkg/metrics/driver/dummy/dummy.go b/pkg/metrics/driver/dummy/dummy.go index 6eb1068471..a4cefaab99 100644 --- a/pkg/metrics/driver/dummy/dummy.go +++ b/pkg/metrics/driver/dummy/dummy.go @@ -21,8 +21,8 @@ package dummy import ( "math/rand" - "github.com/cs3org/reva/pkg/metrics/config" - "github.com/cs3org/reva/pkg/metrics/driver/registry" + "github.com/cs3org/reva/v2/pkg/metrics/config" + "github.com/cs3org/reva/v2/pkg/metrics/driver/registry" ) func init() { diff --git a/pkg/metrics/driver/json/json.go b/pkg/metrics/driver/json/json.go index 43ed354947..b89eaf77c7 100644 --- a/pkg/metrics/driver/json/json.go +++ b/pkg/metrics/driver/json/json.go @@ -24,10 +24,10 @@ import ( "io/ioutil" "os" - "github.com/cs3org/reva/pkg/metrics/driver/registry" + "github.com/cs3org/reva/v2/pkg/metrics/driver/registry" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/metrics/config" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/metrics/config" "github.com/rs/zerolog" ) diff --git a/pkg/metrics/driver/loader/loader.go b/pkg/metrics/driver/loader/loader.go index 82fd0ba7f6..3c8588d174 100644 --- a/pkg/metrics/driver/loader/loader.go +++ b/pkg/metrics/driver/loader/loader.go @@ -20,8 +20,8 @@ package loader import ( // Load metrics drivers. - _ "github.com/cs3org/reva/pkg/metrics/driver/dummy" - _ "github.com/cs3org/reva/pkg/metrics/driver/json" - _ "github.com/cs3org/reva/pkg/metrics/driver/xcloud" + _ "github.com/cs3org/reva/v2/pkg/metrics/driver/dummy" + _ "github.com/cs3org/reva/v2/pkg/metrics/driver/json" + _ "github.com/cs3org/reva/v2/pkg/metrics/driver/xcloud" // Add your own here ) diff --git a/pkg/metrics/driver/registry/registry.go b/pkg/metrics/driver/registry/registry.go index a92fde4463..9337c09951 100644 --- a/pkg/metrics/driver/registry/registry.go +++ b/pkg/metrics/driver/registry/registry.go @@ -19,7 +19,7 @@ package registry import ( - "github.com/cs3org/reva/pkg/metrics/reader" + "github.com/cs3org/reva/v2/pkg/metrics/reader" ) var drivers map[string]reader.Reader // map key is driver type name diff --git a/pkg/metrics/driver/xcloud/xcloud.go b/pkg/metrics/driver/xcloud/xcloud.go index 84fbae56dc..082a1708ba 100644 --- a/pkg/metrics/driver/xcloud/xcloud.go +++ b/pkg/metrics/driver/xcloud/xcloud.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/cs3org/reva/pkg/metrics/driver/registry" + "github.com/cs3org/reva/v2/pkg/metrics/driver/registry" "github.com/rs/zerolog" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/metrics/config" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/metrics/config" ) var log zerolog.Logger diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index ec3fd12fb1..23cc9c3c5e 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -27,11 +27,11 @@ import ( "os" "time" - "github.com/cs3org/reva/pkg/metrics/config" - "github.com/cs3org/reva/pkg/metrics/driver/registry" - "github.com/cs3org/reva/pkg/metrics/reader" + "github.com/cs3org/reva/v2/pkg/metrics/config" + "github.com/cs3org/reva/v2/pkg/metrics/driver/registry" + "github.com/cs3org/reva/v2/pkg/metrics/reader" - "github.com/cs3org/reva/pkg/logger" + "github.com/cs3org/reva/v2/pkg/logger" "go.opencensus.io/stats" "go.opencensus.io/stats/view" ) diff --git a/pkg/metrics/reader/reader.go b/pkg/metrics/reader/reader.go index 88189b11d9..81daf0f613 100644 --- a/pkg/metrics/reader/reader.go +++ b/pkg/metrics/reader/reader.go @@ -24,7 +24,7 @@ Any metrics data driver must implement this interface. Each metric function should return the current/latest available metrics figure relevant to that function. */ -import "github.com/cs3org/reva/pkg/metrics/config" +import "github.com/cs3org/reva/v2/pkg/metrics/config" // Reader the Reader interface type Reader interface { diff --git a/pkg/ocm/invite/manager/json/json.go b/pkg/ocm/invite/manager/json/json.go index 1223670c96..5f1136e5c0 100644 --- a/pkg/ocm/invite/manager/json/json.go +++ b/pkg/ocm/invite/manager/json/json.go @@ -34,12 +34,12 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/invite" - "github.com/cs3org/reva/pkg/ocm/invite/manager/registry" - "github.com/cs3org/reva/pkg/ocm/invite/token" - "github.com/cs3org/reva/pkg/rhttp" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/invite" + "github.com/cs3org/reva/v2/pkg/ocm/invite/manager/registry" + "github.com/cs3org/reva/v2/pkg/ocm/invite/token" + "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/ocm/invite/manager/loader/loader.go b/pkg/ocm/invite/manager/loader/loader.go index 4f531f9639..f5f35caae0 100644 --- a/pkg/ocm/invite/manager/loader/loader.go +++ b/pkg/ocm/invite/manager/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core share manager drivers. - _ "github.com/cs3org/reva/pkg/ocm/invite/manager/json" - _ "github.com/cs3org/reva/pkg/ocm/invite/manager/memory" + _ "github.com/cs3org/reva/v2/pkg/ocm/invite/manager/json" + _ "github.com/cs3org/reva/v2/pkg/ocm/invite/manager/memory" // Add your own here ) diff --git a/pkg/ocm/invite/manager/memory/memory.go b/pkg/ocm/invite/manager/memory/memory.go index bf7f8b22fa..b5454a4474 100644 --- a/pkg/ocm/invite/manager/memory/memory.go +++ b/pkg/ocm/invite/manager/memory/memory.go @@ -27,16 +27,16 @@ import ( "sync" "time" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/ocm/invite" - "github.com/cs3org/reva/pkg/ocm/invite/manager/registry" - "github.com/cs3org/reva/pkg/ocm/invite/token" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/ocm/invite" + "github.com/cs3org/reva/v2/pkg/ocm/invite/manager/registry" + "github.com/cs3org/reva/v2/pkg/ocm/invite/token" + "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/ocm/invite/manager/registry/registry.go b/pkg/ocm/invite/manager/registry/registry.go index 8f750b79d4..d5b3d19014 100644 --- a/pkg/ocm/invite/manager/registry/registry.go +++ b/pkg/ocm/invite/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/ocm/invite" +import "github.com/cs3org/reva/v2/pkg/ocm/invite" // NewFunc is the function that invite managers // should register at init time. diff --git a/pkg/ocm/provider/authorizer/json/json.go b/pkg/ocm/provider/authorizer/json/json.go index 575287c586..75873e77be 100644 --- a/pkg/ocm/provider/authorizer/json/json.go +++ b/pkg/ocm/provider/authorizer/json/json.go @@ -28,9 +28,9 @@ import ( "sync" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/provider" - "github.com/cs3org/reva/pkg/ocm/provider/authorizer/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/provider" + "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/ocm/provider/authorizer/loader/loader.go b/pkg/ocm/provider/authorizer/loader/loader.go index c4663ec234..ff93c902d2 100644 --- a/pkg/ocm/provider/authorizer/loader/loader.go +++ b/pkg/ocm/provider/authorizer/loader/loader.go @@ -20,8 +20,8 @@ package loader import ( // Load core share manager drivers. - _ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/json" - _ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/mentix" - _ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/open" + _ "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/json" + _ "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/mentix" + _ "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/open" // Add your own here ) diff --git a/pkg/ocm/provider/authorizer/mentix/mentix.go b/pkg/ocm/provider/authorizer/mentix/mentix.go index eee16d1407..d9a27acb1f 100644 --- a/pkg/ocm/provider/authorizer/mentix/mentix.go +++ b/pkg/ocm/provider/authorizer/mentix/mentix.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/provider" - "github.com/cs3org/reva/pkg/ocm/provider/authorizer/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/provider" + "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/ocm/provider/authorizer/open/open.go b/pkg/ocm/provider/authorizer/open/open.go index e3b6e31494..f1a0ea3b14 100644 --- a/pkg/ocm/provider/authorizer/open/open.go +++ b/pkg/ocm/provider/authorizer/open/open.go @@ -26,9 +26,9 @@ import ( "strings" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/provider" - "github.com/cs3org/reva/pkg/ocm/provider/authorizer/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/provider" + "github.com/cs3org/reva/v2/pkg/ocm/provider/authorizer/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/ocm/provider/authorizer/registry/registry.go b/pkg/ocm/provider/authorizer/registry/registry.go index c474d5be95..cf50d66ddb 100644 --- a/pkg/ocm/provider/authorizer/registry/registry.go +++ b/pkg/ocm/provider/authorizer/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/ocm/provider" +import "github.com/cs3org/reva/v2/pkg/ocm/provider" // NewFunc is the function that provider authorizers // should register at init time. diff --git a/pkg/ocm/share/manager/json/json.go b/pkg/ocm/share/manager/json/json.go index 8a1f9545ae..7d00c3a4f9 100644 --- a/pkg/ocm/share/manager/json/json.go +++ b/pkg/ocm/share/manager/json/json.go @@ -32,13 +32,13 @@ import ( ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/share" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/share" - "github.com/cs3org/reva/pkg/ocm/share/manager/registry" - "github.com/cs3org/reva/pkg/ocm/share/sender" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/ocm/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/ocm/share/sender" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/ocm/share/manager/loader/loader.go b/pkg/ocm/share/manager/loader/loader.go index 6c327b184f..51e66e2d08 100644 --- a/pkg/ocm/share/manager/loader/loader.go +++ b/pkg/ocm/share/manager/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core share manager drivers. - _ "github.com/cs3org/reva/pkg/ocm/share/manager/json" - _ "github.com/cs3org/reva/pkg/ocm/share/manager/nextcloud" + _ "github.com/cs3org/reva/v2/pkg/ocm/share/manager/json" + _ "github.com/cs3org/reva/v2/pkg/ocm/share/manager/nextcloud" // Add your own here ) diff --git a/pkg/ocm/share/manager/nextcloud/nextcloud.go b/pkg/ocm/share/manager/nextcloud/nextcloud.go index 57ce41d7be..d186b2e022 100644 --- a/pkg/ocm/share/manager/nextcloud/nextcloud.go +++ b/pkg/ocm/share/manager/nextcloud/nextcloud.go @@ -29,19 +29,19 @@ import ( "time" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/utils" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" ocm "github.com/cs3org/go-cs3apis/cs3/sharing/ocm/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/ocm/share" - "github.com/cs3org/reva/pkg/ocm/share/manager/registry" - "github.com/cs3org/reva/pkg/ocm/share/sender" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/ocm/share" + "github.com/cs3org/reva/v2/pkg/ocm/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/ocm/share/sender" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/genproto/protobuf/field_mask" diff --git a/pkg/ocm/share/manager/nextcloud/nextcloud_test.go b/pkg/ocm/share/manager/nextcloud/nextcloud_test.go index 847cb0f7ff..79361be14d 100644 --- a/pkg/ocm/share/manager/nextcloud/nextcloud_test.go +++ b/pkg/ocm/share/manager/nextcloud/nextcloud_test.go @@ -30,11 +30,11 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/auth/scope" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/pkg/ocm/share/manager/nextcloud" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/ocm/share/manager/nextcloud" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/ocm/share/manager/registry/registry.go b/pkg/ocm/share/manager/registry/registry.go index 8ea0628fc9..b37333193e 100644 --- a/pkg/ocm/share/manager/registry/registry.go +++ b/pkg/ocm/share/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/ocm/share" +import "github.com/cs3org/reva/v2/pkg/ocm/share" // NewFunc is the function that share managers // should register at init time. diff --git a/pkg/ocm/share/sender/sender.go b/pkg/ocm/share/sender/sender.go index 5cee734bad..a978ab8e76 100644 --- a/pkg/ocm/share/sender/sender.go +++ b/pkg/ocm/share/sender/sender.go @@ -29,7 +29,7 @@ import ( "time" ocmprovider "github.com/cs3org/go-cs3apis/cs3/ocm/provider/v1beta1" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/pkg/errors" ) diff --git a/pkg/permission/manager/demo/demo.go b/pkg/permission/manager/demo/demo.go index 06a23ea6a0..42da025314 100644 --- a/pkg/permission/manager/demo/demo.go +++ b/pkg/permission/manager/demo/demo.go @@ -20,8 +20,8 @@ package demo import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/permission" - "github.com/cs3org/reva/pkg/permission/manager/registry" + "github.com/cs3org/reva/v2/pkg/permission" + "github.com/cs3org/reva/v2/pkg/permission/manager/registry" ) func init() { diff --git a/pkg/permission/manager/loader/loader.go b/pkg/permission/manager/loader/loader.go index 5f0bbc5774..847e0a6e7a 100644 --- a/pkg/permission/manager/loader/loader.go +++ b/pkg/permission/manager/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load permission manager drivers - _ "github.com/cs3org/reva/pkg/permission/manager/demo" + _ "github.com/cs3org/reva/v2/pkg/permission/manager/demo" // Add your own here ) diff --git a/pkg/permission/manager/registry/registry.go b/pkg/permission/manager/registry/registry.go index 26f55bebad..0ae624e1cb 100644 --- a/pkg/permission/manager/registry/registry.go +++ b/pkg/permission/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/permission" +import "github.com/cs3org/reva/v2/pkg/permission" // NewFunc is the function that permission managers // should register at init time. diff --git a/pkg/plugin/loader.go b/pkg/plugin/loader.go index 335af6275f..205895f3db 100644 --- a/pkg/plugin/loader.go +++ b/pkg/plugin/loader.go @@ -26,7 +26,7 @@ import ( "path/filepath" "regexp" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" ) diff --git a/pkg/publicshare/manager/json/json.go b/pkg/publicshare/manager/json/json.go index 8f7211b687..3bd325bb3e 100644 --- a/pkg/publicshare/manager/json/json.go +++ b/pkg/publicshare/manager/json/json.go @@ -37,11 +37,11 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/publicshare/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/publicshare/manager/loader/loader.go b/pkg/publicshare/manager/loader/loader.go index 5101d1e109..b9698096c3 100644 --- a/pkg/publicshare/manager/loader/loader.go +++ b/pkg/publicshare/manager/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core share manager drivers. - _ "github.com/cs3org/reva/pkg/publicshare/manager/json" - _ "github.com/cs3org/reva/pkg/publicshare/manager/memory" + _ "github.com/cs3org/reva/v2/pkg/publicshare/manager/json" + _ "github.com/cs3org/reva/v2/pkg/publicshare/manager/memory" // Add your own here ) diff --git a/pkg/publicshare/manager/memory/memory.go b/pkg/publicshare/manager/memory/memory.go index c3885227ca..7fd19ad01d 100644 --- a/pkg/publicshare/manager/memory/memory.go +++ b/pkg/publicshare/manager/memory/memory.go @@ -31,11 +31,11 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/publicshare" - "github.com/cs3org/reva/pkg/publicshare/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/publicshare" + "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" ) func init() { diff --git a/pkg/publicshare/manager/registry/registry.go b/pkg/publicshare/manager/registry/registry.go index fa9f1d1a93..1e0096e173 100644 --- a/pkg/publicshare/manager/registry/registry.go +++ b/pkg/publicshare/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/publicshare" +import "github.com/cs3org/reva/v2/pkg/publicshare" // NewFunc is the function that share managers // should register at init time. diff --git a/pkg/publicshare/publicshare.go b/pkg/publicshare/publicshare.go index eb8dec3cdc..601a75b0a9 100644 --- a/pkg/publicshare/publicshare.go +++ b/pkg/publicshare/publicshare.go @@ -30,7 +30,7 @@ import ( link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" ) const ( diff --git a/pkg/registry/memory/memory.go b/pkg/registry/memory/memory.go index 6d828ec6c1..aee78c9ad5 100644 --- a/pkg/registry/memory/memory.go +++ b/pkg/registry/memory/memory.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/cs3org/reva/pkg/registry" + "github.com/cs3org/reva/v2/pkg/registry" ) // Registry implements the Registry interface. diff --git a/pkg/registry/memory/service.go b/pkg/registry/memory/service.go index 0213b2761d..d34e92cc37 100644 --- a/pkg/registry/memory/service.go +++ b/pkg/registry/memory/service.go @@ -18,7 +18,7 @@ package memory -import "github.com/cs3org/reva/pkg/registry" +import "github.com/cs3org/reva/v2/pkg/registry" // NewService creates a new memory registry.Service. func NewService(name string, nodes []interface{}) registry.Service { diff --git a/pkg/rgrpc/rgrpc.go b/pkg/rgrpc/rgrpc.go index 05fa952153..5cc0520b7f 100644 --- a/pkg/rgrpc/rgrpc.go +++ b/pkg/rgrpc/rgrpc.go @@ -24,14 +24,14 @@ import ( "net" "sort" - "github.com/cs3org/reva/internal/grpc/interceptors/appctx" - "github.com/cs3org/reva/internal/grpc/interceptors/auth" - "github.com/cs3org/reva/internal/grpc/interceptors/log" - "github.com/cs3org/reva/internal/grpc/interceptors/recovery" - "github.com/cs3org/reva/internal/grpc/interceptors/token" - "github.com/cs3org/reva/internal/grpc/interceptors/useragent" - "github.com/cs3org/reva/pkg/sharedconf" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/internal/grpc/interceptors/appctx" + "github.com/cs3org/reva/v2/internal/grpc/interceptors/auth" + "github.com/cs3org/reva/v2/internal/grpc/interceptors/log" + "github.com/cs3org/reva/v2/internal/grpc/interceptors/recovery" + "github.com/cs3org/reva/v2/internal/grpc/interceptors/token" + "github.com/cs3org/reva/v2/internal/grpc/interceptors/useragent" + "github.com/cs3org/reva/v2/pkg/sharedconf" + rtrace "github.com/cs3org/reva/v2/pkg/trace" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/rgrpc/status/status.go b/pkg/rgrpc/status/status.go index 9c25f5563c..03b746b95c 100644 --- a/pkg/rgrpc/status/status.go +++ b/pkg/rgrpc/status/status.go @@ -27,7 +27,7 @@ import ( "net/http" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" "go.opentelemetry.io/otel/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/rgrpc/todo/pool/pool.go b/pkg/rgrpc/todo/pool/pool.go index b2c94b1219..26df95a6e0 100644 --- a/pkg/rgrpc/todo/pool/pool.go +++ b/pkg/rgrpc/todo/pool/pool.go @@ -40,7 +40,7 @@ import ( storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" storageregistry "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" datatx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1" - rtrace "github.com/cs3org/reva/pkg/trace" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" ) diff --git a/pkg/rhttp/client.go b/pkg/rhttp/client.go index c74c00cb79..2676386804 100644 --- a/pkg/rhttp/client.go +++ b/pkg/rhttp/client.go @@ -26,7 +26,7 @@ import ( "go.opencensus.io/plugin/ochttp" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/pkg/errors" ) diff --git a/pkg/rhttp/datatx/datatx.go b/pkg/rhttp/datatx/datatx.go index 716efb2931..6e837bb8c2 100644 --- a/pkg/rhttp/datatx/datatx.go +++ b/pkg/rhttp/datatx/datatx.go @@ -23,7 +23,7 @@ package datatx import ( "net/http" - "github.com/cs3org/reva/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage" ) // DataTX provides an abstraction around various data transfer protocols. diff --git a/pkg/rhttp/datatx/manager/loader/loader.go b/pkg/rhttp/datatx/manager/loader/loader.go index 15a11bb5f4..486d91578d 100644 --- a/pkg/rhttp/datatx/manager/loader/loader.go +++ b/pkg/rhttp/datatx/manager/loader/loader.go @@ -20,8 +20,8 @@ package loader import ( // Load core data transfer protocols - _ "github.com/cs3org/reva/pkg/rhttp/datatx/manager/simple" - _ "github.com/cs3org/reva/pkg/rhttp/datatx/manager/spaces" - _ "github.com/cs3org/reva/pkg/rhttp/datatx/manager/tus" + _ "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/simple" + _ "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/spaces" + _ "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/tus" // Add your own here ) diff --git a/pkg/rhttp/datatx/manager/registry/registry.go b/pkg/rhttp/datatx/manager/registry/registry.go index a99b70ecee..b30a657f0d 100644 --- a/pkg/rhttp/datatx/manager/registry/registry.go +++ b/pkg/rhttp/datatx/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/rhttp/datatx" +import "github.com/cs3org/reva/v2/pkg/rhttp/datatx" // NewFunc is the function that data transfer implementations // should register at init time. diff --git a/pkg/rhttp/datatx/manager/simple/simple.go b/pkg/rhttp/datatx/manager/simple/simple.go index ed93f6a5a7..a7acc5dba2 100644 --- a/pkg/rhttp/datatx/manager/simple/simple.go +++ b/pkg/rhttp/datatx/manager/simple/simple.go @@ -22,12 +22,12 @@ import ( "net/http" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp/datatx" - "github.com/cs3org/reva/pkg/rhttp/datatx/manager/registry" - "github.com/cs3org/reva/pkg/rhttp/datatx/utils/download" - "github.com/cs3org/reva/pkg/storage" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/registry" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx/utils/download" + "github.com/cs3org/reva/v2/pkg/storage" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/rhttp/datatx/manager/spaces/spaces.go b/pkg/rhttp/datatx/manager/spaces/spaces.go index 249e947278..6fd9bfb9ef 100644 --- a/pkg/rhttp/datatx/manager/spaces/spaces.go +++ b/pkg/rhttp/datatx/manager/spaces/spaces.go @@ -24,14 +24,14 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp/datatx" - "github.com/cs3org/reva/pkg/rhttp/datatx/manager/registry" - "github.com/cs3org/reva/pkg/rhttp/datatx/utils/download" - "github.com/cs3org/reva/pkg/rhttp/router" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/registry" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx/utils/download" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/rhttp/datatx/manager/tus/tus.go b/pkg/rhttp/datatx/manager/tus/tus.go index 7ece3466fb..f70d07d585 100644 --- a/pkg/rhttp/datatx/manager/tus/tus.go +++ b/pkg/rhttp/datatx/manager/tus/tus.go @@ -23,11 +23,11 @@ import ( "github.com/pkg/errors" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp/datatx" - "github.com/cs3org/reva/pkg/rhttp/datatx/manager/registry" - "github.com/cs3org/reva/pkg/rhttp/datatx/utils/download" - "github.com/cs3org/reva/pkg/storage" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx/manager/registry" + "github.com/cs3org/reva/v2/pkg/rhttp/datatx/utils/download" + "github.com/cs3org/reva/v2/pkg/storage" "github.com/mitchellh/mapstructure" tusd "github.com/tus/tusd/pkg/handler" ) diff --git a/pkg/rhttp/datatx/utils/download/download.go b/pkg/rhttp/datatx/utils/download/download.go index 21b28d3645..bb8bffde7a 100644 --- a/pkg/rhttp/datatx/utils/download/download.go +++ b/pkg/rhttp/datatx/utils/download/download.go @@ -28,10 +28,10 @@ import ( "strconv" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/rs/zerolog" ) diff --git a/pkg/rhttp/rhttp.go b/pkg/rhttp/rhttp.go index 4ed8297c60..b704d51eaa 100644 --- a/pkg/rhttp/rhttp.go +++ b/pkg/rhttp/rhttp.go @@ -27,13 +27,13 @@ import ( "sort" "time" - "github.com/cs3org/reva/internal/http/interceptors/appctx" - "github.com/cs3org/reva/internal/http/interceptors/auth" - "github.com/cs3org/reva/internal/http/interceptors/log" - "github.com/cs3org/reva/internal/http/interceptors/providerauthorizer" - "github.com/cs3org/reva/pkg/rhttp/global" - "github.com/cs3org/reva/pkg/rhttp/router" - rtrace "github.com/cs3org/reva/pkg/trace" + "github.com/cs3org/reva/v2/internal/http/interceptors/appctx" + "github.com/cs3org/reva/v2/internal/http/interceptors/auth" + "github.com/cs3org/reva/v2/internal/http/interceptors/log" + "github.com/cs3org/reva/v2/internal/http/interceptors/providerauthorizer" + "github.com/cs3org/reva/v2/pkg/rhttp/global" + "github.com/cs3org/reva/v2/pkg/rhttp/router" + rtrace "github.com/cs3org/reva/v2/pkg/trace" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/pkg/sdk/action/action.go b/pkg/sdk/action/action.go index 6776065d60..28bd694406 100644 --- a/pkg/sdk/action/action.go +++ b/pkg/sdk/action/action.go @@ -21,7 +21,7 @@ package action import ( "fmt" - "github.com/cs3org/reva/pkg/sdk" + "github.com/cs3org/reva/v2/pkg/sdk" ) type action struct { diff --git a/pkg/sdk/action/download.go b/pkg/sdk/action/download.go index 7f081a58fa..2dc15cddee 100644 --- a/pkg/sdk/action/download.go +++ b/pkg/sdk/action/download.go @@ -24,9 +24,9 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" storage "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/sdk" - "github.com/cs3org/reva/pkg/sdk/common/net" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/sdk" + "github.com/cs3org/reva/v2/pkg/sdk/common/net" ) // DownloadAction is used to download files through Reva. diff --git a/pkg/sdk/action/enumfiles.go b/pkg/sdk/action/enumfiles.go index 1cf55a96c9..f75eb14b2f 100644 --- a/pkg/sdk/action/enumfiles.go +++ b/pkg/sdk/action/enumfiles.go @@ -23,8 +23,8 @@ import ( storage "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/sdk" - "github.com/cs3org/reva/pkg/sdk/common/net" + "github.com/cs3org/reva/v2/pkg/sdk" + "github.com/cs3org/reva/v2/pkg/sdk/common/net" ) // EnumFilesAction offers functions to enumerate files and directories. diff --git a/pkg/sdk/action/fileops.go b/pkg/sdk/action/fileops.go index 06a3ad83a8..f590de70cd 100644 --- a/pkg/sdk/action/fileops.go +++ b/pkg/sdk/action/fileops.go @@ -26,8 +26,8 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" storage "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/sdk" - "github.com/cs3org/reva/pkg/sdk/common/net" + "github.com/cs3org/reva/v2/pkg/sdk" + "github.com/cs3org/reva/v2/pkg/sdk/common/net" ) // FileOperationsAction offers basic file operations. diff --git a/pkg/sdk/action/upload.go b/pkg/sdk/action/upload.go index 263722d670..9ad65ab91d 100644 --- a/pkg/sdk/action/upload.go +++ b/pkg/sdk/action/upload.go @@ -32,11 +32,11 @@ import ( storage "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/sdk" - "github.com/cs3org/reva/pkg/sdk/common" - "github.com/cs3org/reva/pkg/sdk/common/crypto" - "github.com/cs3org/reva/pkg/sdk/common/net" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/sdk" + "github.com/cs3org/reva/v2/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/sdk/common/crypto" + "github.com/cs3org/reva/v2/pkg/sdk/common/net" ) // UploadAction is used to upload files through Reva. diff --git a/pkg/sdk/common/crypto/crypto.go b/pkg/sdk/common/crypto/crypto.go index 84ba0fdba4..8a7ff244ec 100644 --- a/pkg/sdk/common/crypto/crypto.go +++ b/pkg/sdk/common/crypto/crypto.go @@ -24,8 +24,8 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/grpc/services/storageprovider" - "github.com/cs3org/reva/pkg/crypto" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + "github.com/cs3org/reva/v2/pkg/crypto" ) // ComputeChecksum calculates the checksum of the given data using the specified checksum type. diff --git a/pkg/sdk/common/net/net.go b/pkg/sdk/common/net/net.go index 7f47a386aa..ad620f905d 100644 --- a/pkg/sdk/common/net/net.go +++ b/pkg/sdk/common/net/net.go @@ -19,8 +19,8 @@ package net import ( - "github.com/cs3org/reva/internal/http/services/datagateway" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) type ctxKey int diff --git a/pkg/sdk/common/net/tus.go b/pkg/sdk/common/net/tus.go index bf4a73df3c..1e28f64de7 100644 --- a/pkg/sdk/common/net/tus.go +++ b/pkg/sdk/common/net/tus.go @@ -30,7 +30,7 @@ import ( "github.com/eventials/go-tus" "github.com/eventials/go-tus/memorystore" - "github.com/cs3org/reva/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/sdk/common" ) // TUSClient is a simple client wrapper for uploading files via TUS. diff --git a/pkg/sdk/common/net/webdav.go b/pkg/sdk/common/net/webdav.go index 16d810e200..7dc3be244a 100644 --- a/pkg/sdk/common/net/webdav.go +++ b/pkg/sdk/common/net/webdav.go @@ -27,7 +27,7 @@ import ( types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" "github.com/studio-b12/gowebdav" - "github.com/cs3org/reva/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/sdk/common" ) const ( diff --git a/pkg/sdk/session.go b/pkg/sdk/session.go index 6e451bd00c..ffd92c80ef 100644 --- a/pkg/sdk/session.go +++ b/pkg/sdk/session.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata" - "github.com/cs3org/reva/pkg/sdk/common" - "github.com/cs3org/reva/pkg/sdk/common/net" + "github.com/cs3org/reva/v2/pkg/sdk/common" + "github.com/cs3org/reva/v2/pkg/sdk/common/net" ) // Session stores information about a Reva session. diff --git a/pkg/share/cache/cbox/cbox.go b/pkg/share/cache/cbox/cbox.go index 6f3d42295f..45137b2ecb 100644 --- a/pkg/share/cache/cbox/cbox.go +++ b/pkg/share/cache/cbox/cbox.go @@ -26,12 +26,12 @@ import ( userpb "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/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/share/cache" - "github.com/cs3org/reva/pkg/share/cache/registry" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "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/share/cache" + "github.com/cs3org/reva/v2/pkg/share/cache/registry" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/grpc/metadata" diff --git a/pkg/share/cache/loader/loader.go b/pkg/share/cache/loader/loader.go index a3d8ec7cbb..641d89f08c 100644 --- a/pkg/share/cache/loader/loader.go +++ b/pkg/share/cache/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load share cache drivers. - _ "github.com/cs3org/reva/pkg/share/cache/cbox" + _ "github.com/cs3org/reva/v2/pkg/share/cache/cbox" // Add your own here ) diff --git a/pkg/share/cache/registry/registry.go b/pkg/share/cache/registry/registry.go index ce9dff08b5..8f1b72d6a8 100644 --- a/pkg/share/cache/registry/registry.go +++ b/pkg/share/cache/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/share/cache" +import "github.com/cs3org/reva/v2/pkg/share/cache" // NewFunc is the function that cache warmup implementations // should register at init time. diff --git a/pkg/share/manager/json/json.go b/pkg/share/manager/json/json.go index aa3c946e7b..a1c628e389 100644 --- a/pkg/share/manager/json/json.go +++ b/pkg/share/manager/json/json.go @@ -29,16 +29,16 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/share" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/share" "github.com/google/uuid" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/genproto/protobuf/field_mask" - "github.com/cs3org/reva/pkg/share/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" ) func init() { diff --git a/pkg/share/manager/loader/loader.go b/pkg/share/manager/loader/loader.go index b3ebbcae29..5f2da40695 100644 --- a/pkg/share/manager/loader/loader.go +++ b/pkg/share/manager/loader/loader.go @@ -20,8 +20,8 @@ package loader import ( // Load core share manager drivers. - _ "github.com/cs3org/reva/pkg/share/manager/json" - _ "github.com/cs3org/reva/pkg/share/manager/memory" - _ "github.com/cs3org/reva/pkg/share/manager/sql" + _ "github.com/cs3org/reva/v2/pkg/share/manager/json" + _ "github.com/cs3org/reva/v2/pkg/share/manager/memory" + _ "github.com/cs3org/reva/v2/pkg/share/manager/sql" // Add your own here ) diff --git a/pkg/share/manager/memory/memory.go b/pkg/share/manager/memory/memory.go index 1be0bb30ef..6ee09e4592 100644 --- a/pkg/share/manager/memory/memory.go +++ b/pkg/share/manager/memory/memory.go @@ -26,16 +26,16 @@ import ( "sync/atomic" "time" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/share" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/share" "google.golang.org/genproto/protobuf/field_mask" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/share/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" ) var counter uint64 diff --git a/pkg/share/manager/registry/registry.go b/pkg/share/manager/registry/registry.go index 952fc7b8f2..6686ef4341 100644 --- a/pkg/share/manager/registry/registry.go +++ b/pkg/share/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/share" +import "github.com/cs3org/reva/v2/pkg/share" // NewFunc is the function that share managers // should register at init time. diff --git a/pkg/share/manager/sql/conversions.go b/pkg/share/manager/sql/conversions.go index 84772f658f..db8d2cedda 100644 --- a/pkg/share/manager/sql/conversions.go +++ b/pkg/share/manager/sql/conversions.go @@ -31,9 +31,9 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - conversions "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + conversions "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" ) //go:generate mockery -name UserConverter diff --git a/pkg/share/manager/sql/sql.go b/pkg/share/manager/sql/sql.go index 06ac74bb52..64ff5791b1 100644 --- a/pkg/share/manager/sql/sql.go +++ b/pkg/share/manager/sql/sql.go @@ -30,11 +30,11 @@ import ( collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typespb "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/share" - "github.com/cs3org/reva/pkg/share/manager/registry" - "github.com/cs3org/reva/pkg/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/share" + "github.com/cs3org/reva/v2/pkg/share/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "google.golang.org/genproto/protobuf/field_mask" diff --git a/pkg/share/manager/sql/sql_test.go b/pkg/share/manager/sql/sql_test.go index ecc386d2cc..bd2d38a7fe 100644 --- a/pkg/share/manager/sql/sql_test.go +++ b/pkg/share/manager/sql/sql_test.go @@ -29,10 +29,10 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ruser "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/share" - sqlmanager "github.com/cs3org/reva/pkg/share/manager/sql" - mocks "github.com/cs3org/reva/pkg/share/manager/sql/mocks" + ruser "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/share" + sqlmanager "github.com/cs3org/reva/v2/pkg/share/manager/sql" + mocks "github.com/cs3org/reva/v2/pkg/share/manager/sql/mocks" "google.golang.org/protobuf/types/known/fieldmaskpb" _ "github.com/mattn/go-sqlite3" diff --git a/pkg/share/share.go b/pkg/share/share.go index 9ecb37f4c3..2c4755dd58 100644 --- a/pkg/share/share.go +++ b/pkg/share/share.go @@ -24,8 +24,8 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/genproto/protobuf/field_mask" ) diff --git a/pkg/siteacc/account/contact/contact.go b/pkg/siteacc/account/contact/contact.go index 038db6a5a8..d92d1546a2 100644 --- a/pkg/siteacc/account/contact/contact.go +++ b/pkg/siteacc/account/contact/contact.go @@ -18,7 +18,7 @@ package contact -import "github.com/cs3org/reva/pkg/siteacc/html" +import "github.com/cs3org/reva/v2/pkg/siteacc/html" // PanelTemplate is the content provider for the contact form. type PanelTemplate struct { diff --git a/pkg/siteacc/account/edit/edit.go b/pkg/siteacc/account/edit/edit.go index a4d40f257c..58a4375a05 100644 --- a/pkg/siteacc/account/edit/edit.go +++ b/pkg/siteacc/account/edit/edit.go @@ -18,7 +18,7 @@ package edit -import "github.com/cs3org/reva/pkg/siteacc/html" +import "github.com/cs3org/reva/v2/pkg/siteacc/html" // PanelTemplate is the content provider for the edit form. type PanelTemplate struct { diff --git a/pkg/siteacc/account/login/login.go b/pkg/siteacc/account/login/login.go index 078a128b32..dc1df68278 100644 --- a/pkg/siteacc/account/login/login.go +++ b/pkg/siteacc/account/login/login.go @@ -18,7 +18,7 @@ package login -import "github.com/cs3org/reva/pkg/siteacc/html" +import "github.com/cs3org/reva/v2/pkg/siteacc/html" // PanelTemplate is the content provider for the login form. type PanelTemplate struct { diff --git a/pkg/siteacc/account/manage/manage.go b/pkg/siteacc/account/manage/manage.go index eff0ff5af3..cd3e444efd 100644 --- a/pkg/siteacc/account/manage/manage.go +++ b/pkg/siteacc/account/manage/manage.go @@ -18,7 +18,7 @@ package manage -import "github.com/cs3org/reva/pkg/siteacc/html" +import "github.com/cs3org/reva/v2/pkg/siteacc/html" // PanelTemplate is the content provider for the mangement form. type PanelTemplate struct { diff --git a/pkg/siteacc/account/panel.go b/pkg/siteacc/account/panel.go index 040ed8ddc8..6bdd87157c 100644 --- a/pkg/siteacc/account/panel.go +++ b/pkg/siteacc/account/panel.go @@ -23,15 +23,15 @@ import ( "net/url" "strings" - "github.com/cs3org/reva/pkg/siteacc/account/contact" - "github.com/cs3org/reva/pkg/siteacc/account/edit" - "github.com/cs3org/reva/pkg/siteacc/account/login" - "github.com/cs3org/reva/pkg/siteacc/account/manage" - "github.com/cs3org/reva/pkg/siteacc/account/registration" - "github.com/cs3org/reva/pkg/siteacc/account/settings" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" - "github.com/cs3org/reva/pkg/siteacc/html" + "github.com/cs3org/reva/v2/pkg/siteacc/account/contact" + "github.com/cs3org/reva/v2/pkg/siteacc/account/edit" + "github.com/cs3org/reva/v2/pkg/siteacc/account/login" + "github.com/cs3org/reva/v2/pkg/siteacc/account/manage" + "github.com/cs3org/reva/v2/pkg/siteacc/account/registration" + "github.com/cs3org/reva/v2/pkg/siteacc/account/settings" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/html" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/account/registration/registration.go b/pkg/siteacc/account/registration/registration.go index cbc96dab57..4721c8fbf3 100644 --- a/pkg/siteacc/account/registration/registration.go +++ b/pkg/siteacc/account/registration/registration.go @@ -18,7 +18,7 @@ package registration -import "github.com/cs3org/reva/pkg/siteacc/html" +import "github.com/cs3org/reva/v2/pkg/siteacc/html" // PanelTemplate is the content provider for the registration form. type PanelTemplate struct { diff --git a/pkg/siteacc/account/settings/settings.go b/pkg/siteacc/account/settings/settings.go index f6c17cde30..5d225e2abb 100644 --- a/pkg/siteacc/account/settings/settings.go +++ b/pkg/siteacc/account/settings/settings.go @@ -18,7 +18,7 @@ package settings -import "github.com/cs3org/reva/pkg/siteacc/html" +import "github.com/cs3org/reva/v2/pkg/siteacc/html" // PanelTemplate is the content provider for the edit form. type PanelTemplate struct { diff --git a/pkg/siteacc/admin/panel.go b/pkg/siteacc/admin/panel.go index 7d274d8b76..37dea64746 100644 --- a/pkg/siteacc/admin/panel.go +++ b/pkg/siteacc/admin/panel.go @@ -21,9 +21,9 @@ package admin import ( "net/http" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" - "github.com/cs3org/reva/pkg/siteacc/html" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/html" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/alerting/dispatcher.go b/pkg/siteacc/alerting/dispatcher.go index b8724079a6..0561a33269 100644 --- a/pkg/siteacc/alerting/dispatcher.go +++ b/pkg/siteacc/alerting/dispatcher.go @@ -21,10 +21,10 @@ package alerting import ( "strings" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" - "github.com/cs3org/reva/pkg/siteacc/email" - "github.com/cs3org/reva/pkg/smtpclient" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/email" + "github.com/cs3org/reva/v2/pkg/smtpclient" "github.com/pkg/errors" "github.com/prometheus/alertmanager/template" "github.com/rs/zerolog" diff --git a/pkg/siteacc/config/config.go b/pkg/siteacc/config/config.go index ba746f018d..0fa5ba2335 100644 --- a/pkg/siteacc/config/config.go +++ b/pkg/siteacc/config/config.go @@ -21,7 +21,7 @@ package config import ( "strings" - "github.com/cs3org/reva/pkg/smtpclient" + "github.com/cs3org/reva/v2/pkg/smtpclient" ) // Configuration holds the general service configuration. diff --git a/pkg/siteacc/data/account.go b/pkg/siteacc/data/account.go index 1279ac8bc8..c760148edf 100644 --- a/pkg/siteacc/data/account.go +++ b/pkg/siteacc/data/account.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/cs3org/reva/pkg/siteacc/password" + "github.com/cs3org/reva/v2/pkg/siteacc/password" "github.com/pkg/errors" - "github.com/cs3org/reva/pkg/mentix/key" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/mentix/key" + "github.com/cs3org/reva/v2/pkg/utils" ) // Account represents a single site account. diff --git a/pkg/siteacc/data/filestorage.go b/pkg/siteacc/data/filestorage.go index e7413ac5f6..221f73f022 100644 --- a/pkg/siteacc/data/filestorage.go +++ b/pkg/siteacc/data/filestorage.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/cs3org/reva/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/config" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/data/sites.go b/pkg/siteacc/data/sites.go index adc4654584..e2773de54f 100644 --- a/pkg/siteacc/data/sites.go +++ b/pkg/siteacc/data/sites.go @@ -22,7 +22,7 @@ import ( "encoding/json" "sort" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" "github.com/pkg/errors" ) diff --git a/pkg/siteacc/email/email.go b/pkg/siteacc/email/email.go index 9c73f47307..83eef81375 100644 --- a/pkg/siteacc/email/email.go +++ b/pkg/siteacc/email/email.go @@ -23,9 +23,9 @@ import ( "strings" "text/template" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" - "github.com/cs3org/reva/pkg/smtpclient" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/smtpclient" "github.com/pkg/errors" ) diff --git a/pkg/siteacc/endpoints.go b/pkg/siteacc/endpoints.go index 23fd36197c..22dbdfc65a 100644 --- a/pkg/siteacc/endpoints.go +++ b/pkg/siteacc/endpoints.go @@ -26,11 +26,11 @@ import ( "net/url" "strings" - "github.com/cs3org/reva/pkg/mentix/key" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" - "github.com/cs3org/reva/pkg/siteacc/html" - "github.com/cs3org/reva/pkg/siteacc/manager" + "github.com/cs3org/reva/v2/pkg/mentix/key" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/html" + "github.com/cs3org/reva/v2/pkg/siteacc/manager" "github.com/pkg/errors" "github.com/prometheus/alertmanager/template" ) diff --git a/pkg/siteacc/html/panel.go b/pkg/siteacc/html/panel.go index a70c55aadd..55bf3b4020 100644 --- a/pkg/siteacc/html/panel.go +++ b/pkg/siteacc/html/panel.go @@ -23,8 +23,8 @@ import ( "net/http" "strings" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/html/session.go b/pkg/siteacc/html/session.go index 0f6baf744a..852c524e73 100644 --- a/pkg/siteacc/html/session.go +++ b/pkg/siteacc/html/session.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/cs3org/reva/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/data" "github.com/google/uuid" "github.com/pkg/errors" ) diff --git a/pkg/siteacc/html/sessionmanager.go b/pkg/siteacc/html/sessionmanager.go index 3c9c6d5d18..af6f396cfb 100644 --- a/pkg/siteacc/html/sessionmanager.go +++ b/pkg/siteacc/html/sessionmanager.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/cs3org/reva/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/config" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/manager/acclistener.go b/pkg/siteacc/manager/acclistener.go index 24c1d39110..94fff31698 100644 --- a/pkg/siteacc/manager/acclistener.go +++ b/pkg/siteacc/manager/acclistener.go @@ -18,7 +18,7 @@ package manager -import "github.com/cs3org/reva/pkg/siteacc/data" +import "github.com/cs3org/reva/v2/pkg/siteacc/data" // AccountsListenerCallback is the generic function type for accounts listeners. type AccountsListenerCallback = func(AccountsListener, *data.Account) diff --git a/pkg/siteacc/manager/accmanager.go b/pkg/siteacc/manager/accmanager.go index 4131c7972c..42e9d89e30 100644 --- a/pkg/siteacc/manager/accmanager.go +++ b/pkg/siteacc/manager/accmanager.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/cs3org/reva/pkg/mentix/key" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" - "github.com/cs3org/reva/pkg/siteacc/email" - "github.com/cs3org/reva/pkg/siteacc/manager/gocdb" - "github.com/cs3org/reva/pkg/siteacc/sitereg" - "github.com/cs3org/reva/pkg/smtpclient" + "github.com/cs3org/reva/v2/pkg/mentix/key" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/email" + "github.com/cs3org/reva/v2/pkg/siteacc/manager/gocdb" + "github.com/cs3org/reva/v2/pkg/siteacc/sitereg" + "github.com/cs3org/reva/v2/pkg/smtpclient" "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/sethvargo/go-password/password" diff --git a/pkg/siteacc/manager/gocdb/account.go b/pkg/siteacc/manager/gocdb/account.go index 8b164a4876..e90fa2b530 100644 --- a/pkg/siteacc/manager/gocdb/account.go +++ b/pkg/siteacc/manager/gocdb/account.go @@ -24,8 +24,8 @@ import ( "io/ioutil" "net/http" - "github.com/cs3org/reva/pkg/mentix/utils/network" - "github.com/cs3org/reva/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/siteacc/data" "github.com/pkg/errors" ) diff --git a/pkg/siteacc/manager/gocdb/gocdb.go b/pkg/siteacc/manager/gocdb/gocdb.go index 2aa5e4a9d4..fb7d315435 100644 --- a/pkg/siteacc/manager/gocdb/gocdb.go +++ b/pkg/siteacc/manager/gocdb/gocdb.go @@ -19,8 +19,8 @@ package gocdb import ( - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/data" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/data" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/manager/usersmanager.go b/pkg/siteacc/manager/usersmanager.go index 4f39b3e4bf..b68e16995f 100644 --- a/pkg/siteacc/manager/usersmanager.go +++ b/pkg/siteacc/manager/usersmanager.go @@ -21,8 +21,8 @@ package manager import ( "strings" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/html" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/html" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/siteacc.go b/pkg/siteacc/siteacc.go index a819863e25..abeb6ef4e3 100644 --- a/pkg/siteacc/siteacc.go +++ b/pkg/siteacc/siteacc.go @@ -22,12 +22,12 @@ import ( "fmt" "net/http" - accpanel "github.com/cs3org/reva/pkg/siteacc/account" - "github.com/cs3org/reva/pkg/siteacc/admin" - "github.com/cs3org/reva/pkg/siteacc/alerting" - "github.com/cs3org/reva/pkg/siteacc/config" - "github.com/cs3org/reva/pkg/siteacc/html" - "github.com/cs3org/reva/pkg/siteacc/manager" + accpanel "github.com/cs3org/reva/v2/pkg/siteacc/account" + "github.com/cs3org/reva/v2/pkg/siteacc/admin" + "github.com/cs3org/reva/v2/pkg/siteacc/alerting" + "github.com/cs3org/reva/v2/pkg/siteacc/config" + "github.com/cs3org/reva/v2/pkg/siteacc/html" + "github.com/cs3org/reva/v2/pkg/siteacc/manager" "github.com/pkg/errors" "github.com/rs/zerolog" ) diff --git a/pkg/siteacc/sitereg/sitereg.go b/pkg/siteacc/sitereg/sitereg.go index 685011f18b..388049eeec 100644 --- a/pkg/siteacc/sitereg/sitereg.go +++ b/pkg/siteacc/sitereg/sitereg.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "github.com/cs3org/reva/pkg/mentix/key" - "github.com/cs3org/reva/pkg/mentix/utils/network" + "github.com/cs3org/reva/v2/pkg/mentix/key" + "github.com/cs3org/reva/v2/pkg/mentix/utils/network" ) // UnregisterSite unregister a site using the given site registration endpoint. diff --git a/pkg/storage/favorite/loader/loader.go b/pkg/storage/favorite/loader/loader.go index de90e7223c..424b8fc337 100644 --- a/pkg/storage/favorite/loader/loader.go +++ b/pkg/storage/favorite/loader/loader.go @@ -20,6 +20,6 @@ package loader import ( // Load share cache drivers. - _ "github.com/cs3org/reva/pkg/storage/favorite/memory" + _ "github.com/cs3org/reva/v2/pkg/storage/favorite/memory" // Add your own here ) diff --git a/pkg/storage/favorite/memory/memory.go b/pkg/storage/favorite/memory/memory.go index 3126224432..cda4657683 100644 --- a/pkg/storage/favorite/memory/memory.go +++ b/pkg/storage/favorite/memory/memory.go @@ -24,8 +24,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/pkg/storage/favorite" - "github.com/cs3org/reva/pkg/storage/favorite/registry" + "github.com/cs3org/reva/v2/pkg/storage/favorite" + "github.com/cs3org/reva/v2/pkg/storage/favorite/registry" ) func init() { diff --git a/pkg/storage/favorite/memory/memory_test.go b/pkg/storage/favorite/memory/memory_test.go index 263ed97ce6..5d28eead89 100644 --- a/pkg/storage/favorite/memory/memory_test.go +++ b/pkg/storage/favorite/memory/memory_test.go @@ -25,7 +25,7 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" ) type environment struct { diff --git a/pkg/storage/favorite/registry/registry.go b/pkg/storage/favorite/registry/registry.go index c5e0befa24..a92ee49b80 100644 --- a/pkg/storage/favorite/registry/registry.go +++ b/pkg/storage/favorite/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/storage/favorite" +import "github.com/cs3org/reva/v2/pkg/storage/favorite" // NewFunc is the function that favorite storage implementations // should register at init time. diff --git a/pkg/storage/fs/cephfs/cephfs.go b/pkg/storage/fs/cephfs/cephfs.go index e71db2df75..0d907fb8f9 100644 --- a/pkg/storage/fs/cephfs/cephfs.go +++ b/pkg/storage/fs/cephfs/cephfs.go @@ -33,10 +33,10 @@ import ( cephfs2 "github.com/ceph/go-ceph/cephfs" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/cephfs/connections.go b/pkg/storage/fs/cephfs/connections.go index 7b928eaa63..7819894f15 100644 --- a/pkg/storage/fs/cephfs/connections.go +++ b/pkg/storage/fs/cephfs/connections.go @@ -31,7 +31,7 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/pkg/errors" cephfs2 "github.com/ceph/go-ceph/cephfs" diff --git a/pkg/storage/fs/cephfs/errors.go b/pkg/storage/fs/cephfs/errors.go index a4ab013c97..2c4564613c 100644 --- a/pkg/storage/fs/cephfs/errors.go +++ b/pkg/storage/fs/cephfs/errors.go @@ -30,7 +30,7 @@ import "C" import ( "fmt" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) func wrapErrorMsg(code C.int) string { diff --git a/pkg/storage/fs/cephfs/options.go b/pkg/storage/fs/cephfs/options.go index 0b4b81f0e6..cd949d36fb 100644 --- a/pkg/storage/fs/cephfs/options.go +++ b/pkg/storage/fs/cephfs/options.go @@ -24,7 +24,7 @@ package cephfs import ( "path/filepath" - "github.com/cs3org/reva/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/sharedconf" ) // Options for the cephfs module diff --git a/pkg/storage/fs/cephfs/unsupported.go b/pkg/storage/fs/cephfs/unsupported.go index a337f3f789..a409351b14 100644 --- a/pkg/storage/fs/cephfs/unsupported.go +++ b/pkg/storage/fs/cephfs/unsupported.go @@ -24,8 +24,8 @@ package cephfs import ( "github.com/pkg/errors" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" ) func init() { diff --git a/pkg/storage/fs/cephfs/upload.go b/pkg/storage/fs/cephfs/upload.go index 2d8eccf7c9..87ff95f2b2 100644 --- a/pkg/storage/fs/cephfs/upload.go +++ b/pkg/storage/fs/cephfs/upload.go @@ -32,10 +32,10 @@ import ( cephfs2 "github.com/ceph/go-ceph/cephfs" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctx2 "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctx2 "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" "github.com/pkg/errors" tusd "github.com/tus/tusd/pkg/handler" diff --git a/pkg/storage/fs/cephfs/user.go b/pkg/storage/fs/cephfs/user.go index e99686adfd..29e94860b1 100644 --- a/pkg/storage/fs/cephfs/user.go +++ b/pkg/storage/fs/cephfs/user.go @@ -29,15 +29,15 @@ import ( "strings" "syscall" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" cephfs2 "github.com/ceph/go-ceph/cephfs" 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" - ctx2 "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/storage/utils/templates" + ctx2 "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/eos/eos.go b/pkg/storage/fs/eos/eos.go index 1be32bab77..96169cc9ad 100644 --- a/pkg/storage/fs/eos/eos.go +++ b/pkg/storage/fs/eos/eos.go @@ -19,9 +19,9 @@ package eos import ( - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/eosfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/eosfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/eosgrpc/eosgrpc.go b/pkg/storage/fs/eosgrpc/eosgrpc.go index b47889bec6..bfb1aa0c8f 100644 --- a/pkg/storage/fs/eosgrpc/eosgrpc.go +++ b/pkg/storage/fs/eosgrpc/eosgrpc.go @@ -19,9 +19,9 @@ package eosgrpc import ( - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/eosfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/eosfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/eosgrpchome/eosgrpchome.go b/pkg/storage/fs/eosgrpchome/eosgrpchome.go index 245fdfe5da..c85308b149 100644 --- a/pkg/storage/fs/eosgrpchome/eosgrpchome.go +++ b/pkg/storage/fs/eosgrpchome/eosgrpchome.go @@ -19,9 +19,9 @@ package eosgrpchome import ( - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/eosfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/eosfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/eoshome/eoshome.go b/pkg/storage/fs/eoshome/eoshome.go index 69ab5b0f63..435971becf 100644 --- a/pkg/storage/fs/eoshome/eoshome.go +++ b/pkg/storage/fs/eoshome/eoshome.go @@ -19,9 +19,9 @@ package eoshome import ( - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/eosfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/eosfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/loader/loader.go b/pkg/storage/fs/loader/loader.go index 977c27532f..d79e58eb3c 100644 --- a/pkg/storage/fs/loader/loader.go +++ b/pkg/storage/fs/loader/loader.go @@ -20,17 +20,17 @@ package loader import ( // Load core storage filesystem backends. - _ "github.com/cs3org/reva/pkg/storage/fs/cephfs" - _ "github.com/cs3org/reva/pkg/storage/fs/eos" - _ "github.com/cs3org/reva/pkg/storage/fs/eosgrpc" - _ "github.com/cs3org/reva/pkg/storage/fs/eosgrpchome" - _ "github.com/cs3org/reva/pkg/storage/fs/eoshome" - _ "github.com/cs3org/reva/pkg/storage/fs/local" - _ "github.com/cs3org/reva/pkg/storage/fs/localhome" - _ "github.com/cs3org/reva/pkg/storage/fs/nextcloud" - _ "github.com/cs3org/reva/pkg/storage/fs/ocis" - _ "github.com/cs3org/reva/pkg/storage/fs/owncloudsql" - _ "github.com/cs3org/reva/pkg/storage/fs/s3" - _ "github.com/cs3org/reva/pkg/storage/fs/s3ng" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/cephfs" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/eos" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/eosgrpc" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/eosgrpchome" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/eoshome" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/local" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/localhome" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/nextcloud" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/ocis" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/owncloudsql" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/s3" + _ "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng" // Add your own here ) diff --git a/pkg/storage/fs/local/local.go b/pkg/storage/fs/local/local.go index ba0f566ecf..24d5d1e175 100644 --- a/pkg/storage/fs/local/local.go +++ b/pkg/storage/fs/local/local.go @@ -19,9 +19,9 @@ package local import ( - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/localfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/localfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/localhome/localhome.go b/pkg/storage/fs/localhome/localhome.go index c50b4faae7..ad56727806 100644 --- a/pkg/storage/fs/localhome/localhome.go +++ b/pkg/storage/fs/localhome/localhome.go @@ -19,9 +19,9 @@ package localhome import ( - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/localfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/localfs" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/nextcloud/nextcloud.go b/pkg/storage/fs/nextcloud/nextcloud.go index 8f38342de1..9ac08e4c94 100644 --- a/pkg/storage/fs/nextcloud/nextcloud.go +++ b/pkg/storage/fs/nextcloud/nextcloud.go @@ -29,11 +29,11 @@ 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/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/nextcloud/nextcloud_test.go b/pkg/storage/fs/nextcloud/nextcloud_test.go index 21c54de795..54b045ccbc 100644 --- a/pkg/storage/fs/nextcloud/nextcloud_test.go +++ b/pkg/storage/fs/nextcloud/nextcloud_test.go @@ -32,10 +32,10 @@ import ( userpb "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" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage/fs/nextcloud" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/auth/scope" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage/fs/nextcloud" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/fs/ocis/blobstore/blobstore_test.go b/pkg/storage/fs/ocis/blobstore/blobstore_test.go index fb159dfba5..24d4f90838 100644 --- a/pkg/storage/fs/ocis/blobstore/blobstore_test.go +++ b/pkg/storage/fs/ocis/blobstore/blobstore_test.go @@ -24,8 +24,8 @@ import ( "os" "path" - "github.com/cs3org/reva/pkg/storage/fs/ocis/blobstore" - "github.com/cs3org/reva/tests/helpers" + "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" + "github.com/cs3org/reva/v2/tests/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/fs/ocis/ocis.go b/pkg/storage/fs/ocis/ocis.go index bbce1e30e2..2d22309df2 100644 --- a/pkg/storage/fs/ocis/ocis.go +++ b/pkg/storage/fs/ocis/ocis.go @@ -21,11 +21,11 @@ package ocis import ( "path" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/ocis/blobstore" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/options" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options" ) func init() { diff --git a/pkg/storage/fs/ocis/ocis_test.go b/pkg/storage/fs/ocis/ocis_test.go index b8d1e049a8..ea20389af0 100644 --- a/pkg/storage/fs/ocis/ocis_test.go +++ b/pkg/storage/fs/ocis/ocis_test.go @@ -21,8 +21,8 @@ package ocis_test import ( "os" - "github.com/cs3org/reva/pkg/storage/fs/ocis" - "github.com/cs3org/reva/tests/helpers" + "github.com/cs3org/reva/v2/pkg/storage/fs/ocis" + "github.com/cs3org/reva/v2/tests/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/fs/owncloudsql/filecache/filecache.go b/pkg/storage/fs/owncloudsql/filecache/filecache.go index 49cb044c8e..14d9dac172 100644 --- a/pkg/storage/fs/owncloudsql/filecache/filecache.go +++ b/pkg/storage/fs/owncloudsql/filecache/filecache.go @@ -30,7 +30,7 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - conversions "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" + conversions "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/pkg/storage/fs/owncloudsql/filecache/filecache_test.go b/pkg/storage/fs/owncloudsql/filecache/filecache_test.go index 5c336ca5c2..df0eaee230 100644 --- a/pkg/storage/fs/owncloudsql/filecache/filecache_test.go +++ b/pkg/storage/fs/owncloudsql/filecache/filecache_test.go @@ -26,7 +26,7 @@ import ( _ "github.com/mattn/go-sqlite3" - "github.com/cs3org/reva/pkg/storage/fs/owncloudsql/filecache" + "github.com/cs3org/reva/v2/pkg/storage/fs/owncloudsql/filecache" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/fs/owncloudsql/owncloudsql.go b/pkg/storage/fs/owncloudsql/owncloudsql.go index a75c1a747d..5e7b645d6d 100644 --- a/pkg/storage/fs/owncloudsql/owncloudsql.go +++ b/pkg/storage/fs/owncloudsql/owncloudsql.go @@ -40,20 +40,20 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/internal/grpc/services/storageprovider" - conversions "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/owncloudsql/filecache" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + conversions "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/owncloudsql/filecache" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/pkg/xattr" diff --git a/pkg/storage/fs/owncloudsql/owncloudsql_unix.go b/pkg/storage/fs/owncloudsql/owncloudsql_unix.go index 95ef01cab2..6a4ca35c76 100755 --- a/pkg/storage/fs/owncloudsql/owncloudsql_unix.go +++ b/pkg/storage/fs/owncloudsql/owncloudsql_unix.go @@ -31,7 +31,7 @@ import ( "syscall" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" ) // TODO(jfd) get rid of the differences between unix and windows. the inode and dev should never be used for the etag because it interferes with backups diff --git a/pkg/storage/fs/owncloudsql/owncloudsql_windows.go b/pkg/storage/fs/owncloudsql/owncloudsql_windows.go index 679c9e77d0..9f4dd0ad17 100644 --- a/pkg/storage/fs/owncloudsql/owncloudsql_windows.go +++ b/pkg/storage/fs/owncloudsql/owncloudsql_windows.go @@ -30,7 +30,7 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "golang.org/x/sys/windows" ) diff --git a/pkg/storage/fs/owncloudsql/spaces.go b/pkg/storage/fs/owncloudsql/spaces.go index f58d6e0ae1..33669a3162 100644 --- a/pkg/storage/fs/owncloudsql/spaces.go +++ b/pkg/storage/fs/owncloudsql/spaces.go @@ -27,10 +27,10 @@ import ( userpb "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" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/fs/owncloudsql/filecache" - "github.com/cs3org/reva/pkg/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/fs/owncloudsql/filecache" + "github.com/cs3org/reva/v2/pkg/utils" ) // ListStorageSpaces lists storage spaces according to the provided filters diff --git a/pkg/storage/fs/owncloudsql/upload.go b/pkg/storage/fs/owncloudsql/upload.go index cb03dcca00..bece39e4d5 100644 --- a/pkg/storage/fs/owncloudsql/upload.go +++ b/pkg/storage/fs/owncloudsql/upload.go @@ -30,14 +30,14 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - conversions "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/storage/utils/templates" + conversions "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/pkg/storage/fs/registry/registry.go b/pkg/storage/fs/registry/registry.go index e9aa41100b..a263fd9629 100644 --- a/pkg/storage/fs/registry/registry.go +++ b/pkg/storage/fs/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/storage" +import "github.com/cs3org/reva/v2/pkg/storage" // NewFunc is the function that storage implementations // should register at init time. diff --git a/pkg/storage/fs/s3/s3.go b/pkg/storage/fs/s3/s3.go index e624e28561..dbf4eeaa0b 100644 --- a/pkg/storage/fs/s3/s3.go +++ b/pkg/storage/fs/s3/s3.go @@ -36,11 +36,11 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" ) diff --git a/pkg/storage/fs/s3/upload.go b/pkg/storage/fs/s3/upload.go index aa63eead0f..40d9e690df 100644 --- a/pkg/storage/fs/s3/upload.go +++ b/pkg/storage/fs/s3/upload.go @@ -22,7 +22,7 @@ import ( "context" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) // InitiateUpload returns upload ids corresponding to different protocols it supports diff --git a/pkg/storage/fs/s3ng/option_test.go b/pkg/storage/fs/s3ng/option_test.go index d881baa6e9..dcdb563303 100644 --- a/pkg/storage/fs/s3ng/option_test.go +++ b/pkg/storage/fs/s3ng/option_test.go @@ -21,7 +21,7 @@ package s3ng_test import ( "github.com/mitchellh/mapstructure" - "github.com/cs3org/reva/pkg/storage/fs/s3ng" + "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/fs/s3ng/s3ng.go b/pkg/storage/fs/s3ng/s3ng.go index 30bc250ff7..e88e5a6ffb 100644 --- a/pkg/storage/fs/s3ng/s3ng.go +++ b/pkg/storage/fs/s3ng/s3ng.go @@ -21,10 +21,10 @@ package s3ng import ( "fmt" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/registry" - "github.com/cs3org/reva/pkg/storage/fs/s3ng/blobstore" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/registry" + "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs" ) func init() { diff --git a/pkg/storage/fs/s3ng/s3ng_test.go b/pkg/storage/fs/s3ng/s3ng_test.go index fc7cadc7e7..732193723b 100644 --- a/pkg/storage/fs/s3ng/s3ng_test.go +++ b/pkg/storage/fs/s3ng/s3ng_test.go @@ -21,8 +21,8 @@ package s3ng_test import ( "os" - "github.com/cs3org/reva/pkg/storage/fs/s3ng" - "github.com/cs3org/reva/tests/helpers" + "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng" + "github.com/cs3org/reva/v2/tests/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/registry/loader/loader.go b/pkg/storage/registry/loader/loader.go index 8df62b2c3a..6a6e40680c 100644 --- a/pkg/storage/registry/loader/loader.go +++ b/pkg/storage/registry/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core storage broker drivers. - _ "github.com/cs3org/reva/pkg/storage/registry/spaces" - _ "github.com/cs3org/reva/pkg/storage/registry/static" + _ "github.com/cs3org/reva/v2/pkg/storage/registry/spaces" + _ "github.com/cs3org/reva/v2/pkg/storage/registry/static" // Add your own here ) diff --git a/pkg/storage/registry/registry/registry.go b/pkg/storage/registry/registry/registry.go index 4ee886751b..02bb3f46c0 100644 --- a/pkg/storage/registry/registry/registry.go +++ b/pkg/storage/registry/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/storage" +import "github.com/cs3org/reva/v2/pkg/storage" // NewFunc is the function that storage broker implementations // should register at init time. diff --git a/pkg/storage/registry/spaces/spaces.go b/pkg/storage/registry/spaces/spaces.go index 9b5eca2945..bfff5d7604 100644 --- a/pkg/storage/registry/spaces/spaces.go +++ b/pkg/storage/registry/spaces/spaces.go @@ -33,14 +33,14 @@ import ( providerpb "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registrypb "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/storage" - pkgregistry "github.com/cs3org/reva/pkg/storage/registry/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storage" + pkgregistry "github.com/cs3org/reva/v2/pkg/storage/registry/registry" "github.com/mitchellh/mapstructure" "google.golang.org/grpc" ) diff --git a/pkg/storage/registry/spaces/spaces_test.go b/pkg/storage/registry/spaces/spaces_test.go index 0c7f98e701..bb869849d3 100644 --- a/pkg/storage/registry/spaces/spaces_test.go +++ b/pkg/storage/registry/spaces/spaces_test.go @@ -26,10 +26,10 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/registry/spaces" - "github.com/cs3org/reva/pkg/storage/registry/spaces/mocks" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/registry/spaces" + "github.com/cs3org/reva/v2/pkg/storage/registry/spaces/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" diff --git a/pkg/storage/registry/static/static.go b/pkg/storage/registry/static/static.go index a898e2503b..679fb064b1 100644 --- a/pkg/storage/registry/static/static.go +++ b/pkg/storage/registry/static/static.go @@ -28,12 +28,12 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registrypb "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/registry/registry" - "github.com/cs3org/reva/pkg/storage/utils/templates" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/registry/registry" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/mitchellh/mapstructure" ) diff --git a/pkg/storage/registry/static/static_test.go b/pkg/storage/registry/static/static_test.go index 3fb7deab04..175b0cf2f7 100644 --- a/pkg/storage/registry/static/static_test.go +++ b/pkg/storage/registry/static/static_test.go @@ -24,8 +24,8 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" registrypb "github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage/registry/static" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage/registry/static" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/utils/ace/ace_test.go b/pkg/storage/utils/ace/ace_test.go index a5340ca1b7..11d9070a0c 100644 --- a/pkg/storage/utils/ace/ace_test.go +++ b/pkg/storage/utils/ace/ace_test.go @@ -24,7 +24,7 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/ace" + "github.com/cs3org/reva/v2/pkg/storage/utils/ace" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go index f474e1429e..ff893d2c30 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs.go @@ -37,21 +37,21 @@ import ( cs3permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/options" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/storage/utils/templates" - rtrace "github.com/cs3org/reva/pkg/trace" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "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/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" + rtrace "github.com/cs3org/reva/v2/pkg/trace" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" "go.opentelemetry.io/otel/codes" "google.golang.org/grpc" diff --git a/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go b/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go index 9f9e7b8535..14c3499224 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs_concurrency_test.go @@ -25,10 +25,10 @@ import ( "sync" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - testhelpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" + testhelpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" "github.com/stretchr/testify/mock" - "github.com/cs3org/reva/tests/helpers" + "github.com/cs3org/reva/v2/tests/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/storage/utils/decomposedfs/decomposedfs_test.go b/pkg/storage/utils/decomposedfs/decomposedfs_test.go index b0cd93d824..63dd901be6 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs_test.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/mock" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" - treemocks "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree/mocks" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" + treemocks "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/utils/decomposedfs/grants.go b/pkg/storage/utils/decomposedfs/grants.go index f80a0d0344..c0b76b1533 100644 --- a/pkg/storage/utils/decomposedfs/grants.go +++ b/pkg/storage/utils/decomposedfs/grants.go @@ -24,12 +24,12 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/ace" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/ace" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/xattr" ) diff --git a/pkg/storage/utils/decomposedfs/grants_test.go b/pkg/storage/utils/decomposedfs/grants_test.go index b77bb49985..980470e449 100644 --- a/pkg/storage/utils/decomposedfs/grants_test.go +++ b/pkg/storage/utils/decomposedfs/grants_test.go @@ -25,8 +25,8 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/pkg/xattr" diff --git a/pkg/storage/utils/decomposedfs/lookup/lookup.go b/pkg/storage/utils/decomposedfs/lookup/lookup.go index 38032a1acd..c233d7f36f 100644 --- a/pkg/storage/utils/decomposedfs/lookup/lookup.go +++ b/pkg/storage/utils/decomposedfs/lookup/lookup.go @@ -25,11 +25,11 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/options" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "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/xattrs" ) // Lookup implements transformations from filepath to node and back diff --git a/pkg/storage/utils/decomposedfs/lookup/lookup_test.go b/pkg/storage/utils/decomposedfs/lookup/lookup_test.go index 4faf6f58ac..6598d7c283 100644 --- a/pkg/storage/utils/decomposedfs/lookup/lookup_test.go +++ b/pkg/storage/utils/decomposedfs/lookup/lookup_test.go @@ -20,8 +20,8 @@ package lookup_test import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/storage/utils/decomposedfs/metadata.go b/pkg/storage/utils/decomposedfs/metadata.go index c7b7edaf0c..39721f4cdc 100644 --- a/pkg/storage/utils/decomposedfs/metadata.go +++ b/pkg/storage/utils/decomposedfs/metadata.go @@ -25,12 +25,12 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" "github.com/pkg/xattr" ) diff --git a/pkg/storage/utils/decomposedfs/mocks/PermissionsChecker.go b/pkg/storage/utils/decomposedfs/mocks/PermissionsChecker.go index bff1d67cce..d04d940de8 100644 --- a/pkg/storage/utils/decomposedfs/mocks/PermissionsChecker.go +++ b/pkg/storage/utils/decomposedfs/mocks/PermissionsChecker.go @@ -23,7 +23,7 @@ package mocks import ( context "context" - node "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" + node "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" mock "github.com/stretchr/testify/mock" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" diff --git a/pkg/storage/utils/decomposedfs/mocks/Tree.go b/pkg/storage/utils/decomposedfs/mocks/Tree.go index 8fe655b985..61bbab61de 100644 --- a/pkg/storage/utils/decomposedfs/mocks/Tree.go +++ b/pkg/storage/utils/decomposedfs/mocks/Tree.go @@ -26,7 +26,7 @@ import ( mock "github.com/stretchr/testify/mock" - node "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" + node "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" os "os" diff --git a/pkg/storage/utils/decomposedfs/node/locks.go b/pkg/storage/utils/decomposedfs/node/locks.go index afb0443e72..9caadc508d 100644 --- a/pkg/storage/utils/decomposedfs/node/locks.go +++ b/pkg/storage/utils/decomposedfs/node/locks.go @@ -27,11 +27,11 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/filelocks" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/filelocks" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/decomposedfs/node/locks_test.go b/pkg/storage/utils/decomposedfs/node/locks_test.go index 5cd4dd0ad5..ec6ab2d5b3 100644 --- a/pkg/storage/utils/decomposedfs/node/locks_test.go +++ b/pkg/storage/utils/decomposedfs/node/locks_test.go @@ -28,9 +28,9 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" ) var _ = Describe("Node locks", func() { diff --git a/pkg/storage/utils/decomposedfs/node/node.go b/pkg/storage/utils/decomposedfs/node/node.go index f5febee408..8924d76378 100644 --- a/pkg/storage/utils/decomposedfs/node/node.go +++ b/pkg/storage/utils/decomposedfs/node/node.go @@ -36,14 +36,14 @@ import ( userpb "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" - "github.com/cs3org/reva/internal/grpc/services/storageprovider" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/storage/utils/ace" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/internal/grpc/services/storageprovider" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/storage/utils/ace" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" "github.com/pkg/errors" "github.com/pkg/xattr" diff --git a/pkg/storage/utils/decomposedfs/node/node_test.go b/pkg/storage/utils/decomposedfs/node/node_test.go index 5b1582f5be..0f58a451d3 100644 --- a/pkg/storage/utils/decomposedfs/node/node_test.go +++ b/pkg/storage/utils/decomposedfs/node/node_test.go @@ -23,8 +23,8 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/utils/decomposedfs/node/permissions.go b/pkg/storage/utils/decomposedfs/node/permissions.go index fdc31e8054..618f23f274 100644 --- a/pkg/storage/utils/decomposedfs/node/permissions.go +++ b/pkg/storage/utils/decomposedfs/node/permissions.go @@ -24,10 +24,10 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/decomposedfs/options/options_test.go b/pkg/storage/utils/decomposedfs/options/options_test.go index 0ff86610f2..5fbeca6c3f 100644 --- a/pkg/storage/utils/decomposedfs/options/options_test.go +++ b/pkg/storage/utils/decomposedfs/options/options_test.go @@ -19,7 +19,7 @@ package options_test import ( - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/options" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/options" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/storage/utils/decomposedfs/recycle.go b/pkg/storage/utils/decomposedfs/recycle.go index fbf5b093b7..e1442e3c73 100644 --- a/pkg/storage/utils/decomposedfs/recycle.go +++ b/pkg/storage/utils/decomposedfs/recycle.go @@ -28,11 +28,11 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" "github.com/pkg/errors" "github.com/pkg/xattr" ) diff --git a/pkg/storage/utils/decomposedfs/recycle_test.go b/pkg/storage/utils/decomposedfs/recycle_test.go index e341ee89ee..6fdcec20e1 100644 --- a/pkg/storage/utils/decomposedfs/recycle_test.go +++ b/pkg/storage/utils/decomposedfs/recycle_test.go @@ -23,9 +23,9 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/mocks" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/stretchr/testify/mock" diff --git a/pkg/storage/utils/decomposedfs/revisions.go b/pkg/storage/utils/decomposedfs/revisions.go index 91cf568e06..b95427b58d 100644 --- a/pkg/storage/utils/decomposedfs/revisions.go +++ b/pkg/storage/utils/decomposedfs/revisions.go @@ -28,9 +28,9 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/decomposedfs/spaces.go b/pkg/storage/utils/decomposedfs/spaces.go index 6dcc3cc0bb..25396ffb11 100644 --- a/pkg/storage/utils/decomposedfs/spaces.go +++ b/pkg/storage/utils/decomposedfs/spaces.go @@ -34,16 +34,16 @@ import ( v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ocsconv "github.com/cs3org/reva/internal/http/services/owncloud/ocs/conversions" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + ocsconv "github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/conversions" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/google/uuid" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/decomposedfs/testhelpers/helpers.go b/pkg/storage/utils/decomposedfs/testhelpers/helpers.go index 25ce44889c..8b2c5fbec2 100644 --- a/pkg/storage/utils/decomposedfs/testhelpers/helpers.go +++ b/pkg/storage/utils/decomposedfs/testhelpers/helpers.go @@ -23,8 +23,8 @@ import ( "os" "path/filepath" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" "github.com/google/uuid" "github.com/pkg/xattr" "github.com/stretchr/testify/mock" @@ -33,15 +33,15 @@ import ( cs3permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ruser "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/mocks" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/options" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree" - treemocks "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree/mocks" - "github.com/cs3org/reva/tests/helpers" + ruser "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks" + "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" + treemocks "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/mocks" + "github.com/cs3org/reva/v2/tests/helpers" ) // TestEnv represents a test environment for unit tests diff --git a/pkg/storage/utils/decomposedfs/tree/tree.go b/pkg/storage/utils/decomposedfs/tree/tree.go index a7f57c9266..55bcd26d14 100644 --- a/pkg/storage/utils/decomposedfs/tree/tree.go +++ b/pkg/storage/utils/decomposedfs/tree/tree.go @@ -30,13 +30,13 @@ import ( "time" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog/log" diff --git a/pkg/storage/utils/decomposedfs/tree/tree_test.go b/pkg/storage/utils/decomposedfs/tree/tree_test.go index 72e61dcdac..896126cd1c 100644 --- a/pkg/storage/utils/decomposedfs/tree/tree_test.go +++ b/pkg/storage/utils/decomposedfs/tree/tree_test.go @@ -23,11 +23,11 @@ import ( "path" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + helpers "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/testhelpers" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" "github.com/google/uuid" "github.com/pkg/xattr" "github.com/stretchr/testify/mock" diff --git a/pkg/storage/utils/decomposedfs/upload.go b/pkg/storage/utils/decomposedfs/upload.go index a1d5a2f7a6..a35cf67097 100644 --- a/pkg/storage/utils/decomposedfs/upload.go +++ b/pkg/storage/utils/decomposedfs/upload.go @@ -37,15 +37,15 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/logger" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/logger" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/node" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/pkg/storage/utils/decomposedfs/upload_test.go b/pkg/storage/utils/decomposedfs/upload_test.go index 70735e5052..47aeff3edd 100644 --- a/pkg/storage/utils/decomposedfs/upload_test.go +++ b/pkg/storage/utils/decomposedfs/upload_test.go @@ -29,18 +29,18 @@ import ( cs3permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ruser "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/lookup" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/mocks" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/options" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree" - treemocks "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/tree/mocks" - "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/xattrs" - "github.com/cs3org/reva/tests/helpers" + ruser "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/lookup" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/mocks" + "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" + treemocks "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/mocks" + "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/xattrs" + "github.com/cs3org/reva/v2/tests/helpers" "github.com/pkg/xattr" "github.com/stretchr/testify/mock" diff --git a/pkg/storage/utils/decomposedfs/xattrs/xattrs.go b/pkg/storage/utils/decomposedfs/xattrs/xattrs.go index 36f5a506c9..65dd18ad9e 100644 --- a/pkg/storage/utils/decomposedfs/xattrs/xattrs.go +++ b/pkg/storage/utils/decomposedfs/xattrs/xattrs.go @@ -23,7 +23,7 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/filelocks" + "github.com/cs3org/reva/v2/pkg/storage/utils/filelocks" "github.com/gofrs/flock" "github.com/pkg/errors" "github.com/pkg/xattr" diff --git a/pkg/storage/utils/downloader/downloader.go b/pkg/storage/utils/downloader/downloader.go index 85d57055d7..a3795082eb 100644 --- a/pkg/storage/utils/downloader/downloader.go +++ b/pkg/storage/utils/downloader/downloader.go @@ -27,9 +27,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" - "github.com/cs3org/reva/internal/http/services/datagateway" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rhttp" + "github.com/cs3org/reva/v2/internal/http/services/datagateway" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rhttp" ) // Downloader is the interface implemented by the objects that are able to diff --git a/pkg/storage/utils/downloader/mock/downloader_mock.go b/pkg/storage/utils/downloader/mock/downloader_mock.go index 11eb9acef3..33468fe757 100644 --- a/pkg/storage/utils/downloader/mock/downloader_mock.go +++ b/pkg/storage/utils/downloader/mock/downloader_mock.go @@ -24,7 +24,7 @@ import ( "io" "os" - "github.com/cs3org/reva/pkg/storage/utils/downloader" + "github.com/cs3org/reva/v2/pkg/storage/utils/downloader" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" ) diff --git a/pkg/storage/utils/eosfs/eosfs.go b/pkg/storage/utils/eosfs/eosfs.go index 9fbb6c9f1b..9437b043fb 100644 --- a/pkg/storage/utils/eosfs/eosfs.go +++ b/pkg/storage/utils/eosfs/eosfs.go @@ -38,21 +38,21 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/eosclient" - "github.com/cs3org/reva/pkg/eosclient/eosbinary" - "github.com/cs3org/reva/pkg/eosclient/eosgrpc" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/utils/acl" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/storage/utils/grants" - "github.com/cs3org/reva/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/eosclient" + "github.com/cs3org/reva/v2/pkg/eosclient/eosbinary" + "github.com/cs3org/reva/v2/pkg/eosclient/eosgrpc" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/utils/acl" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/storage/utils/grants" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/eosfs/eosfs_test.go b/pkg/storage/utils/eosfs/eosfs_test.go index 6b433aaaf3..05acda34e4 100644 --- a/pkg/storage/utils/eosfs/eosfs_test.go +++ b/pkg/storage/utils/eosfs/eosfs_test.go @@ -30,8 +30,8 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/eosclient" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/eosclient" "github.com/gdexlab/go-render/render" "github.com/thanhpk/randstr" ) diff --git a/pkg/storage/utils/eosfs/upload.go b/pkg/storage/utils/eosfs/upload.go index a1c6d61a14..2d8e27b483 100644 --- a/pkg/storage/utils/eosfs/upload.go +++ b/pkg/storage/utils/eosfs/upload.go @@ -24,8 +24,8 @@ import ( "os" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/grants/grants.go b/pkg/storage/utils/grants/grants.go index 72dbdc31db..1d32550cbd 100644 --- a/pkg/storage/utils/grants/grants.go +++ b/pkg/storage/utils/grants/grants.go @@ -23,7 +23,7 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/acl" + "github.com/cs3org/reva/v2/pkg/storage/utils/acl" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/storage/utils/indexer/errors/errors.go b/pkg/storage/utils/indexer/errors/errors.go index 07d6a9255a..91cc3b78b9 100644 --- a/pkg/storage/utils/indexer/errors/errors.go +++ b/pkg/storage/utils/indexer/errors/errors.go @@ -21,7 +21,7 @@ package errors import ( "fmt" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" ) // AlreadyExistsErr implements the Error interface. diff --git a/pkg/storage/utils/indexer/index/autoincrement.go b/pkg/storage/utils/indexer/index/autoincrement.go index 3c58ed25e0..b02dc3df79 100644 --- a/pkg/storage/utils/indexer/index/autoincrement.go +++ b/pkg/storage/utils/indexer/index/autoincrement.go @@ -27,9 +27,9 @@ import ( "strconv" "strings" - idxerrs "github.com/cs3org/reva/pkg/storage/utils/indexer/errors" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - metadata "github.com/cs3org/reva/pkg/storage/utils/metadata" + idxerrs "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/errors" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + metadata "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" ) // Autoincrement are fields for an index of type autoincrement. diff --git a/pkg/storage/utils/indexer/index/autoincrement_test.go b/pkg/storage/utils/indexer/index/autoincrement_test.go index fb0aafbfa4..bfd55009ed 100644 --- a/pkg/storage/utils/indexer/index/autoincrement_test.go +++ b/pkg/storage/utils/indexer/index/autoincrement_test.go @@ -24,9 +24,9 @@ import ( "path/filepath" "testing" - "github.com/cs3org/reva/pkg/storage/utils/indexer/index" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - metadata "github.com/cs3org/reva/pkg/storage/utils/metadata" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/index" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + metadata "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/utils/indexer/index/index.go b/pkg/storage/utils/indexer/index/index.go index 1af6fbff72..6b593ff97f 100644 --- a/pkg/storage/utils/indexer/index/index.go +++ b/pkg/storage/utils/indexer/index/index.go @@ -18,7 +18,7 @@ package index -import "github.com/cs3org/reva/pkg/storage/utils/indexer/option" +import "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" // Index can be implemented to create new indexer-strategies. See Unique for example. // Each indexer implementation is bound to one data-column (IndexBy) and a data-type (TypeName) diff --git a/pkg/storage/utils/indexer/index/non_unique.go b/pkg/storage/utils/indexer/index/non_unique.go index 8c88f3cdfc..f4b24007ac 100644 --- a/pkg/storage/utils/indexer/index/non_unique.go +++ b/pkg/storage/utils/indexer/index/non_unique.go @@ -25,9 +25,9 @@ import ( "path/filepath" "strings" - idxerrs "github.com/cs3org/reva/pkg/storage/utils/indexer/errors" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - metadata "github.com/cs3org/reva/pkg/storage/utils/metadata" + idxerrs "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/errors" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + metadata "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" ) // NonUnique are fields for an index of type non_unique. diff --git a/pkg/storage/utils/indexer/index/non_unique_test.go b/pkg/storage/utils/indexer/index/non_unique_test.go index b9dac61142..7d3ebefd8f 100644 --- a/pkg/storage/utils/indexer/index/non_unique_test.go +++ b/pkg/storage/utils/indexer/index/non_unique_test.go @@ -24,11 +24,11 @@ import ( "path" "testing" - "github.com/cs3org/reva/pkg/storage/utils/indexer/errors" - "github.com/cs3org/reva/pkg/storage/utils/indexer/index" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - . "github.com/cs3org/reva/pkg/storage/utils/indexer/test" - "github.com/cs3org/reva/pkg/storage/utils/metadata" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/errors" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/index" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + . "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/test" + "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/utils/indexer/index/unique.go b/pkg/storage/utils/indexer/index/unique.go index 40f0f0014e..fccf092f3a 100644 --- a/pkg/storage/utils/indexer/index/unique.go +++ b/pkg/storage/utils/indexer/index/unique.go @@ -25,9 +25,9 @@ import ( "path/filepath" "strings" - idxerrs "github.com/cs3org/reva/pkg/storage/utils/indexer/errors" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - metadata "github.com/cs3org/reva/pkg/storage/utils/metadata" + idxerrs "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/errors" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + metadata "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" ) // Unique are fields for an index of type unique. diff --git a/pkg/storage/utils/indexer/index/unique_test.go b/pkg/storage/utils/indexer/index/unique_test.go index 1677d0d0cb..1110274b5f 100644 --- a/pkg/storage/utils/indexer/index/unique_test.go +++ b/pkg/storage/utils/indexer/index/unique_test.go @@ -23,11 +23,11 @@ import ( "path" "testing" - "github.com/cs3org/reva/pkg/storage/utils/indexer/errors" - "github.com/cs3org/reva/pkg/storage/utils/indexer/index" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - . "github.com/cs3org/reva/pkg/storage/utils/indexer/test" - "github.com/cs3org/reva/pkg/storage/utils/metadata" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/errors" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/index" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + . "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/test" + "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/utils/indexer/indexer.go b/pkg/storage/utils/indexer/indexer.go index 3e136696ab..5ae1e2dfe3 100644 --- a/pkg/storage/utils/indexer/indexer.go +++ b/pkg/storage/utils/indexer/indexer.go @@ -29,11 +29,11 @@ import ( "github.com/CiscoM31/godata" "github.com/iancoleman/strcase" - errorspkg "github.com/cs3org/reva/pkg/storage/utils/indexer/errors" - "github.com/cs3org/reva/pkg/storage/utils/indexer/index" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - "github.com/cs3org/reva/pkg/storage/utils/metadata" - "github.com/cs3org/reva/pkg/storage/utils/sync" + errorspkg "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/errors" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/index" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" + "github.com/cs3org/reva/v2/pkg/storage/utils/sync" ) // Indexer is a facade to configure and query over multiple indices. diff --git a/pkg/storage/utils/indexer/indexer_test.go b/pkg/storage/utils/indexer/indexer_test.go index 3d4a50cce6..f2e01c2de2 100644 --- a/pkg/storage/utils/indexer/indexer_test.go +++ b/pkg/storage/utils/indexer/indexer_test.go @@ -24,10 +24,10 @@ import ( "path" "testing" - _ "github.com/cs3org/reva/pkg/storage/utils/indexer/index" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" - . "github.com/cs3org/reva/pkg/storage/utils/indexer/test" - "github.com/cs3org/reva/pkg/storage/utils/metadata" + _ "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/index" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" + . "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/test" + "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/utils/indexer/map.go b/pkg/storage/utils/indexer/map.go index f792677059..f15e1165d4 100644 --- a/pkg/storage/utils/indexer/map.go +++ b/pkg/storage/utils/indexer/map.go @@ -18,7 +18,7 @@ package indexer -import "github.com/cs3org/reva/pkg/storage/utils/indexer/index" +import "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/index" // typeMap stores the indexer layout at runtime. diff --git a/pkg/storage/utils/indexer/option/option.go b/pkg/storage/utils/indexer/option/option.go index ad1db067c2..9c7abb6a22 100644 --- a/pkg/storage/utils/indexer/option/option.go +++ b/pkg/storage/utils/indexer/option/option.go @@ -19,7 +19,7 @@ package option import ( - "github.com/cs3org/reva/pkg/storage/utils/metadata" + "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" ) // Option defines a single option function. diff --git a/pkg/storage/utils/indexer/reflect.go b/pkg/storage/utils/indexer/reflect.go index 47d02eb3f1..86d3c77687 100644 --- a/pkg/storage/utils/indexer/reflect.go +++ b/pkg/storage/utils/indexer/reflect.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" ) func getType(v interface{}) (reflect.Value, error) { diff --git a/pkg/storage/utils/indexer/reflect_test.go b/pkg/storage/utils/indexer/reflect_test.go index 62812f64db..be040b0ae5 100644 --- a/pkg/storage/utils/indexer/reflect_test.go +++ b/pkg/storage/utils/indexer/reflect_test.go @@ -22,7 +22,7 @@ import ( "fmt" "testing" - "github.com/cs3org/reva/pkg/storage/utils/indexer/option" + "github.com/cs3org/reva/v2/pkg/storage/utils/indexer/option" ) func Test_getTypeFQN(t *testing.T) { @@ -36,8 +36,8 @@ func Test_getTypeFQN(t *testing.T) { args args want string }{ - {name: "ByValue", args: args{&someT{}}, want: "github.com.cs3org.reva.pkg.storage.utils.indexer.someT"}, - {name: "ByRef", args: args{someT{}}, want: "github.com.cs3org.reva.pkg.storage.utils.indexer.someT"}, + {name: "ByValue", args: args{&someT{}}, want: "github.com.cs3org.reva.v2.pkg.storage.utils.indexer.someT"}, + {name: "ByRef", args: args{someT{}}, want: "github.com.cs3org.reva.v2.pkg.storage.utils.indexer.someT"}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/pkg/storage/utils/localfs/localfs.go b/pkg/storage/utils/localfs/localfs.go index 6bbb58ac63..00ca98b32a 100644 --- a/pkg/storage/utils/localfs/localfs.go +++ b/pkg/storage/utils/localfs/localfs.go @@ -35,15 +35,15 @@ import ( userpb "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" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/mime" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/utils/acl" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/storage/utils/grants" - "github.com/cs3org/reva/pkg/storage/utils/templates" - "github.com/cs3org/reva/pkg/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/mime" + "github.com/cs3org/reva/v2/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage/utils/acl" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/storage/utils/grants" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/pkg/errors" ) diff --git a/pkg/storage/utils/localfs/localfs_unix.go b/pkg/storage/utils/localfs/localfs_unix.go index cf7ed56f07..1605170451 100644 --- a/pkg/storage/utils/localfs/localfs_unix.go +++ b/pkg/storage/utils/localfs/localfs_unix.go @@ -31,7 +31,7 @@ import ( "syscall" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" ) // calcEtag will create an etag based on the md5 of diff --git a/pkg/storage/utils/localfs/localfs_windows.go b/pkg/storage/utils/localfs/localfs_windows.go index 235f1867d0..18faee3eee 100644 --- a/pkg/storage/utils/localfs/localfs_windows.go +++ b/pkg/storage/utils/localfs/localfs_windows.go @@ -30,7 +30,7 @@ import ( "strings" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "golang.org/x/sys/windows" ) diff --git a/pkg/storage/utils/localfs/upload.go b/pkg/storage/utils/localfs/upload.go index fe5036e0db..2018780734 100644 --- a/pkg/storage/utils/localfs/upload.go +++ b/pkg/storage/utils/localfs/upload.go @@ -28,11 +28,11 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/storage/utils/chunking" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/storage/utils/chunking" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/google/uuid" "github.com/pkg/errors" tusd "github.com/tus/tusd/pkg/handler" diff --git a/pkg/storage/utils/metadata/cs3.go b/pkg/storage/utils/metadata/cs3.go index 5f6c9b5879..693935df30 100644 --- a/pkg/storage/utils/metadata/cs3.go +++ b/pkg/storage/utils/metadata/cs3.go @@ -32,11 +32,11 @@ import ( rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/status" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/utils" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" ) diff --git a/pkg/storage/utils/walker/mock/walker_mock.go b/pkg/storage/utils/walker/mock/walker_mock.go index 7cc877747b..f5b9033adf 100644 --- a/pkg/storage/utils/walker/mock/walker_mock.go +++ b/pkg/storage/utils/walker/mock/walker_mock.go @@ -25,7 +25,7 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/storage/utils/walker" + "github.com/cs3org/reva/v2/pkg/storage/utils/walker" ) type mockWalker struct { diff --git a/pkg/storage/utils/walker/walker.go b/pkg/storage/utils/walker/walker.go index e479cbf065..2af9a640cd 100644 --- a/pkg/storage/utils/walker/walker.go +++ b/pkg/storage/utils/walker/walker.go @@ -27,7 +27,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) // WalkFunc is the type of function called by Walk to visit each file or directory diff --git a/pkg/sysinfo/metrics.go b/pkg/sysinfo/metrics.go index 2dced38f56..99e42cbf53 100644 --- a/pkg/sysinfo/metrics.go +++ b/pkg/sysinfo/metrics.go @@ -29,7 +29,7 @@ import ( "go.opencensus.io/stats/view" "go.opencensus.io/tag" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" ) type sysInfoMetricsLabels = map[tag.Key]string diff --git a/pkg/token/manager/demo/demo.go b/pkg/token/manager/demo/demo.go index a200de0898..d3a87fc253 100644 --- a/pkg/token/manager/demo/demo.go +++ b/pkg/token/manager/demo/demo.go @@ -26,8 +26,8 @@ import ( auth "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/registry" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/registry" "github.com/pkg/errors" ) diff --git a/pkg/token/manager/jwt/jwt.go b/pkg/token/manager/jwt/jwt.go index e54df4dae9..f331a26ee0 100644 --- a/pkg/token/manager/jwt/jwt.go +++ b/pkg/token/manager/jwt/jwt.go @@ -24,10 +24,10 @@ import ( auth "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/sharedconf" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/sharedconf" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/registry" "github.com/golang-jwt/jwt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/token/manager/loader/loader.go b/pkg/token/manager/loader/loader.go index c6c345af33..47395474df 100644 --- a/pkg/token/manager/loader/loader.go +++ b/pkg/token/manager/loader/loader.go @@ -20,7 +20,7 @@ package loader import ( // Load core token managers. - _ "github.com/cs3org/reva/pkg/token/manager/demo" - _ "github.com/cs3org/reva/pkg/token/manager/jwt" + _ "github.com/cs3org/reva/v2/pkg/token/manager/demo" + _ "github.com/cs3org/reva/v2/pkg/token/manager/jwt" // Add your own here. ) diff --git a/pkg/token/manager/registry/registry.go b/pkg/token/manager/registry/registry.go index c6fbf39d1d..f4be748aad 100644 --- a/pkg/token/manager/registry/registry.go +++ b/pkg/token/manager/registry/registry.go @@ -18,7 +18,7 @@ package registry -import "github.com/cs3org/reva/pkg/token" +import "github.com/cs3org/reva/v2/pkg/token" // NewFunc is the function that token managers // should register at init time. diff --git a/pkg/user/manager/demo/demo.go b/pkg/user/manager/demo/demo.go index 68672917b7..68dd4a62ef 100644 --- a/pkg/user/manager/demo/demo.go +++ b/pkg/user/manager/demo/demo.go @@ -25,9 +25,9 @@ import ( "strings" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" ) func init() { diff --git a/pkg/user/manager/demo/demo_test.go b/pkg/user/manager/demo/demo_test.go index 9eab45cd26..ee8473c7f6 100644 --- a/pkg/user/manager/demo/demo_test.go +++ b/pkg/user/manager/demo/demo_test.go @@ -24,7 +24,7 @@ import ( "testing" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) var ctx = context.Background() diff --git a/pkg/user/manager/json/json.go b/pkg/user/manager/json/json.go index 0966ae2349..6badc23559 100644 --- a/pkg/user/manager/json/json.go +++ b/pkg/user/manager/json/json.go @@ -25,13 +25,13 @@ import ( "strconv" "strings" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) func init() { diff --git a/pkg/user/manager/json/json_test.go b/pkg/user/manager/json/json_test.go index 66838bd983..796296ada9 100644 --- a/pkg/user/manager/json/json_test.go +++ b/pkg/user/manager/json/json_test.go @@ -26,7 +26,7 @@ import ( "testing" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/errtypes" ) var ctx = context.Background() diff --git a/pkg/user/manager/ldap/ldap.go b/pkg/user/manager/ldap/ldap.go index 570b99f825..6459bcb542 100644 --- a/pkg/user/manager/ldap/ldap.go +++ b/pkg/user/manager/ldap/ldap.go @@ -28,11 +28,11 @@ import ( "github.com/Masterminds/sprig" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/registry" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-ldap/ldap/v3" "github.com/google/uuid" "github.com/mitchellh/mapstructure" diff --git a/pkg/user/manager/loader/loader.go b/pkg/user/manager/loader/loader.go index 7640c3ff31..d14d04edc8 100644 --- a/pkg/user/manager/loader/loader.go +++ b/pkg/user/manager/loader/loader.go @@ -20,10 +20,10 @@ package loader import ( // Load core user manager drivers. - _ "github.com/cs3org/reva/pkg/user/manager/demo" - _ "github.com/cs3org/reva/pkg/user/manager/json" - _ "github.com/cs3org/reva/pkg/user/manager/ldap" - _ "github.com/cs3org/reva/pkg/user/manager/nextcloud" - _ "github.com/cs3org/reva/pkg/user/manager/owncloudsql" + _ "github.com/cs3org/reva/v2/pkg/user/manager/demo" + _ "github.com/cs3org/reva/v2/pkg/user/manager/json" + _ "github.com/cs3org/reva/v2/pkg/user/manager/ldap" + _ "github.com/cs3org/reva/v2/pkg/user/manager/nextcloud" + _ "github.com/cs3org/reva/v2/pkg/user/manager/owncloudsql" // Add your own here ) diff --git a/pkg/user/manager/nextcloud/nextcloud.go b/pkg/user/manager/nextcloud/nextcloud.go index b1f2d34be5..b9dae3eca9 100644 --- a/pkg/user/manager/nextcloud/nextcloud.go +++ b/pkg/user/manager/nextcloud/nextcloud.go @@ -26,16 +26,16 @@ import ( "net/http" "strings" - ctxpkg "github.com/cs3org/reva/pkg/ctx" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - // "github.com/cs3org/reva/pkg/errtypes" + // "github.com/cs3org/reva/v2/pkg/errtypes" ) func init() { diff --git a/pkg/user/manager/nextcloud/nextcloud_test.go b/pkg/user/manager/nextcloud/nextcloud_test.go index 2e2f906980..6b4538d312 100644 --- a/pkg/user/manager/nextcloud/nextcloud_test.go +++ b/pkg/user/manager/nextcloud/nextcloud_test.go @@ -26,11 +26,11 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/user/manager/nextcloud" - "github.com/cs3org/reva/tests/helpers" + "github.com/cs3org/reva/v2/pkg/auth/scope" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/user/manager/nextcloud" + "github.com/cs3org/reva/v2/tests/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/user/manager/owncloudsql/accounts/accounts.go b/pkg/user/manager/owncloudsql/accounts/accounts.go index 0a24f311a7..4ec8ef3afc 100644 --- a/pkg/user/manager/owncloudsql/accounts/accounts.go +++ b/pkg/user/manager/owncloudsql/accounts/accounts.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/cs3org/reva/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/appctx" "github.com/pkg/errors" ) diff --git a/pkg/user/manager/owncloudsql/accounts/accounts_test.go b/pkg/user/manager/owncloudsql/accounts/accounts_test.go index 0b01939389..4175e1fc8b 100644 --- a/pkg/user/manager/owncloudsql/accounts/accounts_test.go +++ b/pkg/user/manager/owncloudsql/accounts/accounts_test.go @@ -26,7 +26,7 @@ import ( _ "github.com/mattn/go-sqlite3" - "github.com/cs3org/reva/pkg/user/manager/owncloudsql/accounts" + "github.com/cs3org/reva/v2/pkg/user/manager/owncloudsql/accounts" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/user/manager/owncloudsql/owncloudsql.go b/pkg/user/manager/owncloudsql/owncloudsql.go index b86c9ce917..128474004c 100644 --- a/pkg/user/manager/owncloudsql/owncloudsql.go +++ b/pkg/user/manager/owncloudsql/owncloudsql.go @@ -24,11 +24,11 @@ import ( "fmt" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/user" - "github.com/cs3org/reva/pkg/user/manager/owncloudsql/accounts" - "github.com/cs3org/reva/pkg/user/manager/registry" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/errtypes" + "github.com/cs3org/reva/v2/pkg/user" + "github.com/cs3org/reva/v2/pkg/user/manager/owncloudsql/accounts" + "github.com/cs3org/reva/v2/pkg/user/manager/registry" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/pkg/user/manager/registry/registry.go b/pkg/user/manager/registry/registry.go index 17584350bd..051797e25d 100644 --- a/pkg/user/manager/registry/registry.go +++ b/pkg/user/manager/registry/registry.go @@ -19,7 +19,7 @@ package registry import ( - "github.com/cs3org/reva/pkg/user" + "github.com/cs3org/reva/v2/pkg/user" ) // NewFunc is the function that user managers diff --git a/pkg/user/rpc_user.go b/pkg/user/rpc_user.go index ec7946cad0..d9f9844ae4 100644 --- a/pkg/user/rpc_user.go +++ b/pkg/user/rpc_user.go @@ -24,8 +24,8 @@ import ( "net/rpc" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/appctx" - "github.com/cs3org/reva/pkg/plugin" + "github.com/cs3org/reva/v2/pkg/appctx" + "github.com/cs3org/reva/v2/pkg/plugin" hcplugin "github.com/hashicorp/go-plugin" ) diff --git a/pkg/user/user.go b/pkg/user/user.go index c81438e451..55339d741a 100644 --- a/pkg/user/user.go +++ b/pkg/user/user.go @@ -22,7 +22,7 @@ import ( "context" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/plugin" + "github.com/cs3org/reva/v2/pkg/plugin" ) // Manager is the interface to implement to manipulate users. diff --git a/pkg/utils/resourceid/owncloud_test.go b/pkg/utils/resourceid/owncloud_test.go index d23574ef58..e87e4bea4f 100644 --- a/pkg/utils/resourceid/owncloud_test.go +++ b/pkg/utils/resourceid/owncloud_test.go @@ -21,7 +21,7 @@ import ( "testing" providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils" ) func BenchmarkWrap(b *testing.B) { diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index e5370a41b1..32b69cfd2e 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -36,8 +36,8 @@ import ( userpb "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" - "github.com/cs3org/reva/pkg/registry" - "github.com/cs3org/reva/pkg/registry/memory" + "github.com/cs3org/reva/v2/pkg/registry" + "github.com/cs3org/reva/v2/pkg/registry/memory" "github.com/golang/protobuf/proto" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/tests/helpers/helpers.go b/tests/helpers/helpers.go index bff07340b2..b1516f02f4 100644 --- a/tests/helpers/helpers.go +++ b/tests/helpers/helpers.go @@ -28,7 +28,7 @@ import ( "runtime" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/storage" + "github.com/cs3org/reva/v2/pkg/storage" ) // TempDir creates a temporary directory in tmp/ and returns its path diff --git a/tests/integration/grpc/gateway_storageprovider_static_test.go b/tests/integration/grpc/gateway_storageprovider_static_test.go index a3881f6bf7..3aa820e099 100644 --- a/tests/integration/grpc/gateway_storageprovider_static_test.go +++ b/tests/integration/grpc/gateway_storageprovider_static_test.go @@ -29,10 +29,10 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storagep "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" + "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" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/integration/grpc/gateway_storageprovider_test.go b/tests/integration/grpc/gateway_storageprovider_test.go index 3cb75a8b45..f45478a6df 100644 --- a/tests/integration/grpc/gateway_storageprovider_test.go +++ b/tests/integration/grpc/gateway_storageprovider_test.go @@ -30,14 +30,14 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storagep "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/ocis" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/tests/helpers" + "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/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/ocis" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/tests/helpers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/tests/integration/grpc/groupprovider_test.go b/tests/integration/grpc/groupprovider_test.go index 5849e77733..7ce522a79e 100644 --- a/tests/integration/grpc/groupprovider_test.go +++ b/tests/integration/grpc/groupprovider_test.go @@ -25,10 +25,10 @@ import ( grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" + "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" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "google.golang.org/grpc/metadata" . "github.com/onsi/ginkgo/v2" diff --git a/tests/integration/grpc/storageprovider_test.go b/tests/integration/grpc/storageprovider_test.go index 5656619f64..eaf4d8a57a 100644 --- a/tests/integration/grpc/storageprovider_test.go +++ b/tests/integration/grpc/storageprovider_test.go @@ -26,15 +26,15 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storagep "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/storage" - "github.com/cs3org/reva/pkg/storage/fs/nextcloud" - "github.com/cs3org/reva/pkg/storage/fs/ocis" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/tests/helpers" + "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/storage" + "github.com/cs3org/reva/v2/pkg/storage/fs/nextcloud" + "github.com/cs3org/reva/v2/pkg/storage/fs/ocis" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/tests/helpers" "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" diff --git a/tests/integration/grpc/userprovider_test.go b/tests/integration/grpc/userprovider_test.go index fd78c514e1..7fbd9aa241 100644 --- a/tests/integration/grpc/userprovider_test.go +++ b/tests/integration/grpc/userprovider_test.go @@ -24,10 +24,10 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - jwt "github.com/cs3org/reva/pkg/token/manager/jwt" + "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" + jwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "google.golang.org/grpc/metadata" . "github.com/onsi/ginkgo/v2"