From b15db1794ab9b46dbdc4b2a815c5419b0f0635ab Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 3 Mar 2022 19:56:04 +0100 Subject: [PATCH] update reva to version 2.0.0 (#3258) --- accounts/pkg/storage/cs3.go | 12 +-- changelog/unreleased/update-reva.md | 99 ++++++++++++++++++- go.mod | 2 +- go.sum | 4 +- graph/pkg/identity/cs3.go | 2 +- graph/pkg/middleware/auth.go | 6 +- graph/pkg/middleware/requireadmin.go | 2 +- graph/pkg/service/v0/driveitems.go | 2 +- graph/pkg/service/v0/drives.go | 6 +- graph/pkg/service/v0/graph_test.go | 2 +- graph/pkg/service/v0/net/headers.go | 2 +- graph/pkg/service/v0/service.go | 2 +- graph/pkg/service/v0/users.go | 2 +- nats/pkg/command/server.go | 2 +- notifications/pkg/channels/channels.go | 2 +- notifications/pkg/command/server.go | 4 +- notifications/pkg/service/service.go | 2 +- ocis-pkg/indexer/index/cs3/autoincrement.go | 10 +- ocis-pkg/indexer/index/cs3/helper.go | 2 +- ocis-pkg/indexer/index/cs3/non_unique.go | 10 +- ocis-pkg/indexer/index/cs3/unique.go | 10 +- ocis-pkg/metadata_storage/metadata_storage.go | 8 +- ocis-pkg/middleware/account.go | 6 +- ocs/pkg/middleware/requireselforadmin.go | 2 +- ocs/pkg/middleware/requireuser.go | 2 +- ocs/pkg/server/http/svc_test.go | 6 +- ocs/pkg/service/v0/groups.go | 2 +- ocs/pkg/service/v0/service.go | 2 +- ocs/pkg/service/v0/users.go | 8 +- proxy/pkg/command/server.go | 2 +- proxy/pkg/middleware/account_resolver.go | 2 +- proxy/pkg/middleware/account_resolver_test.go | 6 +- proxy/pkg/middleware/create_home.go | 4 +- proxy/pkg/middleware/signed_url_auth.go | 2 +- proxy/pkg/proxy/policy/selector.go | 2 +- proxy/pkg/proxy/policy/selector_test.go | 2 +- proxy/pkg/user/backend/accounts.go | 4 +- proxy/pkg/user/backend/accounts_test.go | 2 +- settings/pkg/service/v0/service.go | 2 +- storage/pkg/command/appprovider.go | 2 +- storage/pkg/command/authbasic.go | 2 +- storage/pkg/command/authbearer.go | 2 +- storage/pkg/command/authmachine.go | 2 +- storage/pkg/command/frontend.go | 2 +- storage/pkg/command/gateway.go | 2 +- storage/pkg/command/groups.go | 2 +- storage/pkg/command/sharing.go | 2 +- storage/pkg/command/storagemetadata.go | 2 +- storage/pkg/command/storagepubliclink.go | 2 +- storage/pkg/command/storageshares.go | 2 +- storage/pkg/command/storageusers.go | 2 +- storage/pkg/command/users.go | 2 +- thumbnails/pkg/server/grpc/server.go | 2 +- thumbnails/pkg/service/v0/service.go | 2 +- thumbnails/pkg/thumbnail/imgsource/cs3.go | 6 +- webdav/pkg/service/v0/service.go | 4 +- 56 files changed, 192 insertions(+), 97 deletions(-) diff --git a/accounts/pkg/storage/cs3.go b/accounts/pkg/storage/cs3.go index eb167c4f3a..7e1d65e34f 100644 --- a/accounts/pkg/storage/cs3.go +++ b/accounts/pkg/storage/cs3.go @@ -9,12 +9,12 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" v1beta11 "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" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/utils" + "github.com/cs3org/reva/v2/pkg/auth/scope" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/utils" "github.com/owncloud/ocis/accounts/pkg/config" olog "github.com/owncloud/ocis/ocis-pkg/log" metadatastorage "github.com/owncloud/ocis/ocis-pkg/metadata_storage" diff --git a/changelog/unreleased/update-reva.md b/changelog/unreleased/update-reva.md index 2e5e87224f..2efb8ffb48 100644 --- a/changelog/unreleased/update-reva.md +++ b/changelog/unreleased/update-reva.md @@ -1,5 +1,100 @@ -Enhancement: Update reva to v1.16.1-0.20220224114254-d4ffaf323e70 +Enhancement: Update reva to v2.0.0 -We updated reva to the latest edge branch. Changelog will follow. +We updated reva to the version 2.0.0. + +* Fix [cs3org/reva#2457](https://github.com/cs3org/reva/pull/2457) : Do not swallow error +* Fix [cs3org/reva#2422](https://github.com/cs3org/reva/pull/2422) : Handle non existing spaces correctly +* Fix [cs3org/reva#2327](https://github.com/cs3org/reva/pull/2327) : Enable changelog on edge branch +* Fix [cs3org/reva#2370](https://github.com/cs3org/reva/pull/2370) : Fixes for apps in public shares, project spaces for EOS driver +* Fix [cs3org/reva#2464](https://github.com/cs3org/reva/pull/2464) : Pass spacegrants when adding member to space +* Fix [cs3org/reva#2430](https://github.com/cs3org/reva/pull/2430) : Fix aggregated child folder id +* Fix [cs3org/reva#2348](https://github.com/cs3org/reva/pull/2348) : Make archiver handle spaces protocol +* Fix [cs3org/reva#2452](https://github.com/cs3org/reva/pull/2452) : Fix create space error message +* Fix [cs3org/reva#2445](https://github.com/cs3org/reva/pull/2445) : Don't handle ids containing "/" in decomposedfs +* Fix [cs3org/reva#2285](https://github.com/cs3org/reva/pull/2285) : Accept new userid idp format +* Fix [cs3org/reva#2503](https://github.com/cs3org/reva/pull/2503) : Remove the protection from /v?.php/config endpoints +* Fix [cs3org/reva#2462](https://github.com/cs3org/reva/pull/2462) : Public shares path needs to be set +* Fix [cs3org/reva#2427](https://github.com/cs3org/reva/pull/2427) : Fix registry caching +* Fix [cs3org/reva#2298](https://github.com/cs3org/reva/pull/2298) : Remove share refs from trashbin +* Fix [cs3org/reva#2433](https://github.com/cs3org/reva/pull/2433) : Fix shares provider filter +* Fix [cs3org/reva#2351](https://github.com/cs3org/reva/pull/2351) : Fix Statcache removing +* Fix [cs3org/reva#2374](https://github.com/cs3org/reva/pull/2374) : Fix webdav copy of zero byte files +* Fix [cs3org/reva#2336](https://github.com/cs3org/reva/pull/2336) : Handle sending all permissions when creating public links +* Fix [cs3org/reva#2440](https://github.com/cs3org/reva/pull/2440) : Add ArbitraryMetadataKeys to statcache key +* Fix [cs3org/reva#2582](https://github.com/cs3org/reva/pull/2582) : Keep lock structs in a local map protected by a mutex +* Fix [cs3org/reva#2372](https://github.com/cs3org/reva/pull/2372) : Make owncloudsql work with the spaces registry +* Fix [cs3org/reva#2416](https://github.com/cs3org/reva/pull/2416) : The registry now returns complete space structs +* Fix [cs3org/reva#3066](https://github.com/cs3org/reva/pull/3066) : Fix propfind listing for files +* Fix [cs3org/reva#2428](https://github.com/cs3org/reva/pull/2428) : Remove unused home provider from config +* Fix [cs3org/reva#2334](https://github.com/cs3org/reva/pull/2334) : Revert fix decomposedfs upload +* Fix [cs3org/reva#2415](https://github.com/cs3org/reva/pull/2415) : Services should never return transport level errors +* Fix [cs3org/reva#2419](https://github.com/cs3org/reva/pull/2419) : List project spaces for share recipients +* Fix [cs3org/reva#2501](https://github.com/cs3org/reva/pull/2501) : Fix spaces stat +* Fix [cs3org/reva#2432](https://github.com/cs3org/reva/pull/2432) : Use space reference when listing containers +* Fix [cs3org/reva#2572](https://github.com/cs3org/reva/pull/2572) : Wait for nats server on middleware start +* Fix [cs3org/reva#2454](https://github.com/cs3org/reva/pull/2454) : Fix webdav paths in PROPFINDS +* Chg [cs3org/reva#2329](https://github.com/cs3org/reva/pull/2329) : Activate the statcache +* Chg [cs3org/reva#2596](https://github.com/cs3org/reva/pull/2596) : Remove hash from public link urls +* Chg [cs3org/reva#2495](https://github.com/cs3org/reva/pull/2495) : Remove the ownCloud storage driver +* Chg [cs3org/reva#2527](https://github.com/cs3org/reva/pull/2527) : Store space attributes in decomposedFS +* Chg [cs3org/reva#2581](https://github.com/cs3org/reva/pull/2581) : Update hard-coded status values +* Chg [cs3org/reva#2524](https://github.com/cs3org/reva/pull/2524) : Use description during space creation +* Chg [cs3org/reva#2554](https://github.com/cs3org/reva/pull/2554) : Shard nodes per space in decomposedfs +* Chg [cs3org/reva#2576](https://github.com/cs3org/reva/pull/2576) : Harden xattrs errors +* Chg [cs3org/reva#2436](https://github.com/cs3org/reva/pull/2436) : Replace template in GroupFilter for UserProvider with a simple string +* Chg [cs3org/reva#2429](https://github.com/cs3org/reva/pull/2429) : Make archiver id based +* Chg [cs3org/reva#2340](https://github.com/cs3org/reva/pull/2340) : Allow multiple space configurations per provider +* Chg [cs3org/reva#2396](https://github.com/cs3org/reva/pull/2396) : The ocdav handler is now spaces aware +* Chg [cs3org/reva#2349](https://github.com/cs3org/reva/pull/2349) : Require `ListRecycle` when listing trashbin +* Chg [cs3org/reva#2353](https://github.com/cs3org/reva/pull/2353) : Reduce log output +* Chg [cs3org/reva#2542](https://github.com/cs3org/reva/pull/2542) : Do not encode webDAV ids to base64 +* Chg [cs3org/reva#2519](https://github.com/cs3org/reva/pull/2519) : Remove the auto creation of the .space folder +* Chg [cs3org/reva#2394](https://github.com/cs3org/reva/pull/2394) : Remove logic from gateway +* Chg [cs3org/reva#2023](https://github.com/cs3org/reva/pull/2023) : Add a sharestorageprovider +* Chg [cs3org/reva#2234](https://github.com/cs3org/reva/pull/2234) : Add a spaces registry +* Chg [cs3org/reva#2339](https://github.com/cs3org/reva/pull/2339) : Fix static registry regressions +* Chg [cs3org/reva#2370](https://github.com/cs3org/reva/pull/2370) : Fix static registry regressions +* Chg [cs3org/reva#2354](https://github.com/cs3org/reva/pull/2354) : Return not found when updating non existent space +* Chg [cs3org/reva#2589](https://github.com/cs3org/reva/pull/2589) : Remove deprecated linter modules +* Chg [cs3org/reva#2016](https://github.com/cs3org/reva/pull/2016) : Move wrapping and unwrapping of paths to the storage gateway +* Enh [cs3org/reva#2591](https://github.com/cs3org/reva/pull/2591) : Set up App Locks with basic locks +* Enh [cs3org/reva#1209](https://github.com/cs3org/reva/pull/1209) : Reva CephFS module v0.2.1 +* Enh [cs3org/reva#2511](https://github.com/cs3org/reva/pull/2511) : Error handling cleanup in decomposed FS +* Enh [cs3org/reva#2516](https://github.com/cs3org/reva/pull/2516) : Cleaned up some code +* Enh [cs3org/reva#2512](https://github.com/cs3org/reva/pull/2512) : Consolidate xattr setter and getter +* Enh [cs3org/reva#2341](https://github.com/cs3org/reva/pull/2341) : Use CS3 permissions API +* Enh [cs3org/reva#2343](https://github.com/cs3org/reva/pull/2343) : Allow multiple space type fileters on decomposedfs +* Enh [cs3org/reva#2460](https://github.com/cs3org/reva/pull/2460) : Add locking support to decomposedfs +* Enh [cs3org/reva#2540](https://github.com/cs3org/reva/pull/2540) : Refactored the xattrs package in the decomposedfs +* Enh [cs3org/reva#2463](https://github.com/cs3org/reva/pull/2463) : Do not log whole nodes +* Enh [cs3org/reva#2350](https://github.com/cs3org/reva/pull/2350) : Add file locking methods to the storage and filesystem interfaces +* Enh [cs3org/reva#2379](https://github.com/cs3org/reva/pull/2379) : Add new file url of the app provider to the ocs capabilities +* Enh [cs3org/reva#2369](https://github.com/cs3org/reva/pull/2369) : Implement TouchFile from the CS3apis +* Enh [cs3org/reva#2385](https://github.com/cs3org/reva/pull/2385) : Allow to create new files with the app provider on public links +* Enh [cs3org/reva#2397](https://github.com/cs3org/reva/pull/2397) : Product field in OCS version +* Enh [cs3org/reva#2393](https://github.com/cs3org/reva/pull/2393) : Update tus/tusd to version 1.8.0 +* Enh [cs3org/reva#2522](https://github.com/cs3org/reva/pull/2522) : Introduce events +* Enh [cs3org/reva#2528](https://github.com/cs3org/reva/pull/2528) : Use an exclcusive write lock when writing multiple attributes +* Enh [cs3org/reva#2595](https://github.com/cs3org/reva/pull/2595) : Add integration test for the groupprovider +* Enh [cs3org/reva#2439](https://github.com/cs3org/reva/pull/2439) : Ignore handled errors when creating spaces +* Enh [cs3org/reva#2500](https://github.com/cs3org/reva/pull/2500) : Invalidate listproviders cache +* Enh [cs3org/reva#2345](https://github.com/cs3org/reva/pull/2345) : Don't assume that the LDAP groupid in reva matches the name +* Enh [cs3org/reva#2525](https://github.com/cs3org/reva/pull/2525) : Allow using AD UUID as userId values +* Enh [cs3org/reva#2584](https://github.com/cs3org/reva/pull/2584) : Allow running userprovider integration tests for the LDAP driver +* Enh [cs3org/reva#2585](https://github.com/cs3org/reva/pull/2585) : Add metadata storage layer and indexer +* Enh [cs3org/reva#2163](https://github.com/cs3org/reva/pull/2163) : Nextcloud-based share manager for pkg/ocm/share +* Enh [cs3org/reva#2278](https://github.com/cs3org/reva/pull/2278) : OIDC driver changes for lightweight users +* Enh [cs3org/reva#2315](https://github.com/cs3org/reva/pull/2315) : Add new attributes to public link propfinds +* Enh [cs3org/reva#2431](https://github.com/cs3org/reva/pull/2431) : Delete shares when purging spaces +* Enh [cs3org/reva#2434](https://github.com/cs3org/reva/pull/2434) : Refactor ocdav into smaller chunks +* Enh [cs3org/reva#2524](https://github.com/cs3org/reva/pull/2524) : Add checks when removing space members +* Enh [cs3org/reva#2457](https://github.com/cs3org/reva/pull/2457) : Restore spaces that were previously deleted +* Enh [cs3org/reva#2498](https://github.com/cs3org/reva/pull/2498) : Include grants in list storage spaces response +* Enh [cs3org/reva#2344](https://github.com/cs3org/reva/pull/2344) : Allow listing all storage spaces +* Enh [cs3org/reva#2547](https://github.com/cs3org/reva/pull/2547) : Add an if-match check to the storage provider +* Enh [cs3org/reva#2486](https://github.com/cs3org/reva/pull/2486) : Update cs3apis to include lock api changes +* Enh [cs3org/reva#2526](https://github.com/cs3org/reva/pull/2526) : Upgrade ginkgo to v2 https://github.com/owncloud/ocis/pull/3231 +https://github.com/owncloud/ocis/pull/3231 + diff --git a/go.mod b/go.mod index 27759d8199..39be739d39 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/blevesearch/bleve/v2 v2.3.1 github.com/coreos/go-oidc/v3 v3.1.0 github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 - github.com/cs3org/reva v1.16.1-0.20220301130454-abc01bbfa855 + github.com/cs3org/reva/v2 v2.0.0 github.com/disintegration/imaging v1.6.2 github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733 github.com/go-chi/chi/v5 v5.0.7 diff --git a/go.sum b/go.sum index c73d8632f6..567ff7dee5 100644 --- a/go.sum +++ b/go.sum @@ -342,8 +342,8 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 h1:1jqPH58jCxvbaJ9WLIJ7W2/m622bWS6ChptzljSG6IQ= github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva v1.16.1-0.20220301130454-abc01bbfa855 h1:ygRSBDIsIyuVbZ3T4BBjkfvW0+pEZ6JWU2tZlFSGpQI= -github.com/cs3org/reva v1.16.1-0.20220301130454-abc01bbfa855/go.mod h1:fdlrnZ0f+UtAdpZfLG+4LM0ZrhT5V8tPEQt6ycYm82c= +github.com/cs3org/reva/v2 v2.0.0 h1:/w5jn77qm4p8Eizbiat3WDWZmY9mAM/le/lZ+Woa13Q= +github.com/cs3org/reva/v2 v2.0.0/go.mod h1:XNtK1HEClNzmz5vyQa2DUw4KH3oqBjQoEsV1LhAGlV0= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= diff --git a/graph/pkg/identity/cs3.go b/graph/pkg/identity/cs3.go index e4b7c20549..ac3aea6d0a 100644 --- a/graph/pkg/identity/cs3.go +++ b/graph/pkg/identity/cs3.go @@ -7,7 +7,7 @@ import ( cs3group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/graph/pkg/config" diff --git a/graph/pkg/middleware/auth.go b/graph/pkg/middleware/auth.go index ed4a2ecf63..275db9bc4e 100644 --- a/graph/pkg/middleware/auth.go +++ b/graph/pkg/middleware/auth.go @@ -3,9 +3,9 @@ package middleware import ( "net/http" - "github.com/cs3org/reva/pkg/auth/scope" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/auth/scope" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" "github.com/owncloud/ocis/ocis-pkg/account" "google.golang.org/grpc/metadata" diff --git a/graph/pkg/middleware/requireadmin.go b/graph/pkg/middleware/requireadmin.go index ee1c82fe2d..b439c8887e 100644 --- a/graph/pkg/middleware/requireadmin.go +++ b/graph/pkg/middleware/requireadmin.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" accounts "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" "github.com/owncloud/ocis/ocis-pkg/log" diff --git a/graph/pkg/service/v0/driveitems.go b/graph/pkg/service/v0/driveitems.go index 3b188a89d1..a5eb21a65f 100644 --- a/graph/pkg/service/v0/driveitems.go +++ b/graph/pkg/service/v0/driveitems.go @@ -11,7 +11,7 @@ import ( cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/utils/resourceid" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" diff --git a/graph/pkg/service/v0/drives.go b/graph/pkg/service/v0/drives.go index fb983f7232..6c5a2b077e 100644 --- a/graph/pkg/service/v0/drives.go +++ b/graph/pkg/service/v0/drives.go @@ -17,9 +17,9 @@ import ( cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - ctxpkg "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/utils" - "github.com/cs3org/reva/pkg/utils/resourceid" + ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/utils" + "github.com/cs3org/reva/v2/pkg/utils/resourceid" "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" diff --git a/graph/pkg/service/v0/graph_test.go b/graph/pkg/service/v0/graph_test.go index 3d446bd74a..3043bacb89 100644 --- a/graph/pkg/service/v0/graph_test.go +++ b/graph/pkg/service/v0/graph_test.go @@ -10,7 +10,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" diff --git a/graph/pkg/service/v0/net/headers.go b/graph/pkg/service/v0/net/headers.go index 7886f1a1c4..84316eb157 100644 --- a/graph/pkg/service/v0/net/headers.go +++ b/graph/pkg/service/v0/net/headers.go @@ -1,7 +1,7 @@ package net const ( - // "github.com/cs3org/reva/internal/http/services/datagateway" is internal so we redeclare it here + // "github.com/cs3org/reva/v2/internal/http/services/datagateway" is internal so we redeclare it here // HeaderTokenTransport holds the header key for the reva transfer token HeaderTokenTransport = "X-Reva-Transfer" // HeaderIfModifiedSince is used to mimic/pass on caching headers when using grpc diff --git a/graph/pkg/service/v0/service.go b/graph/pkg/service/v0/service.go index c77959d963..7ac1d3590c 100644 --- a/graph/pkg/service/v0/service.go +++ b/graph/pkg/service/v0/service.go @@ -7,7 +7,7 @@ import ( "time" "github.com/ReneKroon/ttlcache/v2" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" diff --git a/graph/pkg/service/v0/users.go b/graph/pkg/service/v0/users.go index ebdba6bb8a..db32655b92 100644 --- a/graph/pkg/service/v0/users.go +++ b/graph/pkg/service/v0/users.go @@ -8,7 +8,7 @@ import ( "net/url" "regexp" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" diff --git a/nats/pkg/command/server.go b/nats/pkg/command/server.go index baf6bf5f8d..1535e51f94 100644 --- a/nats/pkg/command/server.go +++ b/nats/pkg/command/server.go @@ -6,7 +6,7 @@ import ( "os/signal" "syscall" - "github.com/cs3org/reva/pkg/events/server" + "github.com/cs3org/reva/v2/pkg/events/server" "github.com/owncloud/ocis/nats/pkg/config" "github.com/owncloud/ocis/nats/pkg/config/parser" "github.com/owncloud/ocis/nats/pkg/logging" diff --git a/notifications/pkg/channels/channels.go b/notifications/pkg/channels/channels.go index f4e427b018..f13914da45 100644 --- a/notifications/pkg/channels/channels.go +++ b/notifications/pkg/channels/channels.go @@ -8,7 +8,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" groups "github.com/cs3org/go-cs3apis/cs3/identity/group/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/owncloud/ocis/notifications/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/pkg/errors" diff --git a/notifications/pkg/command/server.go b/notifications/pkg/command/server.go index 7f22fa1cb7..37bd6375fd 100644 --- a/notifications/pkg/command/server.go +++ b/notifications/pkg/command/server.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/asim/go-micro/plugins/events/nats/v4" - "github.com/cs3org/reva/pkg/events" - "github.com/cs3org/reva/pkg/events/server" + "github.com/cs3org/reva/v2/pkg/events" + "github.com/cs3org/reva/v2/pkg/events/server" "github.com/owncloud/ocis/notifications/pkg/channels" "github.com/owncloud/ocis/notifications/pkg/config" "github.com/owncloud/ocis/notifications/pkg/config/parser" diff --git a/notifications/pkg/service/service.go b/notifications/pkg/service/service.go index 81e4a26b4a..970052b3df 100644 --- a/notifications/pkg/service/service.go +++ b/notifications/pkg/service/service.go @@ -5,7 +5,7 @@ import ( "os/signal" "syscall" - "github.com/cs3org/reva/pkg/events" + "github.com/cs3org/reva/v2/pkg/events" "github.com/owncloud/ocis/notifications/pkg/channels" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/ocis-pkg/indexer/index/cs3/autoincrement.go b/ocis-pkg/indexer/index/cs3/autoincrement.go index 1c988e9768..74ec81c0aa 100644 --- a/ocis-pkg/indexer/index/cs3/autoincrement.go +++ b/ocis-pkg/indexer/index/cs3/autoincrement.go @@ -15,11 +15,11 @@ import ( v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/utils" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" "github.com/owncloud/ocis/ocis-pkg/indexer/index" diff --git a/ocis-pkg/indexer/index/cs3/helper.go b/ocis-pkg/indexer/index/cs3/helper.go index 5024557e8c..6d7af96eb6 100644 --- a/ocis-pkg/indexer/index/cs3/helper.go +++ b/ocis-pkg/indexer/index/cs3/helper.go @@ -6,7 +6,7 @@ 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/utils" + "github.com/cs3org/reva/v2/pkg/utils" ) func deleteIndexRoot(ctx context.Context, storageProvider provider.ProviderAPIClient, spaceid, indexRootDir string) error { diff --git a/ocis-pkg/indexer/index/cs3/non_unique.go b/ocis-pkg/indexer/index/cs3/non_unique.go index 3e0f1a222d..e25b860dc3 100644 --- a/ocis-pkg/indexer/index/cs3/non_unique.go +++ b/ocis-pkg/indexer/index/cs3/non_unique.go @@ -11,11 +11,11 @@ import ( v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/utils" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/utils" idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" "github.com/owncloud/ocis/ocis-pkg/indexer/index" "github.com/owncloud/ocis/ocis-pkg/indexer/option" diff --git a/ocis-pkg/indexer/index/cs3/unique.go b/ocis-pkg/indexer/index/cs3/unique.go index 8bde7778f8..8329d4ae54 100644 --- a/ocis-pkg/indexer/index/cs3/unique.go +++ b/ocis-pkg/indexer/index/cs3/unique.go @@ -11,11 +11,11 @@ import ( v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/jwt" - "github.com/cs3org/reva/pkg/utils" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/utils" idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors" "github.com/owncloud/ocis/ocis-pkg/indexer/index" "github.com/owncloud/ocis/ocis-pkg/indexer/option" diff --git a/ocis-pkg/metadata_storage/metadata_storage.go b/ocis-pkg/metadata_storage/metadata_storage.go index b99a813ac5..879fff03d8 100644 --- a/ocis-pkg/metadata_storage/metadata_storage.go +++ b/ocis-pkg/metadata_storage/metadata_storage.go @@ -11,10 +11,10 @@ import ( v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/errtypes" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/utils" + revactx "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/utils" "github.com/owncloud/ocis/accounts/pkg/config" "google.golang.org/grpc/metadata" ) diff --git a/ocis-pkg/middleware/account.go b/ocis-pkg/middleware/account.go index ca25c33e22..51b2b37c22 100644 --- a/ocis-pkg/middleware/account.go +++ b/ocis-pkg/middleware/account.go @@ -4,10 +4,10 @@ import ( "encoding/json" "net/http" - "github.com/cs3org/reva/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/auth/scope" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/token/manager/jwt" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/owncloud/ocis/ocis-pkg/account" "go-micro.dev/v4/metadata" ) diff --git a/ocs/pkg/middleware/requireselforadmin.go b/ocs/pkg/middleware/requireselforadmin.go index f24f84585a..b063ce9d0e 100644 --- a/ocs/pkg/middleware/requireselforadmin.go +++ b/ocs/pkg/middleware/requireselforadmin.go @@ -4,7 +4,7 @@ import ( "net/http" "net/url" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/chi/v5" "github.com/go-chi/render" accounts "github.com/owncloud/ocis/accounts/pkg/service/v0" diff --git a/ocs/pkg/middleware/requireuser.go b/ocs/pkg/middleware/requireuser.go index bcf07571e7..ed8d5e4a27 100644 --- a/ocs/pkg/middleware/requireuser.go +++ b/ocs/pkg/middleware/requireuser.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/render" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/ocs/pkg/service/v0/response" diff --git a/ocs/pkg/server/http/svc_test.go b/ocs/pkg/server/http/svc_test.go index 4cbace8d42..410b714317 100644 --- a/ocs/pkg/server/http/svc_test.go +++ b/ocs/pkg/server/http/svc_test.go @@ -16,9 +16,9 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/token" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/token" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/golang/protobuf/ptypes/empty" accountsCfg "github.com/owncloud/ocis/accounts/pkg/config" accountsLogging "github.com/owncloud/ocis/accounts/pkg/logging" diff --git a/ocs/pkg/service/v0/groups.go b/ocs/pkg/service/v0/groups.go index 1eb2ddd484..7a01624155 100644 --- a/ocs/pkg/service/v0/groups.go +++ b/ocs/pkg/service/v0/groups.go @@ -12,7 +12,7 @@ import ( accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/go-chi/chi/v5" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" "github.com/owncloud/ocis/ocs/pkg/service/v0/response" diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go index f484dd17b3..913aedb5b1 100644 --- a/ocs/pkg/service/v0/service.go +++ b/ocs/pkg/service/v0/service.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/go-chi/chi/v5" diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go index aaa781a6fc..2e4bb68c0b 100644 --- a/ocs/pkg/service/v0/users.go +++ b/ocs/pkg/service/v0/users.go @@ -21,10 +21,10 @@ import ( rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/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/auth/scope" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/auth/scope" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/owncloud/ocis/ocs/pkg/service/v0/data" diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go index 90d8a1de1a..8d6f7ce9c7 100644 --- a/proxy/pkg/command/server.go +++ b/proxy/pkg/command/server.go @@ -12,7 +12,7 @@ import ( storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" "github.com/coreos/go-oidc/v3/oidc" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" "github.com/oklog/run" diff --git a/proxy/pkg/middleware/account_resolver.go b/proxy/pkg/middleware/account_resolver.go index 636a1a0190..4a9c1b4e4d 100644 --- a/proxy/pkg/middleware/account_resolver.go +++ b/proxy/pkg/middleware/account_resolver.go @@ -6,7 +6,7 @@ import ( "github.com/owncloud/ocis/proxy/pkg/user/backend" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" ) diff --git a/proxy/pkg/middleware/account_resolver_test.go b/proxy/pkg/middleware/account_resolver_test.go index 2846c892aa..825a85cfcb 100644 --- a/proxy/pkg/middleware/account_resolver_test.go +++ b/proxy/pkg/middleware/account_resolver_test.go @@ -7,9 +7,9 @@ import ( "testing" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/auth/scope" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" "github.com/owncloud/ocis/proxy/pkg/config" diff --git a/proxy/pkg/middleware/create_home.go b/proxy/pkg/middleware/create_home.go index f85d2c8aa0..4c628eebc8 100644 --- a/proxy/pkg/middleware/create_home.go +++ b/proxy/pkg/middleware/create_home.go @@ -6,8 +6,8 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rgrpc/status" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/owncloud/ocis/ocis-pkg/log" "google.golang.org/grpc/metadata" ) diff --git a/proxy/pkg/middleware/signed_url_auth.go b/proxy/pkg/middleware/signed_url_auth.go index ee33a790f8..dcf39f6bdb 100644 --- a/proxy/pkg/middleware/signed_url_auth.go +++ b/proxy/pkg/middleware/signed_url_auth.go @@ -11,7 +11,7 @@ import ( "strings" "time" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/log" storemsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/store/v0" storesvc "github.com/owncloud/ocis/protogen/gen/ocis/services/store/v0" diff --git a/proxy/pkg/proxy/policy/selector.go b/proxy/pkg/proxy/policy/selector.go index a3d1224fd4..86a45ec7fb 100644 --- a/proxy/pkg/proxy/policy/selector.go +++ b/proxy/pkg/proxy/policy/selector.go @@ -9,7 +9,7 @@ import ( accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" "github.com/asim/go-micro/plugins/client/grpc/v4" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/oidc" "github.com/owncloud/ocis/proxy/pkg/config" ) diff --git a/proxy/pkg/proxy/policy/selector_test.go b/proxy/pkg/proxy/policy/selector_test.go index 28eb1a07b3..c5558c72ce 100644 --- a/proxy/pkg/proxy/policy/selector_test.go +++ b/proxy/pkg/proxy/policy/selector_test.go @@ -8,7 +8,7 @@ import ( "testing" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/oidc" accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0" diff --git a/proxy/pkg/user/backend/accounts.go b/proxy/pkg/user/backend/accounts.go index 1c33c61b1f..3fad04671f 100644 --- a/proxy/pkg/user/backend/accounts.go +++ b/proxy/pkg/user/backend/accounts.go @@ -11,8 +11,8 @@ import ( cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" - "github.com/cs3org/reva/pkg/auth/scope" - "github.com/cs3org/reva/pkg/token" + "github.com/cs3org/reva/v2/pkg/auth/scope" + "github.com/cs3org/reva/v2/pkg/token" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" settingssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/settings/v0" diff --git a/proxy/pkg/user/backend/accounts_test.go b/proxy/pkg/user/backend/accounts_test.go index 3115d25076..ce722ce3a5 100644 --- a/proxy/pkg/user/backend/accounts_test.go +++ b/proxy/pkg/user/backend/accounts_test.go @@ -5,7 +5,7 @@ import ( "testing" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/cs3org/reva/pkg/token/manager/jwt" + "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/oidc" accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0" diff --git a/settings/pkg/service/v0/service.go b/settings/pkg/service/v0/service.go index b7d500acfa..2cdb42ec4d 100644 --- a/settings/pkg/service/v0/service.go +++ b/settings/pkg/service/v0/service.go @@ -7,7 +7,7 @@ import ( permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" rpcv1beta1 "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/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/middleware" "github.com/owncloud/ocis/ocis-pkg/roles" diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go index 591fc78136..94b0cafe26 100644 --- a/storage/pkg/command/appprovider.go +++ b/storage/pkg/command/appprovider.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go index 8528cb6c17..d1a48fa698 100644 --- a/storage/pkg/command/authbasic.go +++ b/storage/pkg/command/authbasic.go @@ -7,7 +7,7 @@ import ( "path" "path/filepath" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go index aff1c2a5f3..b98f39a4b2 100644 --- a/storage/pkg/command/authbearer.go +++ b/storage/pkg/command/authbearer.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/authmachine.go b/storage/pkg/command/authmachine.go index 46e0fa9490..8812ca6865 100644 --- a/storage/pkg/command/authmachine.go +++ b/storage/pkg/command/authmachine.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go index 81eb0a268c..1010b13dc5 100644 --- a/storage/pkg/command/frontend.go +++ b/storage/pkg/command/frontend.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go index 0938328090..b1f50b0f53 100644 --- a/storage/pkg/command/gateway.go +++ b/storage/pkg/command/gateway.go @@ -9,7 +9,7 @@ import ( "path" "strings" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/mitchellh/mapstructure" "github.com/oklog/run" diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go index 57d1d38998..a763dceea8 100644 --- a/storage/pkg/command/groups.go +++ b/storage/pkg/command/groups.go @@ -7,7 +7,7 @@ import ( "path" "path/filepath" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go index 3b4c7fb83e..f1dc02a35e 100644 --- a/storage/pkg/command/sharing.go +++ b/storage/pkg/command/sharing.go @@ -11,7 +11,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/storagemetadata.go b/storage/pkg/command/storagemetadata.go index 8ca9d41532..b57c466cf0 100644 --- a/storage/pkg/command/storagemetadata.go +++ b/storage/pkg/command/storagemetadata.go @@ -8,7 +8,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go index ed2a239423..a8c605b103 100644 --- a/storage/pkg/command/storagepubliclink.go +++ b/storage/pkg/command/storagepubliclink.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/storageshares.go b/storage/pkg/command/storageshares.go index ea0d0c9172..bc15a30dd6 100644 --- a/storage/pkg/command/storageshares.go +++ b/storage/pkg/command/storageshares.go @@ -8,7 +8,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/sync" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go index 8aef59396e..3edbd6a1b0 100644 --- a/storage/pkg/command/storageusers.go +++ b/storage/pkg/command/storageusers.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go index c71a674b7f..d9fc04c4d5 100644 --- a/storage/pkg/command/users.go +++ b/storage/pkg/command/users.go @@ -7,7 +7,7 @@ import ( "path" "path/filepath" - "github.com/cs3org/reva/cmd/revad/runtime" + "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" diff --git a/thumbnails/pkg/server/grpc/server.go b/thumbnails/pkg/server/grpc/server.go index af21ec485b..825d808814 100644 --- a/thumbnails/pkg/server/grpc/server.go +++ b/thumbnails/pkg/server/grpc/server.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/owncloud/ocis/ocis-pkg/service/grpc" "github.com/owncloud/ocis/ocis-pkg/version" thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" diff --git a/thumbnails/pkg/service/v0/service.go b/thumbnails/pkg/service/v0/service.go index b4978e3fb1..87c638f225 100644 --- a/thumbnails/pkg/service/v0/service.go +++ b/thumbnails/pkg/service/v0/service.go @@ -10,7 +10,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" + revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/owncloud/ocis/ocis-pkg/log" thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0" "github.com/owncloud/ocis/thumbnails/pkg/preprocessor" diff --git a/thumbnails/pkg/thumbnail/imgsource/cs3.go b/thumbnails/pkg/thumbnail/imgsource/cs3.go index 9795d12923..37b7686d70 100644 --- a/thumbnails/pkg/thumbnail/imgsource/cs3.go +++ b/thumbnails/pkg/thumbnail/imgsource/cs3.go @@ -11,15 +11,15 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - revactx "github.com/cs3org/reva/pkg/ctx" - "github.com/cs3org/reva/pkg/rhttp" + revactx "github.com/cs3org/reva/v2/pkg/ctx" + "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/owncloud/ocis/thumbnails/pkg/config" "github.com/pkg/errors" "google.golang.org/grpc/metadata" ) const ( - // "github.com/cs3org/reva/internal/http/services/datagateway" is internal so we redeclare it here + // "github.com/cs3org/reva/v2/internal/http/services/datagateway" is internal so we redeclare it here // TokenTransportHeader holds the header key for the reva transfer token TokenTransportHeader = "X-Reva-Transfer" ) diff --git a/webdav/pkg/service/v0/service.go b/webdav/pkg/service/v0/service.go index a5562171f1..40eefeff01 100644 --- a/webdav/pkg/service/v0/service.go +++ b/webdav/pkg/service/v0/service.go @@ -9,8 +9,8 @@ import ( gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" - "github.com/cs3org/reva/pkg/rgrpc/todo/pool" - "github.com/cs3org/reva/pkg/storage/utils/templates" + "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" + "github.com/cs3org/reva/v2/pkg/storage/utils/templates" "github.com/go-chi/render" merrors "go-micro.dev/v4/errors" "google.golang.org/grpc/metadata"